Changeset 107393 in vbox

Timestamp:

Dec 20, 2024 9:11:24 AM (2 months ago)

Author:

vboxsync

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

166436

Message:

Windows driver installation/VBoxDrvInst: Fixed option definitions for the 'uninstall' sub command. White space fixes.

File:

• trunk/src/VBox/GuestHost/installation/VBoxDrvInst.cpp (modified) (4 diffs)

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

@@ -149 +149 @@
 static const RTGETOPTDEF g_aCmdInstallOptions[] =
 {
-    { "--inf-file",      VBOXDRVINST_INSTALL_OPT_INF_FILE,       RTGETOPT_REQ_STRING  },
-    { "--inf-section",   VBOXDRVINST_INSTALL_OPT_INF_SECTION,    RTGETOPT_REQ_STRING  },
-    { "--model",         VBOXDRVINST_INSTALL_OPT_MODEL,          RTGETOPT_REQ_STRING  },
-    { "--pnp",           VBOXDRVINST_INSTALL_OPT_PNPID,          RTGETOPT_REQ_STRING  },
-    { "--pnpid" ,        VBOXDRVINST_INSTALL_OPT_PNPID,          RTGETOPT_REQ_STRING  },
-    { "--pnp-id",        VBOXDRVINST_INSTALL_OPT_PNPID,          RTGETOPT_REQ_STRING  },
-    { "--not-force",     VBOXDRVINST_INSTALL_OPT_NOT_FORCE,      RTGETOPT_REQ_NOTHING },
-    { "--not-silent",    VBOXDRVINST_INSTALL_OPT_NOT_SILENT,     RTGETOPT_REQ_NOTHING },
+    { "--inf-file",      VBOXDRVINST_INSTALL_OPT_INF_FILE,      RTGETOPT_REQ_STRING  },
+    { "--inf-section",   VBOXDRVINST_INSTALL_OPT_INF_SECTION,   RTGETOPT_REQ_STRING  },
+    { "--model",         VBOXDRVINST_INSTALL_OPT_MODEL,         RTGETOPT_REQ_STRING  },
+    { "--pnp",           VBOXDRVINST_INSTALL_OPT_PNPID,         RTGETOPT_REQ_STRING  },
+    { "--pnpid" ,        VBOXDRVINST_INSTALL_OPT_PNPID,         RTGETOPT_REQ_STRING  },
+    { "--pnp-id",        VBOXDRVINST_INSTALL_OPT_PNPID,         RTGETOPT_REQ_STRING  },
+    { "--not-force",     VBOXDRVINST_INSTALL_OPT_NOT_FORCE,     RTGETOPT_REQ_NOTHING },
+    { "--not-silent",    VBOXDRVINST_INSTALL_OPT_NOT_SILENT,    RTGETOPT_REQ_NOTHING },
     { "--ignore-reboot", VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT, RTGETOPT_REQ_NOTHING }
 };
@@ -182 +182 @@
     VBOXDRVINST_UNINSTALL_OPT_MODEL,
     VBOXDRVINST_UNINSTALL_OPT_PNPID,
+    VBOXDRVINST_UNINSTALL_OPT_NOT_SILENT,
     VBOXDRVINST_UNINSTALL_OPT_IGNORE_REBOOT
 };
@@ -196 +197 @@
     { "--pnpid" ,        VBOXDRVINST_UNINSTALL_OPT_PNPID,         RTGETOPT_REQ_STRING  },
     { "--pnp-id",        VBOXDRVINST_UNINSTALL_OPT_PNPID,         RTGETOPT_REQ_STRING  },
+    { "--not-silent",    VBOXDRVINST_UNINSTALL_OPT_NOT_SILENT,    RTGETOPT_REQ_NOTHING },
     { "--ignore-reboot", VBOXDRVINST_UNINSTALL_OPT_IGNORE_REBOOT, RTGETOPT_REQ_NOTHING }
 };
@@ -577 +579 @@
                 return vboxDrvInstShowUsage(g_pStdOut, &g_CmdUninstall);
 
-           case VBOXDRVINST_INSTALL_OPT_INF_FILE:
+            case VBOXDRVINST_UNINSTALL_OPT_INF_FILE:
                 DUP_ARG_TO_STR(pszInfFile);
                 break;
 
-            case VBOXDRVINST_INSTALL_OPT_INF_SECTION:
+            case VBOXDRVINST_UNINSTALL_OPT_INF_SECTION:
                 DUP_ARG_TO_STR(pszInfSection);
                 break;
 
-            case VBOXDRVINST_INSTALL_OPT_MODEL:
+            case VBOXDRVINST_UNINSTALL_OPT_MODEL:
                 DUP_ARG_TO_STR(pszModel);
                 break;
 
-            case VBOXDRVINST_INSTALL_OPT_PNPID:
+            case VBOXDRVINST_UNINSTALL_OPT_PNPID:
                 DUP_ARG_TO_STR(pszPnpId);
                 break;
 
-            case VBOXDRVINST_INSTALL_OPT_NOT_SILENT:
+            case VBOXDRVINST_UNINSTALL_OPT_NOT_SILENT:
                 fInstall &= ~VBOX_WIN_DRIVERINSTALL_F_SILENT;
                 break;