Changeset 62697 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg

Timestamp:

Jul 29, 2016 3:56:55 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109271

Message:

HostDrivers: warnings

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (27 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

@@ -19 +19 @@
 #define _WIN32_DCOM
 
-
 #include <devguid.h>
 #include <stdio.h>
@@ -38 +37 @@
 #include <Ws2tcpip.h>
 #include <ws2ipdef.h>
-#include <netioapi.h>
-#include <iphlpapi.h>
+#include <iprt/win/netioapi.h>
+#include <iprt/win/iphlpapi.h>
 
 
@@ -498 +497 @@
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRenameConnection(LPWSTR pGuid, PCWSTR NewName);
 
-static BOOL vboxNetCfgWinRemoveAllNetDevicesOfIdCallback(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pContext)
-{
+static BOOL vboxNetCfgWinRemoveAllNetDevicesOfIdCallback(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pvContext)
+{
+    RT_NOREF1(pvContext);
     SP_REMOVEDEVICE_PARAMS rmdParams;
     memset(&rmdParams, 0, sizeof(SP_REMOVEDEVICE_PARAMS));
@@ -674 +674 @@
 }
 
-typedef BOOL (*VBOXNETCFGWIN_NETENUM_CALLBACK) (HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pContext);
+typedef BOOL (*PFNVBOXNETCFGWINNETENUMCALLBACK)(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pContext);
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnumNetDevices(LPCWSTR pwszPnPId,
-                                                        VBOXNETCFGWIN_NETENUM_CALLBACK callback, PVOID pContext)
+                                                        PFNVBOXNETCFGWINNETENUMCALLBACK pfnCallback, PVOID pvContext)
 {
     NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Searching for: %S\n", pwszPnPId));
@@ -690 +690 @@
     if (hDevInfo != INVALID_HANDLE_VALUE)
     {
-        DWORD winEr;
+        DWORD winEr = NO_ERROR;
 
         DWORD dwDevId = 0;
@@ -771 +771 @@
                 if (!wcsnicmp(pCurId, pwszPnPId, cPnPId))
                 {
-                    if (!callback(hDevInfo, &Dev, pContext))
+                    if (!pfnCallback(hDevInfo, &Dev, pvContext))
                         break;
                 }
@@ -1118 +1118 @@
 {
     VARIANT vtServiceName;
-    BOOL bIsHostOnly = FALSE;
     VariantInit(&vtServiceName);
 
@@ -1198 +1197 @@
 }
 
+#if 0 /* unused */
 
 static HRESULT netIfWinHasIpSettings(IWbemClassObject * pAdapterConfig, SAFEARRAY * pCheckIp, SAFEARRAY * pCheckMask, bool *pFound)
@@ -1273 +1273 @@
 }
 
+#endif /* unused */
+
 static HRESULT netIfWinCreateIWbemServices(IWbemServices ** ppSvc)
 {
@@ -1378 +1380 @@
 static HRESULT netIfWinCreateIpArray(SAFEARRAY **ppArray, in_addr* aIp, UINT cIp)
 {
-    HRESULT hr;
+    HRESULT hr = S_OK; /* MSC maybe used uninitialized */
     SAFEARRAY * pIpArray = SafeArrayCreateVector(VT_BSTR, 0, cIp);
     if (pIpArray)
@@ -1408 +1410 @@
 }
 
+#if 0 /* unused */
 static HRESULT netIfWinCreateIpArrayV4V6(SAFEARRAY **ppArray, BSTR Ip)
 {
@@ -1434 +1437 @@
     return hr;
 }
+#endif
 
 
@@ -1450 +1454 @@
 }
 
+#if 0 /* unused */
 static HRESULT netIfWinCreateIpArrayVariantV4V6(VARIANT * pIpAddresses, BSTR Ip)
 {
@@ -1463 +1468 @@
     return hr;
 }
-
-static HRESULT netIfWinEnableStatic(IWbemServices * pSvc, const GUID * pGuid, BSTR ObjPath, VARIANT * pIp, VARIANT * pMask)
+#endif
+
+static HRESULT netIfWinEnableStatic(IWbemServices *pSvc, const GUID *pGuid, BSTR ObjPath, VARIANT *pIp, VARIANT *pMask)
 {
     ComPtr<IWbemClassObject> pClass;
@@ -1491 +1497 @@
                     switch (winEr)
                     {
-                    case 0:
+                        case 0:
                         {
                             hr = S_OK;
 //                            bool bFound;
 //                            HRESULT tmpHr = netIfWinWaitIpSettings(pSvc, pGuid, pIp->parray, pMask->parray, 180, &bFound);
+                            NOREF(pGuid);
+                            break;
                         }
-                        break;
-                    default:
-                        hr = HRESULT_FROM_WIN32( winEr );
-                        break;
+                        default:
+                            hr = HRESULT_FROM_WIN32( winEr );
+                            break;
                     }
                 }
@@ -1531 +1538 @@
     return hr;
 }
+
+#if 0 /* unused */
 
 static HRESULT netIfWinEnableStaticV4V6(IWbemServices * pSvc, const GUID * pGuid, BSTR ObjPath, BSTR Ip, BSTR Mask)
@@ -1620 +1629 @@
     return hr;
 }
+
+#endif /* unused */
 
 static HRESULT netIfWinEnableDHCP(IWbemServices * pSvc, BSTR ObjPath)
