Changeset 71716 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Apr 6, 2018 6:16:30 PM (7 years ago)

Author:

vboxsync

Message:

VBoxSDS,VBoxSVC: Replaced the enviornment variable hack (VBOX_SERVICE_PROCESS) for preventing VBoxSDS and VBoxSVC from getting watched as clients, with a special export in the executable (Is_VirtualBox_service_process_like_VBoxSDS_And_VBoxSDS). Some cleanups here and there.

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -516 +516 @@
 void    VirtualBoxClassFactory::i_finishVBoxSvc()
 {
-    LogRelFunc(("Finish work of VBoxSVc and VBoxSDS\n"));
+    LogRelFunc(("Finish work of VBoxSVC and VBoxSDS\n"));
     if (m_ptrVirtualBoxSDS.isNotNull())
     {
@@ -787 +787 @@
 
 
-int SetServiceEnvFlag()
-{
-    int rc = VINF_SUCCESS;
-    if (!SetEnvironmentVariable(L"VBOX_SERVICE_PROCESS", L""))
-    {
-        rc = RTErrConvertFromWin32(GetLastError());
-        LogRel(("Error: cannot set service environment flag:  %Rrs\n", rc));
-    }
-    return rc;
+/** Special export that make VBoxProxyStub not register this process as one that
+ * VBoxSDS should be watching.
+ */
+extern "C" DECLEXPORT(void) VBOXCALL Is_VirtualBox_service_process_like_VBoxSDS_And_VBoxSDS(void)
+{
+    /* never called, just need to be here */
 }
 
@@ -834 +831 @@
      */
     RTR3InitExe(argc, &argv, 0);
-
-    SetServiceEnvFlag();
 
     static const RTGETOPTDEF s_aOptions[] =