Changeset 95850 in vbox

Timestamp:

Jul 26, 2022 11:37:17 PM (2 years ago)

Author:

vboxsync

Message:

VBoxService/VMInfo-win.cpp: Use MAX_PATH from windows.h instead of _MAX_PATH from the CRT, d'oh. bugref:10261

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -61 +61 @@
 typedef struct VBOXSERVICEVMINFOUSER
 {
-    WCHAR wszUser[_MAX_PATH];
-    WCHAR wszAuthenticationPackage[_MAX_PATH];
-    WCHAR wszLogonDomain[_MAX_PATH];
+    WCHAR wszUser[MAX_PATH];
+    WCHAR wszAuthenticationPackage[MAX_PATH];
+    WCHAR wszLogonDomain[MAX_PATH];
     /** Number of assigned user processes. */
     ULONG ulNumProcs;
@@ -826 +826 @@
                                &pSessionData->LogonDomain, "Logon domain name");
 
-        TCHAR           szOwnerName[_MAX_PATH]  = { 0 };
+        TCHAR           szOwnerName[MAX_PATH]   = { 0 };
         DWORD           dwOwnerNameSize         = sizeof(szOwnerName);
-        TCHAR           szDomainName[_MAX_PATH] = { 0 };
+        TCHAR           szDomainName[MAX_PATH]  = { 0 };
         DWORD           dwDomainNameSize        = sizeof(szDomainName);
         SID_NAME_USE    enmOwnerType            = SidTypeInvalid;
@@ -1188 +1188 @@
                         AssertPtr(pCurUser);
 
-                        if (   !wcscmp(userSession.wszUser, pCurUser->wszUser)
-                            && !wcscmp(userSession.wszLogonDomain, pCurUser->wszLogonDomain)
-                            && !wcscmp(userSession.wszAuthenticationPackage, pCurUser->wszAuthenticationPackage))
+                        if (   !RTUtf16Cmp(userSession.wszUser, pCurUser->wszUser)
+                            && !RTUtf16Cmp(userSession.wszLogonDomain, pCurUser->wszLogonDomain)
+                            && !RTUtf16Cmp(userSession.wszAuthenticationPackage, pCurUser->wszAuthenticationPackage))
                         {
                             /*
@@ -1319 +1319 @@
 {
     int rc;
-    char szSysDir[_MAX_PATH] = {0};
-    char szWinDir[_MAX_PATH] = {0};
-    char szDriversDir[_MAX_PATH + 32] = {0};
+    char szSysDir[MAX_PATH] = {0};
+    char szWinDir[MAX_PATH] = {0};
+    char szDriversDir[MAX_PATH + 32] = {0};
 
     /* ASSUME: szSysDir and szWinDir and derivatives are always ASCII compatible. */
-    GetSystemDirectory(szSysDir, _MAX_PATH);
-    GetWindowsDirectory(szWinDir, _MAX_PATH);
+    GetSystemDirectory(szSysDir, MAX_PATH);
+    GetWindowsDirectory(szWinDir, MAX_PATH);
     RTStrPrintf(szDriversDir, sizeof(szDriversDir), "%s\\drivers", szSysDir);
 #ifdef RT_ARCH_AMD64
-    char szSysWowDir[_MAX_PATH + 32] = {0};
+    char szSysWowDir[MAX_PATH + 32] = {0};
     RTStrPrintf(szSysWowDir, sizeof(szSysWowDir), "%s\\SysWow64", szWinDir);
 #endif