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

Timestamp:

May 5, 2014 12:02:02 PM (11 years ago)

Author:

vboxsync

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

93552

Message:

VBoxNetCfg: Fixed crash when rolling back in VBoxNetCfgWinInstallInfAndComponent().

File:

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

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

@@ -277 +277 @@
 }
 
-/** @todo r=bird: This function is not in the header file, why is it
- *        exported? */
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinInstallInfAndComponent(IN INetCfg *pNetCfg, IN LPCWSTR pszwComponentId, IN const GUID *pguidClass,
-                                                                IN LPCWSTR const *apInfPaths, IN UINT cInfPaths,
-                                                                OUT INetCfgComponent **ppComponent)
+static HRESULT vboxNetCfgWinInstallInfAndComponent(IN INetCfg *pNetCfg, IN LPCWSTR pszwComponentId, IN const GUID *pguidClass,
+                                                   IN LPCWSTR const *apInfPaths, IN UINT cInfPaths,
+                                                   OUT INetCfgComponent **ppComponent)
 {
     HRESULT hr = S_OK;
-    UINT i = 0;
+    UINT cFilesProcessed = 0;
 
     NonStandardLogFlow(("Installing %u INF files ...\n", cInfPaths));
 
-    for (; i < cInfPaths; i++)
-    {
-        NonStandardLogFlow(("Installing INF file \"%ws\" ...\n", apInfPaths[i]));
-        hr = VBoxDrvCfgInfInstall(apInfPaths[i]);
+    for (; cFilesProcessed < cInfPaths; cFilesProcessed++)
+    {
+        NonStandardLogFlow(("Installing INF file \"%ws\" ...\n", apInfPaths[cFilesProcessed]));
+        hr = VBoxDrvCfgInfInstall(apInfPaths[cFilesProcessed]);
         if (FAILED(hr))
         {
@@ -308 +306 @@
     if (FAILED(hr))
     {
-        for (UINT j = i - 1; j != 0; j--)
-            VBoxDrvCfgInfUninstall(apInfPaths[j], 0);
+        NonStandardLogFlow(("Installation failed, rolling back installation set ...\n"));
+
+        do
+        {
+            HRESULT hr2 = VBoxDrvCfgInfUninstall(apInfPaths[cFilesProcessed], 0);
+            if (FAILED(hr2))
+                NonStandardLogFlow(("VBoxDrvCfgInfUninstall failed, hr (0x%x)\n", hr2));
+                /* Keep going. */
+            if (!cFilesProcessed)
+                break;
+        } while (cFilesProcessed--);
+
+        NonStandardLogFlow(("Rollback complete\n"));
     }
 
@@ -2029 +2038 @@
     {
         NonStandardLog("NetFlt will be installed ...\n");
-        hr = VBoxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETFLT_ID,
+        hr = vboxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETFLT_ID,
                                                  &GUID_DEVCLASS_NETSERVICE,
                                                  apInfFullPaths,