Changeset 58029 in vbox

Timestamp:

Oct 5, 2015 8:50:18 PM (9 years ago)

Author:

vboxsync

Message:

VBoxService: Using prefix 'VGSvc', code style/width cleanups. No real changes.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxService-os2.def (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxService-win.cpp (modified) (32 diffs)
• src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (59 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp (modified) (35 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp (modified) (19 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp (modified) (61 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (32 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControl.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (104 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (114 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp (modified) (29 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (42 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp (modified) (22 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp (modified) (29 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp (modified) (29 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp (modified) (79 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp (modified) (21 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (65 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (93 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.h (modified) (1 diff)

trunk/include/VBox/VBoxGuestLib.h

@@ -586 +586 @@
     uint32_t u32Root;
 } VBGLR3SHAREDFOLDERMAPPING;
-/** Pointer to a shared folder mapping information struct. */
+/** Pointer to a shared folder mapping information structure. */
 typedef VBGLR3SHAREDFOLDERMAPPING *PVBGLR3SHAREDFOLDERMAPPING;
+/** Pointer to a const shared folder mapping information structure. */
+typedef VBGLR3SHAREDFOLDERMAPPING const *PCVBGLR3SHAREDFOLDERMAPPING;
 
 VBGLR3DECL(int)     VbglR3SharedFolderConnect(uint32_t *pu32ClientId);

trunk/src/VBox/Additions/common/VBoxService/VBoxService-os2.def

@@ +1 @@
+; $Id$
 ;; @file
 ; VBoxService - OS/2 definition file.

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

@@ -34 +34 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static void WINAPI vboxServiceWinMain(DWORD argc, LPTSTR *argv);
+static void WINAPI vgsvcWinMain(DWORD argc, LPTSTR *argv);
 
 
@@ -47 +47 @@
 static SERVICE_TABLE_ENTRY const g_aServiceTable[] =
 {
-    { VBOXSERVICE_NAME, vboxServiceWinMain },
+    { VBOXSERVICE_NAME, vgsvcWinMain },
     { NULL,             NULL}
 };
@@ -57 +57 @@
  * @todo Add event log capabilities / check return values.
  */
-static DWORD vboxServiceWinAddAceToObjectsSecurityDescriptor(LPTSTR pszObjName,
+static DWORD vgsvcWinAddAceToObjectsSecurityDescriptor(LPTSTR pszObjName,
                                                              SE_OBJECT_TYPE ObjectType,
                                                              LPTSTR pszTrustee,
@@ -80 +80 @@
     {
         if (dwRes == ERROR_FILE_NOT_FOUND)
-            VBoxServiceError("AddAceToObjectsSecurityDescriptor: Object not found/installed: %s\n", pszObjName);
+            VGSvcError("AddAceToObjectsSecurityDescriptor: Object not found/installed: %s\n", pszObjName);
         else
-            VBoxServiceError("AddAceToObjectsSecurityDescriptor: GetNamedSecurityInfo: Error %u\n", dwRes);
+            VGSvcError("AddAceToObjectsSecurityDescriptor: GetNamedSecurityInfo: Error %u\n", dwRes);
         goto l_Cleanup;
     }
@@ -98 +98 @@
     if (ERROR_SUCCESS != dwRes)
     {
-        VBoxServiceError("AddAceToObjectsSecurityDescriptor: SetEntriesInAcl: Error %u\n", dwRes);
+        VGSvcError("AddAceToObjectsSecurityDescriptor: SetEntriesInAcl: Error %u\n", dwRes);
         goto l_Cleanup;
     }
@@ -108 +108 @@
     if (ERROR_SUCCESS != dwRes)
     {
-        VBoxServiceError("AddAceToObjectsSecurityDescriptor: SetNamedSecurityInfo: Error %u\n", dwRes);
+        VGSvcError("AddAceToObjectsSecurityDescriptor: SetNamedSecurityInfo: Error %u\n", dwRes);
         goto l_Cleanup;
     }
@@ -125 +125 @@
 
 /** Reports our current status to the SCM. */
-static BOOL vboxServiceWinSetStatus(DWORD dwStatus, DWORD dwCheckPoint)
+static BOOL vgsvcWinSetStatus(DWORD dwStatus, DWORD dwCheckPoint)
 {
     if (g_hWinServiceStatus == NULL) /* Program could be in testing mode, so no service environment available. */
         return FALSE;
 
-    VBoxServiceVerbose(2, "Setting service status to: %ld\n", dwStatus);
+    VGSvcVerbose(2, "Setting service status to: %ld\n", dwStatus);
     g_dwWinServiceLastStatus = dwStatus;
 
@@ -154 +154 @@
         }
         else
-            VBoxServiceError("Error determining OS version, rc=%Rrc\n", rc);
+            VGSvcError("Error determining OS version, rc=%Rrc\n", rc);
 #endif
     }
@@ -165 +165 @@
     BOOL fStatusSet = SetServiceStatus(g_hWinServiceStatus, &ss);
     if (!fStatusSet)
-        VBoxServiceError("Error reporting service status=%ld (controls=%x, checkpoint=%ld) to SCM: %ld\n",
+        VGSvcError("Error reporting service status=%ld (controls=%x, checkpoint=%ld) to SCM: %ld\n",
                          dwStatus, ss.dwControlsAccepted, dwCheckPoint, GetLastError());
     return fStatusSet;
@@ -176 +176 @@
  * @param   uCheckPoint         Some number.
  */
-void VBoxServiceWinSetStopPendingStatus(uint32_t uCheckPoint)
-{
-    vboxServiceWinSetStatus(SERVICE_STOP_PENDING, uCheckPoint);
-}
-
-
-static RTEXITCODE vboxServiceWinSetDesc(SC_HANDLE hService)
+void VGSvcWinSetStopPendingStatus(uint32_t uCheckPoint)
+{
+    vgsvcWinSetStatus(SERVICE_STOP_PENDING, uCheckPoint);
+}
+
+
+static RTEXITCODE vgsvcWinSetDesc(SC_HANDLE hService)
 {
 #ifndef TARGET_NT4
@@ -194 +194 @@
                               &desc))
     {
-        VBoxServiceError("Cannot set the service description! Error: %ld\n", GetLastError());
+        VGSvcError("Cannot set the service description! Error: %ld\n", GetLastError());
         return RTEXITCODE_FAILURE;
     }
@@ -205 +205 @@
  * Installs the service.
  */
-RTEXITCODE VBoxServiceWinInstall(void)
-{
-    VBoxServiceVerbose(1, "Installing service ...\n");
+RTEXITCODE VGSvcWinInstall(void)
+{
+    VGSvcVerbose(1, "Installing service ...\n");
 
     TCHAR imagePath[MAX_PATH] = { 0 };
@@ -215 +215 @@
     if (hSCManager == NULL)
     {
-        VBoxServiceError("Could not open SCM! Error: %ld\n", GetLastError());
+        VGSvcError("Could not open SCM! Error: %ld\n", GetLastError());
         return RTEXITCODE_FAILURE;
     }
@@ -227 +227 @@
                                         imagePath, NULL, NULL, NULL, NULL, NULL);
     if (hService != NULL)
-        VBoxServiceVerbose(0, "Service successfully installed!\n");
+        VGSvcVerbose(0, "Service successfully installed!\n");
     else
     {
@@ -234 +234 @@
         {
             case ERROR_SERVICE_EXISTS:
-                VBoxServiceVerbose(1, "Service already exists, just updating the service config.\n");
+                VGSvcVerbose(1, "Service already exists, just updating the service config.\n");
                 hService = OpenService(hSCManager, VBOXSERVICE_NAME, SERVICE_ALL_ACCESS);
                 if (hService)
@@ -249 +249 @@
                                              NULL,
                                              VBOXSERVICE_FRIENDLY_NAME))
-                        VBoxServiceVerbose(1, "The service config has been successfully updated.\n");
+                        VGSvcVerbose(1, "The service config has been successfully updated.\n");
                     else
-                        rc = VBoxServiceError("Could not change service config! Error: %ld\n", GetLastError());
+                        rc = VGSvcError("Could not change service config! Error: %ld\n", GetLastError());
                 }
                 else
-                    rc = VBoxServiceError("Could not open service! Error: %ld\n", GetLastError());
+                    rc = VGSvcError("Could not open service! Error: %ld\n", GetLastError());
                 break;
 
             default:
-                rc = VBoxServiceError("Could not create service! Error: %ld\n", dwErr);
+                rc = VGSvcError("Could not create service! Error: %ld\n", dwErr);
                 break;
         }
@@ -264 +264 @@
 
     if (rc == RTEXITCODE_SUCCESS)
-        rc = vboxServiceWinSetDesc(hService);
+        rc = vgsvcWinSetDesc(hService);
 
     CloseServiceHandle(hService);
@@ -274 +274 @@
  * Uninstalls the service.
  */
-RTEXITCODE VBoxServiceWinUninstall(void)
-{
-    VBoxServiceVerbose(1, "Uninstalling service ...\n");
+RTEXITCODE VGSvcWinUninstall(void)
+{
+    VGSvcVerbose(1, "Uninstalling service ...\n");
 
     SC_HANDLE hSCManager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
     if (hSCManager == NULL)
     {
-        VBoxServiceError("Could not open SCM! Error: %d\n", GetLastError());
+        VGSvcError("Could not open SCM! Error: %d\n", GetLastError());
         return RTEXITCODE_FAILURE;
     }
@@ -306 +306 @@
             }
 
-            VBoxServiceVerbose(0, "Service successfully uninstalled!\n");
+            VGSvcVerbose(0, "Service successfully uninstalled!\n");
             rcExit = RTEXITCODE_SUCCESS;
         }
         else
-            rcExit = VBoxServiceError("Could not remove service! Error: %d\n", GetLastError());
+            rcExit = VGSvcError("Could not remove service! Error: %d\n", GetLastError());
         CloseServiceHandle(hService);
     }
     else
-        rcExit = VBoxServiceError("Could not open service! Error: %d\n", GetLastError());
+        rcExit = VGSvcError("Could not open service! Error: %d\n", GetLastError());
     CloseServiceHandle(hSCManager);
 
@@ -321 +321 @@
 
 
-static int vboxServiceWinStart(void)
+static int vgsvcWinStart(void)
 {
     int rc = VINF_SUCCESS;
@@ -339 +339 @@
     else
     {
-        DWORD dwRes = vboxServiceWinAddAceToObjectsSecurityDescriptor(TEXT("\\\\.\\VBoxMiniRdrDN"),
+        DWORD dwRes = vgsvcWinAddAceToObjectsSecurityDescriptor(TEXT("\\\\.\\VBoxMiniRdrDN"),
                                                                       SE_FILE_OBJECT,
                                                                       (LPTSTR)pBuiltinUsersSID,
@@ -363 +363 @@
     if (RT_SUCCESS(rc))
     {
-        vboxServiceWinSetStatus(SERVICE_START_PENDING, 0);
-
-        rc = VBoxServiceStartServices();
+        vgsvcWinSetStatus(SERVICE_START_PENDING, 0);
+
+        rc = VGSvcStartServices();
         if (RT_SUCCESS(rc))
         {
-            vboxServiceWinSetStatus(SERVICE_RUNNING, 0);
-            VBoxServiceMainWait();
+            vgsvcWinSetStatus(SERVICE_RUNNING, 0);
+            VGSvcMainWait();
         }
         else
         {
-            vboxServiceWinSetStatus(SERVICE_STOPPED, 0);
+            vgsvcWinSetStatus(SERVICE_STOPPED, 0);
 #if 0 /** @todo r=bird: Enable this if SERVICE_CONTROL_STOP isn't triggered automatically */
-            VBoxServiceStopServices();
+            VGSvcStopServices();
 #endif
         }
     }
     else
-        vboxServiceWinSetStatus(SERVICE_STOPPED, 0);
+        vgsvcWinSetStatus(SERVICE_STOPPED, 0);
 
     if (RT_FAILURE(rc))
-        VBoxServiceError("Service failed to start with rc=%Rrc!\n", rc);
+        VGSvcError("Service failed to start with rc=%Rrc!\n", rc);
 
     return rc;
@@ -398 +398 @@
  *          Something else on failure, error will have been reported.
  */
-RTEXITCODE VBoxServiceWinEnterCtrlDispatcher(void)
+RTEXITCODE VGSvcWinEnterCtrlDispatcher(void)
 {
     if (!StartServiceCtrlDispatcher(&g_aServiceTable[0]))
-        return VBoxServiceError("StartServiceCtrlDispatcher: %u. Please start %s with option -f (foreground)!\n",
+        return VGSvcError("StartServiceCtrlDispatcher: %u. Please start %s with option -f (foreground)!\n",
                                 GetLastError(), g_pszProgName);
     return RTEXITCODE_SUCCESS;
@@ -408 +408 @@
 
 #ifndef TARGET_NT4
-static const char* vboxServiceWTSStateToString(DWORD dwEvent)
+static const char* vgsvcWTSStateToString(DWORD dwEvent)
 {
     switch (dwEvent)
@@ -455 +455 @@
 
 #ifdef TARGET_NT4
-static VOID WINAPI vboxServiceWinCtrlHandler(DWORD dwControl)
+static VOID WINAPI vgsvcWinCtrlHandler(DWORD dwControl)
 #else
-static DWORD WINAPI vboxServiceWinCtrlHandler(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext)
+static DWORD WINAPI vgsvcWinCtrlHandler(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext)
 #endif
 {
@@ -463 +463 @@
 
 #ifdef TARGET_NT4
-    VBoxServiceVerbose(2, "Control handler: Control=%#x\n", dwControl);
+    VGSvcVerbose(2, "Control handler: Control=%#x\n", dwControl);
 #else
-    VBoxServiceVerbose(2, "Control handler: Control=%#x, EventType=%#x\n", dwControl, dwEventType);
+    VGSvcVerbose(2, "Control handler: Control=%#x, EventType=%#x\n", dwControl, dwEventType);
 #endif
 
@@ -471 +471 @@
     {
         case SERVICE_CONTROL_INTERROGATE:
-            vboxServiceWinSetStatus(g_dwWinServiceLastStatus, 0);
+            vgsvcWinSetStatus(g_dwWinServiceLastStatus, 0);
             break;
 
@@ -477 +477 @@
         case SERVICE_CONTROL_SHUTDOWN:
         {
-            vboxServiceWinSetStatus(SERVICE_STOP_PENDING, 0);
-
-            int rc2 = VBoxServiceStopServices();
+            vgsvcWinSetStatus(SERVICE_STOP_PENDING, 0);
+
+            int rc2 = VGSvcStopServices();
             if (RT_FAILURE(rc2))
                 rcRet = ERROR_GEN_FAILURE;
             else
             {
-                rc2 = VBoxServiceReportStatus(VBoxGuestFacilityStatus_Terminated);
+                rc2 = VGSvcReportStatus(VBoxGuestFacilityStatus_Terminated);
                 AssertRC(rc2);
             }
 
-            vboxServiceWinSetStatus(SERVICE_STOPPED, 0);
+            vgsvcWinSetStatus(SERVICE_STOPPED, 0);
             break;
         }
@@ -499 +499 @@
             Assert(pNotify->cbSize == sizeof(WTSSESSION_NOTIFICATION));
 
-            VBoxServiceVerbose(1, "Control handler: %s (Session=%ld, Event=%#x)\n",
-                               vboxServiceWTSStateToString(dwEventType),
+            VGSvcVerbose(1, "Control handler: %s (Session=%ld, Event=%#x)\n",
+                               vgsvcWTSStateToString(dwEventType),
                                pNotify->dwSessionId, dwEventType);
 
             /* Handle all events, regardless of dwEventType. */
-            int rc2 = VBoxServiceVMInfoSignal();
+            int rc2 = VGSvcVMInfoSignal();
             AssertRC(rc2);
             break;
@@ -511 +511 @@
 
         default:
-            VBoxServiceVerbose(1, "Control handler: Function not implemented: %#x\n", dwControl);
+            VGSvcVerbose(1, "Control handler: Function not implemented: %#x\n", dwControl);
             rcRet = ERROR_CALL_NOT_IMPLEMENTED;
             break;
@@ -522 +522 @@
 
 
-static void WINAPI vboxServiceWinMain(DWORD argc, LPTSTR *argv)
-{
-    VBoxServiceVerbose(2, "Registering service control handler ...\n");
+static void WINAPI vgsvcWinMain(DWORD argc, LPTSTR *argv)
+{
+    VGSvcVerbose(2, "Registering service control handler ...\n");
 #ifdef TARGET_NT4
-    g_hWinServiceStatus = RegisterServiceCtrlHandler(VBOXSERVICE_NAME, vboxServiceWinCtrlHandler);
+    g_hWinServiceStatus = RegisterServiceCtrlHandler(VBOXSERVICE_NAME, vgsvcWinCtrlHandler);
 #else
-    g_hWinServiceStatus = RegisterServiceCtrlHandlerEx(VBOXSERVICE_NAME, vboxServiceWinCtrlHandler, NULL);
+    g_hWinServiceStatus = RegisterServiceCtrlHandlerEx(VBOXSERVICE_NAME, vgsvcWinCtrlHandler, NULL);
 #endif
     if (g_hWinServiceStatus != NULL)
     {
-        VBoxServiceVerbose(2, "Service control handler registered.\n");
-        vboxServiceWinStart();
+        VGSvcVerbose(2, "Service control handler registered.\n");
+        vgsvcWinStart();
     }
     else
@@ -541 +541 @@
         {
             case ERROR_INVALID_NAME:
-                VBoxServiceError("Invalid service name!\n");
+                VGSvcError("Invalid service name!\n");
                 break;
             case ERROR_SERVICE_DOES_NOT_EXIST:
-                VBoxServiceError("Service does not exist!\n");
+                VGSvcError("Service does not exist!\n");
                 break;
             default:
-                VBoxServiceError("Could not register service control handle! Error: %ld\n", dwErr);
+                VGSvcError("Could not register service control handle! Error: %ld\n", dwErr);
                 break;
         }

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

@@ -141 +141 @@
 };
 
-/* Default call-backs for services which do not need special behaviour. */
-
-/** @copydoc VBOXSERVICE::pfnPreInit */
-DECLCALLBACK(int) VBoxServiceDefaultPreInit(void)
+
+/*
+ * Default call-backs for services which do not need special behaviour.
+ */
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnPreInit, Default Implementation}
+ */
+DECLCALLBACK(int) VGSvcDefaultPreInit(void)
 {
     return VINF_SUCCESS;
 }
 
-/** @copydoc VBOXSERVICE::pfnOption */
-DECLCALLBACK(int) VBoxServiceDefaultOption(const char **ppszShort, int argc,
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnOption, Default Implementation}
+ */
+DECLCALLBACK(int) VGSvcDefaultOption(const char **ppszShort, int argc,
                                            char **argv, int *pi)
 {
@@ -161 +169 @@
 }
 
-/** @copydoc VBOXSERVICE::pfnInit */
-DECLCALLBACK(int) VBoxServiceDefaultInit(void)
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnInit, Default Implementation}
+ */
+DECLCALLBACK(int) VGSvcDefaultInit(void)
 {
     return VINF_SUCCESS;
 }
 
-/** @copydoc VBOXSERVICE::pfnTerm */
-DECLCALLBACK(void) VBoxServiceDefaultTerm(void)
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnTerm, Default Implementation}
+ */
+DECLCALLBACK(void) VGSvcDefaultTerm(void)
 {
     return;
 }
 
-/**
- * Release logger callback.
- *
- * @return  IPRT status code.
- * @param   pLoggerRelease
- * @param   enmPhase
- * @param   pfnLog
- */
-static DECLCALLBACK(void) VBoxServiceLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
+
+/**
+ * @callback_method_impl{FNRTLOGPHASE, Release logger callback}
+ */
+static DECLCALLBACK(void) vgsvcLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
 {
     /* Some introductory information. */
@@ -195 +205 @@
         {
             pfnLog(pLoggerRelease,
-                   "VBoxService %s r%s (verbosity: %d) %s (%s %s) release log\n"
+                   "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
                    "Log opened %s\n",
                    RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET,
@@ -209 +219 @@
             if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
                 pfnLog(pLoggerRelease, "OS Version: %s\n", szTmp);
+            vrc = RTSystemQueryOSInfo(RTSYSOSINFO_SERVICE_PACK, szTmp, sizeof(szTmp));
             if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
                 pfnLog(pLoggerRelease, "OS Service Pack: %s\n", szTmp);
@@ -242 +253 @@
 
         default:
-            /* nothing */;
+            /* nothing */
+            break;
     }
 }
@@ -249 +261 @@
 /**
  * Creates the default release logger outputting to the specified file.
- * Pass NULL for disabled logging.
+ *
+ * Pass NULL to disabled logging.
  *
  * @return  IPRT status code.
- * @param   pszLogFile              Filename for log output.  Optional.
- */
-int VBoxServiceLogCreate(const char *pszLogFile)
+ * @param   pszLogFile      Filename for log output.  NULL disables logging.
+ */
+int VGSvcLogCreate(const char *pszLogFile)
 {
     /* Create release logger (stdout + file). */
@@ -271 +284 @@
                            RT_ELEMENTS(s_apszGroups), s_apszGroups,
                            RTLOGDEST_STDOUT | RTLOGDEST_USER,
-                           VBoxServiceLogHeaderFooter, g_cHistory, g_uHistoryFileSize, g_uHistoryFileTime,
+                           vgsvcLogHeaderFooter, g_cHistory, g_uHistoryFileSize, g_uHistoryFileTime,
                            szError, sizeof(szError), pszLogFile);
     if (RT_SUCCESS(rc))
@@ -286 +299 @@
 
 
-void VBoxServiceLogDestroy(void)
+void VGSvcLogDestroy(void)
 {
     RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
@@ -297 +310 @@
  * @returns 1.
  */
-static int vboxServiceUsage(void)
+static int vgsvcUsage(void)
 {
     RTPrintf("Usage:\n"
@@ -349 +362 @@
  * @param   ...         Format arguments.
  */
-RTEXITCODE VBoxServiceError(const char *pszFormat, ...)
+RTEXITCODE VGSvcError(const char *pszFormat, ...)
 {
     va_list args;
@@ -373 +386 @@
  * @param   ...         Format arguments.
  */
-void VBoxServiceVerbose(unsigned iLevel, const char *pszFormat, ...)
+void VGSvcVerbose(unsigned iLevel, const char *pszFormat, ...)
 {
     if (iLevel <= g_cVerbosity)
@@ -408 +421 @@
  * @param   enmStatus               Status to report to the host.
  */
-int VBoxServiceReportStatus(VBoxGuestFacilityStatus enmStatus)
+int VGSvcReportStatus(VBoxGuestFacilityStatus enmStatus)
 {
     /*
@@ -414 +427 @@
      */
     static VBoxGuestFacilityStatus s_enmLastStatus = VBoxGuestFacilityStatus_Inactive;
-    VBoxServiceVerbose(4, "Setting VBoxService status to %u\n", enmStatus);
+    VGSvcVerbose(4, "Setting VBoxService status to %u\n", enmStatus);
     if (s_enmLastStatus != VBoxGuestFacilityStatus_Failed)
     {
@@ -421 +434 @@
         if (RT_FAILURE(rc))
         {
-            VBoxServiceError("Could not report VBoxService status (%u), rc=%Rrc\n", enmStatus, rc);
+            VGSvcError("Could not report VBoxService status (%u), rc=%Rrc\n", enmStatus, rc);
             return rc;
         }
@@ -432 +445 @@
 /**
  * Gets a 32-bit value argument.
- * @todo Get rid of this and VBoxServiceArgString() as soon as we have RTOpt handling.
+ * @todo Get rid of this and VGSvcArgString() as soon as we have RTOpt handling.
  *
  * @returns 0 on success, non-zero exit code on error.
@@ -443 +456 @@
  * @param   u32Max  The maximum value.
  */
-int VBoxServiceArgUInt32(int argc, char **argv, const char *psz, int *pi, uint32_t *pu32, uint32_t u32Min, uint32_t u32Max)
+int VGSvcArgUInt32(int argc, char **argv, const char *psz, int *pi, uint32_t *pu32, uint32_t u32Min, uint32_t u32Max)
 {
     if (*psz == ':' || *psz == '=')
@@ -464 +477 @@
 }
 
-/** @todo Get rid of this and VBoxServiceArgUInt32() as soon as we have RTOpt handling. */
-int VBoxServiceArgString(int argc, char **argv, const char *psz, int *pi, char *pszBuf, size_t cbBuf)
+
+/** @todo Get rid of this and VGSvcArgUInt32() as soon as we have RTOpt handling. */
+static int vgsvcArgString(int argc, char **argv, const char *psz, int *pi, char *pszBuf, size_t cbBuf)
 {
     AssertPtrReturn(pszBuf, VERR_INVALID_POINTER);
@@ -485 +499 @@
 
 
-
 /**
  * The service thread.
@@ -493 +506 @@
  * @param   pvUser          The service index.
  */
-static DECLCALLBACK(int) vboxServiceThread(RTTHREAD ThreadSelf, void *pvUser)
+static DECLCALLBACK(int) vgsvcThread(RTTHREAD ThreadSelf, void *pvUser)
 {
     const unsigned i = (uintptr_t)pvUser;
@@ -518 +531 @@
  * @returns VBox status code, error message displayed.
  */
-static RTEXITCODE vboxServiceLazyPreInit(void)
+static RTEXITCODE vgsvcLazyPreInit(void)
 {
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
@@ -525 +538 @@
             int rc = g_aServices[j].pDesc->pfnPreInit();
             if (RT_FAILURE(rc))
-                return VBoxServiceError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName, rc);
+                return VGSvcError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName, rc);
             g_aServices[j].fPreInited = true;
         }
@@ -535 +548 @@
  * Count the number of enabled services.
  */
-static unsigned vboxServiceCountEnabledServices(void)
+static unsigned vgsvcCountEnabledServices(void)
 {
     unsigned cEnabled = 0;
@@ -545 +558 @@
 
 #ifdef RT_OS_WINDOWS
-static BOOL WINAPI VBoxServiceConsoleControlHandler(DWORD dwCtrlType)
+/**
+ * Console control event callback.
+ *
+ * @returns TRUE if handled, FALSE if not.
+ * @param   dwCtrlType      The control event type.
+ *
+ * @remarks This is generally called on a new thread, so we're racing every
+ *          other thread in the process.
+ */
+static BOOL WINAPI vgsvcWinConsoleControlHandler(DWORD dwCtrlType)
 {
     int rc = VINF_SUCCESS;
@@ -556 +578 @@
         case CTRL_CLOSE_EVENT:
         case CTRL_C_EVENT:
-            VBoxServiceVerbose(2, "ControlHandler: Received break/close event\n");
-            rc = VBoxServiceStopServices();
+            VGSvcVerbose(2, "ControlHandler: Received break/close event\n");
+            rc = VGSvcStopServices();
             fEventHandled = TRUE;
             break;
@@ -566 +588 @@
 
     if (RT_FAILURE(rc))
-        VBoxServiceError("ControlHandler: Event %ld handled with error rc=%Rrc\n",
+        VGSvcError("ControlHandler: Event %ld handled with error rc=%Rrc\n",
                          dwCtrlType, rc);
     return fEventHandled;
@@ -577 +599 @@
  *
  * @returns VBox status code, errors are fully bitched.
- */
-int VBoxServiceStartServices(void)
+ *
+ * @remarks Also called from VBoxService-win.cpp, thus not static.
+ */
+int VGSvcStartServices(void)
 {
     int rc;
 
-    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Init);
+    VGSvcReportStatus(VBoxGuestFacilityStatus_Init);
 
     /*
      * Initialize the services.
      */
-    VBoxServiceVerbose(2, "Initializing services ...\n");
+    VGSvcVerbose(2, "Initializing services ...\n");
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
         if (g_aServices[j].fEnabled)
@@ -596 +620 @@
                 if (rc != VERR_SERVICE_DISABLED)
                 {
-                    VBoxServiceError("Service '%s' failed to initialize: %Rrc\n",
+                    VGSvcError("Service '%s' failed to initialize: %Rrc\n",
                                      g_aServices[j].pDesc->pszName, rc);
-                    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Failed);
+                    VGSvcReportStatus(VBoxGuestFacilityStatus_Failed);
                     return rc;
                 }
                 g_aServices[j].fEnabled = false;
-                VBoxServiceVerbose(0, "Service '%s' was disabled because of missing functionality\n",
-                                   g_aServices[j].pDesc->pszName);
+                VGSvcVerbose(0, "Service '%s' was disabled because of missing functionality\n", g_aServices[j].pDesc->pszName);
 
             }
@@ -611 +634 @@
      * Start the service(s).
      */
-    VBoxServiceVerbose(2, "Starting services ...\n");
+    VGSvcVerbose(2, "Starting services ...\n");
     rc = VINF_SUCCESS;
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
@@ -618 +641 @@
             continue;
 
-        VBoxServiceVerbose(2, "Starting service     '%s' ...\n", g_aServices[j].pDesc->pszName);
-        rc = RTThreadCreate(&g_aServices[j].Thread, vboxServiceThread, (void *)(uintptr_t)j, 0,
+        VGSvcVerbose(2, "Starting service     '%s' ...\n", g_aServices[j].pDesc->pszName);
+        rc = RTThreadCreate(&g_aServices[j].Thread, vgsvcThread, (void *)(uintptr_t)j, 0,
                             RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, g_aServices[j].pDesc->pszName);
         if (RT_FAILURE(rc))
         {
-            VBoxServiceError("RTThreadCreate failed, rc=%Rrc\n", rc);
+            VGSvcError("RTThreadCreate failed, rc=%Rrc\n", rc);
             break;
         }
@@ -642 +665 @@
         if (g_aServices[j].fShutdown)
         {
-            VBoxServiceError("Service '%s' failed to start!\n", g_aServices[j].pDesc->pszName);
+            VGSvcError("Service '%s' failed to start!\n", g_aServices[j].pDesc->pszName);
             rc = VERR_GENERAL_FAILURE;
         }
@@ -648 +671 @@
 
     if (RT_SUCCESS(rc))
-        VBoxServiceVerbose(1, "All services started.\n");
+        VGSvcVerbose(1, "All services started.\n");
     else
     {
-        VBoxServiceError("An error occcurred while the services!\n");
-        VBoxServiceReportStatus(VBoxGuestFacilityStatus_Failed);
+        VGSvcError("An error occcurred while the services!\n");
+        VGSvcReportStatus(VBoxGuestFacilityStatus_Failed);
     }
     return rc;
@@ -663 +686 @@
  * This should be called even when VBoxServiceStartServices fails so it can
  * clean up anything that we succeeded in starting.
- */
-int VBoxServiceStopServices(void)
-{
-    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Terminating);
+ *
+ * @remarks Also called from VBoxService-win.cpp, thus not static.
+ */
+int VGSvcStopServices(void)
+{
+    VGSvcReportStatus(VBoxGuestFacilityStatus_Terminating);
 
     /*
@@ -680 +705 @@
         if (g_aServices[j].fStarted)
         {
-            VBoxServiceVerbose(3, "Calling stop function for service '%s' ...\n", g_aServices[j].pDesc->pszName);
+            VGSvcVerbose(3, "Calling stop function for service '%s' ...\n", g_aServices[j].pDesc->pszName);
             g_aServices[j].pDesc->pfnStop();
         }
 
-    VBoxServiceVerbose(3, "All stop functions for services called\n");
+    VGSvcVerbose(3, "All stop functions for services called\n");
 
     /*
@@ -696 +721 @@
         if (g_aServices[j].Thread != NIL_RTTHREAD)
         {
-            VBoxServiceVerbose(2, "Waiting for service '%s' to stop ...\n", g_aServices[j].pDesc->pszName);
+            VGSvcVerbose(2, "Waiting for service '%s' to stop ...\n", g_aServices[j].pDesc->pszName);
             int rc2 = VINF_SUCCESS;
             for (int i = 0; i < 30; i++) /* Wait 30 seconds in total */
@@ -705 +730 @@
 #ifdef RT_OS_WINDOWS
                 /* Notify SCM that it takes a bit longer ... */
-                VBoxServiceWinSetStopPendingStatus(i + j*32);
+                VGSvcWinSetStopPendingStatus(i + j*32);
 #endif
             }
             if (RT_FAILURE(rc2))
             {
-                VBoxServiceError("Service '%s' failed to stop. (%Rrc)\n", g_aServices[j].pDesc->pszName, rc2);
+                VGSvcError("Service '%s' failed to stop. (%Rrc)\n", g_aServices[j].pDesc->pszName, rc2);
                 rc = rc2;
             }
         }
-        VBoxServiceVerbose(3, "Terminating service '%s' (%d) ...\n", g_aServices[j].pDesc->pszName, j);
+        VGSvcVerbose(3, "Terminating service '%s' (%d) ...\n", g_aServices[j].pDesc->pszName, j);
         g_aServices[j].pDesc->pfnTerm();
     }
@@ -726 +751 @@
     if (g_hEvtWindowsService != NIL_RTSEMEVENT)
     {
-        VBoxServiceVerbose(3, "Stopping the main thread...\n");
+        VGSvcVerbose(3, "Stopping the main thread...\n");
         int rc2 = RTSemEventSignal(g_hEvtWindowsService);
         AssertRC(rc2);
@@ -732 +757 @@
 #endif
 
-    VBoxServiceVerbose(2, "Stopping services returning: %Rrc\n", rc);
-    VBoxServiceReportStatus(RT_SUCCESS(rc) ? VBoxGuestFacilityStatus_Paused : VBoxGuestFacilityStatus_Failed);
+    VGSvcVerbose(2, "Stopping services returning: %Rrc\n", rc);
+    VGSvcReportStatus(RT_SUCCESS(rc) ? VBoxGuestFacilityStatus_Paused : VBoxGuestFacilityStatus_Failed);
     return rc;
 }
@@ -740 +765 @@
 /**
  * Block the main thread until the service shuts down.
- */
-void VBoxServiceMainWait(void)
+ *
+ * @remarks Also called from VBoxService-win.cpp, thus not static.
+ */
+void VGSvcMainWait(void)
 {
     int rc;
 
-    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Active);
+    VGSvcReportStatus(VBoxGuestFacilityStatus_Active);
 
 #ifdef RT_OS_WINDOWS
@@ -751 +778 @@
      * Wait for the semaphore to be signalled.
      */
-    VBoxServiceVerbose(1, "Waiting in main thread\n");
+    VGSvcVerbose(1, "Waiting in main thread\n");
     rc = RTSemEventCreate(&g_hEvtWindowsService);
     AssertRC(rc);
@@ -790 +817 @@
           );
 
-    VBoxServiceVerbose(3, "VBoxServiceMainWait: Received signal %d (rc=%d)\n", iSignal, rc);
+    VGSvcVerbose(3, "VBoxServiceMainWait: Received signal %d (rc=%d)\n", iSignal, rc);
 #endif /* !RT_OS_WINDOWS */
 }
@@ -818 +845 @@
      * global mutex restrictions.
      */
-    if (VBoxServiceToolboxMain(argc, argv, &rcExit))
+    if (VGSvcToolboxMain(argc, argv, &rcExit))
         return rcExit;
 #endif
@@ -843 +870 @@
     else
         rc = VbglR3Init();
-
     if (RT_FAILURE(rc))
     {
@@ -855 +881 @@
     /*
      * Check if we're the specially spawned VBoxService.exe process that
-     * handles page fusion.  This saves an extra executable.
+     * handles page fusion.  This saves an extra statically linked executable.
      */
     if (   argc == 2
         && !RTStrICmp(argv[1], "pagefusion"))
-        return VBoxServicePageSharingWorkerChild();
+        return VGSvcPageSharingWorkerChild();
 #endif
 
@@ -868 +894 @@
      */
     if (fUserSession)
-        return VBoxServiceControlSessionSpawnInit(argc, argv);
+        return VGSvcGstCtrlSessionSpawnInit(argc, argv);
 #endif
 
@@ -941 +967 @@
                 if (!fFound)
                 {
-                    rcExit = vboxServiceLazyPreInit();
+                    rcExit = vgsvcLazyPreInit();
                     if (rcExit != RTEXITCODE_SUCCESS)
                         return rcExit;
@@ -967 +993 @@
             {
                 case 'i':
-                    rc = VBoxServiceArgUInt32(argc, argv, psz + 1, &i,
+                    rc = VGSvcArgUInt32(argc, argv, psz + 1, &i,
                                               &g_DefaultInterval, 1, (UINT32_MAX / 1000) - 1);
                     if (rc)
@@ -988 +1014 @@
                 case 'h':
                 case '?':
-                    return vboxServiceUsage();
+                    return vgsvcUsage();
 
 #ifdef RT_OS_WINDOWS
                 case 'r':
-                    return VBoxServiceWinInstall();
+                    return VGSvcWinInstall();
 
                 case 'u':
-                    return VBoxServiceWinUninstall();
+                    return VGSvcWinUninstall();
 #endif
 
                 case 'l':
                 {
-                    rc = VBoxServiceArgString(argc, argv, psz + 1, &i,
+                    rc = vgsvcArgString(argc, argv, psz + 1, &i,
                                               g_szLogFile, sizeof(g_szLogFile));
                     if (rc)
@@ -1010 +1036 @@
                 case 'p':
                 {
-                    rc = VBoxServiceArgString(argc, argv, psz + 1, &i,
+                    rc = vgsvcArgString(argc, argv, psz + 1, &i,
                                               g_szPidFile, sizeof(g_szPidFile));
                     if (rc)
@@ -1020 +1046 @@
                 default:
                 {
-                    rcExit = vboxServiceLazyPreInit();
+                    rcExit = vgsvcLazyPreInit();
                     if (rcExit != RTEXITCODE_SUCCESS)
                         return rcExit;
@@ -1043 +1069 @@
 
     /* Check that at least one service is enabled. */
-    if (vboxServiceCountEnabledServices() == 0)
+    if (vgsvcCountEnabledServices() == 0)
         return RTMsgErrorExit(RTEXITCODE_SYNTAX, "At least one service must be enabled\n");
 
-    rc = VBoxServiceLogCreate(strlen(g_szLogFile) ? g_szLogFile : NULL);
+    rc = VGSvcLogCreate(g_szLogFile[0] ? g_szLogFile : NULL);
     if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to create release log \"%s\", rc=%Rrc\n",
-                              strlen(g_szLogFile) ? g_szLogFile : "<None>", rc);
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to create release log '%s', rc=%Rrc\n",
+                              g_szLogFile[0] ? g_szLogFile : "<None>", rc);
 
     /* Call pre-init if we didn't do it already. */
-    rcExit = vboxServiceLazyPreInit();
+    rcExit = vgsvcLazyPreInit();
     if (rcExit != RTEXITCODE_SUCCESS)
         return rcExit;
@@ -1084 +1110 @@
             || dwErr == ERROR_ACCESS_DENIED)
         {
-            VBoxServiceError("%s is already running! Terminating.\n", g_pszProgName);
+            VGSvcError("%s is already running! Terminating.\n", g_pszProgName);
             return RTEXITCODE_FAILURE;
         }
 
-        VBoxServiceError("CreateMutex failed with last error %u! Terminating.\n", GetLastError());
+        VGSvcError("CreateMutex failed with last error %u! Terminating.\n", GetLastError());
         return RTEXITCODE_FAILURE;
     }
@@ -1096 +1122 @@
 #endif /* !RT_OS_WINDOWS */
 
-    VBoxServiceVerbose(0, "%s r%s started. Verbose level = %d\n",
-                       RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity);
+    VGSvcVerbose(0, "%s r%s started. Verbose level = %d\n", RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity);
 
     /*
@@ -1105 +1130 @@
     {
 #ifdef RT_OS_WINDOWS
-        VBoxServiceVerbose(2, "Starting service dispatcher ...\n");
-        rcExit = VBoxServiceWinEnterCtrlDispatcher();
+        VGSvcVerbose(2, "Starting service dispatcher ...\n");
+        rcExit = VGSvcWinEnterCtrlDispatcher();
 #else
-        VBoxServiceVerbose(1, "Daemonizing...\n");
+        VGSvcVerbose(1, "Daemonizing...\n");
         rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */,
                              false /* fRespawn */, NULL /* pcRespawn */);
         if (RT_FAILURE(rc))
-            return VBoxServiceError("Daemon failed: %Rrc\n", rc);
+            return VGSvcError("Daemon failed: %Rrc\n", rc);
         /* in-child */
 #endif
@@ -1129 +1154 @@
          */
 #ifdef RT_OS_WINDOWS
-# ifndef RT_OS_NT4
+# ifndef RT_OS_NT4 /** @todo r=bird: What's RT_OS_NT4??? */
         /* Install console control handler. */
-        if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)VBoxServiceConsoleControlHandler, TRUE /* Add handler */))
-        {
-            VBoxServiceError("Unable to add console control handler, error=%ld\n", GetLastError());
+        if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)vgsvcWinConsoleControlHandler, TRUE /* Add handler */))
+        {
+            VGSvcError("Unable to add console control handler, error=%ld\n", GetLastError());
             /* Just skip this error, not critical. */
         }
 # endif /* !RT_OS_NT4 */
 #endif /* RT_OS_WINDOWS */
-        rc = VBoxServiceStartServices();
+        rc = VGSvcStartServices();
         RTFILE hPidFile = NIL_RTFILE;
         if (RT_SUCCESS(rc))
@@ -1145 +1170 @@
         rcExit = RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
         if (RT_SUCCESS(rc))
-            VBoxServiceMainWait();
+            VGSvcMainWait();
         if (g_szPidFile[0] && hPidFile != NIL_RTFILE)
             VbglR3ClosePidFile(g_szPidFile, hPidFile);
@@ -1153 +1178 @@
         if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)NULL, FALSE /* Remove handler */))
         {
-            VBoxServiceError("Unable to remove console control handler, error=%ld\n", GetLastError());
+            VGSvcError("Unable to remove console control handler, error=%ld\n", GetLastError());
             /* Just skip this error, not critical. */
         }
@@ -1161 +1186 @@
          * through the console control handler. So only do the stopping of services here on other platforms
          * where the break/shutdown/whatever signal was just received. */
-        VBoxServiceStopServices();
+        VGSvcStopServices();
 #endif /* RT_OS_WINDOWS */
     }
-    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Terminated);
+    VGSvcReportStatus(VBoxGuestFacilityStatus_Terminated);
 
 #ifdef RT_OS_WINDOWS
@@ -1173 +1198 @@
 #endif
 
-    VBoxServiceVerbose(0, "Ended.\n");
+    VGSvcVerbose(0, "Ended.\n");
 
 #ifdef DEBUG
@@ -1180 +1205 @@
 #endif
 
-    VBoxServiceLogDestroy();
+    VGSvcLogDestroy();
 
     return rcExit;

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxService - Auto-mounting for Shared Folders.
+ * VBoxService - Auto-mounting for Shared Folders, only Linux & Solaris atm.
  */
 
@@ -54 +54 @@
 
 #ifndef _PATH_MOUNTED
- #ifdef RT_OS_SOLARIS
-  #define _PATH_MOUNTED                          "/etc/mnttab"
- #else
-  #define _PATH_MOUNTED                          "/etc/mtab"
- #endif
+# ifdef RT_OS_SOLARIS
+#  define _PATH_MOUNTED                          "/etc/mnttab"
+# else
+#  define _PATH_MOUNTED                          "/etc/mtab"
+# endif
 #endif
 
@@ -71 +71 @@
 
 
-/** @copydoc VBOXSERVICE::pfnInit */
-static DECLCALLBACK(int) VBoxServiceAutoMountInit(void)
-{
-    VBoxServiceVerbose(3, "VBoxServiceAutoMountInit\n");
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vbsvcAutoMountInit(void)
+{
+    VGSvcVerbose(3, "vbsvcAutoMountInit\n");
 
     int rc = RTSemEventMultiCreate(&g_AutoMountEvent);
@@ -82 +84 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(3, "VBoxServiceAutoMountInit: Service Client ID: %#x\n", g_SharedFoldersSvcClientID);
+        VGSvcVerbose(3, "vbsvcAutoMountInit: Service Client ID: %#x\n", g_SharedFoldersSvcClientID);
     }
     else
@@ -90 +92 @@
         if (rc == VERR_HGCM_SERVICE_NOT_FOUND) /* Host service is not available. */
         {
-            VBoxServiceVerbose(0, "VBoxServiceAutoMountInit: Shared Folders service is not available\n");
+            VGSvcVerbose(0, "vbsvcAutoMountInit: Shared Folders service is not available\n");
             rc = VERR_SERVICE_DISABLED;
         }
         else
-            VBoxServiceError("Control: Failed to connect to the Shared Folders service! Error: %Rrc\n", rc);
+            VGSvcError("Control: Failed to connect to the Shared Folders service! Error: %Rrc\n", rc);
         RTSemEventMultiDestroy(g_AutoMountEvent);
         g_AutoMountEvent = NIL_RTSEMEVENTMULTI;
@@ -103 +105 @@
 
 
-/** @todo Integrate into RTFsQueryMountpoint().  */
-static bool VBoxServiceAutoMountShareIsMounted(const char *pszShare,
-                                               char *pszMountPoint, size_t cbMountPoint)
+/**
+ * @todo Integrate into RTFsQueryMountpoint()?
+ */
+static bool vbsvcAutoMountShareIsMounted(const char *pszShare, char *pszMountPoint, size_t cbMountPoint)
 {
     AssertPtrReturn(pszShare, VERR_INVALID_PARAMETER);
@@ -112 +115 @@
 
     bool fMounted = false;
-    /* @todo What to do if we have a relative path in mtab instead
+    /** @todo What to do if we have a relative path in mtab instead
      *       of an absolute one ("temp" vs. "/media/temp")?
      * procfs contains the full path but not the actual share name ...
@@ -119 +122 @@
     FILE *pFh = fopen(_PATH_MOUNTED, "r");
     if (!pFh)
-        VBoxServiceError("VBoxServiceAutoMountShareIsMounted: Could not open mount tab \"%s\"!\n",
-                         _PATH_MOUNTED);
+        VGSvcError("vbsvcAutoMountShareIsMounted: Could not open mount tab '%s'!\n", _PATH_MOUNTED);
     else
     {
@@ -136 +138 @@
     }
 #else
-    FILE *pFh = setmntent(_PATH_MOUNTED, "r+t");
+    FILE *pFh = setmntent(_PATH_MOUNTED, "r+t"); /** @todo r=bird: why open it for writing? (the '+') */
     if (pFh == NULL)
-        VBoxServiceError("VBoxServiceAutoMountShareIsMounted: Could not open mount tab \"%s\"!\n",
-                         _PATH_MOUNTED);
+        VGSvcError("vbsvcAutoMountShareIsMounted: Could not open mount tab '%s'!\n", _PATH_MOUNTED);
     else
     {
@@ -156 +157 @@
 #endif
 
-    VBoxServiceVerbose(4, "VBoxServiceAutoMountShareIsMounted: Share \"%s\" at mount point \"%s\" = %s\n",
+    VGSvcVerbose(4, "vbsvcAutoMountShareIsMounted: Share '%s' at mount point '%s' = %s\n",
                        pszShare, fMounted ? pszMountPoint : "<None>", fMounted ? "Yes" : "No");
     return fMounted;
@@ -162 +163 @@
 
 
-static int VBoxServiceAutoMountUnmount(const char *pszMountPoint)
+/**
+ * Unmounts a shared folder.
+ *
+ * @returns VBox status code
+ * @param   pszMountPoint   The shared folder mount point.
+ */
+static int vbsvcAutoMountUnmount(const char *pszMountPoint)
 {
     AssertPtrReturn(pszMountPoint, VERR_INVALID_PARAMETER);
@@ -174 +181 @@
         if (r == 0)
             break;
+/** @todo r=bird: Why do sleep 5 seconds after the final retry?
+ *  May also be a good idea to check for EINVAL or other signs that someone
+ *  else have already unmounted the share. */
         RTThreadSleep(5000); /* Wait a while ... */
     }
-    if (r == -1)
+    if (r == -1)  /** @todo r=bird: RTThreadSleep set errno.  */
         rc = RTErrConvertFromErrno(errno);
     return rc;
@@ -182 +192 @@
 
 
-static int VBoxServiceAutoMountPrepareMountPoint(const char *pszMountPoint, const char *pszShareName,
-                                                 vbsf_mount_opts *pOpts)
+/**
+ * Prepares a mount point (create it, set group and mode).
+ *
+ * @returns VBox status code
+ * @param   pszMountPoint   The mount point.
+ * @param   pszShareName    Unused.
+ * @param   pOpts           For getting the group ID.
+ */
+static int vbsvcAutoMountPrepareMountPoint(const char *pszMountPoint, const char *pszShareName, vbsf_mount_opts *pOpts)
 {
     AssertPtrReturn(pOpts, VERR_INVALID_PARAMETER);
@@ -201 +218 @@
                 if (rc == VERR_WRITE_PROTECT)
                 {
-                    VBoxServiceVerbose(3, "VBoxServiceAutoMountPrepareMountPoint: Mount directory \"%s\" already is used/mounted\n", pszMountPoint);
+                    VGSvcVerbose(3, "vbsvcAutoMountPrepareMountPoint: Mount directory '%s' already is used/mounted\n",
+                                       pszMountPoint);
                     rc = VINF_SUCCESS;
                 }
                 else
-                    VBoxServiceError("VBoxServiceAutoMountPrepareMountPoint: Could not set mode %RTfmode for mount directory \"%s\", rc = %Rrc\n",
+                    VGSvcError("vbsvcAutoMountPrepareMountPoint: Could not set mode %RTfmode for mount directory '%s', rc = %Rrc\n",
                                      fMode, pszMountPoint, rc);
             }
         }
         else
-            VBoxServiceError("VBoxServiceAutoMountPrepareMountPoint: Could not set permissions for mount directory \"%s\", rc = %Rrc\n",
+            VGSvcError("vbsvcAutoMountPrepareMountPoint: Could not set permissions for mount directory '%s', rc = %Rrc\n",
                              pszMountPoint, rc);
     }
     else
-        VBoxServiceError("VBoxServiceAutoMountPrepareMountPoint: Could not create mount directory \"%s\" with mode %RTfmode, rc = %Rrc\n",
+        VGSvcError("vbsvcAutoMountPrepareMountPoint: Could not create mount directory '%s' with mode %RTfmode, rc = %Rrc\n",
                          pszMountPoint, fMode, rc);
     return rc;
@@ -220 +238 @@
 
 
-static int VBoxServiceAutoMountSharedFolder(const char *pszShareName, const char *pszMountPoint,
-                                            vbsf_mount_opts *pOpts)
+/**
+ * Mounts a shared folder.
+ *
+ * @returns VBox status code reflecting unmount and mount point preparation
+ *          results, but not actual mounting
+ *
+ * @param   pszShareName    The shared folder name.
+ * @param   pszMountPoint   The mount point.
+ * @param   pOpts           The mount options.
+ */
+static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszMountPoint, struct vbsf_mount_opts *pOpts)
 {
     AssertPtr(pOpts);
 
     int rc = VINF_SUCCESS;
+    bool fSkip = false;
+
+    /* Already mounted? */
     char szAlreadyMountedTo[RTPATH_MAX];
-    bool fSkip = false;
-
-    /* Already mounted? */
-    if (VBoxServiceAutoMountShareIsMounted(pszShareName, szAlreadyMountedTo, sizeof(szAlreadyMountedTo)))
+    if (vbsvcAutoMountShareIsMounted(pszShareName, szAlreadyMountedTo, sizeof(szAlreadyMountedTo)))
     {
         fSkip = true;
@@ -236 +263 @@
         if (RTStrICmp(pszMountPoint, szAlreadyMountedTo))
         {
-            VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Shared folder \"%s\" already mounted to \"%s\", unmounting ...\n",
+            VGSvcVerbose(3, "vbsvcAutoMountWorker: Shared folder '%s' already mounted to '%s', unmounting ...\n",
                                pszShareName, szAlreadyMountedTo);
-            rc = VBoxServiceAutoMountUnmount(szAlreadyMountedTo);
-            if (RT_FAILURE(rc))
-                VBoxServiceError("VBoxServiceAutoMountWorker: Failed to unmount \"%s\", %s (%d)!\n",
-                                 szAlreadyMountedTo, strerror(errno), errno);
+            rc = vbsvcAutoMountUnmount(szAlreadyMountedTo);
+            if (RT_SUCCESS(rc))
+                fSkip = false;
             else
-                fSkip = false;
+                VGSvcError("vbsvcAutoMountWorker: Failed to unmount '%s', %s (%d)! (rc=%Rrc)\n",
+                                 szAlreadyMountedTo, strerror(errno), errno, rc); /** @todo errno isn't reliable at this point */
         }
         if (fSkip)
-            VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Shared folder \"%s\" already mounted to \"%s\", skipping\n",
+            VGSvcVerbose(3, "vbsvcAutoMountWorker: Shared folder '%s' already mounted to '%s', skipping\n",
                                pszShareName, szAlreadyMountedTo);
     }
 
     if (!fSkip && RT_SUCCESS(rc))
-        rc = VBoxServiceAutoMountPrepareMountPoint(pszMountPoint, pszShareName, pOpts);
+        rc = vbsvcAutoMountPrepareMountPoint(pszMountPoint, pszShareName, pOpts);
     if (!fSkip && RT_SUCCESS(rc))
     {
 #ifdef RT_OS_SOLARIS
-        char achOptBuf[MAX_MNTOPT_STR] = { '\0', };
-        int flags = 0;
+        char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
+        int fFlags = 0;
         if (pOpts->ronly)
-            flags |= MS_RDONLY;
-        RTStrPrintf(achOptBuf, sizeof(achOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
+            fFlags |= MS_RDONLY;
+        RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
                     pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask);
         int r = mount(pszShareName,
                       pszMountPoint,
-                      flags | MS_OPTIONSTR,
+                      fFlags | MS_OPTIONSTR,
                       "vboxfs",
                       NULL,                     /* char *dataptr */
                       0,                        /* int datalen */
-                      achOptBuf,
-                      sizeof(achOptBuf));
+                      szOptBuf,
+                      sizeof(szOptBuf));
         if (r == 0)
-        {
-            VBoxServiceVerbose(0, "VBoxServiceAutoMountWorker: Shared folder \"%s\" was mounted to \"%s\"\n", pszShareName, pszMountPoint);
-        }
-        else
-        {
-            if (errno != EBUSY) /* Share is already mounted? Then skip error msg. */
-                VBoxServiceError("VBoxServiceAutoMountWorker: Could not mount shared folder \"%s\" to \"%s\", error = %s\n",
-                                 pszShareName, pszMountPoint, strerror(errno));
-        }
-#else /* !RT_OS_SOLARIS */
-        unsigned long flags = MS_NODEV;
+            VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
+        else if (errno != EBUSY) /* Share is already mounted? Then skip error msg. */
+            VGSvcError("vbsvcAutoMountWorker: Could not mount shared folder '%s' to '%s', error = %s\n",
+                             pszShareName, pszMountPoint, strerror(errno));
+
+#elif defined(RT_OS_LINUX)
+        unsigned long fFlags = MS_NODEV;
 
         const char *szOptions = { "rw" };
@@ -305 +328 @@
                       pszMountPoint,
                       "vboxsf",
-                      flags,
+                      fFlags,
                       &mntinf);
         if (r == 0)
         {
-            VBoxServiceVerbose(0, "VBoxServiceAutoMountWorker: Shared folder \"%s\" was mounted to \"%s\"\n", pszShareName, pszMountPoint);
+            VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n",
+                               pszShareName, pszMountPoint);
 
             r = vbsfmount_complete(pszShareName, pszMountPoint, flags, pOpts);
@@ -319 +343 @@
 
                 case 1:
-                    VBoxServiceError("VBoxServiceAutoMountWorker: Could not update mount table (failed to create memstream): %s\n", strerror(errno));
+                    VGSvcError("vbsvcAutoMountWorker: Could not update mount table (failed to create memstream): %s\n",
+                                     strerror(errno));
                     break;
 
                 case 2:
-                    VBoxServiceError("VBoxServiceAutoMountWorker: Could not open mount table for update: %s\n", strerror(errno));
+                    VGSvcError("vbsvcAutoMountWorker: Could not open mount table for update: %s\n", strerror(errno));
                     break;
 
                 case 3:
-                    /* VBoxServiceError("VBoxServiceAutoMountWorker: Could not add an entry to the mount table: %s\n", strerror(errno)); */
+                    /* VGSvcError("vbsvcAutoMountWorker: Could not add an entry to the mount table: %s\n", strerror(errno)); */
                     errno = 0;
                     break;
 
                 default:
-                    VBoxServiceError("VBoxServiceAutoMountWorker: Unknown error while completing mount operation: %d\n", r);
+                    VGSvcError("vbsvcAutoMountWorker: Unknown error while completing mount operation: %d\n", r);
                     break;
             }
@@ -340 +365 @@
             if (errno == EPROTO)
             {
-                VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Messed up share name, re-trying ...\n");
+                VGSvcVerbose(3, "vbsvcAutoMountWorker: Messed up share name, re-trying ...\n");
+
+                /** @todo r=bird: What on earth is going on here?????  Why can't you
+                 *        strcpy(mntinf.name, pszShareName) to fix it again? */
 
                 /* Sometimes the mount utility messes up the share name.  Try to
                  * un-mangle it again. */
-                char szCWD[4096];
+                char szCWD[RTPATH_MAX];
                 size_t cchCWD;
                 if (!getcwd(szCWD, sizeof(szCWD)))
-                    VBoxServiceError("VBoxServiceAutoMountWorker: Failed to get the current working directory\n");
+                {
+                    VGSvcError("vbsvcAutoMountWorker: Failed to get the current working directory\n");
+                    szCWD[0] = '\0';
+                }
                 cchCWD = strlen(szCWD);
                 if (!strncmp(pszMountPoint, szCWD, cchCWD))
@@ -360 +391 @@
             if (errno == EPROTO)
             {
-                VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Re-trying with old mounting structure ...\n");
+                VGSvcVerbose(3, "vbsvcAutoMountWorker: Re-trying with old mounting structure ...\n");
 
                 /* New mount tool with old vboxsf module? Try again using the old
@@ -379 +410 @@
                      * mount point. */
                     case EINVAL:
-                        VBoxServiceVerbose(0, "VBoxServiceAutoMountWorker: Shared folder \"%s\" already is mounted!\n", pszShareName);
+                        VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' already is mounted!\n", pszShareName);
                         /* Ignore this error! */
                         break;
@@ -387 +418 @@
 
                     default:
-                        VBoxServiceError("VBoxServiceAutoMountWorker: Could not mount shared folder \"%s\" to \"%s\": %s (%d)\n",
+                        VGSvcError("vbsvcAutoMountWorker: Could not mount shared folder '%s' to '%s': %s (%d)\n",
                                          pszShareName, pszMountPoint, strerror(errno), errno);
                         rc = RTErrConvertFromErrno(errno);
@@ -394 +425 @@
             }
         }
-#endif /* !RT_OS_SOLARIS */
-    }
-    VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Mounting returned with rc=%Rrc\n", rc);
+#else
+# error "PORTME"
+#endif
+    }
+    VGSvcVerbose(3, "vbsvcAutoMountWorker: Mounting returned with rc=%Rrc\n", rc);
     return rc;
 }
 
-static int VBoxServiceAutoMountProcessMappings(PVBGLR3SHAREDFOLDERMAPPING paMappings, uint32_t cMappings,
-                                               const char *pszMountDir, const char *pszSharePrefix, uint32_t uClientID)
+
+/**
+ * Processes shared folder mappings retrieved from the host.
+ *
+ * @returns VBox status code.
+ * @param   paMappings      The mappings.
+ * @param   cMappings       The number of mappings.
+ * @param   pszMountDir     The mount directory.
+ * @param   pszSharePrefix  The share prefix.
+ * @param   uClientID       The shared folder service (HGCM) client ID.
+ */
+static int vbsvcAutoMountProcessMappings(PCVBGLR3SHAREDFOLDERMAPPING paMappings, uint32_t cMappings,
+                                         const char *pszMountDir, const char *pszSharePrefix, uint32_t uClientID)
 {
     if (cMappings == 0)
@@ -410 +454 @@
     AssertReturn(uClientID > 0, VERR_INVALID_PARAMETER);
 
+    /** @todo r=bird: Why is this loop schitzoid about status codes? It quits if
+     * RTPathJoin fails (i.e. if the user specifies a very long name), but happily
+     * continues if RTStrAPrintf failes (mem alloc).
+     *
+     * It also happily continues if the 'vboxsf' group is missing, which is a waste
+     * of effort... In fact, retrieving the group ID could probably be done up
+     * front, outside the loop. */
     int rc = VINF_SUCCESS;
     for (uint32_t i = 0; i < cMappings && RT_SUCCESS(rc); i++)
@@ -418 +469 @@
             && *pszShareName)
         {
-            VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Connecting share %u (%s) ...\n", i+1, pszShareName);
-
+            VGSvcVerbose(3, "vbsvcAutoMountWorker: Connecting share %u (%s) ...\n", i+1, pszShareName);
+
+            /** @todo r=bird: why do you copy things twice here and waste heap space?
+             * szMountPoint has a fixed size.
+             * @code
+             * char szMountPoint[RTPATH_MAX];
+             * rc = RTPathJoin(szMountPoint, sizeof(szMountPoint), pszMountDir, *pszSharePrefix ? pszSharePrefix : pszShareName);
+             * if (RT_SUCCESS(rc) && *pszSharePrefix)
+             *     rc = RTStrCat(szMountPoint, sizeof(szMountPoint), pszShareName);
+             * @endcode */
             char *pszShareNameFull = NULL;
             if (RTStrAPrintf(&pszShareNameFull, "%s%s", pszSharePrefix, pszShareName) > 0)
@@ -427 +486 @@
                 if (RT_SUCCESS(rc))
                 {
-                    VBoxServiceVerbose(4, "VBoxServiceAutoMountWorker: Processing mount point \"%s\"\n", szMountPoint);
+                    VGSvcVerbose(4, "vbsvcAutoMountWorker: Processing mount point '%s'\n", szMountPoint);
 
                     struct group *grp_vboxsf = getgrnam("vboxsf");
@@ -451 +510 @@
                         };
 
-                        rc = VBoxServiceAutoMountSharedFolder(pszShareName, szMountPoint, &mount_opts);
+                        rc = vbsvcAutoMountSharedFolder(pszShareName, szMountPoint, &mount_opts);
                     }
                     else
-                        VBoxServiceError("VBoxServiceAutoMountWorker: Group \"vboxsf\" does not exist\n");
+                        VGSvcError("vbsvcAutoMountWorker: Group 'vboxsf' does not exist\n");
                 }
                 else
-                    VBoxServiceError("VBoxServiceAutoMountWorker: Unable to join mount point/prefix/shrae, rc = %Rrc\n", rc);
+                    VGSvcError("vbsvcAutoMountWorker: Unable to join mount point/prefix/shrae, rc = %Rrc\n", rc);
                 RTStrFree(pszShareNameFull);
             }
             else
-                VBoxServiceError("VBoxServiceAutoMountWorker: Unable to allocate full share name\n");
+                VGSvcError("vbsvcAutoMountWorker: Unable to allocate full share name\n");
             RTStrFree(pszShareName);
         }
         else
-            VBoxServiceError("VBoxServiceAutoMountWorker: Error while getting the shared folder name for root node = %u, rc = %Rrc\n",
+            VGSvcError("vbsvcAutoMountWorker: Error while getting the shared folder name for root node = %u, rc = %Rrc\n",
                              paMappings[i].u32Root, rc);
     } /* for cMappings. */
@@ -472 +531 @@
 
 
-/** @copydoc VBOXSERVICE::pfnWorker */
-DECLCALLBACK(int) VBoxServiceAutoMountWorker(bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vbsvcAutoMountWorker(bool volatile *pfShutdown)
 {
     /*
@@ -494 +555 @@
         if (RT_SUCCESS(rc))
         {
-            VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Shared folder mount dir set to \"%s\"\n", pszMountDir);
+            VGSvcVerbose(3, "vbsvcAutoMountWorker: Shared folder mount dir set to '%s'\n", pszMountDir);
 
             char *pszSharePrefix;
@@ -500 +561 @@
             if (RT_SUCCESS(rc))
             {
-                VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Shared folder mount prefix set to \"%s\"\n", pszSharePrefix);
+                VGSvcVerbose(3, "vbsvcAutoMountWorker: Shared folder mount prefix set to '%s'\n", pszSharePrefix);
 #ifdef USE_VIRTUAL_SHARES
                 /* Check for a fixed/virtual auto-mount share. */
                 if (VbglR3SharedFolderExists(g_SharedFoldersSvcClientID, "vbsfAutoMount"))
                 {
-                    VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Host supports auto-mount root\n");
+                    VGSvcVerbose(3, "vbsvcAutoMountWorker: Host supports auto-mount root\n");
                 }
                 else
                 {
 #endif
-                    VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Got %u shared folder mappings\n", cMappings);
-                    rc = VBoxServiceAutoMountProcessMappings(paMappings, cMappings, pszMountDir, pszSharePrefix, g_SharedFoldersSvcClientID);
+                    VGSvcVerbose(3, "vbsvcAutoMountWorker: Got %u shared folder mappings\n", cMappings);
+                    rc = vbsvcAutoMountProcessMappings(paMappings, cMappings, pszMountDir, pszSharePrefix, g_SharedFoldersSvcClientID);
 #ifdef USE_VIRTUAL_SHARES
                 }
@@ -518 +579 @@
             } /* Mount share prefix. */
             else
-                VBoxServiceError("VBoxServiceAutoMountWorker: Error while getting the shared folder mount prefix, rc = %Rrc\n", rc);
+                VGSvcError("vbsvcAutoMountWorker: Error while getting the shared folder mount prefix, rc = %Rrc\n", rc);
             RTStrFree(pszMountDir);
         }
         else
-            VBoxServiceError("VBoxServiceAutoMountWorker: Error while getting the shared folder directory, rc = %Rrc\n", rc);
+            VGSvcError("vbsvcAutoMountWorker: Error while getting the shared folder directory, rc = %Rrc\n", rc);
         VbglR3SharedFolderFreeMappings(paMappings);
     }
     else if (RT_FAILURE(rc))
-        VBoxServiceError("VBoxServiceAutoMountWorker: Error while getting the shared folder mappings, rc = %Rrc\n", rc);
+        VGSvcError("vbsvcAutoMountWorker: Error while getting the shared folder mappings, rc = %Rrc\n", rc);
     else
-        VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: No shared folder mappings found\n");
+        VGSvcVerbose(3, "vbsvcAutoMountWorker: No shared folder mappings found\n");
 
     /*
@@ -534 +595 @@
      * the semantics of the main thread's start/stop sub-threads handling.
      *
-     * This thread exits so fast while doing its own startup in VBoxServiceStartServices()
-     * that this->fShutdown flag is set to true in VBoxServiceThread() before we have the
-     * chance to check for a service failure in VBoxServiceStartServices() to indicate
+     * This thread exits so fast while doing its own startup in VGSvcStartServices()
+     * that this->fShutdown flag is set to true in VGSvcThread() before we have the
+     * chance to check for a service failure in VGSvcStartServices() to indicate
      * a VBoxService startup error.
      *
@@ -555 +616 @@
     g_AutoMountEvent = NIL_RTSEMEVENTMULTI;
 
-    VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Finished with rc=%Rrc\n", rc);
+    VGSvcVerbose(3, "vbsvcAutoMountWorker: Finished with rc=%Rrc\n", rc);
     return VINF_SUCCESS;
 }
 
-/** @copydoc VBOXSERVICE::pfnTerm */
-static DECLCALLBACK(void) VBoxServiceAutoMountTerm(void)
-{
-    VBoxServiceVerbose(3, "VBoxServiceAutoMountTerm\n");
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(void) vbsvcAutoMountTerm(void)
+{
+    VGSvcVerbose(3, "vbsvcAutoMountTerm\n");
 
     VbglR3SharedFolderDisconnect(g_SharedFoldersSvcClientID);
@@ -576 +640 @@
 
 
-/** @copydoc VBOXSERVICE::pfnStop */
-static DECLCALLBACK(void) VBoxServiceAutoMountStop(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vbsvcAutoMountStop(void)
 {
     /*
@@ -603 +669 @@
     NULL,
     /* methods */
-    VBoxServiceDefaultPreInit,
-    VBoxServiceDefaultOption,
-    VBoxServiceAutoMountInit,
-    VBoxServiceAutoMountWorker,
-    VBoxServiceAutoMountStop,
-    VBoxServiceAutoMountTerm
+    VGSvcDefaultPreInit,
+    VGSvcDefaultOption,
+    vbsvcAutoMountInit,
+    vbsvcAutoMountWorker,
+    vbsvcAutoMountStop,
+    vbsvcAutoMountTerm
 };

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

@@ -60 +60 @@
  * Check whether madvise() works.
  */
-static void VBoxServiceBalloonInitMadvise(void)
+static void vgsvcBalloonInitMadvise(void)
 {
 #ifdef RT_OS_LINUX
@@ -77 +77 @@
  * and protect it against fork() in R0. See also suplibOsPageAlloc().
  */
-static void* VBoxServiceBalloonAllocChunk(void)
+static void *VGSvcBalloonAllocChunk(void)
 {
     size_t cb = VMMDEV_MEMORY_BALLOON_CHUNK_SIZE;
@@ -126 +126 @@
 
 /**
- * Free an allocated chunk undoing VBoxServiceBalloonAllocChunk().
- */
-static void VBoxServiceBalloonFreeChunk(void *pv)
+ * Free an allocated chunk undoing VGSvcBalloonAllocChunk().
+ */
+static void vgsvcBalloonFreeChunk(void *pv)
 {
     char *pu8 = (char*)pv;
@@ -159 +159 @@
  * @param   cNewChunks     The new number of 1MB chunks in the balloon.
  */
-static int VBoxServiceBalloonSetUser(uint32_t cNewChunks)
+static int vgsvcBalloonSetUser(uint32_t cNewChunks)
 {
     if (cNewChunks == g_cMemBalloonChunks)
         return VINF_SUCCESS;
 
-    VBoxServiceVerbose(3, "VBoxServiceBalloonSetUser: cNewChunks=%u g_cMemBalloonChunks=%u\n", cNewChunks, g_cMemBalloonChunks);
+    VGSvcVerbose(3, "VBoxServiceBalloonSetUser: cNewChunks=%u g_cMemBalloonChunks=%u\n", cNewChunks, g_cMemBalloonChunks);
     int rc = VINF_SUCCESS;
     if (cNewChunks > g_cMemBalloonChunks)
@@ -173 +173 @@
         for (i = g_cMemBalloonChunks; i < cNewChunks; i++)
         {
-            void *pv = VBoxServiceBalloonAllocChunk();
+            void *pv = VGSvcBalloonAllocChunk();
             if (!pv)
                 break;
@@ -193 +193 @@
             else
             {
-                VBoxServiceBalloonFreeChunk(pv);
+                vgsvcBalloonFreeChunk(pv);
                 break;
             }
         }
-        VBoxServiceVerbose(3, "VBoxServiceBalloonSetUser: inflation complete. chunks=%u rc=%d\n", i, rc);
+        VGSvcVerbose(3, "VBoxServiceBalloonSetUser: inflation complete. chunks=%u rc=%d\n", i, rc);
     }
     else
@@ -213 +213 @@
                 RTMemProtect(pv, VMMDEV_MEMORY_BALLOON_CHUNK_SIZE, RTMEM_PROT_READ | RTMEM_PROT_WRITE);
 #endif
-                VBoxServiceBalloonFreeChunk(pv);
+                vgsvcBalloonFreeChunk(pv);
                 g_pavBalloon[i] = NULL;
                 g_cMemBalloonChunks--;
@@ -219 +219 @@
             else
                 break;
-            VBoxServiceVerbose(3, "VBoxServiceBalloonSetUser: deflation complete. chunks=%u rc=%d\n", i, rc);
+            VGSvcVerbose(3, "VBoxServiceBalloonSetUser: deflation complete. chunks=%u rc=%d\n", i, rc);
         }
     }
@@ -227 +227 @@
 
 
-/** @copydoc VBOXSERVICE::pfnInit */
-static DECLCALLBACK(int) VBoxServiceBalloonInit(void)
-{
-    VBoxServiceVerbose(3, "VBoxServiceBalloonInit\n");
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vgsvcBalloonInit(void)
+{
+    VGSvcVerbose(3, "VBoxServiceBalloonInit\n");
 
     int rc = RTSemEventMultiCreate(&g_MemBalloonEvent);
     AssertRCReturn(rc, rc);
 
-    VBoxServiceBalloonInitMadvise();
+    vgsvcBalloonInitMadvise();
 
     g_cMemBalloonChunks = 0;
@@ -245 +247 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(3, "MemBalloon: New balloon size %d MB (%s memory)\n",
+        VGSvcVerbose(3, "MemBalloon: New balloon size %d MB (%s memory)\n",
                            cNewChunks, fHandleInR3 ? "R3" : "R0");
         if (fHandleInR3)
-            rc = VBoxServiceBalloonSetUser(cNewChunks);
+            rc = vgsvcBalloonSetUser(cNewChunks);
         else
             g_cMemBalloonChunks = cNewChunks;
@@ -263 +265 @@
             )
         {
-            VBoxServiceVerbose(0, "MemBalloon: Memory ballooning support is not available\n");
+            VGSvcVerbose(0, "MemBalloon: Memory ballooning support is not available\n");
             rc = VERR_SERVICE_DISABLED;
         }
         else
         {
-            VBoxServiceVerbose(3, "MemBalloon: VbglR3MemBalloonRefresh failed with %Rrc\n", rc);
+            VGSvcVerbose(3, "MemBalloon: VbglR3MemBalloonRefresh failed with %Rrc\n", rc);
             rc = VERR_SERVICE_DISABLED; /** @todo Playing safe for now, figure out the exact status codes here. */
         }
@@ -285 +287 @@
  * @param   cbPage          The page size.
  */
-uint32_t VBoxServiceBalloonQueryPages(uint32_t cbPage)
+uint32_t VGSvcBalloonQueryPages(uint32_t cbPage)
 {
     Assert(cbPage > 0);
@@ -292 +294 @@
 
 
-/** @copydoc VBOXSERVICE::pfnWorker */
-DECLCALLBACK(int) VBoxServiceBalloonWorker(bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vgsvcBalloonWorker(bool volatile *pfShutdown)
 {
     /* Start monitoring of the stat event change event. */
@@ -299 +303 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceVerbose(3, "VBoxServiceBalloonWorker: VbglR3CtlFilterMask failed with %Rrc\n", rc);
+        VGSvcVerbose(3, "VBoxServiceBalloonWorker: VbglR3CtlFilterMask failed with %Rrc\n", rc);
         return rc;
     }
@@ -326 +330 @@
             if (RT_SUCCESS(rc))
             {
-                VBoxServiceVerbose(3, "VBoxServiceBalloonWorker: new balloon size %d MB (%s memory)\n",
+                VGSvcVerbose(3, "VBoxServiceBalloonWorker: new balloon size %d MB (%s memory)\n",
                                    cNewChunks, fHandleInR3 ? "R3" : "R0");
                 if (fHandleInR3)
                 {
-                    rc = VBoxServiceBalloonSetUser(cNewChunks);
+                    rc = vgsvcBalloonSetUser(cNewChunks);
                     if (RT_FAILURE(rc))
                     {
-                        VBoxServiceVerbose(3, "VBoxServiceBalloonWorker: failed to set balloon size %d MB (%s memory)\n",
+                        VGSvcVerbose(3, "VBoxServiceBalloonWorker: failed to set balloon size %d MB (%s memory)\n",
                                     cNewChunks, fHandleInR3 ? "R3" : "R0");
                     }
                     else
-                        VBoxServiceVerbose(3, "VBoxServiceBalloonWorker: successfully set requested balloon size %d.\n", cNewChunks);
+                        VGSvcVerbose(3, "VBoxServiceBalloonWorker: successfully set requested balloon size %d.\n", cNewChunks);
                 }
                 else
@@ -343 +347 @@
             }
             else
-                VBoxServiceVerbose(3, "VBoxServiceBalloonWorker: VbglR3MemBalloonRefresh failed with %Rrc\n", rc);
+                VGSvcVerbose(3, "VBoxServiceBalloonWorker: VbglR3MemBalloonRefresh failed with %Rrc\n", rc);
         }
 
@@ -359 +363 @@
         if (rc2 != VERR_TIMEOUT && RT_FAILURE(rc2))
         {
-            VBoxServiceError("VBoxServiceBalloonWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
+            VGSvcError("VBoxServiceBalloonWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
             rc = rc2;
             break;
@@ -368 +372 @@
     rc = VbglR3CtlFilterMask(0, VMMDEV_EVENT_BALLOON_CHANGE_REQUEST);
     if (RT_FAILURE(rc))
-        VBoxServiceVerbose(3, "VBoxServiceBalloonWorker: VbglR3CtlFilterMask failed with %Rrc\n", rc);
+        VGSvcVerbose(3, "VBoxServiceBalloonWorker: VbglR3CtlFilterMask failed with %Rrc\n", rc);
 
     RTSemEventMultiDestroy(g_MemBalloonEvent);
     g_MemBalloonEvent = NIL_RTSEMEVENTMULTI;
 
-    VBoxServiceVerbose(3, "VBoxServiceBalloonWorker: finished mem balloon change request thread\n");
+    VGSvcVerbose(3, "VBoxServiceBalloonWorker: finished mem balloon change request thread\n");
     return 0;
 }
 
-/** @copydoc VBOXSERVICE::pfnStop */
-static DECLCALLBACK(void) VBoxServiceBalloonStop(void)
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vgsvcBalloonStop(void)
 {
     RTSemEventMultiSignal(g_MemBalloonEvent);
@@ -398 +405 @@
     NULL,
     /* methods */
-    VBoxServiceDefaultPreInit,
-    VBoxServiceDefaultOption,
-    VBoxServiceBalloonInit,
-    VBoxServiceBalloonWorker,
-    VBoxServiceBalloonStop,
-    VBoxServiceDefaultTerm
+    VGSvcDefaultPreInit,
+    VGSvcDefaultOption,
+    vgsvcBalloonInit,
+    vgsvcBalloonWorker,
+    vgsvcBalloonStop,
+    VGSvcDefaultTerm
 };

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp

@@ -124 +124 @@
 
 
-/** @copydoc VBOXSERVICE::pfnPreInit */
-static DECLCALLBACK(int) VBoxServiceClipboardOS2PreInit(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnPreInit}
+ */
+static DECLCALLBACK(int) vgsvcClipboardOs2PreInit(void)
 {
     return VINF_SUCCESS;
@@ -131 +133 @@
 
 
-/** @copydoc VBOXSERVICE::pfnOption */
-static DECLCALLBACK(int) VBoxServiceClipboardOS2Option(const char **ppszShort, int argc, char **argv, int *pi)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnOption}
+ */
+static DECLCALLBACK(int) vgsvcClipboardOs2Option(const char **ppszShort, int argc, char **argv, int *pi)
 {
     NOREF(ppszShort);
@@ -143 +147 @@
 
 
-/** @copydoc VBOXSERVICE::pfnInit */
-static DECLCALLBACK(int) VBoxServiceClipboardOS2Init(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vgsvcClipboardOs2Init(void)
 {
     int rc = VERR_GENERAL_FAILURE;
@@ -164 +170 @@
     if (g_habCtrl  == NULLHANDLE)
     {
-        VBoxServiceError("WinInitialize(0) failed, lasterr=%lx\n", WinGetLastError(NULLHANDLE));
+        VGSvcError("WinInitialize(0) failed, lasterr=%lx\n", WinGetLastError(NULLHANDLE));
         return VERR_GENERAL_FAILURE;
     }
@@ -184 +190 @@
              * Connect to the clipboard service.
              */
-            VBoxServiceVerbose(4, "clipboard: connecting\n");
+            VGSvcVerbose(4, "clipboard: connecting\n");
             rc = VbglR3ClipboardConnect(&g_u32ClientId);
             if (RT_SUCCESS(rc))
@@ -196 +202 @@
                     g_atomOdin32UnicodeText = WinFindAtom(WinQuerySystemAtomTable(), SZFMT_ODIN32_UNICODETEXT);
                 if (g_atomOdin32UnicodeText == 0)
-                    VBoxServiceError("WinAddAtom() failed, lasterr=%lx; WinFindAtom() failed, lasterror=%lx\n",
+                    VGSvcError("WinAddAtom() failed, lasterr=%lx; WinFindAtom() failed, lasterror=%lx\n",
                                      lLastError, WinGetLastError(g_habCtrl));
 
-                VBoxServiceVerbose(2, "g_u32ClientId=%RX32 g_atomNothingChanged=%#x g_atomOdin32UnicodeText=%#x\n",
+                VGSvcVerbose(2, "g_u32ClientId=%RX32 g_atomNothingChanged=%#x g_atomOdin32UnicodeText=%#x\n",
                                    g_u32ClientId, g_atomNothingChanged, g_atomOdin32UnicodeText);
                 return VINF_SUCCESS;
             }
 
-            VBoxServiceError("Failed to connect to the clipboard service, rc=%Rrc!\n", rc);
+            VGSvcError("Failed to connect to the clipboard service, rc=%Rrc!\n", rc);
         }
         else
-            VBoxServiceError("WinAddAtom() failed, lasterr=%lx; WinFindAtom() failed, lasterror=%lx\n",
+            VGSvcError("WinAddAtom() failed, lasterr=%lx; WinFindAtom() failed, lasterror=%lx\n",
                              lLastError, WinGetLastError(g_habCtrl));
     }
     else
-        VBoxServiceError("WinCreateMsgQueue(,0) failed, lasterr=%lx\n", WinGetLastError(g_habCtrl));
+        VGSvcError("WinCreateMsgQueue(,0) failed, lasterr=%lx\n", WinGetLastError(g_habCtrl));
     WinTerminate(g_habCtrl);
     return rc;
@@ -220 +226 @@
  * Check that we're still the view / try make us the viewer.
  */
-static void VBoxServiceClipboardOS2PollViewer(void)
+static void vgsvcClipboardOs2PollViewer(void)
 {
     const int iOrgState = g_enmState;
@@ -242 +248 @@
     {
         if (g_enmState == kClipboardState_Viewer)
-            VBoxServiceVerbose(3, "clipboard: viewer\n");
+            VGSvcVerbose(3, "clipboard: viewer\n");
         else
-            VBoxServiceVerbose(3, "clipboard: poller\n");
+            VGSvcVerbose(3, "clipboard: poller\n");
     }
 }
@@ -251 +257 @@
 /**
  * Advertise the formats available from the host.
- */
-static void VBoxServiceClipboardOS2AdvertiseHostFormats(uint32_t fFormats)
+ *
+ * @param   fFormats        The formats available on the host.
+ */
+static void vgsvcClipboardOs2AdvertiseHostFormats(uint32_t fFormats)
 {
     /*
@@ -282 +290 @@
                 {
                     if (!WinSetClipbrdData(g_habWorker, 0, CF_TEXT, CFI_POINTER))
-                        VBoxServiceError("WinSetClipbrdData(,,CF_TEXT,) failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+                        VGSvcError("WinSetClipbrdData(,,CF_TEXT,) failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
                     if (    g_atomOdin32UnicodeText
                         &&  !WinSetClipbrdData(g_habWorker, 0, g_atomOdin32UnicodeText, CFI_POINTER))
-                        VBoxServiceError("WinSetClipbrdData(,,g_atomOdin32UnicodeText,) failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+                        VGSvcError("WinSetClipbrdData(,,g_atomOdin32UnicodeText,) failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
                 }
                 if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
@@ -294 +302 @@
             else
             {
-                VBoxServiceError("WinSetClipbrdOwner failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+                VGSvcError("WinSetClipbrdOwner failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
                 g_enmState = kClipboardState_Polling;
             }
@@ -300 +308 @@
         else
         {
-            VBoxServiceError("WinEmptyClipbrd failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+            VGSvcError("WinEmptyClipbrd failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
             g_enmState = kClipboardState_Polling;
         }
@@ -307 +315 @@
         {
             g_fEmptyClipboard = true;
-            VBoxServiceClipboardOS2PollViewer();
+            vgsvcClipboardOs2PollViewer();
         }
 
@@ -313 +321 @@
     }
     else
-        VBoxServiceError("VBoxServiceClipboardOS2AdvertiseHostFormats: WinOpenClipbrd failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
-}
-
-
-static void *VBoxServiceClipboardOs2ConvertToOdin32(uint32_t fFormat, USHORT usFmt, void *pv, uint32_t cb)
+        VGSvcError("vgsvcClipboardOs2AdvertiseHostFormats: WinOpenClipbrd failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+}
+
+
+/**
+ * Converts (render) to an Odin32 clipboard format.
+ *
+ * We ASSUME we get windows data from the host and all we've got to do here is
+ * slapping an Odin32 header on it.
+ *
+ * @returns Pointer to the data (DosFreeMem).
+ * @param   fFormat             The host format.
+ * @param   usFmt               The PM/Odin32 format.
+ * @param   pv                  The data in host formatting.
+ * @param   cb                  The size of the data.
+ */
+static void *vgsvcClipboardOs2ConvertToOdin32(uint32_t fFormat, USHORT usFmt, void *pv, uint32_t cb)
 {
     PVOID pvPM = NULL;
@@ -334 +354 @@
     else
     {
-        VBoxServiceError("DosAllocSharedMem(,,%#x,,) -> %ld\n", cb + sizeof(CLIPHEADER), rc);
+        VGSvcError("DosAllocSharedMem(,,%#x,,) -> %ld\n", cb + sizeof(CLIPHEADER), rc);
         pvPM = NULL;
     }
@@ -341 +361 @@
 
 
-static void *VBoxServiceClipboardOs2ConvertToPM(uint32_t fFormat, USHORT usFmt, void *pv, uint32_t cb)
+/**
+ * Converts (render) to a PM clipboard format.
+ *
+ * @returns Pointer to the data (DosFreeMem).
+ * @param   fFormat             The host format.
+ * @param   usFmt               The PM/Odin32 format.
+ * @param   pv                  The data in host formatting.
+ * @param   cb                  The size of the data.
+ */
+static void *vgsvcClipboardOs2ConvertToPM(uint32_t fFormat, USHORT usFmt, void *pv, uint32_t cb)
 {
     void *pvPM = NULL;
@@ -354 +383 @@
             )
        )
-        pvPM = VBoxServiceClipboardOs2ConvertToOdin32(fFormat, usFmt, pv, cb);
+        pvPM = vgsvcClipboardOs2ConvertToOdin32(fFormat, usFmt, pv, cb);
     else if (usFmt == CF_TEXT)
     {
@@ -379 +408 @@
                 else
                 {
-                    VBoxServiceError("DosAllocSharedMem(,,%#x,,) -> %ld\n", cb + sizeof(CLIPHEADER), orc);
+                    VGSvcError("DosAllocSharedMem(,,%#x,,) -> %ld\n", cb + sizeof(CLIPHEADER), orc);
                     pvPM = NULL;
                 }
@@ -385 +414 @@
             }
             else
-                VBoxServiceError("RTStrUtf8ToCurrentCP() -> %Rrc\n", rc);
+                VGSvcError("RTStrUtf8ToCurrentCP() -> %Rrc\n", rc);
             RTStrFree(pszUtf8);
         }
         else
-            VBoxServiceError("RTUtf16ToUtf8() -> %Rrc\n", rc);
+            VGSvcError("RTUtf16ToUtf8() -> %Rrc\n", rc);
     }
 
@@ -404 +433 @@
  *          request send synchronously by someone who has already opened the
  *          clipboard. We would enter a deadlock trying to open it here.
- *
- */
-static void VBoxServiceClipboardOS2RenderFormat(USHORT usFmt)
+ */
+static void vgsvcClipboardOs2RenderFormat(USHORT usFmt)
 {
     bool fSucceeded = false;
@@ -431 +459 @@
         if (pv)
         {
-            VBoxServiceVerbose(4, "clipboard: reading host data (%#x)\n", fFormat);
+            VGSvcVerbose(4, "clipboard: reading host data (%#x)\n", fFormat);
             rc = VbglR3ClipboardReadData(g_u32ClientId, fFormat, pv, cb, &cb);
             if (rc == VINF_BUFFER_OVERFLOW)
@@ -445 +473 @@
         if (RT_SUCCESS(rc))
         {
-            VBoxServiceVerbose(4, "clipboard: read %u bytes\n", cb);
+            VGSvcVerbose(4, "clipboard: read %u bytes\n", cb);
 
             /*
              * Convert the host clipboard data to PM clipboard data and set it.
              */
-            PVOID pvPM = VBoxServiceClipboardOs2ConvertToPM(fFormat, usFmt, pv, cb);
+            PVOID pvPM = vgsvcClipboardOs2ConvertToPM(fFormat, usFmt, pv, cb);
             if (pvPM)
             {
@@ -457 +485 @@
                 else
                 {
-                    VBoxServiceError("VBoxServiceClipboardOS2RenderFormat: WinSetClipbrdData(,%p,%#x, CF_POINTER) failed, lasterror=%lx\n",
+                    VGSvcError("vgsvcClipboardOs2RenderFormat: WinSetClipbrdData(,%p,%#x, CF_POINTER) failed, lasterror=%lx\n",
                                      pvPM, usFmt, WinGetLastError(g_habWorker));
                     DosFreeMem(pvPM);
@@ -465 +493 @@
         }
         else
-            VBoxServiceError("VBoxServiceClipboardOS2RenderFormat: Failed to query / allocate data. rc=%Rrc cb=%#RX32\n", rc, cb);
+            VGSvcError("vgsvcClipboardOs2RenderFormat: Failed to query / allocate data. rc=%Rrc cb=%#RX32\n", rc, cb);
     }
 
@@ -478 +506 @@
         g_enmState = kClipboardState_Polling;
         g_fEmptyClipboard = true;
-        VBoxServiceClipboardOS2PollViewer();
-    }
-}
-
-
-static void VBoxServiceClipboardOS2SendDataToHost(uint32_t fFormat)
+        vgsvcClipboardOs2PollViewer();
+    }
+}
+
+
+/**
+ * Sends data to the host.
+ *
+ * @param   fFormat     The data format the host is requesting.
+ */
+static void vgsvcClipboardOs2SendDataToHost(uint32_t fFormat)
 {
     if (WinOpenClipbrd(g_habWorker))
@@ -523 +556 @@
         }
         if (!pv)
-            VBoxServiceError("VBoxServiceClipboardOS2SendDataToHost: couldn't find data for %#x\n", fFormat);
+            VGSvcError("vgsvcClipboardOs2SendDataToHost: couldn't find data for %#x\n", fFormat);
 
         /*
          * Now, sent whatever we've got to the host (it's waiting).
          */
-        VBoxServiceVerbose(4, "clipboard: writing %pv/%#d (fFormat=%#x)\n", pv, cb, fFormat);
+        VGSvcVerbose(4, "clipboard: writing %pv/%#d (fFormat=%#x)\n", pv, cb, fFormat);
         VbglR3ClipboardWriteData(g_u32ClientId, fFormat, pv, cb);
         RTUtf16Free(pwszFree);
@@ -536 +569 @@
     else
     {
-        VBoxServiceError("VBoxServiceClipboardOS2SendDataToHost: WinOpenClipbrd failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
-        VBoxServiceVerbose(4, "clipboard: writing NULL/0 (fFormat=%x)\n", fFormat);
+        VGSvcError("vgsvcClipboardOs2SendDataToHost: WinOpenClipbrd failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+        VGSvcVerbose(4, "clipboard: writing NULL/0 (fFormat=%x)\n", fFormat);
         VbglR3ClipboardWriteData(g_u32ClientId, fFormat, NULL, 0);
     }
@@ -546 +579 @@
  * Figure out what's on the clipboard and report it to the host.
  */
-static void VBoxServiceClipboardOS2ReportFormats(void)
+static void vgsvcClipboardOs2ReportFormats(void)
 {
     uint32_t fFormats = 0;
@@ -557 +590 @@
         /** @todo else bitmaps and stuff. */
     }
-    VBoxServiceVerbose(4, "clipboard: reporting fFormats=%#x\n", fFormats);
+    VGSvcVerbose(4, "clipboard: reporting fFormats=%#x\n", fFormats);
     VbglR3ClipboardReportFormats(g_u32ClientId, fFormats);
 }
@@ -569 +602 @@
  * notify the host.
  */
-static void VBoxServiceClipboardOS2Poll(void)
+static void vgsvcClipboardOs2Poll(void)
 {
     if (WinOpenClipbrd(g_habWorker))
@@ -583 +616 @@
             {
                 g_fEmptyClipboard = false;
-                VBoxServiceClipboardOS2ReportFormats();
+                vgsvcClipboardOs2ReportFormats();
 
                 /* inject the dummy */
@@ -591 +624 @@
                 {
                     if (WinSetClipbrdData(g_habWorker, (ULONG)pv, g_atomNothingChanged, CFI_POINTER))
-                        VBoxServiceVerbose(4, "clipboard: Added dummy item.\n");
+                        VGSvcVerbose(4, "clipboard: Added dummy item.\n");
                     else
                     {
-                        VBoxServiceError("VBoxServiceClipboardOS2Poll: WinSetClipbrdData failed, lasterr=%#lx\n", WinGetLastError(g_habWorker));
+                        VGSvcError("vgsvcClipboardOs2Poll: WinSetClipbrdData failed, lasterr=%#lx\n", WinGetLastError(g_habWorker));
                         DosFreeMem(pv);
                     }
                 }
                 else
-                    VBoxServiceError("VBoxServiceClipboardOS2Poll: DosAllocSharedMem(,,1,) -> %ld\n", rc);
+                    VGSvcError("vgsvcClipboardOs2Poll: DosAllocSharedMem(,,1,) -> %ld\n", rc);
             }
             else if (!g_fEmptyClipboard)
             {
                 g_fEmptyClipboard = true;
-                VBoxServiceVerbose(3, "Reporting empty clipboard\n");
+                VGSvcVerbose(3, "Reporting empty clipboard\n");
                 VbglR3ClipboardReportFormats(g_u32ClientId, 0);
             }
@@ -611 +644 @@
     }
     else
-        VBoxServiceError("VBoxServiceClipboardOS2Poll: WinOpenClipbrd failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+        VGSvcError("vgsvcClipboardOs2Poll: WinOpenClipbrd failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
 }
 
@@ -618 +651 @@
  * The clipboard we owned was destroyed by someone else.
  */
-static void VBoxServiceClipboardOS2Destroyed(void)
+static void vgsvcClipboardOs2Destroyed(void)
 {
     /* make sure we're no longer the owner. */
@@ -627 +660 @@
     g_enmState = kClipboardState_Polling;
     g_fEmptyClipboard = true;
-    VBoxServiceVerbose(3, "Reporting empty clipboard\n");
+    VGSvcVerbose(3, "Reporting empty clipboard\n");
     VbglR3ClipboardReportFormats(g_u32ClientId, 0);
 
-    VBoxServiceClipboardOS2PollViewer();
+    vgsvcClipboardOs2PollViewer();
 }
 
@@ -644 +677 @@
  * @param   mp2     Message parameter 2.
  */
-static MRESULT EXPENTRY VBoxServiceClipboardOS2WinProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+static MRESULT EXPENTRY vgsvcClipboardOs2WinProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     if (msg != WM_TIMER)
-        VBoxServiceVerbose(6, "VBoxServiceClipboardOS2WinProc: hwnd=%#lx msg=%#lx mp1=%#lx mp2=%#lx\n", hwnd, msg, mp1, mp2);
+        VGSvcVerbose(6, "vgsvcClipboardOs2WinProc: hwnd=%#lx msg=%#lx mp1=%#lx mp2=%#lx\n", hwnd, msg, mp1, mp2);
 
     switch (msg)
@@ -678 +711 @@
                 break;
             AssertMsgBreak(g_enmState == kClipboardState_Viewer, ("g_enmState=%d\n", g_enmState));
-            VBoxServiceClipboardOS2Poll();
+            vgsvcClipboardOs2Poll();
             break;
 
@@ -689 +722 @@
                 break; /* it's us doing the replacing, ignore. */
             AssertMsgBreak(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState));
-            VBoxServiceClipboardOS2Destroyed();
+            vgsvcClipboardOs2Destroyed();
             break;
 
@@ -698 +731 @@
         case WM_RENDERFMT:
             AssertMsgBreak(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState));
-            VBoxServiceClipboardOS2RenderFormat(SHORT1FROMMP(mp1));
+            vgsvcClipboardOs2RenderFormat(SHORT1FROMMP(mp1));
             break;
 
@@ -723 +756 @@
          */
         case WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS:
-            VBoxServiceClipboardOS2AdvertiseHostFormats(LONGFROMMP(mp1));
+            vgsvcClipboardOs2AdvertiseHostFormats(LONGFROMMP(mp1));
             break;
 
@@ -730 +763 @@
          */
         case WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA:
-            VBoxServiceClipboardOS2SendDataToHost(LONGFROMMP(mp1));
+            vgsvcClipboardOs2SendDataToHost(LONGFROMMP(mp1));
             break;
 
@@ -757 +790 @@
 
             /* poll for changes */
-            VBoxServiceClipboardOS2Poll();
-            VBoxServiceClipboardOS2PollViewer();
+            vgsvcClipboardOs2Poll();
+            vgsvcClipboardOs2PollViewer();
             break;
 
@@ -801 +834 @@
  * @param   pvUser      Pointer to the clipboard service shutdown indicator.
  */
-static DECLCALLBACK(int) VBoxServiceClipboardOS2Listener(RTTHREAD ThreadSelf, void *pvUser)
+static DECLCALLBACK(int) vgsvcClipboardOs2Listener(RTTHREAD ThreadSelf, void *pvUser)
 {
     bool volatile *pfShutdown = (bool volatile *)pvUser;
     int rc = VERR_GENERAL_FAILURE;
-    VBoxServiceVerbose(3, "VBoxServiceClipboardOS2Listener: ThreadSelf=%RTthrd\n", ThreadSelf);
+    VGSvcVerbose(3, "vgsvcClipboardOs2Listener: ThreadSelf=%RTthrd\n", ThreadSelf);
 
     g_habListener = WinInitialize(0);
@@ -821 +854 @@
             ASMAtomicXchgBool(&g_fListenerOkay, true);
             RTThreadUserSignal(ThreadSelf);
-            VBoxServiceVerbose(3, "VBoxServiceClipboardOS2Listener: Started successfully\n");
+            VGSvcVerbose(3, "vgsvcClipboardOs2Listener: Started successfully\n");
 
             /*
@@ -834 +867 @@
                 if (RT_SUCCESS(rc))
                 {
-                    VBoxServiceVerbose(3, "VBoxServiceClipboardOS2Listener: Msg=%#x  fFormats=%#x\n", Msg, fFormats);
+                    VGSvcVerbose(3, "vgsvcClipboardOs2Listener: Msg=%#x  fFormats=%#x\n", Msg, fFormats);
                     switch (Msg)
                     {
@@ -845 +878 @@
                             if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS,
                                             MPFROMLONG(fFormats), 0))
-                                VBoxServiceError("WinPostMsg(%lx, FORMATS,,) failed, lasterr=%#lx\n",
+                                VGSvcError("WinPostMsg(%lx, FORMATS,,) failed, lasterr=%#lx\n",
                                                  g_hwndWorker, WinGetLastError(g_habListener));
                             break;
@@ -855 +888 @@
                             if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA,
                                             MPFROMLONG(fFormats), 0))
-                                VBoxServiceError("WinPostMsg(%lx, READ_DATA,,) failed, lasterr=%#lx\n",
+                                VGSvcError("WinPostMsg(%lx, READ_DATA,,) failed, lasterr=%#lx\n",
                                                  g_hwndWorker, WinGetLastError(g_habListener));
                             break;
@@ -867 +900 @@
 
                         default:
-                            VBoxServiceVerbose(1, "VBoxServiceClipboardOS2Listener: Unknown message %RU32\n", Msg);
+                            VGSvcVerbose(1, "vgsvcClipboardOs2Listener: Unknown message %RU32\n", Msg);
                             break;
                     }
@@ -875 +908 @@
                     if (*pfShutdown)
                         break;
-                    VBoxServiceError("VbglR3ClipboardGetHostMsg failed, rc=%Rrc\n", rc);
+                    VGSvcError("VbglR3ClipboardGetHostMsg failed, rc=%Rrc\n", rc);
                     RTThreadSleep(1000);
                 }
@@ -888 +921 @@
     /* Signal our semaphore to make the worker catch on. */
     RTThreadUserSignal(ThreadSelf);
-    VBoxServiceVerbose(3, "VBoxServiceClipboardOS2Listener: terminating, rc=%Rrc\n", rc);
+    VGSvcVerbose(3, "vgsvcClipboardOs2Listener: terminating, rc=%Rrc\n", rc);
     return rc;
 }
 
 
-/** @copydoc VBOXSERVICE::pfnWorker */
-static DECLCALLBACK(int) VBoxServiceClipboardOS2Worker(bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vgsvcClipboardOs2Worker(bool volatile *pfShutdown)
 {
     int rc = VERR_GENERAL_FAILURE;
@@ -913 +948 @@
              * Create the object window.
              */
-            if (WinRegisterClass(g_habWorker, (PCSZ)"VBoxServiceClipboardClass", VBoxServiceClipboardOS2WinProc, 0, 0))
+            if (WinRegisterClass(g_habWorker, (PCSZ)"VBoxServiceClipboardClass", vgsvcClipboardOs2WinProc, 0, 0))
             {
                 g_hwndWorker = WinCreateWindow(HWND_OBJECT,                             /* hwndParent */
@@ -927 +962 @@
                 if (g_hwndWorker != NULLHANDLE)
                 {
-                    VBoxServiceVerbose(3, "g_hwndWorker=%#lx g_habWorker=%#lx g_hmqWorker=%#lx\n", g_hwndWorker, g_habWorker, g_hmqWorker);
+                    VGSvcVerbose(3, "g_hwndWorker=%#lx g_habWorker=%#lx g_hmqWorker=%#lx\n", g_hwndWorker, g_habWorker, g_hmqWorker);
 
                     /*
@@ -933 +968 @@
                      */
                     g_fListenerOkay = false;
-                    rc = RTThreadCreate(&g_ThreadListener, VBoxServiceClipboardOS2Listener, (void *)pfShutdown, 0,
+                    rc = RTThreadCreate(&g_ThreadListener, vgsvcClipboardOs2Listener, (void *)pfShutdown, 0,
                                         RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "CLIPLISTEN");
                     if (RT_SUCCESS(rc))
@@ -952 +987 @@
                              * The PM event pump.
                              */
-                            VBoxServiceVerbose(2, "clipboard: Entering PM message loop.\n");
+                            VGSvcVerbose(2, "clipboard: Entering PM message loop.\n");
                             rc = VINF_SUCCESS;
                             QMSG qmsg;
@@ -958 +993 @@
                             {
                                 if (qmsg.msg != WM_TIMER)
-                                    VBoxServiceVerbose(6, "WinGetMsg -> hwnd=%p msg=%#x mp1=%p mp2=%p time=%#x ptl=%d,%d rsrv=%#x\n",
+                                    VGSvcVerbose(6, "WinGetMsg -> hwnd=%p msg=%#x mp1=%p mp2=%p time=%#x ptl=%d,%d rsrv=%#x\n",
                                                        qmsg.hwnd, qmsg.msg, qmsg.mp1, qmsg.mp2, qmsg.time, qmsg.ptl.x, qmsg.ptl.y, qmsg.reserved);
                                 WinDispatchMsg(g_habWorker, &qmsg);
                             }
-                            VBoxServiceVerbose(2, "clipboard: Exited PM message loop. *pfShutdown=%RTbool\n", *pfShutdown);
+                            VGSvcVerbose(2, "clipboard: Exited PM message loop. *pfShutdown=%RTbool\n", *pfShutdown);
 
                             RTThreadWait(g_ThreadListener, 60*1000, NULL);
@@ -979 +1014 @@
                 }
                 else
-                    VBoxServiceError("WinCreateWindow() failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+                    VGSvcError("WinCreateWindow() failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
                 /* no class deregistration in PM.  */
             }
             else
-                VBoxServiceError("WinRegisterClass() failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+                VGSvcError("WinRegisterClass() failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
 
             if (g_hmqCtrl != g_hmqWorker)
@@ -990 +1025 @@
         }
         else
-            VBoxServiceError("WinCreateMsgQueue(,0) failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
+            VGSvcError("WinCreateMsgQueue(,0) failed, lasterr=%lx\n", WinGetLastError(g_habWorker));
 
         if (g_habCtrl != g_habWorker)
@@ -997 +1032 @@
     }
     else
-        VBoxServiceError("WinInitialize(0) failed, lasterr=%lx\n", WinGetLastError(NULLHANDLE));
+        VGSvcError("WinInitialize(0) failed, lasterr=%lx\n", WinGetLastError(NULLHANDLE));
 
     return rc;
@@ -1003 +1038 @@
 
 
-/** @copydoc VBOXSERVICE::pfnStop */
-static DECLCALLBACK(void) VBoxServiceClipboardOS2Stop(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vgsvcClipboardOs2Stop(void)
 {
     if (    g_hmqWorker != NULLHANDLE
         &&  !WinPostQueueMsg(g_hmqWorker, WM_QUIT, NULL, NULL))
-        VBoxServiceError("WinPostQueueMsg(g_hmqWorker, WM_QUIT, 0,0) failed, lasterr=%lx\n", WinGetLastError(g_habCtrl));
+        VGSvcError("WinPostQueueMsg(g_hmqWorker, WM_QUIT, 0,0) failed, lasterr=%lx\n", WinGetLastError(g_habCtrl));
 
     /* Must disconnect the clipboard here otherwise the listner won't quit and
@@ -1017 +1054 @@
             RTThreadSleep(32);      /* fudge */
 
-        VBoxServiceVerbose(4, "clipboard: disconnecting %#x\n", g_u32ClientId);
+        VGSvcVerbose(4, "clipboard: disconnecting %#x\n", g_u32ClientId);
         int rc = VbglR3ClipboardDisconnect(g_u32ClientId);
         if (RT_SUCCESS(rc))
             g_u32ClientId = 0;
         else
-            VBoxServiceError("clipboard: VbglR3ClipboardDisconnect(%#x) -> %Rrc\n", g_u32ClientId, rc);
-    }
-}
-
-
-/** @copydoc VBOXSERVICE::pfnTerm */
-static DECLCALLBACK(void) VBoxServiceClipboardOS2Term(void)
+            VGSvcError("clipboard: VbglR3ClipboardDisconnect(%#x) -> %Rrc\n", g_u32ClientId, rc);
+    }
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(void) vgsvcClipboardOs2Term(void)
 {
     if (g_u32ClientId != 0)
     {
-        VBoxServiceVerbose(4, "clipboard: disconnecting %#x\n", g_u32ClientId);
+        VGSvcVerbose(4, "clipboard: disconnecting %#x\n", g_u32ClientId);
         int rc = VbglR3ClipboardDisconnect(g_u32ClientId);
         if (RT_SUCCESS(rc))
             g_u32ClientId = 0;
         else
-            VBoxServiceError("clipboard: VbglR3ClipboardDisconnect(%#x) -> %Rrc\n", g_u32ClientId, rc);
+            VGSvcError("clipboard: VbglR3ClipboardDisconnect(%#x) -> %Rrc\n", g_u32ClientId, rc);
     }
     WinDestroyMsgQueue(g_hmqCtrl);
@@ -1062 +1101 @@
     ,
     /* methods */
-    VBoxServiceClipboardOS2PreInit,
-    VBoxServiceClipboardOS2Option,
-    VBoxServiceClipboardOS2Init,
-    VBoxServiceClipboardOS2Worker,
-    VBoxServiceClipboardOS2Stop,
-    VBoxServiceClipboardOS2Term
+    vgsvcClipboardOs2PreInit,
+    vgsvcClipboardOs2Option,
+    vgsvcClipboardOs2Init,
+    vgsvcClipboardOs2Worker,
+    vgsvcClipboardOs2Stop,
+    vgsvcClipboardOs2Term
 };
 

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

@@ -43 +43 @@
 *********************************************************************************************************************************/
 /** The control interval (milliseconds). */
-static uint32_t             g_uControlIntervalMS = 0;
+static uint32_t             g_msControlInterval = 0;
 /** The semaphore we're blocking our main control thread on. */
 static RTSEMEVENTMULTI      g_hControlEvent = NIL_RTSEMEVENTMULTI;
@@ -70 +70 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static int  gstcntlHandleSessionOpen(PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int  gstcntlHandleSessionClose(PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static void VBoxServiceControlShutdown(void);
-
-
-/** @copydoc VBOXSERVICE::pfnPreInit */
-static DECLCALLBACK(int) VBoxServiceControlPreInit(void)
+static int  vgsvcGstCtrlHandleSessionOpen(PVBGLR3GUESTCTRLCMDCTX pHostCtx);
+static int  vgsvcGstCtrlHandleSessionClose(PVBGLR3GUESTCTRLCMDCTX pHostCtx);
+static void vgsvcGstCtrlShutdown(void);
+
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnPreInit}
+ */
+static DECLCALLBACK(int) vgsvcGstCtrlPreInit(void)
 {
     int rc;
@@ -90 +92 @@
         if (rc == VERR_HGCM_SERVICE_NOT_FOUND) /* Host service is not available. */
         {
-            VBoxServiceVerbose(0, "Guest property service is not available, skipping\n");
+            VGSvcVerbose(0, "Guest property service is not available, skipping\n");
             rc = VINF_SUCCESS;
         }
         else
-            VBoxServiceError("Failed to connect to the guest property service, rc=%Rrc\n", rc);
+            VGSvcError("Failed to connect to the guest property service, rc=%Rrc\n", rc);
     }
     else
-    {
         VbglR3GuestPropDisconnect(uGuestPropSvcClientID);
-    }
 
     if (rc == VERR_NOT_FOUND) /* If a value is not found, don't be sad! */
@@ -111 +111 @@
     {
         /* Init session object. */
-        rc = GstCntlSessionInit(&g_Session, 0 /* Flags */);
+        rc = VGSvcGstCtrlSessionInit(&g_Session, 0 /* Flags */);
     }
 
@@ -118 +118 @@
 
 
-/** @copydoc VBOXSERVICE::pfnOption */
-static DECLCALLBACK(int) VBoxServiceControlOption(const char **ppszShort, int argc, char **argv, int *pi)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnOption}
+ */
+static DECLCALLBACK(int) vgsvcGstCtrlOption(const char **ppszShort, int argc, char **argv, int *pi)
 {
     int rc = -1;
@@ -125 +127 @@
         /* no short options */;
     else if (!strcmp(argv[*pi], "--control-interval"))
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_uControlIntervalMS, 1, UINT32_MAX - 1);
+        rc = VGSvcArgUInt32(argc, argv, "", pi,
+                                  &g_msControlInterval, 1, UINT32_MAX - 1);
 #ifdef DEBUG
     else if (!strcmp(argv[*pi], "--control-dump-stdout"))
@@ -143 +145 @@
 
 
-/** @copydoc VBOXSERVICE::pfnInit */
-static DECLCALLBACK(int) VBoxServiceControlInit(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vgsvcGstCtrlInit(void)
 {
     /*
@@ -150 +154 @@
      * Then create the event sem to block on.
      */
-    if (!g_uControlIntervalMS)
-        g_uControlIntervalMS = 1000;
+    if (!g_msControlInterval)
+        g_msControlInterval = 1000;
 
     int rc = RTSemEventMultiCreate(&g_hControlEvent);
@@ -163 +167 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(3, "Guest control service client ID=%RU32\n",
-                           g_uControlSvcClientID);
+        VGSvcVerbose(3, "Guest control service client ID=%RU32\n", g_uControlSvcClientID);
 
         /* Init session thread list. */
@@ -175 +178 @@
         if (rc == VERR_HGCM_SERVICE_NOT_FOUND) /* Host service is not available. */
         {
-            VBoxServiceVerbose(0, "Guest control service is not available\n");
+            VGSvcVerbose(0, "Guest control service is not available\n");
             rc = VERR_SERVICE_DISABLED;
         }
         else
-            VBoxServiceError("Failed to connect to the guest control service! Error: %Rrc\n", rc);
+            VGSvcError("Failed to connect to the guest control service! Error: %Rrc\n", rc);
         RTSemEventMultiDestroy(g_hControlEvent);
         g_hControlEvent = NIL_RTSEMEVENTMULTI;
@@ -187 +190 @@
 
 
-/** @copydoc VBOXSERVICE::pfnWorker */
-DECLCALLBACK(int) VBoxServiceControlWorker(bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vgsvcGstCtrlWorker(bool volatile *pfShutdown)
 {
     /*
@@ -213 +218 @@
     for (;;)
     {
-        VBoxServiceVerbose(3, "Waiting for host msg ...\n");
+        VGSvcVerbose(3, "Waiting for host msg ...\n");
         uint32_t uMsg = 0;
         uint32_t cParms = 0;
@@ -220 +225 @@
         {
 #ifdef DEBUG
-            VBoxServiceVerbose(4, "Message requires %ld parameters, but only 2 supplied -- retrying request (no error!)...\n",
-                               cParms);
+            VGSvcVerbose(4, "Message requires %ld parameters, but only 2 supplied -- retrying request (no error!)...\n",
+                         cParms);
 #endif
             rc = VINF_SUCCESS; /* Try to get "real" message in next block below. */
@@ -228 +233 @@
         {
             /* Note: VERR_GEN_IO_FAILURE seems to be normal if ran into timeout. */
-            VBoxServiceError("Getting host message failed with %Rrc\n", rc);
+            VGSvcError("Getting host message failed with %Rrc\n", rc);
 
             /* Check for VM session change. */
@@ -236 +241 @@
                 && (idNewSession != g_idControlSession))
             {
-                VBoxServiceVerbose(1, "The VM session ID changed\n");
+                VGSvcVerbose(1, "The VM session ID changed\n");
                 g_idControlSession = idNewSession;
 
                 /* Close all opened guest sessions -- all context IDs, sessions etc.
                  * are now invalid. */
-                rc2 = GstCntlSessionClose(&g_Session);
+                rc2 = VGSvcGstCtrlSessionClose(&g_Session);
                 AssertRC(rc2);
 
                 /* Do a reconnect. */
-                VBoxServiceVerbose(1, "Reconnecting to HGCM service ...\n");
+                VGSvcVerbose(1, "Reconnecting to HGCM service ...\n");
                 rc2 = VbglR3GuestCtrlConnect(&g_uControlSvcClientID);
                 if (RT_SUCCESS(rc2))
                 {
-                    VBoxServiceVerbose(3, "Guest control service client ID=%RU32\n",
-                                       g_uControlSvcClientID);
+                    VGSvcVerbose(3, "Guest control service client ID=%RU32\n", g_uControlSvcClientID);
                     cRetrievalFailed = 0;
                     continue; /* Skip waiting. */
@@ -256 +260 @@
                 else
                 {
-                    VBoxServiceError("Unable to re-connect to HGCM service, rc=%Rrc, bailing out\n", rc);
+                    VGSvcError("Unable to re-connect to HGCM service, rc=%Rrc, bailing out\n", rc);
                     break;
                 }
@@ -263 +267 @@
             if (++cRetrievalFailed > 16) /** @todo Make this configurable? */
             {
-                VBoxServiceError("Too many failed attempts in a row to get next message, bailing out\n");
+                VGSvcError("Too many failed attempts in a row to get next message, bailing out\n");
                 break;
             }
@@ -272 +276 @@
         if (RT_SUCCESS(rc))
         {
-            VBoxServiceVerbose(4, "Msg=%RU32 (%RU32 parms) retrieved\n", uMsg, cParms);
+            VGSvcVerbose(4, "Msg=%RU32 (%RU32 parms) retrieved\n", uMsg, cParms);
             cRetrievalFailed = 0; /* Reset failed retrieval count. */
 
@@ -284 +288 @@
                 && (idNewSession != g_idControlSession))
             {
-                VBoxServiceVerbose(1, "The VM session ID changed\n");
+                VGSvcVerbose(1, "The VM session ID changed\n");
                 g_idControlSession = idNewSession;
 
                 /* Close all opened guest sessions -- all context IDs, sessions etc.
                  * are now invalid. */
-                rc2 = GstCntlSessionClose(&g_Session);
+                rc2 = VGSvcGstCtrlSessionClose(&g_Session);
                 AssertRC(rc2);
             }
@@ -296 +300 @@
             {
                 case HOST_CANCEL_PENDING_WAITS:
-                    VBoxServiceVerbose(1, "We were asked to quit ...\n");
+                    VGSvcVerbose(1, "We were asked to quit ...\n");
                     break;
 
                 case HOST_SESSION_CREATE:
-                    rc = gstcntlHandleSessionOpen(&ctxHost);
+                    rc = vgsvcGstCtrlHandleSessionOpen(&ctxHost);
                     break;
 
                 case HOST_SESSION_CLOSE:
-                    rc = gstcntlHandleSessionClose(&ctxHost);
+                    rc = vgsvcGstCtrlHandleSessionClose(&ctxHost);
                     break;
 
@@ -320 +324 @@
                      */
                     if (ctxHost.uProtocol == 1)
-                    {
-                        rc = GstCntlSessionHandler(&g_Session, uMsg, &ctxHost,
-                                                   pvScratchBuf, cbScratchBuf, pfShutdown);
-                    }
+                        rc = VGSvcGstCtrlSessionHandler(&g_Session, uMsg, &ctxHost, pvScratchBuf, cbScratchBuf, pfShutdown);
                     else
                     {
@@ -332 +333 @@
                          */
                         rc = VbglR3GuestCtrlMsgSkip(g_uControlSvcClientID);
-                        VBoxServiceVerbose(3, "Skipping uMsg=%RU32, cParms=%RU32, rc=%Rrc\n",
-                                           uMsg, cParms, rc);
+                        VGSvcVerbose(3, "Skipping uMsg=%RU32, cParms=%RU32, rc=%Rrc\n", uMsg, cParms, rc);
                     }
                     break;
@@ -351 +351 @@
     }
 
-    VBoxServiceVerbose(0, "Guest control service stopped\n");
+    VGSvcVerbose(0, "Guest control service stopped\n");
 
     /* Delete scratch buffer. */
@@ -357 +357 @@
         RTMemFree(pvScratchBuf);
 
-    VBoxServiceVerbose(0, "Guest control worker returned with rc=%Rrc\n", rc);
+    VGSvcVerbose(0, "Guest control worker returned with rc=%Rrc\n", rc);
     return rc;
 }
 
 
-static int gstcntlHandleSessionOpen(PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+static int vgsvcGstCtrlHandleSessionOpen(PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
@@ -379 +379 @@
          * host wants to use in subsequent calls. */
         pHostCtx->uProtocol = ssInfo.uProtocol;
-        VBoxServiceVerbose(3, "Client ID=%RU32 now is using protocol %RU32\n",
-                           pHostCtx->uClientID, pHostCtx->uProtocol);
-
-        rc = GstCntlSessionThreadCreate(&g_lstControlSessionThreads,
-                                        &ssInfo, NULL /* ppSessionThread */);
+        VGSvcVerbose(3, "Client ID=%RU32 now is using protocol %RU32\n", pHostCtx->uClientID, pHostCtx->uProtocol);
+
+        rc = VGSvcGstCtrlSessionThreadCreate(&g_lstControlSessionThreads, &ssInfo, NULL /* ppSessionThread */);
     }
 
@@ -390 +388 @@
         /* Report back on failure. On success this will be done
          * by the forked session thread. */
-        int rc2 = VbglR3GuestCtrlSessionNotify(pHostCtx,
-                                               GUEST_SESSION_NOTIFYTYPE_ERROR, rc /* uint32_t vs. int */);
+        int rc2 = VbglR3GuestCtrlSessionNotify(pHostCtx, GUEST_SESSION_NOTIFYTYPE_ERROR, rc /* uint32_t vs. int */);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Reporting session error status on open failed with rc=%Rrc\n", rc2);
-    }
-
-    VBoxServiceVerbose(3, "Opening a new guest session returned rc=%Rrc\n", rc);
+            VGSvcError("Reporting session error status on open failed with rc=%Rrc\n", rc2);
+    }
+
+    VGSvcVerbose(3, "Opening a new guest session returned rc=%Rrc\n", rc);
     return rc;
 }
 
 
-static int gstcntlHandleSessionClose(PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+static int vgsvcGstCtrlHandleSessionClose(PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    uint32_t uSessionID, uFlags;
-    int rc = VbglR3GuestCtrlSessionGetClose(pHostCtx, &uFlags, &uSessionID);
+    uint32_t uSessionID;
+    uint32_t fFlags;
+    int rc = VbglR3GuestCtrlSessionGetClose(pHostCtx, &fFlags, &uSessionID);
     if (RT_SUCCESS(rc))
     {
@@ -416 +414 @@
             if (pThread->StartupInfo.uSessionID == uSessionID)
             {
-                rc = GstCntlSessionThreadDestroy(pThread, uFlags);
+                rc = VGSvcGstCtrlSessionThreadDestroy(pThread, fFlags);
                 break;
             }
@@ -429 +427 @@
             if (RT_FAILURE(rc2))
             {
-                VBoxServiceError("Reporting session error status on close failed with rc=%Rrc\n", rc2);
+                VGSvcError("Reporting session error status on close failed with rc=%Rrc\n", rc2);
                 if (RT_SUCCESS(rc))
                     rc = rc2;
@@ -435 +433 @@
         }
 #endif
-        VBoxServiceVerbose(2, "Closing guest session %RU32 returned rc=%Rrc\n",
-                           uSessionID, rc);
+        VGSvcVerbose(2, "Closing guest session %RU32 returned rc=%Rrc\n", uSessionID, rc);
     }
     else
-        VBoxServiceError("Closing guest session %RU32 failed with rc=%Rrc\n",
-                         uSessionID, rc);
+        VGSvcError("Closing guest session %RU32 failed with rc=%Rrc\n", uSessionID, rc);
     return rc;
 }
 
 
-/** @copydoc VBOXSERVICE::pfnStop */
-static DECLCALLBACK(void) VBoxServiceControlStop(void)
-{
-    VBoxServiceVerbose(3, "Stopping ...\n");
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vgsvcGstCtrlStop(void)
+{
+    VGSvcVerbose(3, "Stopping ...\n");
 
     /** @todo Later, figure what to do if we're in RTProcWait(). It's a very
@@ -461 +459 @@
     if (g_uControlSvcClientID)
     {
-        VBoxServiceVerbose(3, "Cancelling pending waits (client ID=%u) ...\n",
+        VGSvcVerbose(3, "Cancelling pending waits (client ID=%u) ...\n",
                            g_uControlSvcClientID);
 
         int rc = VbglR3GuestCtrlCancelPendingWaits(g_uControlSvcClientID);
         if (RT_FAILURE(rc))
-            VBoxServiceError("Cancelling pending waits failed; rc=%Rrc\n", rc);
+            VGSvcError("Cancelling pending waits failed; rc=%Rrc\n", rc);
     }
 }
@@ -474 +472 @@
  * Destroys all guest process threads which are still active.
  */
-static void VBoxServiceControlShutdown(void)
-{
-    VBoxServiceVerbose(2, "Shutting down ...\n");
-
-    int rc2 = GstCntlSessionThreadDestroyAll(&g_lstControlSessionThreads,
-                                             0 /* Flags */);
+static void vgsvcGstCtrlShutdown(void)
+{
+    VGSvcVerbose(2, "Shutting down ...\n");
+
+    int rc2 = VGSvcGstCtrlSessionThreadDestroyAll(&g_lstControlSessionThreads, 0 /* Flags */);
     if (RT_FAILURE(rc2))
-        VBoxServiceError("Closing session threads failed with rc=%Rrc\n", rc2);
-
-    rc2 = GstCntlSessionClose(&g_Session);
+        VGSvcError("Closing session threads failed with rc=%Rrc\n", rc2);
+
+    rc2 = VGSvcGstCtrlSessionClose(&g_Session);
     if (RT_FAILURE(rc2))
-        VBoxServiceError("Closing session failed with rc=%Rrc\n", rc2);
-
-    VBoxServiceVerbose(2, "Shutting down complete\n");
-}
-
-
-/** @copydoc VBOXSERVICE::pfnTerm */
-static DECLCALLBACK(void) VBoxServiceControlTerm(void)
-{
-    VBoxServiceVerbose(3, "Terminating ...\n");
-
-    VBoxServiceControlShutdown();
-
-    VBoxServiceVerbose(3, "Disconnecting client ID=%u ...\n",
-                       g_uControlSvcClientID);
+        VGSvcError("Closing session failed with rc=%Rrc\n", rc2);
+
+    VGSvcVerbose(2, "Shutting down complete\n");
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(void) vgsvcGstCtrlTerm(void)
+{
+    VGSvcVerbose(3, "Terminating ...\n");
+
+    vgsvcGstCtrlShutdown();
+
+    VGSvcVerbose(3, "Disconnecting client ID=%u ...\n", g_uControlSvcClientID);
     VbglR3GuestCtrlDisconnect(g_uControlSvcClientID);
     g_uControlSvcClientID = 0;
@@ -537 +535 @@
     ,
     /* methods */
-    VBoxServiceControlPreInit,
-    VBoxServiceControlOption,
-    VBoxServiceControlInit,
-    VBoxServiceControlWorker,
-    VBoxServiceControlStop,
-    VBoxServiceControlTerm
+    vgsvcGstCtrlPreInit,
+    vgsvcGstCtrlOption,
+    vgsvcGstCtrlInit,
+    vgsvcGstCtrlWorker,
+    vgsvcGstCtrlStop,
+    vgsvcGstCtrlTerm
 };
 

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

@@ -284 +284 @@
 RT_C_DECLS_BEGIN
 
-/**
- * Note on naming conventions:
- * - VBoxServiceControl* is named everything sub service module related, e.g.
- *   everything which is callable by main() and/or the service dispatcher(s).
- * - GstCntl* is named everything which declared extern and thus can be called
- *   by different guest control modules as needed.
- * - gstcntl (all lowercase) is a purely static function to split up functionality
- *   inside a module.
- */
-
-/* Guest session thread handling. */
-extern int                      GstCntlSessionThreadCreate(PRTLISTANCHOR pList, const PVBOXSERVICECTRLSESSIONSTARTUPINFO pSessionStartupInfo, PVBOXSERVICECTRLSESSIONTHREAD *ppSessionThread);
-extern int                      GstCntlSessionThreadDestroy(PVBOXSERVICECTRLSESSIONTHREAD pSession, uint32_t uFlags);
-extern int                      GstCntlSessionThreadDestroyAll(PRTLISTANCHOR pList, uint32_t uFlags);
-extern int                      GstCntlSessionThreadTerminate(PVBOXSERVICECTRLSESSIONTHREAD pSession);
-extern RTEXITCODE               VBoxServiceControlSessionSpawnInit(int argc, char **argv);
-/* Per-session functions. */
-extern PVBOXSERVICECTRLPROCESS  GstCntlSessionRetainProcess(PVBOXSERVICECTRLSESSION pSession, uint32_t uPID);
-extern int                      GstCntlSessionClose(PVBOXSERVICECTRLSESSION pSession);
-extern int                      GstCntlSessionDestroy(PVBOXSERVICECTRLSESSION pSession);
-extern int                      GstCntlSessionInit(PVBOXSERVICECTRLSESSION pSession, uint32_t uFlags);
-extern int                      GstCntlSessionHandler(PVBOXSERVICECTRLSESSION pSession, uint32_t uMsg, PVBGLR3GUESTCTRLCMDCTX pHostCtx, void *pvScratchBuf, size_t cbScratchBuf, volatile bool *pfShutdown);
-extern int                      GstCntlSessionProcessAdd(PVBOXSERVICECTRLSESSION pSession, PVBOXSERVICECTRLPROCESS pProcess);
-extern int                      GstCntlSessionProcessRemove(PVBOXSERVICECTRLSESSION pSession, PVBOXSERVICECTRLPROCESS pProcess);
-extern int                      GstCntlSessionProcessStartAllowed(const PVBOXSERVICECTRLSESSION pSession, bool *pbAllowed);
-extern int                      GstCntlSessionReapProcesses(PVBOXSERVICECTRLSESSION pSession);
-/* Per-guest process functions. */
-extern int                      GstCntlProcessFree(PVBOXSERVICECTRLPROCESS pProcess);
-extern int                      GstCntlProcessHandleInput(PVBOXSERVICECTRLPROCESS pProcess, PVBGLR3GUESTCTRLCMDCTX pHostCtx, bool fPendingClose, void *pvBuf, uint32_t cbBuf);
-extern int                      GstCntlProcessHandleOutput(PVBOXSERVICECTRLPROCESS pProcess, PVBGLR3GUESTCTRLCMDCTX pHostCtx, uint32_t uHandle, uint32_t cbToRead, uint32_t uFlags);
-extern int                      GstCntlProcessHandleTerm(PVBOXSERVICECTRLPROCESS pProcess);
-extern void                     GstCntlProcessRelease(PVBOXSERVICECTRLPROCESS pProcess);
-extern int                      GstCntlProcessStart(const PVBOXSERVICECTRLSESSION pSession, const PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo, uint32_t uContext);
-extern int                      GstCntlProcessStop(PVBOXSERVICECTRLPROCESS pProcess);
-extern int                      GstCntlProcessWait(const PVBOXSERVICECTRLPROCESS pProcess, RTMSINTERVAL msTimeout, int *pRc);
+extern RTLISTANCHOR             g_lstControlSessionThreads;
+extern VBOXSERVICECTRLSESSION   g_Session;
+
+
+/** @name Guest session thread handling.
+ * @{ */
+extern int                      VGSvcGstCtrlSessionThreadCreate(PRTLISTANCHOR pList, const PVBOXSERVICECTRLSESSIONSTARTUPINFO pSessionStartupInfo, PVBOXSERVICECTRLSESSIONTHREAD *ppSessionThread);
+extern int                      VGSvcGstCtrlSessionThreadDestroy(PVBOXSERVICECTRLSESSIONTHREAD pSession, uint32_t uFlags);
+extern int                      VGSvcGstCtrlSessionThreadDestroyAll(PRTLISTANCHOR pList, uint32_t uFlags);
+extern int                      VGSvcGstCtrlSessionThreadTerminate(PVBOXSERVICECTRLSESSIONTHREAD pSession);
+extern RTEXITCODE               VGSvcGstCtrlSessionSpawnInit(int argc, char **argv);
+/** @} */
+/** @name Per-session functions.
+ * @{ */
+extern PVBOXSERVICECTRLPROCESS  VGSvcGstCtrlSessionRetainProcess(PVBOXSERVICECTRLSESSION pSession, uint32_t uPID);
+extern int                      VGSvcGstCtrlSessionClose(PVBOXSERVICECTRLSESSION pSession);
+extern int                      VGSvcGstCtrlSessionDestroy(PVBOXSERVICECTRLSESSION pSession);
+extern int                      VGSvcGstCtrlSessionInit(PVBOXSERVICECTRLSESSION pSession, uint32_t uFlags);
+extern int                      VGSvcGstCtrlSessionHandler(PVBOXSERVICECTRLSESSION pSession, uint32_t uMsg, PVBGLR3GUESTCTRLCMDCTX pHostCtx, void *pvScratchBuf, size_t cbScratchBuf, volatile bool *pfShutdown);
+extern int                      VGSvcGstCtrlSessionProcessAdd(PVBOXSERVICECTRLSESSION pSession, PVBOXSERVICECTRLPROCESS pProcess);
+extern int                      VGSvcGstCtrlSessionProcessRemove(PVBOXSERVICECTRLSESSION pSession, PVBOXSERVICECTRLPROCESS pProcess);
+extern int                      VGSvcGstCtrlSessionProcessStartAllowed(const PVBOXSERVICECTRLSESSION pSession, bool *pbAllowed);
+extern int                      VGSvcGstCtrlSessionReapProcesses(PVBOXSERVICECTRLSESSION pSession);
+/** @} */
+/** @name Per-guest process functions.
+ * @{ */
+extern int                      VGSvcGstCtrlProcessFree(PVBOXSERVICECTRLPROCESS pProcess);
+extern int                      VGSvcGstCtrlProcessHandleInput(PVBOXSERVICECTRLPROCESS pProcess, PVBGLR3GUESTCTRLCMDCTX pHostCtx, bool fPendingClose, void *pvBuf, uint32_t cbBuf);
+extern int                      VGSvcGstCtrlProcessHandleOutput(PVBOXSERVICECTRLPROCESS pProcess, PVBGLR3GUESTCTRLCMDCTX pHostCtx, uint32_t uHandle, uint32_t cbToRead, uint32_t uFlags);
+extern int                      VGSvcGstCtrlProcessHandleTerm(PVBOXSERVICECTRLPROCESS pProcess);
+extern void                     VGSvcGstCtrlProcessRelease(PVBOXSERVICECTRLPROCESS pProcess);
+extern int                      VGSvcGstCtrlProcessStart(const PVBOXSERVICECTRLSESSION pSession, const PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo, uint32_t uContext);
+extern int                      VGSvcGstCtrlProcessStop(PVBOXSERVICECTRLPROCESS pProcess);
+extern int                      VGSvcGstCtrlProcessWait(const PVBOXSERVICECTRLPROCESS pProcess, RTMSINTERVAL msTimeout, int *pRc);
+/** @} */
 
 RT_C_DECLS_END
 
-#endif /* ___VBoxServiceControl_h */
-
+#endif
+

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

@@ -47 +47 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static int                  gstcntlProcessAssignPID(PVBOXSERVICECTRLPROCESS pThread, uint32_t uPID);
-static int                  gstcntlProcessLock(PVBOXSERVICECTRLPROCESS pProcess);
-static int                  gstcntlProcessRequest(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx, PFNRT pfnFunction, unsigned cArgs, ...);
-static int                  gstcntlProcessSetupPipe(const char *pszHowTo, int fd, PRTHANDLE ph, PRTHANDLE *pph, PRTPIPE phPipe);
-static int                  gstcntlProcessUnlock(PVBOXSERVICECTRLPROCESS pProcess);
+static int                  vgsvcGstCtrlProcessAssignPID(PVBOXSERVICECTRLPROCESS pThread, uint32_t uPID);
+static int                  vgsvcGstCtrlProcessLock(PVBOXSERVICECTRLPROCESS pProcess);
+static int                  vgsvcGstCtrlProcessRequest(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                                       PFNRT pfnFunction, unsigned cArgs, ...);
+static int                  vgsvcGstCtrlProcessSetupPipe(const char *pszHowTo, int fd, PRTHANDLE ph, PRTHANDLE *pph,
+                                                         PRTPIPE phPipe);
+static int                  vgsvcGstCtrlProcessUnlock(PVBOXSERVICECTRLPROCESS pProcess);
 /* Request handlers. */
-static DECLCALLBACK(int)    gstcntlProcessOnInput(PVBOXSERVICECTRLPROCESS pThis, const PVBGLR3GUESTCTRLCMDCTX pHostCtx, bool fPendingClose, void *pvBuf, uint32_t cbBuf);
-static DECLCALLBACK(int)    gstcntlProcessOnOutput(PVBOXSERVICECTRLPROCESS pThis, const PVBGLR3GUESTCTRLCMDCTX pHostCtx, uint32_t uHandle, uint32_t cbToRead, uint32_t uFlags);
-static DECLCALLBACK(int)    gstcntlProcessOnTerm(PVBOXSERVICECTRLPROCESS pThis);
+static DECLCALLBACK(int)    vgsvcGstCtrlProcessOnInput(PVBOXSERVICECTRLPROCESS pThis, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                                       bool fPendingClose, void *pvBuf, uint32_t cbBuf);
+static DECLCALLBACK(int)    vgsvcGstCtrlProcessOnOutput(PVBOXSERVICECTRLPROCESS pThis, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                                        uint32_t uHandle, uint32_t cbToRead, uint32_t uFlags);
+static DECLCALLBACK(int)    vgsvcGstCtrlProcessOnTerm(PVBOXSERVICECTRLPROCESS pThis);
+
 
 /**
@@ -66 +71 @@
  * @param   u32ContextID                The context ID bound to this request / command.
  */
-static int gstcntlProcessInit(PVBOXSERVICECTRLPROCESS pProcess,
-                              const PVBOXSERVICECTRLSESSION pSession,
-                              const PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo,
-                              uint32_t u32ContextID)
+static int vgsvcGstCtrlProcessInit(PVBOXSERVICECTRLPROCESS pProcess,
+                                   const PVBOXSERVICECTRLSESSION pSession,
+                                   const PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo,
+                                   uint32_t u32ContextID)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -122 +127 @@
 
     if (RT_FAILURE(rc)) /* Clean up on failure. */
-        GstCntlProcessFree(pProcess);
+        VGSvcGstCtrlProcessFree(pProcess);
     return rc;
 }
@@ -134 +139 @@
  * @param   pProcess                Guest process to free.
  */
-int GstCntlProcessFree(PVBOXSERVICECTRLPROCESS pProcess)
+int VGSvcGstCtrlProcessFree(PVBOXSERVICECTRLPROCESS pProcess)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
 
-    VBoxServiceVerbose(3, "[PID %RU32]: Freeing (cRefs=%RU32)...\n",
-                       pProcess->uPID, pProcess->cRefs);
+    VGSvcVerbose(3, "[PID %RU32]: Freeing (cRefs=%RU32)...\n", pProcess->uPID, pProcess->cRefs);
     Assert(pProcess->cRefs == 0);
 
@@ -155 +159 @@
      */
     AssertPtr(pProcess->pSession);
-    rc = GstCntlSessionProcessRemove(pProcess->pSession, pProcess);
+    rc = VGSvcGstCtrlSessionProcessRemove(pProcess->pSession, pProcess);
     AssertRC(rc);
 
@@ -175 +179 @@
  * @param   pProcess            Process to stop.
  */
-int GstCntlProcessStop(PVBOXSERVICECTRLPROCESS pProcess)
+int VGSvcGstCtrlProcessStop(PVBOXSERVICECTRLPROCESS pProcess)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
 
-    VBoxServiceVerbose(3, "[PID %RU32]: Stopping ...\n",
-                       pProcess->uPID);
+    VGSvcVerbose(3, "[PID %RU32]: Stopping ...\n", pProcess->uPID);
 
     /* Do *not* set pThread->fShutdown or other stuff here!
      * The guest thread loop will clean up itself. */
 
-    return GstCntlProcessHandleTerm(pProcess);
+    return VGSvcGstCtrlProcessHandleTerm(pProcess);
 }
 
@@ -194 +197 @@
  * @param   pProcess            Process to unlock.
  */
-void GstCntlProcessRelease(PVBOXSERVICECTRLPROCESS pProcess)
+void VGSvcGstCtrlProcessRelease(PVBOXSERVICECTRLPROCESS pProcess)
 {
     AssertPtrReturnVoid(pProcess);
@@ -212 +215 @@
 
     if (fShutdown)
-        GstCntlProcessFree(pProcess);
+        VGSvcGstCtrlProcessFree(pProcess);
 }
 
@@ -222 +225 @@
  * @param   pProcess            Process to wait shutting down for.
  * @param   RTMSINTERVAL        Timeout in ms to wait for shutdown.
- * @param   pRc                 Where to store the thread's return code. Optional.
- */
-int GstCntlProcessWait(const PVBOXSERVICECTRLPROCESS pProcess,
-                       RTMSINTERVAL msTimeout, int *pRc)
+ * @param   prc                 Where to store the thread's return code.
+ *                              Optional.
+ */
+int VGSvcGstCtrlProcessWait(const PVBOXSERVICECTRLPROCESS pProcess, RTMSINTERVAL msTimeout, int *prc)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
-    /* pRc is optional. */
-
-    int rc = gstcntlProcessLock(pProcess);
+    AssertPtrNullReturn(prc, VERR_INVALID_POINTER);
+
+    int rc = vgsvcGstCtrlProcessLock(pProcess);
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(2, "[PID %RU32]: Waiting for shutdown (%RU32ms) ...\n",
-                           pProcess->uPID, msTimeout);
+        VGSvcVerbose(2, "[PID %RU32]: Waiting for shutdown (%RU32ms) ...\n", pProcess->uPID, msTimeout);
 
         AssertMsgReturn(pProcess->fStarted,
@@ -244 +246 @@
         {
             /* Unlock process before waiting. */
-            rc = gstcntlProcessUnlock(pProcess);
+            rc = vgsvcGstCtrlProcessUnlock(pProcess);
             AssertRC(rc);
 
@@ -251 +253 @@
             Assert(pProcess->Thread != NIL_RTTHREAD);
             rc = RTThreadWait(pProcess->Thread, msTimeout, &rcThread);
-            if (RT_FAILURE(rc))
+            if (RT_SUCCESS(rc))
             {
-                VBoxServiceError("[PID %RU32]: Waiting for shutting down thread returned error rc=%Rrc\n",
-                                 pProcess->uPID, rc);
+                VGSvcVerbose(3, "[PID %RU32]: Thread shutdown complete, thread rc=%Rrc\n", pProcess->uPID, rcThread);
+                if (prc)
+                    *prc = rcThread;
             }
             else
-            {
-                VBoxServiceVerbose(3, "[PID %RU32]: Thread shutdown complete, thread rc=%Rrc\n",
-                                   pProcess->uPID, rcThread);
-                if (pRc)
-                    *pRc = rcThread;
-            }
+                VGSvcError("[PID %RU32]: Waiting for shutting down thread returned error rc=%Rrc\n", pProcess->uPID, rc);
         }
         else
         {
-            VBoxServiceVerbose(3, "[PID %RU32]: Thread already shut down, no waiting needed\n",
-                               pProcess->uPID);
-
-            int rc2 = gstcntlProcessUnlock(pProcess);
+            VGSvcVerbose(3, "[PID %RU32]: Thread already shut down, no waiting needed\n", pProcess->uPID);
+
+            int rc2 = vgsvcGstCtrlProcessUnlock(pProcess);
             AssertRC(rc2);
         }
     }
 
-    VBoxServiceVerbose(3, "[PID %RU32]: Waiting resulted in rc=%Rrc\n",
-                       pProcess->uPID, rc);
+    VGSvcVerbose(3, "[PID %RU32]: Waiting resulted in rc=%Rrc\n", pProcess->uPID, rc);
     return rc;
 }
@@ -287 +283 @@
  * @param   phStdInW            The standard input pipe handle.
  */
-static int gstcntlProcessPollsetCloseInput(PVBOXSERVICECTRLPROCESS pProcess,
-                                           PRTPIPE phStdInW)
+static int vgsvcGstCtrlProcessPollsetCloseInput(PVBOXSERVICECTRLPROCESS pProcess, PRTPIPE phStdInW)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -308 +303 @@
 
 
-static const char* gstcntlProcessPollHandleToString(uint32_t idPollHnd)
+/**
+ * Names a poll handle ID.
+ *
+ * @returns Pointer to read-only string.
+ * @param   idPollHnd           What to name.
+ */
+static const char *vgsvcGstCtrlProcessPollHandleToString(uint32_t idPollHnd)
 {
     switch (idPollHnd)
@@ -325 +326 @@
             return "ipc_notify";
         default:
-            break;
-    }
-
-    return "unknown";
+            return "unknown";
+    }
 }
 
@@ -340 +339 @@
  * @param   phStdInW            The standard input pipe handle.
  */
-static int gstcntlProcessPollsetOnInput(PVBOXSERVICECTRLPROCESS pProcess,
-                                        uint32_t fPollEvt, PRTPIPE phStdInW)
+static int vgsvcGstCtrlProcessPollsetOnInput(PVBOXSERVICECTRLPROCESS pProcess, uint32_t fPollEvt, PRTPIPE phStdInW)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -347 +345 @@
     NOREF(fPollEvt);
 
-    return gstcntlProcessPollsetCloseInput(pProcess, phStdInW);
+    return vgsvcGstCtrlProcessPollsetCloseInput(pProcess, phStdInW);
 }
 
@@ -359 +357 @@
  * @param   phPipeR             The pipe handle.
  * @param   idPollHnd           The pipe ID to handle.
- *
- */
-static int gstcntlProcessHandleOutputError(PVBOXSERVICECTRLPROCESS pProcess,
-                                           uint32_t fPollEvt, PRTPIPE phPipeR, uint32_t idPollHnd)
+ */
+static int vgsvcGstCtrlProcessHandleOutputError(PVBOXSERVICECTRLPROCESS pProcess,
+                                                uint32_t fPollEvt, PRTPIPE phPipeR, uint32_t idPollHnd)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -370 +367 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "[PID %RU32]: Output error: idPollHnd=%s, fPollEvt=0x%x\n",
-                       pProcess->uPID, gstcntlProcessPollHandleToString(idPollHnd), fPollEvt);
+    VGSvcVerbose(4, "[PID %RU32]: Output error: idPollHnd=%s, fPollEvt=0x%x\n",
+                 pProcess->uPID, vgsvcGstCtrlProcessPollHandleToString(idPollHnd), fPollEvt);
 #endif
 
@@ -389 +386 @@
         {
 #ifdef DEBUG
-            VBoxServiceVerbose(3, "[PID %RU32]: idPollHnd=%s has %zu bytes left, vetoing close\n",
-                               pProcess->uPID, gstcntlProcessPollHandleToString(idPollHnd), cbReadable);
+            VGSvcVerbose(3, "[PID %RU32]: idPollHnd=%s has %zu bytes left, vetoing close\n",
+                         pProcess->uPID, vgsvcGstCtrlProcessPollHandleToString(idPollHnd), cbReadable);
 #endif
             /* Veto closing the pipe yet because there's still stuff to read
@@ -400 +397 @@
 #ifdef DEBUG
     else
-        VBoxServiceVerbose(3, "[PID %RU32]: idPollHnd=%s will be closed\n",
-                           pProcess->uPID, gstcntlProcessPollHandleToString(idPollHnd));
+        VGSvcVerbose(3, "[PID %RU32]: idPollHnd=%s will be closed\n",
+                     pProcess->uPID, vgsvcGstCtrlProcessPollHandleToString(idPollHnd));
 #endif
 
@@ -426 +423 @@
  *
  */
-static int gstcntlProcessPollsetOnOutput(PVBOXSERVICECTRLPROCESS pProcess,
-                                         uint32_t fPollEvt, PRTPIPE phPipeR, uint32_t idPollHnd)
+static int vgsvcGstCtrlProcessPollsetOnOutput(PVBOXSERVICECTRLPROCESS pProcess,
+                                              uint32_t fPollEvt, PRTPIPE phPipeR, uint32_t idPollHnd)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "[PID %RU32]: Output event phPipeR=%p, idPollHnd=%s, fPollEvt=0x%x\n",
-                       pProcess->uPID, phPipeR, gstcntlProcessPollHandleToString(idPollHnd), fPollEvt);
+    VGSvcVerbose(4, "[PID %RU32]: Output event phPipeR=%p, idPollHnd=%s, fPollEvt=0x%x\n",
+                 pProcess->uPID, phPipeR, vgsvcGstCtrlProcessPollHandleToString(idPollHnd), fPollEvt);
 #endif
 
@@ -449 +446 @@
             && cbReadable)
         {
-            VBoxServiceVerbose(4, "[PID %RU32]: Output event cbReadable=%zu\n",
-                               pProcess->uPID, cbReadable);
+            VGSvcVerbose(4, "[PID %RU32]: Output event cbReadable=%zu\n", pProcess->uPID, cbReadable);
         }
     }
@@ -461 +457 @@
         size_t cbRead = 0;
         uint8_t byData[_64K];
-        rc = RTPipeRead(*phPipeR,
-                        byData, sizeof(byData), &cbRead);
-        VBoxServiceVerbose(4, "GstCntlProcessHandleOutputEvent cbRead=%u, rc=%Rrc\n",
-                           cbRead, rc);
+        rc = RTPipeRead(*phPipeR, byData, sizeof(byData), &cbRead);
+        VGSvcVerbose(4, "VGSvcGstCtrlProcessHandleOutputEvent cbRead=%u, rc=%Rrc\n", cbRead, rc);
 
         /* Make sure we go another poll round in case there was too much data
@@ -473 +467 @@
 
     if (fPollEvt & RTPOLL_EVT_ERROR)
-        rc = gstcntlProcessHandleOutputError(pProcess,
-                                             fPollEvt, phPipeR, idPollHnd);
+        rc = vgsvcGstCtrlProcessHandleOutputError(pProcess, fPollEvt, phPipeR, idPollHnd);
     return rc;
 }
@@ -486 +479 @@
  * @param   pProcess                    The guest process to handle.
  */
-static int gstcntlProcessProcLoop(PVBOXSERVICECTRLPROCESS pProcess)
+static int vgsvcGstCtrlProcessProcLoop(PVBOXSERVICECTRLPROCESS pProcess)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -507 +500 @@
      * the first (stale) entry will be found and we get really weird results!
      */
-    rc = gstcntlProcessAssignPID(pProcess, pProcess->hProcess /* Opaque PID handle */);
+    rc = vgsvcGstCtrlProcessAssignPID(pProcess, pProcess->hProcess /* Opaque PID handle */);
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("Unable to assign PID=%u, to new thread, rc=%Rrc\n",
-                         pProcess->hProcess, rc);
+        VGSvcError("Unable to assign PID=%u, to new thread, rc=%Rrc\n", pProcess->hProcess, rc);
         return rc;
     }
@@ -519 +511 @@
      * and that it's now OK to send input to the process.
      */
-    VBoxServiceVerbose(2, "[PID %RU32]: Process \"%s\" started, CID=%u, User=%s, cMsTimeout=%RU32\n",
+    VGSvcVerbose(2, "[PID %RU32]: Process '%s' started, CID=%u, User=%s, cMsTimeout=%RU32\n",
                        pProcess->uPID, pProcess->StartupInfo.szCmd, pProcess->uContextID,
                        pProcess->StartupInfo.szUser, pProcess->StartupInfo.uTimeLimitMS);
@@ -529 +521 @@
         rc = VINF_SUCCESS; /* SIGCHLD send by quick childs! */
     if (RT_FAILURE(rc))
-        VBoxServiceError("[PID %RU32]: Error reporting starting status to host, rc=%Rrc\n",
-                         pProcess->uPID, rc);
+        VGSvcError("[PID %RU32]: Error reporting starting status to host, rc=%Rrc\n", pProcess->uPID, rc);
 
     /*
@@ -554 +545 @@
             {
                 case VBOXSERVICECTRLPIPEID_STDIN:
-                    rc = gstcntlProcessPollsetOnInput(pProcess, fPollEvt,
-                                                      &pProcess->hPipeStdInW);
+                    rc = vgsvcGstCtrlProcessPollsetOnInput(pProcess, fPollEvt, &pProcess->hPipeStdInW);
                     break;
 
                 case VBOXSERVICECTRLPIPEID_STDOUT:
-                    rc = gstcntlProcessPollsetOnOutput(pProcess, fPollEvt,
-                                                       &pProcess->hPipeStdOutR, idPollHnd);
+                    rc = vgsvcGstCtrlProcessPollsetOnOutput(pProcess, fPollEvt, &pProcess->hPipeStdOutR, idPollHnd);
                     break;
 
                 case VBOXSERVICECTRLPIPEID_STDERR:
-                    rc = gstcntlProcessPollsetOnOutput(pProcess, fPollEvt,
-                                                       &pProcess->hPipeStdOutR, idPollHnd);
+                    rc = vgsvcGstCtrlProcessPollsetOnOutput(pProcess, fPollEvt, &pProcess->hPipeStdOutR, idPollHnd);
                     break;
 
                 case VBOXSERVICECTRLPIPEID_IPC_NOTIFY:
 #ifdef DEBUG_andy
-                    VBoxServiceVerbose(4, "[PID %RU32]: IPC notify\n", pProcess->uPID);
-#endif
-                    rc2 = gstcntlProcessLock(pProcess);
+                    VGSvcVerbose(4, "[PID %RU32]: IPC notify\n", pProcess->uPID);
+#endif
+                    rc2 = vgsvcGstCtrlProcessLock(pProcess);
                     if (RT_SUCCESS(rc2))
                     {
@@ -578 +566 @@
                         uint8_t abBuf[8];
                         size_t cbIgnore;
-                        rc2 = RTPipeRead(pProcess->hNotificationPipeR,
-                                         abBuf, sizeof(abBuf), &cbIgnore);
+                        rc2 = RTPipeRead(pProcess->hNotificationPipeR, abBuf, sizeof(abBuf), &cbIgnore);
                         if (RT_FAILURE(rc2))
-                            VBoxServiceError("Draining IPC notification pipe failed with rc=%Rrc\n", rc2);
+                            VGSvcError("Draining IPC notification pipe failed with rc=%Rrc\n", rc2);
 
                         /* Process all pending requests. */
-                        VBoxServiceVerbose(4, "[PID %RU32]: Processing pending requests ...\n",
-                                           pProcess->uPID);
+                        VGSvcVerbose(4, "[PID %RU32]: Processing pending requests ...\n", pProcess->uPID);
                         Assert(pProcess->hReqQueue != NIL_RTREQQUEUE);
                         rc2 = RTReqQueueProcess(pProcess->hReqQueue,
@@ -591 +577 @@
                         if (   RT_FAILURE(rc2)
                             && rc2 != VERR_TIMEOUT)
-                            VBoxServiceError("Processing requests failed with with rc=%Rrc\n", rc2);
-
-                        int rc3 = gstcntlProcessUnlock(pProcess);
+                            VGSvcError("Processing requests failed with with rc=%Rrc\n", rc2);
+
+                        int rc3 = vgsvcGstCtrlProcessUnlock(pProcess);
                         AssertRC(rc3);
 #ifdef DEBUG
-                        VBoxServiceVerbose(4, "[PID %RU32]: Processing pending requests done, rc=%Rrc\n",
-                                           pProcess->uPID, rc2);
+                        VGSvcVerbose(4, "[PID %RU32]: Processing pending requests done, rc=%Rrc\n", pProcess->uPID, rc2);
 #endif
                     }
@@ -612 +597 @@
         }
 #if 0
-        VBoxServiceVerbose(4, "[PID %RU32]: Polling done, pollRc=%Rrc, pollCnt=%RU32, idPollHnd=%s, rc=%Rrc, fProcessAlive=%RTbool, fShutdown=%RTbool\n",
-                           pProcess->uPID, rc2, RTPollSetGetCount(hPollSet), gstcntlProcessPollHandleToString(idPollHnd), rc, fProcessAlive, pProcess->fShutdown);
-        VBoxServiceVerbose(4, "[PID %RU32]: stdOut=%s, stdErrR=%s\n",
-                           pProcess->uPID,
-                           *phStdOutR == NIL_RTPIPE ? "closed" : "open",
-                           *phStdErrR == NIL_RTPIPE ? "closed" : "open");
+        VGSvcVerbose(4, "[PID %RU32]: Polling done, pollRc=%Rrc, pollCnt=%RU32, idPollHnd=%s, rc=%Rrc, fProcessAlive=%RTbool, fShutdown=%RTbool\n",
+                     pProcess->uPID, rc2, RTPollSetGetCount(hPollSet), vgsvcGstCtrlProcessPollHandleToString(idPollHnd), rc, fProcessAlive, pProcess->fShutdown);
+        VGSvcVerbose(4, "[PID %RU32]: stdOut=%s, stdErrR=%s\n",
+                     pProcess->uPID,
+                     *phStdOutR == NIL_RTPIPE ? "closed" : "open",
+                     *phStdErrR == NIL_RTPIPE ? "closed" : "open");
 #endif
         if (RT_UNLIKELY(pProcess->fShutdown))
@@ -629 +614 @@
             rc2 = RTProcWaitNoResume(pProcess->hProcess, RTPROCWAIT_FLAGS_NOBLOCK, &ProcessStatus);
 #if 0
-            VBoxServiceVerbose(4, "[PID %RU32]: RTProcWaitNoResume=%Rrc\n",
-                               pProcess->uPID, rc2);
+            VGSvcVerbose(4, "[PID %RU32]: RTProcWaitNoResume=%Rrc\n", pProcess->uPID, rc2);
 #endif
             if (RT_SUCCESS_NP(rc2))
@@ -687 +671 @@
                         break; /* Give up after 20 mins. */
 
-                    VBoxServiceVerbose(3, "[PID %RU32]: Timed out (%RU64ms elapsed > %RU32ms timeout), killing ...\n",
-                                       pProcess->uPID, cMsElapsed, pProcess->StartupInfo.uTimeLimitMS);
+                    VGSvcVerbose(3, "[PID %RU32]: Timed out (%RU64ms elapsed > %RU32ms timeout), killing ...\n",
+                                 pProcess->uPID, cMsElapsed, pProcess->StartupInfo.uTimeLimitMS);
 
                     rc2 = RTProcTerminate(pProcess->hProcess);
-                    VBoxServiceVerbose(3, "[PID %RU32]: Killing process resulted in rc=%Rrc\n",
-                                       pProcess->uPID, rc2);
+                    VGSvcVerbose(3, "[PID %RU32]: Killing process resulted in rc=%Rrc\n",
+                                 pProcess->uPID, rc2);
                     MsProcessKilled = u64Now;
                     continue;
@@ -710 +694 @@
     }
 
-    VBoxServiceVerbose(3, "[PID %RU32]: Loop ended: rc=%Rrc, fShutdown=%RTbool, fProcessAlive=%RTbool, fProcessTimedOut=%RTbool, MsProcessKilled=%RU64\n",
-                       pProcess->uPID, rc, pProcess->fShutdown, fProcessAlive, fProcessTimedOut, MsProcessKilled, MsProcessKilled);
-    VBoxServiceVerbose(3, "[PID %RU32]: *phStdOutR=%s, *phStdErrR=%s\n",
-                       pProcess->uPID,
-                       pProcess->hPipeStdOutR == NIL_RTPIPE ? "closed" : "open",
-                       pProcess->hPipeStdErrR == NIL_RTPIPE ? "closed" : "open");
+    VGSvcVerbose(3, "[PID %RU32]: Loop ended: rc=%Rrc, fShutdown=%RTbool, fProcessAlive=%RTbool, fProcessTimedOut=%RTbool, MsProcessKilled=%RU64\n",
+                 pProcess->uPID, rc, pProcess->fShutdown, fProcessAlive, fProcessTimedOut, MsProcessKilled, MsProcessKilled);
+    VGSvcVerbose(3, "[PID %RU32]: *phStdOutR=%s, *phStdErrR=%s\n",
+                 pProcess->uPID,
+                 pProcess->hPipeStdOutR == NIL_RTPIPE ? "closed" : "open",
+                 pProcess->hPipeStdErrR == NIL_RTPIPE ? "closed" : "open");
 
     /* Signal that this thread is in progress of shutting down. */
-    ASMAtomicXchgBool(&pProcess->fShutdown, true);
+    ASMAtomicWriteBool(&pProcess->fShutdown, true);
 
     /*
@@ -727 +711 @@
         if (MsProcessKilled == UINT64_MAX)
         {
-            VBoxServiceVerbose(2, "[PID %RU32]: Is still alive and not killed yet\n",
-                               pProcess->uPID);
+            VGSvcVerbose(2, "[PID %RU32]: Is still alive and not killed yet\n", pProcess->uPID);
 
             MsProcessKilled = RTTimeMilliTS();
@@ -737 +720 @@
             }
             else if (RT_FAILURE(rc2))
-                VBoxServiceError("PID %RU32]: Killing process failed with rc=%Rrc\n",
-                                 pProcess->uPID, rc2);
+                VGSvcError("PID %RU32]: Killing process failed with rc=%Rrc\n", pProcess->uPID, rc2);
             RTThreadSleep(500);
         }
@@ -744 +726 @@
         for (int i = 0; i < 10 && fProcessAlive; i++)
         {
-            VBoxServiceVerbose(4, "[PID %RU32]: Kill attempt %d/10: Waiting to exit ...\n",
-                               pProcess->uPID, i + 1);
+            VGSvcVerbose(4, "[PID %RU32]: Kill attempt %d/10: Waiting to exit ...\n", pProcess->uPID, i + 1);
             rc2 = RTProcWait(pProcess->hProcess, RTPROCWAIT_FLAGS_NOBLOCK, &ProcessStatus);
             if (RT_SUCCESS(rc2))
             {
-                VBoxServiceVerbose(4, "[PID %RU32]: Kill attempt %d/10: Exited\n",
-                                   pProcess->uPID, i + 1);
+                VGSvcVerbose(4, "[PID %RU32]: Kill attempt %d/10: Exited\n", pProcess->uPID, i + 1);
                 fProcessAlive = false;
                 break;
@@ -756 +736 @@
             if (i >= 5)
             {
-                VBoxServiceVerbose(4, "[PID %RU32]: Kill attempt %d/10: Trying to terminate ...\n",
-                                   pProcess->uPID, i + 1);
+                VGSvcVerbose(4, "[PID %RU32]: Kill attempt %d/10: Trying to terminate ...\n", pProcess->uPID, i + 1);
                 rc2 = RTProcTerminate(pProcess->hProcess);
                 if (   RT_FAILURE(rc)
                     && rc2 != VERR_NOT_FOUND)
-                    VBoxServiceError("PID %RU32]: Killing process failed with rc=%Rrc\n",
+                    VGSvcError("PID %RU32]: Killing process failed with rc=%Rrc\n",
                                      pProcess->uPID, rc2);
             }
@@ -768 +747 @@
 
         if (fProcessAlive)
-            VBoxServiceError("[PID %RU32]: Could not be killed\n", pProcess->uPID);
+            VGSvcError("[PID %RU32]: Could not be killed\n", pProcess->uPID);
     }
 
@@ -783 +762 @@
      */
 
-    rc2 = gstcntlProcessLock(pProcess);
+    rc2 = vgsvcGstCtrlProcessLock(pProcess);
     if (RT_SUCCESS(rc2))
     {
-        VBoxServiceVerbose(3, "[PID %RU32]: Processing outstanding requests ...\n",
-                           pProcess->uPID);
+        VGSvcVerbose(3, "[PID %RU32]: Processing outstanding requests ...\n", pProcess->uPID);
 
         /* Process all pending requests (but don't wait for new ones). */
@@ -794 +772 @@
         if (   RT_FAILURE(rc2)
             && rc2 != VERR_TIMEOUT)
-            VBoxServiceError("[PID %RU32]: Processing outstanding requests failed with with rc=%Rrc\n",
-                             pProcess->uPID, rc2);
-
-        VBoxServiceVerbose(3, "[PID %RU32]: Processing outstanding requests done, rc=%Rrc\n",
-                           pProcess->uPID, rc2);
-
-        rc2 = gstcntlProcessUnlock(pProcess);
+            VGSvcError("[PID %RU32]: Processing outstanding requests failed with with rc=%Rrc\n", pProcess->uPID, rc2);
+
+        VGSvcVerbose(3, "[PID %RU32]: Processing outstanding requests done, rc=%Rrc\n", pProcess->uPID, rc2);
+
+        rc2 = vgsvcGstCtrlProcessUnlock(pProcess);
         AssertRC(rc2);
     }
@@ -811 +787 @@
     {
         uint32_t uStatus = PROC_STS_UNDEFINED;
-        uint32_t uFlags = 0;
+        uint32_t fFlags = 0;
 
         if (     fProcessTimedOut  && !fProcessAlive && MsProcessKilled != UINT64_MAX)
         {
-            VBoxServiceVerbose(3, "[PID %RU32]: Timed out and got killed\n",
-                               pProcess->uPID);
+            VGSvcVerbose(3, "[PID %RU32]: Timed out and got killed\n", pProcess->uPID);
             uStatus = PROC_STS_TOK;
         }
         else if (fProcessTimedOut  &&  fProcessAlive && MsProcessKilled != UINT64_MAX)
         {
-            VBoxServiceVerbose(3, "[PID %RU32]: Timed out and did *not* get killed\n",
-                               pProcess->uPID);
+            VGSvcVerbose(3, "[PID %RU32]: Timed out and did *not* get killed\n", pProcess->uPID);
             uStatus = PROC_STS_TOA;
         }
         else if (pProcess->fShutdown && (fProcessAlive || MsProcessKilled != UINT64_MAX))
         {
-            VBoxServiceVerbose(3, "[PID %RU32]: Got terminated because system/service is about to shutdown\n",
-                               pProcess->uPID);
+            VGSvcVerbose(3, "[PID %RU32]: Got terminated because system/service is about to shutdown\n", pProcess->uPID);
             uStatus = PROC_STS_DWN; /* Service is stopping, process was killed. */
-            uFlags = pProcess->StartupInfo.uFlags; /* Return handed-in execution flags back to the host. */
+            fFlags  = pProcess->StartupInfo.uFlags; /* Return handed-in execution flags back to the host. */
         }
         else if (fProcessAlive)
-        {
-            VBoxServiceError("[PID %RU32]: Is alive when it should not!\n",
-                             pProcess->uPID);
-        }
+            VGSvcError("[PID %RU32]: Is alive when it should not!\n", pProcess->uPID);
         else if (MsProcessKilled != UINT64_MAX)
-        {
-            VBoxServiceError("[PID %RU32]: Has been killed when it should not!\n",
-                             pProcess->uPID);
-        }
+            VGSvcError("[PID %RU32]: Has been killed when it should not!\n", pProcess->uPID);
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_NORMAL)
         {
-            VBoxServiceVerbose(3, "[PID %RU32]: Ended with RTPROCEXITREASON_NORMAL (Exit code: %d)\n",
-                               pProcess->uPID, ProcessStatus.iStatus);
-
+            VGSvcVerbose(3, "[PID %RU32]: Ended with RTPROCEXITREASON_NORMAL (Exit code: %d)\n",
+                         pProcess->uPID, ProcessStatus.iStatus);
             uStatus = PROC_STS_TEN;
-            uFlags = ProcessStatus.iStatus;
+            fFlags  = ProcessStatus.iStatus;
         }
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_SIGNAL)
         {
-            VBoxServiceVerbose(3, "[PID %RU32]: Ended with RTPROCEXITREASON_SIGNAL (Signal: %u)\n",
-                               pProcess->uPID, ProcessStatus.iStatus);
-
+            VGSvcVerbose(3, "[PID %RU32]: Ended with RTPROCEXITREASON_SIGNAL (Signal: %u)\n",
+                         pProcess->uPID, ProcessStatus.iStatus);
             uStatus = PROC_STS_TES;
-            uFlags = ProcessStatus.iStatus;
+            fFlags  = ProcessStatus.iStatus;
         }
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_ABEND)
         {
             /* ProcessStatus.iStatus will be undefined. */
-            VBoxServiceVerbose(3, "[PID %RU32]: Ended with RTPROCEXITREASON_ABEND\n",
-                               pProcess->uPID);
-
+            VGSvcVerbose(3, "[PID %RU32]: Ended with RTPROCEXITREASON_ABEND\n", pProcess->uPID);
             uStatus = PROC_STS_TEA;
-            uFlags = ProcessStatus.iStatus;
+            fFlags  = ProcessStatus.iStatus;
         }
         else
-            VBoxServiceVerbose(1, "[PID %RU32]: Handling process status %u not implemented\n",
-                               pProcess->uPID, ProcessStatus.enmReason);
-
-        VBoxServiceVerbose(2, "[PID %RU32]: Ended, ClientID=%u, CID=%u, Status=%u, Flags=0x%x\n",
-                           pProcess->uPID, pProcess->uClientID, pProcess->uContextID, uStatus, uFlags);
+            VGSvcVerbose(1, "[PID %RU32]: Handling process status %u not implemented\n", pProcess->uPID, ProcessStatus.enmReason);
+        VGSvcVerbose(2, "[PID %RU32]: Ended, ClientID=%u, CID=%u, Status=%u, Flags=0x%x\n",
+                     pProcess->uPID, pProcess->uClientID, pProcess->uContextID, uStatus, fFlags);
 
         VBGLR3GUESTCTRLCMDCTX ctxEnd = { pProcess->uClientID, pProcess->uContextID };
-        rc2 = VbglR3GuestCtrlProcCbStatus(&ctxEnd,
-                                          pProcess->uPID, uStatus, uFlags,
-                                          NULL /* pvData */, 0 /* cbData */);
+        rc2 = VbglR3GuestCtrlProcCbStatus(&ctxEnd, pProcess->uPID, uStatus, fFlags, NULL /* pvData */, 0 /* cbData */);
         if (   RT_FAILURE(rc2)
             && rc2 == VERR_NOT_FOUND)
-            VBoxServiceError("[PID %RU32]: Error reporting final status to host; rc=%Rrc\n",
-                             pProcess->uPID, rc2);
-    }
-
-    VBoxServiceVerbose(3, "[PID %RU32]: Process loop returned with rc=%Rrc\n",
-                       pProcess->uPID, rc);
+            VGSvcError("[PID %RU32]: Error reporting final status to host; rc=%Rrc\n", pProcess->uPID, rc2);
+    }
+
+    VGSvcVerbose(3, "[PID %RU32]: Process loop returned with rc=%Rrc\n", pProcess->uPID, rc);
     return rc;
 }
@@ -897 +854 @@
  * @param   phPipe                  The pipe's object to initialize.
  */
-static int gstcntlProcessInitPipe(PRTHANDLE ph, PRTPIPE phPipe)
+static int vgsvcGstCtrlProcessInitPipe(PRTHANDLE ph, PRTPIPE phPipe)
 {
     AssertPtrReturn(ph, VERR_INVALID_PARAMETER);
@@ -924 +881 @@
  *                              should service.
  */
-static int gstcntlProcessSetupPipe(const char *pszHowTo, int fd,
-                                   PRTHANDLE ph, PRTHANDLE *pph, PRTPIPE phPipe)
+static int vgsvcGstCtrlProcessSetupPipe(const char *pszHowTo, int fd, PRTHANDLE ph, PRTHANDLE *pph, PRTPIPE phPipe)
 {
     AssertPtrReturn(ph, VERR_INVALID_POINTER);
@@ -950 +906 @@
             rc = RTPipeCreate(&ph->u.hPipe, phPipe, RTPIPE_C_INHERIT_READ);
         }
-        else /* stdout or stderr? */
+        else /* stdout or stderr. */
         {
             /* Connect a read pipe specified by phPipe to stdout or stderr. */
@@ -993 +949 @@
  * @param   cbExpanded                  Size (in bytes) of string to store the resolved path.
  */
-static int gstcntlProcessMakeFullPath(const char *pszPath, char *pszExpanded, size_t cbExpanded)
+static int vgsvcGstCtrlProcessMakeFullPath(const char *pszPath, char *pszExpanded, size_t cbExpanded)
 {
     int rc = VINF_SUCCESS;
+/** @todo r=bird: This feature shall be made optional, i.e. require a
+ *        flag to be passed down.  Further, it shall work on the environment
+ *        block of the new process (i.e. include env changes passed down from
+ *        the caller).  I would also suggest using the unix variable expansion
+ *        syntax, not the DOS one.
+ *
+ *        Since this currently not available on non-windows guests, I suggest
+ *        we disable it until such a time as it is implemented correctly. */
 #ifdef RT_OS_WINDOWS
-    if (!ExpandEnvironmentStrings(pszPath, pszExpanded, cbExpanded))
+    if (!ExpandEnvironmentStrings(pszPath, pszExpanded, (DWORD)cbExpanded))
         rc = RTErrConvertFromWin32(GetLastError());
 #else
@@ -1004 +968 @@
 #endif
 #ifdef DEBUG
-    VBoxServiceVerbose(3, "VBoxServiceControlExecMakeFullPath: %s -> %s\n",
-                       pszPath, pszExpanded);
+    VGSvcVerbose(3, "VBoxServiceControlExecMakeFullPath: %s -> %s\n", pszPath, pszExpanded);
 #endif
     return rc;
@@ -1021 +984 @@
  * @param   cbResolved                  Size (in bytes) of resolved file name string.
  */
-static int gstcntlProcessResolveExecutable(const char *pszFileName,
-                                           char *pszResolved, size_t cbResolved)
+static int vgsvcGstCtrlProcessResolveExecutable(const char *pszFileName, char *pszResolved, size_t cbResolved)
 {
     AssertPtrReturn(pszFileName, VERR_INVALID_POINTER);
@@ -1046 +1008 @@
     if (RT_SUCCESS(rc))
     {
-        rc = gstcntlProcessMakeFullPath(szPathToResolve, pszResolved, cbResolved);
+        rc = vgsvcGstCtrlProcessMakeFullPath(szPathToResolve, pszResolved, cbResolved);
         if (RT_SUCCESS(rc))
-            VBoxServiceVerbose(3, "Looked up executable: %s -> %s\n",
-                               pszFileName, pszResolved);
+            VGSvcVerbose(3, "Looked up executable: %s -> %s\n", pszFileName, pszResolved);
     }
 
     if (RT_FAILURE(rc))
-        VBoxServiceError("Failed to lookup executable \"%s\" with rc=%Rrc\n",
-                         pszFileName, rc);
+        VGSvcError("Failed to lookup executable '%s' with rc=%Rrc\n", pszFileName, rc);
     return rc;
 }
@@ -1070 +1030 @@
  *                          Needs to be freed with RTGetOptArgvFree.
  */
-static int gstcntlProcessAllocateArgv(const char *pszArgv0, const char * const *papszArgs, uint32_t fFlags,
-                                      char ***ppapszArgv)
+static int vgsvcGstCtrlProcessAllocateArgv(const char *pszArgv0, const char * const *papszArgs, uint32_t fFlags,
+                                           char ***ppapszArgv)
 {
     AssertPtrReturn(ppapszArgv, VERR_INVALID_POINTER);
 
-    VBoxServiceVerbose(3, "GstCntlProcessPrepareArgv: pszArgv0=%p, papszArgs=%p, fFlags=%#x, ppapszArgv=%p\n",
-                       pszArgv0, papszArgs, fFlags, ppapszArgv);
+    VGSvcVerbose(3, "VGSvcGstCtrlProcessPrepareArgv: pszArgv0=%p, papszArgs=%p, fFlags=%#x, ppapszArgv=%p\n",
+                 pszArgv0, papszArgs, fFlags, ppapszArgv);
 
     int rc = VINF_SUCCESS;
@@ -1087 +1047 @@
 
     /* Allocate new argv vector (adding + 2 for argv0 + termination). */
-    size_t cbSize = (cArgs + 2) * sizeof(char*);
-    char **papszNewArgv = (char**)RTMemAlloc(cbSize);
+    size_t cbSize = (cArgs + 2) * sizeof(char *);
+    char **papszNewArgv = (char **)RTMemAlloc(cbSize);
     if (!papszNewArgv)
         return VERR_NO_MEMORY;
 
 #ifdef DEBUG
-    VBoxServiceVerbose(3, "GstCntlProcessAllocateArgv: cbSize=%RU32, cArgs=%RU32\n",
-                       cbSize, cArgs);
-#endif
-
+    VGSvcVerbose(3, "VGSvcGstCtrlProcessAllocateArgv: cbSize=%RU32, cArgs=%RU32\n", cbSize, cArgs);
+#endif
 
     /* HACK ALERT! Since we still don't allow the user to really specify the first
@@ -1181 +1139 @@
  * @param   uPID           PID to assign to the specified guest control execution thread.
  */
-int gstcntlProcessAssignPID(PVBOXSERVICECTRLPROCESS pProcess, uint32_t uPID)
+static int vgsvcGstCtrlProcessAssignPID(PVBOXSERVICECTRLPROCESS pProcess, uint32_t uPID)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -1204 +1162 @@
                     uint32_t uTriedPID = uPID;
                     uPID += 391939;
-                    VBoxServiceVerbose(2, "PID %RU32 was used before (process %p), trying again with %RU32 ...\n",
+                    VGSvcVerbose(2, "PID %RU32 was used before (process %p), trying again with %RU32 ...\n",
                                        uTriedPID, pProcessCur, uPID);
                     fTryAgain = true;
@@ -1223 +1181 @@
 
 
-void gstcntlProcessFreeArgv(char **papszArgv)
+static void vgsvcGstCtrlProcessFreeArgv(char **papszArgv)
 {
     if (papszArgv)
@@ -1251 +1209 @@
  *                                      successful process start.
  */
-static int gstcntlProcessCreateProcess(const char *pszExec, const char * const *papszArgs, RTENV hEnv, uint32_t fFlags,
-                                       PCRTHANDLE phStdIn, PCRTHANDLE phStdOut, PCRTHANDLE phStdErr, const char *pszAsUser,
-                                       const char *pszPassword, PRTPROCESS phProcess)
+static int vgsvcGstCtrlProcessCreateProcess(const char *pszExec, const char * const *papszArgs, RTENV hEnv, uint32_t fFlags,
+                                            PCRTHANDLE phStdIn, PCRTHANDLE phStdOut, PCRTHANDLE phStdErr, const char *pszAsUser,
+                                            const char *pszPassword, PRTPROCESS phProcess)
 {
     AssertPtrReturn(pszExec, VERR_INVALID_PARAMETER);
@@ -1297 +1255 @@
             if (   RT_SUCCESS(rc)
                 && RTPathExists(szSysWow64))
-                VBoxServiceVerbose(0, "Warning: This service is 32-bit; could not execute sysprep on 64-bit OS!\n");
+                VGSvcVerbose(0, "Warning: This service is 32-bit; could not execute sysprep on 64-bit OS!\n");
 #endif
             if (RT_SUCCESS(rc))
@@ -1305 +1263 @@
 
             if (RT_FAILURE(rc))
-                VBoxServiceError("Failed to detect sysrep location, rc=%Rrc\n", rc);
+                VGSvcError("Failed to detect sysrep location, rc=%Rrc\n", rc);
         }
         else if (!fRet)
-            VBoxServiceError("Failed to retrieve OS information, last error=%ld\n", GetLastError());
-
-        VBoxServiceVerbose(3, "Sysprep executable is: %s\n", szSysprepCmd);
+            VGSvcError("Failed to retrieve OS information, last error=%ld\n", GetLastError());
+
+        VGSvcVerbose(3, "Sysprep executable is: %s\n", szSysprepCmd);
 
         if (RT_SUCCESS(rc))
         {
             char **papszArgsExp;
-            rc = gstcntlProcessAllocateArgv(szSysprepCmd /* argv0 */, papszArgs, fFlags, &papszArgsExp);
+            rc = vgsvcGstCtrlProcessAllocateArgv(szSysprepCmd /* argv0 */, papszArgs, fFlags, &papszArgsExp);
             if (RT_SUCCESS(rc))
             {
@@ -1324 +1282 @@
                                     phStdIn, phStdOut, phStdErr, NULL /* pszAsUser */,
                                     NULL /* pszPassword */, phProcess);
-                gstcntlProcessFreeArgv(papszArgsExp);
+                vgsvcGstCtrlProcessFreeArgv(papszArgsExp);
             }
         }
 
         if (RT_FAILURE(rc))
-            VBoxServiceVerbose(3, "Starting sysprep returned rc=%Rrc\n", rc);
+            VGSvcVerbose(3, "Starting sysprep returned rc=%Rrc\n", rc);
 
         return rc;
@@ -1340 +1298 @@
         /* We want to use the internal toolbox (all internal
          * tools are starting with "vbox_" (e.g. "vbox_cat"). */
-        rc = gstcntlProcessResolveExecutable(VBOXSERVICE_NAME, szExecExp, sizeof(szExecExp));
+        rc = vgsvcGstCtrlProcessResolveExecutable(VBOXSERVICE_NAME, szExecExp, sizeof(szExecExp));
     }
     else
@@ -1348 +1306 @@
          * Do the environment variables expansion on executable and arguments.
          */
-        rc = gstcntlProcessResolveExecutable(pszExec, szExecExp, sizeof(szExecExp));
+        rc = vgsvcGstCtrlProcessResolveExecutable(pszExec, szExecExp, sizeof(szExecExp));
 #ifdef VBOXSERVICE_TOOLBOX
     }
@@ -1357 +1315 @@
         /** @todo r-bird: pszExec != argv[0]! When are you going to get that?!? How many
          * times does this need to be pointed out?  HOST/GUEST INTERFACE IS MISDESIGNED! */
-        rc = gstcntlProcessAllocateArgv(pszExec /* Always use the unmodified executable name as argv0. */,
-                                        papszArgs /* Append the rest of the argument vector (if any). */,
-                                        fFlags, &papszArgsExp);
+        rc = vgsvcGstCtrlProcessAllocateArgv(pszExec /* Always use the unmodified executable name as argv0. */,
+                                             papszArgs /* Append the rest of the argument vector (if any). */,
+                                             fFlags, &papszArgsExp);
         if (RT_FAILURE(rc))
         {
             /* Don't print any arguments -- may contain passwords or other sensible data! */
-            VBoxServiceError("Could not prepare arguments, rc=%Rrc\n", rc);
+            VGSvcError("Could not prepare arguments, rc=%Rrc\n", rc);
         }
         else
@@ -1388 +1346 @@
                 uProcFlags |= RTPROC_FLAGS_SERVICE;
 #ifdef DEBUG
-            VBoxServiceVerbose(3, "Command: %s\n", szExecExp);
+            VGSvcVerbose(3, "Command: %s\n", szExecExp);
             for (size_t i = 0; papszArgsExp[i]; i++)
-                VBoxServiceVerbose(3, "\targv[%ld]: %s\n", i, papszArgsExp[i]);
-#endif
-            VBoxServiceVerbose(3, "Starting process \"%s\" ...\n", szExecExp);
+                VGSvcVerbose(3, "\targv[%ld]: %s\n", i, papszArgsExp[i]);
+#endif
+            VGSvcVerbose(3, "Starting process '%s' ...\n", szExecExp);
 
             /* Do normal execution. */
@@ -1401 +1359 @@
                                 phProcess);
 
-            VBoxServiceVerbose(3, "Starting process \"%s\" returned rc=%Rrc\n",
-                               szExecExp, rc);
-
-            gstcntlProcessFreeArgv(papszArgsExp);
+            VGSvcVerbose(3, "Starting process '%s' returned rc=%Rrc\n", szExecExp, rc);
+
+            vgsvcGstCtrlProcessFreeArgv(papszArgsExp);
         }
     }
@@ -1412 +1369 @@
 
 #ifdef DEBUG
-static int gstcntlProcessDumpToFile(const char *pszFileName, void *pvBuf, size_t cbBuf)
+static int vgsvcGstCtrlProcessDumpToFile(const char *pszFileName, void *pvBuf, size_t cbBuf)
 {
     AssertPtrReturn(pszFileName, VERR_INVALID_POINTER);
@@ -1428 +1385 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(4, "Dumping %ld bytes to \"%s\"\n", cbBuf, szFile);
+        VGSvcVerbose(4, "Dumping %ld bytes to '%s'\n", cbBuf, szFile);
 
         RTFILE fh;
@@ -1441 +1398 @@
     return rc;
 }
-#endif
+#endif /* DEBUG */
 
 
@@ -1450 +1407 @@
  * @param   PVBOXSERVICECTRLPROCESS         Guest process.
  */
-static int gstcntlProcessProcessWorker(PVBOXSERVICECTRLPROCESS pProcess)
+static int vgsvcGstCtrlProcessProcessWorker(PVBOXSERVICECTRLPROCESS pProcess)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
-    VBoxServiceVerbose(3, "Thread of process pThread=0x%p = \"%s\" started\n",
-                       pProcess, pProcess->StartupInfo.szCmd);
+    VGSvcVerbose(3, "Thread of process pThread=0x%p = '%s' started\n", pProcess, pProcess->StartupInfo.szCmd);
 
     int rc = VbglR3GuestCtrlConnect(&pProcess->uClientID);
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("Process thread \"%s\" (%p) failed to connect to the guest control service, rc=%Rrc\n",
-                         pProcess->StartupInfo.szCmd, pProcess, rc);
+        VGSvcError("Process thread '%s' (%p) failed to connect to the guest control service, rc=%Rrc\n",
+                   pProcess->StartupInfo.szCmd, pProcess, rc);
         RTThreadUserSignal(RTThreadSelf());
         return rc;
     }
 
-    VBoxServiceVerbose(3, "Guest process \"%s\" got client ID=%u, flags=0x%x\n",
-                       pProcess->StartupInfo.szCmd, pProcess->uClientID, pProcess->StartupInfo.uFlags);
+    VGSvcVerbose(3, "Guest process '%s' got client ID=%u, flags=0x%x\n",
+                 pProcess->StartupInfo.szCmd, pProcess->uClientID, pProcess->StartupInfo.uFlags);
 
     /* The process thread is not interested in receiving any commands;
@@ -1474 +1430 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("Unable to set message filter, rc=%Rrc\n", rc);
+        VGSvcError("Unable to set message filter, rc=%Rrc\n", rc);
         /* Non-critical. */
     }
 
-    rc = GstCntlSessionProcessAdd(pProcess->pSession, pProcess);
+    rc = VGSvcGstCtrlSessionProcessAdd(pProcess->pSession, pProcess);
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("Errorwhile adding guest process \"%s\" (%p) to session process list, rc=%Rrc\n",
-                         pProcess->StartupInfo.szCmd, pProcess, rc);
+        VGSvcError("Errorwhile adding guest process '%s' (%p) to session process list, rc=%Rrc\n",
+                   pProcess->StartupInfo.szCmd, pProcess, rc);
         RTThreadUserSignal(RTThreadSelf());
         return rc;
@@ -1563 +1519 @@
             RTHANDLE    hStdIn;
             PRTHANDLE   phStdIn;
-            rc = gstcntlProcessSetupPipe("|", 0 /*STDIN_FILENO*/,
+            rc = vgsvcGstCtrlProcessSetupPipe("|", 0 /*STDIN_FILENO*/,
                                          &hStdIn, &phStdIn, &pProcess->hPipeStdInW);
             if (RT_SUCCESS(rc))
@@ -1569 +1525 @@
                 RTHANDLE    hStdOut;
                 PRTHANDLE   phStdOut;
-                rc = gstcntlProcessSetupPipe(  (pProcess->StartupInfo.uFlags & EXECUTEPROCESSFLAG_WAIT_STDOUT)
+                rc = vgsvcGstCtrlProcessSetupPipe(  (pProcess->StartupInfo.uFlags & EXECUTEPROCESSFLAG_WAIT_STDOUT)
                                              ? "|" : "/dev/null",
                                              1 /*STDOUT_FILENO*/,
@@ -1577 +1533 @@
                     RTHANDLE    hStdErr;
                     PRTHANDLE   phStdErr;
-                    rc = gstcntlProcessSetupPipe(  (pProcess->StartupInfo.uFlags & EXECUTEPROCESSFLAG_WAIT_STDERR)
+                    rc = vgsvcGstCtrlProcessSetupPipe(  (pProcess->StartupInfo.uFlags & EXECUTEPROCESSFLAG_WAIT_STDERR)
                                                  ? "|" : "/dev/null",
                                                  2 /*STDERR_FILENO*/,
@@ -1618 +1574 @@
                                 bool fNeedsImpersonation = !(pProcess->pSession->fFlags & VBOXSERVICECTRLSESSION_FLAG_SPAWN);
 
-                                rc = gstcntlProcessCreateProcess(pProcess->StartupInfo.szCmd, papszArgs, hEnv,
+                                rc = vgsvcGstCtrlProcessCreateProcess(pProcess->StartupInfo.szCmd, papszArgs, hEnv,
                                                                  pProcess->StartupInfo.uFlags,
                                                                  phStdIn, phStdOut, phStdErr,
@@ -1625 +1581 @@
                                                                  &pProcess->hProcess);
                                 if (RT_FAILURE(rc))
-                                    VBoxServiceError("Error starting process, rc=%Rrc\n", rc);
+                                    VGSvcError("Error starting process, rc=%Rrc\n", rc);
                                 /*
                                  * Tell the session thread that it can continue
@@ -1650 +1606 @@
 
                                     /* Enter the process main loop. */
-                                    rc = gstcntlProcessProcLoop(pProcess);
+                                    rc = vgsvcGstCtrlProcessProcLoop(pProcess);
 
                                     /*
@@ -1712 +1668 @@
             if (   RT_FAILURE(rc2)
                 && rc2 != VERR_NOT_FOUND)
-                VBoxServiceError("[PID %RU32]: Could not report process failure error; rc=%Rrc (process error %Rrc)\n",
-                                 pProcess->uPID, rc2, rc);
+                VGSvcError("[PID %RU32]: Could not report process failure error; rc=%Rrc (process error %Rrc)\n",
+                           pProcess->uPID, rc2, rc);
         }
 
         /* Disconnect this client from the guest control service. This also cancels all
          * outstanding host requests. */
-        VBoxServiceVerbose(3, "[PID %RU32]: Disconnecting (client ID=%u) ...\n",
-                           pProcess->uPID, pProcess->uClientID);
+        VGSvcVerbose(3, "[PID %RU32]: Disconnecting (client ID=%u) ...\n", pProcess->uPID, pProcess->uClientID);
         VbglR3GuestCtrlDisconnect(pProcess->uClientID);
         pProcess->uClientID = 0;
@@ -1741 +1696 @@
         RTThreadUserSignal(RTThreadSelf());
 
-    VBoxServiceVerbose(3, "[PID %RU32]: Thread of process \"%s\" ended with rc=%Rrc\n",
-                       pProcess->uPID, pProcess->StartupInfo.szCmd, rc);
+    VGSvcVerbose(3, "[PID %RU32]: Thread of process '%s' ended with rc=%Rrc\n",
+                 pProcess->uPID, pProcess->StartupInfo.szCmd, rc);
 
     /* Finally, update stopped status. */
@@ -1751 +1706 @@
 
 
-static int gstcntlProcessLock(PVBOXSERVICECTRLPROCESS pProcess)
+static int vgsvcGstCtrlProcessLock(PVBOXSERVICECTRLPROCESS pProcess)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -1768 +1723 @@
  *
  */
-static DECLCALLBACK(int) gstcntlProcessThread(RTTHREAD ThreadSelf, void *pvUser)
+static DECLCALLBACK(int) vgsvcGstCtrlProcessThread(RTTHREAD ThreadSelf, void *pvUser)
 {
     PVBOXSERVICECTRLPROCESS pProcess = (VBOXSERVICECTRLPROCESS*)pvUser;
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
-    return gstcntlProcessProcessWorker(pProcess);
-}
-
-
-static int gstcntlProcessUnlock(PVBOXSERVICECTRLPROCESS pProcess)
+    return vgsvcGstCtrlProcessProcessWorker(pProcess);
+}
+
+
+static int vgsvcGstCtrlProcessUnlock(PVBOXSERVICECTRLPROCESS pProcess)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -1795 +1750 @@
 
  */
-int GstCntlProcessStart(const PVBOXSERVICECTRLSESSION pSession,
-                        const PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo,
-                        uint32_t uContextID)
+int VGSvcGstCtrlProcessStart(const PVBOXSERVICECTRLSESSION pSession,
+                             const PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo, uint32_t uContextID)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -1809 +1763 @@
         return VERR_NO_MEMORY;
 
-    int rc = gstcntlProcessInit(pProcess, pSession, pStartupInfo, uContextID);
+    int rc = vgsvcGstCtrlProcessInit(pProcess, pSession, pStartupInfo, uContextID);
     if (RT_SUCCESS(rc))
     {
@@ -1815 +1769 @@
         if (s_uCtrlExecThread++ == UINT32_MAX)
             s_uCtrlExecThread = 0; /* Wrap around to not let IPRT freak out. */
-        rc = RTThreadCreateF(&pProcess->Thread, gstcntlProcessThread,
+        rc = RTThreadCreateF(&pProcess->Thread, vgsvcGstCtrlProcessThread,
                              pProcess /*pvUser*/, 0 /*cbStack*/,
                              RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "gctl%u", s_uCtrlExecThread);
         if (RT_FAILURE(rc))
         {
-            VBoxServiceError("Creating thread for guest process \"%s\" failed: rc=%Rrc, pProcess=%p\n",
-                             pStartupInfo->szCmd, rc, pProcess);
-
-            GstCntlProcessFree(pProcess);
+            VGSvcError("Creating thread for guest process '%s' failed: rc=%Rrc, pProcess=%p\n",
+                       pStartupInfo->szCmd, rc, pProcess);
+
+            VGSvcGstCtrlProcessFree(pProcess);
         }
         else
         {
-            VBoxServiceVerbose(4, "Waiting for thread to initialize ...\n");
+            VGSvcVerbose(4, "Waiting for thread to initialize ...\n");
 
             /* Wait for the thread to initialize. */
@@ -1835 +1789 @@
                 || RT_FAILURE(rc))
             {
-                VBoxServiceError("Thread for process \"%s\" failed to start, rc=%Rrc\n",
-                                 pStartupInfo->szCmd, rc);
-
-                GstCntlProcessFree(pProcess);
+                VGSvcError("Thread for process '%s' failed to start, rc=%Rrc\n", pStartupInfo->szCmd, rc);
+                VGSvcGstCtrlProcessFree(pProcess);
             }
             else
@@ -1851 +1803 @@
 
 
-static DECLCALLBACK(int) gstcntlProcessOnInput(PVBOXSERVICECTRLPROCESS pThis,
-                                               const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                               bool fPendingClose, void *pvBuf, uint32_t cbBuf)
+static DECLCALLBACK(int) vgsvcGstCtrlProcessOnInput(PVBOXSERVICECTRLPROCESS pThis,
+                                                    const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                                    bool fPendingClose, void *pvBuf, uint32_t cbBuf)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
@@ -1864 +1816 @@
     {
         if (pThis->hPipeStdInW != NIL_RTPIPE)
-        {
-            rc = RTPipeWrite(pThis->hPipeStdInW,
-                             pvBuf, cbBuf, &cbWritten);
-        }
+            rc = RTPipeWrite(pThis->hPipeStdInW, pvBuf, cbBuf, &cbWritten);
         else
             rc = VINF_EOF;
@@ -1880 +1829 @@
      */
     if (   fPendingClose
-        && (cbBuf == cbWritten))
-    {
-        int rc2 = gstcntlProcessPollsetCloseInput(pThis, &pThis->hPipeStdInW);
+        && cbBuf == cbWritten)
+    {
+        int rc2 = vgsvcGstCtrlProcessPollsetCloseInput(pThis, &pThis->hPipeStdInW);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -1888 +1837 @@
 
     uint32_t uStatus = INPUT_STS_UNDEFINED; /* Status to send back to the host. */
-    uint32_t uFlags = 0; /* No flags at the moment. */
+    uint32_t fFlags = 0; /* No flags at the moment. */
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(4, "[PID %RU32]: Written %RU32 bytes input, CID=%RU32, fPendingClose=%RTbool\n",
-                           pThis->uPID, cbWritten, pHostCtx->uContextID, fPendingClose);
+        VGSvcVerbose(4, "[PID %RU32]: Written %RU32 bytes input, CID=%RU32, fPendingClose=%RTbool\n",
+                     pThis->uPID, cbWritten, pHostCtx->uContextID, fPendingClose);
         uStatus = INPUT_STS_WRITTEN;
     }
@@ -1912 +1861 @@
     {
         uStatus = INPUT_STS_ERROR;
-        uFlags = rc;
+        fFlags = rc; /* funny thing to call a "flag"... */
     }
     Assert(uStatus > INPUT_STS_UNDEFINED);
 
-#ifdef DEBUG
-
-#endif
-    int rc2 = VbglR3GuestCtrlProcCbStatusInput(pHostCtx, pThis->uPID,
-                                               uStatus, uFlags, (uint32_t)cbWritten);
+    int rc2 = VbglR3GuestCtrlProcCbStatusInput(pHostCtx, pThis->uPID, uStatus, fFlags, (uint32_t)cbWritten);
     if (RT_SUCCESS(rc))
         rc = rc2;
 
 #ifdef DEBUG
-    VBoxServiceVerbose(3, "[PID %RU32]: gstcntlProcessOnInput returned with rc=%Rrc\n",
-                       pThis->uPID, rc);
+    VGSvcVerbose(3, "[PID %RU32]: vgsvcGstCtrlProcessOnInput returned with rc=%Rrc\n", pThis->uPID, rc);
 #endif
     return VINF_SUCCESS; /** @todo Return rc here as soon as RTReqQueue todos are fixed. */
@@ -1932 +1876 @@
 
 
-static DECLCALLBACK(int) gstcntlProcessOnOutput(PVBOXSERVICECTRLPROCESS pThis,
-                                                const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                                uint32_t uHandle, uint32_t cbToRead, uint32_t uFlags)
+static DECLCALLBACK(int) vgsvcGstCtrlProcessOnOutput(PVBOXSERVICECTRLPROCESS pThis,
+                                                     const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                                     uint32_t uHandle, uint32_t cbToRead, uint32_t fFlags)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
@@ -1948 +1892 @@
     if (pvBuf)
     {
-        PRTPIPE phPipe =   uHandle == OUTPUT_HANDLE_ID_STDOUT
-                         ? &pThis->hPipeStdOutR
-                         : &pThis->hPipeStdErrR;
+        PRTPIPE phPipe = uHandle == OUTPUT_HANDLE_ID_STDOUT
+                       ? &pThis->hPipeStdOutR
+                       : &pThis->hPipeStdErrR;
         AssertPtr(phPipe);
 
@@ -1978 +1922 @@
                )
             {
+                /** @todo r=bird: vgsvcGstCtrlProcessDumpToFile(void *pvBuf, size_t cbBuf, const char *pszFileNmFmt, ...) */
                 char szDumpFile[RTPATH_MAX];
                 if (!RTStrPrintf(szDumpFile, sizeof(szDumpFile), "VBoxService_Session%RU32_PID%RU32_StdOut.txt",
                                  pSession->StartupInfo.uSessionID, pThis->uPID)) rc = VERR_BUFFER_UNDERFLOW;
                 if (RT_SUCCESS(rc))
-                    rc = gstcntlProcessDumpToFile(szDumpFile, pvBuf, cbRead);
+                    rc = vgsvcGstCtrlProcessDumpToFile(szDumpFile, pvBuf, cbRead);
                 AssertRC(rc);
             }
@@ -1993 +1938 @@
                     rc = VERR_BUFFER_UNDERFLOW;
                 if (RT_SUCCESS(rc))
-                    rc = gstcntlProcessDumpToFile(szDumpFile, pvBuf, cbRead);
+                    rc = vgsvcGstCtrlProcessDumpToFile(szDumpFile, pvBuf, cbRead);
                 AssertRC(rc);
             }
@@ -2002 +1947 @@
         {
 #ifdef DEBUG
-            VBoxServiceVerbose(3, "[PID %RU32]: Read %RU32 bytes output: uHandle=%RU32, CID=%RU32, uFlags=%x\n",
-                               pThis->uPID, cbRead, uHandle, pHostCtx->uContextID, uFlags);
+            VGSvcVerbose(3, "[PID %RU32]: Read %RU32 bytes output: uHandle=%RU32, CID=%RU32, fFlags=%x\n",
+                         pThis->uPID, cbRead, uHandle, pHostCtx->uContextID, fFlags);
 #endif
             /** Note: Don't convert/touch/modify/whatever the output data here! This might be binary
@@ -2011 +1956 @@
              *       regardless whether we got data or not! Otherwise the waiting events
              *       on the host never will get completed! */
-            rc = VbglR3GuestCtrlProcCbOutput(pHostCtx, pThis->uPID, uHandle, uFlags,
-                                             pvBuf, cbRead);
+            Assert((uint32_t)cbRead == cbRead);
+            rc = VbglR3GuestCtrlProcCbOutput(pHostCtx, pThis->uPID, uHandle, fFlags, pvBuf, (uint32_t)cbRead);
             if (   RT_FAILURE(rc)
                 && rc == VERR_NOT_FOUND) /* Not critical if guest PID is not found on the host (anymore). */
@@ -2024 +1969 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(3, "[PID %RU32]: Reading output returned with rc=%Rrc\n",
-                       pThis->uPID, rc);
+    VGSvcVerbose(3, "[PID %RU32]: Reading output returned with rc=%Rrc\n", pThis->uPID, rc);
 #endif
     return VINF_SUCCESS; /** @todo Return rc here as soon as RTReqQueue todos are fixed. */
@@ -2031 +1975 @@
 
 
-static DECLCALLBACK(int) gstcntlProcessOnTerm(PVBOXSERVICECTRLPROCESS pThis)
+static DECLCALLBACK(int) vgsvcGstCtrlProcessOnTerm(PVBOXSERVICECTRLPROCESS pThis)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
 
     if (!ASMAtomicXchgBool(&pThis->fShutdown, true))
-    {
-        VBoxServiceVerbose(3, "[PID %RU32]: Setting shutdown flag ...\n",
-                           pThis->uPID);
-    }
+        VGSvcVerbose(3, "[PID %RU32]: Setting shutdown flag ...\n", pThis->uPID);
 
     return VINF_SUCCESS; /** @todo Return rc here as soon as RTReqQueue todos are fixed. */
@@ -2045 +1986 @@
 
 
-int gstcntlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                             bool fAsync, RTMSINTERVAL uTimeoutMS, PRTREQ pReq, PFNRT pfnFunction,
-                             unsigned cArgs, va_list Args)
+static int vgsvcGstCtrlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx, bool fAsync,
+                                         RTMSINTERVAL uTimeoutMS, PRTREQ pReq, PFNRT pfnFunction, unsigned cArgs, va_list Args)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -2055 +1995 @@
         AssertPtrReturn(pfnFunction, VERR_INVALID_POINTER);
 
-    int rc = gstcntlProcessLock(pProcess);
+    int rc = vgsvcGstCtrlProcessLock(pProcess);
     if (RT_SUCCESS(rc))
     {
 #ifdef DEBUG
-    VBoxServiceVerbose(3, "[PID %RU32]: gstcntlProcessRequestExV fAsync=%RTbool, uTimeoutMS=%RU32, cArgs=%u\n",
-                       pProcess->uPID, fAsync, uTimeoutMS, cArgs);
-#endif
-        uint32_t uFlags = RTREQFLAGS_IPRT_STATUS;
+        VGSvcVerbose(3, "[PID %RU32]: vgsvcGstCtrlProcessRequestExV fAsync=%RTbool, uTimeoutMS=%RU32, cArgs=%u\n",
+                     pProcess->uPID, fAsync, uTimeoutMS, cArgs);
+#endif
+        uint32_t fFlags = RTREQFLAGS_IPRT_STATUS;
         if (fAsync)
         {
             Assert(uTimeoutMS == 0);
-            uFlags |= RTREQFLAGS_NO_WAIT;
-        }
-
-        rc = RTReqQueueCallV(pProcess->hReqQueue, &pReq, uTimeoutMS, uFlags,
-                             pfnFunction, cArgs, Args);
+            fFlags |= RTREQFLAGS_NO_WAIT;
+        }
+
+        rc = RTReqQueueCallV(pProcess->hReqQueue, &pReq, uTimeoutMS, fFlags, pfnFunction, cArgs, Args);
         if (RT_SUCCESS(rc))
         {
@@ -2081 +2020 @@
                 && cbWritten != 1)
             {
-                VBoxServiceError("[PID %RU32]: Notification pipe got %zu bytes instead of 1\n",
+                VGSvcError("[PID %RU32]: Notification pipe got %zu bytes instead of 1\n",
                                  pProcess->uPID, cbWritten);
             }
             else if (RT_UNLIKELY(RT_FAILURE(rc)))
-                VBoxServiceError("[PID %RU32]: Writing to notification pipe failed, rc=%Rrc\n",
+                VGSvcError("[PID %RU32]: Writing to notification pipe failed, rc=%Rrc\n",
                                  pProcess->uPID, rc);
         }
         else
-            VBoxServiceError("[PID %RU32]: RTReqQueueCallV failed, rc=%Rrc\n",
+            VGSvcError("[PID %RU32]: RTReqQueueCallV failed, rc=%Rrc\n",
                              pProcess->uPID, rc);
 
-        int rc2 = gstcntlProcessUnlock(pProcess);
+        int rc2 = vgsvcGstCtrlProcessUnlock(pProcess);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -2098 +2037 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(3, "[PID %RU32]: gstcntlProcessRequestExV returned rc=%Rrc\n",
-                       pProcess->uPID, rc);
+    VGSvcVerbose(3, "[PID %RU32]: vgsvcGstCtrlProcessRequestExV returned rc=%Rrc\n", pProcess->uPID, rc);
 #endif
     return rc;
@@ -2105 +2043 @@
 
 
-int gstcntlProcessRequestAsync(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                               PFNRT pfnFunction, unsigned cArgs, ...)
+static int vgsvcGstCtrlProcessRequestAsync(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                           PFNRT pfnFunction, unsigned cArgs, ...)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -2114 +2052 @@
     va_list va;
     va_start(va, cArgs);
-    int rc = gstcntlProcessRequestExV(pProcess, pHostCtx, true /* fAsync */, 0 /* uTimeoutMS */,
-                                      NULL /* pReq */, pfnFunction, cArgs, va);
+    int rc = vgsvcGstCtrlProcessRequestExV(pProcess, pHostCtx, true /* fAsync */, 0 /* uTimeoutMS */,
+                                           NULL /* pReq */, pfnFunction, cArgs, va);
     va_end(va);
 
@@ -2122 +2060 @@
 
 
-int gstcntlProcessRequestWait(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                              RTMSINTERVAL uTimeoutMS, PRTREQ pReq, PFNRT pfnFunction, unsigned cArgs, ...)
+#if 0 /* unused */
+static int vgsvcGstCtrlProcessRequestWait(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                          RTMSINTERVAL uTimeoutMS, PRTREQ pReq, PFNRT pfnFunction, unsigned cArgs, ...)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -2131 +2070 @@
     va_list va;
     va_start(va, cArgs);
-    int rc = gstcntlProcessRequestExV(pProcess, pHostCtx, false /* fAsync */, uTimeoutMS,
-                                      pReq, pfnFunction, cArgs, va);
+    int rc = vgsvcGstCtrlProcessRequestExV(pProcess, pHostCtx, false /* fAsync */, uTimeoutMS,
+                                           pReq, pfnFunction, cArgs, va);
     va_end(va);
 
     return rc;
 }
-
-
-int GstCntlProcessHandleInput(PVBOXSERVICECTRLPROCESS pProcess, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                              bool fPendingClose, void *pvBuf, uint32_t cbBuf)
+#endif
+
+
+int VGSvcGstCtrlProcessHandleInput(PVBOXSERVICECTRLPROCESS pProcess, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                   bool fPendingClose, void *pvBuf, uint32_t cbBuf)
 {
     if (!ASMAtomicReadBool(&pProcess->fShutdown))
-        return gstcntlProcessRequestAsync(pProcess, pHostCtx, (PFNRT)gstcntlProcessOnInput,
-                                          5 /* cArgs */, pProcess, pHostCtx, fPendingClose, pvBuf, cbBuf);
-
-    return gstcntlProcessOnInput(pProcess, pHostCtx, fPendingClose, pvBuf, cbBuf);
-}
-
-
-int GstCntlProcessHandleOutput(PVBOXSERVICECTRLPROCESS pProcess, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                               uint32_t uHandle, uint32_t cbToRead, uint32_t uFlags)
+        return vgsvcGstCtrlProcessRequestAsync(pProcess, pHostCtx, (PFNRT)vgsvcGstCtrlProcessOnInput,
+                                               5 /* cArgs */, pProcess, pHostCtx, fPendingClose, pvBuf, cbBuf);
+
+    return vgsvcGstCtrlProcessOnInput(pProcess, pHostCtx, fPendingClose, pvBuf, cbBuf);
+}
+
+
+int VGSvcGstCtrlProcessHandleOutput(PVBOXSERVICECTRLPROCESS pProcess, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                    uint32_t uHandle, uint32_t cbToRead, uint32_t fFlags)
 {
     if (!ASMAtomicReadBool(&pProcess->fShutdown))
-        return gstcntlProcessRequestAsync(pProcess, pHostCtx, (PFNRT)gstcntlProcessOnOutput,
-                                          5 /* cArgs */, pProcess, pHostCtx, uHandle, cbToRead, uFlags);
-
-    return gstcntlProcessOnOutput(pProcess, pHostCtx, uHandle, cbToRead, uFlags);
-}
-
-
-int GstCntlProcessHandleTerm(PVBOXSERVICECTRLPROCESS pProcess)
+        return vgsvcGstCtrlProcessRequestAsync(pProcess, pHostCtx, (PFNRT)vgsvcGstCtrlProcessOnOutput,
+                                               5 /* cArgs */, pProcess, pHostCtx, uHandle, cbToRead, fFlags);
+
+    return vgsvcGstCtrlProcessOnOutput(pProcess, pHostCtx, uHandle, cbToRead, fFlags);
+}
+
+
+int VGSvcGstCtrlProcessHandleTerm(PVBOXSERVICECTRLPROCESS pProcess)
 {
     if (!ASMAtomicReadBool(&pProcess->fShutdown))
-        return gstcntlProcessRequestAsync(pProcess, NULL /* pHostCtx */, (PFNRT)gstcntlProcessOnTerm,
-                                          1 /* cArgs */, pProcess);
-
-    return gstcntlProcessOnTerm(pProcess);
-}
-
+        return vgsvcGstCtrlProcessRequestAsync(pProcess, NULL /* pHostCtx */, (PFNRT)vgsvcGstCtrlProcessOnTerm,
+                                               1 /* cArgs */, pProcess);
+
+    return vgsvcGstCtrlProcessOnTerm(pProcess);
+}
+

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

@@ -42 +42 @@
 
 /*********************************************************************************************************************************
-*   Externals                                                                                                                    *
+*   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
-extern RTLISTANCHOR                g_lstControlSessionThreads;
-extern VBOXSERVICECTRLSESSION      g_Session;
-
-extern int                  VBoxServiceLogCreate(const char *pszLogFile);
-extern void                 VBoxServiceLogDestroy(void);
-
-
-/*********************************************************************************************************************************
-*   Internal Functions                                                                                                           *
-*********************************************************************************************************************************/
-static int                  gstcntlSessionFileDestroy(PVBOXSERVICECTRLFILE pFile);
-static int                  gstcntlSessionFileAdd(PVBOXSERVICECTRLSESSION pSession, PVBOXSERVICECTRLFILE pFile);
-static PVBOXSERVICECTRLFILE gstcntlSessionFileGetLocked(const PVBOXSERVICECTRLSESSION pSession, uint32_t uHandle);
-static DECLCALLBACK(int)    gstcntlSessionThread(RTTHREAD ThreadSelf, void *pvUser);
-/* Host -> Guest handlers. */
-static int                  gstcntlSessionHandleDirRemove(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandleFileOpen(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandleFileClose(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandleFileRead(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandleFileWrite(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx, void *pvScratchBuf, size_t cbScratchBuf);
-static int                  gstcntlSessionHandleFileSeek(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandleFileTell(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandlePathRename(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandleProcExec(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandleProcInput(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx, void *pvScratchBuf, size_t cbScratchBuf);
-static int                  gstcntlSessionHandleProcOutput(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandleProcTerminate(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-static int                  gstcntlSessionHandleProcWaitFor(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx);
-
-
 /** Generic option indices for session spawn arguments. */
 enum
@@ -90 +60 @@
 
 
-static int gstcntlSessionFileDestroy(PVBOXSERVICECTRLFILE pFile)
+
+static int vgsvcGstCtrlSessionFileDestroy(PVBOXSERVICECTRLFILE pFile)
 {
     AssertPtrReturn(pFile, VERR_INVALID_POINTER);
@@ -108 +79 @@
 
 /** @todo No locking done yet! */
-static PVBOXSERVICECTRLFILE gstcntlSessionFileGetLocked(const PVBOXSERVICECTRLSESSION pSession,
-                                                        uint32_t uHandle)
+static PVBOXSERVICECTRLFILE vgsvcGstCtrlSessionFileGetLocked(const PVBOXSERVICECTRLSESSION pSession, uint32_t uHandle)
 {
     AssertPtrReturn(pSession, NULL);
 
-    PVBOXSERVICECTRLFILE pFileCur = NULL;
     /** @todo Use a map later! */
+    PVBOXSERVICECTRLFILE pFileCur;
     RTListForEach(&pSession->lstFiles, pFileCur, VBOXSERVICECTRLFILE, Node)
     {
@@ -125 +95 @@
 
 
-static int gstcntlSessionHandleDirRemove(PVBOXSERVICECTRLSESSION pSession,
-                                         PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+static int vgsvcGstCtrlSessionHandleDirRemove(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -158 +127 @@
             rc = VERR_NOT_SUPPORTED;
 
-        VBoxServiceVerbose(4, "[Dir %s]: Removing with fFlags=0x%x, rc=%Rrc\n", szDir, fFlags, rc);
+        VGSvcVerbose(4, "[Dir %s]: Removing with fFlags=0x%x, rc=%Rrc\n", szDir, fFlags, rc);
 
         /* Report back in any case. */
         int rc2 = VbglR3GuestCtrlMsgReply(pHostCtx, rc);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("[Dir %s]: Failed to report removing status, rc=%Rrc\n", szDir, rc2);
+            VGSvcError("[Dir %s]: Failed to report removing status, rc=%Rrc\n", szDir, rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -169 +138 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Removing directory \"%s\" returned rc=%Rrc\n", szDir, rc);
-#endif
-    return rc;
-}
-
-
-static int gstcntlSessionHandleFileOpen(PVBOXSERVICECTRLSESSION pSession,
-                                        PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+    VGSvcVerbose(4, "Removing directory '%s' returned rc=%Rrc\n", szDir, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandleFileOpen(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -186 +154 @@
     char szSharing[64];
     uint32_t uCreationMode = 0;
-    uint64_t uOffset = 0;
+    uint64_t offOpen = 0;
     uint32_t uHandle = 0;
 
@@ -201 +169 @@
                                         &uCreationMode,
                                         /* Offset. */
-                                        &uOffset);
-    VBoxServiceVerbose(4, "[File %s]: szAccess=%s, szDisposition=%s, szSharing=%s, uOffset=%RU64, rc=%Rrc\n",
-                       szFile, szAccess, szDisposition, szSharing, uOffset, rc);
-
+                                        &offOpen);
+    VGSvcVerbose(4, "[File %s]: szAccess=%s, szDisposition=%s, szSharing=%s, offOpen=%RU64, rc=%Rrc\n",
+                 szFile, szAccess, szDisposition, szSharing, offOpen, rc);
     if (RT_SUCCESS(rc))
     {
@@ -215 +182 @@
             if (RT_SUCCESS(rc))
             {
+                /** @todo r=bird: Plase, use RTStrCopy for stuff like this! */
                 RTStrPrintf(pFile->szName, sizeof(pFile->szName), "%s", szFile);
 
                 uint64_t fFlags;
-                rc = RTFileModeToFlagsEx(szAccess, szDisposition,
-                                         NULL /* pszSharing, not used yet */, &fFlags);
-                VBoxServiceVerbose(4, "[File %s]: Opening with fFlags=0x%x, rc=%Rrc\n", pFile->szName, fFlags, rc);
+                rc = RTFileModeToFlagsEx(szAccess, szDisposition, NULL /* pszSharing, not used yet */, &fFlags);
+                VGSvcVerbose(4, "[File %s]: Opening with fFlags=0x%x, rc=%Rrc\n", pFile->szName, fFlags, rc);
 
                 if (RT_SUCCESS(rc))
                     rc = RTFileOpen(&pFile->hFile, pFile->szName, fFlags);
                 if (   RT_SUCCESS(rc)
-                    && uOffset)
+                    && offOpen)
                 {
                     /* Seeking is optional. However, the whole operation
                      * will fail if we don't succeed seeking to the wanted position. */
-                    rc = RTFileSeek(pFile->hFile, (int64_t)uOffset, RTFILE_SEEK_BEGIN, NULL /* Current offset */);
+                    rc = RTFileSeek(pFile->hFile, (int64_t)offOpen, RTFILE_SEEK_BEGIN, NULL /* Current offset */);
                     if (RT_FAILURE(rc))
-                        VBoxServiceError("[File %s]: Seeking to offset %RU64 failed; rc=%Rrc\n",
-                                         pFile->szName, uOffset, rc);
+                        VGSvcError("[File %s]: Seeking to offset %RU64 failed; rc=%Rrc\n", pFile->szName, offOpen, rc);
                 }
                 else if (RT_FAILURE(rc))
-                    VBoxServiceError("[File %s]: Opening failed with rc=%Rrc\n", pFile->szName, rc);
+                    VGSvcError("[File %s]: Opening failed with rc=%Rrc\n", pFile->szName, rc);
             }
 
@@ -243 +209 @@
                 pFile->uHandle = uHandle;
 
-                /* rc = */ RTListAppend(&pSession->lstFiles, &pFile->Node);
-
-                VBoxServiceVerbose(3, "[File %s]: Opened (ID=%RU32)\n",
-                                   pFile->szName, pFile->uHandle);
+                RTListAppend(&pSession->lstFiles, &pFile->Node);
+
+                VGSvcVerbose(3, "[File %s]: Opened (ID=%RU32)\n", pFile->szName, pFile->uHandle);
             }
 
@@ -262 +227 @@
         int rc2 = VbglR3GuestCtrlFileCbOpen(pHostCtx, rc, uHandle);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("[File %s]: Failed to report file open status, rc=%Rrc\n",
-                             szFile, rc2);
+            VGSvcError("[File %s]: Failed to report file open status, rc=%Rrc\n", szFile, rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -269 +233 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Opening file \"%s\" (open mode=\"%s\", disposition=\"%s\", creation mode=0x%x returned rc=%Rrc\n",
-                       szFile, szAccess, szDisposition, uCreationMode, rc);
-#endif
-    return rc;
-}
-
-
-static int gstcntlSessionHandleFileClose(const PVBOXSERVICECTRLSESSION pSession,
-                                         PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+    VGSvcVerbose(4, "Opening file '%s' (open mode='%s', disposition='%s', creation mode=0x%x returned rc=%Rrc\n",
+                 szFile, szAccess, szDisposition, uCreationMode, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandleFileClose(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -288 +251 @@
     if (RT_SUCCESS(rc))
     {
-        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = vgsvcGstCtrlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
-        {
-            rc = gstcntlSessionFileDestroy(pFile);
-        }
+            rc = vgsvcGstCtrlSessionFileDestroy(pFile);
         else
             rc = VERR_NOT_FOUND;
@@ -299 +260 @@
         int rc2 = VbglR3GuestCtrlFileCbClose(pHostCtx, rc);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to report file close status, rc=%Rrc\n", rc2);
+            VGSvcError("Failed to report file close status, rc=%Rrc\n", rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -305 +266 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Closing file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
-                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
-#endif
-    return rc;
-}
-
-
-static int gstcntlSessionHandleFileRead(const PVBOXSERVICECTRLSESSION pSession,
-                                        PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                        void *pvScratchBuf, size_t cbScratchBuf)
+    VGSvcVerbose(4, "Closing file '%s' (handle=%RU32) returned rc=%Rrc\n", pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandleFileRead(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                             void *pvScratchBuf, size_t cbScratchBuf)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -329 +288 @@
         size_t cbRead = 0;
 
-        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = vgsvcGstCtrlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
@@ -357 +316 @@
 
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to report file read status, rc=%Rrc\n", rc2);
+            VGSvcError("Failed to report file read status, rc=%Rrc\n", rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -363 +322 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Reading file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
-                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
-#endif
-    return rc;
-}
-
-
-static int gstcntlSessionHandleFileReadAt(const PVBOXSERVICECTRLSESSION pSession,
-                                          PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                          void *pvScratchBuf, size_t cbScratchBuf)
+    VGSvcVerbose(4, "Reading file '%s' (handle=%RU32) returned rc=%Rrc\n", pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandleFileReadAt(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                               void *pvScratchBuf, size_t cbScratchBuf)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -380 +337 @@
 
     uint32_t uHandle = 0;
-    uint32_t cbToRead; int64_t iOffset;
-
-    int rc = VbglR3GuestCtrlFileGetReadAt(pHostCtx,
-                                          &uHandle, &cbToRead, (uint64_t *)&iOffset);
+    uint32_t cbToRead;
+    uint64_t offReadAt;
+    int rc = VbglR3GuestCtrlFileGetReadAt(pHostCtx, &uHandle, &cbToRead, &offReadAt);
     if (RT_SUCCESS(rc))
     {
@@ -389 +345 @@
         size_t cbRead = 0;
 
-        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = vgsvcGstCtrlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
@@ -401 +357 @@
                 }
 
-                if (RT_LIKELY(RT_SUCCESS(rc)))
-                    rc = RTFileReadAt(pFile->hFile, iOffset, pvDataRead, cbToRead, &cbRead);
+                if (RT_SUCCESS(rc))
+                    rc = RTFileReadAt(pFile->hFile, (RTFOFF)offReadAt, pvDataRead, cbToRead, &cbRead);
             }
             else
@@ -417 +373 @@
 
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to report file read status, rc=%Rrc\n", rc2);
+            VGSvcError("Failed to report file read status, rc=%Rrc\n", rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -423 +379 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Reading file \"%s\" at offset (handle=%RU32) returned rc=%Rrc\n",
-                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
-#endif
-    return rc;
-}
-
-
-static int gstcntlSessionHandleFileWrite(const PVBOXSERVICECTRLSESSION pSession,
-                                         PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                         void *pvScratchBuf, size_t cbScratchBuf)
+    VGSvcVerbose(4, "Reading file '%s' at offset (handle=%RU32) returned rc=%Rrc\n",
+                 pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandleFileWrite(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                              void *pvScratchBuf, size_t cbScratchBuf)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -443 +398 @@
     uint32_t uHandle = 0;
     uint32_t cbToWrite;
-
-    int rc = VbglR3GuestCtrlFileGetWrite(pHostCtx, &uHandle,
-                                         pvScratchBuf, (uint32_t)cbScratchBuf, &cbToWrite);
+    int rc = VbglR3GuestCtrlFileGetWrite(pHostCtx, &uHandle, pvScratchBuf, (uint32_t)cbScratchBuf, &cbToWrite);
     if (RT_SUCCESS(rc))
     {
         size_t cbWritten = 0;
-        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = vgsvcGstCtrlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
             rc = RTFileWrite(pFile->hFile, pvScratchBuf, cbToWrite, &cbWritten);
 #ifdef DEBUG
-            VBoxServiceVerbose(4, "[File %s]: Writing pvScratchBuf=%p, cbToWrite=%RU32, cbWritten=%zu, rc=%Rrc\n",
-                               pFile->szName, pvScratchBuf, cbToWrite, cbWritten, rc);
+            VGSvcVerbose(4, "[File %s]: Writing pvScratchBuf=%p, cbToWrite=%RU32, cbWritten=%zu, rc=%Rrc\n",
+                         pFile->szName, pvScratchBuf, cbToWrite, cbWritten, rc);
 #endif
         }
@@ -464 +417 @@
         int rc2 = VbglR3GuestCtrlFileCbWrite(pHostCtx, rc, (uint32_t)cbWritten);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to report file write status, rc=%Rrc\n", rc2);
+            VGSvcError("Failed to report file write status, rc=%Rrc\n", rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -470 +423 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Writing file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
-                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
-#endif
-    return rc;
-}
-
-
-static int gstcntlSessionHandleFileWriteAt(const PVBOXSERVICECTRLSESSION pSession,
-                                           PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                           void *pvScratchBuf, size_t cbScratchBuf)
+    VGSvcVerbose(4, "Writing file '%s' (handle=%RU32) returned rc=%Rrc\n", pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandleFileWriteAt(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                                void *pvScratchBuf, size_t cbScratchBuf)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -489 +440 @@
 
     uint32_t uHandle = 0;
-    uint32_t cbToWrite; int64_t iOffset;
-
-    int rc = VbglR3GuestCtrlFileGetWriteAt(pHostCtx, &uHandle,
-                                           pvScratchBuf, (uint32_t)cbScratchBuf,
-                                           &cbToWrite, (uint64_t *)&iOffset);
+    uint32_t cbToWrite;
+    uint64_t offWriteAt;
+
+    int rc = VbglR3GuestCtrlFileGetWriteAt(pHostCtx, &uHandle, pvScratchBuf, (uint32_t)cbScratchBuf, &cbToWrite, &offWriteAt);
     if (RT_SUCCESS(rc))
     {
         size_t cbWritten = 0;
-        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = vgsvcGstCtrlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
-            rc = RTFileWriteAt(pFile->hFile, iOffset,
-                               pvScratchBuf, cbToWrite, &cbWritten);
-#ifdef DEBUG
-            VBoxServiceVerbose(4, "[File %s]: Writing iOffset=%RI64, pvScratchBuf=%p, cbToWrite=%RU32, cbWritten=%zu, rc=%Rrc\n",
-                               pFile->szName, iOffset, pvScratchBuf, cbToWrite, cbWritten, rc);
+            rc = RTFileWriteAt(pFile->hFile, (RTFOFF)offWriteAt, pvScratchBuf, cbToWrite, &cbWritten);
+#ifdef DEBUG
+            VGSvcVerbose(4, "[File %s]: Writing offWriteAt=%RI64, pvScratchBuf=%p, cbToWrite=%RU32, cbWritten=%zu, rc=%Rrc\n",
+                         pFile->szName, offWriteAt, pvScratchBuf, cbToWrite, cbWritten, rc);
 #endif
         }
@@ -513 +462 @@
         int rc2 = VbglR3GuestCtrlFileCbWrite(pHostCtx, rc, (uint32_t)cbWritten);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to report file write status, rc=%Rrc\n", rc2);
+            VGSvcError("Failed to report file write status, rc=%Rrc\n", rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -519 +468 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Writing file \"%s\" at offset (handle=%RU32) returned rc=%Rrc\n",
-                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
-#endif
-    return rc;
-}
-
-
-static int gstcntlSessionHandleFileSeek(const PVBOXSERVICECTRLSESSION pSession,
-                                        PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+    VGSvcVerbose(4, "Writing file '%s' at offset (handle=%RU32) returned rc=%Rrc\n",
+                 pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandleFileSeek(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -536 +484 @@
     uint32_t uHandle = 0;
     uint32_t uSeekMethod;
-    uint64_t uOffset; /* Will be converted to int64_t. */
-
-    uint64_t uOffsetActual = 0;
-
-    int rc = VbglR3GuestCtrlFileGetSeek(pHostCtx, &uHandle,
-                                        &uSeekMethod, &uOffset);
-    if (RT_SUCCESS(rc))
-    {
-        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+    uint64_t offSeek; /* Will be converted to int64_t. */
+    int rc = VbglR3GuestCtrlFileGetSeek(pHostCtx, &uHandle, &uSeekMethod, &offSeek);
+    if (RT_SUCCESS(rc))
+    {
+        uint64_t offActual = 0;
+        pFile = vgsvcGstCtrlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
-            unsigned uSeekMethodIPRT;
+            unsigned uSeekMethodIprt;
             switch (uSeekMethod)
             {
                 case GUEST_FILE_SEEKTYPE_BEGIN:
-                    uSeekMethodIPRT = RTFILE_SEEK_BEGIN;
+                    uSeekMethodIprt = RTFILE_SEEK_BEGIN;
                     break;
 
                 case GUEST_FILE_SEEKTYPE_CURRENT:
-                    uSeekMethodIPRT = RTFILE_SEEK_CURRENT;
+                    uSeekMethodIprt = RTFILE_SEEK_CURRENT;
                     break;
 
                 case GUEST_FILE_SEEKTYPE_END:
-                    uSeekMethodIPRT = RTFILE_SEEK_END;
+                    uSeekMethodIprt = RTFILE_SEEK_END;
                     break;
 
@@ -569 +514 @@
             if (RT_SUCCESS(rc))
             {
-                rc = RTFileSeek(pFile->hFile, (int64_t)uOffset,
-                                uSeekMethodIPRT, &uOffsetActual);
-#ifdef DEBUG
-                VBoxServiceVerbose(4, "[File %s]: Seeking to iOffset=%RI64, uSeekMethodIPRT=%RU16, rc=%Rrc\n",
-                                   pFile->szName, (int64_t)uOffset, uSeekMethodIPRT, rc);
+                rc = RTFileSeek(pFile->hFile, (int64_t)offSeek, uSeekMethodIprt, &offActual);
+#ifdef DEBUG
+                VGSvcVerbose(4, "[File %s]: Seeking to offSeek=%RI64, uSeekMethodIPRT=%RU16, rc=%Rrc\n",
+                             pFile->szName, offSeek, uSeekMethodIprt, rc);
 #endif
             }
@@ -581 +525 @@
 
         /* Report back in any case. */
-        int rc2 = VbglR3GuestCtrlFileCbSeek(pHostCtx, rc, uOffsetActual);
+        int rc2 = VbglR3GuestCtrlFileCbSeek(pHostCtx, rc, offActual);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to report file seek status, rc=%Rrc\n", rc2);
+            VGSvcError("Failed to report file seek status, rc=%Rrc\n", rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -589 +533 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Seeking file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
-                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
-#endif
-    return rc;
-}
-
-
-static int gstcntlSessionHandleFileTell(const PVBOXSERVICECTRLSESSION pSession,
-                                        PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+    VGSvcVerbose(4, "Seeking file '%s' (handle=%RU32) returned rc=%Rrc\n", pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandleFileTell(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -605 +547 @@
 
     uint32_t uHandle = 0;
-    uint64_t uOffsetActual = 0;
-
     int rc = VbglR3GuestCtrlFileGetTell(pHostCtx, &uHandle);
     if (RT_SUCCESS(rc))
     {
-        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        uint64_t off = 0;
+        pFile = vgsvcGstCtrlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
-            uOffsetActual = RTFileTell(pFile->hFile);
-#ifdef DEBUG
-            VBoxServiceVerbose(4, "[File %s]: Telling uOffsetActual=%RU64\n",
-                               pFile->szName, uOffsetActual);
+            off = RTFileTell(pFile->hFile);
+#ifdef DEBUG
+            VGSvcVerbose(4, "[File %s]: Telling off=%RU64\n", pFile->szName, off);
 #endif
         }
@@ -623 +563 @@
 
         /* Report back in any case. */
-        int rc2 = VbglR3GuestCtrlFileCbTell(pHostCtx, rc, uOffsetActual);
+        int rc2 = VbglR3GuestCtrlFileCbTell(pHostCtx, rc, off);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to report file tell status, rc=%Rrc\n", rc2);
+            VGSvcError("Failed to report file tell status, rc=%Rrc\n", rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -631 +571 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Telling file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
-                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
-#endif
-    return rc;
-}
-
-
-static int gstcntlSessionHandlePathRename(PVBOXSERVICECTRLSESSION pSession,
-                                          PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+    VGSvcVerbose(4, "Telling file '%s' (handle=%RU32) returned rc=%Rrc\n", pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandlePathRename(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -646 +584 @@
     char szSource[RTPATH_MAX];
     char szDest[RTPATH_MAX];
-    uint32_t uFlags = 0;
+    uint32_t fFlags = 0;
 
     int rc = VbglR3GuestCtrlPathGetRename(pHostCtx,
@@ -652 +590 @@
                                           szDest, sizeof(szDest),
                                           /* Flags of type PATHRENAME_FLAG_. */
-                                          &uFlags);
-    if (RT_SUCCESS(rc))
-    {
-        if (uFlags & ~PATHRENAME_FLAG_VALID_MASK)
+                                          &fFlags);
+    if (RT_SUCCESS(rc))
+    {
+        if (fFlags & ~PATHRENAME_FLAG_VALID_MASK)
             rc = VERR_NOT_SUPPORTED;
 
-        VBoxServiceVerbose(4, "Renaming \"%s\" to \"%s\", uFlags=0x%x, rc=%Rrc\n",
-                           szSource, szDest, uFlags, rc);
-
-        if (RT_SUCCESS(rc))
-        {
-            if (uFlags & PATHRENAME_FLAG_NO_REPLACE)
-                uFlags |= RTPATHRENAME_FLAGS_NO_REPLACE;
-
-            if (uFlags & PATHRENAME_FLAG_REPLACE)
-                uFlags |= RTPATHRENAME_FLAGS_REPLACE;
-
-            if (uFlags & PATHRENAME_FLAG_NO_SYMLINKS)
-                uFlags |= RTPATHRENAME_FLAGS_NO_SYMLINKS;
-
-            rc = RTPathRename(szSource, szDest, uFlags);
+        VGSvcVerbose(4, "Renaming '%s' to '%s', fFlags=0x%x, rc=%Rrc\n", szSource, szDest, fFlags, rc);
+
+        if (RT_SUCCESS(rc))
+        {
+/** @todo r=bird: shouldn't you use a different variable here for the IPRT flags??? */
+            if (fFlags & PATHRENAME_FLAG_NO_REPLACE)
+                fFlags |= RTPATHRENAME_FLAGS_NO_REPLACE;
+
+            if (fFlags & PATHRENAME_FLAG_REPLACE)
+                fFlags |= RTPATHRENAME_FLAGS_REPLACE;
+
+            if (fFlags & PATHRENAME_FLAG_NO_SYMLINKS)
+                fFlags |= RTPATHRENAME_FLAGS_NO_SYMLINKS;
+
+            rc = RTPathRename(szSource, szDest, fFlags);
         }
 
@@ -678 +616 @@
         int rc2 = VbglR3GuestCtrlMsgReply(pHostCtx, rc);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to report renaming status, rc=%Rrc\n", rc2);
+            VGSvcError("Failed to report renaming status, rc=%Rrc\n", rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -684 +622 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Renaming \"%s\" to \"%s\" returned rc=%Rrc\n",
-                       szSource, szDest, rc);
+    VGSvcVerbose(4, "Renaming '%s' to '%s' returned rc=%Rrc\n", szSource, szDest, rc);
 #endif
     return rc;
@@ -694 +631 @@
  * Handles starting a guest processes.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSession        Guest session.
  * @param   pHostCtx        Host context.
  */
-int gstcntlSessionHandleProcExec(PVBOXSERVICECTRLSESSION pSession,
-                                 PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+static int vgsvcGstCtrlSessionHandleProcExec(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -756 +692 @@
         if (RT_SUCCESS(rc))
         {
-            VBoxServiceVerbose(3, "Request to start process szCmd=%s, uFlags=0x%x, szArgs=%s, szEnv=%s, uTimeout=%RU32\n",
-                               startupInfo.szCmd, startupInfo.uFlags,
-                               startupInfo.uNumArgs ? startupInfo.szArgs : "<None>",
-                               startupInfo.uNumEnvVars ? startupInfo.szEnv : "<None>",
-                               startupInfo.uTimeLimitMS);
-
-            rc = GstCntlSessionProcessStartAllowed(pSession, &fStartAllowed);
+            VGSvcVerbose(3, "Request to start process szCmd=%s, fFlags=0x%x, szArgs=%s, szEnv=%s, uTimeout=%RU32\n",
+                         startupInfo.szCmd, startupInfo.uFlags,
+                         startupInfo.uNumArgs ? startupInfo.szArgs : "<None>",
+                         startupInfo.uNumEnvVars ? startupInfo.szEnv : "<None>",
+                         startupInfo.uTimeLimitMS);
+
+            rc = VGSvcGstCtrlSessionProcessStartAllowed(pSession, &fStartAllowed);
             if (RT_SUCCESS(rc))
             {
                 if (fStartAllowed)
-                {
-                    rc = GstCntlProcessStart(pSession, &startupInfo, pHostCtx->uContextID);
-                }
+                    rc = VGSvcGstCtrlProcessStart(pSession, &startupInfo, pHostCtx->uContextID);
                 else
                     rc = VERR_MAX_PROCS_REACHED; /* Maximum number of processes reached. */
@@ -778 +712 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("Starting process failed with rc=%Rrc, protocol=%RU32, parameters=%RU32\n",
-                         rc, pHostCtx->uProtocol, pHostCtx->uNumParms);
+        VGSvcError("Starting process failed with rc=%Rrc, protocol=%RU32, parameters=%RU32\n",
+                   rc, pHostCtx->uProtocol, pHostCtx->uNumParms);
 
         /* Don't report back if we didn't supply sufficient buffer for getting
@@ -793 +727 @@
                                                   NULL /* pvData */, 0 /* cbData */);
             if (RT_FAILURE(rc2))
-                VBoxServiceError("Error sending start process status to host, rc=%Rrc\n", rc2);
+                VGSvcError("Error sending start process status to host, rc=%Rrc\n", rc2);
         }
     }
@@ -804 +738 @@
  * Sends stdin input to a specific guest process.
  *
- * @returns IPRT status code.
- * @param pSession            The session which is in charge.
- * @param pHostCtx            The host context to use.
- * @param pvScratchBuf        The scratch buffer.
- * @param cbScratchBuf        The scratch buffer size for retrieving the input data.
+ * @returns VBox status code.
+ * @param   pSession            The session which is in charge.
+ * @param   pHostCtx            The host context to use.
+ * @param   pvScratchBuf        The scratch buffer.
+ * @param   cbScratchBuf        The scratch buffer size for retrieving the input
+ *                              data.
  */
-int gstcntlSessionHandleProcInput(PVBOXSERVICECTRLSESSION pSession,
-                                  PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                  void *pvScratchBuf, size_t cbScratchBuf)
+static int vgsvcGstCtrlSessionHandleProcInput(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                                              void *pvScratchBuf, size_t cbScratchBuf)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -820 +754 @@
 
     uint32_t uPID;
-    uint32_t uFlags;
+    uint32_t fFlags;
     uint32_t cbSize;
 
@@ -829 +763 @@
      * Ask the host for the input data.
      */
-    int rc = VbglR3GuestCtrlProcGetInput(pHostCtx, &uPID, &uFlags,
+    int rc = VbglR3GuestCtrlProcGetInput(pHostCtx, &uPID, &fFlags,
                                          pvScratchBuf, (uint32_t)cbScratchBuf, &cbSize);
     if (RT_FAILURE(rc))
-    {
-        VBoxServiceError("Failed to retrieve process input command for PID=%RU32, rc=%Rrc\n",
-                         uPID, rc);
-    }
+        VGSvcError("Failed to retrieve process input command for PID=%RU32, rc=%Rrc\n", uPID, rc);
     else if (cbSize > cbScratchBuf)
     {
-        VBoxServiceError("Too much process input received, rejecting: uPID=%RU32, cbSize=%RU32, cbScratchBuf=%RU32\n",
-                         uPID, cbSize, cbScratchBuf);
+        VGSvcError("Too much process input received, rejecting: uPID=%RU32, cbSize=%RU32, cbScratchBuf=%RU32\n",
+                   uPID, cbSize, cbScratchBuf);
         rc = VERR_TOO_MUCH_DATA;
     }
@@ -848 +779 @@
          */
         bool fPendingClose = false;
-        if (uFlags & INPUT_FLAG_EOF)
+        if (fFlags & INPUT_FLAG_EOF)
         {
             fPendingClose = true;
 #ifdef DEBUG
-            VBoxServiceVerbose(4, "Got last process input block for PID=%RU32 (%RU32 bytes) ...\n",
-                               uPID, cbSize);
-#endif
-        }
-
-        PVBOXSERVICECTRLPROCESS pProcess = GstCntlSessionRetainProcess(pSession, uPID);
+            VGSvcVerbose(4, "Got last process input block for PID=%RU32 (%RU32 bytes) ...\n", uPID, cbSize);
+#endif
+        }
+
+        PVBOXSERVICECTRLPROCESS pProcess = VGSvcGstCtrlSessionRetainProcess(pSession, uPID);
         if (pProcess)
         {
-            rc = GstCntlProcessHandleInput(pProcess, pHostCtx, fPendingClose,
-                                           pvScratchBuf, cbSize);
+            rc = VGSvcGstCtrlProcessHandleInput(pProcess, pHostCtx, fPendingClose, pvScratchBuf, cbSize);
             if (RT_FAILURE(rc))
-                VBoxServiceError("Error handling input command for PID=%RU32, rc=%Rrc\n",
-                                 uPID, rc);
-            GstCntlProcessRelease(pProcess);
+                VGSvcError("Error handling input command for PID=%RU32, rc=%Rrc\n", uPID, rc);
+            VGSvcGstCtrlProcessRelease(pProcess);
         }
         else
@@ -872 +800 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "Setting input for PID=%RU32 resulted in rc=%Rrc\n",
-                       uPID, rc);
+    VGSvcVerbose(4, "Setting input for PID=%RU32 resulted in rc=%Rrc\n", uPID, rc);
 #endif
     return rc;
@@ -882 +809 @@
  * Gets stdout/stderr output of a specific guest process.
  *
- * @return IPRT status code.
- * @param pSession            The session which is in charge.
- * @param pHostCtx            The host context to use.
+ * @returns VBox status code.
+ * @param   pSession            The session which is in charge.
+ * @param   pHostCtx            The host context to use.
  */
-int gstcntlSessionHandleProcOutput(PVBOXSERVICECTRLSESSION pSession,
-                                   PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+static int vgsvcGstCtrlSessionHandleProcOutput(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -894 +820 @@
     uint32_t uPID;
     uint32_t uHandleID;
-    uint32_t uFlags;
-
-    int rc = VbglR3GuestCtrlProcGetOutput(pHostCtx, &uPID, &uHandleID, &uFlags);
+    uint32_t fFlags;
+
+    int rc = VbglR3GuestCtrlProcGetOutput(pHostCtx, &uPID, &uHandleID, &fFlags);
 #ifdef DEBUG_andy
-    VBoxServiceVerbose(4, "Getting output for PID=%RU32, CID=%RU32, uHandleID=%RU32, uFlags=%RU32\n",
-                       uPID, pHostCtx->uContextID, uHandleID, uFlags);
-#endif
-    if (RT_SUCCESS(rc))
-    {
-        PVBOXSERVICECTRLPROCESS pProcess = GstCntlSessionRetainProcess(pSession, uPID);
+    VGSvcVerbose(4, "Getting output for PID=%RU32, CID=%RU32, uHandleID=%RU32, fFlags=%RU32\n",
+                 uPID, pHostCtx->uContextID, uHandleID, fFlags);
+#endif
+    if (RT_SUCCESS(rc))
+    {
+        PVBOXSERVICECTRLPROCESS pProcess = VGSvcGstCtrlSessionRetainProcess(pSession, uPID);
         if (pProcess)
         {
-            rc = GstCntlProcessHandleOutput(pProcess, pHostCtx,
-                                            uHandleID, _64K /* cbToRead */, uFlags);
+            rc = VGSvcGstCtrlProcessHandleOutput(pProcess, pHostCtx, uHandleID, _64K /* cbToRead */, fFlags);
             if (RT_FAILURE(rc))
-                VBoxServiceError("Error getting output for PID=%RU32, rc=%Rrc\n",
-                                 uPID, rc);
-            GstCntlProcessRelease(pProcess);
+                VGSvcError("Error getting output for PID=%RU32, rc=%Rrc\n", uPID, rc);
+            VGSvcGstCtrlProcessRelease(pProcess);
         }
         else
@@ -918 +842 @@
 
 #ifdef DEBUG_andy
-    VBoxServiceVerbose(4, "Getting output for PID=%RU32 resulted in rc=%Rrc\n",
-                       uPID, rc);
+    VGSvcVerbose(4, "Getting output for PID=%RU32 resulted in rc=%Rrc\n", uPID, rc);
 #endif
     return rc;
@@ -928 +851 @@
  * Tells a guest process to terminate.
  *
- * @return  IPRT status code.
- * @param pSession            The session which is in charge.
- * @param pHostCtx            The host context to use.
+ * @returns VBox status code.
+ * @param   pSession            The session which is in charge.
+ * @param   pHostCtx            The host context to use.
  */
-int gstcntlSessionHandleProcTerminate(const PVBOXSERVICECTRLSESSION pSession,
-                                      PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+static int vgsvcGstCtrlSessionHandleProcTerminate(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -942 +864 @@
     if (RT_SUCCESS(rc))
     {
-        PVBOXSERVICECTRLPROCESS pProcess = GstCntlSessionRetainProcess(pSession, uPID);
+        PVBOXSERVICECTRLPROCESS pProcess = VGSvcGstCtrlSessionRetainProcess(pSession, uPID);
         if (pProcess)
         {
-            rc = GstCntlProcessHandleTerm(pProcess);
-
-            GstCntlProcessRelease(pProcess);
+            rc = VGSvcGstCtrlProcessHandleTerm(pProcess);
+
+            VGSvcGstCtrlProcessRelease(pProcess);
         }
         else
@@ -954 +876 @@
 
 #ifdef DEBUG_andy
-    VBoxServiceVerbose(4, "Terminating PID=%RU32 resulted in rc=%Rrc\n",
-                       uPID, rc);
-#endif
-    return rc;
-}
-
-
-int gstcntlSessionHandleProcWaitFor(const PVBOXSERVICECTRLSESSION pSession,
-                                    PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+    VGSvcVerbose(4, "Terminating PID=%RU32 resulted in rc=%Rrc\n", uPID, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandleProcWaitFor(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -973 +893 @@
     if (RT_SUCCESS(rc))
     {
-        PVBOXSERVICECTRLPROCESS pProcess = GstCntlSessionRetainProcess(pSession, uPID);
+        PVBOXSERVICECTRLPROCESS pProcess = VGSvcGstCtrlSessionRetainProcess(pSession, uPID);
         if (pProcess)
         {
             rc = VERR_NOT_IMPLEMENTED; /** @todo */
-            GstCntlProcessRelease(pProcess);
+            VGSvcGstCtrlProcessRelease(pProcess);
         }
         else
@@ -987 +907 @@
 
 
-int GstCntlSessionHandler(PVBOXSERVICECTRLSESSION pSession,
-                          uint32_t uMsg, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                          void *pvScratchBuf, size_t cbScratchBuf,
-                          volatile bool *pfShutdown)
+int VGSvcGstCtrlSessionHandler(PVBOXSERVICECTRLSESSION pSession, uint32_t uMsg, PVBGLR3GUESTCTRLCMDCTX pHostCtx,
+                               void *pvScratchBuf, size_t cbScratchBuf, volatile bool *pfShutdown)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -997 +915 @@
     AssertPtrReturn(pfShutdown, VERR_INVALID_POINTER);
 
-    int rc = VINF_SUCCESS;
-    /**
+
+    /*
      * Only anonymous sessions (that is, sessions which run with local
      * service privileges) or spawned session processes can do certain
      * operations.
      */
-    bool fImpersonated = (   pSession->fFlags & VBOXSERVICECTRLSESSION_FLAG_SPAWN
-                          || pSession->fFlags & VBOXSERVICECTRLSESSION_FLAG_ANONYMOUS);
-
+    bool const fImpersonated = RT_BOOL(pSession->fFlags & (  VBOXSERVICECTRLSESSION_FLAG_SPAWN
+                                                           | VBOXSERVICECTRLSESSION_FLAG_ANONYMOUS));
+    int rc;
     switch (uMsg)
     {
         case HOST_SESSION_CLOSE:
             /* Shutdown (this spawn). */
-            rc = GstCntlSessionClose(pSession);
+            rc = VGSvcGstCtrlSessionClose(pSession);
             *pfShutdown = true; /* Shutdown in any case. */
             break;
 
         case HOST_DIR_REMOVE:
-            rc = fImpersonated
-               ? gstcntlSessionHandleDirRemove(pSession, pHostCtx)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleDirRemove(pSession, pHostCtx);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         case HOST_EXEC_CMD:
-            rc = gstcntlSessionHandleProcExec(pSession, pHostCtx);
+            rc = vgsvcGstCtrlSessionHandleProcExec(pSession, pHostCtx);
             break;
 
         case HOST_EXEC_SET_INPUT:
-            rc = gstcntlSessionHandleProcInput(pSession, pHostCtx,
-                                               pvScratchBuf, cbScratchBuf);
+            rc = vgsvcGstCtrlSessionHandleProcInput(pSession, pHostCtx, pvScratchBuf, cbScratchBuf);
             break;
 
         case HOST_EXEC_GET_OUTPUT:
-            rc = gstcntlSessionHandleProcOutput(pSession, pHostCtx);
+            rc = vgsvcGstCtrlSessionHandleProcOutput(pSession, pHostCtx);
             break;
 
         case HOST_EXEC_TERMINATE:
-            rc = gstcntlSessionHandleProcTerminate(pSession, pHostCtx);
+            rc = vgsvcGstCtrlSessionHandleProcTerminate(pSession, pHostCtx);
             break;
 
         case HOST_EXEC_WAIT_FOR:
-            rc = gstcntlSessionHandleProcWaitFor(pSession, pHostCtx);
+            rc = vgsvcGstCtrlSessionHandleProcWaitFor(pSession, pHostCtx);
             break;
 
         case HOST_FILE_OPEN:
-            rc = fImpersonated
-               ? gstcntlSessionHandleFileOpen(pSession, pHostCtx)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleFileOpen(pSession, pHostCtx);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         case HOST_FILE_CLOSE:
-            rc = fImpersonated
-               ? gstcntlSessionHandleFileClose(pSession, pHostCtx)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleFileClose(pSession, pHostCtx);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         case HOST_FILE_READ:
-            rc = fImpersonated
-               ? gstcntlSessionHandleFileRead(pSession, pHostCtx,
-                                              pvScratchBuf, cbScratchBuf)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleFileRead(pSession, pHostCtx, pvScratchBuf, cbScratchBuf);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         case HOST_FILE_READ_AT:
-            rc = fImpersonated
-               ? gstcntlSessionHandleFileReadAt(pSession, pHostCtx,
-                                                pvScratchBuf, cbScratchBuf)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleFileReadAt(pSession, pHostCtx, pvScratchBuf, cbScratchBuf);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         case HOST_FILE_WRITE:
-            rc = fImpersonated
-               ? gstcntlSessionHandleFileWrite(pSession, pHostCtx,
-                                               pvScratchBuf, cbScratchBuf)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleFileWrite(pSession, pHostCtx, pvScratchBuf, cbScratchBuf);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         case HOST_FILE_WRITE_AT:
-            rc = fImpersonated
-               ? gstcntlSessionHandleFileWriteAt(pSession, pHostCtx,
-                                                 pvScratchBuf, cbScratchBuf)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleFileWriteAt(pSession, pHostCtx, pvScratchBuf, cbScratchBuf);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         case HOST_FILE_SEEK:
-            rc = fImpersonated
-               ? gstcntlSessionHandleFileSeek(pSession, pHostCtx)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleFileSeek(pSession, pHostCtx);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         case HOST_FILE_TELL:
-            rc = fImpersonated
-               ? gstcntlSessionHandleFileTell(pSession, pHostCtx)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleFileTell(pSession, pHostCtx);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         case HOST_PATH_RENAME:
-            rc = fImpersonated
-               ? gstcntlSessionHandlePathRename(pSession, pHostCtx)
-               : VERR_NOT_SUPPORTED;
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandlePathRename(pSession, pHostCtx);
+            else
+                rc = VERR_NOT_SUPPORTED;
             break;
 
         default:
             rc = VbglR3GuestCtrlMsgSkip(pHostCtx->uClientID);
-            VBoxServiceVerbose(3, "Unsupported message (uMsg=%RU32, cParms=%RU32) from host, skipping\n",
-                               uMsg, pHostCtx->uNumParms);
+            VGSvcVerbose(3, "Unsupported message (uMsg=%RU32, cParms=%RU32) from host, skipping\n", uMsg, pHostCtx->uNumParms);
             break;
     }
 
     if (RT_FAILURE(rc))
-        VBoxServiceError("Error while handling message (uMsg=%RU32, cParms=%RU32), rc=%Rrc\n",
-                         uMsg, pHostCtx->uNumParms, rc);
+        VGSvcError("Error while handling message (uMsg=%RU32, cParms=%RU32), rc=%Rrc\n", uMsg, pHostCtx->uNumParms, rc);
 
     return rc;
@@ -1118 +1039 @@
  * This thread runs in the main executable to control the spawned session process.
  *
- * @return IPRT status code.
- * @param  RTTHREAD             Pointer to the thread's data.
- * @param  void*                User-supplied argument pointer.
+ * @returns VBox status code.
+ * @param   hThreadSelf     Thread handle.
+ * @param   pvUser          Pointer to a VBOXSERVICECTRLSESSIONTHREAD structure.
  *
  */
-static DECLCALLBACK(int) gstcntlSessionThread(RTTHREAD ThreadSelf, void *pvUser)
+static DECLCALLBACK(int) vgsvcGstCtrlSessionThread(RTTHREAD hThreadSelf, void *pvUser)
 {
     PVBOXSERVICECTRLSESSIONTHREAD pThread = (PVBOXSERVICECTRLSESSIONTHREAD)pvUser;
@@ -1134 +1055 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(3, "Session ID=%RU32 thread running, client ID=%RU32\n",
-                           uSessionID, uClientID);
+        VGSvcVerbose(3, "Session ID=%RU32 thread running, client ID=%RU32\n", uSessionID, uClientID);
 
         /* The session thread is not interested in receiving any commands;
          * tell the host service. */
-        rc = VbglR3GuestCtrlMsgFilterSet(uClientID, 0 /* Skip all */,
-                                         0 /* Filter mask to add */, 0 /* Filter mask to remove */);
+        rc = VbglR3GuestCtrlMsgFilterSet(uClientID, 0 /* Skip all */, 0 /* Filter mask to add */, 0 /* Filter mask to remove */);
         if (RT_FAILURE(rc))
         {
-            VBoxServiceError("Unable to set message filter, rc=%Rrc\n", rc);
+            VGSvcError("Unable to set message filter, rc=%Rrc\n", rc);
             /* Non-critical. */
             rc = VINF_SUCCESS;
@@ -1149 +1068 @@
     }
     else
-        VBoxServiceError("Error connecting to guest control service, rc=%Rrc\n", rc);
+        VGSvcError("Error connecting to guest control service, rc=%Rrc\n", rc);
 
     if (RT_FAILURE(rc))
@@ -1155 +1074 @@
 
     /* Let caller know that we're done initializing, regardless of the result. */
-    int rc2 = RTThreadUserSignal(RTThreadSelf());
+    int rc2 = RTThreadUserSignal(hThreadSelf);
     AssertRC(rc2);
 
@@ -1173 +1092 @@
         for (;;)
         {
-            rcWait = RTProcWaitNoResume(pThread->hProcess, RTPROCWAIT_FLAGS_NOBLOCK,
-                                        &ProcessStatus);
+            rcWait = RTProcWaitNoResume(pThread->hProcess, RTPROCWAIT_FLAGS_NOBLOCK, &ProcessStatus);
             if (RT_UNLIKELY(rcWait == VERR_INTERRUPTED))
                 continue;
-            else if (   rcWait == VINF_SUCCESS
-                     || rcWait == VERR_PROCESS_NOT_FOUND)
+
+            if (   rcWait == VINF_SUCCESS
+                || rcWait == VERR_PROCESS_NOT_FOUND)
             {
                 fProcessAlive = false;
                 break;
             }
-            else
-                AssertMsgBreak(rcWait == VERR_PROCESS_RUNNING,
-                               ("Got unexpected rc=%Rrc while waiting for session process termination\n", rcWait));
+            AssertMsgBreak(rcWait == VERR_PROCESS_RUNNING,
+                           ("Got unexpected rc=%Rrc while waiting for session process termination\n", rcWait));
 
             if (ASMAtomicReadBool(&pThread->fShutdown))
@@ -1191 +1109 @@
                 if (!u64TimeoutStart)
                 {
-                    VBoxServiceVerbose(3, "Notifying guest session process (PID=%RU32, session ID=%RU32) ...\n",
-                                       pThread->hProcess, uSessionID);
-
-                    VBGLR3GUESTCTRLCMDCTX hostCtx = { uClientID,
-                                                      VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(uSessionID),
-                                                      pThread->StartupInfo.uProtocol, 2 /* uNumParms */ };
-                    rc = VbglR3GuestCtrlSessionClose(&hostCtx, 0 /* uFlags */);
+                    VGSvcVerbose(3, "Notifying guest session process (PID=%RU32, session ID=%RU32) ...\n",
+                                 pThread->hProcess, uSessionID);
+
+                    VBGLR3GUESTCTRLCMDCTX hostCtx =
+                    {
+                        /* .idClient  = */  uClientID,
+                        /* .idContext = */  VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(uSessionID),
+                        /* .uProtocol = */  pThread->StartupInfo.uProtocol,
+                        /* .cParams   = */  2
+                    };
+                    rc = VbglR3GuestCtrlSessionClose(&hostCtx, 0 /* fFlags */);
                     if (RT_FAILURE(rc))
                     {
-                        VBoxServiceError("Unable to notify guest session process (PID=%RU32, session ID=%RU32), rc=%Rrc\n",
-                                         pThread->hProcess, uSessionID, rc);
+                        VGSvcError("Unable to notify guest session process (PID=%RU32, session ID=%RU32), rc=%Rrc\n",
+                                   pThread->hProcess, uSessionID, rc);
 
                         if (rc == VERR_NOT_SUPPORTED)
@@ -1207 +1129 @@
                             /* Terminate guest session process in case it's not supported by a too old host. */
                             rc = RTProcTerminate(pThread->hProcess);
-                            VBoxServiceVerbose(3, "Terminating guest session process (PID=%RU32) ended with rc=%Rrc\n",
-                                               pThread->hProcess, rc);
+                            VGSvcVerbose(3, "Terminating guest session process (PID=%RU32) ended with rc=%Rrc\n",
+                                         pThread->hProcess, rc);
                         }
                         break;
                     }
 
-                    VBoxServiceVerbose(3, "Guest session ID=%RU32 thread was asked to terminate, waiting for session process to exit (%RU32ms timeout) ...\n",
-                                       uSessionID, uTimeoutsMS);
+                    VGSvcVerbose(3, "Guest session ID=%RU32 thread was asked to terminate, waiting for session process to exit (%RU32ms timeout) ...\n",
+                                 uSessionID, uTimeoutsMS);
                     u64TimeoutStart = RTTimeMilliTS();
-
                     continue; /* Don't waste time on waiting. */
                 }
                 if (RTTimeMilliTS() - u64TimeoutStart > uTimeoutsMS)
                 {
-                     VBoxServiceVerbose(3, "Guest session ID=%RU32 process did not shut down within time\n",
-                                        uSessionID);
+                     VGSvcVerbose(3, "Guest session ID=%RU32 process did not shut down within time\n", uSessionID);
                      break;
                 }
@@ -1232 +1152 @@
         if (!fProcessAlive)
         {
-            VBoxServiceVerbose(2, "Guest session process (ID=%RU32) terminated with rc=%Rrc, reason=%ld, status=%d\n",
-                               uSessionID, rcWait,
-                               ProcessStatus.enmReason, ProcessStatus.iStatus);
+            VGSvcVerbose(2, "Guest session process (ID=%RU32) terminated with rc=%Rrc, reason=%d, status=%d\n",
+                         uSessionID, rcWait, ProcessStatus.enmReason, ProcessStatus.iStatus);
             if (ProcessStatus.iStatus == RTEXITCODE_INIT)
             {
-                VBoxServiceError("Guest session process (ID=%RU32) failed to initialize. Here some hints:\n",
-                                 uSessionID);
-                VBoxServiceError("- Is logging enabled and the output directory is read-only by the guest session user?\n");
+                VGSvcError("Guest session process (ID=%RU32) failed to initialize. Here some hints:\n", uSessionID);
+                VGSvcError("- Is logging enabled and the output directory is read-only by the guest session user?\n");
                 /** @todo Add more here. */
             }
@@ -1252 +1170 @@
         for (int i = 0; i < 3; i++)
         {
-            VBoxServiceVerbose(2, "Guest session ID=%RU32 process still alive, killing attempt %d/3\n",
-                               uSessionID, i + 1);
+            VGSvcVerbose(2, "Guest session ID=%RU32 process still alive, killing attempt %d/3\n", uSessionID, i + 1);
 
             rc = RTProcTerminate(pThread->hProcess);
             if (RT_SUCCESS(rc))
                 break;
+            /** @todo r=bird: What's the point of sleeping 3 second after the last attempt? */
             RTThreadSleep(3000);
         }
 
-        VBoxServiceVerbose(2, "Guest session ID=%RU32 process termination resulted in rc=%Rrc\n",
-                           uSessionID, rc);
-
-        uSessionStatus = RT_SUCCESS(rc)
-                       ? GUEST_SESSION_NOTIFYTYPE_TOK : GUEST_SESSION_NOTIFYTYPE_TOA;
+        VGSvcVerbose(2, "Guest session ID=%RU32 process termination resulted in rc=%Rrc\n", uSessionID, rc);
+
+        uSessionStatus = RT_SUCCESS(rc) ? GUEST_SESSION_NOTIFYTYPE_TOK : GUEST_SESSION_NOTIFYTYPE_TOA;
+    }
+    else if (RT_SUCCESS(rcWait))
+    {
+        switch (ProcessStatus.enmReason)
+        {
+            case RTPROCEXITREASON_NORMAL:
+                uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TEN;
+                break;
+
+            case RTPROCEXITREASON_ABEND:
+                uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TEA;
+                break;
+
+            case RTPROCEXITREASON_SIGNAL:
+                uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TES;
+                break;
+
+            default:
+                AssertMsgFailed(("Unhandled process termination reason (%d)\n", ProcessStatus.enmReason));
+                uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TEA;
+                break;
+        }
     }
     else
     {
-        if (RT_SUCCESS(rcWait))
-        {
-            switch (ProcessStatus.enmReason)
-            {
-                case RTPROCEXITREASON_NORMAL:
-                    uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TEN;
-                    break;
-
-                case RTPROCEXITREASON_ABEND:
-                    uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TEA;
-                    break;
-
-                case RTPROCEXITREASON_SIGNAL:
-                    uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TES;
-                    break;
-
-                default:
-                    AssertMsgFailed(("Unhandled process termination reason (%ld)\n",
-                                     ProcessStatus.enmReason));
-                    uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TEA;
-                    break;
-            }
-        }
-        else
-        {
-            /* If we didn't find the guest process anymore, just assume it
-             * terminated normally. */
-            uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TEN;
-        }
-    }
-
-    VBoxServiceVerbose(3, "Guest session ID=%RU32 thread ended with sessionStatus=%RU32, sessionRc=%Rrc\n",
-                       uSessionID, uSessionStatus, uSessionRc);
+        /* If we didn't find the guest process anymore, just assume it
+         * terminated normally. */
+        uSessionStatus = GUEST_SESSION_NOTIFYTYPE_TEN;
+    }
+
+    VGSvcVerbose(3, "Guest session ID=%RU32 thread ended with sessionStatus=%RU32, sessionRc=%Rrc\n",
+                 uSessionID, uSessionStatus, uSessionRc);
 
     /* Report final status. */
     Assert(uSessionStatus != GUEST_SESSION_NOTIFYTYPE_UNDEFINED);
     VBGLR3GUESTCTRLCMDCTX ctx = { uClientID, VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(uSessionID) };
-    rc2 = VbglR3GuestCtrlSessionNotify(&ctx,
-                                       uSessionStatus, uSessionRc);
+    rc2 = VbglR3GuestCtrlSessionNotify(&ctx, uSessionStatus, uSessionRc);
     if (RT_FAILURE(rc2))
-        VBoxServiceError("Reporting session ID=%RU32 final status failed with rc=%Rrc\n",
-                         uSessionID, rc2);
+        VGSvcError("Reporting session ID=%RU32 final status failed with rc=%Rrc\n", uSessionID, rc2);
 
     VbglR3GuestCtrlDisconnect(uClientID);
 
-    VBoxServiceVerbose(3, "Session ID=%RU32 thread ended with rc=%Rrc\n",
-                       uSessionID, rc);
-    return rc;
-}
-
-
-RTEXITCODE gstcntlSessionSpawnWorker(PVBOXSERVICECTRLSESSION pSession)
+    VGSvcVerbose(3, "Session ID=%RU32 thread ended with rc=%Rrc\n", uSessionID, rc);
+    return rc;
+}
+
+
+static RTEXITCODE vgsvcGstCtrlSessionSpawnWorker(PVBOXSERVICECTRLSESSION pSession)
 {
     AssertPtrReturn(pSession, RTEXITCODE_FAILURE);
@@ -1326 +1235 @@
     bool fSessionFilter = true;
 
-    VBoxServiceVerbose(0, "Hi, this is guest session ID=%RU32\n",
-                       pSession->StartupInfo.uSessionID);
+    VGSvcVerbose(0, "Hi, this is guest session ID=%RU32\n", pSession->StartupInfo.uSessionID);
 
     uint32_t uClientID;
@@ -1336 +1244 @@
          * host service to send messages which belong to another
          * session we don't want to handle. */
-        uint32_t uFilterAdd =
-            VBOX_GUESTCTRL_FILTER_BY_SESSION(pSession->StartupInfo.uSessionID);
+        uint32_t uFilterAdd = VBOX_GUESTCTRL_FILTER_BY_SESSION(pSession->StartupInfo.uSessionID);
         rc = VbglR3GuestCtrlMsgFilterSet(uClientID,
                                          VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(pSession->StartupInfo.uSessionID),
                                          uFilterAdd, 0 /* Filter remove */);
-        VBoxServiceVerbose(3, "Setting message filterAdd=0x%x returned %Rrc\n",
-                           uFilterAdd, rc);
+        VGSvcVerbose(3, "Setting message filterAdd=0x%x returned %Rrc\n", uFilterAdd, rc);
 
         if (   RT_FAILURE(rc)
@@ -1353 +1259 @@
         }
 
-        VBoxServiceVerbose(1, "Using client ID=%RU32\n", uClientID);
+        VGSvcVerbose(1, "Using client ID=%RU32\n", uClientID);
     }
     else
-        VBoxServiceError("Error connecting to guest control service, rc=%Rrc\n", rc);
+        VGSvcError("Error connecting to guest control service, rc=%Rrc\n", rc);
 
     /* Report started status. */
     VBGLR3GUESTCTRLCMDCTX ctx = { uClientID, VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(pSession->StartupInfo.uSessionID) };
-    int rc2 = VbglR3GuestCtrlSessionNotify(&ctx,
-                                           GUEST_SESSION_NOTIFYTYPE_STARTED, VINF_SUCCESS);
+    int rc2 = VbglR3GuestCtrlSessionNotify(&ctx, GUEST_SESSION_NOTIFYTYPE_STARTED, VINF_SUCCESS);
     if (RT_FAILURE(rc2))
     {
-        VBoxServiceError("Reporting session ID=%RU32 started status failed with rc=%Rrc\n",
-                         pSession->StartupInfo.uSessionID, rc2);
+        VGSvcError("Reporting session ID=%RU32 started status failed with rc=%Rrc\n", pSession->StartupInfo.uSessionID, rc2);
 
         /*
@@ -1392 +1296 @@
         bool fShutdown = false;
 
-        VBGLR3GUESTCTRLCMDCTX ctxHost = { uClientID, 0 /* Context ID, zeroed */,
-                                          pSession->StartupInfo.uProtocol };
+        VBGLR3GUESTCTRLCMDCTX ctxHost = { uClientID, 0 /* Context ID */, pSession->StartupInfo.uProtocol };
         for (;;)
         {
-            VBoxServiceVerbose(3, "Waiting for host msg ...\n");
+            VGSvcVerbose(3, "Waiting for host msg ...\n");
             uint32_t uMsg = 0;
             uint32_t cParms = 0;
@@ -1403 +1306 @@
             {
 #ifdef DEBUG
-                VBoxServiceVerbose(4, "Message requires %RU32 parameters, but only 2 supplied -- retrying request (no error!)...\n", cParms);
+                VGSvcVerbose(4, "Message requires %RU32 parameters, but only 2 supplied -- retrying request (no error!)...\n",
+                             cParms);
 #endif
                 rc = VINF_SUCCESS; /* Try to get "real" message in next block below. */
             }
             else if (RT_FAILURE(rc))
-                VBoxServiceVerbose(3, "Getting host message failed with %Rrc\n", rc); /* VERR_GEN_IO_FAILURE seems to be normal if ran into timeout. */
+                VGSvcVerbose(3, "Getting host message failed with %Rrc\n", rc); /* VERR_GEN_IO_FAILURE seems to be normal if ran into timeout. */
             if (RT_SUCCESS(rc))
             {
-                VBoxServiceVerbose(4, "Msg=%RU32 (%RU32 parms) retrieved\n", uMsg, cParms);
+                VGSvcVerbose(4, "Msg=%RU32 (%RU32 parms) retrieved\n", uMsg, cParms);
 
                 /* Set number of parameters for current host context. */
@@ -1417 +1321 @@
 
                 /* ... and pass it on to the session handler. */
-                rc = GstCntlSessionHandler(pSession, uMsg, &ctxHost,
-                                           pvScratchBuf, cbScratchBuf, &fShutdown);
+                rc = VGSvcGstCtrlSessionHandler(pSession, uMsg, &ctxHost, pvScratchBuf, cbScratchBuf, &fShutdown);
             }
 
@@ -1424 +1327 @@
                 break;
 
-            /* Let's sleep for a bit and let others run ... */
+            /* Let others run ... */
             RTThreadYield();
         }
     }
 
-    VBoxServiceVerbose(0, "Session %RU32 ended\n", pSession->StartupInfo.uSessionID);
+    VGSvcVerbose(0, "Session %RU32 ended\n", pSession->StartupInfo.uSessionID);
 
     if (pvScratchBuf)
@@ -1436 +1339 @@
     if (uClientID)
     {
-        VBoxServiceVerbose(3, "Disconnecting client ID=%RU32 ...\n", uClientID);
+        VGSvcVerbose(3, "Disconnecting client ID=%RU32 ...\n", uClientID);
         VbglR3GuestCtrlDisconnect(uClientID);
     }
 
-    VBoxServiceVerbose(3, "Session worker returned with rc=%Rrc\n", rc);
+    VGSvcVerbose(3, "Session worker returned with rc=%Rrc\n", rc);
     return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
@@ -1446 +1349 @@
 
 /**
- * Finds a (formerly) started guest process given by its PID and increases
- * its reference count. Must be decreased by the caller with GstCntlProcessRelease().
- * Note: This does *not lock the process!
+ * Finds a (formerly) started guest process given by its PID and increases its
+ * reference count.
  *
- * @return  PVBOXSERVICECTRLTHREAD      Guest process if found, otherwise NULL.
- * @param   PVBOXSERVICECTRLSESSION     Pointer to guest session where to search process in.
- * @param   uPID                        PID to search for.
+ * Must be decreased by the caller with VGSvcGstCtrlProcessRelease().
+ *
+ * @returns Guest process if found, otherwise NULL.
+ * @param   pSession    Pointer to guest session where to search process in.
+ * @param   uPID        PID to search for.
+ *
+ * @note    This does *not lock the process!
  */
-PVBOXSERVICECTRLPROCESS GstCntlSessionRetainProcess(PVBOXSERVICECTRLSESSION pSession, uint32_t uPID)
+PVBOXSERVICECTRLPROCESS VGSvcGstCtrlSessionRetainProcess(PVBOXSERVICECTRLSESSION pSession, uint32_t uPID)
 {
     AssertPtrReturn(pSession, NULL);
@@ -1489 +1395 @@
 
 
-int GstCntlSessionClose(PVBOXSERVICECTRLSESSION pSession)
+int VGSvcGstCtrlSessionClose(PVBOXSERVICECTRLSESSION pSession)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
 
-    VBoxServiceVerbose(0, "Session %RU32 is about to close ...\n",
-                       pSession->StartupInfo.uSessionID);
+    VGSvcVerbose(0, "Session %RU32 is about to close ...\n", pSession->StartupInfo.uSessionID);
 
     int rc = RTCritSectEnter(&pSession->CritSect);
@@ -1502 +1407 @@
          * Close all guest processes.
          */
-        VBoxServiceVerbose(0, "Stopping all guest processes ...\n");
+        VGSvcVerbose(0, "Stopping all guest processes ...\n");
 
         /* Signal all guest processes in the active list that we want to shutdown. */
@@ -1509 +1414 @@
         RTListForEach(&pSession->lstProcesses, pProcess, VBOXSERVICECTRLPROCESS, Node)
         {
-            GstCntlProcessStop(pProcess);
+            VGSvcGstCtrlProcessStop(pProcess);
             cProcesses++;
         }
 
-        VBoxServiceVerbose(1, "%zu guest processes were signalled to stop\n", cProcesses);
+        VGSvcVerbose(1, "%zu guest processes were signalled to stop\n", cProcesses);
 
         /* Wait for all active threads to shutdown and destroy the active thread list. */
@@ -1525 +1430 @@
             AssertRC(rc2);
 
-            rc2 = GstCntlProcessWait(pProcess,
-                                     30 * 1000 /* Wait 30 seconds max. */,
-                                     NULL /* rc */);
+            rc2 = VGSvcGstCtrlProcessWait(pProcess, 30 * 1000 /* Wait 30 seconds max. */, NULL /* rc */);
 
             int rc3 = RTCritSectEnter(&pSession->CritSect);
@@ -1533 +1436 @@
 
             if (RT_SUCCESS(rc2))
-                GstCntlProcessFree(pProcess);
+                VGSvcGstCtrlProcessFree(pProcess);
 
             if (fLast)
@@ -1548 +1451 @@
             bool fLast = RTListNodeIsLast(&pSession->lstProcesses, &pProcess->Node);
 
-            VBoxServiceVerbose(1, "Process %p (PID %RU32) still in list\n",
-                               pProcess, pProcess->uPID);
+            VGSvcVerbose(1, "Process %p (PID %RU32) still in list\n", pProcess, pProcess->uPID);
             if (fLast)
                 break;
@@ -1562 +1464 @@
          * Close all left guest files.
          */
-        VBoxServiceVerbose(0, "Closing all guest files ...\n");
+        VGSvcVerbose(0, "Closing all guest files ...\n");
 
         PVBOXSERVICECTRLFILE pFile;
@@ -1571 +1473 @@
             bool fLast = RTListNodeIsLast(&pSession->lstFiles, &pFile->Node);
 
-            int rc2 = gstcntlSessionFileDestroy(pFile);
+            int rc2 = vgsvcGstCtrlSessionFileDestroy(pFile);
             if (RT_FAILURE(rc2))
             {
-                VBoxServiceError("Unable to close file \"%s\"; rc=%Rrc\n",
-                                 pFile->szName, rc2);
+                VGSvcError("Unable to close file '%s'; rc=%Rrc\n", pFile->szName, rc2);
                 if (RT_SUCCESS(rc))
                     rc = rc2;
@@ -1587 +1488 @@
         }
 
-        AssertMsg(RTListIsEmpty(&pSession->lstFiles),
-                  ("Guest file list still contains entries when it should not\n"));
+        AssertMsg(RTListIsEmpty(&pSession->lstFiles), ("Guest file list still contains entries when it should not\n"));
 
         int rc2 = RTCritSectLeave(&pSession->CritSect);
@@ -1599 +1499 @@
 
 
-int GstCntlSessionDestroy(PVBOXSERVICECTRLSESSION pSession)
+int VGSvcGstCtrlSessionDestroy(PVBOXSERVICECTRLSESSION pSession)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
 
-    int rc = GstCntlSessionClose(pSession);
+    int rc = VGSvcGstCtrlSessionClose(pSession);
 
     /* Destroy critical section. */
@@ -1612 +1512 @@
 
 
-int GstCntlSessionInit(PVBOXSERVICECTRLSESSION pSession, uint32_t fFlags)
+int VGSvcGstCtrlSessionInit(PVBOXSERVICECTRLSESSION pSession, uint32_t fFlags)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -1632 +1532 @@
  * Adds a guest process to a session's process list.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pSession                Guest session to add process to.
  * @param   pProcess                Guest process to add.
  */
-int GstCntlSessionProcessAdd(PVBOXSERVICECTRLSESSION pSession,
-                             PVBOXSERVICECTRLPROCESS pProcess)
+int VGSvcGstCtrlSessionProcessAdd(PVBOXSERVICECTRLSESSION pSession, PVBOXSERVICECTRLPROCESS pProcess)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -1645 +1544 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(3, "Adding process (PID %RU32) to session ID=%RU32\n",
-                           pProcess->uPID, pSession->StartupInfo.uSessionID);
+        VGSvcVerbose( 3, "Adding process (PID %RU32) to session ID=%RU32\n", pProcess->uPID, pSession->StartupInfo.uSessionID);
 
         /* Add process to session list. */
-        /* rc = */ RTListAppend(&pSession->lstProcesses, &pProcess->Node);
+        RTListAppend(&pSession->lstProcesses, &pProcess->Node);
 
         int rc2 = RTCritSectLeave(&pSession->CritSect);
@@ -1663 +1561 @@
  * Removes a guest process from a session's process list.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pSession                Guest session to remove process from.
  * @param   pProcess                Guest process to remove.
  */
-int GstCntlSessionProcessRemove(PVBOXSERVICECTRLSESSION pSession,
-                                PVBOXSERVICECTRLPROCESS pProcess)
+int VGSvcGstCtrlSessionProcessRemove(PVBOXSERVICECTRLSESSION pSession, PVBOXSERVICECTRLPROCESS pProcess)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -1676 +1573 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(3, "Removing process (PID %RU32) from session ID=%RU32\n",
-                           pProcess->uPID, pSession->StartupInfo.uSessionID);
+        VGSvcVerbose(3, "Removing process (PID %RU32) from session ID=%RU32\n", pProcess->uPID, pSession->StartupInfo.uSessionID);
         Assert(pProcess->cRefs == 0);
 
@@ -1695 +1591 @@
  * maximum number of concurrent guest processes defined is allowed or not.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pbAllowed           True if starting (another) guest process
  *                              is allowed, false if not.
  */
-int GstCntlSessionProcessStartAllowed(const PVBOXSERVICECTRLSESSION pSession,
-                                      bool *pbAllowed)
+int VGSvcGstCtrlSessionProcessStartAllowed(const PVBOXSERVICECTRLSESSION pSession, bool *pbAllowed)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -1720 +1615 @@
                 uProcsRunning++;
 
-            VBoxServiceVerbose(3, "Maximum served guest processes set to %u, running=%u\n",
-                               pSession->uProcsMaxKept, uProcsRunning);
+            VGSvcVerbose(3, "Maximum served guest processes set to %u, running=%u\n", pSession->uProcsMaxKept, uProcsRunning);
 
             int32_t iProcsLeft = (pSession->uProcsMaxKept - uProcsRunning - 1);
             if (iProcsLeft < 0)
             {
-                VBoxServiceVerbose(3, "Maximum running guest processes reached (%u)\n",
-                                   pSession->uProcsMaxKept);
+                VGSvcVerbose(3, "Maximum running guest processes reached (%u)\n", pSession->uProcsMaxKept);
                 fLimitReached = true;
             }
@@ -1747 +1640 @@
  *
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pSessionStartupInfo     Session startup info.
  * @param   pSessionThread          The session thread under construction.
  * @param   uCtrlSessionThread      The session thread debug ordinal.
  */
-static int vgsvcGstCntlSessionThreadCreateProcess(const PVBOXSERVICECTRLSESSIONSTARTUPINFO pSessionStartupInfo,
-                                                  PVBOXSERVICECTRLSESSIONTHREAD pSessionThread, uint32_t uCtrlSessionThread)
+static int vgsvcVGSvcGstCtrlSessionThreadCreateProcess(const PVBOXSERVICECTRLSESSIONSTARTUPINFO pSessionStartupInfo,
+                                                       PVBOXSERVICECTRLSESSIONTHREAD pSessionThread, uint32_t uCtrlSessionThread)
 {
     /*
@@ -1765 +1658 @@
         Assert(!strlen(pSessionThread->StartupInfo.szDomain));
 
-        VBoxServiceVerbose(3, "New anonymous guest session ID=%RU32 created, fFlags=%x, using protocol %RU32\n",
-                           pSessionStartupInfo->uSessionID,
-                           pSessionStartupInfo->fFlags,
-                           pSessionStartupInfo->uProtocol);
+        VGSvcVerbose(3, "New anonymous guest session ID=%RU32 created, fFlags=%x, using protocol %RU32\n",
+                     pSessionStartupInfo->uSessionID,
+                     pSessionStartupInfo->fFlags,
+                     pSessionStartupInfo->uProtocol);
     }
     else
     {
-        VBoxServiceVerbose(3, "Spawning new guest session ID=%RU32, szUser=%s, szPassword=%s, szDomain=%s, fFlags=%x, using protocol %RU32\n",
-                           pSessionStartupInfo->uSessionID,
-                           pSessionStartupInfo->szUser,
-#ifdef DEBUG
-                           pSessionStartupInfo->szPassword,
+        VGSvcVerbose(3, "Spawning new guest session ID=%RU32, szUser=%s, szPassword=%s, szDomain=%s, fFlags=%x, using protocol %RU32\n",
+                     pSessionStartupInfo->uSessionID,
+                     pSessionStartupInfo->szUser,
+#ifdef DEBUG
+                     pSessionStartupInfo->szPassword,
 #else
-                           "XXX", /* Never show passwords in release mode. */
-#endif
-                           pSessionStartupInfo->szDomain,
-                           pSessionStartupInfo->fFlags,
-                           pSessionStartupInfo->uProtocol);
+                     "XXX", /* Never show passwords in release mode. */
+#endif
+                     pSessionStartupInfo->szDomain,
+                     pSessionStartupInfo->fFlags,
+                     pSessionStartupInfo->uProtocol);
     }
 
@@ -1853 +1746 @@
 
 #ifdef DEBUG
-        VBoxServiceVerbose(4, "Argv building rc=%Rrc, session flags=%x\n", rc, g_Session.fFlags);
+        VGSvcVerbose(4, "Argv building rc=%Rrc, session flags=%x\n", rc, g_Session.fFlags);
         if (RT_SUCCESS(rc))
         {
@@ -1867 +1760 @@
         if (g_cVerbosity > 3)
         {
-            VBoxServiceVerbose(4, "Spawning parameters:\n");
+            VGSvcVerbose(4, "Spawning parameters:\n");
             for (idxArg = 0; apszArgs[idxArg]; idxArg++)
-                VBoxServiceVerbose(4, "\t%s\n", apszArgs[idxArg]);
+                VGSvcVerbose(4, "\t%s\n", apszArgs[idxArg]);
         }
 
@@ -1968 +1861 @@
  * be added to the given session thread list.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pList                   Which list to use to store the session thread in.
  * @param   pSessionStartupInfo     Session startup info.
@@ -1974 +1867 @@
  *                                  Optional.
  */
-int GstCntlSessionThreadCreate(PRTLISTANCHOR pList,
-                               const PVBOXSERVICECTRLSESSIONSTARTUPINFO pSessionStartupInfo,
-                               PVBOXSERVICECTRLSESSIONTHREAD *ppSessionThread)
+int VGSvcGstCtrlSessionThreadCreate(PRTLISTANCHOR pList, const PVBOXSERVICECTRLSESSIONSTARTUPINFO pSessionStartupInfo,
+                                    PVBOXSERVICECTRLSESSIONTHREAD *ppSessionThread)
 {
     AssertPtrReturn(pList, VERR_INVALID_POINTER);
@@ -2020 +1912 @@
              * Start the session thread.
              */
-            rc = vgsvcGstCntlSessionThreadCreateProcess(pSessionStartupInfo, pSessionThread, s_uCtrlSessionThread);
+            rc = vgsvcVGSvcGstCtrlSessionThreadCreateProcess(pSessionStartupInfo, pSessionThread, s_uCtrlSessionThread);
             if (RT_SUCCESS(rc))
             {
@@ -2026 +1918 @@
                  * Start the session thread.
                  */
-                rc = RTThreadCreateF(&pSessionThread->Thread, gstcntlSessionThread,
+                rc = RTThreadCreateF(&pSessionThread->Thread, vgsvcGstCtrlSessionThread,
                                      pSessionThread /*pvUser*/, 0 /*cbStack*/,
                                      RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "sess%u", s_uCtrlSessionThread);
@@ -2036 +1928 @@
                         && !ASMAtomicReadBool(&pSessionThread->fShutdown))
                     {
-                        VBoxServiceVerbose(2, "Thread for session ID=%RU32 started\n", pSessionThread->StartupInfo.uSessionID);
+                        VGSvcVerbose(2, "Thread for session ID=%RU32 started\n", pSessionThread->StartupInfo.uSessionID);
 
                         ASMAtomicXchgBool(&pSessionThread->fStarted, true);
 
                         /* Add session to list. */
-                        /* rc = */ RTListAppend(pList, &pSessionThread->Node);
+                        RTListAppend(pList, &pSessionThread->Node);
                         if (ppSessionThread) /* Return session if wanted. */
                             *ppSessionThread = pSessionThread;
@@ -2050 +1942 @@
                      * Bail out.
                      */
-                    VBoxServiceError("Thread for session ID=%RU32 failed to start, rc=%Rrc\n",
-                                     pSessionThread->StartupInfo.uSessionID, rc);
+                    VGSvcError("Thread for session ID=%RU32 failed to start, rc=%Rrc\n",
+                               pSessionThread->StartupInfo.uSessionID, rc);
                     if (RT_SUCCESS_NP(rc))
                         rc = VERR_CANT_CREATE; /** @todo Find a better rc. */
                 }
                 else
-                    VBoxServiceError("Creating session thread failed, rc=%Rrc\n", rc);
+                    VGSvcError("Creating session thread failed, rc=%Rrc\n", rc);
 
                 RTProcTerminate(pSessionThread->hProcess);
@@ -2074 +1966 @@
         rc = VERR_NO_MEMORY;
 
-    VBoxServiceVerbose(3, "Spawning session thread returned returned rc=%Rrc\n", rc);
+    VGSvcVerbose(3, "Spawning session thread returned returned rc=%Rrc\n", rc);
     return rc;
 }
@@ -2082 +1974 @@
  * Waits for a formerly opened guest session process to close.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pThread                 Guest session thread to wait for.
  * @param   uTimeoutMS              Waiting timeout (in ms).
- * @param   uFlags                  Closing flags.
+ * @param   fFlags                  Closing flags.
  */
-int GstCntlSessionThreadWait(PVBOXSERVICECTRLSESSIONTHREAD pThread,
-                             uint32_t uTimeoutMS, uint32_t uFlags)
+int VGSvcGstCtrlSessionThreadWait(PVBOXSERVICECTRLSESSIONTHREAD pThread, uint32_t uTimeoutMS, uint32_t fFlags)
 {
     AssertPtrReturn(pThread, VERR_INVALID_POINTER);
     /** @todo Validate closing flags. */
 
-    if (pThread->Thread == NIL_RTTHREAD)
-    {
-        AssertMsgFailed(("Guest session thread of session %p does not exist when it should\n",
-                         pThread));
-        return VERR_NOT_FOUND;
-    }
+    AssertMsgReturn(pThread->Thread != NIL_RTTHREAD,
+                    ("Guest session thread of session %p does not exist when it should\n", pThread),
+                    VERR_NOT_FOUND);
 
     int rc = VINF_SUCCESS;
@@ -2111 +1999 @@
         ASMAtomicXchgBool(&pThread->fShutdown, true);
 
-        VBoxServiceVerbose(3, "Waiting for session thread ID=%RU32 to close (%RU32ms) ...\n",
-                           pThread->StartupInfo.uSessionID, uTimeoutMS);
+        VGSvcVerbose(3, "Waiting for session thread ID=%RU32 to close (%RU32ms) ...\n",
+                     pThread->StartupInfo.uSessionID, uTimeoutMS);
 
         int rcThread;
         rc = RTThreadWait(pThread->Thread, uTimeoutMS, &rcThread);
-        if (RT_FAILURE(rc))
-        {
-            VBoxServiceError("Waiting for session thread ID=%RU32 to close failed with rc=%Rrc\n",
-                             pThread->StartupInfo.uSessionID, rc);
-        }
+        if (RT_SUCCESS(rc))
+            VGSvcVerbose(3, "Session thread ID=%RU32 ended with rc=%Rrc\n", pThread->StartupInfo.uSessionID, rcThread);
         else
-            VBoxServiceVerbose(3, "Session thread ID=%RU32 ended with rc=%Rrc\n",
-                               pThread->StartupInfo.uSessionID, rcThread);
+            VGSvcError("Waiting for session thread ID=%RU32 to close failed with rc=%Rrc\n", pThread->StartupInfo.uSessionID, rc);
     }
 
@@ -2133 +2017 @@
  * it from the session thread list.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pThread                 Session thread to destroy.
- * @param   uFlags                  Closing flags.
+ * @param   fFlags                  Closing flags.
  */
-int GstCntlSessionThreadDestroy(PVBOXSERVICECTRLSESSIONTHREAD pThread, uint32_t uFlags)
+int VGSvcGstCtrlSessionThreadDestroy(PVBOXSERVICECTRLSESSIONTHREAD pThread, uint32_t fFlags)
 {
     AssertPtrReturn(pThread, VERR_INVALID_POINTER);
 
-    int rc = GstCntlSessionThreadWait(pThread,
-                                      5 * 60 * 1000 /* 5 minutes timeout */, uFlags);
+    int rc = VGSvcGstCtrlSessionThreadWait(pThread, 5 * 60 * 1000 /* 5 minutes timeout */, fFlags);
 
     /* Remove session from list and destroy object. */
@@ -2158 +2041 @@
  * @note    Caller is responsible for locking!
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pList                   Which list to close the session threads for.
- * @param   uFlags                  Closing flags.
+ * @param   fFlags                  Closing flags.
  */
-int GstCntlSessionThreadDestroyAll(PRTLISTANCHOR pList, uint32_t uFlags)
+int VGSvcGstCtrlSessionThreadDestroyAll(PRTLISTANCHOR pList, uint32_t fFlags)
 {
     AssertPtrReturn(pList, VERR_INVALID_POINTER);
@@ -2170 +2053 @@
     /*int rc = VbglR3GuestCtrlClose
         if (RT_FAILURE(rc))
-            VBoxServiceError("Cancelling pending waits failed; rc=%Rrc\n", rc);*/
+            VGSvcError("Cancelling pending waits failed; rc=%Rrc\n", rc);*/
 
     PVBOXSERVICECTRLSESSIONTHREAD pSessIt;
@@ -2176 +2059 @@
     RTListForEachSafe(pList, pSessIt, pSessItNext, VBOXSERVICECTRLSESSIONTHREAD, Node)
     {
-        int rc2 = GstCntlSessionThreadDestroy(pSessIt, uFlags);
+        int rc2 = VGSvcGstCtrlSessionThreadDestroy(pSessIt, fFlags);
         if (RT_FAILURE(rc2))
         {
-            VBoxServiceError("Closing session thread '%s' failed with rc=%Rrc\n", RTThreadGetName(pSessIt->Thread), rc2);
+            VGSvcError("Closing session thread '%s' failed with rc=%Rrc\n", RTThreadGetName(pSessIt->Thread), rc2);
             if (RT_SUCCESS(rc))
                 rc = rc2;
@@ -2186 +2069 @@
     }
 
-    VBoxServiceVerbose(4, "Destroying guest session threads ended with %Rrc\n", rc);
-    return rc;
-}
-
-RTEXITCODE VBoxServiceControlSessionSpawnInit(int argc, char **argv)
+    VGSvcVerbose(4, "Destroying guest session threads ended with %Rrc\n", rc);
+    return rc;
+}
+
+
+/**
+ * Main function for the session process.
+ *
+ * @returns exit code.
+ * @param   argc        Argument count.
+ * @param   argv        Argument vector (UTF-8).
+ */
+RTEXITCODE VGSvcGstCtrlSessionSpawnInit(int argc, char **argv)
 {
     static const RTGETOPTDEF s_aOptions[] =
@@ -2215 +2106 @@
                  1 /*iFirst*/, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
-    uint32_t uSessionFlags = VBOXSERVICECTRLSESSION_FLAG_SPAWN;
+    uint32_t fSession = VBOXSERVICECTRLSESSION_FLAG_SPAWN;
 
     /* Protocol and session ID must be specified explicitly. */
@@ -2235 +2126 @@
 #ifdef DEBUG
             case VBOXSERVICESESSIONOPT_DUMP_STDOUT:
-                uSessionFlags |= VBOXSERVICECTRLSESSION_FLAG_DUMPSTDOUT;
+                fSession |= VBOXSERVICECTRLSESSION_FLAG_DUMPSTDOUT;
                 break;
 
             case VBOXSERVICESESSIONOPT_DUMP_STDERR:
-                uSessionFlags |= VBOXSERVICECTRLSESSION_FLAG_DUMPSTDERR;
+                fSession |= VBOXSERVICECTRLSESSION_FLAG_DUMPSTDERR;
                 break;
 #endif
@@ -2283 +2174 @@
 
     /* Init the session object. */
-    int rc = GstCntlSessionInit(&g_Session, uSessionFlags);
+    int rc = VGSvcGstCtrlSessionInit(&g_Session, fSession);
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_INIT, "Failed to initialize session object, rc=%Rrc\n", rc);
 
-    rc = VBoxServiceLogCreate(g_szLogFile[0] ? g_szLogFile : NULL);
+    rc = VGSvcLogCreate(g_szLogFile[0] ? g_szLogFile : NULL);
     if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_INIT, "Failed to create log file \"%s\", rc=%Rrc\n",
+        return RTMsgErrorExit(RTEXITCODE_INIT, "Failed to create log file '%s', rc=%Rrc\n",
                               g_szLogFile[0] ? g_szLogFile : "<None>", rc);
 
-    RTEXITCODE rcExit = gstcntlSessionSpawnWorker(&g_Session);
-
-    VBoxServiceLogDestroy();
+    RTEXITCODE rcExit = vgsvcGstCtrlSessionSpawnWorker(&g_Session);
+
+    VGSvcLogDestroy();
     return rcExit;
 }

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

@@ -40 +40 @@
 *********************************************************************************************************************************/
 #ifdef RT_OS_LINUX
+
 /** @name Paths to access the CPU device
  * @{
@@ -76 +77 @@
 
 /** Content of uId if the path wasn't probed yet. */
-#define ACPI_CPU_PATH_NOT_PROBED UINT32_MAX
-
+# define ACPI_CPU_PATH_NOT_PROBED UINT32_MAX
+#endif /* RT_OS_LINUX*/
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+#ifdef RT_OS_LINUX
 /** Possible combinations of all path components for level 1. */
-const SYSFSCPUPATHCOMP g_aAcpiCpuPathLvl1[] =
+static const SYSFSCPUPATHCOMP g_aAcpiCpuPathLvl1[] =
 {
     /** LNXSYSTEM:<id> */
-    {true, "LNXSYSTM:*"}
+    { true, "LNXSYSTM:*" }
 };
 
 /** Possible combinations of all path components for level 2. */
-const SYSFSCPUPATHCOMP g_aAcpiCpuPathLvl2[] =
+static const SYSFSCPUPATHCOMP g_aAcpiCpuPathLvl2[] =
 {
     /** device:<id> */
@@ -95 +102 @@
 
 /** Possible combinations of all path components for level 3 */
-const SYSFSCPUPATHCOMP g_aAcpiCpuPathLvl3[] =
+static const SYSFSCPUPATHCOMP g_aAcpiCpuPathLvl3[] =
 {
     /** ACPI0004:<id> */
@@ -102 +109 @@
 
 /** Possible combinations of all path components for level 4 */
-const SYSFSCPUPATHCOMP g_aAcpiCpuPathLvl4[] =
+static const SYSFSCPUPATHCOMP g_aAcpiCpuPathLvl4[] =
 {
     /** LNXCPU:<id> */
@@ -111 +118 @@
 
 /** All possible combinations. */
-SYSFSCPUPATH g_aAcpiCpuPath[] =
+static SYSFSCPUPATH g_aAcpiCpuPath[] =
 {
     /** Level 1 */
@@ -129 +136 @@
  *          below and would make the hot unplug code fail.
  */
-const char *g_apszTopologyPath[] =
+static const char *g_apszTopologyPath[] =
 {
     "sysdev",
     "physical_node"
 };
-#endif
+
+#endif /* RT_OS_LINUX*/
+
 
 #ifdef RT_OS_LINUX
+
 /**
  * Probes for the correct path to the ACPI CPU object in sysfs for the
@@ -143 +153 @@
  * @returns VBox status code.
  */
-static int VBoxServiceCpuHotPlugProbePath(void)
+static int vgsvcCpuHotPlugProbePath(void)
 {
     int rc = VINF_SUCCESS;
@@ -221 +231 @@
         } /* For every level */
 
-        VBoxServiceVerbose(1, "Final path after probing %s rc=%Rrc\n", pszPath, rc);
+        VGSvcVerbose(1, "Final path after probing %s rc=%Rrc\n", pszPath, rc);
         RTStrFree(pszPath);
     }
@@ -227 +237 @@
     return rc;
 }
+
 
 /**
@@ -236 +247 @@
  * @param   idCpuPackage The package ID of the CPU.
  */
-static int VBoxServiceCpuHotPlugGetACPIDevicePath(char **ppszPath, uint32_t idCpuCore, uint32_t idCpuPackage)
+static int vgsvcCpuHotPlugGetACPIDevicePath(char **ppszPath, uint32_t idCpuCore, uint32_t idCpuPackage)
 {
     int rc = VINF_SUCCESS;
@@ -242 +253 @@
     AssertPtrReturn(ppszPath, VERR_INVALID_PARAMETER);
 
-    rc = VBoxServiceCpuHotPlugProbePath();
+    rc = vgsvcCpuHotPlugProbePath();
     if (RT_SUCCESS(rc))
     {
@@ -316 +327 @@
                             pszPath = pszPathCurr;
                             fFound = true;
-                            VBoxServiceVerbose(3, "CPU found\n");
+                            VGSvcVerbose(3, "CPU found\n");
                             break;
                         }
@@ -323 +334 @@
                             /* Get the next directory. */
                             RTStrFree(pszPathCurr);
-                            VBoxServiceVerbose(3, "CPU doesn't match, next directory\n");
+                            VGSvcVerbose(3, "CPU doesn't match, next directory\n");
                         }
                     }
@@ -331 +342 @@
                         iLvlCurr++;
 
-                        VBoxServiceVerbose(3, "Going deeper (iLvlCurr=%u)\n", iLvlCurr);
+                        VGSvcVerbose(3, "Going deeper (iLvlCurr=%u)\n", iLvlCurr);
 
                         pAcpiCpuPathLvl = &g_aAcpiCpuPath[iLvlCurr];
@@ -349 +360 @@
                         }
 
-                        VBoxServiceVerbose(3, "New path %s\n", pszPathDir);
+                        VGSvcVerbose(3, "New path %s\n", pszPathDir);
 
                         /* Open the directory */
@@ -369 +380 @@
                     iLvlCurr--;
                     pAcpiCpuPathLvl = &g_aAcpiCpuPath[iLvlCurr];
-                    VBoxServiceVerbose(3, "Directory not found, going back (iLvlCurr=%u)\n", iLvlCurr);
+                    VGSvcVerbose(3, "Directory not found, going back (iLvlCurr=%u)\n", iLvlCurr);
                 }
             } /* while not found */
@@ -395 +406 @@
     return rc;
 }
+
 #endif /* RT_OS_LINUX */
-
 
 /**
@@ -404 +415 @@
  * @param   idCpuPackage    The CPU package ID.
  */
-static void VBoxServiceCpuHotPlugHandlePlugEvent(uint32_t idCpuCore, uint32_t idCpuPackage)
+static void vgsvcCpuHotPlugHandlePlugEvent(uint32_t idCpuCore, uint32_t idCpuPackage)
 {
 #ifdef RT_OS_LINUX
@@ -413 +424 @@
      * Because the directory might not be available immediately we try a few times.
      *
-     * @todo: Maybe use udev to monitor hot-add events from the kernel
      */
+    /** @todo Maybe use udev to monitor hot-add events from the kernel */
     bool fCpuOnline = false;
     unsigned cTries = 5;
@@ -457 +468 @@
                         if (RT_SUCCESS(rc))
                         {
-                            VBoxServiceVerbose(1, "CpuHotPlug: CPU %u/%u was brought online\n", idCpuPackage, idCpuCore);
+                            VGSvcVerbose(1, "CpuHotPlug: CPU %u/%u was brought online\n", idCpuPackage, idCpuCore);
                             fCpuOnline = true;
                             break;
@@ -464 +475 @@
                     }
                     else
-                        VBoxServiceError("CpuHotPlug: Failed to open \"%s/%s/online\" rc=%Rrc\n",
-                                         SYSFS_CPU_PATH, DirFolderContent.szName, rc);
+                        VGSvcError("CpuHotPlug: Failed to open '%s/%s/online' rc=%Rrc\n",
+                                   SYSFS_CPU_PATH, DirFolderContent.szName, rc);
                 }
             }
         }
         else
-            VBoxServiceError("CpuHotPlug: Failed to open path %s rc=%Rrc\n", SYSFS_CPU_PATH, rc);
+            VGSvcError("CpuHotPlug: Failed to open path %s rc=%Rrc\n", SYSFS_CPU_PATH, rc);
 
         /* Sleep a bit */
@@ -490 +501 @@
  * @param   idCpuPackage    The CPU package ID.
  */
-static void VBoxServiceCpuHotPlugHandleUnplugEvent(uint32_t idCpuCore, uint32_t idCpuPackage)
+static void vgsvcCpuHotPlugHandleUnplugEvent(uint32_t idCpuCore, uint32_t idCpuPackage)
 {
 #ifdef RT_OS_LINUX
     char *pszCpuDevicePath = NULL;
-    int rc = VBoxServiceCpuHotPlugGetACPIDevicePath(&pszCpuDevicePath, idCpuCore, idCpuPackage);
+    int rc = vgsvcCpuHotPlugGetACPIDevicePath(&pszCpuDevicePath, idCpuCore, idCpuPackage);
     if (RT_SUCCESS(rc))
     {
         RTFILE hFileCpuEject;
-        rc = RTFileOpenF(&hFileCpuEject, RTFILE_O_WRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE,
-                         "%s/eject", pszCpuDevicePath);
+        rc = RTFileOpenF(&hFileCpuEject, RTFILE_O_WRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE, "%s/eject", pszCpuDevicePath);
         if (RT_SUCCESS(rc))
         {
@@ -505 +515 @@
             rc = RTFileWrite(hFileCpuEject, "1", 1, NULL);
             if (RT_SUCCESS(rc))
-                VBoxServiceVerbose(1, "CpuHotPlug: CPU %u/%u was ejected\n", idCpuPackage, idCpuCore);
+                VGSvcVerbose(1, "CpuHotPlug: CPU %u/%u was ejected\n", idCpuPackage, idCpuCore);
             else
-                VBoxServiceError("CpuHotPlug: Failed to eject CPU %u/%u rc=%Rrc\n", idCpuPackage, idCpuCore, rc);
+                VGSvcError("CpuHotPlug: Failed to eject CPU %u/%u rc=%Rrc\n", idCpuPackage, idCpuCore, rc);
 
             RTFileClose(hFileCpuEject);
         }
         else
-            VBoxServiceError("CpuHotPlug: Failed to open \"%s/eject\" rc=%Rrc\n", pszCpuDevicePath, rc);
+            VGSvcError("CpuHotPlug: Failed to open '%s/eject' rc=%Rrc\n", pszCpuDevicePath, rc);
         RTStrFree(pszCpuDevicePath);
     }
     else
-        VBoxServiceError("CpuHotPlug: Failed to get CPU device path rc=%Rrc\n", rc);
+        VGSvcError("CpuHotPlug: Failed to get CPU device path rc=%Rrc\n", rc);
 #else
 # error "Port me"
@@ -523 +533 @@
 
 
-/** @copydoc VBOXSERVICE::pfnWorker */
-DECLCALLBACK(int) VBoxServiceCpuHotPlugWorker(bool volatile *pfShutdown)
+/** @interface_method_impl{VBOXSERVICE,pfnWorker} */
+static DECLCALLBACK(int) vgsvcCpuHotPlugWorker(bool volatile *pfShutdown)
 {
     /*
@@ -550 +560 @@
         if (RT_SUCCESS(rc))
         {
-            VBoxServiceVerbose(3, "CpuHotPlug: Event happened idCpuCore=%u idCpuPackage=%u enmEventType=%d\n",
-                               idCpuCore, idCpuPackage, enmEventType);
+            VGSvcVerbose(3, "CpuHotPlug: Event happened idCpuCore=%u idCpuPackage=%u enmEventType=%d\n",
+                         idCpuCore, idCpuPackage, enmEventType);
             switch (enmEventType)
             {
                 case VMMDevCpuEventType_Plug:
-                    VBoxServiceCpuHotPlugHandlePlugEvent(idCpuCore, idCpuPackage);
+                    vgsvcCpuHotPlugHandlePlugEvent(idCpuCore, idCpuPackage);
                     break;
 
                 case VMMDevCpuEventType_Unplug:
-                    VBoxServiceCpuHotPlugHandleUnplugEvent(idCpuCore, idCpuPackage);
+                    vgsvcCpuHotPlugHandleUnplugEvent(idCpuCore, idCpuPackage);
                     break;
 
@@ -566 +576 @@
                     static uint32_t s_iErrors = 0;
                     if (s_iErrors++ < 10)
-                        VBoxServiceError("CpuHotPlug: Unknown event: idCpuCore=%u idCpuPackage=%u enmEventType=%d\n",
-                                         idCpuCore, idCpuPackage, enmEventType);
+                        VGSvcError("CpuHotPlug: Unknown event: idCpuCore=%u idCpuPackage=%u enmEventType=%d\n",
+                                   idCpuCore, idCpuPackage, enmEventType);
                     break;
                 }
@@ -574 +584 @@
         else if (rc != VERR_INTERRUPTED && rc != VERR_TRY_AGAIN)
         {
-            VBoxServiceError("CpuHotPlug: VbglR3CpuHotPlugWaitForEvent returned %Rrc\n", rc);
+            VGSvcError("CpuHotPlug: VbglR3CpuHotPlugWaitForEvent returned %Rrc\n", rc);
             break;
         }
@@ -587 +597 @@
 
 
-/** @copydoc VBOXSERVICE::pfnStop */
-static DECLCALLBACK(void) VBoxServiceCpuHotPlugStop(void)
+/** @interface_method_impl{VBOXSERVICE,pfnStop} */
+static DECLCALLBACK(void) vgsvcCpuHotPlugStop(void)
 {
     VbglR3InterruptEventWaits();
@@ -609 +619 @@
     NULL,
     /* methods */
-    VBoxServiceDefaultPreInit,
-    VBoxServiceDefaultOption,
-    VBoxServiceDefaultInit,
-    VBoxServiceCpuHotPlugWorker,
-    VBoxServiceCpuHotPlugStop,
-    VBoxServiceDefaultTerm
+    VGSvcDefaultPreInit,
+    VGSvcDefaultOption,
+    VGSvcDefaultInit,
+    vgsvcCpuHotPlugWorker,
+    vgsvcCpuHotPlugStop,
+    VGSvcDefaultTerm
 };
 

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

@@ -96 +96 @@
 
 /* Default call-backs for services which do not need special behaviour. */
-DECLCALLBACK(int) VBoxServiceDefaultPreInit(void);
-DECLCALLBACK(int) VBoxServiceDefaultOption(const char **ppszShort, int argc,
-                                           char **argv, int *pi);
-DECLCALLBACK(int) VBoxServiceDefaultInit(void);
-DECLCALLBACK(void) VBoxServiceDefaultTerm(void);
+DECLCALLBACK(int)  VGSvcDefaultPreInit(void);
+DECLCALLBACK(int)  VGSvcDefaultOption(const char **ppszShort, int argc, char **argv, int *pi);
+DECLCALLBACK(int)  VGSvcDefaultInit(void);
+DECLCALLBACK(void) VGSvcDefaultTerm(void);
 
 /** The service name.
@@ -181 +180 @@
 #endif
 
-extern RTEXITCODE               VBoxServiceSyntax(const char *pszFormat, ...);
-extern RTEXITCODE               VBoxServiceError(const char *pszFormat, ...);
-extern void                     VBoxServiceVerbose(unsigned iLevel, const char *pszFormat, ...);
-extern int                      VBoxServiceArgUInt32(int argc, char **argv, const char *psz, int *pi, uint32_t *pu32,
-                                                     uint32_t u32Min, uint32_t u32Max);
-extern int                      VBoxServiceStartServices(void);
-extern int                      VBoxServiceStopServices(void);
-extern void                     VBoxServiceMainWait(void);
-extern int                      VBoxServiceReportStatus(VBoxGuestFacilityStatus enmStatus);
-#ifdef RT_OS_WINDOWS
-extern RTEXITCODE               VBoxServiceWinInstall(void);
-extern RTEXITCODE               VBoxServiceWinUninstall(void);
-extern RTEXITCODE               VBoxServiceWinEnterCtrlDispatcher(void);
-extern void                     VBoxServiceWinSetStopPendingStatus(uint32_t uCheckPoint);
+extern RTEXITCODE               VGSvcSyntax(const char *pszFormat, ...);
+extern RTEXITCODE               VGSvcError(const char *pszFormat, ...);
+extern void                     VGSvcVerbose(unsigned iLevel, const char *pszFormat, ...);
+extern int                      VGSvcLogCreate(const char *pszLogFile);
+extern void                     VGSvcLogDestroy(void);
+extern int                      VGSvcArgUInt32(int argc, char **argv, const char *psz, int *pi, uint32_t *pu32,
+                                               uint32_t u32Min, uint32_t u32Max);
+
+/* Exposing the following bits because of windows: */
+extern int                      VGSvcStartServices(void);
+extern int                      VGSvcStopServices(void);
+extern void                     VGSvcMainWait(void);
+extern int                      VGSvcReportStatus(VBoxGuestFacilityStatus enmStatus);
+#ifdef RT_OS_WINDOWS
+extern RTEXITCODE               VGSvcWinInstall(void);
+extern RTEXITCODE               VGSvcWinUninstall(void);
+extern RTEXITCODE               VGSvcWinEnterCtrlDispatcher(void);
+extern void                     VGSvcWinSetStopPendingStatus(uint32_t uCheckPoint);
 #endif
 
 #ifdef VBOXSERVICE_TOOLBOX
-extern bool                     VBoxServiceToolboxMain(int argc, char **argv, RTEXITCODE *prcExit);
+extern bool                     VGSvcToolboxMain(int argc, char **argv, RTEXITCODE *prcExit);
 #endif
 
 #ifdef RT_OS_WINDOWS
 # ifdef VBOX_WITH_GUEST_PROPS
-extern int                      VBoxServiceVMInfoWinWriteUsers(PVBOXSERVICEVEPROPCACHE pCache, char **ppszUserList, uint32_t *pcUsersInList);
-extern int                      VBoxServiceWinGetComponentVersions(uint32_t uiClientID);
+extern int                      VGSvcVMInfoWinWriteUsers(PVBOXSERVICEVEPROPCACHE pCache, char **ppszUserList, uint32_t *pcUsersInList);
+extern int                      VGSvcVMInfoWinGetComponentVersions(uint32_t uClientID);
 # endif /* VBOX_WITH_GUEST_PROPS */
 #endif /* RT_OS_WINDOWS */
 
 #ifdef VBOXSERVICE_MANAGEMENT
-extern uint32_t                 VBoxServiceBalloonQueryPages(uint32_t cbPage);
+extern uint32_t                 VGSvcBalloonQueryPages(uint32_t cbPage);
 #endif
 #if defined(VBOXSERVICE_PAGE_SHARING)
-extern RTEXITCODE               VBoxServicePageSharingWorkerChild(void);
-#endif
-extern int                      VBoxServiceVMInfoSignal(void);
+extern RTEXITCODE               VGSvcPageSharingWorkerChild(void);
+#endif
+extern int                      VGSvcVMInfoSignal(void);
 
 RT_C_DECLS_END

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

@@ -38 +38 @@
 #include "VBoxServiceUtils.h"
 
+#if defined(RT_OS_WINDOWS) && !defined(TARGET_NT4)
+# include <tlhelp32.h>
+# include <psapi.h>
+# include <winternl.h>
+#endif
+
 
 /*********************************************************************************************************************************
-*   Global Variables                                                                                                             *
+*   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-
-/** The semaphore we're blocking on. */
-static RTSEMEVENTMULTI  g_PageSharingEvent = NIL_RTSEMEVENTMULTI;
-
-#if defined(RT_OS_WINDOWS) && !defined(TARGET_NT4)
-#include <tlhelp32.h>
-#include <psapi.h>
-#include <winternl.h>
-
 typedef struct
 {
     AVLPVNODECORE   Core;
+#ifdef RT_OS_WINDOWS
     HMODULE         hModule;
     char            szFileVersion[16];
     MODULEENTRY32   Info;
-} KNOWN_MODULE, *PKNOWN_MODULE;
-
-#define SystemModuleInformation     11
+#endif /* RT_OS_WINDOWS */
+} VGSVCPGSHKNOWNMOD, *PVGSVCPGSHKNOWNMOD;
+
+
+#ifdef RT_OS_WINDOWS
+/* NTDLL API we want to use: */
+# define SystemModuleInformation 11
 
 typedef struct _RTL_PROCESS_MODULE_INFORMATION
@@ -82 +84 @@
 
 typedef NTSTATUS (WINAPI *PFNZWQUERYSYSTEMINFORMATION)(ULONG, PVOID, ULONG, PULONG);
+
+#endif /* RT_OS_WINDOWS */
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+#ifdef RT_OS_WINDOWS
 static PFNZWQUERYSYSTEMINFORMATION g_pfnZwQuerySystemInformation = NULL;
-
-
-static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *pvUser);
+#endif
+
+/** The semaphore we're blocking on. */
+static RTSEMEVENTMULTI  g_PageSharingEvent = NIL_RTSEMEVENTMULTI;
 
 static PAVLPVNODECORE   g_pKnownModuleTree = NULL;
 static uint64_t         g_idSession = 0;
+
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+static DECLCALLBACK(int) vgsvcPageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *pvUser);
+
+
+#if defined(RT_OS_WINDOWS) && !defined(TARGET_NT4)
 
 /**
@@ -95 +115 @@
  * @param   fValidateMemory Validate/touch memory pages or not
  */
-void VBoxServicePageSharingRegisterModule(PKNOWN_MODULE pModule, bool fValidateMemory)
+static void vgsvcPageSharingRegisterModule(PVGSVCPGSHKNOWNMOD pModule, bool fValidateMemory)
 {
     VMMDEVSHAREDREGIONDESC   aRegions[VMMDEVSHAREDREGIONDESC_MAX];
@@ -103 +123 @@
     BYTE                    *pVersionInfo;
 
-    VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule\n");
+    VGSvcVerbose(3, "vgsvcPageSharingRegisterModule\n");
 
     cbVersionSize = GetFileVersionInfoSize(pModule->Info.szExePath, &dummy);
     if (!cbVersionSize)
     {
-        VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule: GetFileVersionInfoSize failed with %d\n", GetLastError());
+        VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: GetFileVersionInfoSize failed with %d\n", GetLastError());
         return;
     }
@@ -117 +137 @@
     if (!GetFileVersionInfo(pModule->Info.szExePath, 0, cbVersionSize, pVersionInfo))
     {
-        VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule: GetFileVersionInfo failed with %d\n", GetLastError());
+        VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: GetFileVersionInfo failed with %d\n", GetLastError());
         goto end;
     }
 
     /* Fetch default code page. */
-    struct LANGANDCODEPAGE {
+    struct LANGANDCODEPAGE
+    {
         WORD wLanguage;
         WORD wCodePage;
@@ -128 +149 @@
 
     UINT   cbTranslate;
-    BOOL ret = VerQueryValue(pVersionInfo, TEXT("\\VarFileInfo\\Translation"), (LPVOID *)&lpTranslate, &cbTranslate);
-    if (    !ret
-        ||  cbTranslate < 4)
-    {
-        VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule: VerQueryValue failed with %d (cb=%d)\n", GetLastError(), cbTranslate);
+    BOOL fRet = VerQueryValue(pVersionInfo, TEXT("\\VarFileInfo\\Translation"), (LPVOID *)&lpTranslate, &cbTranslate);
+    if (   !fRet
+        || cbTranslate < 4)
+    {
+        VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: VerQueryValue failed with %d (cb=%d)\n", GetLastError(), cbTranslate);
         goto end;
     }
@@ -147 +168 @@
 
         sprintf(szFileVersionLocation, TEXT("\\StringFileInfo\\%04x%04x\\FileVersion"), lpTranslate[i].wLanguage, lpTranslate[i].wCodePage);
-        ret = VerQueryValue(pVersionInfo, szFileVersionLocation, (LPVOID *)&lpszFileVersion, &cbFileVersion);
-        if (ret)
+        fRet = VerQueryValue(pVersionInfo, szFileVersionLocation, (LPVOID *)&lpszFileVersion, &cbFileVersion);
+        if (fRet)
             break;
     }
     if (i == cTranslationBlocks)
     {
-        VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule: no file version found!\n");
+        VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: no file version found!\n");
         goto end;
     }
@@ -167 +188 @@
         {
             MEMORY_BASIC_INFORMATION MemInfo;
-
-            SIZE_T ret = VirtualQuery(pBaseAddress, &MemInfo, sizeof(MemInfo));
-            Assert(ret);
-            if (!ret)
+            SIZE_T cbRet = VirtualQuery(pBaseAddress, &MemInfo, sizeof(MemInfo));
+            Assert(cbRet);
+            if (!cbRet)
             {
-                VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule: VirtualQueryEx failed with %d\n", GetLastError());
+                VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: VirtualQueryEx failed with %d\n", GetLastError());
                 break;
             }
 
-            if (    MemInfo.State == MEM_COMMIT
-                &&  MemInfo.Type == MEM_IMAGE)
+            if (   MemInfo.State == MEM_COMMIT
+                && MemInfo.Type  == MEM_IMAGE)
             {
                 switch (MemInfo.Protect)
                 {
-                case PAGE_EXECUTE:
-                case PAGE_EXECUTE_READ:
-                case PAGE_READONLY:
-                {
-                    char *pRegion = (char *)MemInfo.BaseAddress;
-
-                    /* Skip the first region as it only contains the image file header. */
-                    if (pRegion != (char *)pModule->Info.modBaseAddr)
+                    case PAGE_EXECUTE:
+                    case PAGE_EXECUTE_READ:
+                    case PAGE_READONLY:
                     {
-                        /* Touch all pages. */
-                        while (pRegion < (char *)MemInfo.BaseAddress + MemInfo.RegionSize)
+                        char *pRegion = (char *)MemInfo.BaseAddress;
+
+                        /* Skip the first region as it only contains the image file header. */
+                        if (pRegion != (char *)pModule->Info.modBaseAddr)
                         {
-                            /* Try to trick the optimizer to leave the page touching code in place. */
-                            ASMProbeReadByte(pRegion);
-                            pRegion += PAGE_SIZE;
+                            /* Touch all pages. */
+                            while ((uintptr_t)pRegion < (uintptr_t)MemInfo.BaseAddress + MemInfo.RegionSize)
+                            {
+                                /* Try to trick the optimizer to leave the page touching code in place. */
+                                ASMProbeReadByte(pRegion);
+                                pRegion += PAGE_SIZE;
+                            }
                         }
+#ifdef RT_ARCH_X86
+                        aRegions[idxRegion].GCRegionAddr = (RTGCPTR32)MemInfo.BaseAddress;
+#else
+                        aRegions[idxRegion].GCRegionAddr = (RTGCPTR64)MemInfo.BaseAddress;
+#endif
+                        aRegions[idxRegion].cbRegion     = MemInfo.RegionSize;
+                        idxRegion++;
+
+                        break;
                     }
-#ifdef RT_ARCH_X86
-                    aRegions[idxRegion].GCRegionAddr = (RTGCPTR32)MemInfo.BaseAddress;
-#else
-                    aRegions[idxRegion].GCRegionAddr = (RTGCPTR64)MemInfo.BaseAddress;
-#endif
-                    aRegions[idxRegion].cbRegion     = MemInfo.RegionSize;
-                    idxRegion++;
-
-                    break;
-                }
-
-                default:
-                    break; /* ignore */
+
+                    default:
+                        break; /* ignore */
                 }
             }
@@ -216 +236 @@
             pBaseAddress = (BYTE *)MemInfo.BaseAddress + MemInfo.RegionSize;
             if (dwModuleSize > MemInfo.RegionSize)
-            {
                 dwModuleSize -= MemInfo.RegionSize;
-            }
             else
             {
@@ -241 +259 @@
         idxRegion++;
     }
-    VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule: VbglR3RegisterSharedModule %s %s base=%p size=%x cregions=%d\n", pModule->Info.szModule, pModule->szFileVersion, pModule->Info.modBaseAddr, pModule->Info.modBaseSize, idxRegion);
+    VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: VbglR3RegisterSharedModule %s %s base=%p size=%x cregions=%d\n", pModule->Info.szModule, pModule->szFileVersion, pModule->Info.modBaseAddr, pModule->Info.modBaseSize, idxRegion);
     int rc = VbglR3RegisterSharedModule(pModule->Info.szModule, pModule->szFileVersion, (uintptr_t)pModule->Info.modBaseAddr,
                                         pModule->Info.modBaseSize, idxRegion, aRegions);
     if (RT_FAILURE(rc))
-        VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule: VbglR3RegisterSharedModule failed with %Rrc\n", rc);
+        VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: VbglR3RegisterSharedModule failed with %Rrc\n", rc);
 
 end:
@@ -252 +270 @@
 }
 
+
 /**
  * Inspect all loaded modules for the specified process
  * @param   dwProcessId     Process id
  */
-void VBoxServicePageSharingInspectModules(DWORD dwProcessId, PAVLPVNODECORE *ppNewTree)
-{
-    HANDLE hProcess, hSnapshot;
-
+static void vgsvcPageSharingInspectModules(DWORD dwProcessId, PAVLPVNODECORE *ppNewTree)
+{
     /* Get a list of all the modules in this process. */
-    hProcess = OpenProcess(PROCESS_QUERY_INFORMATION,
-                           FALSE /* no child process handle inheritance */, dwProcessId);
+    HANDLE hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE /* no child process handle inheritance */, dwProcessId);
     if (hProcess == NULL)
     {
-        VBoxServiceVerbose(3, "VBoxServicePageSharingInspectModules: OpenProcess %x failed with %d\n", dwProcessId, GetLastError());
+        VGSvcVerbose(3, "vgsvcPageSharingInspectModules: OpenProcess %x failed with %d\n", dwProcessId, GetLastError());
         return;
     }
 
-    hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, dwProcessId);
+    HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, dwProcessId);
     if (hSnapshot == INVALID_HANDLE_VALUE)
     {
-        VBoxServiceVerbose(3, "VBoxServicePageSharingInspectModules: CreateToolhelp32Snapshot failed with %d\n", GetLastError());
+        VGSvcVerbose(3, "vgsvcPageSharingInspectModules: CreateToolhelp32Snapshot failed with %d\n", GetLastError());
         CloseHandle(hProcess);
         return;
     }
 
-    VBoxServiceVerbose(3, "VBoxServicePageSharingInspectModules\n");
+    VGSvcVerbose(3, "vgsvcPageSharingInspectModules\n");
 
     MODULEENTRY32 ModuleInfo;
@@ -300 +316 @@
             {
                 /* New module; register it. */
-                PKNOWN_MODULE pModule = (PKNOWN_MODULE)RTMemAllocZ(sizeof(*pModule));
+                PVGSVCPGSHKNOWNMOD pModule = (PVGSVCPGSHKNOWNMOD)RTMemAllocZ(sizeof(*pModule));
                 Assert(pModule);
                 if (!pModule)
@@ -309 +325 @@
                 pModule->hModule  = LoadLibraryEx(ModuleInfo.szExePath, 0, DONT_RESOLVE_DLL_REFERENCES);
                 if (pModule->hModule)
-                    VBoxServicePageSharingRegisterModule(pModule, true /* validate pages */);
-
-                VBoxServiceVerbose(3, "\n\n     MODULE NAME:     %s",           ModuleInfo.szModule );
-                VBoxServiceVerbose(3, "\n     executable     = %s",             ModuleInfo.szExePath );
-                VBoxServiceVerbose(3, "\n     process ID     = 0x%08X",         ModuleInfo.th32ProcessID );
-                VBoxServiceVerbose(3, "\n     base address   = 0x%08X", (DWORD) ModuleInfo.modBaseAddr );
-                VBoxServiceVerbose(3, "\n     base size      = %d",             ModuleInfo.modBaseSize );
+                    vgsvcPageSharingRegisterModule(pModule, true /* validate pages */);
+
+                VGSvcVerbose(3, "\n\n     MODULE NAME:     %s",           ModuleInfo.szModule );
+                VGSvcVerbose(3, "\n     executable     = %s",             ModuleInfo.szExePath );
+                VGSvcVerbose(3, "\n     process ID     = 0x%08X",         ModuleInfo.th32ProcessID );
+                VGSvcVerbose(3, "\n     base address   = 0x%08X", (DWORD) ModuleInfo.modBaseAddr );
+                VGSvcVerbose(3, "\n     base size      = %d",             ModuleInfo.modBaseSize );
 
                 pRec = &pModule->Core;
@@ -322 +338 @@
             Assert(ret); NOREF(ret);
         }
-    }
-    while (Module32Next(hSnapshot, &ModuleInfo));
+    } while (Module32Next(hSnapshot, &ModuleInfo));
 
     CloseHandle(hSnapshot);
     CloseHandle(hProcess);
 }
+
 
 /**
@@ -334 +350 @@
  *
  */
-static void VBoxServicePageSharingInspectGuest(void)
+static void vgsvcPageSharingInspectGuest(void)
 {
     HANDLE hSnapshot;
@@ -340 +356 @@
     DWORD dwProcessId = GetCurrentProcessId();
 
-    VBoxServiceVerbose(3, "VBoxServicePageSharingInspectGuest\n");
+    VGSvcVerbose(3, "vgsvcPageSharingInspectGuest\n");
 
     hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
     if (hSnapshot == INVALID_HANDLE_VALUE)
     {
-        VBoxServiceVerbose(3, "VBoxServicePageSharingInspectGuest: CreateToolhelp32Snapshot failed with %d\n", GetLastError());
+        VGSvcVerbose(3, "vgsvcPageSharingInspectGuest: CreateToolhelp32Snapshot failed with %d\n", GetLastError());
         return;
     }
@@ -359 +375 @@
         /* Skip our own process. */
         if (ProcessInfo.th32ProcessID != dwProcessId)
-            VBoxServicePageSharingInspectModules(ProcessInfo.th32ProcessID, &pNewTree);
+            vgsvcPageSharingInspectModules(ProcessInfo.th32ProcessID, &pNewTree);
     }
     while (Process32Next(hSnapshot, &ProcessInfo));
@@ -375 +391 @@
         if (!cbBuffer)
         {
-            VBoxServiceVerbose(1, "ZwQuerySystemInformation returned length 0\n");
+            VGSvcVerbose(1, "ZwQuerySystemInformation returned length 0\n");
             goto skipkernelmodules;
         }
@@ -386 +402 @@
         if (ret != STATUS_SUCCESS)
         {
-            VBoxServiceVerbose(1, "ZwQuerySystemInformation returned %x (1)\n", ret);
+            VGSvcVerbose(1, "ZwQuerySystemInformation returned %x (1)\n", ret);
             goto skipkernelmodules;
         }
@@ -393 +409 @@
         for (unsigned i = 0; i < pSystemModules->NumberOfModules; i++)
         {
-            VBoxServiceVerbose(4, "\n\n   KERNEL  MODULE NAME:     %s",     pSystemModules->Modules[i].FullPathName[pSystemModules->Modules[i].OffsetToFileName] );
-            VBoxServiceVerbose(4, "\n     executable     = %s",             pSystemModules->Modules[i].FullPathName );
-            VBoxServiceVerbose(4, "\n     flags          = 0x%08X\n",       pSystemModules->Modules[i].Flags);
+            VGSvcVerbose(4, "\n\n   KERNEL  MODULE NAME:     %s", pSystemModules->Modules[i].FullPathName[pSystemModules->Modules[i].OffsetToFileName] );
+            VGSvcVerbose(4, "\n     executable     = %s",         pSystemModules->Modules[i].FullPathName );
+            VGSvcVerbose(4, "\n     flags          = 0x%08X\n",   pSystemModules->Modules[i].Flags);
 
             /* User-mode modules seem to have no flags set; skip them as we detected them above. */
@@ -409 +425 @@
                 {
                     /* New module; register it. */
-                    char          szFullFilePath[512];
-                    PKNOWN_MODULE pModule = (PKNOWN_MODULE)RTMemAllocZ(sizeof(*pModule));
+                    char szFullFilePath[512];
+                    PVGSVCPGSHKNOWNMOD pModule = (PVGSVCPGSHKNOWNMOD)RTMemAllocZ(sizeof(*pModule));
                     Assert(pModule);
                     if (!pModule)
                         break;
 
+/** @todo Use unicode APIs! */
                     strcpy(pModule->Info.szModule, &pSystemModules->Modules[i].FullPathName[pSystemModules->Modules[i].OffsetToFileName]);
                     GetSystemDirectoryA(szFullFilePath, sizeof(szFullFilePath));
@@ -425 +442 @@
                         strcat(szFullFilePath, "\\");
                         strcat(szFullFilePath, pSystemModules->Modules[i].FullPathName);
-                        VBoxServiceVerbose(3, "Unexpected kernel module name try %s\n", szFullFilePath);
+                        VGSvcVerbose(3, "Unexpected kernel module name try %s\n", szFullFilePath);
                         if (RTFileExists(szFullFilePath) == false)
                         {
@@ -431 +448 @@
                             strcat(szFullFilePath, "\\drivers\\");
                             strcat(szFullFilePath, pSystemModules->Modules[i].FullPathName);
-                            VBoxServiceVerbose(3, "Unexpected kernel module name try %s\n", szFullFilePath);
+                            VGSvcVerbose(3, "Unexpected kernel module name try %s\n", szFullFilePath);
                             if (RTFileExists(szFullFilePath) == false)
                             {
-                                VBoxServiceVerbose(1, "Unexpected kernel module name %s\n", pSystemModules->Modules[i].FullPathName);
+                                VGSvcVerbose(1, "Unexpected kernel module name %s\n", pSystemModules->Modules[i].FullPathName);
                                 RTMemFree(pModule);
                                 continue;
@@ -445 +462 @@
                         if (!lpPath)
                         {
-                            VBoxServiceVerbose(1, "Unexpected kernel module name %s (2)\n", pSystemModules->Modules[i].FullPathName);
+                            VGSvcVerbose(1, "Unexpected kernel module name %s (2)\n", pSystemModules->Modules[i].FullPathName);
                             RTMemFree(pModule);
                             continue;
@@ -458 +475 @@
 
                     pModule->Core.Key = pSystemModules->Modules[i].ImageBase;
-                    VBoxServicePageSharingRegisterModule(pModule, false /* don't check memory pages */);
-
-                    VBoxServiceVerbose(3, "\n\n   KERNEL  MODULE NAME:     %s",     pModule->Info.szModule );
-                    VBoxServiceVerbose(3, "\n     executable     = %s",             pModule->Info.szExePath );
-                    VBoxServiceVerbose(3, "\n     base address   = 0x%08X", (DWORD) pModule->Info.modBaseAddr );
-                    VBoxServiceVerbose(3, "\n     flags          = 0x%08X",         pSystemModules->Modules[i].Flags);
-                    VBoxServiceVerbose(3, "\n     base size      = %d",             pModule->Info.modBaseSize );
+                    vgsvcPageSharingRegisterModule(pModule, false /* don't check memory pages */);
+
+                    VGSvcVerbose(3, "\n\n   KERNEL  MODULE NAME:     %s",     pModule->Info.szModule );
+                    VGSvcVerbose(3, "\n     executable     = %s",             pModule->Info.szExePath );
+                    VGSvcVerbose(3, "\n     base address   = 0x%08X", (DWORD) pModule->Info.modBaseAddr );
+                    VGSvcVerbose(3, "\n     flags          = 0x%08X",         pSystemModules->Modules[i].Flags);
+                    VGSvcVerbose(3, "\n     base size      = %d",             pModule->Info.modBaseSize );
 
                     pRec = &pModule->Core;
@@ -478 +495 @@
 
     /* Delete leftover modules in the old tree. */
-    RTAvlPVDestroy(&g_pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, NULL);
+    RTAvlPVDestroy(&g_pKnownModuleTree, vgsvcPageSharingEmptyTreeCallback, NULL);
 
     /* Check all registered modules. */
@@ -487 +504 @@
 }
 
+
 /**
  * RTAvlPVDestroy callback.
  */
-static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *pvUser)
-{
-    PKNOWN_MODULE pModule = (PKNOWN_MODULE)pNode;
+static DECLCALLBACK(int) vgsvcPageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *pvUser)
+{
+    PVGSVCPGSHKNOWNMOD pModule = (PVGSVCPGSHKNOWNMOD)pNode;
     bool *pfUnregister = (bool *)pvUser;
 
-    VBoxServiceVerbose(3, "VBoxServicePageSharingEmptyTreeCallback %s %s\n", pModule->Info.szModule, pModule->szFileVersion);
+    VGSvcVerbose(3, "vgsvcPageSharingEmptyTreeCallback %s %s\n", pModule->Info.szModule, pModule->szFileVersion);
 
     /* Dereference module in the hypervisor. */
@@ -514 +532 @@
 
 #elif TARGET_NT4
-static void VBoxServicePageSharingInspectGuest(void)
+
+static void vgsvcPageSharingInspectGuest(void)
 {
     /* not implemented */
 }
+
 #else
-static void VBoxServicePageSharingInspectGuest(void)
+
+static void vgsvcPageSharingInspectGuest(void)
 {
     /** @todo other platforms */
 }
+
 #endif
 
-/** @copydoc VBOXSERVICE::pfnInit */
-static DECLCALLBACK(int) VBoxServicePageSharingInit(void)
-{
-    VBoxServiceVerbose(3, "VBoxServicePageSharingInit\n");
+/** @interface_method_impl{VBOXSERVICE,pfnInit} */
+static DECLCALLBACK(int) vgsvcPageSharingInit(void)
+{
+    VGSvcVerbose(3, "vgsvcPageSharingInit\n");
 
     int rc = RTSemEventMultiCreate(&g_PageSharingEvent);
@@ -540 +562 @@
     {
         if (rc == VERR_IO_GEN_FAILURE)
-            VBoxServiceVerbose(0, "PageSharing: Page sharing support is not available by the host\n");
+            VGSvcVerbose(0, "PageSharing: Page sharing support is not available by the host\n");
         else
-            VBoxServiceError("VBoxServicePageSharingInit: Failed with rc=%Rrc\n", rc);
+            VGSvcError("vgsvcPageSharingInit: Failed with rc=%Rrc\n", rc);
 
         rc = VERR_SERVICE_DISABLED;
@@ -555 +577 @@
 }
 
-/** @copydoc VBOXSERVICE::pfnWorker */
-DECLCALLBACK(int) VBoxServicePageSharingWorker(bool volatile *pfShutdown)
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vgsvcPageSharingWorker(bool volatile *pfShutdown)
 {
     /*
@@ -569 +594 @@
     for (;;)
     {
-        BOOL fEnabled = VbglR3PageSharingIsEnabled();
-
-        VBoxServiceVerbose(3, "VBoxServicePageSharingWorker: enabled=%d\n", fEnabled);
+        bool fEnabled = VbglR3PageSharingIsEnabled();
+        VGSvcVerbose(3, "vgsvcPageSharingWorker: enabled=%d\n", fEnabled);
 
         if (fEnabled)
-            VBoxServicePageSharingInspectGuest();
+            vgsvcPageSharingInspectGuest();
 
         /*
@@ -589 +613 @@
         if (rc != VERR_TIMEOUT && RT_FAILURE(rc))
         {
-            VBoxServiceError("VBoxServicePageSharingWorker: RTSemEventMultiWait failed; rc=%Rrc\n", rc);
+            VGSvcError("vgsvcPageSharingWorker: RTSemEventMultiWait failed; rc=%Rrc\n", rc);
             break;
         }
@@ -601 +625 @@
             bool fUnregister = false;
 
-            VBoxServiceVerbose(3, "VBoxServicePageSharingWorker: VM was restored!!\n");
+            VGSvcVerbose(3, "vgsvcPageSharingWorker: VM was restored!!\n");
             /* The VM was restored, so reregister all modules the next time. */
-            RTAvlPVDestroy(&g_pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, &fUnregister);
+            RTAvlPVDestroy(&g_pKnownModuleTree, vgsvcPageSharingEmptyTreeCallback, &fUnregister);
             g_pKnownModuleTree = NULL;
 
@@ -614 +638 @@
     g_PageSharingEvent = NIL_RTSEMEVENTMULTI;
 
-    VBoxServiceVerbose(3, "VBoxServicePageSharingWorker: finished thread\n");
+    VGSvcVerbose(3, "vgsvcPageSharingWorker: finished thread\n");
     return 0;
 }
@@ -622 +646 @@
 /**
  * This gets control when VBoxService is launched with "pagefusion" by
- * VBoxServicePageSharingWorkerProcess().
+ * vgsvcPageSharingWorkerProcess().
  *
  * @returns RTEXITCODE_SUCCESS.
@@ -629 +653 @@
  *          via RTProcTerminate().
  */
-RTEXITCODE VBoxServicePageSharingWorkerChild(void)
-{
-    VBoxServiceVerbose(3, "VBoxServicePageSharingInitFork\n");
+RTEXITCODE VGSvcPageSharingWorkerChild(void)
+{
+    VGSvcVerbose(3, "vgsvcPageSharingInitFork\n");
 
     bool fShutdown = false;
-    VBoxServicePageSharingInit();
-    VBoxServicePageSharingWorker(&fShutdown);
+    vgsvcPageSharingInit();
+    vgsvcPageSharingWorker(&fShutdown);
 
     return RTEXITCODE_SUCCESS;
 }
 
-/** @copydoc VBOXSERVICE::pfnWorker */
-DECLCALLBACK(int) VBoxServicePageSharingWorkerProcess(bool volatile *pfShutdown)
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vgsvcPageSharingWorkerProcess(bool volatile *pfShutdown)
 {
     RTPROCESS hProcess = NIL_RTPROCESS;
@@ -657 +684 @@
     for (;;)
     {
-        BOOL fEnabled = VbglR3PageSharingIsEnabled();
-        VBoxServiceVerbose(3, "VBoxServicePageSharingWorkerProcess: enabled=%d\n", fEnabled);
+        bool fEnabled = VbglR3PageSharingIsEnabled();
+        VGSvcVerbose(3, "vgsvcPageSharingWorkerProcess: enabled=%d\n", fEnabled);
 
         /*
@@ -678 +705 @@
                 rc = RTProcCreate(pszExeName, papszArgs, RTENV_DEFAULT, 0 /* normal child */, &hProcess);
                 if (RT_FAILURE(rc))
-                    VBoxServiceError("VBoxServicePageSharingWorkerProcess: RTProcCreate %s failed; rc=%Rrc\n", pszExeName, rc);
+                    VGSvcError("vgsvcPageSharingWorkerProcess: RTProcCreate %s failed; rc=%Rrc\n", pszExeName, rc);
             }
         }
@@ -695 +722 @@
         if (rc != VERR_TIMEOUT && RT_FAILURE(rc))
         {
-            VBoxServiceError("VBoxServicePageSharingWorkerProcess: RTSemEventMultiWait failed; rc=%Rrc\n", rc);
+            VGSvcError("vgsvcPageSharingWorkerProcess: RTSemEventMultiWait failed; rc=%Rrc\n", rc);
             break;
         }
@@ -706 +733 @@
     g_PageSharingEvent = NIL_RTSEMEVENTMULTI;
 
-    VBoxServiceVerbose(3, "VBoxServicePageSharingWorkerProcess: finished thread\n");
+    VGSvcVerbose(3, "vgsvcPageSharingWorkerProcess: finished thread\n");
     return 0;
 }
@@ -712 +739 @@
 #endif /* RT_OS_WINDOWS */
 
-/** @copydoc VBOXSERVICE::pfnStop */
-static DECLCALLBACK(void) VBoxServicePageSharingStop(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vgsvcPageSharingStop(void)
 {
     RTSemEventMultiSignal(g_PageSharingEvent);
@@ -733 +762 @@
     NULL,
     /* methods */
-    VBoxServiceDefaultPreInit,
-    VBoxServiceDefaultOption,
-    VBoxServicePageSharingInit,
+    VGSvcDefaultPreInit,
+    VGSvcDefaultOption,
+    vgsvcPageSharingInit,
 #ifdef RT_OS_WINDOWS
-    VBoxServicePageSharingWorkerProcess,
+    vgsvcPageSharingWorkerProcess,
 #else
-    VBoxServicePageSharingWorker,
+    vgsvcPageSharingWorker,
 #endif
-    VBoxServicePageSharingStop,
-    VBoxServiceDefaultTerm
+    vgsvcPageSharingStop,
+    VGSvcDefaultTerm
 };
+

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

@@ -31 +31 @@
 
 
-/** Internal functions, not for public use. */
-PVBOXSERVICEVEPROPCACHEENTRY vboxServicePropCacheFindInternal(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, uint32_t uFlags);
-PVBOXSERVICEVEPROPCACHEENTRY vboxServicePropCacheInsertEntryInternal(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName);
-
 
 /** @todo Docs */
-PVBOXSERVICEVEPROPCACHEENTRY vboxServicePropCacheFindInternal(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, uint32_t uFlags)
+static PVBOXSERVICEVEPROPCACHEENTRY vgsvcPropCacheFindInternal(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName,
+                                                               uint32_t fFlags)
 {
     AssertPtrReturn(pCache, NULL);
@@ -65 +62 @@
 
 /** @todo Docs */
-PVBOXSERVICEVEPROPCACHEENTRY vboxServicePropCacheInsertEntryInternal(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName)
+static PVBOXSERVICEVEPROPCACHEENTRY vgsvcPropCacheInsertEntryInternal(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName)
 {
     AssertPtrReturn(pCache, NULL);
@@ -86 +83 @@
         if (RT_SUCCESS(rc))
         {
-            /*rc =*/ RTListAppend(&pCache->NodeHead, &pNode->NodeSucc);
+            RTListAppend(&pCache->NodeHead, &pNode->NodeSucc);
             rc = RTCritSectLeave(&pCache->CritSect);
         }
@@ -95 +92 @@
 
 /** @todo Docs */
-int vboxServicePropCacheWritePropF(uint32_t u32ClientId, const char *pszName, uint32_t fFlags, const char *pszValueFormat, ...)
+static int vgsvcPropCacheWritePropF(uint32_t u32ClientId, const char *pszName, uint32_t fFlags, const char *pszValueFormat, ...)
 {
     AssertPtrReturn(pszName, VERR_INVALID_POINTER);
@@ -108 +105 @@
         if (RTStrAPrintfV(&pszValue, pszValueFormat, va) >= 0)
         {
-            if (fFlags & VBOXSERVICEPROPCACHEFLAG_TRANSIENT)
+            if (fFlags & VGSVCPROPCACHE_FLAGS_TRANSIENT)
             {
                 /*
@@ -135 +132 @@
     }
     else
-    {
         rc = VbglR3GuestPropWriteValue(u32ClientId, pszName, NULL);
-    }
     return rc;
 }
@@ -149 +144 @@
  * @param   uClientId       The HGCM handle of to the guest property service.
  */
-int VBoxServicePropCacheCreate(PVBOXSERVICEVEPROPCACHE pCache, uint32_t uClientId)
+int VGSvcPropCacheCreate(PVBOXSERVICEVEPROPCACHE pCache, uint32_t uClientId)
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
@@ -162 +157 @@
 /**
  * Updates a cache entry without submitting any changes to the host.
+ *
  * This is handy for defining default values/flags.
  *
@@ -171 +167 @@
  * @param   pszValueReset   The property reset value.
  */
-int VBoxServicePropCacheUpdateEntry(PVBOXSERVICEVEPROPCACHE pCache,
-                                    const char *pszName, uint32_t fFlags, const char *pszValueReset)
+int VGSvcPropCacheUpdateEntry(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, uint32_t fFlags, const char *pszValueReset)
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
     AssertPtrReturn(pszName, VERR_INVALID_POINTER);
-    PVBOXSERVICEVEPROPCACHEENTRY pNode = vboxServicePropCacheFindInternal(pCache, pszName, 0);
+    PVBOXSERVICEVEPROPCACHEENTRY pNode = vgsvcPropCacheFindInternal(pCache, pszName, 0);
     if (pNode == NULL)
-        pNode = vboxServicePropCacheInsertEntryInternal(pCache, pszName);
+        pNode = vgsvcPropCacheInsertEntryInternal(pCache, pszName);
 
     int rc;
@@ -214 +209 @@
  * @param   ...             Format arguments.
  */
-int VBoxServicePropCacheUpdate(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, const char *pszValueFormat, ...)
+int VGSvcPropCacheUpdate(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, const char *pszValueFormat, ...)
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
@@ -235 +230 @@
     }
 
-    PVBOXSERVICEVEPROPCACHEENTRY pNode = vboxServicePropCacheFindInternal(pCache, pszName, 0);
+    PVBOXSERVICEVEPROPCACHEENTRY pNode = vgsvcPropCacheFindInternal(pCache, pszName, 0);
 
     /* Lock the cache. */
@@ -242 +237 @@
     {
         if (pNode == NULL)
-            pNode = vboxServicePropCacheInsertEntryInternal(pCache, pszName);
+            pNode = vgsvcPropCacheInsertEntryInternal(pCache, pszName);
 
         AssertPtr(pNode);
@@ -249 +244 @@
             bool fUpdate = false;
             /* Always update this property, no matter what? */
-            if (pNode->fFlags & VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE)
+            if (pNode->fFlags & VGSVCPROPCACHE_FLAGS_ALWAYS_UPDATE)
                 fUpdate = true;
             /* Did the value change so we have to update? */
@@ -261 +256 @@
             {
                 /* Write the update. */
-                rc = vboxServicePropCacheWritePropF(pCache->uClientID, pNode->pszName, pNode->fFlags, pszValue);
-                VBoxServiceVerbose(4, "[PropCache %p]: Written \"%s\"=\"%s\" (flags: %x), rc=%Rrc\n",
+                rc = vgsvcPropCacheWritePropF(pCache->uClientID, pNode->pszName, pNode->fFlags, pszValue);
+                VGSvcVerbose(4, "[PropCache %p]: Written '%s'='%s' (flags: %x), rc=%Rrc\n",
                                    pCache, pNode->pszName, pszValue, pNode->fFlags, rc);
                 if (RT_SUCCESS(rc)) /* Only update the node's value on successful write. */
@@ -280 +275 @@
             if (pNode->pszValue) /* Did we have a value before? Then the value needs to be deleted. */
             {
-                rc = vboxServicePropCacheWritePropF(pCache->uClientID, pNode->pszName,
+                rc = vgsvcPropCacheWritePropF(pCache->uClientID, pNode->pszName,
                                                     0, /* Flags */ NULL /* Value */);
-                VBoxServiceVerbose(4, "[PropCache %p]: Deleted \"%s\"=\"%s\" (flags: %x), rc=%Rrc\n",
+                VGSvcVerbose(4, "[PropCache %p]: Deleted '%s'='%s' (flags: %x), rc=%Rrc\n",
                                    pCache, pNode->pszName, pNode->pszValue, pNode->fFlags, rc);
                 if (RT_SUCCESS(rc)) /* Only delete property value on successful Vbgl deletion. */
@@ -299 +294 @@
     }
 
-    VBoxServiceVerbose(4, "[PropCache %p]: Updating \"%s\" resulted in rc=%Rrc\n",
-                       pCache, pszName, rc);
+    VGSvcVerbose(4, "[PropCache %p]: Updating '%s' resulted in rc=%Rrc\n", pCache, pszName, rc);
 
     /* Delete temp stuff. */
@@ -320 +314 @@
  * @param   ...             Format arguments.
  */
-int VBoxServicePropCacheUpdateByPath(PVBOXSERVICEVEPROPCACHE pCache, const char *pszValue, uint32_t fFlags, const char *pszPathFormat, ...)
+int VGSvcPropCacheUpdateByPath(PVBOXSERVICEVEPROPCACHE pCache, const char *pszValue, uint32_t fFlags,
+                               const char *pszPathFormat, ...)
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
@@ -349 +344 @@
                 {
                     /** @todo Use some internal function to update the node directly, this is slow atm. */
-                    rc = VBoxServicePropCacheUpdate(pCache, pNodeIt->pszName, pszValue);
+                    rc = VGSvcPropCacheUpdate(pCache, pNodeIt->pszName, pszValue);
                 }
                 if (RT_FAILURE(rc))
@@ -367 +362 @@
  * @param   pCache          The property cache.
  */
-int VBoxServicePropCacheFlush(PVBOXSERVICEVEPROPCACHE pCache)
+int VGSvcPropCacheFlush(PVBOXSERVICEVEPROPCACHE pCache)
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
@@ -377 +372 @@
         RTListForEach(&pCache->NodeHead, pNodeIt, VBOXSERVICEVEPROPCACHEENTRY, NodeSucc)
         {
-            rc = vboxServicePropCacheWritePropF(pCache->uClientID, pNodeIt->pszName,
-                                                pNodeIt->fFlags, pNodeIt->pszValue);
+            rc = vgsvcPropCacheWritePropF(pCache->uClientID, pNodeIt->pszName, pNodeIt->fFlags, pNodeIt->pszValue);
             if (RT_FAILURE(rc))
                 break;
@@ -393 +387 @@
  * @param   pCache          The property cache.
  */
-void VBoxServicePropCacheDestroy(PVBOXSERVICEVEPROPCACHE pCache)
+void VGSvcPropCacheDestroy(PVBOXSERVICEVEPROPCACHE pCache)
 {
     AssertPtrReturnVoid(pCache);
@@ -411 +405 @@
             RTListNodeRemove(&pNode->NodeSucc);
 
-            if (pNode->fFlags & VBOXSERVICEPROPCACHEFLAG_TEMPORARY)
-            {
-                rc = vboxServicePropCacheWritePropF(pCache->uClientID, pNode->pszName,
-                                                    pNode->fFlags, pNode->pszValueReset);
-            }
+            if (pNode->fFlags & VGSVCPROPCACHE_FLAGS_TEMPORARY)
+                rc = vgsvcPropCacheWritePropF(pCache->uClientID, pNode->pszName, pNode->fFlags, pNode->pszValueReset);
 
             AssertPtr(pNode->pszName);

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

@@ -21 +21 @@
 #include "VBoxServiceInternal.h"
 
-# ifdef VBOX_WITH_GUEST_PROPS
+#ifdef VBOX_WITH_GUEST_PROPS
 
+/** @name VGSVCPROPCACHE_FLAG_XXX - Guest Property Cache Flags.
+ * @{ */
 /** Indicates wheter a guest property is temporary and either should
  *  - a) get a "reset" value assigned (via VBoxServicePropCacheUpdateEntry)
@@ -28 +30 @@
  *  - b) get deleted when no reset value is specified.
  */
-#define VBOXSERVICEPROPCACHEFLAG_TEMPORARY              RT_BIT(1)
+# define VGSVCPROPCACHE_FLAGS_TEMPORARY             RT_BIT(1)
 /** Indicates whether a property every time needs to be updated, regardless
  *  if its real value changed or not. */
-#define VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE          RT_BIT(2)
+# define VGSVCPROPCACHE_FLAGS_ALWAYS_UPDATE         RT_BIT(2)
 /** The guest property gets deleted when
  *  - a) the property cache gets destroyed, or
  *  - b) the VM gets reset / shutdown / destroyed.
  */
-#define VBOXSERVICEPROPCACHEFLAG_TRANSIENT              RT_BIT(3)
+# define VGSVCPROPCACHE_FLAGS_TRANSIENT             RT_BIT(3)
+/** @}  */
 
-int VBoxServicePropCacheCreate(PVBOXSERVICEVEPROPCACHE pCache, uint32_t uClientId);
-int VBoxServicePropCacheUpdateEntry(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, uint32_t fFlags, const char *pszValueReset);
-int VBoxServicePropCacheUpdate(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, const char *pszValueFormat, ...);
-int VBoxServicePropCacheUpdateByPath(PVBOXSERVICEVEPROPCACHE pCache, const char *pszValue, uint32_t fFlags, const char *pszPathFormat, ...);
-int VBoxServicePropCacheFlush(PVBOXSERVICEVEPROPCACHE pCache);
-void VBoxServicePropCacheDestroy(PVBOXSERVICEVEPROPCACHE pCache);
-# endif /* VBOX_WITH_GUEST_PROPS */
+int  VGSvcPropCacheCreate(PVBOXSERVICEVEPROPCACHE pCache, uint32_t uClientId);
+int  VGSvcPropCacheUpdateEntry(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, uint32_t fFlags, const char *pszValueReset);
+int  VGSvcPropCacheUpdate(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, const char *pszValueFormat, ...);
+int  VGSvcPropCacheUpdateByPath(PVBOXSERVICEVEPROPCACHE pCache, const char *pszValue, uint32_t fFlags,
+                                const char *pszPathFormat, ...);
+int  VGSvcPropCacheFlush(PVBOXSERVICEVEPROPCACHE pCache);
+void VGSvcPropCacheDestroy(PVBOXSERVICEVEPROPCACHE pCache);
+#endif /* VBOX_WITH_GUEST_PROPS */
 
-#endif  /* ___VBoxServicePropCache_h */
+#endif
 

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

@@ -62 +62 @@
 typedef struct _VBOXSTATSCONTEXT
 {
-    RTMSINTERVAL          cMsStatInterval;
-
-    uint64_t              au64LastCpuLoad_Idle[VMM_MAX_CPU_COUNT];
-    uint64_t              au64LastCpuLoad_Kernel[VMM_MAX_CPU_COUNT];
-    uint64_t              au64LastCpuLoad_User[VMM_MAX_CPU_COUNT];
-    uint64_t              au64LastCpuLoad_Nice[VMM_MAX_CPU_COUNT];
+    RTMSINTERVAL    cMsStatInterval;
+
+    uint64_t        au64LastCpuLoad_Idle[VMM_MAX_CPU_COUNT];
+    uint64_t        au64LastCpuLoad_Kernel[VMM_MAX_CPU_COUNT];
+    uint64_t        au64LastCpuLoad_User[VMM_MAX_CPU_COUNT];
+    uint64_t        au64LastCpuLoad_Nice[VMM_MAX_CPU_COUNT];
 
 #ifdef RT_OS_WINDOWS
-    NTSTATUS (WINAPI *pfnNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS SystemInformationClass, PVOID SystemInformation, ULONG SystemInformationLength, PULONG ReturnLength);
+    NTSTATUS (WINAPI *pfnNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS SystemInformationClass, PVOID SystemInformation,
+                                                   ULONG SystemInformationLength, PULONG ReturnLength);
     void     (WINAPI *pfnGlobalMemoryStatusEx)(LPMEMORYSTATUSEX lpBuffer);
     BOOL     (WINAPI *pfnGetPerformanceInfo)(PPERFORMANCE_INFORMATION pPerformanceInformation, DWORD cb);
@@ -80 +81 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-static VBOXSTATSCONTEXT gCtx = {0};
+/** Global data. */
+static VBOXSTATSCONTEXT g_VMStat = {0};
 
 /** The semaphore we're blocking on. */
@@ -86 +88 @@
 
 
-/** @copydoc VBOXSERVICE::pfnInit */
-static DECLCALLBACK(int) VBoxServiceVMStatsInit(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vgsvcVMStatsInit(void)
 {
-    VBoxServiceVerbose(3, "VBoxServiceVMStatsInit\n");
+    VGSvcVerbose(3, "vgsvcVMStatsInit\n");
 
     int rc = RTSemEventMultiCreate(&g_VMStatEvent);
     AssertRCReturn(rc, rc);
 
-    gCtx.cMsStatInterval        = 0;     /* default; update disabled */
-    RT_ZERO(gCtx.au64LastCpuLoad_Idle);
-    RT_ZERO(gCtx.au64LastCpuLoad_Kernel);
-    RT_ZERO(gCtx.au64LastCpuLoad_User);
-    RT_ZERO(gCtx.au64LastCpuLoad_Nice);
-
-    rc = VbglR3StatQueryInterval(&gCtx.cMsStatInterval);
+    g_VMStat.cMsStatInterval        = 0;     /* default; update disabled */
+    RT_ZERO(g_VMStat.au64LastCpuLoad_Idle);
+    RT_ZERO(g_VMStat.au64LastCpuLoad_Kernel);
+    RT_ZERO(g_VMStat.au64LastCpuLoad_User);
+    RT_ZERO(g_VMStat.au64LastCpuLoad_Nice);
+
+    rc = VbglR3StatQueryInterval(&g_VMStat.cMsStatInterval);
     if (RT_SUCCESS(rc))
-        VBoxServiceVerbose(3, "VBoxStatsInit: New statistics interval %u seconds\n", gCtx.cMsStatInterval);
+        VGSvcVerbose(3, "vgsvcVMStatsInit: New statistics interval %u seconds\n", g_VMStat.cMsStatInterval);
     else
-        VBoxServiceVerbose(3, "VBoxStatsInit: DeviceIoControl failed with %d\n", rc);
+        VGSvcVerbose(3, "vgsvcVMStatsInit: DeviceIoControl failed with %d\n", rc);
 
 #ifdef RT_OS_WINDOWS
     /* NtQuerySystemInformation might be dropped in future releases, so load
        it dynamically as per Microsoft's recommendation. */
-    *(void **)&gCtx.pfnNtQuerySystemInformation = RTLdrGetSystemSymbol("ntdll.dll", "NtQuerySystemInformation");
-    if (gCtx.pfnNtQuerySystemInformation)
-        VBoxServiceVerbose(3, "VBoxStatsInit: gCtx.pfnNtQuerySystemInformation = %x\n", gCtx.pfnNtQuerySystemInformation);
+    *(void **)&g_VMStat.pfnNtQuerySystemInformation = RTLdrGetSystemSymbol("ntdll.dll", "NtQuerySystemInformation");
+    if (g_VMStat.pfnNtQuerySystemInformation)
+        VGSvcVerbose(3, "vgsvcVMStatsInit: g_VMStat.pfnNtQuerySystemInformation = %x\n", g_VMStat.pfnNtQuerySystemInformation);
     else
     {
-        VBoxServiceVerbose(3, "VBoxStatsInit: ntdll.NtQuerySystemInformation not found!\n");
+        VGSvcVerbose(3, "vgsvcVMStatsInit: ntdll.NtQuerySystemInformation not found!\n");
         return VERR_SERVICE_DISABLED;
     }
 
     /* GlobalMemoryStatus is win2k and up, so load it dynamically */
-    *(void **)&gCtx.pfnGlobalMemoryStatusEx = RTLdrGetSystemSymbol("kernel32.dll", "GlobalMemoryStatusEx");
-    if (gCtx.pfnGlobalMemoryStatusEx)
-        VBoxServiceVerbose(3, "VBoxStatsInit: gCtx.GlobalMemoryStatusEx = %x\n", gCtx.pfnGlobalMemoryStatusEx);
+    *(void **)&g_VMStat.pfnGlobalMemoryStatusEx = RTLdrGetSystemSymbol("kernel32.dll", "GlobalMemoryStatusEx");
+    if (g_VMStat.pfnGlobalMemoryStatusEx)
+        VGSvcVerbose(3, "vgsvcVMStatsInit: g_VMStat.GlobalMemoryStatusEx = %x\n", g_VMStat.pfnGlobalMemoryStatusEx);
     else
     {
         /** @todo Now fails in NT4; do we care? */
-        VBoxServiceVerbose(3, "VBoxStatsInit: kernel32.GlobalMemoryStatusEx not found!\n");
+        VGSvcVerbose(3, "vgsvcVMStatsInit: kernel32.GlobalMemoryStatusEx not found!\n");
         return VERR_SERVICE_DISABLED;
     }
 
     /* GetPerformanceInfo is xp and up, so load it dynamically */
-    *(void **)&gCtx.pfnGetPerformanceInfo = RTLdrGetSystemSymbol("psapi.dll", "GetPerformanceInfo");
-    if (gCtx.pfnGetPerformanceInfo)
-        VBoxServiceVerbose(3, "VBoxStatsInit: gCtx.pfnGetPerformanceInfo= %x\n", gCtx.pfnGetPerformanceInfo);
+    *(void **)&g_VMStat.pfnGetPerformanceInfo = RTLdrGetSystemSymbol("psapi.dll", "GetPerformanceInfo");
+    if (g_VMStat.pfnGetPerformanceInfo)
+        VGSvcVerbose(3, "vgsvcVMStatsInit: g_VMStat.pfnGetPerformanceInfo= %x\n", g_VMStat.pfnGetPerformanceInfo);
 #endif /* RT_OS_WINDOWS */
 
@@ -142 +146 @@
  * Gathers VM statistics and reports them to the host.
  */
-static void VBoxServiceVMStatsReport(void)
+static void vgsvcVMStatsReport(void)
 {
 #if defined(RT_OS_WINDOWS)
-    SYSTEM_INFO systemInfo;
-    PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION pProcInfo;
-    MEMORYSTATUSEX memStatus;
-    uint32_t cbStruct;
-    DWORD    cbReturned;
-
-    Assert(gCtx.pfnGlobalMemoryStatusEx && gCtx.pfnNtQuerySystemInformation);
-    if (    !gCtx.pfnGlobalMemoryStatusEx
-        ||  !gCtx.pfnNtQuerySystemInformation)
+    Assert(g_VMStat.pfnGlobalMemoryStatusEx && g_VMStat.pfnNtQuerySystemInformation);
+    if (   !g_VMStat.pfnGlobalMemoryStatusEx
+        || !g_VMStat.pfnNtQuerySystemInformation)
         return;
 
@@ -162 +160 @@
 
     /* Query and report guest statistics */
+    SYSTEM_INFO systemInfo;
     GetSystemInfo(&systemInfo);
 
+    MEMORYSTATUSEX memStatus;
     memStatus.dwLength = sizeof(memStatus);
-    gCtx.pfnGlobalMemoryStatusEx(&memStatus);
+    g_VMStat.pfnGlobalMemoryStatusEx(&memStatus);
 
     req.guestStats.u32PageSize          = systemInfo.dwPageSize;
@@ -178 +178 @@
                                         | VBOX_GUEST_STAT_PAGE_FILE_SIZE
                                         | VBOX_GUEST_STAT_MEMORY_LOAD;
-#ifdef VBOX_WITH_MEMBALLOON
-    req.guestStats.u32PhysMemBalloon    = VBoxServiceBalloonQueryPages(_4K);
+# ifdef VBOX_WITH_MEMBALLOON
+    req.guestStats.u32PhysMemBalloon    = VGSvcBalloonQueryPages(_4K);
     req.guestStats.u32StatCaps         |= VBOX_GUEST_STAT_PHYS_MEM_BALLOON;
-#else
+# else
     req.guestStats.u32PhysMemBalloon    = 0;
-#endif
-
-    if (gCtx.pfnGetPerformanceInfo)
+# endif
+
+    if (g_VMStat.pfnGetPerformanceInfo)
     {
         PERFORMANCE_INFORMATION perfInfo;
 
-        if (gCtx.pfnGetPerformanceInfo(&perfInfo, sizeof(perfInfo)))
+        if (g_VMStat.pfnGetPerformanceInfo(&perfInfo, sizeof(perfInfo)))
         {
             req.guestStats.u32Processes         = perfInfo.ProcessCount;
@@ -200 +200 @@
             req.guestStats.u32MemSystemCache    = perfInfo.SystemCache;     /* already in pages */
             req.guestStats.u32StatCaps |= VBOX_GUEST_STAT_PROCESSES | VBOX_GUEST_STAT_THREADS | VBOX_GUEST_STAT_HANDLES
-                                        | VBOX_GUEST_STAT_MEM_COMMIT_TOTAL | VBOX_GUEST_STAT_MEM_KERNEL_TOTAL
-                                        | VBOX_GUEST_STAT_MEM_KERNEL_PAGED | VBOX_GUEST_STAT_MEM_KERNEL_NONPAGED
-                                        | VBOX_GUEST_STAT_MEM_SYSTEM_CACHE;
+                                       |  VBOX_GUEST_STAT_MEM_COMMIT_TOTAL | VBOX_GUEST_STAT_MEM_KERNEL_TOTAL
+                                       |  VBOX_GUEST_STAT_MEM_KERNEL_PAGED | VBOX_GUEST_STAT_MEM_KERNEL_NONPAGED
+                                       |  VBOX_GUEST_STAT_MEM_SYSTEM_CACHE;
         }
         else
-            VBoxServiceVerbose(3, "VBoxServiceVMStatsReport: GetPerformanceInfo failed with %d\n", GetLastError());
+            VGSvcVerbose(3, "vgsvcVMStatsReport: GetPerformanceInfo failed with %d\n", GetLastError());
     }
 
     /* Query CPU load information */
-    cbStruct = systemInfo.dwNumberOfProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION);
+    uint32_t cbStruct = systemInfo.dwNumberOfProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION);
+    PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION pProcInfo;
     pProcInfo = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)RTMemAlloc(cbStruct);
     if (!pProcInfo)
@@ -215 +216 @@
 
     /* Unfortunately GetSystemTimes is XP SP1 and up only, so we need to use the semi-undocumented NtQuerySystemInformation */
-    bool fCpuInfoAvail = false;
-    NTSTATUS rc = gCtx.pfnNtQuerySystemInformation(SystemProcessorPerformanceInformation, pProcInfo, cbStruct, &cbReturned);
+    bool  fCpuInfoAvail = false;
+    DWORD cbReturned;
+    NTSTATUS rc = g_VMStat.pfnNtQuerySystemInformation(SystemProcessorPerformanceInformation, pProcInfo, cbStruct, &cbReturned);
     if (    !rc
         &&  cbReturned == cbStruct)
@@ -224 +226 @@
             if (i >= VMM_MAX_CPU_COUNT)
             {
-                VBoxServiceVerbose(3, "VBoxStatsReportStatistics: skipping information for CPU%u\n", i);
-                continue;
-            }
-
-            if (gCtx.au64LastCpuLoad_Kernel[i] == 0)
+                VGSvcVerbose(3, "vgsvcVMStatsReport: skipping information for CPUs %u..%u\n", i, systemInfo.dwNumberOfProcessors);
+                break;
+            }
+
+            if (g_VMStat.au64LastCpuLoad_Kernel[i] == 0)
             {
                 /* first time */
-                gCtx.au64LastCpuLoad_Idle[i]    = pProcInfo[i].IdleTime.QuadPart;
-                gCtx.au64LastCpuLoad_Kernel[i]  = pProcInfo[i].KernelTime.QuadPart;
-                gCtx.au64LastCpuLoad_User[i]    = pProcInfo[i].UserTime.QuadPart;
+                g_VMStat.au64LastCpuLoad_Idle[i]    = pProcInfo[i].IdleTime.QuadPart;
+                g_VMStat.au64LastCpuLoad_Kernel[i]  = pProcInfo[i].KernelTime.QuadPart;
+                g_VMStat.au64LastCpuLoad_User[i]    = pProcInfo[i].UserTime.QuadPart;
 
                 Sleep(250);
 
-                rc = gCtx.pfnNtQuerySystemInformation(SystemProcessorPerformanceInformation, pProcInfo, cbStruct, &cbReturned);
+                rc = g_VMStat.pfnNtQuerySystemInformation(SystemProcessorPerformanceInformation, pProcInfo, cbStruct, &cbReturned);
                 Assert(!rc);
             }
 
-            uint64_t deltaIdle    = (pProcInfo[i].IdleTime.QuadPart   - gCtx.au64LastCpuLoad_Idle[i]);
-            uint64_t deltaKernel  = (pProcInfo[i].KernelTime.QuadPart - gCtx.au64LastCpuLoad_Kernel[i]);
-            uint64_t deltaUser    = (pProcInfo[i].UserTime.QuadPart   - gCtx.au64LastCpuLoad_User[i]);
+            uint64_t deltaIdle    = (pProcInfo[i].IdleTime.QuadPart   - g_VMStat.au64LastCpuLoad_Idle[i]);
+            uint64_t deltaKernel  = (pProcInfo[i].KernelTime.QuadPart - g_VMStat.au64LastCpuLoad_Kernel[i]);
+            uint64_t deltaUser    = (pProcInfo[i].UserTime.QuadPart   - g_VMStat.au64LastCpuLoad_User[i]);
             deltaKernel          -= deltaIdle;  /* idle time is added to kernel time */
             uint64_t ullTotalTime = deltaIdle + deltaKernel + deltaUser;
@@ -249 +251 @@
                 ullTotalTime = 1;
 
-            req.guestStats.u32CpuLoad_Idle      = (uint32_t)(deltaIdle  * 100 / ullTotalTime);
-            req.guestStats.u32CpuLoad_Kernel    = (uint32_t)(deltaKernel* 100 / ullTotalTime);
-            req.guestStats.u32CpuLoad_User      = (uint32_t)(deltaUser  * 100 / ullTotalTime);
-
-            req.guestStats.u32StatCaps |= VBOX_GUEST_STAT_CPU_LOAD_IDLE | VBOX_GUEST_STAT_CPU_LOAD_KERNEL | VBOX_GUEST_STAT_CPU_LOAD_USER;
-            req.guestStats.u32CpuId = i;
+            req.guestStats.u32CpuLoad_Idle   = (uint32_t)(deltaIdle  * 100 / ullTotalTime);
+            req.guestStats.u32CpuLoad_Kernel = (uint32_t)(deltaKernel* 100 / ullTotalTime);
+            req.guestStats.u32CpuLoad_User   = (uint32_t)(deltaUser  * 100 / ullTotalTime);
+
+            req.guestStats.u32StatCaps      |= VBOX_GUEST_STAT_CPU_LOAD_IDLE | VBOX_GUEST_STAT_CPU_LOAD_KERNEL
+                                            |  VBOX_GUEST_STAT_CPU_LOAD_USER;
+            req.guestStats.u32CpuId          = i;
             rc = VbglR3StatReport(&req);
             if (RT_SUCCESS(rc))
-                VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", i);
+                VGSvcVerbose(3, "vgsvcVMStatsReport: new statistics (CPU %u) reported successfully!\n", i);
             else
-                VBoxServiceVerbose(3, "VBoxStatsReportStatistics: DeviceIoControl (stats report) failed with %d\n", GetLastError());
-
-            gCtx.au64LastCpuLoad_Idle[i]   = pProcInfo[i].IdleTime.QuadPart;
-            gCtx.au64LastCpuLoad_Kernel[i] = pProcInfo[i].KernelTime.QuadPart;
-            gCtx.au64LastCpuLoad_User[i]   = pProcInfo[i].UserTime.QuadPart;
+                VGSvcVerbose(3, "vgsvcVMStatsReport: VbglR3StatReport failed with rc=%Rrc\n", rc);
+
+            g_VMStat.au64LastCpuLoad_Idle[i]    = pProcInfo[i].IdleTime.QuadPart;
+            g_VMStat.au64LastCpuLoad_Kernel[i]  = pProcInfo[i].KernelTime.QuadPart;
+            g_VMStat.au64LastCpuLoad_User[i]    = pProcInfo[i].UserTime.QuadPart;
         }
     }
@@ -270 +273 @@
     if (!fCpuInfoAvail)
     {
-        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: CPU info not available!\n");
+        VGSvcVerbose(3, "vgsvcVMStatsReport: CPU info not available!\n");
         rc = VbglR3StatReport(&req);
         if (RT_SUCCESS(rc))
-            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics reported successfully!\n");
+            VGSvcVerbose(3, "vgsvcVMStatsReport: new statistics reported successfully!\n");
         else
-            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
+            VGSvcVerbose(3, "vgsvcVMStatsReport: stats report failed with rc=%Rrc\n", rc);
     }
 
@@ -333 +336 @@
     }
     else
-        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: memory info not available!\n");
+        VGSvcVerbose(3, "vgsvcVMStatsReport: memory info not available!\n");
 
     req.guestStats.u32PageSize = getpagesize();
@@ -340 +343 @@
                                 | VBOX_GUEST_STAT_MEM_SYSTEM_CACHE
                                 | VBOX_GUEST_STAT_PAGE_FILE_SIZE;
-#ifdef VBOX_WITH_MEMBALLOON
-    req.guestStats.u32PhysMemBalloon  = VBoxServiceBalloonQueryPages(_4K);
+# ifdef VBOX_WITH_MEMBALLOON
+    req.guestStats.u32PhysMemBalloon  = VGSvcBalloonQueryPages(_4K);
     req.guestStats.u32StatCaps       |= VBOX_GUEST_STAT_PHYS_MEM_BALLOON;
-#else
+# else
     req.guestStats.u32PhysMemBalloon  = 0;
-#endif
+# endif
 
 
@@ -390 +393 @@
                         rc = RTStrToUInt64Ex(RTStrStripL(psz), &psz, 0, &u64Idle);
 
-                    uint64_t u64DeltaIdle   = u64Idle   - gCtx.au64LastCpuLoad_Idle[u32CpuId];
-                    uint64_t u64DeltaSystem = u64System - gCtx.au64LastCpuLoad_Kernel[u32CpuId];
-                    uint64_t u64DeltaUser   = u64User   - gCtx.au64LastCpuLoad_User[u32CpuId];
-                    uint64_t u64DeltaNice   = u64Nice   - gCtx.au64LastCpuLoad_Nice[u32CpuId];
+                    uint64_t u64DeltaIdle   = u64Idle   - g_VMStat.au64LastCpuLoad_Idle[u32CpuId];
+                    uint64_t u64DeltaSystem = u64System - g_VMStat.au64LastCpuLoad_Kernel[u32CpuId];
+                    uint64_t u64DeltaUser   = u64User   - g_VMStat.au64LastCpuLoad_User[u32CpuId];
+                    uint64_t u64DeltaNice   = u64Nice   - g_VMStat.au64LastCpuLoad_Nice[u32CpuId];
 
                     uint64_t u64DeltaAll    = u64DeltaIdle
@@ -402 +405 @@
                         u64DeltaAll = 1;
 
-                    gCtx.au64LastCpuLoad_Idle[u32CpuId]   = u64Idle;
-                    gCtx.au64LastCpuLoad_Kernel[u32CpuId] = u64System;
-                    gCtx.au64LastCpuLoad_User[u32CpuId]   = u64User;
-                    gCtx.au64LastCpuLoad_Nice[u32CpuId]   = u64Nice;
+                    g_VMStat.au64LastCpuLoad_Idle[u32CpuId]   = u64Idle;
+                    g_VMStat.au64LastCpuLoad_Kernel[u32CpuId] = u64System;
+                    g_VMStat.au64LastCpuLoad_User[u32CpuId]   = u64User;
+                    g_VMStat.au64LastCpuLoad_Nice[u32CpuId]   = u64Nice;
 
                     req.guestStats.u32CpuId = u32CpuId;
@@ -418 +421 @@
                     rc = VbglR3StatReport(&req);
                     if (RT_SUCCESS(rc))
-                        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", u32CpuId);
+                        VGSvcVerbose(3, "vgsvcVMStatsReport: new statistics (CPU %u) reported successfully!\n", u32CpuId);
                     else
-                        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
+                        VGSvcVerbose(3, "vgsvcVMStatsReport: stats report failed with rc=%Rrc\n", rc);
                 }
                 else
-                    VBoxServiceVerbose(3, "VBoxStatsReportStatistics: skipping information for CPU%u\n", u32CpuId);
+                    VGSvcVerbose(3, "vgsvcVMStatsReport: skipping information for CPU%u\n", u32CpuId);
             }
         }
@@ -430 +433 @@
     if (!fCpuInfoAvail)
     {
-        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: CPU info not available!\n");
+        VGSvcVerbose(3, "vgsvcVMStatsReport: CPU info not available!\n");
         rc = VbglR3StatReport(&req);
         if (RT_SUCCESS(rc))
-            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics reported successfully!\n");
+            VGSvcVerbose(3, "vgsvcVMStatsReport: new statistics reported successfully!\n");
         else
-            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
+            VGSvcVerbose(3, "vgsvcVMStatsReport: stats report failed with rc=%Rrc\n", rc);
     }
 
@@ -522 +525 @@
                                    | VBOX_GUEST_STAT_PAGE_FILE_SIZE;
 #ifdef VBOX_WITH_MEMBALLOON
-        req.guestStats.u32PhysMemBalloon  = VBoxServiceBalloonQueryPages(_4K);
+        req.guestStats.u32PhysMemBalloon  = VGSvcBalloonQueryPages(_4K);
         req.guestStats.u32StatCaps       |= VBOX_GUEST_STAT_PHYS_MEM_BALLOON;
 #else
@@ -544 +547 @@
                     break;
 
-                if (cCPUs >= VMM_MAX_CPU_COUNT)
-                    VBoxServiceVerbose(3, "VBoxStatsReportStatistics: skipping information for CPU%u\n", cCPUs);
-                else
+                if (cCPUs < VMM_MAX_CPU_COUNT)
                 {
                     uint64_t u64Idle   = StatCPU.cpu_sysinfo.cpu[CPU_IDLE];
@@ -552 +553 @@
                     uint64_t u64System = StatCPU.cpu_sysinfo.cpu[CPU_KERNEL];
 
-                    uint64_t u64DeltaIdle   = u64Idle   - gCtx.au64LastCpuLoad_Idle[cCPUs];
-                    uint64_t u64DeltaSystem = u64System - gCtx.au64LastCpuLoad_Kernel[cCPUs];
-                    uint64_t u64DeltaUser   = u64User   - gCtx.au64LastCpuLoad_User[cCPUs];
+                    uint64_t u64DeltaIdle   = u64Idle   - g_VMStat.au64LastCpuLoad_Idle[cCPUs];
+                    uint64_t u64DeltaSystem = u64System - g_VMStat.au64LastCpuLoad_Kernel[cCPUs];
+                    uint64_t u64DeltaUser   = u64User   - g_VMStat.au64LastCpuLoad_User[cCPUs];
 
                     uint64_t u64DeltaAll    = u64DeltaIdle + u64DeltaSystem + u64DeltaUser;
@@ -560 +561 @@
                         u64DeltaAll = 1;
 
-                    gCtx.au64LastCpuLoad_Idle[cCPUs]   = u64Idle;
-                    gCtx.au64LastCpuLoad_Kernel[cCPUs] = u64System;
-                    gCtx.au64LastCpuLoad_User[cCPUs]   = u64User;
+                    g_VMStat.au64LastCpuLoad_Idle[cCPUs]   = u64Idle;
+                    g_VMStat.au64LastCpuLoad_Kernel[cCPUs] = u64System;
+                    g_VMStat.au64LastCpuLoad_User[cCPUs]   = u64User;
 
                     req.guestStats.u32CpuId = cCPUs;
@@ -576 +577 @@
                     rc = VbglR3StatReport(&req);
                     if (RT_SUCCESS(rc))
-                        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", cCPUs);
+                        VGSvcVerbose(3, "vgsvcVMStatsReport: new statistics (CPU %u) reported successfully!\n", cCPUs);
                     else
-                        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
+                        VGSvcVerbose(3, "vgsvcVMStatsReport: stats report failed with rc=%Rrc\n", rc);
                     cCPUs++;
                 }
+                else
+                    VGSvcVerbose(3, "vgsvcVMStatsReport: skipping information for CPU%u\n", cCPUs);
             }
         }
@@ -589 +592 @@
         if (!fCpuInfoAvail)
         {
-            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: CPU info not available!\n");
+            VGSvcVerbose(3, "vgsvcVMStatsReport: CPU info not available!\n");
             rc = VbglR3StatReport(&req);
             if (RT_SUCCESS(rc))
-                VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics reported successfully!\n");
+                VGSvcVerbose(3, "vgsvcVMStatsReport: new statistics reported successfully!\n");
             else
-                VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
+                VGSvcVerbose(3, "vgsvcVMStatsReport: stats report failed with rc=%Rrc\n", rc);
         }
 
@@ -606 +609 @@
 }
 
-/** @copydoc VBOXSERVICE::pfnWorker */
-DECLCALLBACK(int) VBoxServiceVMStatsWorker(bool volatile *pfShutdown)
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnWorker}
+ */
+DECLCALLBACK(int) vgsvcVMStatsWorker(bool volatile *pfShutdown)
 {
     int rc = VINF_SUCCESS;
@@ -615 +621 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceVerbose(3, "VBoxServiceVMStatsWorker: VbglR3CtlFilterMask failed with %d\n", rc);
+        VGSvcVerbose(3, "vgsvcVMStatsWorker: VbglR3CtlFilterMask failed with %d\n", rc);
         return rc;
     }
@@ -637 +643 @@
         if (    RT_SUCCESS(rc)
             &&  (fEvents & VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST))
-        {
-            VbglR3StatQueryInterval(&gCtx.cMsStatInterval);
-        }
-
-        if (gCtx.cMsStatInterval)
-        {
-            VBoxServiceVMStatsReport();
-            cWaitMillies = gCtx.cMsStatInterval;
+            VbglR3StatQueryInterval(&g_VMStat.cMsStatInterval);
+
+        if (g_VMStat.cMsStatInterval)
+        {
+            vgsvcVMStatsReport();
+            cWaitMillies = g_VMStat.cMsStatInterval;
         }
         else
@@ -662 +666 @@
         if (rc2 != VERR_TIMEOUT && RT_FAILURE(rc2))
         {
-            VBoxServiceError("VBoxServiceVMStatsWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
+            VGSvcError("vgsvcVMStatsWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
             rc = rc2;
             break;
@@ -671 +675 @@
     rc = VbglR3CtlFilterMask(0, VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST);
     if (RT_FAILURE(rc))
-        VBoxServiceVerbose(3, "VBoxServiceVMStatsWorker: VbglR3CtlFilterMask failed with %d\n", rc);
+        VGSvcVerbose(3, "vgsvcVMStatsWorker: VbglR3CtlFilterMask failed with %d\n", rc);
 
     RTSemEventMultiDestroy(g_VMStatEvent);
     g_VMStatEvent = NIL_RTSEMEVENTMULTI;
 
-    VBoxServiceVerbose(3, "VBoxStatsThread: finished statistics change request thread\n");
+    VGSvcVerbose(3, "VBoxStatsThread: finished statistics change request thread\n");
     return 0;
 }
 
 
-/** @copydoc VBOXSERVICE::pfnStop */
-static DECLCALLBACK(void) VBoxServiceVMStatsStop(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vgsvcVMStatsStop(void)
 {
     RTSemEventMultiSignal(g_VMStatEvent);
@@ -702 +708 @@
     NULL,
     /* methods */
-    VBoxServiceDefaultPreInit,
-    VBoxServiceDefaultOption,
-    VBoxServiceVMStatsInit,
-    VBoxServiceVMStatsWorker,
-    VBoxServiceVMStatsStop,
-    VBoxServiceDefaultTerm
+    VGSvcDefaultPreInit,
+    VGSvcDefaultOption,
+    vgsvcVMStatsInit,
+    vgsvcVMStatsWorker,
+    vgsvcVMStatsStop,
+    VGSvcDefaultTerm
 };
 

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

@@ -83 +83 @@
 #ifdef RT_OS_WINDOWS
 # include <Windows.h>
-# include <winbase.h> /** @todo r=bird: Why is this here? Windows.h should include winbase.h... */
 #else
 # include <unistd.h>
@@ -105 +104 @@
 *********************************************************************************************************************************/
 /** The timesync interval (milliseconds). */
-uint32_t g_TimeSyncInterval = 0;
+static uint32_t         g_TimeSyncInterval = 0;
 /**
  * @see pg_vboxservice_timesync
  *
  * @remark  OS/2: There is either a 1 second resolution on the DosSetDateTime
- *                API or a but in the settimeofday implementation. Thus, don't
+ *                API or a bug in my settimeofday implementation.  Thus, don't
  *                bother unless there is at least a 1 second drift.
  */
 #ifdef RT_OS_OS2
-static uint32_t g_TimeSyncMinAdjust = 1000;
+static uint32_t         g_TimeSyncMinAdjust = 1000;
 #else
-static uint32_t g_TimeSyncMinAdjust = 100;
+static uint32_t         g_TimeSyncMinAdjust = 100;
 #endif
 /** @see pg_vboxservice_timesync */
-static uint32_t g_TimeSyncLatencyFactor = 8;
+static uint32_t         g_TimeSyncLatencyFactor = 8;
 /** @see pg_vboxservice_timesync */
-static uint32_t g_TimeSyncMaxLatency = 250;
+static uint32_t         g_TimeSyncMaxLatency = 250;
 /** @see pg_vboxservice_timesync */
-static uint32_t g_TimeSyncSetThreshold = 20*60*1000;
+static uint32_t         g_TimeSyncSetThreshold = 20*60*1000;
 /** Whether the next adjustment should just set the time instead of trying to
  * adjust it. This is used to implement --timesync-set-start.  */
-static bool volatile g_fTimeSyncSetNext = false;
+static bool volatile    g_fTimeSyncSetNext = false;
 /** Whether to set the time when the VM was restored. */
-static bool g_fTimeSyncSetOnRestore = true;
+static bool             g_fTimeSyncSetOnRestore = true;
 
 /** Current error count. Used to knowing when to bitch and when not to. */
-static uint32_t g_cTimeSyncErrors = 0;
+static uint32_t         g_cTimeSyncErrors = 0;
 
 /** The semaphore we're blocking on. */
-static RTSEMEVENTMULTI g_TimeSyncEvent = NIL_RTSEMEVENTMULTI;
+static RTSEMEVENTMULTI  g_TimeSyncEvent = NIL_RTSEMEVENTMULTI;
 
 /** The VM session ID. Changes whenever the VM is restored or reset. */
-static uint64_t g_idTimeSyncSession;
+static uint64_t         g_idTimeSyncSession;
 
 #ifdef RT_OS_WINDOWS
 /** Process token. */
-static HANDLE g_hTokenProcess = NULL;
+static HANDLE           g_hTokenProcess = NULL;
 /** Old token privileges. */
 static TOKEN_PRIVILEGES g_TkOldPrivileges;
 /** Backup values for time adjustment. */
-static DWORD g_dwWinTimeAdjustment;
-static DWORD g_dwWinTimeIncrement;
-static BOOL g_bWinTimeAdjustmentDisabled;
+static DWORD            g_dwWinTimeAdjustment;
+static DWORD            g_dwWinTimeIncrement;
+static BOOL             g_bWinTimeAdjustmentDisabled;
 #endif
 
 
-/** @copydoc VBOXSERVICE::pfnPreInit */
-static DECLCALLBACK(int) VBoxServiceTimeSyncPreInit(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnPreInit}
+ */
+static DECLCALLBACK(int) vgsvcTimeSyncPreInit(void)
 {
 #ifdef VBOX_WITH_GUEST_PROPS
-    /** @todo Merge this function with VBoxServiceTimeSyncOption() to generalize
+    /** @todo Merge this function with vgsvcTimeSyncOption() to generalize
      *        the "command line args override guest property values" behavior. */
 
@@ -168 +169 @@
         if (rc == VERR_HGCM_SERVICE_NOT_FOUND) /* Host service is not available. */
         {
-            VBoxServiceVerbose(0, "VMInfo: Guest property service is not available, skipping\n");
+            VGSvcVerbose(0, "VMInfo: Guest property service is not available, skipping\n");
             rc = VINF_SUCCESS;
         }
         else
-            VBoxServiceError("Failed to connect to the guest property service! Error: %Rrc\n", rc);
+            VGSvcError("Failed to connect to the guest property service! Error: %Rrc\n", rc);
     }
     else
     {
-        rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-interval",
-                                       &g_TimeSyncInterval, 50, UINT32_MAX - 1);
+        rc = VGSvcReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-interval",
+                                 &g_TimeSyncInterval, 50, UINT32_MAX - 1);
         if (   RT_SUCCESS(rc)
             || rc == VERR_NOT_FOUND)
-        {
-            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-min-adjust",
-                                           &g_TimeSyncMinAdjust, 0, 3600000);
-        }
+            rc = VGSvcReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-min-adjust",
+                                     &g_TimeSyncMinAdjust, 0, 3600000);
         if (   RT_SUCCESS(rc)
             || rc == VERR_NOT_FOUND)
-        {
-            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-latency-factor",
-                                           &g_TimeSyncLatencyFactor, 1, 1024);
-        }
+            rc = VGSvcReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-latency-factor",
+                                     &g_TimeSyncLatencyFactor, 1, 1024);
         if (   RT_SUCCESS(rc)
             || rc == VERR_NOT_FOUND)
-        {
-            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-max-latency",
-                                           &g_TimeSyncMaxLatency, 1, 3600000);
-        }
+            rc = VGSvcReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-max-latency",
+                                     &g_TimeSyncMaxLatency, 1, 3600000);
         if (   RT_SUCCESS(rc)
             || rc == VERR_NOT_FOUND)
-        {
-            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold",
-                                           &g_TimeSyncSetThreshold, 0, 7*24*60*60*1000 /* a week */);
-        }
+            rc = VGSvcReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold",
+                                     &g_TimeSyncSetThreshold, 0, 7*24*60*60*1000 /* a week */);
         if (   RT_SUCCESS(rc)
             || rc == VERR_NOT_FOUND)
         {
             char *pszValue;
-            rc = VBoxServiceReadProp(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-start",
-                                     &pszValue, NULL /* ppszFlags */, NULL /* puTimestamp */);
+            rc = VGSvcReadProp(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-start",
+                               &pszValue, NULL /* ppszFlags */, NULL /* puTimestamp */);
             if (RT_SUCCESS(rc))
             {
@@ -218 +211 @@
         {
             uint32_t value;
-            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-on-restore",
-                                           &value, 1, 1);
+            rc = VGSvcReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-on-restore",
+                                     &value, 1, 1);
             if (RT_SUCCESS(rc))
                 g_fTimeSyncSetOnRestore = !!value;
@@ -237 +230 @@
 
 
-/** @copydoc VBOXSERVICE::pfnOption */
-static DECLCALLBACK(int) VBoxServiceTimeSyncOption(const char **ppszShort, int argc, char **argv, int *pi)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnOption}
+ */
+static DECLCALLBACK(int) vgsvcTimeSyncOption(const char **ppszShort, int argc, char **argv, int *pi)
 {
     int rc = -1;
@@ -245 +240 @@
         /* no short options */;
     else if (!strcmp(argv[*pi], "--timesync-interval"))
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_TimeSyncInterval, 50, UINT32_MAX - 1);
+        rc = VGSvcArgUInt32(argc, argv, "", pi, &g_TimeSyncInterval, 50, UINT32_MAX - 1);
     else if (!strcmp(argv[*pi], "--timesync-min-adjust"))
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_TimeSyncMinAdjust, 0, 3600000);
+        rc = VGSvcArgUInt32(argc, argv, "", pi, &g_TimeSyncMinAdjust, 0, 3600000);
     else if (!strcmp(argv[*pi], "--timesync-latency-factor"))
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_TimeSyncLatencyFactor, 1, 1024);
+        rc = VGSvcArgUInt32(argc, argv, "", pi, &g_TimeSyncLatencyFactor, 1, 1024);
     else if (!strcmp(argv[*pi], "--timesync-max-latency"))
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_TimeSyncMaxLatency, 1, 3600000);
+        rc = VGSvcArgUInt32(argc, argv, "", pi, &g_TimeSyncMaxLatency, 1, 3600000);
     else if (!strcmp(argv[*pi], "--timesync-set-threshold"))
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_TimeSyncSetThreshold, 0, 7*24*60*60*1000); /* a week */
+        rc = VGSvcArgUInt32(argc, argv, "", pi, &g_TimeSyncSetThreshold, 0, 7*24*60*60*1000); /* a week */
     else if (!strcmp(argv[*pi], "--timesync-set-start"))
     {
@@ -266 +256 @@
     else if (!strcmp(argv[*pi], "--timesync-set-on-restore"))
     {
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi, &value, 1, 1);
+        rc = VGSvcArgUInt32(argc, argv, "", pi, &value, 1, 1);
         if (RT_SUCCESS(rc))
             g_fTimeSyncSetOnRestore = !!value;
@@ -275 +265 @@
 
 
-/** @copydoc VBOXSERVICE::pfnInit */
-static DECLCALLBACK(int) VBoxServiceTimeSyncInit(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vgsvcTimeSyncInit(void)
 {
     /*
@@ -313 +305 @@
                     DWORD dwErr = GetLastError();
                     rc = RTErrConvertFromWin32(dwErr);
-                    VBoxServiceError("VBoxServiceTimeSyncInit: Adjusting token privileges (SE_SYSTEMTIME_NAME) failed with status code %u/%Rrc!\n", dwErr, rc);
+                    VGSvcError("vgsvcTimeSyncInit: Adjusting token privileges (SE_SYSTEMTIME_NAME) failed with status code %u/%Rrc!\n",
+                               dwErr, rc);
                 }
             }
@@ -320 +313 @@
                 DWORD dwErr = GetLastError();
                 rc = RTErrConvertFromWin32(dwErr);
-                VBoxServiceError("VBoxServiceTimeSyncInit: Looking up token privileges (SE_SYSTEMTIME_NAME) failed with status code %u/%Rrc!\n", dwErr, rc);
+                VGSvcError("vgsvcTimeSyncInit: Looking up token privileges (SE_SYSTEMTIME_NAME) failed with status code %u/%Rrc!\n",
+                           dwErr, rc);
             }
             if (RT_FAILURE(rc))
@@ -332 +326 @@
             DWORD dwErr = GetLastError();
             rc = RTErrConvertFromWin32(dwErr);
-            VBoxServiceError("VBoxServiceTimeSyncInit: Opening process token (SE_SYSTEMTIME_NAME) failed with status code %u/%Rrc!\n", dwErr, rc);
+            VGSvcError("vgsvcTimeSyncInit: Opening process token (SE_SYSTEMTIME_NAME) failed with status code %u/%Rrc!\n",
+                       dwErr, rc);
             g_hTokenProcess = NULL;
         }
@@ -338 +333 @@
 
     if (GetSystemTimeAdjustment(&g_dwWinTimeAdjustment, &g_dwWinTimeIncrement, &g_bWinTimeAdjustmentDisabled))
-        VBoxServiceVerbose(3, "VBoxServiceTimeSyncInit: Initially %ld (100ns) units per %ld (100 ns) units interval, disabled=%d\n",
-                           g_dwWinTimeAdjustment, g_dwWinTimeIncrement, g_bWinTimeAdjustmentDisabled ? 1 : 0);
+        VGSvcVerbose(3, "vgsvcTimeSyncInit: Initially %ld (100ns) units per %ld (100 ns) units interval, disabled=%d\n",
+                     g_dwWinTimeAdjustment, g_dwWinTimeIncrement, g_bWinTimeAdjustmentDisabled ? 1 : 0);
     else
     {
         DWORD dwErr = GetLastError();
         rc = RTErrConvertFromWin32(dwErr);
-        VBoxServiceError("VBoxServiceTimeSyncInit: Could not get time adjustment values! Last error: %ld!\n", dwErr);
+        VGSvcError("vgsvcTimeSyncInit: Could not get time adjustment values! Last error: %ld!\n", dwErr);
     }
 #endif /* RT_OS_WINDOWS */
@@ -359 +354 @@
  * @param   pDrift          The time adjustment.
  */
-static bool VBoxServiceTimeSyncAdjust(PCRTTIMESPEC pDrift)
+static bool vgsvcTimeSyncAdjust(PCRTTIMESPEC pDrift)
 {
 #ifdef RT_OS_WINDOWS
-/** @todo r=bird: NT4 doesn't have GetSystemTimeAdjustment according to MSDN. */
 /** @todo r=bird: g_hTokenProcess cannot be NULL here.
- *        VBoxServiceTimeSyncInit will fail and the service will not be
- *        started with it being NULL.  VBoxServiceTimeSyncInit OTOH will *NOT*
- *        be called until the service thread has terminated.  If anything
+ *        vgsvcTimeSyncInit will fail and the service will not be started with
+ *        it being NULL.  vgsvcTimeSyncInit OTOH will *NOT* be called until the
+ *        service thread has terminated.  If anything
  *        else is the case, there is buggy code somewhere.*/
     if (g_hTokenProcess == NULL) /* Is the token already closed when shutting down? */
@@ -397 +391 @@
         }
 
-        VBoxServiceVerbose(3, "VBoxServiceTimeSyncAdjust: Drift=%lldms\n", RTTimeSpecGetMilli(pDrift));
-        VBoxServiceVerbose(3, "VBoxServiceTimeSyncAdjust: OrgTA=%ld, CurTA=%ld, NewTA=%ld, DiffNew=%ld, DiffMax=%ld\n",
-                           g_dwWinTimeAdjustment, dwWinTimeAdjustment, dwWinNewTimeAdjustment, dwDiffNew, dwDiffMax);
+        VGSvcVerbose(3, "vgsvcTimeSyncAdjust: Drift=%lldms\n", RTTimeSpecGetMilli(pDrift));
+        VGSvcVerbose(3, "vgsvcTimeSyncAdjust: OrgTA=%ld, CurTA=%ld, NewTA=%ld, DiffNew=%ld, DiffMax=%ld\n",
+                     g_dwWinTimeAdjustment, dwWinTimeAdjustment, dwWinNewTimeAdjustment, dwDiffNew, dwDiffMax);
         if (SetSystemTimeAdjustment(dwWinNewTimeAdjustment, FALSE /* Periodic adjustments enabled. */))
         {
@@ -407 +401 @@
 
         if (g_cTimeSyncErrors++ < 10)
-             VBoxServiceError("VBoxServiceTimeSyncAdjust: SetSystemTimeAdjustment failed, error=%u\n", GetLastError());
+             VGSvcError("vgsvcTimeSyncAdjust: SetSystemTimeAdjustment failed, error=%u\n", GetLastError());
     }
     else if (g_cTimeSyncErrors++ < 10)
-        VBoxServiceError("VBoxServiceTimeSyncAdjust: GetSystemTimeAdjustment failed, error=%ld\n", GetLastError());
+        VGSvcError("vgsvcTimeSyncAdjust: GetSystemTimeAdjustment failed, error=%ld\n", GetLastError());
 
 #elif defined(RT_OS_OS2) || defined(RT_OS_HAIKU)
@@ -424 +418 @@
     {
         if (g_cVerbosity >= 1)
-            VBoxServiceVerbose(1, "VBoxServiceTimeSyncAdjust: adjtime by %RDtimespec\n", pDrift);
+            VGSvcVerbose(1, "vgsvcTimeSyncAdjust: adjtime by %RDtimespec\n", pDrift);
         g_cTimeSyncErrors = 0;
         return true;
@@ -438 +432 @@
  * Cancels any pending time adjustment.
  *
- * Called when we've caught up and before calls to VBoxServiceTimeSyncSet.
- */
-static void VBoxServiceTimeSyncCancelAdjust(void)
+ * Called when we've caught up and before calls to vgsvcTimeSyncSet.
+ */
+static void vgsvcTimeSyncCancelAdjust(void)
 {
 #ifdef RT_OS_WINDOWS
 /** @todo r=bird: g_hTokenProcess cannot be NULL here.  See argumentation in
- *        VBoxServiceTimeSyncAdjust.  */
+ *        vgsvcTimeSyncAdjust.  */
     if (g_hTokenProcess == NULL) /* No process token (anymore)? */
         return;
     if (SetSystemTimeAdjustment(0, TRUE /* Periodic adjustments disabled. */))
-        VBoxServiceVerbose(3, "VBoxServiceTimeSyncCancelAdjust: Windows Time Adjustment is now disabled.\n");
+        VGSvcVerbose(3, "vgsvcTimeSyncCancelAdjust: Windows Time Adjustment is now disabled.\n");
     else if (g_cTimeSyncErrors++ < 10)
-        VBoxServiceError("VBoxServiceTimeSyncCancelAdjust: SetSystemTimeAdjustment(,disable) failed, error=%u\n", GetLastError());
+        VGSvcError("vgsvcTimeSyncCancelAdjust: SetSystemTimeAdjustment(,disable) failed, error=%u\n", GetLastError());
 #endif /* !RT_OS_WINDOWS */
 }
@@ -462 +456 @@
  * @param   pDrift              The time adjustment.
  */
-static void VBoxServiceTimeSyncSet(PCRTTIMESPEC pDrift)
+static void vgsvcTimeSyncSet(PCRTTIMESPEC pDrift)
 {
     /*
@@ -478 +472 @@
             char        sz[64];
             RTTIME      Time;
-            VBoxServiceVerbose(1, "time set to %s\n",
-                               RTTimeToString(RTTimeExplode(&Time, &NewGuestTime), sz, sizeof(sz)));
+            VGSvcVerbose(1, "time set to %s\n", RTTimeToString(RTTimeExplode(&Time, &NewGuestTime), sz, sizeof(sz)));
 #ifdef DEBUG
             RTTIMESPEC  Tmp;
             if (g_cVerbosity >= 3)
-                VBoxServiceVerbose(3, "        now %s\n",
-                                   RTTimeToString(RTTimeExplode(&Time, RTTimeNow(&Tmp)), sz, sizeof(sz)));
+                VGSvcVerbose(3, "        now %s\n", RTTimeToString(RTTimeExplode(&Time, RTTimeNow(&Tmp)), sz, sizeof(sz)));
 #endif
         }
     }
     else if (g_cTimeSyncErrors++ < 10)
-        VBoxServiceError("VBoxServiceTimeSyncSet: RTTimeSet(%RDtimespec) failed: %Rrc\n", &NewGuestTime, rc);
-}
-
-
-/** @copydoc VBOXSERVICE::pfnWorker */
-DECLCALLBACK(int) VBoxServiceTimeSyncWorker(bool volatile *pfShutdown)
+        VGSvcError("vgsvcTimeSyncSet: RTTimeSet(%RDtimespec) failed: %Rrc\n", &NewGuestTime, rc);
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnWorker}
+ */
+DECLCALLBACK(int) vgsvcTimeSyncWorker(bool volatile *pfShutdown)
 {
     RTTIME Time;
@@ -523 +517 @@
             {
                 if (g_cTimeSyncErrors++ < 10)
-                    VBoxServiceError("VBoxServiceTimeSyncWorker: VbglR3GetHostTime failed; rc2=%Rrc\n", rc2);
+                    VGSvcError("vgsvcTimeSyncWorker: VbglR3GetHostTime failed; rc2=%Rrc\n", rc2);
                 break;
             }
@@ -544 +538 @@
                     if (idNewSession != g_idTimeSyncSession)
                     {
-                        VBoxServiceVerbose(3, "VBoxServiceTimeSyncWorker: The VM session ID changed, forcing resync.\n");
+                        VGSvcVerbose(3, "vgsvcTimeSyncWorker: The VM session ID changed, forcing resync.\n");
                         TimeSyncSetThreshold = 0;
                         g_idTimeSyncSession  = idNewSession;
@@ -566 +560 @@
                 if (g_cVerbosity >= 3)
                 {
-                    VBoxServiceVerbose(3, "VBoxServiceTimeSyncWorker: Host:    %s    (MinAdjust: %RU32 ms)\n",
-                                       RTTimeToString(RTTimeExplode(&Time, &HostNow), sz, sizeof(sz)), MinAdjust);
-                    VBoxServiceVerbose(3, "VBoxServiceTimeSyncWorker: Guest: - %s => %RDtimespec drift\n",
-                                       RTTimeToString(RTTimeExplode(&Time, &GuestNow), sz, sizeof(sz)),
-                                       &Drift);
+                    VGSvcVerbose(3, "vgsvcTimeSyncWorker: Host:    %s    (MinAdjust: %RU32 ms)\n",
+                                 RTTimeToString(RTTimeExplode(&Time, &HostNow), sz, sizeof(sz)), MinAdjust);
+                    VGSvcVerbose(3, "vgsvcTimeSyncWorker: Guest: - %s => %RDtimespec drift\n",
+                                 RTTimeToString(RTTimeExplode(&Time, &GuestNow), sz, sizeof(sz)), &Drift);
                 }
 
@@ -585 +578 @@
                     if (    AbsDriftMilli > TimeSyncSetThreshold
                         ||  g_fTimeSyncSetNext
-                        ||  !VBoxServiceTimeSyncAdjust(&Drift))
+                        ||  !vgsvcTimeSyncAdjust(&Drift))
                     {
-                        VBoxServiceTimeSyncCancelAdjust();
-                        VBoxServiceTimeSyncSet(&Drift);
+                        vgsvcTimeSyncCancelAdjust();
+                        vgsvcTimeSyncSet(&Drift);
                     }
                 }
                 else
-                    VBoxServiceTimeSyncCancelAdjust();
+                    vgsvcTimeSyncCancelAdjust();
                 break;
             }
-            VBoxServiceVerbose(3, "VBoxServiceTimeSyncWorker: %RDtimespec: latency too high (%RDtimespec) sleeping 1s\n", GuestElapsed);
+            VGSvcVerbose(3, "vgsvcTimeSyncWorker: %RDtimespec: latency too high (%RDtimespec) sleeping 1s\n", GuestElapsed);
             RTThreadSleep(1000);
         } while (--cTries > 0);
@@ -615 +608 @@
         if (rc2 != VERR_TIMEOUT && RT_FAILURE(rc2))
         {
-            VBoxServiceError("VBoxServiceTimeSyncWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
+            VGSvcError("vgsvcTimeSyncWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
             rc = rc2;
             break;
@@ -621 +614 @@
     }
 
-    VBoxServiceTimeSyncCancelAdjust();
+    vgsvcTimeSyncCancelAdjust();
     RTSemEventMultiDestroy(g_TimeSyncEvent);
     g_TimeSyncEvent = NIL_RTSEMEVENTMULTI;
@@ -628 +621 @@
 
 
-/** @copydoc VBOXSERVICE::pfnStop */
-static DECLCALLBACK(void) VBoxServiceTimeSyncStop(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vgsvcTimeSyncStop(void)
 {
     RTSemEventMultiSignal(g_TimeSyncEvent);
@@ -635 +630 @@
 
 
-/** @copydoc VBOXSERVICE::pfnTerm */
-static DECLCALLBACK(void) VBoxServiceTimeSyncTerm(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(void) vgsvcTimeSyncTerm(void)
 {
 #ifdef RT_OS_WINDOWS
@@ -647 +644 @@
         {
             DWORD dwErr = GetLastError();
-            VBoxServiceError("VBoxServiceTimeSyncTerm: Restoring token privileges (SE_SYSTEMTIME_NAME) failed with code %u!\n", dwErr);
+            VGSvcError("vgsvcTimeSyncTerm: Restoring token privileges (SE_SYSTEMTIME_NAME) failed with code %u!\n", dwErr);
         }
         CloseHandle(g_hTokenProcess);
@@ -699 +696 @@
     ,
     /* methods */
-    VBoxServiceTimeSyncPreInit,
-    VBoxServiceTimeSyncOption,
-    VBoxServiceTimeSyncInit,
-    VBoxServiceTimeSyncWorker,
-    VBoxServiceTimeSyncStop,
-    VBoxServiceTimeSyncTerm
+    vgsvcTimeSyncPreInit,
+    vgsvcTimeSyncOption,
+    vgsvcTimeSyncInit,
+    vgsvcTimeSyncWorker,
+    vgsvcTimeSyncStop,
+    vgsvcTimeSyncTerm
 };
 

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

@@ -106 +106 @@
 
 
+
+
 /**
  * Displays a common header for all help text to stdout.
  */
-static void VBoxServiceToolboxShowUsageHeader(void)
+static void vgsvcToolboxShowUsageHeader(void)
 {
     RTPrintf(VBOX_PRODUCT " Guest Toolbox Version "
@@ -123 +125 @@
  * Displays a help text to stdout.
  */
-static void VBoxServiceToolboxShowUsage(void)
-{
-    VBoxServiceToolboxShowUsageHeader();
+static void vgsvcToolboxShowUsage(void)
+{
+    vgsvcToolboxShowUsageHeader();
     RTPrintf("  VBoxService [--use-toolbox] vbox_<command> [<general options>] <parameters>\n\n"
              "General options:\n\n"
@@ -151 +153 @@
  * Displays the program's version number.
  */
-static void VBoxServiceToolboxShowVersion(void)
+static void vgsvcToolboxShowVersion(void)
 {
     RTPrintf("%sr%d\n", VBOX_VERSION_STRING, RTBldCfgRevision());
@@ -162 +164 @@
  * @return  IPRT status code.
  */
-static int VBoxServiceToolboxStrmInit(void)
+static int vgsvcToolboxStrmInit(void)
 {
     /* Set stdout's mode to binary. This is required for outputting all the machine-readable
@@ -182 +184 @@
  *                                  different stream versions later.
  */
-static void VBoxServiceToolboxPrintStrmHeader(const char *pszToolName, uint32_t uVersion)
+static void vgsvcToolboxPrintStrmHeader(const char *pszToolName, uint32_t uVersion)
 {
     AssertPtrReturnVoid(pszToolName);
@@ -194 +196 @@
  *
  */
-static void VBoxServiceToolboxPrintStrmTermination()
+static void vgsvcToolboxPrintStrmTermination()
 {
     RTPrintf("%c%c%c%c", 0, 0, 0, 0);
@@ -204 +206 @@
  * and print an error message and return an error if necessary.
  */
-static int vboxServiceToolboxParseMode(const char *pcszMode, RTFMODE *pfMode)
+static int vgsvcToolboxParseMode(const char *pcszMode, RTFMODE *pfMode)
 {
     int rc = RTStrToUInt32Ex(pcszMode, NULL, 8 /* Base */, pfMode);
     if (RT_FAILURE(rc)) /* Only octet based values supported right now! */
-        RTMsgError("Mode flag strings not implemented yet! Use octal numbers instead. (%s)\n",
-                   pcszMode);
+        RTMsgError("Mode flag strings not implemented yet! Use octal numbers instead. (%s)\n", pcszMode);
     return rc;
 }
@@ -220 +221 @@
  * @param   pList                   Pointer to list to destroy.
  */
-static void VBoxServiceToolboxPathBufDestroy(PRTLISTNODE pList)
+static void vgsvcToolboxPathBufDestroy(PRTLISTNODE pList)
 {
     AssertPtr(pList);
@@ -247 +248 @@
  * @param   pszName                 Name of entry to add.
  */
-static int VBoxServiceToolboxPathBufAddPathEntry(PRTLISTNODE pList, const char *pszName)
+static int vgsvcToolboxPathBufAddPathEntry(PRTLISTNODE pList, const char *pszName)
 {
     AssertPtrReturn(pList, VERR_INVALID_PARAMETER);
@@ -258 +259 @@
         AssertPtr(pNode->pszName);
 
-        /*rc =*/ RTListAppend(pList, &pNode->Node);
+        RTListAppend(pList, &pNode->Node);
     }
     else
@@ -275 +276 @@
  *                                  else stdout will be used.
  */
-static int VBoxServiceToolboxCatOutput(RTFILE hInput, RTFILE hOutput)
+static int vgsvcToolboxCatOutput(RTFILE hInput, RTFILE hOutput)
 {
     int rc = VINF_SUCCESS;
@@ -336 +337 @@
  * @param   argv                    Pointer to argument array.
  */
-static RTEXITCODE VBoxServiceToolboxCat(int argc, char **argv)
+static RTEXITCODE vgsvcToolboxCat(int argc, char **argv)
 {
     static const RTGETOPTDEF s_aOptions[] =
@@ -360 +361 @@
     RTGETOPTSTATE GetState;
 
-    RTGetOptInit(&GetState, argc, argv,
-                 s_aOptions, RT_ELEMENTS(s_aOptions),
-                 1 /*iFirst*/, 0 /*fFlags*/);
+    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1 /*iFirst*/, 0 /*fFlags*/);
 
     int rc = VINF_SUCCESS;
@@ -370 +369 @@
     RTFILE hOutput = NIL_RTFILE;
     uint32_t fFlags = RTFILE_O_CREATE_REPLACE /* Output file flags. */
-                      | RTFILE_O_WRITE
-                      | RTFILE_O_DENY_WRITE;
+                    | RTFILE_O_WRITE
+                    | RTFILE_O_DENY_WRITE;
 
     /* Init directory list. */
@@ -398 +397 @@
 
             case 'h':
-                VBoxServiceToolboxShowUsageHeader();
+                vgsvcToolboxShowUsageHeader();
                 RTPrintf("%s", g_paszCatHelp);
                 return RTEXITCODE_SUCCESS;
@@ -411 +410 @@
 
             case 'V':
-                VBoxServiceToolboxShowVersion();
+                vgsvcToolboxShowVersion();
                 return RTEXITCODE_SUCCESS;
 
@@ -419 +418 @@
 
             case VINF_GETOPT_NOT_OPTION:
-                {
-                    /* Add file(s) to buffer. This enables processing multiple paths
-                     * at once.
-                     *
-                     * Since the non-options (RTGETOPTINIT_FLAGS_OPTS_FIRST) come last when
-                     * processing this loop it's safe to immediately exit on syntax errors
-                     * or showing the help text (see above). */
-                    rc = VBoxServiceToolboxPathBufAddPathEntry(&inputList, ValueUnion.psz);
-                    break;
-                }
+                /* Add file(s) to buffer. This enables processing multiple paths
+                 * at once.
+                 *
+                 * Since the non-options (RTGETOPTINIT_FLAGS_OPTS_FIRST) come last when
+                 * processing this loop it's safe to immediately exit on syntax errors
+                 * or showing the help text (see above). */
+                rc = vgsvcToolboxPathBufAddPathEntry(&inputList, ValueUnion.psz);
+                break;
 
             default:
@@ -441 +438 @@
             rc = RTFileOpen(&hOutput, pszOutput, fFlags);
             if (RT_FAILURE(rc))
-                RTMsgError("Could not create output file '%s', rc=%Rrc\n",
-                           pszOutput, rc);
+                RTMsgError("Could not create output file '%s', rc=%Rrc\n", pszOutput, rc);
         }
 
@@ -456 +452 @@
                 if (RT_SUCCESS(rc))
                 {
-                    rc = VBoxServiceToolboxCatOutput(hInput, hOutput);
+                    rc = vgsvcToolboxCatOutput(hInput, hOutput);
                     RTFileClose(hInput);
                 }
@@ -463 +459 @@
                     PCRTSTATUSMSG pMsg = RTErrGet(rc);
                     if (pMsg)
-                        RTMsgError("Could not open input file '%s': %s\n",
-                                   pNodeIt->pszName, pMsg->pszMsgFull);
+                        RTMsgError("Could not open input file '%s': %s\n", pNodeIt->pszName, pMsg->pszMsgFull);
                     else
                         RTMsgError("Could not open input file '%s', rc=%Rrc\n", pNodeIt->pszName, rc);
@@ -475 +470 @@
             /* If not input files were defined, process stdin. */
             if (RTListNodeIsFirst(&inputList, &inputList))
-                rc = VBoxServiceToolboxCatOutput(hInput, hOutput);
+                rc = vgsvcToolboxCatOutput(hInput, hOutput);
         }
     }
@@ -481 +476 @@
     if (hOutput != NIL_RTFILE)
         RTFileClose(hOutput);
-    VBoxServiceToolboxPathBufDestroy(&inputList);
+    vgsvcToolboxPathBufDestroy(&inputList);
 
     return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
@@ -491 +486 @@
  *
  * @return  IPRT status code.
- * @param   pszName                     Object name.
- * @param   cbName                      Size of object name.
- * @param   uOutputFlags                Output / handling flags of type VBOXSERVICETOOLBOXOUTPUTFLAG.
- * @param   pObjInfo                    Pointer to object information.
- */
-static int VBoxServiceToolboxPrintFsInfo(const char *pszName, uint16_t cbName,
-                                         uint32_t uOutputFlags,
-                                         PRTFSOBJINFO pObjInfo)
+ * @param   pszName         Object name.
+ * @param   cbName          Size of object name.
+ * @param   fOutputFlags    Output / handling flags of type
+ *                          VBOXSERVICETOOLBOXOUTPUTFLAG.
+ * @param   pObjInfo        Pointer to object information.
+ */
+static int vgsvcToolboxPrintFsInfo(const char *pszName, size_t cbName, uint32_t fOutputFlags, PRTFSOBJINFO pObjInfo)
 {
     AssertPtrReturn(pszName, VERR_INVALID_POINTER);
@@ -520 +514 @@
     /** @todo sticy bits++ */
 
-    if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_LONG))
-    {
-        if (uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
+    if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_LONG))
+    {
+        if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
         {
             /** @todo Skip node_id if not present/available! */
-            RTPrintf("ftype=%c%cnode_id=%RU64%cname_len=%RU16%cname=%s%c",
+            RTPrintf("ftype=%c%cnode_id=%RU64%cname_len=%zu%cname=%s%c",
                      chFileType, 0, (uint64_t)pObjInfo->Attr.u.Unix.INodeId, 0,
                      cbName, 0, pszName, 0);
         }
         else
-            RTPrintf("%c %#18llx %3d %s\n",
+            RTPrintf("%c %#18llx %3zu %s\n",
                      chFileType, (uint64_t)pObjInfo->Attr.u.Unix.INodeId, cbName, pszName);
 
-        if (uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE) /* End of data block. */
+        if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE) /* End of data block. */
             RTPrintf("%c%c", 0, 0);
     }
     else
     {
-        if (uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
+        if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
         {
             RTPrintf("ftype=%c%c", chFileType, 0);
@@ -591 +585 @@
                      szTimeModification, 0,
                      szTimeAccess, 0);
-            RTPrintf("cname_len=%RU16%cname=%s%c",
+            RTPrintf("cname_len=%zu%cname=%s%c",
                      cbName, 0, pszName, 0);
 
@@ -637 +631 @@
                      RTTimeSpecGetNano(&pObjInfo->ModificationTime), /** @todo really ns? */
                      RTTimeSpecGetNano(&pObjInfo->AccessTime)); /** @todo really ns? */
-            RTPrintf(" %2d %s\n", cbName, pszName);
+            RTPrintf(" %2zu %s\n", cbName, pszName);
         }
     }
@@ -651 +645 @@
  * @return  IPRT status code.
  * @param   pszDir                  Directory (path) to ouptut.
- * @param   uFlags                  Flags of type VBOXSERVICETOOLBOXLSFLAG.
- * @param   uOutputFlags            Flags of type  VBOXSERVICETOOLBOXOUTPUTFLAG.
- */
-static int VBoxServiceToolboxLsHandleDir(const char *pszDir,
-                                         uint32_t uFlags, uint32_t uOutputFlags)
+ * @param   fFlags                  Flags of type VBOXSERVICETOOLBOXLSFLAG.
+ * @param   fOutputFlags            Flags of type  VBOXSERVICETOOLBOXOUTPUTFLAG.
+ */
+static int vgsvcToolboxLsHandleDir(const char *pszDir, uint32_t fFlags, uint32_t fOutputFlags)
 {
     AssertPtrReturn(pszDir, VERR_INVALID_PARAMETER);
 
-    if (uFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
+    if (fFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
         RTPrintf("dname=%s%c", pszDir, 0);
-    else if (uFlags & VBOXSERVICETOOLBOXLSFLAG_RECURSIVE)
+    else if (fFlags & VBOXSERVICETOOLBOXLSFLAG_RECURSIVE)
         RTPrintf("%s:\n", pszDir);
 
@@ -668 +661 @@
     if (RT_FAILURE(rc))
     {
-        if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
+        if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
             RTMsgError("Failed to retrieve absolute path of '%s', rc=%Rrc\n", pszDir, rc);
         return rc;
@@ -677 +670 @@
     if (RT_FAILURE(rc))
     {
-        if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
+        if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
             RTMsgError("Failed to open directory '%s', rc=%Rrc\n", szPathAbs, rc);
         return rc;
@@ -699 +692 @@
             {
                 memcpy(&pNode->dirEntry, &DirEntry, sizeof(RTDIRENTRYEX));
-                /*rc =*/ RTListAppend(&dirList, &pNode->Node);
+                RTListAppend(&dirList, &pNode->Node);
             }
             else
@@ -712 +705 @@
     if (RT_FAILURE(rc2))
     {
-        if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
-            RTMsgError("Failed to close dir '%s', rc=%Rrc\n",
-                       pszDir, rc2);
+        if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
+            RTMsgError("Failed to close dir '%s', rc=%Rrc\n", pszDir, rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -724 +716 @@
         RTListForEach(&dirList, pNodeIt, VBOXSERVICETOOLBOXDIRENTRY, Node)
         {
-            rc = VBoxServiceToolboxPrintFsInfo(pNodeIt->dirEntry.szName, pNodeIt->dirEntry.cbName,
-                                               uOutputFlags,
-                                               &pNodeIt->dirEntry.Info);
+            rc = vgsvcToolboxPrintFsInfo(pNodeIt->dirEntry.szName, pNodeIt->dirEntry.cbName,
+                                         fOutputFlags, &pNodeIt->dirEntry.Info);
             if (RT_FAILURE(rc))
                 break;
@@ -733 +724 @@
         /* If everything went fine we do the second run (if needed) ... */
         if (   RT_SUCCESS(rc)
-            && (uFlags & VBOXSERVICETOOLBOXLSFLAG_RECURSIVE))
+            && (fFlags & VBOXSERVICETOOLBOXLSFLAG_RECURSIVE))
         {
             /* Process all sub-directories. */
@@ -742 +733 @@
                 {
                     case RTFS_TYPE_SYMLINK:
-                        if (!(uFlags & VBOXSERVICETOOLBOXLSFLAG_SYMLINKS))
+                        if (!(fFlags & VBOXSERVICETOOLBOXLSFLAG_SYMLINKS))
                             break;
                         /* Fall through is intentional. */
                     case RTFS_TYPE_DIRECTORY:
+                    {
+                        const char *pszName = pNodeIt->dirEntry.szName;
+                        if (   !RTStrICmp(pszName, ".")
+                            || !RTStrICmp(pszName, ".."))
                         {
-                            const char *pszName = pNodeIt->dirEntry.szName;
-                            if (   !RTStrICmp(pszName, ".")
-                                || !RTStrICmp(pszName, ".."))
-                            {
-                                /* Skip dot directories. */
-                                continue;
-                            }
-
-                            char szPath[RTPATH_MAX];
-                            rc = RTPathJoin(szPath, sizeof(szPath),
-                                            pszDir, pNodeIt->dirEntry.szName);
-                            if (RT_SUCCESS(rc))
-                                rc = VBoxServiceToolboxLsHandleDir(szPath,
-                                                                   uFlags, uOutputFlags);
+                            /* Skip dot directories. */
+                            continue;
                         }
+
+                        char szPath[RTPATH_MAX];
+                        rc = RTPathJoin(szPath, sizeof(szPath), pszDir, pNodeIt->dirEntry.szName);
+                        if (RT_SUCCESS(rc))
+                            rc = vgsvcToolboxLsHandleDir(szPath, fFlags, fOutputFlags);
                         break;
+                    }
 
                     default: /* Ignore the rest. */
@@ -804 +793 @@
  * @param   argv                    Pointer to argument array.
  */
-static RTEXITCODE VBoxServiceToolboxLs(int argc, char **argv)
+static RTEXITCODE vgsvcToolboxLs(int argc, char **argv)
 {
     static const RTGETOPTDEF s_aOptions[] =
     {
         { "--machinereadable", VBOXSERVICETOOLBOXOPT_MACHINE_READABLE,      RTGETOPT_REQ_NOTHING },
-        { "--dereference",     'L',                                           RTGETOPT_REQ_NOTHING },
-        { NULL,                'l',                                           RTGETOPT_REQ_NOTHING },
-        { NULL,                'R',                                           RTGETOPT_REQ_NOTHING },
+        { "--dereference",     'L',                                         RTGETOPT_REQ_NOTHING },
+        { NULL,                'l',                                         RTGETOPT_REQ_NOTHING },
+        { NULL,                'R',                                         RTGETOPT_REQ_NOTHING },
         { "--verbose",         VBOXSERVICETOOLBOXOPT_VERBOSE,               RTGETOPT_REQ_NOTHING}
     };
@@ -818 +807 @@
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv,
-                          s_aOptions, RT_ELEMENTS(s_aOptions),
+    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions),
                           1 /*iFirst*/, RTGETOPTINIT_FLAGS_OPTS_FIRST);
     AssertRCReturn(rc, RTEXITCODE_INIT);
@@ -832 +820 @@
 
     while (   (ch = RTGetOpt(&GetState, &ValueUnion))
-              && RT_SUCCESS(rc))
+           && RT_SUCCESS(rc))
     {
         /* For options that require an argument, ValueUnion has received the value. */
@@ -838 +826 @@
         {
             case 'h':
-                VBoxServiceToolboxShowUsageHeader();
+                vgsvcToolboxShowUsageHeader();
                 RTPrintf("%s", g_paszLsHelp);
                 return RTEXITCODE_SUCCESS;
@@ -863 +851 @@
 
             case 'V':
-                VBoxServiceToolboxShowVersion();
+                vgsvcToolboxShowVersion();
                 return RTEXITCODE_SUCCESS;
 
@@ -873 +861 @@
                  * processing this loop it's safe to immediately exit on syntax errors
                  * or showing the help text (see above). */
-                rc = VBoxServiceToolboxPathBufAddPathEntry(&fileList, ValueUnion.psz);
+                rc = vgsvcToolboxPathBufAddPathEntry(&fileList, ValueUnion.psz);
                 /** @todo r=bird: Nit: creating a list here is not really
                  *        necessary since you've got one in argv that's
@@ -893 +881 @@
             if (RT_SUCCESS(rc))
             {
-                rc = VBoxServiceToolboxPathBufAddPathEntry(&fileList, szDirCur);
+                rc = vgsvcToolboxPathBufAddPathEntry(&fileList, szDirCur);
                 if (RT_FAILURE(rc))
                     RTMsgError("Adding current directory failed, rc=%Rrc\n", rc);
@@ -904 +892 @@
         if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
         {
-            rc = VBoxServiceToolboxStrmInit();
+            rc = vgsvcToolboxStrmInit();
             if (RT_FAILURE(rc))
                 RTMsgError("Error while initializing parseable streams, rc=%Rrc\n", rc);
-            VBoxServiceToolboxPrintStrmHeader("vbt_ls", 1 /* Stream version */);
+            vgsvcToolboxPrintStrmHeader("vbt_ls", 1 /* Stream version */);
         }
 
@@ -917 +905 @@
                 RTFSOBJINFO objInfo;
                 int rc2 = RTPathQueryInfoEx(pNodeIt->pszName, &objInfo,
-                                            RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK /* @todo Follow link? */);
+                                            RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK /** @todo Follow link? */);
                 if (RT_FAILURE(rc2))
                 {
                     if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
-                        RTMsgError("Cannot access '%s': No such file or directory\n",
-                                   pNodeIt->pszName);
+                        RTMsgError("Cannot access '%s': No such file or directory\n", pNodeIt->pszName);
                     rc = VERR_FILE_NOT_FOUND;
                     /* Do not break here -- process every element in the list
@@ -929 +916 @@
                 else
                 {
-                    rc2 = VBoxServiceToolboxPrintFsInfo(pNodeIt->pszName,
-                                                        strlen(pNodeIt->pszName) /* cbName */,
-                                                        fOutputFlags,
-                                                        &objInfo);
+                    rc2 = vgsvcToolboxPrintFsInfo(pNodeIt->pszName,
+                                                  strlen(pNodeIt->pszName) /* cbName */,
+                                                  fOutputFlags,
+                                                  &objInfo);
                     if (RT_FAILURE(rc2))
                         rc = rc2;
@@ -939 +926 @@
             else
             {
-                int rc2 = VBoxServiceToolboxLsHandleDir(pNodeIt->pszName,
-                                                        fFlags, fOutputFlags);
+                int rc2 = vgsvcToolboxLsHandleDir(pNodeIt->pszName, fFlags, fOutputFlags);
                 if (RT_FAILURE(rc2))
                     rc = rc2;
@@ -947 +933 @@
 
         if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE) /* Output termination. */
-            VBoxServiceToolboxPrintStrmTermination();
+            vgsvcToolboxPrintStrmTermination();
     }
     else if (fVerbose)
         RTMsgError("Failed with rc=%Rrc\n", rc);
 
-    VBoxServiceToolboxPathBufDestroy(&fileList);
+    vgsvcToolboxPathBufDestroy(&fileList);
     return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
@@ -958 +944 @@
 
 /* Try using RTPathRmCmd. */
-static RTEXITCODE VBoxServiceToolboxRm(int argc, char **argv)
+static RTEXITCODE vgsvcToolboxRm(int argc, char **argv)
 {
     return RTPathRmCmd(argc, argv);
@@ -989 +975 @@
  */
 static void toolboxMkTempReport(const char *pcszMessage, const char *pcszFile,
-                                bool fActive, int rc, uint32_t fOutputFlags,
-                                int *prc)
+                                bool fActive, int rc, uint32_t fOutputFlags, int *prc)
 {
     if (!fActive)
@@ -1013 +998 @@
  * @param   argv                    Pointer to argument array.
  */
-static RTEXITCODE VBoxServiceToolboxMkTemp(int argc, char **argv)
+static RTEXITCODE vgsvcToolboxMkTemp(int argc, char **argv)
 {
     static const RTGETOPTDEF s_aOptions[] =
@@ -1039 +1024 @@
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
-    rc = RTGetOptInit(&GetState, argc, argv, s_aOptions,
-                      RT_ELEMENTS(s_aOptions), 1 /*iFirst*/,
-                      RTGETOPTINIT_FLAGS_OPTS_FIRST);
+    rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1 /*iFirst*/, RTGETOPTINIT_FLAGS_OPTS_FIRST);
     AssertRCReturn(rc, RTEXITCODE_INIT);
 
@@ -1061 +1044 @@
         {
             case 'h':
-                VBoxServiceToolboxShowUsageHeader();
+                vgsvcToolboxShowUsageHeader();
                 RTPrintf("%s", g_paszMkTempHelp);
                 return RTEXITCODE_SUCCESS;
 
             case 'V':
-                VBoxServiceToolboxShowVersion();
+                vgsvcToolboxShowVersion();
                 return RTEXITCODE_SUCCESS;
 
@@ -1078 +1061 @@
 
             case 'm':
-                rc = vboxServiceToolboxParseMode(ValueUnion.psz, &fMode);
+                rc = vgsvcToolboxParseMode(ValueUnion.psz, &fMode);
                 if (RT_FAILURE(rc))
                     return RTEXITCODE_SYNTAX;
@@ -1104 +1087 @@
         }
     }
+
     /* Print magic/version. */
     if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
     {
-        rc = VBoxServiceToolboxStrmInit();
+        rc = vgsvcToolboxStrmInit();
         if (RT_FAILURE(rc))
             RTMsgError("Error while initializing parseable streams, rc=%Rrc\n", rc);
-        VBoxServiceToolboxPrintStrmHeader("vbt_mktemp", 1 /* Stream version */);
+        vgsvcToolboxPrintStrmHeader("vbt_mktemp", 1 /* Stream version */);
     }
 
@@ -1119 +1103 @@
         return RTEXITCODE_SYNTAX;
     }
+
     /* We need exactly one template, containing at least one 'X'. */
     if (cNonOptions != 1)
     {
-        toolboxMkTempReport("Please specify exactly one template.\n", "",
-                            true, VERR_INVALID_PARAMETER, fOutputFlags, &rc);
+        toolboxMkTempReport("Please specify exactly one template.\n", "", true, VERR_INVALID_PARAMETER, fOutputFlags, &rc);
         return RTEXITCODE_SYNTAX;
     }
     pcszTemplate = argv[argc - 1];
+
     /* Validate that the template is as IPRT requires (asserted by IPRT). */
     if (   RTPathHasPath(pcszTemplate)
@@ -1133 +1118 @@
     {
         toolboxMkTempReport("Template '%s' should contain a file name with no path and at least three consecutive 'X' characters or ending in 'X'.\n",
-                            pcszTemplate, true, VERR_INVALID_PARAMETER,
-                            fOutputFlags, &rc);
+                            pcszTemplate, true, VERR_INVALID_PARAMETER, fOutputFlags, &rc);
         return RTEXITCODE_FAILURE;
     }
     if (pcszPath && !RTPathStartsWithRoot(pcszPath))
     {
-        toolboxMkTempReport("Path '%s' should be absolute.\n",
-                            pcszPath, true, VERR_INVALID_PARAMETER,
-                            fOutputFlags, &rc);
+        toolboxMkTempReport("Path '%s' should be absolute.\n", pcszPath, true, VERR_INVALID_PARAMETER, fOutputFlags, &rc);
         return RTEXITCODE_FAILURE;
     }
     if (pcszPath)
     {
-        rc = RTStrCopy(szTemplateWithPath, sizeof(szTemplateWithPath),
-                       pcszPath);
+        rc = RTStrCopy(szTemplateWithPath, sizeof(szTemplateWithPath), pcszPath);
         if (RT_FAILURE(rc))
         {
-            toolboxMkTempReport("Path '%s' too long.\n", pcszPath, true,
-                                VERR_INVALID_PARAMETER, fOutputFlags, &rc);
+            toolboxMkTempReport("Path '%s' too long.\n", pcszPath, true, VERR_INVALID_PARAMETER, fOutputFlags, &rc);
             return RTEXITCODE_FAILURE;
         }
@@ -1160 +1140 @@
         if (RT_FAILURE(rc))
         {
-            toolboxMkTempReport("Failed to get the temporary directory.\n",
-                                "", true, VERR_INVALID_PARAMETER,
-                                fOutputFlags, &rc);
+            toolboxMkTempReport("Failed to get the temporary directory.\n", "", true, VERR_INVALID_PARAMETER, fOutputFlags, &rc);
             return RTEXITCODE_FAILURE;
         }
     }
-    rc = RTPathAppend(szTemplateWithPath, sizeof(szTemplateWithPath),
-                      pcszTemplate);
+    rc = RTPathAppend(szTemplateWithPath, sizeof(szTemplateWithPath), pcszTemplate);
     if (RT_FAILURE(rc))
     {
-        toolboxMkTempReport("Template '%s' too long for path.\n",
-                            pcszTemplate, true, VERR_INVALID_PARAMETER,
-                            fOutputFlags, &rc);
+        toolboxMkTempReport("Template '%s' too long for path.\n", pcszTemplate, true, VERR_INVALID_PARAMETER, fOutputFlags, &rc);
         return RTEXITCODE_FAILURE;
     }
@@ -1178 +1153 @@
     if (fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_DIRECTORY)
     {
-        rc =   fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_SECURE
-             ? RTDirCreateTempSecure(szTemplateWithPath)
-             : RTDirCreateTemp(szTemplateWithPath, fMode);
+        rc = fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_SECURE
+           ? RTDirCreateTempSecure(szTemplateWithPath)
+           : RTDirCreateTemp(szTemplateWithPath, fMode);
         toolboxMkTempReport("Created temporary directory '%s'.\n",
                             szTemplateWithPath, RT_SUCCESS(rc), rc,
@@ -1186 +1161 @@
         /* RTDirCreateTemp[Secure] sets the template to "" on failure. */
         toolboxMkTempReport("The following error occurred while creating a temporary directory from template '%s': %Rrc.\n",
-                            pcszTemplate, RT_FAILURE(rc), rc, fOutputFlags,
-                            NULL);
+                            pcszTemplate, RT_FAILURE(rc), rc, fOutputFlags, NULL /*prc*/);
     }
     else
     {
-        rc =   fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_SECURE
-             ? RTFileCreateTempSecure(szTemplateWithPath)
-             : RTFileCreateTemp(szTemplateWithPath, fMode);
+        rc = fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_SECURE
+           ? RTFileCreateTempSecure(szTemplateWithPath)
+           : RTFileCreateTemp(szTemplateWithPath, fMode);
         toolboxMkTempReport("Created temporary file '%s'.\n",
                             szTemplateWithPath, RT_SUCCESS(rc), rc,
@@ -1199 +1173 @@
         /* RTFileCreateTemp[Secure] sets the template to "" on failure. */
         toolboxMkTempReport("The following error occurred while creating a temporary file from template '%s': %Rrc.\n",
-                            pcszTemplate, RT_FAILURE(rc), rc, fOutputFlags,
-                            NULL);
+                            pcszTemplate, RT_FAILURE(rc), rc, fOutputFlags, NULL /*prc*/);
     }
     if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE) /* Output termination. */
-        VBoxServiceToolboxPrintStrmTermination();
+        vgsvcToolboxPrintStrmTermination();
     return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
@@ -1228 +1201 @@
  * @param   argv                    Pointer to argument array.
  */
-static RTEXITCODE VBoxServiceToolboxMkDir(int argc, char **argv)
+static RTEXITCODE vgsvcToolboxMkDir(int argc, char **argv)
 {
     static const RTGETOPTDEF s_aOptions[] =
@@ -1240 +1213 @@
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv,
-                          s_aOptions, RT_ELEMENTS(s_aOptions),
+    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions),
                           1 /*iFirst*/, RTGETOPTINIT_FLAGS_OPTS_FIRST);
     AssertRCReturn(rc, RTEXITCODE_INIT);
@@ -1260 +1232 @@
 
             case 'm':
-                rc = vboxServiceToolboxParseMode(ValueUnion.psz, &fDirMode);
+                rc = vgsvcToolboxParseMode(ValueUnion.psz, &fDirMode);
                 if (RT_FAILURE(rc))
                     return RTEXITCODE_SYNTAX;
@@ -1273 +1245 @@
 
             case 'h':
-                VBoxServiceToolboxShowUsageHeader();
+                vgsvcToolboxShowUsageHeader();
                 RTPrintf("%s", g_paszMkDirHelp);
                 return RTEXITCODE_SUCCESS;
 
             case 'V':
-                VBoxServiceToolboxShowVersion();
+                vgsvcToolboxShowVersion();
                 return RTEXITCODE_SUCCESS;
 
@@ -1332 +1304 @@
  * @param   argv                    Pointer to argument array.
  */
-static RTEXITCODE VBoxServiceToolboxStat(int argc, char **argv)
+static RTEXITCODE vgsvcToolboxStat(int argc, char **argv)
 {
     static const RTGETOPTDEF s_aOptions[] =
@@ -1346 +1318 @@
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
-    RTGetOptInit(&GetState, argc, argv,
-                 s_aOptions, RT_ELEMENTS(s_aOptions),
-                 1 /*iFirst*/, RTGETOPTINIT_FLAGS_OPTS_FIRST);
+    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1 /*iFirst*/, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
     int rc = VINF_SUCCESS;
@@ -1384 +1354 @@
 
             case 'h':
-                VBoxServiceToolboxShowUsageHeader();
+                vgsvcToolboxShowUsageHeader();
                 RTPrintf("%s", g_paszStatHelp);
                 return RTEXITCODE_SUCCESS;
 
             case 'V':
-                VBoxServiceToolboxShowVersion();
+                vgsvcToolboxShowVersion();
                 return RTEXITCODE_SUCCESS;
 
             case VINF_GETOPT_NOT_OPTION:
-                {
+            {
 /** @todo r=bird: The whole fileList is unecessary because you're using
  * RTGETOPTINIT_FLAGS_OPTS_FIRST.  You can obviously do the processing right
@@ -1399 +1369 @@
  * continue there. */
 
-                    /* Add file(s) to buffer. This enables processing multiple files
-                     * at once.
-                     *
-                     * Since the non-options (RTGETOPTINIT_FLAGS_OPTS_FIRST) come last when
-                     * processing this loop it's safe to immediately exit on syntax errors
-                     * or showing the help text (see above). */
-                    rc = VBoxServiceToolboxPathBufAddPathEntry(&fileList, ValueUnion.psz);
-                    break;
-                }
+                /* Add file(s) to buffer. This enables processing multiple files
+                 * at once.
+                 *
+                 * Since the non-options (RTGETOPTINIT_FLAGS_OPTS_FIRST) come last when
+                 * processing this loop it's safe to immediately exit on syntax errors
+                 * or showing the help text (see above). */
+                rc = vgsvcToolboxPathBufAddPathEntry(&fileList, ValueUnion.psz);
+                break;
+            }
 
             default:
@@ -1418 +1388 @@
         if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE) /* Output termination. */
         {
-            rc = VBoxServiceToolboxStrmInit();
+            rc = vgsvcToolboxStrmInit();
             if (RT_FAILURE(rc))
                 RTMsgError("Error while initializing parseable streams, rc=%Rrc\n", rc);
-            VBoxServiceToolboxPrintStrmHeader("vbt_stat", 1 /* Stream version */);
+            vgsvcToolboxPrintStrmHeader("vbt_stat", 1 /* Stream version */);
         }
 
@@ -1433 +1403 @@
 /** @todo r=bird: You can get a number of other errors here, like access denied. */
                 if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
-                    RTMsgError("Cannot stat for '%s': No such file or directory (%Rrc)\n",
-                               pNodeIt->pszName, rc);
+                    RTMsgError("Cannot stat for '%s': No such file or directory (%Rrc)\n", pNodeIt->pszName, rc);
                 rc = VERR_FILE_NOT_FOUND;
                 /* Do not break here -- process every element in the list
@@ -1441 +1410 @@
             else
             {
-                rc2 = VBoxServiceToolboxPrintFsInfo(pNodeIt->pszName,
-                                                    strlen(pNodeIt->pszName) /* cbName */,
-                                                    fOutputFlags,
-                                                    &objInfo);
+                rc2 = vgsvcToolboxPrintFsInfo(pNodeIt->pszName,
+                                              strlen(pNodeIt->pszName) /* cbName */,
+                                              fOutputFlags,
+                                              &objInfo);
                 if (RT_FAILURE(rc2))
                     rc = rc2;
@@ -1451 +1420 @@
 
         if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE) /* Output termination. */
-            VBoxServiceToolboxPrintStrmTermination();
+            vgsvcToolboxPrintStrmTermination();
 
         /* At this point the overall result (success/failure) should be in rc. */
@@ -1461 +1430 @@
         RTMsgError("Failed with rc=%Rrc\n", rc);
 
-    VBoxServiceToolboxPathBufDestroy(&fileList);
+    vgsvcToolboxPathBufDestroy(&fileList);
     return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
@@ -1473 +1442 @@
  * @param   pszTool     The name of the tool.
  */
-static PFNHANDLER vboxServiceToolboxLookUpHandler(const char *pszTool)
+static PFNHANDLER vgsvcToolboxLookUpHandler(const char *pszTool)
 {
     static struct
@@ -1482 +1451 @@
     const s_aTools[] =
     {
-        { "cat",    VBoxServiceToolboxCat    },
-        { "ls",     VBoxServiceToolboxLs     },
-        { "rm",     VBoxServiceToolboxRm     },
-        { "mktemp", VBoxServiceToolboxMkTemp },
-        { "mkdir",  VBoxServiceToolboxMkDir  },
-        { "stat",   VBoxServiceToolboxStat   },
+        { "cat",    vgsvcToolboxCat    },
+        { "ls",     vgsvcToolboxLs     },
+        { "rm",     vgsvcToolboxRm     },
+        { "mktemp", vgsvcToolboxMkTemp },
+        { "mkdir",  vgsvcToolboxMkDir  },
+        { "stat",   vgsvcToolboxStat   },
     };
 
@@ -1516 +1485 @@
  *                                  internal toolbox command was handled.
  */
-bool VBoxServiceToolboxMain(int argc, char **argv, RTEXITCODE *prcExit)
+bool VGSvcToolboxMain(int argc, char **argv, RTEXITCODE *prcExit)
 {
 
@@ -1524 +1493 @@
     AssertReturn(argc > 0, false);
     const char *pszTool    = RTPathFilename(argv[0]);
-    PFNHANDLER  pfnHandler = vboxServiceToolboxLookUpHandler(pszTool);
+    PFNHANDLER  pfnHandler = vgsvcToolboxLookUpHandler(pszTool);
     if (!pfnHandler)
     {
@@ -1536 +1505 @@
         argv += 2;
         pszTool = argv[0];
-        pfnHandler = vboxServiceToolboxLookUpHandler(pszTool);
+        pfnHandler = vgsvcToolboxLookUpHandler(pszTool);
         if (!pfnHandler)
         {
@@ -1542 +1511 @@
            if (!strcmp(pszTool, "-V"))
            {
-               VBoxServiceToolboxShowVersion();
+               vgsvcToolboxShowVersion();
                return true;
            }
@@ -1548 +1517 @@
                && (strcmp(pszTool, "-h")))
                *prcExit = RTEXITCODE_SYNTAX;
-           VBoxServiceToolboxShowUsage();
+           vgsvcToolboxShowUsage();
            return true;
         }

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

@@ -32 +32 @@
 #include "VBoxServiceInternal.h"
 
+
 #ifdef VBOX_WITH_GUEST_PROPS
 
@@ -48 +49 @@
  *                              on success.  Optional.
  */
-int VBoxServiceReadProp(uint32_t u32ClientId, const char *pszPropName,
-                        char **ppszValue, char **ppszFlags, uint64_t *puTimestamp)
+int VGSvcReadProp(uint32_t u32ClientId, const char *pszPropName, char **ppszValue, char **ppszFlags, uint64_t *puTimestamp)
 {
     AssertPtrReturn(pszPropName, VERR_INVALID_POINTER);
@@ -69 +69 @@
         if (!pvBuf)
         {
-            VBoxServiceError("Guest Property: Failed to allocate %zu bytes\n", cbBuf);
+            VGSvcError("Guest Property: Failed to allocate %zu bytes\n", cbBuf);
             rc = VERR_NO_MEMORY;
             break;
@@ -76 +76 @@
         char    *pszFlags;
         uint64_t uTimestamp;
-        rc = VbglR3GuestPropRead(u32ClientId, pszPropName,
-                                 pvBuf, cbBuf,
-                                 &pszValue, &uTimestamp, &pszFlags, NULL);
+        rc = VbglR3GuestPropRead(u32ClientId, pszPropName, pvBuf, cbBuf, &pszValue, &uTimestamp, &pszFlags, NULL);
         if (RT_FAILURE(rc))
         {
@@ -88 +86 @@
             }
             if (rc == VERR_NOT_FOUND)
-                VBoxServiceVerbose(2, "Guest Property: %s not found\n", pszPropName);
+                VGSvcVerbose(2, "Guest Property: %s not found\n", pszPropName);
             else
-                VBoxServiceError("Guest Property: Failed to query \"%s\": %Rrc\n", pszPropName, rc);
+                VGSvcError("Guest Property: Failed to query '%s': %Rrc\n", pszPropName, rc);
             break;
         }
 
-        VBoxServiceVerbose(2, "Guest Property: Read \"%s\" = \"%s\", timestamp %RU64n\n",
-                           pszPropName, pszValue, uTimestamp);
+        VGSvcVerbose(2, "Guest Property: Read '%s' = '%s', timestamp %RU64n\n", pszPropName, pszValue, uTimestamp);
         *ppszValue = RTStrDup(pszValue);
         if (!*ppszValue)
         {
-            VBoxServiceError("Guest Property: RTStrDup failed for \"%s\"\n", pszValue);
+            VGSvcError("Guest Property: RTStrDup failed for '%s'\n", pszValue);
             rc = VERR_NO_MEMORY;
             break;
@@ -127 +124 @@
  *
  */
-int VBoxServiceReadPropUInt32(uint32_t u32ClientId, const char *pszPropName,
-                              uint32_t *pu32, uint32_t u32Min, uint32_t u32Max)
+int VGSvcReadPropUInt32(uint32_t u32ClientId, const char *pszPropName, uint32_t *pu32, uint32_t u32Min, uint32_t u32Max)
 {
     char *pszValue;
-    int rc = VBoxServiceReadProp(u32ClientId, pszPropName, &pszValue,
-                                 NULL /* ppszFlags */, NULL /* puTimestamp */);
+    int rc = VGSvcReadProp(u32ClientId, pszPropName, &pszValue, NULL /* ppszFlags */, NULL /* puTimestamp */);
     if (RT_SUCCESS(rc))
     {
@@ -139 +134 @@
         if (   RT_SUCCESS(rc)
             && (*pu32 < u32Min || *pu32 > u32Max))
-        {
-            rc = VBoxServiceError("The guest property value %s = %RU32 is out of range [%RU32..%RU32].\n",
-                                  pszPropName, *pu32, u32Min, u32Max);
-        }
+            rc = VGSvcError("The guest property value %s = %RU32 is out of range [%RU32..%RU32].\n",
+                            pszPropName, *pu32, u32Min, u32Max);
         RTStrFree(pszValue);
     }
@@ -165 +158 @@
  *                              on success.  Optional.
  */
-int VBoxServiceReadHostProp(uint32_t u32ClientId, const char *pszPropName, bool fReadOnly,
-                            char **ppszValue, char **ppszFlags, uint64_t *puTimestamp)
+int VGSvcReadHostProp(uint32_t u32ClientId, const char *pszPropName, bool fReadOnly,
+                      char **ppszValue, char **ppszFlags, uint64_t *puTimestamp)
 {
     AssertPtrReturn(ppszValue, VERR_INVALID_PARAMETER);
@@ -172 +165 @@
     char *pszValue = NULL;
     char *pszFlags = NULL;
-    int rc = VBoxServiceReadProp(u32ClientId, pszPropName, &pszValue, &pszFlags, puTimestamp);
+    int rc = VGSvcReadProp(u32ClientId, pszPropName, &pszValue, &pszFlags, puTimestamp);
     if (RT_SUCCESS(rc))
     {
@@ -218 +211 @@
  * @param   ...             Format arguments.
  */
-int VBoxServiceWritePropF(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, ...)
+int VGSvcWritePropF(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, ...)
 {
     AssertPtr(pszName);
@@ -226 +219 @@
         va_list va;
         va_start(va, pszValueFormat);
-        VBoxServiceVerbose(3, "Writing guest property \"%s\" = \"%N\"\n", pszName, pszValueFormat, &va);
+        VGSvcVerbose(3, "Writing guest property '%s' = '%N'\n", pszName, pszValueFormat, &va);
         va_end(va);
 
@@ -234 +227 @@
 
         if (RT_FAILURE(rc))
-             VBoxServiceError("Error writing guest property \"%s\" (rc=%Rrc)\n", pszName, rc);
+             VGSvcError("Error writing guest property '%s' (rc=%Rrc)\n", pszName, rc);
     }
     else
     {
-        VBoxServiceVerbose(3, "Deleting guest property \"%s\"\n", pszName);
+        VGSvcVerbose(3, "Deleting guest property '%s'\n", pszName);
         rc = VbglR3GuestPropWriteValue(u32ClientId, pszName, NULL);
         if (RT_FAILURE(rc))
-            VBoxServiceError("Error deleting guest property \"%s\" (rc=%Rrc)\n", pszName, rc);
+            VGSvcError("Error deleting guest property '%s' (rc=%Rrc)\n", pszName, rc);
     }
     return rc;
@@ -255 +248 @@
  * @returns Success indicator.
  */
-static bool VBoxServiceGetFileVersionOwn(LPSTR pVerData,
-                                         PDWORD pdwMajor,
-                                         PDWORD pdwMinor,
-                                         PDWORD pdwBuildNumber,
-                                         PDWORD pdwRevisionNumber)
+static bool vgsvcUtilGetFileVersionOwn(LPSTR pVerData, PDWORD pdwMajor, PDWORD pdwMinor, PDWORD pdwBuildNumber,
+                                       PDWORD pdwRevisionNumber)
 {
     UINT    cchStrValue = 0;
@@ -275 +265 @@
 
 /**
- * Worker for VBoxServiceGetFileVersionString.
+ * Worker for VGSvcUtilWinGetFileVersionString.
  *
  * @returns VBox status code.
  * @param   pszFilename         ASCII & ANSI & UTF-8 compliant name.
  */
-static int VBoxServiceGetFileVersion(const char *pszFilename,
-                                     PDWORD pdwMajor,
-                                     PDWORD pdwMinor,
-                                     PDWORD pdwBuildNumber,
-                                     PDWORD pdwRevisionNumber)
+static int vgsvcUtilGetFileVersion(const char *pszFilename, PDWORD pdwMajor, PDWORD pdwMinor, PDWORD pdwBuildNumber,
+                                   PDWORD pdwRevisionNumber)
 {
     int rc;
@@ -307 +294 @@
                  * it goes beyond the range of an uint16_t / WORD.
                  */
-                if (VBoxServiceGetFileVersionOwn(pVerData, pdwMajor, pdwMinor, pdwBuildNumber, pdwRevisionNumber))
+                if (vgsvcUtilGetFileVersionOwn(pVerData, pdwMajor, pdwMinor, pdwBuildNumber, pdwRevisionNumber))
                     rc = VINF_SUCCESS;
                 else
@@ -325 +312 @@
                     {
                         rc = RTErrConvertFromWin32(GetLastError());
-                        VBoxServiceVerbose(3, "No file version value for file \"%s\" available! (%d / rc=%Rrc)\n",
-                                           pszFilename,  GetLastError(), rc);
+                        VGSvcVerbose(3, "No file version value for file '%s' available! (%d / rc=%Rrc)\n",
+                                     pszFilename,  GetLastError(), rc);
                     }
                 }
@@ -333 +320 @@
             {
                 rc = RTErrConvertFromWin32(GetLastError());
-                VBoxServiceVerbose(0, "GetFileVersionInfo(%s) -> %u / %Rrc\n", pszFilename, GetLastError(), rc);
+                VGSvcVerbose(0, "GetFileVersionInfo(%s) -> %u / %Rrc\n", pszFilename, GetLastError(), rc);
             }
 
@@ -340 +327 @@
         else
         {
-            VBoxServiceVerbose(0, "Failed to allocate %u byte for file version info for '%s'\n", cbVerData, pszFilename);
+            VGSvcVerbose(0, "Failed to allocate %u byte for file version info for '%s'\n", cbVerData, pszFilename);
             rc = VERR_NO_TMP_MEMORY;
         }
@@ -347 +334 @@
     {
         rc = RTErrConvertFromWin32(GetLastError());
-        VBoxServiceVerbose(3, "GetFileVersionInfoSize(%s) -> %u / %Rrc\n", pszFilename, GetLastError(), rc);
+        VGSvcVerbose(3, "GetFileVersionInfoSize(%s) -> %u / %Rrc\n", pszFilename, GetLastError(), rc);
     }
     return rc;
@@ -365 +352 @@
  *                          at least 2 bytes!
  */
-int VBoxServiceGetFileVersionString(const char *pszPath, const char *pszFilename,
-                                    char *pszVersion, size_t cbVersion)
+int VGSvcUtilWinGetFileVersionString(const char *pszPath, const char *pszFilename, char *pszVersion, size_t cbVersion)
 {
     /*
@@ -383 +369 @@
     {
         DWORD dwMajor, dwMinor, dwBuild, dwRev;
-        rc = VBoxServiceGetFileVersion(szFullPath, &dwMajor, &dwMinor, &dwBuild, &dwRev);
+        rc = vgsvcUtilGetFileVersion(szFullPath, &dwMajor, &dwMinor, &dwBuild, &dwRev);
         if (RT_SUCCESS(rc))
             RTStrPrintf(pszVersion, cbVersion, "%u.%u.%ur%u", dwMajor, dwMinor, dwBuild, dwRev);

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

@@ -22 +22 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
-int VBoxServiceReadProp(uint32_t u32ClientId, const char *pszPropName, char **ppszValue, char **ppszFlags, uint64_t *puTimestamp);
-int VBoxServiceReadPropUInt32(uint32_t u32ClientId, const char *pszPropName, uint32_t *pu32, uint32_t u32Min, uint32_t u32Max);
-int VBoxServiceReadHostProp(uint32_t u32ClientId, const char *pszPropName, bool fReadOnly, char **ppszValue, char **ppszFlags, uint64_t *puTimestamp);
-int VBoxServiceWritePropF(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, ...);
+int VGSvcReadProp(uint32_t u32ClientId, const char *pszPropName, char **ppszValue, char **ppszFlags, uint64_t *puTimestamp);
+int VGSvcReadPropUInt32(uint32_t u32ClientId, const char *pszPropName, uint32_t *pu32, uint32_t u32Min, uint32_t u32Max);
+int VGSvcReadHostProp(uint32_t u32ClientId, const char *pszPropName, bool fReadOnly, char **ppszValue, char **ppszFlags,
+                      uint64_t *puTimestamp);
+int VGSvcWritePropF(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, ...);
 #endif
 
 #ifdef RT_OS_WINDOWS
-int VBoxServiceGetFileVersionString(const char *pszPath, const char *pszFileName, char *pszVersion, size_t cbVersion);
+int VGSvcUtilWinGetFileVersionString(const char *pszPath, const char *pszFileName, char *pszVersion, size_t cbVersion);
 #endif
 

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

@@ -95 +95 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, PVBOXSERVICEVMINFOPROC const paProcs, DWORD cProcs);
-static bool VBoxServiceVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER a_pUserInfo, PLUID a_pSession);
-static int  VBoxServiceVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppProc, DWORD *pdwCount);
-static void VBoxServiceVMInfoWinProcessesFree(DWORD cProcs, PVBOXSERVICEVMINFOPROC paProcs);
-static int  vboxServiceVMInfoWinWriteLastInput(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain);
+static uint32_t vgsvcVMInfoWinSessionHasProcesses(PLUID pSession, PVBOXSERVICEVMINFOPROC const paProcs, DWORD cProcs);
+static bool vgsvcVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER a_pUserInfo, PLUID a_pSession);
+static int  vgsvcVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppProc, DWORD *pdwCount);
+static void vgsvcVMInfoWinProcessesFree(DWORD cProcs, PVBOXSERVICEVMINFOPROC paProcs);
+static int  vgsvcVMInfoWinWriteLastInput(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain);
 
 
@@ -156 +156 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceVerbose(1, "Secur32.dll APIs are not availble (%Rrc)\n", rc);
+        VGSvcVerbose(1, "Secur32.dll APIs are not availble (%Rrc)\n", rc);
         g_pfnLsaGetLogonSessionData = NULL;
         g_pfnLsaEnumerateLogonSessions = NULL;
@@ -175 +175 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceVerbose(1, "WtsApi32.dll APIs are not availble (%Rrc)\n", rc);
+        VGSvcVerbose(1, "WtsApi32.dll APIs are not availble (%Rrc)\n", rc);
         g_pfnWTSFreeMemory = NULL;
         g_pfnWTSQuerySessionInformationA = NULL;
@@ -193 +193 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceVerbose(1, "psapi.dll APIs are not availble (%Rrc)\n", rc);
+        VGSvcVerbose(1, "psapi.dll APIs are not availble (%Rrc)\n", rc);
         g_pfnEnumProcesses = NULL;
         g_pfnGetModuleFileNameExW = NULL;
@@ -227 +227 @@
 
 
-static bool vboxServiceVMInfoSession0Separation(void)
+static bool vgsvcVMInfoSession0Separation(void)
 {
     return g_WinVersion.dwPlatformId == VER_PLATFORM_WIN32_NT
@@ -239 +239 @@
  * @return  IPRT status code.
  */
-static int VBoxServiceVMInfoWinProcessesGetModuleNameA(PVBOXSERVICEVMINFOPROC const pProc,
-                                                       PRTUTF16 *ppszName)
+static int vgsvcVMInfoWinProcessesGetModuleNameA(PVBOXSERVICEVMINFOPROC const pProc, PRTUTF16 *ppszName)
 {
     AssertPtrReturn(pProc, VERR_INVALID_POINTER);
@@ -261 +260 @@
         DWORD dwErr = GetLastError();
         if (g_cVerbosity)
-            VBoxServiceError("Unable to open process with PID=%ld, error=%ld\n",
-                             pProc->id, dwErr);
+            VGSvcError("Unable to open process with PID=%u, error=%u\n", pProc->id, dwErr);
         rc = RTErrConvertFromWin32(dwErr);
     }
@@ -283 +281 @@
         if (   RT_FAILURE(rc)
             && g_cVerbosity > 3)
-        {
-           VBoxServiceError("Unable to retrieve process name for PID=%ld, error=%ld\n",
-                             pProc->id, GetLastError());
-        }
+           VGSvcError("Unable to retrieve process name for PID=%u, error=%u\n", pProc->id, GetLastError());
         else
         {
@@ -310 +305 @@
  * @param   tkClass         The kind of token information to get.
  */
-static int VBoxServiceVMInfoWinProcessesGetTokenInfo(PVBOXSERVICEVMINFOPROC pProc,
-                                                     TOKEN_INFORMATION_CLASS tkClass)
+static int vgsvcVMInfoWinProcessesGetTokenInfo(PVBOXSERVICEVMINFOPROC pProc, TOKEN_INFORMATION_CLASS tkClass)
 {
     AssertPtrReturn(pProc, VERR_INVALID_POINTER);
@@ -321 +315 @@
         dwErr = GetLastError();
         if (g_cVerbosity > 4)
-            VBoxServiceError("Unable to open process with PID=%ld, error=%ld\n",
-                             pProc->id, dwErr);
+            VGSvcError("Unable to open process with PID=%u, error=%u\n", pProc->id, dwErr);
         return RTErrConvertFromWin32(dwErr);
     }
@@ -335 +328 @@
         {
             case TokenStatistics:
+                /** @todo r=bird: Someone has been reading too many MSDN examples. You shall
+                 *        use RTMemAlloc here!  There is absolutely not reason for
+                 *        complicating things uncessarily by using HeapAlloc! */
                 dwTokenInfoSize = sizeof(TOKEN_STATISTICS);
-                pvTokenInfo = HeapAlloc(GetProcessHeap(),
-                                        HEAP_ZERO_MEMORY, dwTokenInfoSize);
+                pvTokenInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTokenInfoSize);
                 AssertPtr(pvTokenInfo);
                 break;
@@ -352 +347 @@
 
             default:
-                VBoxServiceError("Token class not implemented: %ld\n", tkClass);
+                VGSvcError("Token class not implemented: %d\n", tkClass);
                 rc = VERR_NOT_IMPLEMENTED;
                 break;
@@ -370 +365 @@
                     {
                         case TokenGroups:
-                            pvTokenInfo = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(),
-                                                                   HEAP_ZERO_MEMORY, dwRetLength);
+                            pvTokenInfo = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRetLength);
                             if (!pvTokenInfo)
                                 dwErr = GetLastError();
@@ -378 +372 @@
 
                         case TokenUser:
-                            pvTokenInfo = (PTOKEN_USER)HeapAlloc(GetProcessHeap(),
-                                                                 HEAP_ZERO_MEMORY, dwRetLength);
+                            pvTokenInfo = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRetLength);
                             if (!pvTokenInfo)
                                 dwErr = GetLastError();
@@ -478 +471 @@
                         if (dwErr != ERROR_SUCCESS)
                         {
-                            VBoxServiceError("Error retrieving SID of process PID=%ld: %ld\n",
-                                             pProc->id, dwErr);
+                            VGSvcError("Error retrieving SID of process PID=%u: %u\n", pProc->id, dwErr);
                             if (pProc->pSid)
                             {
@@ -506 +498 @@
     {
         if (g_cVerbosity)
-            VBoxServiceError("Unable to query token information for PID=%ld, error=%ld\n",
-                             pProc->id, dwErr);
+            VGSvcError("Unable to query token information for PID=%u, error=%u\n", pProc->id, dwErr);
         rc = RTErrConvertFromWin32(dwErr);
     }
@@ -526 +517 @@
  * @param   pcProcs     Where to store the returned process count.
  */
-static int VBoxServiceVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppaProcs, PDWORD pcProcs)
+static int vgsvcVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppaProcs, PDWORD pcProcs)
 {
     AssertPtr(ppaProcs);
@@ -582 +573 @@
                 paProcs[i].pSid = NULL;
 
-                int rc2 = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenUser);
+                int rc2 = vgsvcVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenUser);
                 if (RT_FAILURE(rc2) && g_cVerbosity)
-                    VBoxServiceError("Get token class \"user\" for process %ld failed, rc=%Rrc\n",
-                                     paProcs[i].id, rc2);
-
-                rc2 = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenGroups);
+                    VGSvcError("Get token class 'user' for process %u failed, rc=%Rrc\n", paProcs[i].id, rc2);
+
+                rc2 = vgsvcVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenGroups);
                 if (RT_FAILURE(rc2) && g_cVerbosity)
-                    VBoxServiceError("Get token class \"groups\" for process %ld failed, rc=%Rrc\n",
-                                     paProcs[i].id, rc2);
-
-                rc2 = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenStatistics);
+                    VGSvcError("Get token class 'groups' for process %u failed, rc=%Rrc\n", paProcs[i].id, rc2);
+
+                rc2 = vgsvcVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenStatistics);
                 if (RT_FAILURE(rc2) && g_cVerbosity)
-                    VBoxServiceError("Get token class \"statistics\" for process %ld failed, rc=%Rrc\n",
-                                     paProcs[i].id, rc2);
+                    VGSvcError("Get token class 'statistics' for process %u failed, rc=%Rrc\n", paProcs[i].id, rc2);
             }
 
@@ -605 +593 @@
             }
             else
-                VBoxServiceVMInfoWinProcessesFree(cProcesses, paProcs);
+                vgsvcVMInfoWinProcessesFree(cProcesses, paProcs);
         }
         else
@@ -617 +605 @@
 /**
  * Frees the process structures returned by
- * VBoxServiceVMInfoWinProcessesEnumerate() before.
+ * vgsvcVMInfoWinProcessesEnumerate() before.
  *
  * @param   paProcs     What
  */
-static void VBoxServiceVMInfoWinProcessesFree(DWORD cProcs, PVBOXSERVICEVMINFOPROC paProcs)
+static void vgsvcVMInfoWinProcessesFree(DWORD cProcs, PVBOXSERVICEVMINFOPROC paProcs)
 {
     for (DWORD i = 0; i < cProcs; i++)
@@ -644 +632 @@
  * @param   puSession       Looked up session number.  Optional.
  */
-static uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession,
-                                                        PVBOXSERVICEVMINFOPROC const paProcs, DWORD cProcs,
-                                                        PULONG puTerminalSession)
+static uint32_t vgsvcVMInfoWinSessionHasProcesses(PLUID pSession,
+                                                  PVBOXSERVICEVMINFOPROC const paProcs, DWORD cProcs, PULONG puTerminalSession)
 {
     if (!pSession)
     {
-        VBoxServiceVerbose(1, "Session became invalid while enumerating!\n");
+        VGSvcVerbose(1, "Session became invalid while enumerating!\n");
         return 0;
     }
@@ -660 +647 @@
     if (rcNt != STATUS_SUCCESS)
     {
-        VBoxServiceError("Could not get logon session data! rcNt=%#x\n", rcNt);
+        VGSvcError("Could not get logon session data! rcNt=%#x\n", rcNt);
         return 0;
     }
@@ -666 +653 @@
     if (!IsValidSid(pSessionData->Sid))
     {
-       VBoxServiceError("User SID=%p is not valid\n", pSessionData->Sid);
+       VGSvcError("User SID=%p is not valid\n", pSessionData->Sid);
        if (pSessionData)
            g_pfnLsaFreeReturnBuffer(pSessionData);
@@ -692 +679 @@
                 {
                     PRTUTF16 pszName;
-                    int rc2 = VBoxServiceVMInfoWinProcessesGetModuleNameA(&paProcs[i], &pszName);
-                    VBoxServiceVerbose(4, "Session %RU32: PID=%ld (fInt=%RTbool): %ls\n",
-                                       pSessionData->Session, paProcs[i].id, paProcs[i].fInteractive,
-                                       RT_SUCCESS(rc2) ? pszName : L"<Unknown>");
+                    int rc2 = vgsvcVMInfoWinProcessesGetModuleNameA(&paProcs[i], &pszName);
+                    VGSvcVerbose(4, "Session %RU32: PID=%u (fInt=%RTbool): %ls\n",
+                                 pSessionData->Session, paProcs[i].id, paProcs[i].fInteractive,
+                                 RT_SUCCESS(rc2) ? pszName : L"<Unknown>");
                     if (RT_SUCCESS(rc2))
                         RTUtf16Free(pszName);
@@ -727 +714 @@
  * @param   pszWhat             What this is. For the log.
  */
-static void VBoxServiceVMInfoWinSafeCopy(PWCHAR pwszDst, size_t cbDst, LSA_UNICODE_STRING const *pSrc, const char *pszWhat)
+static void vgsvcVMInfoWinSafeCopy(PWCHAR pwszDst, size_t cbDst, LSA_UNICODE_STRING const *pSrc, const char *pszWhat)
 {
     Assert(RT_ALIGN(cbDst, sizeof(WCHAR)) == cbDst);
@@ -734 +721 @@
     if (cbCopy + sizeof(WCHAR) > cbDst)
     {
-        VBoxServiceVerbose(0, "%s is too long - %u bytes, buffer %u bytes! It will be truncated.\n",
-                           pszWhat, cbCopy, cbDst);
+        VGSvcVerbose(0, "%s is too long - %u bytes, buffer %u bytes! It will be truncated.\n", pszWhat, cbCopy, cbDst);
         cbCopy = cbDst - sizeof(WCHAR);
     }
@@ -751 +737 @@
  * @param   pSession            The session to check.
  */
-static bool VBoxServiceVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER pUserInfo, PLUID pSession)
+static bool vgsvcVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER pUserInfo, PLUID pSession)
 {
     AssertPtrReturn(pUserInfo, false);
@@ -769 +755 @@
                 /* If we don't have enough memory it's hard to judge whether the specified user
                  * is logged in or not, so just assume he/she's not. */
-                VBoxServiceVerbose(3, "Not enough memory to retrieve logon session data!\n");
+                VGSvcVerbose(3, "Not enough memory to retrieve logon session data!\n");
                 break;
 
@@ -778 +764 @@
 
             default:
-                VBoxServiceError("LsaGetLogonSessionData failed with error %u\n", ulError);
+                VGSvcError("LsaGetLogonSessionData failed with error %u\n", ulError);
                 break;
         }
@@ -787 +773 @@
     if (!pSessionData)
     {
-        VBoxServiceError("Invalid logon session data!\n");
+        VGSvcError("Invalid logon session data!\n");
         return false;
     }
 
-    VBoxServiceVerbose(3, "Session data: Name=%ls, SessionID=%RU32, LogonID=%ld,%ld, LogonType=%ld\n",
-                       pSessionData->UserName.Buffer,
-                       pSessionData->Session,
-                       pSessionData->LogonId.HighPart, pSessionData->LogonId.LowPart,
-                       pSessionData->LogonType);
-
-    if (vboxServiceVMInfoSession0Separation())
+    VGSvcVerbose(3, "Session data: Name=%ls, SessionID=%RU32, LogonID=%d,%u, LogonType=%u\n",
+                 pSessionData->UserName.Buffer, pSessionData->Session,
+                 pSessionData->LogonId.HighPart, pSessionData->LogonId.LowPart, pSessionData->LogonType);
+
+    if (vgsvcVMInfoSession0Separation())
     {
         /* Starting at Windows Vista user sessions begin with session 1, so
          * ignore (stale) session 0 users. */
         if (   pSessionData->Session == 0
-        /* Also check the logon time. */
+            /* Also check the logon time. */
             || pSessionData->LogonTime.QuadPart == 0)
         {
@@ -823 +807 @@
             || (SECURITY_LOGON_TYPE)pSessionData->LogonType == CachedInteractive))
     {
-        VBoxServiceVerbose(3, "Session LogonType=%ld is supported -- looking up SID + type ...\n",
-                           pSessionData->LogonType);
+        VGSvcVerbose(3, "Session LogonType=%u is supported -- looking up SID + type ...\n", pSessionData->LogonType);
 
         /*
          * Copy out relevant data.
          */
-        VBoxServiceVMInfoWinSafeCopy(pUserInfo->wszUser, sizeof(pUserInfo->wszUser),
-                                     &pSessionData->UserName, "User name");
-        VBoxServiceVMInfoWinSafeCopy(pUserInfo->wszAuthenticationPackage, sizeof(pUserInfo->wszAuthenticationPackage),
-                                     &pSessionData->AuthenticationPackage, "Authentication pkg name");
-        VBoxServiceVMInfoWinSafeCopy(pUserInfo->wszLogonDomain, sizeof(pUserInfo->wszLogonDomain),
-                                     &pSessionData->LogonDomain, "Logon domain name");
+        vgsvcVMInfoWinSafeCopy(pUserInfo->wszUser, sizeof(pUserInfo->wszUser), &pSessionData->UserName, "User name");
+        vgsvcVMInfoWinSafeCopy(pUserInfo->wszAuthenticationPackage, sizeof(pUserInfo->wszAuthenticationPackage),
+                               &pSessionData->AuthenticationPackage, "Authentication pkg name");
+        vgsvcVMInfoWinSafeCopy(pUserInfo->wszLogonDomain, sizeof(pUserInfo->wszLogonDomain),
+                               &pSessionData->LogonDomain, "Logon domain name");
 
         TCHAR           szOwnerName[_MAX_PATH]  = { 0 };
@@ -857 +839 @@
              */
             if (dwErr != ERROR_NONE_MAPPED)
-                VBoxServiceError("Failed looking up account info for user=%ls, error=$ld!\n",
-                                 pUserInfo->wszUser, dwErr);
+                VGSvcError("Failed looking up account info for user=%ls, error=$ld!\n", pUserInfo->wszUser, dwErr);
         }
         else
@@ -864 +845 @@
             if (enmOwnerType == SidTypeUser) /* Only recognize users; we don't care about the rest! */
             {
-                VBoxServiceVerbose(3, "Account User=%ls, Session=%ld, LogonID=%ld,%ld, AuthPkg=%ls, Domain=%ls\n",
-                                   pUserInfo->wszUser, pSessionData->Session, pSessionData->LogonId.HighPart,
-                                   pSessionData->LogonId.LowPart, pUserInfo->wszAuthenticationPackage,
-                                   pUserInfo->wszLogonDomain);
+                VGSvcVerbose(3, "Account User=%ls, Session=%u, LogonID=%d,%u, AuthPkg=%ls, Domain=%ls\n",
+                             pUserInfo->wszUser, pSessionData->Session, pSessionData->LogonId.HighPart,
+                             pSessionData->LogonId.LowPart, pUserInfo->wszAuthenticationPackage, pUserInfo->wszLogonDomain);
 
                 /**
@@ -893 +873 @@
 
                     if (s_fSkipRDPDetection)
-                        VBoxServiceVerbose(0, "Detection of logged-in users via RDP is disabled\n");
+                        VGSvcVerbose(0, "Detection of logged-in users via RDP is disabled\n");
                 }
 
@@ -913 +893 @@
                         if (cbRet)
                             iState = *pBuffer;
-                        VBoxServiceVerbose(3, "Account User=%ls, WTSConnectState=%d (%ld)\n",
-                                           pUserInfo->wszUser, iState, cbRet);
+                        VGSvcVerbose(3, "Account User=%ls, WTSConnectState=%d (%u)\n", pUserInfo->wszUser, iState, cbRet);
                         if (    iState == WTSActive           /* User logged on to WinStation. */
                              || iState == WTSShadow           /* Shadowing another WinStation. */
@@ -921 +900 @@
                             /** @todo On Vista and W2K, always "old" user name are still
                              *        there. Filter out the old one! */
-                            VBoxServiceVerbose(3, "Account User=%ls using TCS/RDP, state=%d \n",
-                                               pUserInfo->wszUser, iState);
+                            VGSvcVerbose(3, "Account User=%ls using TCS/RDP, state=%d \n", pUserInfo->wszUser, iState);
                             fFoundUser = true;
                         }
@@ -939 +917 @@
                              */
                             case ERROR_CTX_WINSTATION_NOT_FOUND:
-                                VBoxServiceVerbose(3, "No WinStation found for user=%ls\n",
-                                                   pUserInfo->wszUser);
+                                VGSvcVerbose(3, "No WinStation found for user=%ls\n", pUserInfo->wszUser);
                                 break;
 
                             default:
-                                VBoxServiceVerbose(3, "Cannot query WTS connection state for user=%ls, error=%ld\n",
-                                                   pUserInfo->wszUser, dwLastErr);
+                                VGSvcVerbose(3, "Cannot query WTS connection state for user=%ls, error=%u\n",
+                                             pUserInfo->wszUser, dwLastErr);
                                 break;
                         }
@@ -954 +931 @@
             }
             else
-                VBoxServiceVerbose(3, "SID owner type=%d not handled, skipping\n",
-                                   enmOwnerType);
-        }
-
-        VBoxServiceVerbose(3, "Account User=%ls %s logged in\n",
-                           pUserInfo->wszUser, fFoundUser ? "is" : "is not");
+                VGSvcVerbose(3, "SID owner type=%d not handled, skipping\n", enmOwnerType);
+        }
+
+        VGSvcVerbose(3, "Account User=%ls %s logged in\n", pUserInfo->wszUser, fFoundUser ? "is" : "is not");
     }
 
@@ -970 +945 @@
 
 
-static int vboxServiceVMInfoWinWriteLastInput(PVBOXSERVICEVEPROPCACHE pCache,
-                                              const char *pszUser, const char *pszDomain)
+static int vgsvcVMInfoWinWriteLastInput(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain)
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
@@ -980 +954 @@
 
     char szPipeName[255];
-    if (RTStrPrintf(szPipeName, sizeof(szPipeName), "%s%s",
-                    VBOXTRAY_IPC_PIPE_PREFIX, pszUser))
+/** @todo r=bird:  Pointless if.  */
+    if (RTStrPrintf(szPipeName, sizeof(szPipeName), "%s%s", VBOXTRAY_IPC_PIPE_PREFIX, pszUser))
     {
         bool fReportToHost = false;
@@ -990 +964 @@
         if (RT_SUCCESS(rc))
         {
-            VBOXTRAYIPCHEADER ipcHdr = { VBOXTRAY_IPC_HDR_MAGIC, 0 /* Header version */,
-                                         VBOXTRAYIPCMSGTYPE_USERLASTINPUT, 0 /* No msg */ };
+            VBOXTRAYIPCHEADER ipcHdr =
+            {
+                /* .uMagic      = */ VBOXTRAY_IPC_HDR_MAGIC,
+                /* .uHdrVersion = */ 0,
+                /* .uMsgType    = */ VBOXTRAYIPCMSGTYPE_USERLASTINPUT,
+                /* .cbMsgData   = */ 0 /* No msg */
+            };
 
             rc = RTLocalIpcSessionWrite(hSession, &ipcHdr, sizeof(ipcHdr));
@@ -997 +976 @@
             VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
             if (RT_SUCCESS(rc))
-                rc = RTLocalIpcSessionRead(hSession, &ipcRes, sizeof(ipcRes),
-                                           NULL /* Exact read */);
+                rc = RTLocalIpcSessionRead(hSession, &ipcRes, sizeof(ipcRes), NULL /* Exact read */);
             if (   RT_SUCCESS(rc)
                 /* If uLastInput is set to UINT32_MAX VBoxTray was not able to retrieve the
@@ -1008 +986 @@
                           : VBoxGuestUserState_Idle;
 
-                rc = vboxServiceUserUpdateF(pCache, pszUser, pszDomain, "UsageState",
-                                              userState == VBoxGuestUserState_InUse
-                                            ? "InUse" : "Idle");
+                rc = VGSvcUserUpdateF(pCache, pszUser, pszDomain, "UsageState",
+                                      userState == VBoxGuestUserState_InUse ? "InUse" : "Idle");
 
                 /*
@@ -1018 +995 @@
                  */
                 fReportToHost = rc == VINF_SUCCESS;
-                VBoxServiceVerbose(4, "User \"%s\" (domain \"%s\") is idle for %RU32, fReportToHost=%RTbool\n",
-                                   pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInput, fReportToHost);
+                VGSvcVerbose(4, "User '%s' (domain '%s') is idle for %RU32, fReportToHost=%RTbool\n",
+                             pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInput, fReportToHost);
 
 #if 0 /* Do we want to write the idle time as well? */
                     /* Also write the user's current idle time, if there is any. */
                     if (userState == VBoxGuestUserState_Idle)
-                        rc = vboxServiceUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs",
-                                                    "%RU32", ipcRes.uLastInputMs);
+                        rc = vgsvcUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs", "%RU32", ipcRes.uLastInputMs);
                     else
-                        rc = vboxServiceUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs",
-                                                    NULL /* Delete property */);
+                        rc = vgsvcUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs", NULL /* Delete property */);
 
                     if (RT_SUCCESS(rc))
@@ -1035 +1010 @@
 #ifdef DEBUG
             else if (ipcRes.uLastInput == UINT32_MAX)
-                VBoxServiceVerbose(4, "Last input for user \"%s\" is not supported, skipping\n",
-                                   pszUser, rc);
-
-            VBoxServiceVerbose(4, "Getting last input for user \"%s\" ended with rc=%Rrc\n",
-                               pszUser, rc);
+                VGSvcVerbose(4, "Last input for user '%s' is not supported, skipping\n", pszUser, rc);
+
+            VGSvcVerbose(4, "Getting last input for user '%s' ended with rc=%Rrc\n", pszUser, rc);
 #endif
             int rc2 = RTLocalIpcSessionClose(hSession);
@@ -1053 +1026 @@
                     /* No VBoxTray (or too old version which does not support IPC) running
                        for the given user. Not much we can do then. */
-                    VBoxServiceVerbose(4, "VBoxTray for user \"%s\" not running (anymore), no last input available\n",
-                                       pszUser);
+                    VGSvcVerbose(4, "VBoxTray for user '%s' not running (anymore), no last input available\n", pszUser);
 
                     /* Overwrite rc from above. */
-                    rc = vboxServiceUserUpdateF(pCache, pszUser, pszDomain,
-                                                "UsageState", "Idle");
+                    rc = VGSvcUserUpdateF(pCache, pszUser, pszDomain, "UsageState", "Idle");
 
                     fReportToHost = rc == VINF_SUCCESS;
@@ -1067 +1038 @@
 
                 default:
-                    VBoxServiceError("Error querying last input for user \"%s\", rc=%Rrc\n",
-                                     pszUser, rc);
+                    VGSvcError("Error querying last input for user '%s', rc=%Rrc\n", pszUser, rc);
                     break;
             }
@@ -1076 +1046 @@
         {
             Assert(userState != VBoxGuestUserState_Unknown);
-            int rc2 = VbglR3GuestUserReportState(pszUser, pszDomain, userState,
-                                                 NULL /* No details */, 0);
+            int rc2 = VbglR3GuestUserReportState(pszUser, pszDomain, userState, NULL /* No details */, 0);
             if (RT_FAILURE(rc2))
-                VBoxServiceError("Error reporting usage state %ld for user \"%s\" to host, rc=%Rrc\n",
-                                 userState, pszUser, rc2);
-
+                VGSvcError("Error reporting usage state %d for user '%s' to host, rc=%Rrc\n", userState, pszUser, rc2);
             if (RT_SUCCESS(rc))
                 rc = rc2;
@@ -1102 +1069 @@
  * @param   pcUsersInList   Where to store the number of users in the list.
  */
-int VBoxServiceVMInfoWinWriteUsers(PVBOXSERVICEVEPROPCACHE pCache,
-                                   char **ppszUserList, uint32_t *pcUsersInList)
+int VGSvcVMInfoWinWriteUsers(PVBOXSERVICEVEPROPCACHE pCache, char **ppszUserList, uint32_t *pcUsersInList)
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
@@ -1128 +1094 @@
     if (rcNt != STATUS_SUCCESS)
     {
-        ULONG ulError = LsaNtStatusToWinError(rcNt);
-        switch (ulError)
+        ULONG uError = LsaNtStatusToWinError(rcNt);
+        switch (uError)
         {
             case ERROR_NOT_ENOUGH_MEMORY:
-                VBoxServiceError("Not enough memory to enumerate logon sessions!\n");
+                VGSvcError("Not enough memory to enumerate logon sessions!\n");
                 break;
 
@@ -1138 +1104 @@
                 /* If we're about to shutdown when we were in the middle of enumerating the logon
                  * sessions, skip the error to not confuse the user with an unnecessary log message. */
-                VBoxServiceVerbose(3, "Shutdown in progress ...\n");
-                ulError = ERROR_SUCCESS;
+                VGSvcVerbose(3, "Shutdown in progress ...\n");
+                uError = ERROR_SUCCESS;
                 break;
 
             default:
-                VBoxServiceError("LsaEnumerate failed with error %RU32\n", ulError);
+                VGSvcError("LsaEnumerate failed with error %RU32\n", uError);
                 break;
         }
@@ -1150 +1116 @@
             g_pfnLsaFreeReturnBuffer(paSessions);
 
-        return RTErrConvertFromWin32(ulError);
-    }
-    VBoxServiceVerbose(3, "Found %ld sessions\n", cSessions);
+        return RTErrConvertFromWin32(uError);
+    }
+    VGSvcVerbose(3, "Found %u sessions\n", cSessions);
 
     PVBOXSERVICEVMINFOPROC  paProcs;
     DWORD                   cProcs;
-    rc = VBoxServiceVMInfoWinProcessesEnumerate(&paProcs, &cProcs);
+    rc = vgsvcVMInfoWinProcessesEnumerate(&paProcs, &cProcs);
     if (RT_FAILURE(rc))
     {
         if (rc == VERR_NO_MEMORY)
-            VBoxServiceError("Not enough memory to enumerate processes\n");
+            VGSvcError("Not enough memory to enumerate processes\n");
         else
-            VBoxServiceError("Failed to enumerate processes, rc=%Rrc\n", rc);
+            VGSvcError("Failed to enumerate processes, rc=%Rrc\n", rc);
     }
     else
@@ -1169 +1135 @@
         pUserInfo = (PVBOXSERVICEVMINFOUSER)RTMemAllocZ(cSessions * sizeof(VBOXSERVICEVMINFOUSER) + 1);
         if (!pUserInfo)
-            VBoxServiceError("Not enough memory to store enumerated users!\n");
+            VGSvcError("Not enough memory to store enumerated users!\n");
         else
         {
@@ -1180 +1146 @@
             for (ULONG i = 0; i < cSessions; i++)
             {
-                VBoxServiceVerbose(3, "Handling session %RU32 (of %RU32)\n", i + 1, cSessions);
+                VGSvcVerbose(3, "Handling session %RU32 (of %RU32)\n", i + 1, cSessions);
 
                 VBOXSERVICEVMINFOUSER userSession;
-                if (VBoxServiceVMInfoWinIsLoggedIn(&userSession, &paSessions[i]))
+                if (vgsvcVMInfoWinIsLoggedIn(&userSession, &paSessions[i]))
                 {
-                    VBoxServiceVerbose(4, "Handling user=%ls, domain=%ls, package=%ls, session=%RU32\n",
-                                       userSession.wszUser, userSession.wszLogonDomain, userSession.wszAuthenticationPackage,
-                                       userSession.ulLastSession);
+                    VGSvcVerbose(4, "Handling user=%ls, domain=%ls, package=%ls, session=%RU32\n",
+                                 userSession.wszUser, userSession.wszLogonDomain, userSession.wszAuthenticationPackage,
+                                 userSession.ulLastSession);
 
                     /* Retrieve assigned processes of current session. */
-                    uint32_t cCurSessionProcs = VBoxServiceVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs,
+                    uint32_t cCurSessionProcs = vgsvcVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs,
                                                                                         NULL /* Terminal session ID */);
                     /* Don't return here when current session does not have assigned processes
@@ -1201 +1167 @@
                         RTStrPrintf(szDebugSessionPath,  sizeof(szDebugSessionPath),
                                     "/VirtualBox/GuestInfo/Debug/LSA/Session/%RU32", userSession.ulLastSession);
-                        VBoxServiceWritePropF(s_uDebugGuestPropClientID, szDebugSessionPath,
-                                              "#%RU32: cSessionProcs=%RU32 (of %RU32 procs total)", s_uDebugIter, cCurSessionProcs, cProcs);
+                        VGSvcWritePropF(s_uDebugGuestPropClientID, szDebugSessionPath,
+                                        "#%RU32: cSessionProcs=%RU32 (of %RU32 procs total)",
+                                        s_uDebugIter, cCurSessionProcs, cProcs);
                     }
 
@@ -1220 +1187 @@
                             if (userSession.ulLastSession > pCurUser->ulLastSession)
                             {
-                                VBoxServiceVerbose(4, "Updating user=%ls to %u processes (last used session: %RU32)\n",
+                                VGSvcVerbose(4, "Updating user=%ls to %u processes (last used session: %RU32)\n",
                                                    pCurUser->wszUser, cCurSessionProcs, userSession.ulLastSession);
 
                                 if (!cCurSessionProcs)
-                                    VBoxServiceVerbose(3, "Stale session for user=%ls detected! Processes: %RU32 -> %RU32, Session: %RU32 -> %RU32\n",
-                                                       pCurUser->wszUser,
-                                                       pCurUser->ulNumProcs, cCurSessionProcs,
-                                                       pCurUser->ulLastSession, userSession.ulLastSession);
+                                    VGSvcVerbose(3, "Stale session for user=%ls detected! Processes: %RU32 -> %RU32, Session: %RU32 -> %RU32\n",
+                                                 pCurUser->wszUser, pCurUser->ulNumProcs, cCurSessionProcs,
+                                                 pCurUser->ulLastSession, userSession.ulLastSession);
 
                                 pCurUser->ulNumProcs = cCurSessionProcs;
@@ -1237 +1203 @@
                             else if (pCurUser->ulLastSession == userSession.ulLastSession)
                             {
-                                VBoxServiceVerbose(4, "Updating processes for user=%ls (old procs=%RU32, new procs=%RU32, session=%RU32)\n",
-                                                   pCurUser->wszUser, pCurUser->ulNumProcs, cCurSessionProcs, pCurUser->ulLastSession);
+                                VGSvcVerbose(4, "Updating processes for user=%ls (old procs=%RU32, new procs=%RU32, session=%RU32)\n",
+                                             pCurUser->wszUser, pCurUser->ulNumProcs, cCurSessionProcs, pCurUser->ulLastSession);
 
                                 pCurUser->ulNumProcs = cCurSessionProcs;
@@ -1250 +1216 @@
                     if (!fFoundUser)
                     {
-                        VBoxServiceVerbose(4, "Adding new user=%ls (session=%RU32) with %RU32 processes\n",
-                                           userSession.wszUser, userSession.ulLastSession, cCurSessionProcs);
+                        VGSvcVerbose(4, "Adding new user=%ls (session=%RU32) with %RU32 processes\n",
+                                     userSession.wszUser, userSession.ulLastSession, cCurSessionProcs);
 
                         memcpy(&pUserInfo[cUniqueUsers], &userSession, sizeof(VBOXSERVICEVMINFOUSER));
@@ -1262 +1228 @@
 
             if (g_cVerbosity > 3)
-                VBoxServiceWritePropF(s_uDebugGuestPropClientID, "/VirtualBox/GuestInfo/Debug/LSA",
-                                      "#%RU32: cSessions=%RU32, cProcs=%RU32, cUniqueUsers=%RU32",
-                                      s_uDebugIter, cSessions, cProcs, cUniqueUsers);
-
-            VBoxServiceVerbose(3, "Found %u unique logged-in user(s)\n",
-                               cUniqueUsers);
+                VGSvcWritePropF(s_uDebugGuestPropClientID, "/VirtualBox/GuestInfo/Debug/LSA",
+                                "#%RU32: cSessions=%RU32, cProcs=%RU32, cUniqueUsers=%RU32",
+                                s_uDebugIter, cSessions, cProcs, cUniqueUsers);
+
+            VGSvcVerbose(3, "Found %u unique logged-in user(s)\n", cUniqueUsers);
 
             for (ULONG i = 0; i < cUniqueUsers; i++)
@@ -1274 +1239 @@
                 {
                     char szDebugUserPath[255]; RTStrPrintf(szDebugUserPath,  sizeof(szDebugUserPath), "/VirtualBox/GuestInfo/Debug/LSA/User/%RU32", i);
-                    VBoxServiceWritePropF(s_uDebugGuestPropClientID, szDebugUserPath,
-                                          "#%RU32: szName=%ls, sessionID=%RU32, cProcs=%RU32",
-                                          s_uDebugIter, pUserInfo[i].wszUser, pUserInfo[i].ulLastSession, pUserInfo[i].ulNumProcs);
+                    VGSvcWritePropF(s_uDebugGuestPropClientID, szDebugUserPath,
+                                    "#%RU32: szName=%ls, sessionID=%RU32, cProcs=%RU32",
+                                    s_uDebugIter, pUserInfo[i].wszUser, pUserInfo[i].ulLastSession, pUserInfo[i].ulNumProcs);
                 }
 
@@ -1285 +1250 @@
                 if (fAddUser)
                 {
-                    VBoxServiceVerbose(3, "User \"%ls\" has %RU32 interactive processes (session=%RU32)\n",
-                                       pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, pUserInfo[i].ulLastSession);
+                    VGSvcVerbose(3, "User '%ls' has %RU32 interactive processes (session=%RU32)\n",
+                                 pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, pUserInfo[i].ulLastSession);
 
                     if (cUsersInList > 0)
@@ -1309 +1274 @@
                         /* Do idle detection. */
                         if (RT_SUCCESS(rc))
-                            rc = vboxServiceVMInfoWinWriteLastInput(pCache, pszUser, pszDomain);
+                            rc = vgsvcVMInfoWinWriteLastInput(pCache, pszUser, pszDomain);
                     }
                     else
@@ -1323 +1288 @@
             RTMemFree(pUserInfo);
         }
-        VBoxServiceVMInfoWinProcessesFree(cProcs, paProcs);
+        vgsvcVMInfoWinProcessesFree(cProcs, paProcs);
     }
     if (paSessions)
@@ -1341 +1306 @@
 
 
-int VBoxServiceWinGetComponentVersions(uint32_t uClientID)
+int VGSvcVMInfoWinGetComponentVersions(uint32_t uClientID)
 {
     int rc;
@@ -1409 +1374 @@
     {
         char szVer[128];
-        VBoxServiceGetFileVersionString(aVBoxFiles[i].pszFilePath, aVBoxFiles[i].pszFileName, szVer, sizeof(szVer));
+        VGSvcUtilWinGetFileVersionString(aVBoxFiles[i].pszFilePath, aVBoxFiles[i].pszFileName, szVer, sizeof(szVer));
         char szPropPath[256];
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestAdd/Components/%s", aVBoxFiles[i].pszFileName);
-        rc = VBoxServiceWritePropF(uClientID, szPropPath, "%s", szVer);
+        rc = VGSvcWritePropF(uClientID, szPropPath, "%s", szVer);
     }
 

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

@@ -125 +125 @@
 
 #ifdef VBOX_WITH_DBUS
-/** ConsoleKit defines (taken from 0.4.5). */
-#define CK_NAME      "org.freedesktop.ConsoleKit"
-#define CK_PATH      "/org/freedesktop/ConsoleKit"
-#define CK_INTERFACE "org.freedesktop.ConsoleKit"
-
-#define CK_MANAGER_PATH      "/org/freedesktop/ConsoleKit/Manager"
-#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
-#define CK_SEAT_INTERFACE    "org.freedesktop.ConsoleKit.Seat"
-#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
+/** @name ConsoleKit defines (taken from 0.4.5).
+ * @{ */
+# define CK_NAME                "org.freedesktop.ConsoleKit"
+# define CK_PATH                "/org/freedesktop/ConsoleKit"
+# define CK_INTERFACE           "org.freedesktop.ConsoleKit"
+# define CK_MANAGER_PATH        "/org/freedesktop/ConsoleKit/Manager"
+# define CK_MANAGER_INTERFACE   "org.freedesktop.ConsoleKit.Manager"
+# define CK_SEAT_INTERFACE      "org.freedesktop.ConsoleKit.Seat"
+# define CK_SESSION_INTERFACE   "org.freedesktop.ConsoleKit.Session"
+/** @} */
 #endif
 
@@ -144 +145 @@
  * @return  IPRT status code.
  */
-int VBoxServiceVMInfoSignal(void)
+int VGSvcVMInfoSignal(void)
 {
     /* Trigger a re-enumeration of all logged-in users by unblocking
@@ -155 +156 @@
 
 
-/** @copydoc VBOXSERVICE::pfnPreInit */
-static DECLCALLBACK(int) VBoxServiceVMInfoPreInit(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnPreInit}
+ */
+static DECLCALLBACK(int) vbsvcVMInfoPreInit(void)
 {
     return VINF_SUCCESS;
@@ -162 +165 @@
 
 
-/** @copydoc VBOXSERVICE::pfnOption */
-static DECLCALLBACK(int) VBoxServiceVMInfoOption(const char **ppszShort, int argc, char **argv, int *pi)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnOption}
+ */
+static DECLCALLBACK(int) vbsvcVMInfoOption(const char **ppszShort, int argc, char **argv, int *pi)
 {
     /** @todo Use RTGetOpt here. */
@@ -171 +176 @@
         /* no short options */;
     else if (!strcmp(argv[*pi], "--vminfo-interval"))
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_cMsVMInfoInterval, 1, UINT32_MAX - 1);
+        rc = VGSvcArgUInt32(argc, argv, "", pi, &g_cMsVMInfoInterval, 1, UINT32_MAX - 1);
     else if (!strcmp(argv[*pi], "--vminfo-user-idle-threshold"))
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_uVMInfoUserIdleThresholdMS, 1, UINT32_MAX - 1);
+        rc = VGSvcArgUInt32(argc, argv, "", pi, &g_uVMInfoUserIdleThresholdMS, 1, UINT32_MAX - 1);
     return rc;
 }
 
 
-/** @copydoc VBOXSERVICE::pfnInit */
-static DECLCALLBACK(int) VBoxServiceVMInfoInit(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vbsvcVMInfoInit(void)
 {
     /*
@@ -206 +211 @@
     rc = VbglR3GuestPropConnect(&g_uVMInfoGuestPropSvcClientID);
     if (RT_SUCCESS(rc))
-        VBoxServiceVerbose(3, "Property Service Client ID: %#x\n", g_uVMInfoGuestPropSvcClientID);
+        VGSvcVerbose(3, "Property Service Client ID: %#x\n", g_uVMInfoGuestPropSvcClientID);
     else
     {
@@ -213 +218 @@
         if (rc == VERR_HGCM_SERVICE_NOT_FOUND) /* Host service is not available. */
         {
-            VBoxServiceVerbose(0, "Guest property service is not available, disabling the service\n");
+            VGSvcVerbose(0, "Guest property service is not available, disabling the service\n");
             rc = VERR_SERVICE_DISABLED;
         }
         else
-            VBoxServiceError("Failed to connect to the guest property service! Error: %Rrc\n", rc);
+            VGSvcError("Failed to connect to the guest property service! Error: %Rrc\n", rc);
         RTSemEventMultiDestroy(g_hVMInfoEvent);
         g_hVMInfoEvent = NIL_RTSEMEVENTMULTI;
@@ -224 +229 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServicePropCacheCreate(&g_VMInfoPropCache, g_uVMInfoGuestPropSvcClientID);
+        VGSvcPropCacheCreate(&g_VMInfoPropCache, g_uVMInfoGuestPropSvcClientID);
 
         /*
          * Declare some guest properties with flags and reset values.
          */
-        int rc2 = VBoxServicePropCacheUpdateEntry(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsersList,
-                                                  VBOXSERVICEPROPCACHEFLAG_TEMPORARY | VBOXSERVICEPROPCACHEFLAG_TRANSIENT, NULL /* Delete on exit */);
+        int rc2 = VGSvcPropCacheUpdateEntry(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsersList,
+                                            VGSVCPROPCACHE_FLAGS_TEMPORARY | VGSVCPROPCACHE_FLAGS_TRANSIENT,
+                                            NULL /* Delete on exit */);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to init property cache value \"%s\", rc=%Rrc\n", g_pszPropCacheValLoggedInUsersList, rc2);
-
-        rc2 = VBoxServicePropCacheUpdateEntry(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsers,
-                                              VBOXSERVICEPROPCACHEFLAG_TEMPORARY | VBOXSERVICEPROPCACHEFLAG_TRANSIENT, "0");
+            VGSvcError("Failed to init property cache value '%s', rc=%Rrc\n", g_pszPropCacheValLoggedInUsersList, rc2);
+
+        rc2 = VGSvcPropCacheUpdateEntry(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsers,
+                                        VGSVCPROPCACHE_FLAGS_TEMPORARY | VGSVCPROPCACHE_FLAGS_TRANSIENT, "0");
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to init property cache value \"%s\", rc=%Rrc\n", g_pszPropCacheValLoggedInUsers, rc2);
-
-        rc2 = VBoxServicePropCacheUpdateEntry(&g_VMInfoPropCache, g_pszPropCacheValNoLoggedInUsers,
-                                              VBOXSERVICEPROPCACHEFLAG_TEMPORARY | VBOXSERVICEPROPCACHEFLAG_TRANSIENT, "true");
+            VGSvcError("Failed to init property cache value '%s', rc=%Rrc\n", g_pszPropCacheValLoggedInUsers, rc2);
+
+        rc2 = VGSvcPropCacheUpdateEntry(&g_VMInfoPropCache, g_pszPropCacheValNoLoggedInUsers,
+                                        VGSVCPROPCACHE_FLAGS_TEMPORARY | VGSVCPROPCACHE_FLAGS_TRANSIENT, "true");
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to init property cache value \"%s\", rc=%Rrc\n", g_pszPropCacheValNoLoggedInUsers, rc2);
-
-        rc2 = VBoxServicePropCacheUpdateEntry(&g_VMInfoPropCache, g_pszPropCacheValNetCount,
-                                              VBOXSERVICEPROPCACHEFLAG_TEMPORARY | VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE, NULL /* Delete on exit */);
+            VGSvcError("Failed to init property cache value '%s', rc=%Rrc\n", g_pszPropCacheValNoLoggedInUsers, rc2);
+
+        rc2 = VGSvcPropCacheUpdateEntry(&g_VMInfoPropCache, g_pszPropCacheValNetCount,
+                                        VGSVCPROPCACHE_FLAGS_TEMPORARY | VGSVCPROPCACHE_FLAGS_ALWAYS_UPDATE,
+                                        NULL /* Delete on exit */);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Failed to init property cache value \"%s\", rc=%Rrc\n", g_pszPropCacheValNetCount, rc2);
+            VGSvcError("Failed to init property cache value '%s', rc=%Rrc\n", g_pszPropCacheValNetCount, rc2);
 
         /*
@@ -254 +261 @@
          */
         char *pszValue;
-        rc2 = VBoxServiceReadHostProp(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--vminfo-user-idle-threshold", true /* Read only */,
-                                      &pszValue, NULL /* Flags */, NULL /* Timestamp */);
+        rc2 = VGSvcReadHostProp(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--vminfo-user-idle-threshold",
+                                true /* Read only */, &pszValue, NULL /* Flags */, NULL /* Timestamp */);
         if (RT_SUCCESS(rc2))
         {
@@ -276 +283 @@
  * @param   puTimestamp             Timestamp of property to retrieve. Optional.
  */
-static int vboxServiceGetLAClientValue(uint32_t uClientID, const char *pszProperty,
-                                       char **ppszValue, uint64_t *puTimestamp)
+static int vgsvcGetLAClientValue(uint32_t uClientID, const char *pszProperty, char **ppszValue, uint64_t *puTimestamp)
 {
     AssertReturn(uClientID, VERR_INVALID_PARAMETER);
@@ -285 +291 @@
 
     char pszClientPath[255];
+/** @todo r=bird: Another pointless RTStrPrintf test with wrong status code to boot. */
     if (RTStrPrintf(pszClientPath, sizeof(pszClientPath),
                     "/VirtualBox/HostInfo/VRDP/Client/%RU32/%s", uClientID, pszProperty))
     {
-        rc = VBoxServiceReadHostProp(g_uVMInfoGuestPropSvcClientID, pszClientPath, true /* Read only */,
-                                     ppszValue, NULL /* Flags */, puTimestamp);
+        rc = VGSvcReadHostProp(g_uVMInfoGuestPropSvcClientID, pszClientPath, true /* Read only */,
+                               ppszValue, NULL /* Flags */, puTimestamp);
     }
     else
@@ -306 +313 @@
  * @param   pClient                 Pointer where to store the client information.
  */
-static int vboxServiceGetLAClientInfo(uint32_t uClientID, PVBOXSERVICELACLIENTINFO pClient)
+static int vgsvcGetLAClientInfo(uint32_t uClientID, PVBOXSERVICELACLIENTINFO pClient)
 {
     AssertReturn(uClientID, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pClient, VERR_INVALID_POINTER);
 
-    int rc = vboxServiceGetLAClientValue(uClientID, "Name", &pClient->pszName,
+    int rc = vgsvcGetLAClientValue(uClientID, "Name", &pClient->pszName,
                                          NULL /* Timestamp */);
     if (RT_SUCCESS(rc))
     {
         char *pszAttach;
-        rc = vboxServiceGetLAClientValue(uClientID, "Attach", &pszAttach,
-                                         &pClient->uAttachedTS);
+        rc = vgsvcGetLAClientValue(uClientID, "Attach", &pszAttach, &pClient->uAttachedTS);
         if (RT_SUCCESS(rc))
         {
             AssertPtr(pszAttach);
-            pClient->fAttached = !RTStrICmp(pszAttach, "1") ? true : false;
+            pClient->fAttached = RTStrICmp(pszAttach, "1") == 0;
 
             RTStrFree(pszAttach);
@@ -327 +333 @@
     }
     if (RT_SUCCESS(rc))
-        rc = vboxServiceGetLAClientValue(uClientID, "Location", &pClient->pszLocation,
-                                         NULL /* Timestamp */);
+        rc = vgsvcGetLAClientValue(uClientID, "Location", &pClient->pszLocation, NULL /* Timestamp */);
     if (RT_SUCCESS(rc))
-        rc = vboxServiceGetLAClientValue(uClientID, "Domain", &pClient->pszDomain,
-                                         NULL /* Timestamp */);
+        rc = vgsvcGetLAClientValue(uClientID, "Domain", &pClient->pszDomain, NULL /* Timestamp */);
     if (RT_SUCCESS(rc))
         pClient->uID = uClientID;
@@ -344 +348 @@
  * @param   pClient                 Pointer to client information structure to free.
  */
-static void vboxServiceFreeLAClientInfo(PVBOXSERVICELACLIENTINFO pClient)
+static void vgsvcFreeLAClientInfo(PVBOXSERVICELACLIENTINFO pClient)
 {
     if (pClient)
@@ -378 +382 @@
  *                                  the property.
  */
-int vboxServiceUserUpdateF(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
-                           const char *pszKey, const char *pszValueFormat, ...)
+int VGSvcUserUpdateF(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
+                     const char *pszKey, const char *pszValueFormat, ...)
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
@@ -392 +396 @@
     if (pszDomain)
     {
+/** @todo r=bird: RTStrAPrintf returns -1, not zero on failure!   */
         if (!RTStrAPrintf(&pszName, "%s%s@%s/%s", g_pszPropCacheValUser, pszUser, pszDomain, pszKey))
             rc = VERR_NO_MEMORY;
@@ -397 +402 @@
     else
     {
+/** @todo r=bird: RTStrAPrintf returns -1, not zero on failure! You got it
+ *        right 5 lines further down... */
         if (!RTStrAPrintf(&pszName, "%s%s/%s", g_pszPropCacheValUser, pszUser, pszKey))
             rc = VERR_NO_MEMORY;
@@ -416 +423 @@
 
     if (RT_SUCCESS(rc))
-        rc = VBoxServicePropCacheUpdate(pCache, pszName, pszValue);
+        rc = VGSvcPropCacheUpdate(pCache, pszName, pszValue);
     if (rc == VINF_SUCCESS) /* VBoxServicePropCacheUpdate will also return VINF_NO_CHANGE. */
     {
         /** @todo Combine updating flags w/ updating the actual value. */
-        rc = VBoxServicePropCacheUpdateEntry(pCache, pszName,
-                                             VBOXSERVICEPROPCACHEFLAG_TEMPORARY | VBOXSERVICEPROPCACHEFLAG_TRANSIENT,
-                                             NULL /* Delete on exit */);
+        rc = VGSvcPropCacheUpdateEntry(pCache, pszName,
+                                       VGSVCPROPCACHE_FLAGS_TEMPORARY | VGSVCPROPCACHE_FLAGS_TRANSIENT,
+                                       NULL /* Delete on exit */);
     }
 
@@ -436 +443 @@
  * Errors are ignored.
  */
-static void vboxserviceVMInfoWriteFixedProperties(void)
+static void vgsvcVMInfoWriteFixedProperties(void)
 {
     /*
@@ -443 +450 @@
     char szInfo[256];
     int rc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szInfo, sizeof(szInfo));
-    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/Product",
-                          "%s", RT_FAILURE(rc) ? "" : szInfo);
+    VGSvcWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/Product",
+                    "%s", RT_FAILURE(rc) ? "" : szInfo);
 
     rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szInfo, sizeof(szInfo));
-    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/Release",
-                          "%s", RT_FAILURE(rc) ? "" : szInfo);
+    VGSvcWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/Release",
+                    "%s", RT_FAILURE(rc) ? "" : szInfo);
 
     rc = RTSystemQueryOSInfo(RTSYSOSINFO_VERSION, szInfo, sizeof(szInfo));
-    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/Version",
-                          "%s", RT_FAILURE(rc) ? "" : szInfo);
+    VGSvcWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/Version",
+                    "%s", RT_FAILURE(rc) ? "" : szInfo);
 
     rc = RTSystemQueryOSInfo(RTSYSOSINFO_SERVICE_PACK, szInfo, sizeof(szInfo));
-    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/ServicePack",
-                          "%s", RT_FAILURE(rc) ? "" : szInfo);
+    VGSvcWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/ServicePack",
+                    "%s", RT_FAILURE(rc) ? "" : szInfo);
 
     /*
@@ -465 +472 @@
     char *pszAddRev;
     rc = VbglR3GetAdditionsVersion(&pszAddVer, &pszAddVerExt, &pszAddRev);
-    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Version",
-                          "%s", RT_FAILURE(rc) ? "" : pszAddVer);
-    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/VersionExt",
-                          "%s", RT_FAILURE(rc) ? "" : pszAddVerExt);
-    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Revision",
-                          "%s", RT_FAILURE(rc) ? "" : pszAddRev);
+    VGSvcWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Version",
+                    "%s", RT_FAILURE(rc) ? "" : pszAddVer);
+    VGSvcWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/VersionExt",
+                    "%s", RT_FAILURE(rc) ? "" : pszAddVerExt);
+    VGSvcWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Revision",
+                    "%s", RT_FAILURE(rc) ? "" : pszAddRev);
     if (RT_SUCCESS(rc))
     {
@@ -484 +491 @@
     char *pszInstDir;
     rc = VbglR3GetAdditionsInstallationPath(&pszInstDir);
-    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/InstallDir",
-                          "%s", RT_FAILURE(rc) ? "" :  pszInstDir);
+    VGSvcWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/InstallDir",
+                    "%s", RT_FAILURE(rc) ? "" :  pszInstDir);
     if (RT_SUCCESS(rc))
         RTStrFree(pszInstDir);
 
-    VBoxServiceWinGetComponentVersions(g_uVMInfoGuestPropSvcClientID);
+    VGSvcVMInfoWinGetComponentVersions(g_uVMInfoGuestPropSvcClientID);
 #endif
 }
+
 
 #if defined(VBOX_WITH_DBUS) && defined(RT_OS_LINUX) /* Not yet for Solaris/FreeBSB. */
@@ -497 +505 @@
  * Simple wrapper to work around compiler-specific va_list madness.
  */
-static dbus_bool_t vboxService_dbus_message_get_args(DBusMessage *message,
-                                                     DBusError   *error,
-                                                     int first_arg_type,
-                                                     ...)
+static dbus_bool_t vboxService_dbus_message_get_args(DBusMessage *message, DBusError *error, int first_arg_type, ...)
 {
     va_list va;
     va_start(va, first_arg_type);
-    dbus_bool_t ret = dbus_message_get_args_valist(message, error,
-                                                   first_arg_type, va);
+    dbus_bool_t ret = dbus_message_get_args_valist(message, error, first_arg_type, va);
     va_end(va);
     return ret;
@@ -511 +515 @@
 #endif
 
+
 /**
  * Provide information about active users.
  */
-static int vboxserviceVMInfoWriteUsers(void)
+static int vgsvcVMInfoWriteUsers(void)
 {
-    int rc = VINF_SUCCESS;
+    int rc;
     char *pszUserList = NULL;
     uint32_t cUsersInList = 0;
@@ -522 +527 @@
 #ifdef RT_OS_WINDOWS
 # ifndef TARGET_NT4
-    rc = VBoxServiceVMInfoWinWriteUsers(&g_VMInfoPropCache,
-                                        &pszUserList, &cUsersInList);
+    rc = VGSvcVMInfoWinWriteUsers(&g_VMInfoPropCache, &pszUserList, &cUsersInList);
 # else
     rc = VERR_NOT_IMPLEMENTED;
@@ -549 +553 @@
     /* Allocate a first array to hold 32 users max. */
     char **papszUsers = (char **)RTMemAllocZ(cListSize * sizeof(char *));
-    if (!papszUsers)
+    if (papszUsers)
+        rc = VINF_SUCCESS;
+    else
         rc = VERR_NO_MEMORY;
 
@@ -558 +564 @@
     {
 # ifdef RT_OS_DARWIN /* No ut_user->ut_session on Darwin */
-        VBoxServiceVerbose(4, "Found entry \"%s\" (type: %d, PID: %RU32)\n",
-                           ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid);
+        VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32)\n", ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid);
 # else
-        VBoxServiceVerbose(4, "Found entry \"%s\" (type: %d, PID: %RU32, session: %RU32)\n",
-                           ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid, ut_user->ut_session);
+        VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32, session: %RU32)\n",
+                     ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid, ut_user->ut_session);
 # endif
         if (cUsersInList > cListSize)
@@ -582 +587 @@
             if (!fFound)
             {
-                VBoxServiceVerbose(4, "Adding user \"%s\" (type: %d) to list\n",
-                                   ut_user->ut_user, ut_user->ut_type);
+                VGSvcVerbose(4, "Adding user '%s' (type: %d) to list\n", ut_user->ut_user, ut_user->ut_type);
 
                 rc = RTStrDupEx(&papszUsers[cUsersInList], (const char *)ut_user->ut_user);
@@ -602 +606 @@
     {
         /* Handle desktop sessions using ConsoleKit. */
-        VBoxServiceVerbose(4, "Checking ConsoleKit sessions ...\n");
+        VGSvcVerbose(4, "Checking ConsoleKit sessions ...\n");
         fHaveLibDbus = true;
         dbus_error_init(&dbErr);
@@ -612 +616 @@
     {
         /* Get all available sessions. */
+/** @todo r=bird: What's the point of hardcoding things here when we've taken the pain of defining CK_XXX constants at the top of the file (or vice versa)? */
         DBusMessage *pMsgSessions = dbus_message_new_method_call("org.freedesktop.ConsoleKit",
                                                                  "/org/freedesktop/ConsoleKit/Manager",
@@ -617 +622 @@
                                                                  "GetSessions");
         if (   pMsgSessions
-            && (dbus_message_get_type(pMsgSessions) == DBUS_MESSAGE_TYPE_METHOD_CALL))
+            && dbus_message_get_type(pMsgSessions) == DBUS_MESSAGE_TYPE_METHOD_CALL)
         {
             DBusMessage *pReplySessions = dbus_connection_send_with_reply_and_block(pConnection,
@@ -625 +630 @@
                 && !dbus_error_is_set(&dbErr))
             {
-                char **ppszSessions; int cSessions;
-                if (   (dbus_message_get_type(pMsgSessions) == DBUS_MESSAGE_TYPE_METHOD_CALL)
+                char **ppszSessions;
+                int cSessions;
+                if (   dbus_message_get_type(pMsgSessions) == DBUS_MESSAGE_TYPE_METHOD_CALL
                     && vboxService_dbus_message_get_args(pReplySessions, &dbErr, DBUS_TYPE_ARRAY,
                                                          DBUS_TYPE_OBJECT_PATH, &ppszSessions, &cSessions,
                                                          DBUS_TYPE_INVALID /* Termination */))
                 {
-                    VBoxServiceVerbose(4, "ConsoleKit: retrieved %RU16 session(s)\n", cSessions);
+                    VGSvcVerbose(4, "ConsoleKit: retrieved %RU16 session(s)\n", cSessions);
 
                     char **ppszCurSession = ppszSessions;
-                    for (ppszCurSession;
-                         ppszCurSession && *ppszCurSession; ppszCurSession++)
+                    for (ppszCurSession; ppszCurSession && *ppszCurSession; ppszCurSession++)
                     {
-                        VBoxServiceVerbose(4, "ConsoleKit: processing session '%s' ...\n", *ppszCurSession);
+                        VGSvcVerbose(4, "ConsoleKit: processing session '%s' ...\n", *ppszCurSession);
 
                         /* Only respect active sessions .*/
@@ -649 +654 @@
                         {
                             DBusMessage *pReplySessionActive = dbus_connection_send_with_reply_and_block(pConnection,
-                                                                                                         pMsgSessionActive, 30 * 1000 /* 30s timeout */,
+                                                                                                         pMsgSessionActive,
+                                                                                                         30 * 1000 /*sec*/,
                                                                                                          &dbErr);
                             if (   pReplySessionActive
@@ -672 +678 @@
                         }
 
-                        VBoxServiceVerbose(4, "ConsoleKit: session '%s' is %s\n",
+                        VGSvcVerbose(4, "ConsoleKit: session '%s' is %s\n",
                                            *ppszCurSession, fActive ? "active" : "not active");
 
@@ -686 +692 @@
                         {
                             DBusMessage *pReplyUnixUser = dbus_connection_send_with_reply_and_block(pConnection,
-                                                                                                    pMsgUnixUser, 30 * 1000 /* 30s timeout */,
+                                                                                                    pMsgUnixUser,
+                                                                                                    30 * 1000 /* 30s timeout */,
                                                                                                     &dbErr);
                             if (   pReplyUnixUser
@@ -711 +718 @@
                                         if (ppwEntry->pw_uid >= uid_min /* Only respect users, not daemons etc. */)
                                         {
-                                            VBoxServiceVerbose(4, "ConsoleKit: session '%s' -> %s (uid: %RU32)\n",
-                                                               *ppszCurSession, ppwEntry->pw_name, uid);
+                                            VGSvcVerbose(4, "ConsoleKit: session '%s' -> %s (uid: %RU32)\n",
+                                                         *ppszCurSession, ppwEntry->pw_name, uid);
 
                                             bool fFound = false;
@@ -720 +727 @@
                                             if (!fFound)
                                             {
-                                                VBoxServiceVerbose(4, "ConsoleKit: adding user \"%s\" to list\n",
-                                                                   ppwEntry->pw_name);
+                                                VGSvcVerbose(4, "ConsoleKit: adding user '%s' to list\n", ppwEntry->pw_name);
 
                                                 rc = RTStrDupEx(&papszUsers[cUsersInList], (const char *)ppwEntry->pw_name);
@@ -732 +738 @@
                                     }
                                     else
-                                        VBoxServiceError("ConsoleKit: unable to lookup user name for uid=%RU32\n", uid);
+                                        VGSvcError("ConsoleKit: unable to lookup user name for uid=%RU32\n", uid);
                                 }
                                 else
@@ -747 +753 @@
                             {
                                 s_iBitchedAboutConsoleKit++;
-                                VBoxServiceError("ConsoleKit: unable to retrieve user for session '%s' (msg type=%d): %s\n",
-                                                 *ppszCurSession, dbus_message_get_type(pMsgUnixUser),
-                                                 dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
+                                VGSvcError("ConsoleKit: unable to retrieve user for session '%s' (msg type=%d): %s\n",
+                                           *ppszCurSession, dbus_message_get_type(pMsgUnixUser),
+                                           dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
                             }
                         }
@@ -760 +766 @@
                 }
                 else
-                {
-                    VBoxServiceError("ConsoleKit: unable to retrieve session parameters (msg type=%d): %s\n",
-                                     dbus_message_get_type(pMsgSessions),
-                                     dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
-                }
+                    VGSvcError("ConsoleKit: unable to retrieve session parameters (msg type=%d): %s\n",
+                               dbus_message_get_type(pMsgSessions),
+                               dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
                 dbus_message_unref(pReplySessions);
             }
@@ -780 +784 @@
             {
                 s_iBitchedAboutConsoleKit++;
-                VBoxServiceError("Unable to invoke ConsoleKit (%d/3) -- maybe not installed / used? Error: %s\n",
-                                 s_iBitchedAboutConsoleKit,
-                                 dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
+                VGSvcError("Unable to invoke ConsoleKit (%d/3) -- maybe not installed / used? Error: %s\n",
+                           s_iBitchedAboutConsoleKit,
+                           dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
             }
         }
@@ -795 +799 @@
         {
             s_iBitchedAboutDBus++;
-            VBoxServiceError("Unable to connect to system D-Bus (%d/3): %s\n", s_iBitchedAboutDBus,
-                             fHaveLibDbus && dbus_error_is_set(&dbErr) ? dbErr.message : "D-Bus not installed");
+            VGSvcError("Unable to connect to system D-Bus (%d/3): %s\n", s_iBitchedAboutDBus,
+                       fHaveLibDbus && dbus_error_is_set(&dbErr) ? dbErr.message : "D-Bus not installed");
         }
     }
@@ -811 +815 @@
     size_t cchUserList = 0;
     if (RT_SUCCESS(rc))
-    {
         for (uint32_t i = 0; i < cUsersInList; i++)
             cchUserList += (i != 0) + strlen(papszUsers[i]);
-    }
 
     /* Build the user list. */
@@ -846 +848 @@
     Assert(RT_FAILURE(rc) || cUsersInList == 0 || (pszUserList && *pszUserList));
 
-    /* If the user enumeration above failed, reset the user count to 0 except
+    /*
+     * If the user enumeration above failed, reset the user count to 0 except
      * we didn't have enough memory anymore. In that case we want to preserve
      * the previous user count in order to not confuse third party tools which
-     * rely on that count. */
+     * rely on that count.
+     */
     if (RT_FAILURE(rc))
     {
@@ -856 +860 @@
             static int s_iVMInfoBitchedOOM = 0;
             if (s_iVMInfoBitchedOOM++ < 3)
-                VBoxServiceVerbose(0, "Warning: Not enough memory available to enumerate users! Keeping old value (%RU32)\n",
-                                   g_cVMInfoLoggedInUsers);
+                VGSvcVerbose(0, "Warning: Not enough memory available to enumerate users! Keeping old value (%RU32)\n",
+                             g_cVMInfoLoggedInUsers);
             cUsersInList = g_cVMInfoLoggedInUsers;
         }
@@ -866 +870 @@
         g_cVMInfoLoggedInUsers = cUsersInList;
 
-    VBoxServiceVerbose(4, "cUsersInList=%RU32, pszUserList=%s, rc=%Rrc\n",
-                       cUsersInList, pszUserList ? pszUserList : "<NULL>", rc);
+    VGSvcVerbose(4, "cUsersInList=%RU32, pszUserList=%s, rc=%Rrc\n", cUsersInList, pszUserList ? pszUserList : "<NULL>", rc);
 
     if (pszUserList)
     {
         AssertMsg(cUsersInList, ("pszUserList contains users whereas cUsersInList is 0\n"));
-        rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsersList, "%s", pszUserList);
+        rc = VGSvcPropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsersList, "%s", pszUserList);
     }
     else
-        rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsersList, NULL);
+        rc = VGSvcPropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsersList, NULL);
     if (RT_FAILURE(rc))
-        VBoxServiceError("Error writing logged in users list, rc=%Rrc\n", rc);
-
-    rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsers, "%RU32", cUsersInList);
+        VGSvcError("Error writing logged in users list, rc=%Rrc\n", rc);
+
+    rc = VGSvcPropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValLoggedInUsers, "%RU32", cUsersInList);
     if (RT_FAILURE(rc))
-        VBoxServiceError("Error writing logged in users count, rc=%Rrc\n", rc);
-
-    rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValNoLoggedInUsers,
-                                    cUsersInList == 0 ? "true" : "false");
+        VGSvcError("Error writing logged in users count, rc=%Rrc\n", rc);
+
+    rc = VGSvcPropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValNoLoggedInUsers, cUsersInList == 0 ? "true" : "false");
     if (RT_FAILURE(rc))
-        VBoxServiceError("Error writing no logged in users beacon, rc=%Rrc\n", rc);
+        VGSvcError("Error writing no logged in users beacon, rc=%Rrc\n", rc);
 
     if (pszUserList)
         RTStrFree(pszUserList);
 
-    VBoxServiceVerbose(4, "Writing users returned with rc=%Rrc\n", rc);
+    VGSvcVerbose(4, "Writing users returned with rc=%Rrc\n", rc);
     return rc;
 }
@@ -899 +901 @@
  * Provide information about the guest network.
  */
-static int vboxserviceVMInfoWriteNetwork(void)
+static int vgsvcVMInfoWriteNetwork(void)
 {
     int         rc = VINF_SUCCESS;
@@ -913 +915 @@
     if (!pAdpInfo)
     {
-        VBoxServiceError("VMInfo/Network: Failed to allocate IP_ADAPTER_INFO\n");
+        VGSvcError("VMInfo/Network: Failed to allocate IP_ADAPTER_INFO\n");
         return VERR_NO_MEMORY;
     }
@@ -928 +930 @@
     else if (dwRet == ERROR_NO_DATA)
     {
-        VBoxServiceVerbose(3, "VMInfo/Network: No network adapters available\n");
+        VGSvcVerbose(3, "VMInfo/Network: No network adapters available\n");
 
         /* If no network adapters available / present in the
@@ -939 +941 @@
         if (pAdpInfo)
             RTMemFree(pAdpInfo);
-        VBoxServiceError("VMInfo/Network: Failed to get adapter info: Error %d\n", dwRet);
+        VGSvcError("VMInfo/Network: Failed to get adapter info: Error %d\n", dwRet);
         return RTErrConvertFromWin32(dwRet);
     }
@@ -952 +954 @@
         if (WSAENETDOWN == wsaErr)
         {
-            VBoxServiceVerbose(0, "VMInfo/Network: Network is not up yet.\n");
+            VGSvcVerbose(0, "VMInfo/Network: Network is not up yet.\n");
             wsaErr = VINF_SUCCESS;
         }
         else
-            VBoxServiceError("VMInfo/Network: Failed to get a socket: Error %d\n", wsaErr);
+            VGSvcError("VMInfo/Network: Failed to get a socket: Error %d\n", wsaErr);
         if (pAdpInfo)
             RTMemFree(pAdpInfo);
@@ -993 +995 @@
         == SOCKET_ERROR)
     {
-        VBoxServiceError("VMInfo/Network: Failed to WSAIoctl() on socket: Error: %d\n", WSAGetLastError());
+        VGSvcError("VMInfo/Network: Failed to WSAIoctl() on socket: Error: %d\n", WSAGetLastError());
         if (pAdpInfo)
             RTMemFree(pAdpInfo);
@@ -1013 +1015 @@
         RTStrPrintf(szIp, sizeof(szIp), "%s", inet_ntoa(pAddress->sin_addr));
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/V4/IP", cIfsReported);
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szIp);
+        VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szIp);
 
         pAddress = (sockaddr_in *) & (aInterfaces[i].iiBroadcastAddress);
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/V4/Broadcast", cIfsReported);
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
+        VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
 
         pAddress = (sockaddr_in *)&(aInterfaces[i].iiNetmask);
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/V4/Netmask", cIfsReported);
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
+        VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
 
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Status", cIfsReported);
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, nFlags & IFF_UP ? "Up" : "Down");
+        VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, nFlags & IFF_UP ? "Up" : "Down");
 
 # ifndef TARGET_NT4
@@ -1039 +1041 @@
                         pAdp->Address[0], pAdp->Address[1], pAdp->Address[2],
                         pAdp->Address[3], pAdp->Address[4], pAdp->Address[5]);
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szMac);
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szMac);
         }
         else
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, NULL);
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, NULL);
 # endif /* !TARGET_NT4 */
 
@@ -1064 +1066 @@
     {
         rc = RTErrConvertFromErrno(errno);
-        VBoxServiceError("VMInfo/Network: Failed to get all interfaces: Error %Rrc\n");
+        VGSvcError("VMInfo/Network: Failed to get all interfaces: Error %Rrc\n");
         return rc;
     }
@@ -1084 +1086 @@
                         szInetAddr, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
             RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/V4/IP", cIfsReported);
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szInetAddr);
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szInetAddr);
 
             memset(szInetAddr, 0, NI_MAXHOST);
@@ -1090 +1092 @@
                         szInetAddr, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
             RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/V4/Broadcast", cIfsReported);
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szInetAddr);
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szInetAddr);
 
             memset(szInetAddr, 0, NI_MAXHOST);
@@ -1096 +1098 @@
                         szInetAddr, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
             RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/V4/Netmask", cIfsReported);
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szInetAddr);
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szInetAddr);
 
             /* Search for the AF_LINK interface of the current AF_INET one and get the mac. */
@@ -1113 +1115 @@
                                 pu8Mac[0], pu8Mac[1], pu8Mac[2], pu8Mac[3],  pu8Mac[4], pu8Mac[5]);
                     RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/MAC", cIfsReported);
-                    VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szMac);
+                    VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szMac);
                     break;
                 }
@@ -1119 +1121 @@
 
             RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Status", cIfsReported);
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, pIfCurr->ifa_flags & IFF_UP ? "Up" : "Down");
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, pIfCurr->ifa_flags & IFF_UP ? "Up" : "Down");
 
             cIfsReported++;
@@ -1139 +1141 @@
     {
         rc = RTErrConvertFromErrno(errno);
-        VBoxServiceError("VMInfo/Network: Failed to get a socket: Error %Rrc\n", rc);
+        VGSvcError("VMInfo/Network: Failed to get a socket: Error %Rrc\n", rc);
         return rc;
     }
@@ -1182 +1184 @@
         close(sd);
         RTMemTmpFree(pchBuf);
-        VBoxServiceError("VMInfo/Network: Error doing SIOCGIFCONF (cbBuf=%d): %Rrc\n", cbBuf, rc);
+        VGSvcError("VMInfo/Network: Error doing SIOCGIFCONF (cbBuf=%d): %Rrc\n", cbBuf, rc);
         return rc;
     }
@@ -1237 +1239 @@
             {
                 rc = RTErrConvertFromErrno(errno);
-                VBoxServiceError("VMInfo/Network: Failed to ioctl(SIOCGIFFLAGS,%s) on socket: Error %Rrc\n", pCur->ifr_name, rc);
+                VGSvcError("VMInfo/Network: Failed to ioctl(SIOCGIFFLAGS,%s) on socket: Error %Rrc\n", pCur->ifr_name, rc);
                 break;
             }
@@ -1250 +1252 @@
             sockaddr_in *pAddress = (sockaddr_in *)&pCur->ifr_addr;
             strcpy(&szPropPath[offSubProp], "/V4/IP");
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
 
             /* Get the broadcast address. */
@@ -1257 +1259 @@
             {
                 rc = RTErrConvertFromErrno(errno);
-                VBoxServiceError("VMInfo/Network: Failed to ioctl(SIOCGIFBRDADDR) on socket: Error %Rrc\n", rc);
+                VGSvcError("VMInfo/Network: Failed to ioctl(SIOCGIFBRDADDR) on socket: Error %Rrc\n", rc);
                 break;
             }
             pAddress = (sockaddr_in *)&IfReqTmp.ifr_broadaddr;
             strcpy(&szPropPath[offSubProp], "/V4/Broadcast");
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
 
             /* Get the net mask. */
@@ -1269 +1271 @@
             {
                 rc = RTErrConvertFromErrno(errno);
-                VBoxServiceError("VMInfo/Network: Failed to ioctl(SIOCGIFNETMASK) on socket: Error %Rrc\n", rc);
+                VGSvcError("VMInfo/Network: Failed to ioctl(SIOCGIFNETMASK) on socket: Error %Rrc\n", rc);
                 break;
             }
@@ -1278 +1280 @@
 # endif
             strcpy(&szPropPath[offSubProp], "/V4/Netmask");
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
 
 # if defined(RT_OS_SOLARIS)
@@ -1304 +1306 @@
                 {
                     rc = RTErrConvertFromErrno(errno);
-                    VBoxServiceError("VMInfo/Network: failed to ioctl(SIOCGARP) on socket: Error %Rrc\n", rc);
+                    VGSvcError("VMInfo/Network: failed to ioctl(SIOCGARP) on socket: Error %Rrc\n", rc);
                     break;
                 }
@@ -1310 +1312 @@
             else
             {
-                VBoxServiceVerbose(2, "VMInfo/Network: Interface \"%s\" has no assigned IP address, skipping ...\n", pCur->ifr_name);
+                VGSvcVerbose(2, "VMInfo/Network: Interface '%s' has no assigned IP address, skipping ...\n", pCur->ifr_name);
                 continue;
             }
@@ -1327 +1329 @@
             {
                 rc = RTErrConvertFromErrno(errno);
-                VBoxServiceError("VMInfo/Network: Failed to ioctl(SIOCGIFHWADDR) on socket: Error %Rrc\n", rc);
+                VGSvcError("VMInfo/Network: Failed to ioctl(SIOCGIFHWADDR) on socket: Error %Rrc\n", rc);
                 break;
             }
@@ -1333 +1335 @@
 # endif
             strcpy(&szPropPath[offSubProp], "/MAC");
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%02X%02X%02X%02X%02X%02X",
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%02X%02X%02X%02X%02X%02X",
                                        IfMac.au8[0], IfMac.au8[1], IfMac.au8[2], IfMac.au8[3], IfMac.au8[4], IfMac.au8[5]);
 
             strcpy(&szPropPath[offSubProp], "/Status");
-            VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, fIfUp ? "Up" : "Down");
+            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, fIfUp ? "Up" : "Down");
 
             /* The name. */
@@ -1344 +1346 @@
             {
                 strcpy(&szPropPath[offSubProp], "/Name");
-                VBoxServicePropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%.*s", sizeof(pCur->ifr_name), pCur->ifr_name);
+                VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%.*s", sizeof(pCur->ifr_name), pCur->ifr_name);
             }
 
@@ -1360 +1362 @@
     close(sd);
     if (RT_FAILURE(rc))
-        VBoxServiceError("VMInfo/Network: Network enumeration for interface %RU32 failed with error %Rrc\n", cIfsReported, rc);
+        VGSvcError("VMInfo/Network: Network enumeration for interface %RU32 failed with error %Rrc\n", cIfsReported, rc);
 
 #endif /* !RT_OS_WINDOWS */
@@ -1372 +1374 @@
     /* Get former count. */
     uint32_t cIfsReportedOld;
-    rc = VBoxServiceReadPropUInt32(g_uVMInfoGuestPropSvcClientID, g_pszPropCacheValNetCount, &cIfsReportedOld,
-                                   0 /* Min */, UINT32_MAX /* Max */);
+    rc = VGSvcReadPropUInt32(g_uVMInfoGuestPropSvcClientID, g_pszPropCacheValNetCount, &cIfsReportedOld,
+                             0 /* Min */, UINT32_MAX /* Max */);
     if (   RT_SUCCESS(rc)
         && cIfsReportedOld > cIfsReported) /* Are some ifaces not around anymore? */
     {
-        VBoxServiceVerbose(3, "VMInfo/Network: Stale interface data detected (%RU32 old vs. %RU32 current)\n",
-                           cIfsReportedOld, cIfsReported);
+        VGSvcVerbose(3, "VMInfo/Network: Stale interface data detected (%RU32 old vs. %RU32 current)\n",
+                     cIfsReportedOld, cIfsReported);
 
         uint32_t uIfaceDeleteIdx = cIfsReported;
         do
         {
-            VBoxServiceVerbose(3, "VMInfo/Network: Deleting stale data of interface %d ...\n", uIfaceDeleteIdx);
-            rc = VBoxServicePropCacheUpdateByPath(&g_VMInfoPropCache, NULL /* Value, delete */, 0 /* Flags */, "/VirtualBox/GuestInfo/Net/%RU32", uIfaceDeleteIdx++);
+            VGSvcVerbose(3, "VMInfo/Network: Deleting stale data of interface %d ...\n", uIfaceDeleteIdx);
+            rc = VGSvcPropCacheUpdateByPath(&g_VMInfoPropCache, NULL /* Value, delete */, 0 /* Flags */, "/VirtualBox/GuestInfo/Net/%RU32", uIfaceDeleteIdx++);
         } while (RT_SUCCESS(rc));
     }
@@ -1390 +1392 @@
              && rc != VERR_NOT_FOUND)
     {
-        VBoxServiceError("VMInfo/Network: Failed retrieving old network interfaces count with error %Rrc\n", rc);
+        VGSvcError("VMInfo/Network: Failed retrieving old network interfaces count with error %Rrc\n", rc);
     }
 #endif
@@ -1399 +1401 @@
      * properties are no longer valid.
      */
-    VBoxServicePropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValNetCount, "%RU32",
-                               cIfsReported);
+    VGSvcPropCacheUpdate(&g_VMInfoPropCache, g_pszPropCacheValNetCount, "%RU32", cIfsReported);
 
     /* Don't fail here; just report everything we got. */
@@ -1407 +1408 @@
 
 
-/** @copydoc VBOXSERVICE::pfnWorker */
-DECLCALLBACK(int) VBoxServiceVMInfoWorker(bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vbsvcVMInfoWorker(bool volatile *pfShutdown)
 {
     int rc;
@@ -1422 +1425 @@
     WSADATA wsaData;
     if (WSAStartup(MAKEWORD(2, 2), &wsaData))
-        VBoxServiceError("VMInfo/Network: WSAStartup failed! Error: %Rrc\n", RTErrConvertFromWin32(WSAGetLastError()));
+        VGSvcError("VMInfo/Network: WSAStartup failed! Error: %Rrc\n", RTErrConvertFromWin32(WSAGetLastError()));
 #endif /* RT_OS_WINDOWS */
 
@@ -1428 +1431 @@
      * Write the fixed properties first.
      */
-    vboxserviceVMInfoWriteFixedProperties();
+    vgsvcVMInfoWriteFixedProperties();
 
     /*
@@ -1435 +1438 @@
     for (;;)
     {
-        rc = vboxserviceVMInfoWriteUsers();
+        rc = vgsvcVMInfoWriteUsers();
         if (RT_FAILURE(rc))
             break;
 
-        rc = vboxserviceVMInfoWriteNetwork();
+        rc = vgsvcVMInfoWriteNetwork();
         if (RT_FAILURE(rc))
             break;
@@ -1451 +1454 @@
         /* Check for new connection. */
         char *pszLAClientID = NULL;
-        int rc2 = VBoxServiceReadHostProp(g_uVMInfoGuestPropSvcClientID, g_pszLAActiveClient, true /* Read only */,
+        int rc2 = VGSvcReadHostProp(g_uVMInfoGuestPropSvcClientID, g_pszLAActiveClient, true /* Read only */,
                                           &pszLAClientID, NULL /* Flags */, NULL /* Timestamp */);
         if (RT_SUCCESS(rc2))
@@ -1463 +1466 @@
                 /* Peek at "Attach" value to figure out if hotdesking happened. */
                 char *pszAttach = NULL;
-                rc2 = vboxServiceGetLAClientValue(uLAClientID, "Attach", &pszAttach,
+                rc2 = vgsvcGetLAClientValue(uLAClientID, "Attach", &pszAttach,
                                                  &uLAClientAttachedTS);
 
@@ -1470 +1473 @@
                         || (g_LAClientAttachedTS != uLAClientAttachedTS)))
                 {
-                    vboxServiceFreeLAClientInfo(&g_LAClientInfo);
+                    vgsvcFreeLAClientInfo(&g_LAClientInfo);
 
                     /* Note: There is a race between setting the guest properties by the host and getting them by
                      *       the guest. */
-                    rc2 = vboxServiceGetLAClientInfo(uLAClientID, &g_LAClientInfo);
+                    rc2 = vgsvcGetLAClientInfo(uLAClientID, &g_LAClientInfo);
                     if (RT_SUCCESS(rc2))
                     {
-                        VBoxServiceVerbose(1, "VRDP: Hotdesk client %s with ID=%RU32, Name=%s, Domain=%s\n",
-                                           /* If g_LAClientAttachedTS is 0 this means there already was an active
-                                            * hotdesk session when VBoxService started. */
-                                           !g_LAClientAttachedTS ? "already active" : g_LAClientInfo.fAttached ? "connected" : "disconnected",
-                                           uLAClientID, g_LAClientInfo.pszName, g_LAClientInfo.pszDomain);
+                        VGSvcVerbose(1, "VRDP: Hotdesk client %s with ID=%RU32, Name=%s, Domain=%s\n",
+                                     /* If g_LAClientAttachedTS is 0 this means there already was an active
+                                      * hotdesk session when VBoxService started. */
+                                     !g_LAClientAttachedTS ? "already active" : g_LAClientInfo.fAttached ? "connected" : "disconnected",
+                                     uLAClientID, g_LAClientInfo.pszName, g_LAClientInfo.pszDomain);
 
                         g_LAClientAttachedTS = g_LAClientInfo.uAttachedTS;
@@ -1495 +1498 @@
                         {
                             s_iBitchedAboutLAClientInfo++;
-                            VBoxServiceError("Error getting active location awareness client info, rc=%Rrc\n", rc2);
+                            VGSvcError("Error getting active location awareness client info, rc=%Rrc\n", rc2);
                         }
                     }
                 }
                 else if (RT_FAILURE(rc2))
-                     VBoxServiceError("Error getting attached value of location awareness client %RU32, rc=%Rrc\n",
-                                      uLAClientID, rc2);
+                     VGSvcError("Error getting attached value of location awareness client %RU32, rc=%Rrc\n", uLAClientID, rc2);
                 if (pszAttach)
                     RTStrFree(pszAttach);
@@ -1507 +1509 @@
             else
             {
-                VBoxServiceVerbose(1, "VRDP: UTTSC disconnected from VRDP server\n");
-                vboxServiceFreeLAClientInfo(&g_LAClientInfo);
+                VGSvcVerbose(1, "VRDP: UTTSC disconnected from VRDP server\n");
+                vgsvcFreeLAClientInfo(&g_LAClientInfo);
             }
 
@@ -1520 +1522 @@
             {
                 s_iBitchedAboutLAClient++;
-                VBoxServiceError("VRDP: Querying connected location awareness client failed with rc=%Rrc\n", rc2);
+                VGSvcError("VRDP: Querying connected location awareness client failed with rc=%Rrc\n", rc2);
             }
         }
 
-        VBoxServiceVerbose(3, "VRDP: Handling location awareness done\n");
+        VGSvcVerbose(3, "VRDP: Handling location awareness done\n");
 
         /*
@@ -1533 +1535 @@
         if (idNewSession != g_idVMInfoSession)
         {
-            VBoxServiceVerbose(3, "The VM session ID changed, flushing all properties\n");
-            vboxserviceVMInfoWriteFixedProperties();
-            VBoxServicePropCacheFlush(&g_VMInfoPropCache);
+            VGSvcVerbose(3, "The VM session ID changed, flushing all properties\n");
+            vgsvcVMInfoWriteFixedProperties();
+            VGSvcPropCacheFlush(&g_VMInfoPropCache);
             g_idVMInfoSession = idNewSession;
         }
@@ -1553 +1555 @@
         if (rc2 != VERR_TIMEOUT && RT_FAILURE(rc2))
         {
-            VBoxServiceError("RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
+            VGSvcError("RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
             rc = rc2;
             break;
@@ -1562 +1564 @@
             rc2 = RTSemEventMultiReset(g_hVMInfoEvent);
             if (RT_FAILURE(rc2))
-                rc2 = VBoxServiceError("RTSemEventMultiReset failed; rc2=%Rrc\n", rc2);
+                rc2 = VGSvcError("RTSemEventMultiReset failed; rc2=%Rrc\n", rc2);
         }
     }
@@ -1574 +1576 @@
 
 
-/** @copydoc VBOXSERVICE::pfnStop */
-static DECLCALLBACK(void) VBoxServiceVMInfoStop(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vbsvcVMInfoStop(void)
 {
     RTSemEventMultiSignal(g_hVMInfoEvent);
@@ -1581 +1585 @@
 
 
-/** @copydoc VBOXSERVICE::pfnTerm */
-static DECLCALLBACK(void) VBoxServiceVMInfoTerm(void)
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(void) vbsvcVMInfoTerm(void)
 {
     if (g_hVMInfoEvent != NIL_RTSEMEVENTMULTI)
@@ -1602 +1608 @@
 
         /* Destroy LA client info. */
-        vboxServiceFreeLAClientInfo(&g_LAClientInfo);
+        vgsvcFreeLAClientInfo(&g_LAClientInfo);
 
         /* Destroy property cache. */
-        VBoxServicePropCacheDestroy(&g_VMInfoPropCache);
+        VGSvcPropCacheDestroy(&g_VMInfoPropCache);
 
         /* Disconnect from guest properties service. */
         rc = VbglR3GuestPropDisconnect(g_uVMInfoGuestPropSvcClientID);
         if (RT_FAILURE(rc))
-            VBoxServiceError("Failed to disconnect from guest property service! Error: %Rrc\n", rc);
+            VGSvcError("Failed to disconnect from guest property service! Error: %Rrc\n", rc);
         g_uVMInfoGuestPropSvcClientID = 0;
 
@@ -1640 +1646 @@
     ,
     /* methods */
-    VBoxServiceVMInfoPreInit,
-    VBoxServiceVMInfoOption,
-    VBoxServiceVMInfoInit,
-    VBoxServiceVMInfoWorker,
-    VBoxServiceVMInfoStop,
-    VBoxServiceVMInfoTerm
+    vbsvcVMInfoPreInit,
+    vbsvcVMInfoOption,
+    vbsvcVMInfoInit,
+    vbsvcVMInfoWorker,
+    vbsvcVMInfoStop,
+    vbsvcVMInfoTerm
 };
 

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

@@ -19 +19 @@
 #define ___VBoxServiceVMInfo_h
 
-//RT_C_DECLS_BEGIN
 
-extern int vboxServiceUserUpdateF(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
-                                  const char *pszKey, const char *pszValueFormat, ...);
+extern int VGSvcUserUpdateF(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
+                            const char *pszKey, const char *pszValueFormat, ...);
 
-//RT_C_DECLS_END
 
 extern uint32_t g_uVMInfoUserIdleThresholdMS;
 
-#endif /* ___VBoxServiceVMInfo_h */
+#endif