Fixes for _UNICODE macro on Visual Studio (#2510)

Signed-off-by: Miguel Barro <[email protected]>
(cherry picked from commit 49e7986)

Author: MiguelBarro

src/cpp/utils/StringMatching.cpp

@@ -99,7 +99,7 @@ bool StringMatching::matchPattern(
         const char* pattern,
         const char* str)
 {
-    if (PathMatchSpec(str, pattern))
+    if (PathMatchSpecA(str, pattern))
     {
         return true;
     }
@@ -110,11 +110,11 @@ bool StringMatching::matchString(
         const char* str1,
         const char* str2)
 {
-    if (PathMatchSpec(str1, str2))
+    if (PathMatchSpecA(str1, str2))
     {
         return true;
     }
-    if (PathMatchSpec(str2, str1))
+    if (PathMatchSpecA(str2, str1))
     {
         return true;
     }

src/cpp/utils/SystemInfo.cpp

@@ -104,7 +104,7 @@ ReturnCode_t SystemInfo::get_username(
 #define INFO_BUFFER_SIZE 32767
     char user[INFO_BUFFER_SIZE];
     DWORD bufCharCount = INFO_BUFFER_SIZE;
-    if (!GetUserName(user, &bufCharCount))
+    if (!GetUserNameA(user, &bufCharCount))
     {
         return ReturnCode_t::RETCODE_ERROR;
     }