Changeset 69785 in vbox

Timestamp:

Nov 20, 2017 8:18:32 PM (7 years ago)

Author:

vboxsync

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

119190

Message:

VBoxSDS: Made VirtualBoxSDS internal and non-scriptable, dropping the API wrapping (sideeffect of either of those). The latter helps avoiding an annoying deadlock (requires reboot) when an API call goes south.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• include/VirtualBoxSDSImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -24402 +24402 @@
   <!--
   // IVirtualBoxSDS
+  // Note! This actually extends IUnknown rather than IDispatch, notdual=yes
+  //       sees to that.
   //////////////////////////////////////////////////////////////////////////
   -->
 
-  <!-- This is now an internal interface, it doesn't need to be dual either. -->
   <interface
-    name="IVirtualBoxSDS" extends="$unknown"
+    name="IVirtualBoxSDS" extends="$unknown" notdual="yes"
     uuid="787d20ed-faf3-4170-6697-3a2a7de6e086"
-    wsmap="suppress"
+    wsmap="suppress" internal="yes"
     reservedMethods="0" reservedAttributes="0"
     >

trunk/src/VBox/Main/include/VirtualBoxSDSImpl.h

@@ -19 +19 @@
 #define ____H_VIRTUALBOXSDSIMPL
 
-#include "VirtualBoxSDSWrap.h"
-#include "TokenWrap.h"
-
-#ifdef RT_OS_WINDOWS
-# include "win/resource.h"
-#endif
+#include "VirtualBoxBase.h"
 
 
@@ -68 +63 @@
 
 
-class ATL_NO_VTABLE VirtualBoxSDS :
-    public VirtualBoxSDSWrap
-#ifdef RT_OS_WINDOWS
+/**
+ * The IVirtualBoxSDS implementation.
+ *
+ * This class helps different VBoxSVC processes make sure a user only have a
+ * single VirtualBox instance.
+ *
+ * @note This is a simple internal class living in a privileged process.  So, we
+ *       do not use the API wrappers as they add complexity.  In particular,
+ *       they add the auto caller logic, which is an excellent tool to create
+ *       unkillable processes.  If an API method during development or product
+ *       for instance triggers an NT exception like STATUS_ACCESS_VIOLATION, the
+ *       caller will be unwound without releasing the caller.  When uninit is
+ *       called during COM shutdown/whatever, the thread gets stuck waiting for
+ *       the long gone caller and cannot be killed (Windows 10, build 16299),
+ *       requiring a reboot to continue.
+ *
+ * @todo Would be very nice to get rid of the ATL cruft too here.
+ */
+class VirtualBoxSDS
+    : public IVirtualBoxSDS
+    , public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>
     , public ATL::CComCoClass<VirtualBoxSDS, &CLSID_VirtualBoxSDS>
-#endif
 {
 private:
@@ -82 +94 @@
 
 public:
+    DECLARE_CLASSFACTORY_SINGLETON(VirtualBoxSDS)
+    DECLARE_NOT_AGGREGATABLE(VirtualBoxSDS)
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    DECLARE_CLASSFACTORY_SINGLETON(VirtualBoxSDS)
-
-    //DECLARE_REGISTRY_RESOURCEID(IDR_VIRTUALBOX)
-
-    // Kind of redundant (VirtualBoxSDSWrap declares itself not aggregatable
-    // and CComCoClass<VirtualBoxSDS, &CLSID_VirtualBoxSDS> as aggregatable,
-    // the former is the first inheritance), but the C multiple inheritance
-    // rules and the class factory in VBoxSDS.cpp needs this to disambiguate.
-    DECLARE_NOT_AGGREGATABLE(VirtualBoxSDS)
+    BEGIN_COM_MAP(VirtualBoxSDS)
+        COM_INTERFACE_ENTRY(IVirtualBoxSDS)
+    END_COM_MAP()
 
     DECLARE_EMPTY_CTOR_DTOR(VirtualBoxSDS)
 
     HRESULT FinalConstruct();
-    void FinalRelease();
-
-    // public initializers/uninitializers for internal purposes only
-    HRESULT init();
-    void uninit();
+    void    FinalRelease();
 
 private:
 
-    // Wrapped IVirtualBoxSDS methods
-    HRESULT registerVBoxSVC(const ComPtr<IVBoxSVCRegistration> &aVBoxSVC, LONG aPid, ComPtr<IUnknown> &aExistingVirtualBox);
-    HRESULT deregisterVBoxSVC(const ComPtr<IVBoxSVCRegistration> &aVBoxSVC, LONG aPid);
+    // IVirtualBoxSDS methods
+    HRESULT RegisterVBoxSVC(IVBoxSVCRegistration *aVBoxSVC, LONG aPid, IUnknown **aExistingVirtualBox);
+    HRESULT DeregisterVBoxSVC(IVBoxSVCRegistration *aVBoxSVC, LONG aPid);