Changeset 108442 in vbox

Timestamp:

Mar 4, 2025 6:26:48 PM (2 months ago)

Author:

vboxsync

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

167816

Message:

Windows driver installation: Added VBOXWINDRVSVCFN_DELETE to make it possible to also delete a service. bugref:10762

Location:

trunk

Files:

• include/VBox/GuestHost/VBoxWinDrvInst.h (modified) (1 diff)
• src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp (modified) (2 diffs)

trunk/include/VBox/GuestHost/VBoxWinDrvInst.h

@@ -120 +120 @@
     /** Restart the service. */
     VBOXWINDRVSVCFN_RESTART,
+    /** Deletes a service. */
+    VBOXWINDRVSVCFN_DELETE,
     /** End marker, do not use. */
     VBOXWINDRVSVCFN_END

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

@@ -2429 +2429 @@
         }
 
+        case VBOXWINDRVSVCFN_DELETE:
+        {
+            if (!DeleteService(hSvc))
+                rc = vboxWinDrvInstLogLastError(pCtx, "Deleting service '%s' failed", pszService);
+            else
+            {
+                vboxWinDrvInstLogInfo(pCtx, "Successfully deleted service '%s'", pszService);
+                fFlags &= ~VBOXWINDRVSVCFN_F_WAIT; /* Drop the wait flag, makes no sense here. */
+            }
+            break;
+        }
+
         default:
             AssertFailedStmt(rc = VERR_NOT_SUPPORTED);
@@ -2434 +2446 @@
     }
 
