Changeset 107822 in vbox for trunk/src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp

Timestamp:

Jan 16, 2025 3:09:22 PM (6 weeks ago)

Author:

vboxsync

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

166991

Message:

Windows driver installation/VBoxWinDrvInst.cpp: Removed a case in vboxWinDrvUninstallFromDriverStore() which never can be reached, minimal reshuffling for better readability.

File:

• trunk/src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp (modified) (2 diffs)

trunk/src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp

@@ -1687 +1687 @@
         {
             vboxWinDrvInstLogVerbose(pCtx, 1, "Using DiUninstallDriverW()");
+
             BOOL fReboot = FALSE;
             if (!(pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_DRYRUN))
@@ -1708 +1709 @@
             vboxWinDrvInstLogVerbose(pCtx, 1, "Using SetupUninstallOEMInfW()");
 
-            DWORD dwUninstallFlags = 0;
-            if (pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_FORCE)
-                dwUninstallFlags |= SUOI_FORCEDELETE;
-
             if (!(pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_DRYRUN))
+            {
+                DWORD dwUninstallFlags = 0;
+                if (pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_FORCE)
+                    dwUninstallFlags |= SUOI_FORCEDELETE;
+
+                /* Takes the oemXXX.inf file (without a path), as found in the Windows INF directory. */
                 fRc = g_pfnSetupUninstallOEMInfW(pCur->wszInfFile, dwUninstallFlags, NULL /* pReserved */);
-            else
-                fRc = FALSE;
+            }
         }