Changeset 69729 in vbox

Timestamp:

Nov 17, 2017 7:55:33 PM (7 years ago)

Author:

vboxsync

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

119120

Message:

Main: Outlined a possible plan B for the VBoxSDS stuff.

Location:

trunk

Files:

• include/VBox/log.h (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/VirtualBoxImpl.h (modified) (2 diffs)
• src/VBox/Main/include/VirtualBoxSDSImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/VirtualBoxClientImpl.cpp (modified) (6 diffs)
• src/VBox/Main/src-server/win/svcmain.cpp (modified) (2 diffs)

trunk/include/VBox/log.h

@@ -636 +636 @@
     /** Main group, IVBoxSVCAvailabilityChangedEvent. */
     LOG_GROUP_MAIN_VBOXSVCAVAILABILITYCHANGEDEVENT,
+    /** Main group, IVBoxSVC. */
+    LOG_GROUP_MAIN_VBOXSVC,
     /** Main group, IVetoEvent. */
     LOG_GROUP_MAIN_VETOEVENT,

trunk/src/VBox/Main/Makefile.kmk

@@ -278 +278 @@
  PROGRAMS += VBoxSDS
  VBoxSDS_TEMPLATE = VBOXMAINEXE
- VBoxSDS_DEFS = \
+ VBoxSDS_DEFS = $(if $(VBOX_WITH_SDS_PLAN_B),VBOX_WITH_SDS_PLAN_B,)
  VBoxSDS_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
  VBoxSDS_DEFS.win += _WIN32_WINNT=0x0510
@@ -367 +367 @@
         $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE,) \
         $(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL,) \
-        $(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI,)
+        $(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI,) \
+        $(if-expr defined(VBOX_WITH_SDS) && defined(VBOX_WITH_SDS_PLAN_B),VBOX_WITH_SDS_PLAN_B,)
 ifdef VBOX_WITH_USB
  VBoxSVC_DEFS += \
@@ -763 +764 @@
         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
         $(if $(VBOX_WITH_VRDEAUTH_IN_VBOXSVC),VBOX_WITH_VRDEAUTH_IN_VBOXSVC,) \
-        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
+        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
+        $(if-expr defined(VBOX_WITH_SDS) && defined(VBOX_WITH_SDS_PLAN_B),VBOX_WITH_SDS_PLAN_B,)
 ifdef VBOX_WITH_CRHGSMI
  VBoxC_DEFS += VBOX_WITH_CRHGSMI
@@ -1194 +1196 @@
  VBoxProxyStub_TEMPLATE = VBOXMAINCOMP
  VBoxProxyStub_DEFS     = REGISTER_PROXY_DLL PROXY_CLSID_IS="$(VBOX_MIDL_PROXY_CLSID_IS)" \
-        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
+        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
+        $(if-expr defined(VBOX_WITH_SDS) && defined(VBOX_WITH_SDS_PLAN_B),VBOX_WITH_SDS_PLAN_B,)
  VBoxProxyStub_DEFS.win.x86 = WIN32
  VBoxProxyStub_SDKS     = VBOX_NTDLL

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

@@ -24373 +24373 @@
 
 <if target="midl">
+
+  <!-- VBOX_SDS_PLAN_B start -->
+  <!--
+  // IVBoxSVC
+  //////////////////////////////////////////////////////////////////////////
+  -->
+  <interface
+    name="IVBoxSVC" extends="$unknown"
+    uuid="8876e618-8936-4b2c-3015-aaebe6d479b9"
+    wsmap="suppress"
+    reservedMethods="2" reservedAttributes="4"
+    >
+      <desc>
+          Implemented by the VirtualBox class factory and registered with VBoxSDS
+          so it can retrieve IVirtualBox on behalf of other VBoxSVCs.
+      </desc>
+
+      <method name="getVirtualBox" >
+        <desc> Gets an IUnknown interface to the VirtualBox object in the VBoxSVC process. </desc>
+        <param name="result" type="$unknown" dir="return" >
+          <desc> Where to return the IUnknown interface. </desc>
+        </param>
+      </method>
+
+  </interface>
+  <!-- VBOX_SDS_PLAN_B end -->
+
   <!--
   // IVirtualBoxSDS
@@ -24407 +24434 @@
       </method>
 
+      <!-- VBOX_SDS_PLAN_B start -->
+      <method name="registerVBoxSVC">
+        <desc>Registers a VBoxSVC instance with the SDS.</desc>
+        <param name="vboxSVC" type="IVBoxSVC" dir="in">
+          <desc>Interface implemented by the VirtualBox class factory.</desc>
+        </param>
+        <param name="pid" type="long" dir="in">
+          <desc>The process ID of the VBoxSVC instance.</desc>
+        </param>
+        <param name="existingVirtualBox" type="$unknown" dir="return">
+          <desc>If there is already an VBoxSVC for this user, the an IUnknown
+            interface to its VirtualBox object is returned here, otherwise it
+            is set to NULL.</desc>
+        </param>
+      </method>
+
+      <method name="deregisterVBoxSVC">
+        <desc>Registers a VBoxSVC instance with the SDS.</desc>
+        <param name="vboxSVC" type="IVBoxSVC" dir="in">
+          <desc>Same as specified during registration.</desc>
+        </param>
+        <param name="pid" type="long" dir="in">
+          <desc>The process ID of the VBoxSVC instance (same as during registration).</desc>
+        </param>
+      </method>
+      <!-- VBOX_SDS_PLAN_B end -->
+
   </interface>
