Changeset 12723 in vbox for trunk/src

Timestamp:

Sep 25, 2008 12:10:33 PM (16 years ago)

Author:

vboxsync

Message:

VBoxService: Added some Assert(), fixed return value of service control handler, cosmetics.

Location:

trunk/src/VBox/Additions/WINNT/VBoxService

Files:

• VBoxService.cpp (modified) (18 diffs)
• VBoxService.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.cpp

@@ -137 +137 @@
     Log(("VBoxService: Starting services ...\n"));
 
+    Assert(pEnv);
     pEnv->hStopEvent = CreateEvent (NULL, TRUE, FALSE, NULL);
 
@@ -211 +212 @@
 {
     /* Signal to all threads. */
+    Assert(pEnv);
+    Assert(pTable);
     if (bAlert && (NULL != pEnv->hStopEvent))
     {
@@ -278 +281 @@
 
     /* Start service threads. */
-    /*gServiceEnv.hInstance = gInstance;
-    gServiceEnv.hDriver   = gVBoxDriver;*/
-
-    int rc = vboxStartServices (&gServiceEnv, vboxServiceTable);
+    int rc = vboxStartServices(&gServiceEnv, vboxServiceTable);
 
     /** @todo Add error handling. */
@@ -293 +293 @@
                                  LPVOID lpContext)
 {
+    DWORD rc = NO_ERROR;
+
     switch (dwControl)
     {
 
     case SERVICE_CONTROL_INTERROGATE:
-        SetStatus (gvboxServiceStatusCode);
+        SetStatus(gvboxServiceStatusCode);
         break;
 
@@ -303 +305 @@
     case SERVICE_CONTROL_SHUTDOWN:
         {
-            SetStatus (SERVICE_STOP_PENDING);
-
-            vboxStopServices (TRUE, &gServiceEnv, vboxServiceTable);
-
-            /*CloseHandle(gvboxDriver);*/
+            SetStatus(SERVICE_STOP_PENDING);
+
+            vboxStopServices(TRUE, &gServiceEnv, vboxServiceTable);
+
+            /* Don't close VBox driver here - the service might be
+             * started again. */
             CloseHandle(gStopSem);
 
-            SetStatus (SERVICE_STOPPED);
+            SetStatus(SERVICE_STOPPED);
         }
         break;
@@ -330 +333 @@
 
     default:
-        /** @todo r=bird: Andy, you should probably return ERROR_CALL_NOT_IMPLEMENTED here.
-         * Whoever omitted the DWORD return here and WINAPI bit here has been very sloppy :-| */
+
+        Log(("VBoxService: Service control function not implemented: %ld\n", dwControl));
+        rc = ERROR_CALL_NOT_IMPLEMENTED;
         break;
     }
-    return NO_ERROR;
+    return rc;
 }
 
@@ -355 +359 @@
             break;
         default:
-            writeLog("VBoxService: Could not register service control handle! Error: %d\n", dwErr);
+            writeLog("VBoxService: Could not register service control handle! Error: %ld\n", dwErr);
             break;
         }
@@ -363 +367 @@
         vboxServiceStart();
 
-        while( 1) {
-            Sleep( 100 );       /** @todo */
+        while (1) {
+            Sleep (100);       /** @todo */
         }
     }
@@ -387 +391 @@
                                 VBOXSERVICE_NAME, VBOXSERVICE_FRIENDLY_NAME,
                                 SERVICE_ALL_ACCESS,
-                                SERVICE_WIN32_OWN_PROCESS|SERVICE_INTERACTIVE_PROCESS,
+                                SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS,
                                 SERVICE_DEMAND_START,SERVICE_ERROR_NORMAL,
                                 imagePath, NULL, NULL, NULL, NULL, NULL);
@@ -393 +397 @@
     if (NULL == hService) {
         writeLog("VBoxService: Could not create service! Error: %d\n", GetLastError());
-        CloseServiceHandle (hSCManager);
+        CloseServiceHandle(hSCManager);
         return 1;
     }
@@ -401 +405 @@
     }
 
-    CloseServiceHandle (hService);
-    CloseServiceHandle (hSCManager);
+    CloseServiceHandle(hService);
+    CloseServiceHandle(hSCManager);
 
     return 0;
@@ -410 +414 @@
 {
     SC_HANDLE hService, hSCManager;
-    hSCManager = OpenSCManager (NULL,NULL,SC_MANAGER_ALL_ACCESS);
+    hSCManager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
 
     writeLog("VBoxService: Uninstalling service ...\n");
@@ -435 +439 @@
     else
     {
-        HKEY hKey;
-        if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Services\\EventLog\\System"), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS) {
-            RegDeleteKey (hKey, VBOXSERVICE_NAME);
-            RegCloseKey (hKey);
+        HKEY hKey = NULL;
+        if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Services\\EventLog\\System"), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS) {
+            RegDeleteKey(hKey, VBOXSERVICE_NAME);
+            RegCloseKey(hKey);
         }
 
@@ -444 +448 @@
     }
 
-    CloseServiceHandle (hService);
-    CloseServiceHandle (hSCManager);
+    CloseServiceHandle(hService);
+    CloseServiceHandle(hSCManager);
 
     return 0;
@@ -453 +457 @@
 {
     char szBuffer[1024] = { 0 };
+
+    Assert(a_pszText);
 
     va_list va;
@@ -466 +472 @@
 void printHelp (_TCHAR* a_pszName)
 {
+    Assert(a_pszName);
     _tprintf(_T("VBoxService - Guest Additions Helper Service for Windows XP/2K/Vista\n"));
     _tprintf(_T("Version: %d.%d.%d.%d\n\n"), VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV);
@@ -505 +512 @@
     static SERVICE_TABLE_ENTRY const s_serviceTable[]=
     {
-        { VBOXSERVICE_NAME, ServiceMain },
+        {VBOXSERVICE_NAME, ServiceMain},
         {NULL,NULL}
     };
@@ -527 +534 @@
 
         else {
-            _tprintf (_T("Invalid command line argument: %ws\n"), argv[1]);
-            _tprintf (_T("Type %s /h to display help.\n"), argv[0]);
+            _tprintf(_T("Invalid command line argument: %ws\n"), argv[1]);
+            _tprintf(_T("Type %s /h to display help.\n"), argv[0]);
         }
     }

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.h

@@ -24 +24 @@
 
 #include <iprt/alloc.h>
+#include <iprt/assert.h>
 #include <iprt/initterm.h>
 #include <iprt/string.h>