Changeset 107061 in vbox for trunk/src/VBox/GuestHost/installation

Timestamp:

Nov 20, 2024 4:09:39 PM (2 months ago)

Author:

vboxsync

Message:

Windows driver installation: Added VBOX_WIN_DRIVERINSTALL_F_NO_DESTROY and internal VBoxWinDrvInstTestXXX functions, required for testcase(s). bugref:10762

Location:

trunk/src/VBox/GuestHost/installation

Files:

• VBoxWinDrvInst.cpp (modified) (6 diffs)
• VBoxWinDrvInstInternal.h (added)

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

@@ -59 +59 @@
 
 #include "VBoxWinDrvCommon.h"
+#include "VBoxWinDrvInstInternal.h"
 
 
@@ -139 +140 @@
 DECL_HIDDEN_DATA(PFNSETUPUNINSTALLOEMINFW)               g_pfnSetupUninstallOEMInfW               = NULL; /* For XP+.  */
 DECL_HIDDEN_DATA(PFNSETUPSETNONINTERACTIVEMODE)          g_pfnSetupSetNonInteractiveMode          = NULL; /* For W2K+. */
-
-
-/**
- * Enumeration specifying the driver (un)installation mode.
- */
-typedef enum VBOXWINDRVINSTMODE
-{
-    /** Invalid mode; do not use. */
-    VBOXWINDRVINSTMODE_INVALID = 0,
-    /** Install a driver. */
-    VBOXWINDRVINSTMODE_INSTALL,
-    /** Install by executing an INF section. */
-    VBOXWINDRVINSTMODE_INSTALL_INFSECTION,
-    /** Uninstall a driver. */
-    VBOXWINDRVINSTMODE_UNINSTALL,
-    /** Uninstall by executing an INF section. */
-    VBOXWINDRVINSTMODE_UNINSTALL_INFSECTION
-} VBOXWINDRVINSTMODE;
-
-/**
- * Structure for keeping driver (un)installation parameters.
- */
-typedef struct VBOXWINDRVINSTPARMS
-{
-    /** Installation mode. */
-    VBOXWINDRVINSTMODE enmMode;
-    /** Installation flags of type VBOX_WIN_DRIVERINSTALL_F_XXX. */
-    uint32_t           fFlags;
-    /** INF file to use for (un)installation. */
-    PRTUTF16           pwszInfFile;
-    /** Union keeping specific parameters, depending on \a enmMode. */
-    union
-    {
-        struct
-        {
-            /** Model including decoration (e.g. "VBoxUSB.NTAMD64"); optional and might be NULL. */
-            PRTUTF16   pwszModel;
-            /** Hardware (Pnp) ID; optional and might be NULL. */
-            PRTUTF16   pwszPnpId;
-            /** Name of section to install. */
-            PRTUTF16   pwszSection;
-        } UnInstall;
-        struct
-        {
-            /** Section within in the INF file to execute. */
-            PRTUTF16   pwszSection;
-        } ExecuteInf;
-    } u;
-} VBOXWINDRVINSTPARMS;
-/** Pointer to driver installation parameters. */
-typedef VBOXWINDRVINSTPARMS *PVBOXWINDRVINSTPARMS;
 
 /**
@@ -1813 +1763 @@
     }
 
-    vboxWinDrvInstParmsDestroy(&pCtx->Parms);
+    if (!(fFlags & VBOX_WIN_DRIVERINSTALL_F_NO_DESTROY))
+        vboxWinDrvInstParmsDestroy(&pCtx->Parms);
 
     if (RT_FAILURE(rc))
@@ -1882 +1833 @@
         rc = vboxWinDrvInstMain(pCtx, &pCtx->Parms);
 
-    vboxWinDrvInstParmsDestroy(&pCtx->Parms);
+    if (!(fFlags & VBOX_WIN_DRIVERINSTALL_F_NO_DESTROY))
+        vboxWinDrvInstParmsDestroy(&pCtx->Parms);
 
     if (RT_FAILURE(rc))
@@ -1919 +1871 @@
     rc = vboxWinDrvInstMain(pCtx, &pCtx->Parms);
 
-    vboxWinDrvInstParmsDestroy(&pCtx->Parms);
+    if (!(fFlags & VBOX_WIN_DRIVERINSTALL_F_NO_DESTROY))
+        vboxWinDrvInstParmsDestroy(&pCtx->Parms);
 
     return rc;
@@ -1952 +1905 @@
 }
 
+#ifdef TESTCASE
+/**
+ * Returns the internal parameters of an (un)installation.
+ *
+ * @returns Internal parameters of an (un)installation.
+ * @param   hDrvInst            Windows driver installer handle to use.
+ */
+PVBOXWINDRVINSTPARMS VBoxWinDrvInstTestGetParms(VBOXWINDRVINST hDrvInst)
+{
+    PVBOXWINDRVINSTINTERNAL pCtx = hDrvInst;
+    VBOXWINDRVINST_VALID_RETURN_RC((hDrvInst), NULL);
+
+    return &pCtx->Parms;
+}
+
+/**
+ * Detroys internal parameters of an (un)installation.
+ *
+ * @param   pParms              Internal parameters of an (un)installation to destroy.
+ */
+void VBoxWinDrvInstTestParmsDestroy(PVBOXWINDRVINSTPARMS pParms)
+{
+    vboxWinDrvInstParmsDestroy(pParms);
+}
+#endif /* TESTCASE */
+