+
 </if>
 

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

@@ -59 +59 @@
 }
 
+
+#if defined(VBOX_WITH_SDS_PLAN_B) && !defined(VBOX_WITH_XPCOM)
+class VirtualBoxClassFactory; /* See ../src-server/win/svcmain.cpp  */
+#endif
+
+
 class ATL_NO_VTABLE VirtualBox :
     public VirtualBoxWrap
@@ -74 +80 @@
     friend class CallbackEvent;
 
+#ifndef VBOX_WITH_XPCOM
+# ifdef VBOX_WITH_SDS_PLAN_B
+    DECLARE_CLASSFACTORY_EX(VirtualBoxClassFactory)
+# else
     DECLARE_CLASSFACTORY_SINGLETON(VirtualBox)
+# endif
+#endif
 
     // Do not use any ATL registry support.

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

@@ -110 +110 @@
     HRESULT getVirtualBox(ComPtr<IVirtualBox> &aVirtualBox, ComPtr<IToken> &aToken);
 
+    /* SDS plan B interfaces: */
+    HRESULT registerVBoxSVC(const ComPtr<IVBoxSVC> &aVBoxSVC, LONG aPid, ComPtr<IUnknown> &aExistingVirtualBox);
+    HRESULT deregisterVBoxSVC(const ComPtr<IVBoxSVC> &aVBoxSVC, LONG aPid);
+
     // Wrapped IVirtualBoxSDS methods
 

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -67 +67 @@
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
 
 HRESULT CreateVirtualBoxThroughSDS(ComPtr<IVirtualBox> &aVirtualBox, ComPtr<IToken> &aToken)
@@ -238 +238 @@
 }
 
