Changeset 76067 in vbox for trunk/src/VBox/Main/include

Timestamp:

Dec 8, 2018 12:54:36 AM (6 years ago)

Author:

vboxsync

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

127307

Message:

VBoxSDS,VBoxSVC,VBoxProxyStub: Kicked out the failed attempt at centralized client watching. bugref:3300

Location:

trunk/src/VBox/Main/include

Files:

• RpcChannelHook.h (modified) (5 diffs)
• VirtualBoxSDSImpl.h (modified) (1 diff)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
-* VBox COM Rpc Channel Hook definition
-*/
+ * VirtualBox Main - RPC Channel Hook Hack, VBoxProxyStub.
+ */
 
 /*
@@ -21 +21 @@
 #include <iprt/cdefs.h>
 
-#ifdef RT_OS_WINDOWS
+#ifndef RT_OS_WINDOWS
+# error "Oops"
+#endif
+
 #include <iprt/win/windows.h>
 #include <ObjIdl.h>
 
 
-typedef void *PRPC_CHANNEL_HOOK;
+RT_C_DECLS_BEGIN
 
-// {CEDA3E95-A46A-4C41-AA01-EFFD856E455C}
+/* {CEDA3E95-A46A-4C41-AA01-EFFD856E455C} */
 static const GUID RPC_CHANNEL_EXTENSION_GUID =
 { 0xceda3e95, 0xa46a, 0x4c41,{ 0xaa, 0x1, 0xef, 0xfd, 0x85, 0x6e, 0x45, 0x5c } };
 
-RT_C_DECLS_BEGIN
-// C wrapper for using in proxy
+/** C wrapper for using in proxy (C code). */
 void SetupClientRpcChannelHook(void);
+
 RT_C_DECLS_END
 
 
-#if defined(__cplusplus)
+#ifdef __cplusplus
 
-/*
-* This is RPC channel hook implementation for registering VirtualBox API clients.
-* This channel hook instantiated in COM client process by VBoxProxyStub
-* We use it to catch a moment when a new VirtualBox object sucessfully instantiated to
-* register new API client in a VBoxSDS clients list.
-*/
+/**
+ * This is RPC channel hook implementation for registering VirtualBox API clients.
+ *
+ * This channel hook instantiated in COM client process by VBoxProxyStub
+ * We use it to catch a moment when a new VirtualBox object sucessfully instantiated to
+ * register new API client in a VBoxSDS clients list.
+ */
 class CRpcChannelHook : public IChannelHook
 {
@@ -52 +56 @@
 
     /* IUnknown Interface methods */
-    STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
-    STDMETHODIMP_(ULONG) AddRef(void);
-    STDMETHODIMP_(ULONG) Release(void);
+    STDMETHOD(QueryInterface)(REFIID riid, void **ppv);
+    STDMETHOD_(ULONG, AddRef)(void);
+    STDMETHOD_(ULONG, Release)(void);
 
     /* IChannelHook Interface methods */
-    STDMETHODIMP_(void) ClientGetSize(REFGUID uExtent, REFIID riid, ULONG *pDataSize);
-    STDMETHODIMP_(void) ClientFillBuffer(REFGUID uExtent, REFIID riid, ULONG *pDataSize, void *pDataBuffer);
-    STDMETHODIMP_(void) ClientNotify(REFGUID uExtent, REFIID riid, ULONG cbDataSize, void *pDataBuffer, DWORD lDataRep, HRESULT hrFault);
+    STDMETHOD_(void, ClientGetSize)(REFGUID uExtent, REFIID riid, ULONG *pDataSize);
+    STDMETHOD_(void, ClientFillBuffer)(REFGUID uExtent, REFIID riid, ULONG *pDataSize, void *pDataBuffer);
+    STDMETHOD_(void, ClientNotify)(REFGUID uExtent, REFIID riid, ULONG cbDataSize, void *pDataBuffer, DWORD lDataRep, HRESULT hrFault);
 
-    STDMETHODIMP_(void) ServerNotify(REFGUID uExtent, REFIID riid, ULONG cbDataSize, void *pDataBuffer, DWORD lDataRep);
-    STDMETHODIMP_(void) ServerGetSize(REFGUID uExtent, REFIID riid, HRESULT hrFault, ULONG *pDataSize);
-    STDMETHODIMP_(void) ServerFillBuffer(REFGUID uExtent, REFIID riid, ULONG *pDataSize, void *pDataBuffer, HRESULT hrFault);
+    STDMETHOD_(void, ServerNotify)(REFGUID uExtent, REFIID riid, ULONG cbDataSize, void *pDataBuffer, DWORD lDataRep);
+    STDMETHOD_(void, ServerGetSize)(REFGUID uExtent, REFIID riid, HRESULT hrFault, ULONG *pDataSize);
+    STDMETHOD_(void, ServerFillBuffer)(REFGUID uExtent, REFIID riid, ULONG *pDataSize, void *pDataBuffer, HRESULT hrFault);
 
 protected:
@@ -70 +74 @@
 
 protected:
-    const GUID m_ChannelHookID;
-    static volatile bool s_fChannelRegistered;
-    static volatile bool s_fVBpoxSDSCalledOnce;
-    static CRpcChannelHook s_RpcChannelHook;
+    const GUID              m_ChannelHookID;
+    static volatile bool    s_fChannelRegistered;
+    static volatile bool    s_fVBpoxSDSCalledOnce;
+    static CRpcChannelHook  s_RpcChannelHook;
 
     /* C wrapper*/
@@ -79 +83 @@
 };
 
+#endif /* __cplusplus */
 
-#endif // #if defined(__cplusplus)
-
-
-#endif // #ifdef RT_OS_WINDOWS
-
-#endif // ____H_RPCCHANNELHOOK
+#endif

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

@@ -75 +75 @@
     STDMETHOD(RegisterVBoxSVC)(IVBoxSVCRegistration *aVBoxSVC, LONG aPid, IUnknown **aExistingVirtualBox);
     STDMETHOD(DeregisterVBoxSVC)(IVBoxSVCRegistration *aVBoxSVC, LONG aPid);
-    STDMETHOD(NotifyClientsFinished)(); /**< @todo r=bird: Internal within SDS! Make private. */
     /** @} */