@@ -2172 +2183 @@
 static HRESULT vboxNetCfgWinNetAdpUninstall(IN INetCfg *pNc, LPCWSTR pwszId, DWORD InfRmFlags)
 {
-    HRESULT hr = S_OK;
+    NOREF(pNc);
     NonStandardLog("Finding NetAdp driver package and trying to uninstall it ...\n");
 
     VBoxDrvCfgInfUninstallAllF(L"Net", pwszId, InfRmFlags);
     NonStandardLog("NetAdp is not installed currently\n");
-    return hr;
+    return S_OK;
 }
 
@@ -2291 +2302 @@
     const WCHAR * pSuffix = wcsrchr( DevName, L'#' );
     ULONG cbSize = sizeof(VBOX_CONNECTION_NAME);
-    ULONG cbSufSize = 0;
 
     if (pSuffix)
@@ -2317 +2327 @@
 static BOOL vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority(IN INetCfg *pNc, IN INetCfgComponent *pNcc, PVOID pContext)
 {
+    RT_NOREF1(pNc);
     INetCfgComponentBindings *pNetCfgBindings;
     GUID *pGuid = (GUID*)pContext;
@@ -2652 +2663 @@
         {
             BOOL ok;
-            DWORD ret = 0;
             GUID netGuid;
             SP_DEVINFO_DATA DeviceInfoData;
@@ -2663 +2673 @@
 
             /* copy the net class GUID */
-            memcpy (&netGuid, &GUID_DEVCLASS_NET, sizeof (GUID_DEVCLASS_NET));
+            memcpy(&netGuid, &GUID_DEVCLASS_NET, sizeof (GUID_DEVCLASS_NET));
 
             /* return a device info set contains all installed devices of the Net class */
-            hDeviceInfo = SetupDiGetClassDevs (&netGuid, NULL, NULL, DIGCF_PRESENT);
+            hDeviceInfo = SetupDiGetClassDevs(&netGuid, NULL, NULL, DIGCF_PRESENT);
 
             if (hDeviceInfo == INVALID_HANDLE_VALUE)
-                SetErrBreak (("SetupDiGetClassDevs failed (0x%08X)", GetLastError()));
+                SetErrBreak(("SetupDiGetClassDevs failed (0x%08X)", GetLastError()));
 
             /* enumerate the driver info list */
@@ -2676 +2686 @@
                 TCHAR *deviceHwid;
 
-                ok = SetupDiEnumDeviceInfo (hDeviceInfo, index, &DeviceInfoData);
+                ok = SetupDiEnumDeviceInfo(hDeviceInfo, index, &DeviceInfoData);
 
                 if (!ok)
@@ -2690 +2700 @@
 
                 /* try to get the hardware ID registry property */
-                ok = SetupDiGetDeviceRegistryProperty (hDeviceInfo,
-                                                       &DeviceInfoData,
-                                                       SPDRP_HARDWAREID,
-                                                       NULL,
-                                                       NULL,
-                                                       0,
-                                                       &size);
+                ok = SetupDiGetDeviceRegistryProperty(hDeviceInfo,
+                                                      &DeviceInfoData,
+                                                      SPDRP_HARDWAREID,
+                                                      NULL,
+                                                      NULL,
+                                                      0,
+                                                      &size);
                 if (!ok)
                 {
@@ -2705 +2715 @@
                     }
 
-                    deviceHwid = (TCHAR *) malloc (size);
-                    ok = SetupDiGetDeviceRegistryProperty (hDeviceInfo,
-                                                           &DeviceInfoData,
-                                                           SPDRP_HARDWAREID,
-                                                           NULL,
-                                                           (PBYTE)deviceHwid,
-                                                           size,
-                                                           NULL);
+                    deviceHwid = (TCHAR *) malloc(size);
+                    ok = SetupDiGetDeviceRegistryProperty(hDeviceInfo,
+                                                          &DeviceInfoData,
+                                                          SPDRP_HARDWAREID,
+                                                          NULL,
+                                                          (PBYTE)deviceHwid,
+                                                          size,
+                                                          NULL);
                     if (!ok)
                     {
-                        free (deviceHwid);
+                        free(deviceHwid);
                         deviceHwid = NULL;
                         index++;
@@ -2730 +2740 @@
                 for (TCHAR *t = deviceHwid;
                      t && *t && t < &deviceHwid[size / sizeof(TCHAR)];
-                     t += _tcslen (t) + 1)
-                {
-                    if (!_tcsicmp (DRIVERHWID, t))
+                     t += _tcslen(t) + 1)
+                {
+                    if (!_tcsicmp(DRIVERHWID, t))
                     {
                           /* get the device instance ID */
@@ -3493 +3503 @@
 HRESULT vboxNetCfgWinSetupMetric(IN HKEY hKey)
 {
-    HRESULT rc = S_OK;
     HINSTANCE hModule = NULL;
-    NET_LUID luid;
-    int loopbackMetric;
-
-    rc = vboxLoadIpHelpFunctions(hModule);
-
+    HRESULT rc = vboxLoadIpHelpFunctions(hModule);
     if (SUCCEEDED(rc))
+    {
+        NET_LUID luid;
         rc = vboxNetCfgWinGetInterfaceLUID(hKey, &luid);
-
-    if (SUCCEEDED(rc))
-        rc = vboxNetCfgWinGetLoopbackMetric(&loopbackMetric);
-
-    if (SUCCEEDED(rc))
-        rc = vboxNetCfgWinSetInterfaceMetric(&luid, loopbackMetric - 1);
+        if (SUCCEEDED(rc))
+        {
+            int loopbackMetric;
+            rc = vboxNetCfgWinGetLoopbackMetric(&loopbackMetric);
+            if (SUCCEEDED(rc))
+                rc = vboxNetCfgWinSetInterfaceMetric(&luid, loopbackMetric - 1);
+        }
+    }
 
     g_pfnInitializeIpInterfaceEntry = NULL;