Changeset 60765 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/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

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj

Files:

• VBoxNetFltNobj.cpp (modified) (3 diffs)
• VBoxNetFltNobj.h (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp

@@ -5 +5 @@
  */
 /*
- * Copyright (C) 2011-2015 Oracle Corporation
+ * Copyright (C) 2011-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -542 +542 @@
 
 
-CComModule _Module;
+static ATL::CComModule _Module;
 
 BEGIN_OBJECT_MAP(ObjectMap)
@@ -575 +575 @@
 STDAPI DllRegisterServer()
 {
+// this is a "just in case" conditional, which is not defined
+#ifdef VBOX_FORCE_REGISTER_SERVER
     return _Module.RegisterServer(TRUE);
+#else
+    return S_OK;
+#endif
 }
 
 STDAPI DllUnregisterServer()
 {
+// this is a "just in case" conditional, which is not defined
+#ifdef VBOX_FORCE_REGISTER_SERVER
     return _Module.UnregisterServer(TRUE);
-}
+#else
+    return S_OK;
+#endif
+}

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h

@@ -5 +5 @@
  */
 /*
- * Copyright (C) 2011-2015 Oracle Corporation
+ * Copyright (C) 2011-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 
 #include <windows.h>
-/* atl stuff */
-#include <atlbase.h>
-extern CComModule _Module;
-#include <atlcom.h>
 
+#include "VBox/com/defs.h"
 #include "VBoxNetFltNobjT.h"
 #include "VBoxNetFltNobjRc.h"
@@ -34 +31 @@
  */
 class ATL_NO_VTABLE VBoxNetFltNobj :
-    public CComObjectRootEx<CComObjectThreadModel>,
-    public CComCoClass<VBoxNetFltNobj, &CLSID_VBoxNetFltNobj>,
+    public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>,
+    public ATL::CComCoClass<VBoxNetFltNobj, &CLSID_VBoxNetFltNobj>,
     public INetCfgComponentControl,
     public INetCfgComponentNotifyBinding
@@ -48 +45 @@
     END_COM_MAP()
 
+    // this is a "just in case" conditional, which is not defined
+#ifdef VBOX_FORCE_REGISTER_SERVER
     DECLARE_REGISTRY_RESOURCEID(IDR_VBOXNETFLT_NOBJ)
+#endif
 
     /* INetCfgComponentControl methods */