Changeset 71139 in vbox for trunk/src/VBox/Main/src-all/win

Timestamp:

Feb 27, 2018 5:48:13 PM (7 years ago)

Author:

vboxsync

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

121027

Message:

Main/VBoxSVC,VBoxSDS: fix for ​bugref:8161: added API client list interface to VBoxSDS, forcibly closes all VirtualBox clients process on Windows 7 at system shutdown. Added functionality to close VBoxSDS and VBoxSVC services automatically if the API client finished unexpectedly (crashed).

File:

• trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c (modified) (4 diffs)

trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c

@@ -41 +41 @@
 #include <iprt/uuid.h>
 #include <iprt/utf16.h>
+#include "RpcChannelHook.h"
 
 
@@ -147 +148 @@
 };
 
+BOOL IsVBoxServiceProcess(void)
+{
+    if (GetEnvironmentVariable(L"VBOX_SERVICE_PROCESS", NULL, 0) == 0)
+    {
+        int res = GetLastError();
+        if (res != ERROR_ENVVAR_NOT_FOUND)
+            LogRel(("Error: cannot get service environment variable: %Rrwa\n", res));
+        return false;
+    }
+    return true;
+}
+
 
 /**
@@ -171 +184 @@
             RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
             Log12(("VBoxProxyStub[%u]/DllMain: DLL_PROCESS_ATTACH\n", GetCurrentProcessId()));
+
+            /* Install RPC channel hook to intercept a moment just after VirtualBox object activation.
+               It's reports to VBoxSDS that a new VirtualBox API client started. */
+            if(!IsVBoxServiceProcess())
+                SetupClientRpcChannelHook();
 
 #ifdef VBOX_STRICT
@@ -1346 +1364 @@
     VbpsRegisterClassId(pState, &CLSID_VirtualBoxSDS, "VirtualBoxSDS Class", pszSdsAppId, "VirtualBox.VirtualBoxSDS", ".1",
                         &LIBID_VirtualBox, "LocalServer32", pwszVBoxDir, pszSdsExe, NULL /*N/A*/);
+
+    VbpsRegisterClassName(pState, "VirtualBox.VirtualBoxClientList.1", "VirtualBoxClientList Class", &CLSID_VirtualBoxClientList, NULL);
+    VbpsRegisterClassName(pState, "VirtualBox.VirtualBoxClientList", "VirtualBoxClientList Class", &CLSID_VirtualBoxClientList, ".1");
+    VbpsRegisterClassId(pState, &CLSID_VirtualBoxClientList, "VirtualBoxClientList Class", pszSdsAppId, "VirtualBox.VirtualBoxClientList", ".1",
+        &LIBID_VirtualBox, "LocalServer32", pwszVBoxDir, pszSdsExe, NULL /*N/A*/);
 #endif
 }