Changeset 36338 in vbox

Timestamp:

Mar 22, 2011 10:57:01 AM (14 years ago)

Author:

vboxsync

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

70672

Message:

VBoxService: Also report terminated status when used by SCM, logging.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService-win.cpp (modified) (4 diffs)
• VBoxService.cpp (modified) (2 diffs)
• VBoxServiceInternal.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp

@@ -309 +309 @@
                                   &pBuiltinUsersSID))
     {
-        /**@todo r=bird: rc = RTErrConvertFromWin32(GetLastError()); ?*/
-        VBoxServiceError("AllocateAndInitializeSid: Error %u\n", GetLastError());
+        rc = RTErrConvertFromWin32(GetLastError());
     }
     else
@@ -352 +351 @@
         }
     }
-    /**@todo r=bird: else vboxServiceWinSetStatus(SERVICE_STOPPED, 0); ? */
+    else
+        vboxServiceWinSetStatus(SERVICE_STOPPED, 0);
 
     if (RT_FAILURE(rc))
@@ -390 +390 @@
     VBoxServiceVerbose(2, "Control handler: Control=%#x\n", dwControl);
 #else
-    VBoxServiceVerbose(2, "Control handler: Control=%#x EventType=%#x\n", dwControl, dwEventType);
+    VBoxServiceVerbose(2, "Control handler: Control=%#x, EventType=%#x\n", dwControl, dwEventType);
 #endif
 
@@ -407 +407 @@
             if (RT_FAILURE(rc2))
                 rcRet = ERROR_GEN_FAILURE;
+            else
+            {
+                rc2 = VBoxServiceReportStatus(VBoxGuestFacilityStatus_Terminated);
+                AssertRC(rc2);
+            }
 
             vboxServiceWinSetStatus(SERVICE_STOPPED, 0);

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

@@ -47 +47 @@
 #include <iprt/thread.h>
 
-#include <VBox/VBoxGuestLib.h>
 #include <VBox/log.h>
 
@@ -246 +245 @@
      */
     static VBoxGuestFacilityStatus s_enmLastStatus = VBoxGuestFacilityStatus_Inactive;
+    VBoxServiceVerbose(4, "Setting VBoxService status to %u\n", enmStatus);
     if (s_enmLastStatus != VBoxGuestFacilityStatus_Failed)
     {

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -27 +27 @@
 #include <iprt/list.h>
 #include <iprt/critsect.h>
+
+#include <VBox/VBoxGuestLib.h>
 
 /**
@@ -278 +280 @@
 extern int          VBoxServiceStopServices(void);
 extern void         VBoxServiceMainWait(void);
+extern int          VBoxServiceReportStatus(VBoxGuestFacilityStatus enmStatus);
 #ifdef RT_OS_WINDOWS
 extern RTEXITCODE   VBoxServiceWinInstall(void);