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

Timestamp:

Nov 20, 2017 4:36:34 PM (7 years ago)

Author:

vboxsync

Message:

VBoxSDS/Plan/B: More complete code.

File:

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

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

@@ -186 +186 @@
 
 #ifdef VBOX_WITH_SDS_PLAN_B
-class VBoxSVC;
+class VBoxSVCRegistration;
 
 /**
@@ -203 +203 @@
     /** The IUnknown of the VirtualBox object/interface we're working with. */
     IUnknown              *m_pObj;
-    /** Pointer to the IVBoxSVC implementation that VBoxSDS works with. */
-    VBoxSVC               *m_pVBoxSVC;
+    /** Pointer to the IVBoxSVCRegistration implementation that VBoxSDS works with. */
+    VBoxSVCRegistration   *m_pVBoxSVC;
     /** The VBoxSDS interface. */
     ComPtr<IVirtualBoxSDS> m_ptrVirtualBoxSDS;
@@ -227 +227 @@
     STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid, void **ppvObj);
 
-    /** Worker for VBoxSVC::getVirtualBox. */
+    /** Worker for VBoxSVCRegistration::getVirtualBox. */
     HRESULT i_getVirtualBox(IUnknown **ppResult);
 
@@ -234 +234 @@
     void    VirtualBoxClassFactory::i_deregisterWithSds(void);
 
-    friend VBoxSVC;
+    friend VBoxSVCRegistration;
 };
 
@@ -242 +242 @@
  * VirtualBox object when the next VBoxSVC for this user registers itself.
  */
-class VBoxSVC : public IVBoxSVC
+class VBoxSVCRegistration : public IVBoxSVCRegistration
 {
 private:
@@ -253 +253 @@
 
 public:
-    VBoxSVC(VirtualBoxClassFactory *pFactory)
+    VBoxSVCRegistration(VirtualBoxClassFactory *pFactory)
         : m_cRefs(1), m_pFactory(pFactory)
     { }
-    virtual ~VBoxSVC()
+    virtual ~VBoxSVCRegistration()
     {
         if (m_pFactory)
@@ -272 +272 @@
         if (riid == __uuidof(IUnknown))
             *ppvObject = (void *)(IUnknown *)this;
-        else if (riid == __uuidof(IVBoxSVC))
-            *ppvObject = (void *)(IVBoxSVC *)this;
+        else if (riid == __uuidof(IVBoxSVCRegistration))
+            *ppvObject = (void *)(IVBoxSVCRegistration *)this;
         else
         {
@@ -297 +297 @@
     }
 
-    // IVBoxSVC
+    // IVBoxSVCRegistration
     STDMETHOD(GetVirtualBox)(IUnknown **ppResult)
     {
@@ -317 +317 @@
     {
         /*
-         * Create VBoxSVC object and hand that to VBoxSDS.
+         * Create VBoxSVCRegistration object and hand that to VBoxSDS.
          */
-        m_pVBoxSVC = new VBoxSVC(this);
+        m_pVBoxSVC = new VBoxSVCRegistration(this);
         hrc = m_ptrVirtualBoxSDS->RegisterVBoxSVC(m_pVBoxSVC, GetCurrentProcessId(), ppOtherVirtualBox);
         if (SUCCEEDED(hrc))