Changeset 83780 in vbox for trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

Timestamp:

Apr 17, 2020 10:26:07 PM (5 years ago)

Author:

vboxsync

Message:

HostDrivers/VBoxDrvCfg.cpp: VC++ 14.1 adjustments. bugref:8489

File:

• trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

@@ -297 +297 @@
     for (DWORD i = 2; (hr = vboxDrvCfgInfQueryKeyValue(&InfCtx, i, &lpszPlatformCur, &cPlatformCur)) == S_OK; ++i)
     {
-        if (wcsicmp(lpszPlatformCur, L"NT"VBOXDRVCFG_ARCHSTR))
+        if (wcsicmp(lpszPlatformCur, L"NT" VBOXDRVCFG_ARCHSTR))
         {
             if (bNt)
@@ -499 +499 @@
                             ))
                     {
-                        for (WCHAR * pHwId = pDrvDetail->HardwareID; pHwId && *pHwId && pHwId < (TCHAR*)(DetailBuf + sizeof(DetailBuf)/sizeof(DetailBuf[0])) ;pHwId += wcslen(pHwId) + 1)
+                        for (WCHAR *pwszHwId = pDrvDetail->HardwareID;
+                             pwszHwId && *pwszHwId && (uintptr_t)pwszHwId < (uintptr_t)DetailBuf + sizeof(DetailBuf);
+                             pwszHwId += wcslen(pwszHwId) + 1)
                         {
-                            if (!wcsicmp(pHwId, pPnPId))
+                            if (!wcsicmp(pwszHwId, pPnPId))
                             {
                                 NonStandardAssert(pDrvDetail->InfFileName[0]);
@@ -514 +516 @@
                     else
                     {
-                        DWORD dwErr = GetLastError();
-                        NonStandardLogRelCrap((__FUNCTION__": SetupDiGetDriverInfoDetail fail dwErr=%ld, size(%d)", dwErr, dwReq));
+                        DWORD dwErr2 = GetLastError();
+                        NonStandardLogRelCrap((__FUNCTION__": SetupDiGetDriverInfoDetail fail dwErr=%ld, size(%d)", dwErr2, dwReq));
 //                        NonStandardAssert(0);
                     }
@@ -522 +524 @@
                 else
                 {
-                    DWORD dwErr = GetLastError();
-                    if (dwErr == ERROR_NO_MORE_ITEMS)
+                    DWORD dwErr2 = GetLastError();
+                    if (dwErr2 == ERROR_NO_MORE_ITEMS)
                     {
                         NonStandardLogRelCrap((__FUNCTION__": dwErr == ERROR_NO_MORE_ITEMS -> search was finished "));