Changeset 62686 in vbox for trunk/src/VBox/HostDrivers

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.

Location:

trunk/src/VBox/HostDrivers

Files:

• VBoxUSB/win/Install/USBInstall.cpp (modified) (1 diff)
• VBoxUSB/win/Install/USBUninstall.cpp (modified) (1 diff)
• VBoxUSB/win/lib/VBoxUsbLib-win.cpp (modified) (1 diff)
• VBoxUSB/win/testcase/USBTest.cpp (modified) (1 diff)
• win/cfg/VBoxDrvCfg.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #include <iprt/win/windows.h>
-#include <setupapi.h>
+#include <iprt/win/setupapi.h>
 #include <newdev.h>
 #include <iprt/assert.h>

trunk/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #include <iprt/win/windows.h>
-#include <setupapi.h>
+#include <iprt/win/setupapi.h>
 #include <newdev.h>
 

trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp

@@ -39 +39 @@
 #include <stdio.h>
 #pragma warning (disable:4200) /* shuts up the empty array member warnings */
-#include <setupapi.h>
+#include <iprt/win/setupapi.h>
 #include <usbdi.h>
 #include <hidsdi.h>

trunk/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #include <iprt/win/windows.h>
-#include <setupapi.h>
+#include <iprt/win/setupapi.h>
 #include <newdev.h>
 #include <iprt/assert.h>

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 */