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

Timestamp:

May 15, 2017 11:21:57 PM (8 years ago)

Author:

vboxsync

Message:

VBox/Main: ​bugref:3300: VBoxSVC from terminal server session is not 'visible' - added client token to track client lifetime

Location:

trunk/src/VBox/Main/include

Files:

• VirtualBoxClientImpl.h (modified) (1 diff)
• VirtualBoxSDSImpl.h (modified) (3 diffs)

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

@@ -94 +94 @@
 
         ComPtr<IVirtualBox> m_pVirtualBox;
+        ComPtr<IToken> m_pToken;
         const ComObjPtr<EventSource> m_pEventSource;
 

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

@@ -20 +20 @@
 
 #include "VirtualBoxSDSWrap.h"
+#include "TokenWrap.h"
 
 #ifdef RT_OS_WINDOWS
 # include "win/resource.h"
 #endif
+
+ /**
+ * The MediumLockToken class automates cleanup of a Medium lock.
+ */
+class ATL_NO_VTABLE VirtualBoxToken :
+    public TokenWrap
+{
+public:
+
+    DECLARE_EMPTY_CTOR_DTOR(VirtualBoxToken)
+
+    HRESULT FinalConstruct();
+    void FinalRelease();
+
+    // public initializer/uninitializer for internal purposes only
+    HRESULT init(const std::wstring& wstrUserName);
+    void uninit();
+
+    /**
+    * Fabrique method to create and initialize COM token object.
+    *
+    * @param aToken         Pointer to result Token COM object.
+    * @param wstrUserName   User name of client for that we create the token
+    */
+    static HRESULT CreateToken(ComPtr<IToken>& aToken, const std::wstring& wstrUserName);
+
+    // Trace COM reference counting in debug mode
+#ifdef RT_STRICT
+    virtual ULONG InternalAddRef();
+    virtual ULONG InternalRelease();
+#endif
+    
+private:
+
+    // wrapped IToken methods
+    HRESULT abandon(AutoCaller &aAutoCaller);
+    HRESULT dummy();
+
+    // data
+    struct Data
+    {
+        std::wstring wstrUserName;
+    };
+
+    Data m;
+};
 
 class ATL_NO_VTABLE VirtualBoxSDS :
@@ -61 +108 @@
     *    either from cahce or makes new one.
     */
-    HRESULT getVirtualBox(ComPtr<IVirtualBox> &aVirtualBox);
-
-    /**
-    *  Should be called by client to deregister it from VBoxSDS when client beign finished
-    */
-    HRESULT releaseVirtualBox();
+    HRESULT getVirtualBox(ComPtr<IVirtualBox> &aVirtualBox, ComPtr<IToken> &aToken);
 
     // Wrapped IVirtualBoxSDS methods
@@ -92 +134 @@
     class VirtualBoxCache;
     static VirtualBoxCache m_cache;
+    friend VirtualBoxToken;
 };