Changeset 107994 in vbox for trunk

Timestamp:

Jan 30, 2025 3:59:32 PM (3 months ago)

Author:

vboxsync

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

167257

Message:

Windows driver installation: Fixed vboxWinDrvInstControlServiceEx() naming and made a bit more clear how to use the timeout value + log it. bugref:10762

File:

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

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

@@ -2307 +2307 @@
  *                              VBOXWINDRVSVCFN_START + VBOXWINDRVSVCFN_STOP by the caller.
  * @param   fFlags              Service control flags (of type VBOXWINDRVSVCFN_F_XXX) to use.
- * @param   msTimeout           Timeout (in ms) to use. Only being used if VBOXWINDRVSVCFN_F_WAIT is specified in \a fFlags.
- */
-static int vbooxWinDrvInstControlServiceEx(PVBOXWINDRVINSTINTERNAL pCtx,
-                                           const char *pszService, VBOXWINDRVSVCFN enmFn, uint32_t fFlags, RTMSINTERVAL msTimeout)
+ * @param   msTimeout           Timeout (in ms) to use. Ignored if VBOXWINDRVSVCFN_F_WAIT is missing in \a fFlags.
+ */
+static int vboxWinDrvInstControlServiceEx(PVBOXWINDRVINSTINTERNAL pCtx,
+                                          const char *pszService, VBOXWINDRVSVCFN enmFn, uint32_t fFlags, RTMSINTERVAL msTimeout)
 {
     AssertPtrReturn(pszService, VERR_INVALID_POINTER);
     AssertReturn(!(fFlags & ~VBOXWINDRVSVCFN_F_VALID_MASK), VERR_INVALID_PARAMETER);
     AssertReturn(enmFn > VBOXWINDRVSVCFN_INVALID && enmFn < VBOXWINDRVSVCFN_END, VERR_INVALID_PARAMETER);
-    AssertReturn(msTimeout == RT_INDEFINITE_WAIT || msTimeout, VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & VBOXWINDRVSVCFN_F_WAIT) || msTimeout, VERR_INVALID_PARAMETER);
 
     PRTUTF16 pwszService;
@@ -2407 +2407 @@
         else
         {
-            vboxWinDrvInstLogInfo(pCtx, "Waiting for status change of service '%s' ...", pszService);
+            vboxWinDrvInstLogInfo(pCtx, "Waiting for status change of service '%s' (%ums timeout) ...", pszService, msTimeout);
             for (;;)
             {
@@ -2506 +2506 @@
 
 #define CONTROL_SERVICE(a_Fn) \
-    vbooxWinDrvInstControlServiceEx(pCtx, pszService, a_Fn, fFlags, msTimeout);
+    vboxWinDrvInstControlServiceEx(pCtx, pszService, a_Fn, fFlags, msTimeout);
 
     int rc;