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

Timestamp:

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

Author:

vboxsync

Message:

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

File:

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

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2004-2013 Oracle Corporation
+ * Copyright (C) 2004-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <tchar.h>
 
 #include "VBox/com/defs.h"
@@ -41 +42 @@
 #include <iprt/message.h>
 
-#include <atlbase.h>
-#include <atlcom.h>
-
-#define _ATL_FREE_THREADED
-
-class CExeModule : public CComModule
+class CExeModule : public ATL::CComModule
 {
 public:
@@ -70 +66 @@
 LONG CExeModule::Unlock()
 {
-    LONG l = CComModule::Unlock();
+    LONG l = ATL::CComModule::Unlock();
     if (l == 0)
     {
@@ -92 +88 @@
         } while (dwWait == WAIT_OBJECT_0);
         /* timed out */
-        if (!bActivity && m_nLockCnt == 0) /* if no activity let's really bail */
+        if (!bActivity && GetLockCount() == 0) /* if no activity let's really bail */
         {
             /* Disable log rotation at this point, worst case a log file
@@ -114 +110 @@
                 }
             }
-#if _WIN32_WINNT >= 0x0400 & defined(_ATL_FREE_THREADED)
+#if _WIN32_WINNT >= 0x0400
             CoSuspendClassObjects();
-            if (!bActivity && m_nLockCnt == 0)
+            if (!bActivity && GetLockCount() == 0)
 #endif
                 break;
@@ -135 +131 @@
 }
 
-CExeModule _Module;
+static CExeModule _Module;
 
 BEGIN_OBJECT_MAP(ObjectMap)
@@ -384 +380 @@
     {
         _Module.StartMonitor();
-#if _WIN32_WINNT >= 0x0400 & defined(_ATL_FREE_THREADED)
+#if _WIN32_WINNT >= 0x0400
         hRes = _Module.RegisterClassObjects(CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE | REGCLS_SUSPENDED);
         _ASSERTE(SUCCEEDED(hRes));