Changeset 53038 in vbox for trunk

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.

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (5 diffs)
• HostDrivers/win/cfg/VBoxDrvCfg.cpp (modified) (10 diffs)
• Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (4 diffs)
• Installer/win/VBoxMergeNetAdpSeq.wxi (modified) (1 diff)

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);
 }
 

trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

@@ -352 +352 @@
     LPWSTR lpszPnPId;
     HRESULT hr = vboxDrvCfgInfQueryModelsSectionName(hInf, &lpszModels, NULL);
+    NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryModelsSectionName returned lpszModels = (%S)", lpszModels));
     if (hr != S_OK)
     {
@@ -367 +368 @@
     {
         hr = vboxDrvCfgInfQueryKeyValue(&InfCtx, 2, &lpszPnPId, NULL);
+        NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for models (%S) returned lpszPnPId (%S) \n", lpszModels, lpszPnPId));
+
         if (hr != S_OK)
         {
@@ -488 +491 @@
                                 {
                                     list.add(pDrvDetail->InfFileName);
+                                    NonStandardLogRelCrap((__FUNCTION__": %S added to list", pDrvDetail->InfFileName));
                                 }
                             }
@@ -505 +509 @@
                     if (dwErr == ERROR_NO_MORE_ITEMS)
                     {
+                        NonStandardLogRelCrap((__FUNCTION__": dwErr == ERROR_NO_MORE_ITEMS -> search was finished "));
                         break;
                     }
@@ -557 +562 @@
     VBoxDrvCfgStringList list(128);
     HRESULT hr = vboxDrvCfgCollectInfsSetupDi(pGuidClass, lpszPnPId, list);
+    NonStandardLogRelCrap((__FUNCTION__": vboxDrvCfgCollectInfsSetupDi returned %d devices with PnPId %S and class name %S", list.size(), lpszPnPId, lpszClassName));
     if (hr == S_OK)
     {
@@ -575 +581 @@
 
             vboxDrvCfgInfEnumerationCallback(pRel, &Context);
-//            NonStandardLogRelCrap(("inf : %S\n", list.get(i)));
+            NonStandardLogRelCrap((__FUNCTION__": inf = %S\n", list.get(i)));
         }
     }
@@ -633 +639 @@
     PINFENUM_CONTEXT pContext = (PINFENUM_CONTEXT)pCtxt;
     DWORD dwErr;
-//    NonStandardLogRelCrap(("vboxDrvCfgInfEnumerationCallback: pFileName (%S)\n", pFileName));
-
+    NonStandardLogRelCrap((__FUNCTION__": lpszFileName (%S)\n", lpszFileName));
+    NonStandardLogRelCrap((__FUNCTION__ ": pContext->InfInfo.lpszClassName = (%S)", pContext->InfInfo.lpszClassName));
     HINF hInf = SetupOpenInfFileW(lpszFileName, pContext->InfInfo.lpszClassName, INF_STYLE_WIN4, NULL /*__in PUINT ErrorLine */);
     if (hInf == INVALID_HANDLE_VALUE)
@@ -644 +650 @@
             NonStandardLogCrap((__FUNCTION__ ": SetupOpenInfFileW err dwErr=%ld\n", dwErr));
         }
-
+        else
+        {
+            NonStandardLogCrap((__FUNCTION__ ": dwErr == ERROR_CLASS_MISMATCH"));
+        }
         return true;
     }
@@ -650 +659 @@
     LPWSTR lpszPnPId;
     HRESULT hr = vboxDrvCfgInfQueryFirstPnPId(hInf, &lpszPnPId);
+    NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryFirstPnPId returned lpszPnPId = (%S)", lpszPnPId));
+    NonStandardLogRelCrap((__FUNCTION__ ": pContext->InfInfo.lpszPnPId = (%S)", pContext->InfInfo.lpszPnPId));
     if (hr == S_OK)
     {
@@ -694 +705 @@
         Context.Flags = Flags;
         Context.hr = S_OK;
+        NonStandardLogRelCrap((__FUNCTION__": Calling vboxDrvCfgEnumFiles(wszInfDirPath, vboxDrvCfgInfEnumerationCallback, &Context)"));
         hr = vboxDrvCfgEnumFiles(wszInfDirPath, vboxDrvCfgInfEnumerationCallback, &Context);
         NonStandardAssert(hr == S_OK);

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -503 +503 @@
 static MSIHANDLE g_hCurrentModule = NULL;
 
+static VOID vboxDrvLoggerCallback(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char * msg, void * pvContext)
+{
+    switch (enmSeverity)
+    {
+        case VBOXDRVCFG_LOG_SEVERITY_FLOW:
+        case VBOXDRVCFG_LOG_SEVERITY_REGULAR:
+            break;
+        case VBOXDRVCFG_LOG_SEVERITY_REL:
+            if (g_hCurrentModule)
+                logString(g_hCurrentModule, (LPCSTR)msg);
+            break;
+        default:
+            break;
+    }
+}
+
 static VOID netCfgLoggerCallback(LPCSTR szString)
 {
@@ -528 +544 @@
 
     VBoxNetCfgWinSetLogging((LOG_ROUTINE)netCfgLoggerCallback);
+    /* uncomment next line if you want to add logging information from VBoxDrvCfg.cpp */
+//    VBoxDrvCfgLoggerSet(vboxDrvLoggerCallback, NULL);
 }
 
@@ -1083 +1101 @@
     if (SUCCEEDED(hr))
     {
-        hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, pwszId, L"Net", 0/* could be SUOI_FORCEDELETE */);
+        hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, L"Net", pwszId, SUOI_FORCEDELETE/* could be SUOI_FORCEDELETE */);
         if (FAILED(hr))
         {
             logStringW(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstalled successfully, but failed to remove INF files");
         }
+        else
+            logStringW(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstalled successfully");
+
     }
     else
@@ -1172 +1193 @@
     if (SUCCEEDED(hr))
     {
-        hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, pwszId, L"Net", 0/* could be SUOI_FORCEDELETE */);
-        if (FAILED(hr))
-            logStringW(hModule, L"StopHostOnlyInterfaces: VBoxDrvCfgInfUninstallAllSetupDi failed, hr = 0x%x", hr);
+        logStringW(hModule, L"StopHostOnlyInterfaces: Disabling host interfaces was successful, hr = 0x%x", hr);
     }
     else

trunk/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi

@@ -39 +39 @@
     <!-- First stop the existing host-only interfaces on update ... -->
     <Custom Action="ca_StopHostOnlyInterfaces" After="InstallInitialize" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
     </Custom>
+
     <Custom Action="ca_UninstallNetAdpArgs" Before="ca_UninstallNetAdp" >
-        <![CDATA[(Installed) AND (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
     </Custom>
-    <Custom Action="ca_UninstallNetAdp" After="ca_RemoveHostOnlyInterfaces" >
-        <![CDATA[(Installed) AND (REMOVE="ALL")]]>
+    <Custom Action="ca_UninstallNetAdp" After="ca_StopHostOnlyInterfaces" >
+        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
         </Custom>
-    
+
 <?endif ?>