Changeset 83780 in vbox for trunk/src/VBox/HostDrivers/win/cfg
- Timestamp:
- Apr 17, 2020 10:26:07 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp
r82968 r83780 297 297 for (DWORD i = 2; (hr = vboxDrvCfgInfQueryKeyValue(&InfCtx, i, &lpszPlatformCur, &cPlatformCur)) == S_OK; ++i) 298 298 { 299 if (wcsicmp(lpszPlatformCur, L"NT" VBOXDRVCFG_ARCHSTR))299 if (wcsicmp(lpszPlatformCur, L"NT" VBOXDRVCFG_ARCHSTR)) 300 300 { 301 301 if (bNt) … … 499 499 )) 500 500 { 501 for (WCHAR * pHwId = pDrvDetail->HardwareID; pHwId && *pHwId && pHwId < (TCHAR*)(DetailBuf + sizeof(DetailBuf)/sizeof(DetailBuf[0])) ;pHwId += wcslen(pHwId) + 1) 501 for (WCHAR *pwszHwId = pDrvDetail->HardwareID; 502 pwszHwId && *pwszHwId && (uintptr_t)pwszHwId < (uintptr_t)DetailBuf + sizeof(DetailBuf); 503 pwszHwId += wcslen(pwszHwId) + 1) 502 504 { 503 if (!wcsicmp(p HwId, pPnPId))505 if (!wcsicmp(pwszHwId, pPnPId)) 504 506 { 505 507 NonStandardAssert(pDrvDetail->InfFileName[0]); … … 514 516 else 515 517 { 516 DWORD dwErr = GetLastError();517 NonStandardLogRelCrap((__FUNCTION__": SetupDiGetDriverInfoDetail fail dwErr=%ld, size(%d)", dwErr , dwReq));518 DWORD dwErr2 = GetLastError(); 519 NonStandardLogRelCrap((__FUNCTION__": SetupDiGetDriverInfoDetail fail dwErr=%ld, size(%d)", dwErr2, dwReq)); 518 520 // NonStandardAssert(0); 519 521 } … … 522 524 else 523 525 { 524 DWORD dwErr = GetLastError();525 if (dwErr == ERROR_NO_MORE_ITEMS)526 DWORD dwErr2 = GetLastError(); 527 if (dwErr2 == ERROR_NO_MORE_ITEMS) 526 528 { 527 529 NonStandardLogRelCrap((__FUNCTION__": dwErr == ERROR_NO_MORE_ITEMS -> search was finished "));
Note:
See TracChangeset
for help on using the changeset viewer.