Changeset 24280 in vbox

Timestamp:

Nov 3, 2009 8:06:50 AM (15 years ago)

Author:

vboxsync

Message:

installer/win: move [Un]InstallBranding & InstallPythonAPI actions out of ifdef NETFLT; netadp/win: better failure tracing

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/WinNetConfig.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/WinNetConfig.cpp

@@ -1683 +1683 @@
             {
                 winEr = GetLastError();
-                Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiCallClassInstaller failed (0x%08X)\n", winEr);
+                Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiCallClassInstaller failed winErr(%d)\n", winEr);
                 hr = HRESULT_FROM_WIN32(winEr);
             }
@@ -1690 +1690 @@
         {
             winEr = GetLastError();
-            Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiSetSelectedDevice failed (0x%08X)\n", winEr);
+            Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiSetSelectedDevice failed winErr(%d)\n", winEr);
             hr = HRESULT_FROM_WIN32(winEr);
         }
@@ -1697 +1697 @@
     {
         winEr = GetLastError();
+        Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiSetClassInstallParams failed winErr(%d)\n", winEr);
         hr = HRESULT_FROM_WIN32(winEr);
     }
@@ -1747 +1748 @@
                 if(winEr != ERROR_INSUFFICIENT_BUFFER)
                 {
+                        Log(L"VBoxNetCfgWinEnumNetDevices: SetupDiGetDeviceRegistryPropertyW (1) failed winErr(%d)\n", winEr);
                     hr = HRESULT_FROM_WIN32(winEr);
                     break;
@@ -1768 +1770 @@
                 {
                     winEr = GetLastError();
+                        Log(L"VBoxNetCfgWinEnumNetDevices: SetupDiGetDeviceRegistryPropertyW (2) failed winErr(%d)\n", winEr);
                     hr = HRESULT_FROM_WIN32(winEr);
                     break;
@@ -1799 +1802 @@
         SetupDiDestroyDeviceInfoList(hDevInfo);
     }
+    else
+    {
+        DWORD winEr = GetLastError();
+        Log(L"VBoxNetCfgWinEnumNetDevices: SetupDiGetClassDevsExW failed winErr(%d)\n", winEr);
+        hr = HRESULT_FROM_WIN32(winEr);
+    }
+
     return hr;
 }