-#endif
+#endif /* RT_OS_WINDOWS && VBOX_WITH_SDS && !VBOX_WITH_SDS_PLAN_B */
 
 /**
@@ -250 +250 @@
 #if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
     // setup COM Security to enable impersonation
-    // This works for console Virtual Box clients, GUI has own security settings
+    // This works for console VirtualBox clients, GUI has own security settings
     //  For GUI Virtual Box it will be second call so can return TOO_LATE error
     HRESULT hrGUICoInitializeSecurity = CoInitializeSecurity(NULL,
@@ -289 +289 @@
         mData.m_SemEvWatcher = NIL_RTSEMEVENT;
 
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
         rc = CreateVirtualBoxThroughSDS(mData.m_pVirtualBox, mData.m_pToken);
 #else
@@ -383 +383 @@
     IUnknown *pUnknown = NULL;
 
-# ifdef VBOX_WITH_SDS
+# if defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
     // Check the VBOXSDS service running account name is SYSTEM
     wchar_t wszBuffer[256];
@@ -746 +746 @@
                 ComPtr<IVirtualBox> pVirtualBox;
                 ComPtr<IToken> pToken;
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
                 rc = CreateVirtualBoxThroughSDS(pVirtualBox, pToken);
 #else

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

@@ -138 +138 @@
 
 
+#ifdef VBOX_WITH_SDS_PLAN_B
+
+/**
+ * Custom class factory for the VirtualBox singleton.
+ *
+ * The implementation of CreateInstance is found in win/svcmain.cpp.
+ */
+class VirtualBoxClassFactory : public ATL::CComClassFactory
+{
+private:
+    /** Tri state: 0=uninitialized or initializing; 1=success; -1=failure.
+     * This will be updated after both m_hrcCreate and m_pObj have been set. */
+    volatile int32_t    m_iState;
+    /** The result of the instantiation attempt. */
+    HRESULT             m_hrcCreate;
+    /** The IUnknown of the VirtualBox object/interface we're working with. */
+    IUnknown           *m_pObj;
+
+public:
+    VirtualBoxClassFactory() : m_iState(0), m_hrcCreate(S_OK), m_pObj(NULL) { }
+    virtual ~VirtualBoxClassFactory()
+    {
+        if (m_pObj)
+        {
+            m_pObj->Release();
+            m_pObj = NULL;
+        }
+        /** @todo Need to check if this is okay wrt COM termination. */
+        i_deregisterWithSds();
+    }
+
+    // IClassFactory
+    STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid, void **ppvObj);
+
+    // IVBoxSVC
+    STDMETHOD(GetVirtualBox)(IUnknown **ppOtherObj);
+
+private:
+    HRESULT VirtualBoxClassFactory::i_registerWithSds(IUnknown **ppOtherVirtualBox);
+    void    VirtualBoxClassFactory::i_deregisterWithSds(void);
+};
+
+
+HRESULT VirtualBoxClassFactory::i_registerWithSds(IUnknown **ppOtherVirtualBox)
+{
+    *ppOtherVirtualBox = NULL;
+    return S_OK;
+}
+
+
+void VirtualBoxClassFactory::i_deregisterWithSds(void)
+{
+    Log(("VirtualBoxClassFactory::i_deregisterWithSds\n"));
+}
+
+
+STDMETHODIMP VirtualBoxClassFactory::GetVirtualBox(IUnknown **ppUnkVirtualBox)
+{
+    IUnknown *pObj = m_pObj;
+    if (pObj)
+    {
+        /** @todo Do we need to do something regarding server locking?  Hopefully COM
+         *        deals with that........... */
+        pObj->AddRef();
+        *ppUnkVirtualBox = pObj;
+        Log(("VirtualBoxClassFactory::GetVirtualBox: S_OK - %p\n", pObj));
+        return S_OK;
+    }
+    *ppUnkVirtualBox = NULL;
+    Log(("VirtualBoxClassFactory::GetVirtualBox: E_FAIL\n"));
+    return E_FAIL;
+}
+
+
+/**
+ * Custom class factory impl for the VirtualBox singleton.
+ *
+ * This will consult with VBoxSDS on whether this VBoxSVC instance should
+ * provide the actual VirtualBox instance or just forward the instance from
+ * some other SVC instance.
+ *
+ * @param   pUnkOuter       This must be NULL.
+ * @param   riid            Reference to the interface ID to provide.
+ * @param   ppvObj          Where to return the pointer to the riid instance.
+ *
+ * @return  COM status code.
+ */
+STDMETHODIMP VirtualBoxClassFactory::CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppvObj)
+{
+    HRESULT hrc = E_POINTER;
+    if (ppvObj != NULL)
+    {
+        *ppvObj = NULL;
+        // no aggregation for singletons
+        AssertReturn(pUnkOuter == NULL, CLASS_E_NOAGGREGATION);
+
+        /*
+         * We must make sure there is only one instance around.
+         * So, we check without locking and then again after locking.
+         */
+        if (ASMAtomicReadS32(&m_iState) == 0)
+        {
+            Lock();
+            __try
+            {
+                if (ASMAtomicReadS32(&m_iState) == 0)
+                {
+                    /*
+                     * lock the module to indicate activity
+                     * (necessary for the monitor shutdown thread to correctly
+                     * terminate the module in case when CreateInstance() fails)
+                     */
+                    ATL::_pAtlModule->Lock();
+                    __try
+                    {
+                        /*
+                         * Now we need to connect to VBoxSDS to register ourselves.
+                         */
+                        IUnknown *pOtherVirtualBox = NULL;
+                        m_hrcCreate = hrc = i_registerWithSds(&pOtherVirtualBox);
+                        if (SUCCEEDED(hrc) && pOtherVirtualBox)
+                            m_pObj = pOtherVirtualBox;
+                        else if (SUCCEEDED(hrc))
+                        {
+                            ATL::_pAtlModule->Lock();
+                            ATL::CComObjectCached<VirtualBox> *p;
+                            m_hrcCreate = hrc = ATL::CComObjectCached<VirtualBox>::CreateInstance(&p);
+                            if (SUCCEEDED(hrc))
+                            {
+                                m_hrcCreate = hrc = p->QueryInterface(IID_IUnknown, (void **)&m_pObj);
+                                if (FAILED(hrc))
+                                {
+                                    delete p;
+                                    i_deregisterWithSds();
+                                    m_pObj = NULL;
+                                }
+                            }
+                        }
+                        ASMAtomicWriteS32(&m_iState, SUCCEEDED(hrc) ? 1 : -1);
+                    }
+                    __finally
+                    {
+                        ATL::_pAtlModule->Unlock();
+                    }
+                }
+            }
+            __finally
+            {
+                if (ASMAtomicReadS32(&m_iState) == 0)
+                {
+                    ASMAtomicWriteS32(&m_iState, -1);
+                    if (SUCCEEDED(m_hrcCreate))
+                        m_hrcCreate = E_FAIL;
+                }
+                Unlock();
+            }
+        }
+
+        /*
+         * Query the requested interface from the IUnknown one we're keeping around.
+         */
+        if (m_hrcCreate == S_OK)
+            hrc = m_pObj->QueryInterface(riid, ppvObj);
+        else
+            hrc = m_hrcCreate;
+    }
+    return hrc;
+}
+
+#endif /* VBOX_WITH_SDS_PLAN_B */
+
+
 BEGIN_OBJECT_MAP(ObjectMap)
     OBJECT_ENTRY(CLSID_VirtualBox, VirtualBox)
@@ -146 +318 @@
 HINSTANCE g_hInstance = NULL;
 #define MAIN_WND_CLASS L"VirtualBox Interface"
+
 
 /*