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

Timestamp:

Jul 3, 2014 1:03:19 PM (11 years ago)

Author:

vboxsync

Message:

NetFlt: Uninstallation logging.

File:

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

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

@@ -145 +145 @@
 {
     if (!pNetCfg) /* If network config has been released already, just bail out. */
+    {
+        NonStandardLogFlow(("Warning: No network config given but write lock is set to TRUE\n"));
         return S_OK;
+    }
 
     HRESULT hr = pNetCfg->Uninitialize();
@@ -151 +154 @@
     {
         NonStandardLogFlow(("Uninitialize failed, hr (0x%x)\n", hr));
-        return hr;
+        /* Try to release the write lock below. */
     }
 
     if (fHasWriteLock)
     {
-        hr = vboxNetCfgWinINetCfgUnlock(pNetCfg);
-        if (FAILED(hr))
-            NonStandardLogFlow(("vboxNetCfgWinINetCfgUnlock failed, hr (0x%x)\n", hr));
+        HRESULT hr2 = vboxNetCfgWinINetCfgUnlock(pNetCfg);
+        if (FAILED(hr2))
+            NonStandardLogFlow(("vboxNetCfgWinINetCfgUnlock failed, hr (0x%x)\n", hr2));
+        if (SUCCEEDED(hr))
+            hr = hr2;
     }
 
@@ -1999 +2004 @@
 static HRESULT vboxNetCfgWinNetFltUninstall(IN INetCfg *pNc, DWORD InfRmFlags)
 {
-    INetCfgComponent * pNcc = NULL;
+    INetCfgComponent *pNcc = NULL;
     HRESULT hr = pNc->FindComponent(VBOXNETCFGWIN_NETFLT_ID, &pNcc);
     if (hr == S_OK)
@@ -2006 +2011 @@
 
         hr = VBoxNetCfgWinUninstallComponent(pNc, pNcc);
+        NonStandardLog("NetFlt component uninstallation ended with hr (0x%x)\n", hr));
 
         pNcc->Release();
@@ -2012 +2018 @@
     {
         NonStandardLog("NetFlt is not installed currently\n");
-        hr = S_OK;
     }
     else
     {
         NonStandardLogFlow(("FindComponent failed, hr (0x%x)\n", hr));
-        hr = S_OK;
     }