Changeset 60765 in vbox for trunk/src/VBox/Main/src-client/win

Timestamp:

Apr 29, 2016 2:26:58 PM (9 years ago)

Author:

vboxsync

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

106960

Message:

API: stop using ATL and use a vastly smaller lookalike instead, plus a lot of cleanups

File:

• trunk/src/VBox/Main/src-client/win/dllmain.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-client/win/dllmain.cpp

@@ -25 +25 @@
 #include <VirtualBoxClientImpl.h>
 
-#include <atlbase.h>
-#include <atlcom.h>
-
 #include <iprt/initterm.h>
 
@@ -34 +31 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-CComModule _Module;
+static ATL::CComModule _Module;
 
 BEGIN_OBJECT_MAP(ObjectMap)
@@ -50 +47 @@
     if (dwReason == DLL_PROCESS_ATTACH)
     {
+        // idempotent, so doesn't harm, and needed for COM embedding scenario
+        RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
+
         _Module.Init(ObjectMap, hInstance, &LIBID_VirtualBox);
         DisableThreadLibraryCalls(hInstance);
-
-        // idempotent, so doesn't harm, and needed for COM embedding scenario
-        RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
     }
     else if (dwReason == DLL_PROCESS_DETACH)
@@ -68 +65 @@
 STDAPI DllCanUnloadNow(void)
 {
-    return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
+    return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE;
 }
 
@@ -74 +71 @@
 // Returns a class factory to create an object of the requested type
 
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
     return _Module.GetClassObject(rclsid, riid, ppv);