-    if (   RT_SUCCESS(rc)
-        && (fFlags & VBOXWINDRVSVCFN_F_WAIT))
-    {
-        uint64_t const msStartTS = RTTimeMilliTS();
-
-        rc = VERR_NO_CHANGE; /* No change yet. */
-
-        if (!g_pfnQueryServiceStatusEx)
-        {
-            vboxWinDrvInstLogWarn(pCtx, "Waiting for status change of service '%s' not supported on this OS, skipping",
-                                  pszService);
-            rc = VINF_SUCCESS;
-        }
-        else
-        {
-            vboxWinDrvInstLogInfo(pCtx, "Waiting for status change of service '%s' (%ums timeout) ...", pszService, msTimeout);
-            for (;;)
+    if (RT_SUCCESS(rc))
+    {
+        if (fFlags & VBOXWINDRVSVCFN_F_WAIT)
+        {
+            uint64_t const msStartTS = RTTimeMilliTS();
+
+            rc = VERR_NO_CHANGE; /* No change yet. */
+
+            if (!g_pfnQueryServiceStatusEx)
             {
-                DWORD dwBytes;
-                if (!g_pfnQueryServiceStatusEx(hSvc,
-                                               SC_STATUS_PROCESS_INFO,
-                                               (LPBYTE)&enmSvcSts,
-                                               sizeof(SERVICE_STATUS_PROCESS),
-                                               &dwBytes))
+                vboxWinDrvInstLogWarn(pCtx, "Waiting for status change of service '%s' not supported on this OS, skipping",
+                                      pszService);
+                rc = VINF_SUCCESS;
+            }
+            else
+            {
+                vboxWinDrvInstLogInfo(pCtx, "Waiting for status change of service '%s' (%ums timeout) ...", pszService, msTimeout);
+                for (;;)
                 {
-                    rc = vboxWinDrvInstLogLastError(pCtx, "Failed to query service status");
-                    break;
-                }
-
-                if ((RTTimeMilliTS() - msStartTS) % RT_MS_1SEC == 0) /* Don't spam. */
-                    vboxWinDrvInstLogVerbose(pCtx, 3, "Service '%s' status is %#x: %u",
-                                             pszService, enmSvcSts.dwCurrentState, (RTTimeMilliTS() - msStartTS) % 100 == 0);
-
-                switch (enmSvcSts.dwCurrentState)
-                {
-                    case SERVICE_STOP_PENDING:
-                    case SERVICE_START_PENDING:
-                        RTThreadSleep(100); /* Wait a bit before retrying. */
-                        break;
-
-                    case SERVICE_RUNNING:
+                    DWORD dwBytes;
+                    if (!g_pfnQueryServiceStatusEx(hSvc,
+                                                   SC_STATUS_PROCESS_INFO,
+                                                   (LPBYTE)&enmSvcSts,
+                                                   sizeof(SERVICE_STATUS_PROCESS),
+                                                   &dwBytes))
                     {
-                        if (enmFn == VBOXWINDRVSVCFN_START)
-                            rc = VINF_SUCCESS;
+                        rc = vboxWinDrvInstLogLastError(pCtx, "Failed to query service status");
                         break;
                     }
 
-                    case SERVICE_STOPPED:
+                    if ((RTTimeMilliTS() - msStartTS) % RT_MS_1SEC == 0) /* Don't spam. */
+                        vboxWinDrvInstLogVerbose(pCtx, 3, "Service '%s' status is %#x: %u",
+                                                 pszService, enmSvcSts.dwCurrentState, (RTTimeMilliTS() - msStartTS) % 100 == 0);
+
+                    switch (enmSvcSts.dwCurrentState)
                     {
-                        if (enmFn == VBOXWINDRVSVCFN_START)
+                        case SERVICE_STOP_PENDING:
+                        case SERVICE_START_PENDING:
+                            RTThreadSleep(100); /* Wait a bit before retrying. */
+                            break;
+
+                        case SERVICE_RUNNING:
                         {
-                            vboxWinDrvInstLogError(pCtx, "Service '%s' stopped unexpectedly", pszService);
+                            if (enmFn == VBOXWINDRVSVCFN_START)
+                                rc = VINF_SUCCESS;
+                            break;
+                        }
+
+                        case SERVICE_STOPPED:
+                        {
+                            if (enmFn == VBOXWINDRVSVCFN_START)
+                            {
+                                vboxWinDrvInstLogError(pCtx, "Service '%s' stopped unexpectedly", pszService);
+                                rc = VERR_INVALID_STATE;
+                            }
+                            else
+                                rc = VINF_SUCCESS;
+                            break;
+                        }
+
+                        default:
+                        {
+                            vboxWinDrvInstLogError(pCtx, "Service '%s' reported an unexpected state (%#x)",
+                                                   pszService, enmSvcSts.dwCurrentState);
                             rc = VERR_INVALID_STATE;
                         }
-                        else
-                            rc = VINF_SUCCESS;
+                    }
+
+                    if (   RT_FAILURE(rc)
+                        && rc != VERR_NO_CHANGE)
+                        break;
+
+                    if (RT_SUCCESS(rc))
+                        break;
+
+                    if (RTTimeMilliTS() - msStartTS >= msTimeout)
+                    {
+                        vboxWinDrvInstLogError(pCtx, "Waiting for service '%s' timed out (%ums)", pszService, msTimeout);
+                        rc = VERR_TIMEOUT;
                         break;
                     }
-
-                    default:
-                    {
-                        vboxWinDrvInstLogError(pCtx, "Service '%s' reported an unexpected state (%#x)",
-                                               pszService, enmSvcSts.dwCurrentState);
-                        rc = VERR_INVALID_STATE;
-                    }
-                }
-
-                if (   RT_FAILURE(rc)
-                    && rc != VERR_NO_CHANGE)
-                    break;
-
-                if (RT_SUCCESS(rc))
-                    break;
-
-                if (RTTimeMilliTS() - msStartTS >= msTimeout)
-                {
-                    vboxWinDrvInstLogError(pCtx, "Waiting for service '%s' timed out (%ums)", pszService, msTimeout);
-                    rc = VERR_TIMEOUT;
-                    break;
                 }
             }
-        }
-
-        if (RT_SUCCESS(rc))
-            vboxWinDrvInstLogInfo(pCtx, "Service '%s' successfully %s",
-                                  pszService, enmFn == VBOXWINDRVSVCFN_START ? "started" : "stopped");
-    }
-    else
-        vboxWinDrvInstLogVerbose(pCtx, 1, "Service '%s' was %s asynchronously",
-                                 pszService, enmFn == VBOXWINDRVSVCFN_START ? "started" : "stopped");
+
+            if (RT_SUCCESS(rc))
+                vboxWinDrvInstLogInfo(pCtx, "Service '%s' successfully %s",
+                                      pszService, enmFn == VBOXWINDRVSVCFN_START ? "started" : "stopped");
+        }
+        else
+            vboxWinDrvInstLogVerbose(pCtx, 1, "Service '%s' was %s asynchronously",
+                                     pszService, enmFn == VBOXWINDRVSVCFN_START ? "started" : "stopped");
+    }
 
     RTUtf16Free(pwszService);