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

Timestamp:

Oct 13, 2014 10:42:54 AM (10 years ago)

Author:

vboxsync

Message:

pr7489. Fixed RemoveHostOnlyInterfaces(). Function RemoveHostOnlyInterfaces() resumes deleting driver packages and inf files (not only devices) related to Host-only adapters again. UninstallNetAdp deletes Host-only driver packages(not devices) only. RemoveHostOnlyInterfaces is used during uninstallation, UninstallNetAdp is used during upgrade.

File:

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

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

@@ -548 +548 @@
         case VBOXNECTFGWINPROPCHANGE_TYPE_DISABLE:
             PcParams.StateChange = DICS_DISABLE;
+            NonStandardLogFlow(("vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback: Change type (DICS_DISABLE): %d\n", pPc->enmPcType));
             break;
         case VBOXNECTFGWINPROPCHANGE_TYPE_ENABLE:
             PcParams.StateChange = DICS_ENABLE;
+            NonStandardLogFlow(("vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback: Change type (DICS_ENABLE): %d\n", pPc->enmPcType));
             break;
         default:
@@ -684 +686 @@
             if (cCurId >= cPnPId)
             {
+                NonStandardLogFlow(("!wcsnicmp(pCurId = (%S), pwszPnPId = (%S), cPnPId = (%d))", pCurId, pwszPnPId, cPnPId));
+
                 pCurId += cCurId - cPnPId;
                 if (!wcsnicmp(pCurId, pwszPnPId, cPnPId))
@@ -723 +727 @@
     Pc.enmPcType = enmPcType;
     Pc.hr = S_OK;
+    NonStandardLogFlow(("Calling VBoxNetCfgWinEnumNetDevices with lpszPnPId =(%S) and vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback", lpszPnPId));
+
     HRESULT hr = VBoxNetCfgWinEnumNetDevices(lpszPnPId, vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback, &Pc);
     if (!SUCCEEDED(hr))
@@ -2069 +2075 @@
 static HRESULT vboxNetCfgWinNetAdpUninstall(IN INetCfg *pNc, DWORD InfRmFlags)
 {
-    INetCfgComponent *pNcc = NULL;
-    HRESULT hr = pNc->FindComponent(VBOXNETCFGWIN_NETADP_ID, &pNcc);
-    if (hr == S_OK)
-    {
-        NonStandardLog("NetAdp is installed currently, uninstalling ...\n");
-
-        hr = VBoxNetCfgWinUninstallComponent(pNc, pNcc);
-        NonStandardLogFlow(("NetAdp component uninstallation ended with hr (0x%x)\n", hr));
-
-        pNcc->Release();
-    }
-    else if (hr == S_FALSE)
-    {
-        NonStandardLog("NetAdp is not installed currently\n");
-    }
-    else
-    {
-        NonStandardLogFlow(("FindComponent failed, hr (0x%x)\n", hr));
-    }
+    HRESULT hr = S_OK;
+    NonStandardLog("Finding NetAdp driver package and trying to uninstall it ...\n");
 
     VBoxDrvCfgInfUninstallAllF(L"Net", VBOXNETCFGWIN_NETADP_ID, InfRmFlags);
-
+    NonStandardLog("NetAdp is not installed currently\n");
     return hr;
 }
@@ -2096 +2085 @@
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetAdpUninstall(IN INetCfg *pNc)
 {
-    return vboxNetCfgWinNetAdpUninstall(pNc, 0);
+    return vboxNetCfgWinNetAdpUninstall(pNc, SUOI_FORCEDELETE);
 }