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

Timestamp:

Jul 29, 2016 1:25:48 PM (8 years ago)

Author:

vboxsync

Message:

Use the iprt/win/setupapi.h wrapper for setupapi.h to deal with preprocessor warnings.

File:

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

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

@@ -22 +22 @@
 #include <VBox/VBoxDrvCfg-win.h>
 
-#include <setupapi.h>
+#include <iprt/win/setupapi.h>
 #include <shlobj.h>
 
@@ -362 +362 @@
 
     LPWSTR lpszModels;
-    LPWSTR lpszPnPId;
     HRESULT hr = vboxDrvCfgInfQueryModelsSectionName(hInf, &lpszModels, NULL);
     NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryModelsSectionName returned lpszModels = (%S)", lpszModels));
@@ -371 +370 @@
     }
 
+    LPWSTR lpszPnPId = NULL;
     INFCONTEXT InfCtx;
     hr = vboxDrvCfgInfQueryContext(hInf, lpszModels, NULL, &InfCtx);
@@ -454 +454 @@
 {
     DWORD dwErr = ERROR_SUCCESS;
-    int counter = 0;
     HDEVINFO hDevInfo = SetupDiCreateDeviceInfoList(
                             pGuid, /* IN LPGUID ClassGuid, OPTIONAL */