Changeset 25166 in vbox for trunk/src

Timestamp:

Dec 3, 2009 1:35:13 PM (15 years ago)

Author:

vboxsync

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

55595

Message:

VBoxService: Removed default parameter, cosmetics.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService-win.cpp (modified) (13 diffs)
• VBoxServiceInternal.h (modified) (1 diff)

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

@@ -44 +44 @@
 };
 
+
 /**
  * @todo Format code style.
@@ -49 +50 @@
  * @todo Add event log capabilities / check return values.
  */
-DWORD VBoxServiceWinAddAceToObjectsSecurityDescriptor (LPTSTR pszObjName,
-                                                       SE_OBJECT_TYPE ObjectType,
-                                                       LPTSTR pszTrustee,
-                                                       TRUSTEE_FORM TrusteeForm,
-                                                       DWORD dwAccessRights,
-                                                       ACCESS_MODE AccessMode,
-                                                       DWORD dwInheritance)
+DWORD VBoxServiceWinAddAceToObjectsSecurityDescriptor(LPTSTR pszObjName,
+                                                      SE_OBJECT_TYPE ObjectType,
+                                                      LPTSTR pszTrustee,
+                                                      TRUSTEE_FORM TrusteeForm,
+                                                      DWORD dwAccessRights,
+                                                      ACCESS_MODE AccessMode,
+                                                      DWORD dwInheritance)
 {
     DWORD dwRes = 0;
@@ -115 +116 @@
 }
 
-BOOL VBoxServiceWinSetStatus (DWORD dwStatus, DWORD dwCheckPoint /*= 0 */)
+
+BOOL VBoxServiceWinSetStatus(DWORD dwStatus, DWORD dwCheckPoint)
 {
     if (NULL == g_hWinServiceStatus) /* Program could be in testing mode, so no service environment available. */
@@ -132 +134 @@
     ss.dwWaitHint                 = 3000;
 
-    return SetServiceStatus (g_hWinServiceStatus, &ss);
-}
-
-int VBoxServiceWinInstall ()
+    return SetServiceStatus(g_hWinServiceStatus, &ss);
+}
+
+
+int VBoxServiceWinInstall(void)
 {
     SC_HANDLE hService, hSCManager;
@@ -173 +176 @@
 }
 
-int VBoxServiceWinUninstall ()
+int VBoxServiceWinUninstall(void)
 {
     SC_HANDLE hService, hSCManager;
@@ -216 +219 @@
 }
 
-int VBoxServiceWinStart()
+
+int VBoxServiceWinStart(void)
 {
     int rc = VINF_SUCCESS;
@@ -260 +264 @@
            always starts in main thread (which causes the SCM to wait because of the non-responding
            service). */
-        VBoxServiceWinSetStatus (SERVICE_RUNNING);
+        VBoxServiceWinSetStatus (SERVICE_RUNNING, 0);
 
         /*
@@ -269 +273 @@
 
         if (RT_FAILURE(rc))
-            VBoxServiceWinSetStatus (SERVICE_STOPPED);
+            VBoxServiceWinSetStatus (SERVICE_STOPPED, 0);
     }
 
@@ -278 +282 @@
 }
 
+
 #ifdef TARGET_NT4
-VOID WINAPI VBoxServiceWinCtrlHandler (DWORD dwControl)
+VOID WINAPI VBoxServiceWinCtrlHandler(DWORD dwControl)
 #else
-DWORD WINAPI VBoxServiceWinCtrlHandler (DWORD dwControl,
-                                        DWORD dwEventType,
-                                        LPVOID lpEventData,
-                                        LPVOID lpContext)
+DWORD WINAPI VBoxServiceWinCtrlHandler(DWORD dwControl,
+                                       DWORD dwEventType,
+                                       LPVOID lpEventData,
+                                       LPVOID lpContext)
 #endif
 {
@@ -298 +303 @@
 
     case SERVICE_CONTROL_INTERROGATE:
-        VBoxServiceWinSetStatus(g_rcWinService);
+        VBoxServiceWinSetStatus(g_rcWinService, 0);
         break;
 
@@ -304 +309 @@
     case SERVICE_CONTROL_SHUTDOWN:
         {
-            VBoxServiceWinSetStatus(SERVICE_STOP_PENDING);
+            VBoxServiceWinSetStatus(SERVICE_STOP_PENDING, 0);
 
             rc = VBoxServiceStopServices();
 
-            VBoxServiceWinSetStatus(SERVICE_STOPPED);
+            VBoxServiceWinSetStatus(SERVICE_STOPPED, 0);
         }
         break;
@@ -342 +347 @@
 }
 
-void WINAPI VBoxServiceWinMain (DWORD argc, LPTSTR *argv)
+
+void WINAPI VBoxServiceWinMain(DWORD argc, LPTSTR *argv)
 {
     int rc = VINF_SUCCESS;
@@ -377 +383 @@
     }
 }
-

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

@@ -147 +147 @@
 extern int VBoxServiceWinUninstall(void);
 /** Reports our current status to the SCM. */
-extern BOOL VBoxServiceWinSetStatus (DWORD dwStatus, DWORD dwCheckPoint = 0);
+extern BOOL VBoxServiceWinSetStatus(DWORD dwStatus, DWORD dwCheckPoint);
 #ifdef VBOX_WITH_GUEST_PROPS
 /** Detects wheter a user is logged on based on the enumerated processes. */