Changeset 62780 in vbox

Timestamp:

Jul 31, 2016 10:48:58 PM (9 years ago)

Author:

vboxsync

Message:

Wrap objbase.h + objidl.h too.

Location:

trunk

Files:

• include/VBox/com/defs.h (modified) (1 diff)
• include/iprt/win/objbase.h (added)
• include/iprt/win/objidl.h (added)
• src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (1 diff)
• src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (1 diff)
• src/VBox/Installer/win/Stub/VBoxStub.cpp (modified) (1 diff)
• src/VBox/Main/glue/com.cpp (modified) (1 diff)
• src/VBox/Main/glue/initterm.cpp (modified) (1 diff)
• src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (1 diff)
• src/VBox/Main/src-server/HostImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/win/NetIf-win.cpp (modified) (1 diff)
• src/VBox/Main/testcase/tstCollector.cpp (modified) (1 diff)

trunk/include/VBox/com/defs.h

@@ -75 +75 @@
 #if !defined(VBOX_WITH_XPCOM)
 
-#if defined(RT_OS_WINDOWS)
+#ifdef RT_OS_WINDOWS
 
 // Windows COM
 /////////////////////////////////////////////////////////////////////////////
 
-#include <objbase.h>
-#ifndef VBOX_COM_NO_ATL
+# include <iprt/win/objbase.h>
+# ifndef VBOX_COM_NO_ATL
 
 /* Do not use actual ATL, just provide a superficial lookalike ourselves. */
-# include <VBox/com/microatl.h>
-#endif /* VBOX_COM_NO_ATL */
-
-#define NS_DECL_ISUPPORTS
-#define NS_IMPL_ISUPPORTS1_CI(a, b)
+#  include <VBox/com/microatl.h>
+# endif /* VBOX_COM_NO_ATL */
+
+# define NS_DECL_ISUPPORTS
+# define NS_IMPL_ISUPPORTS1_CI(a, b)
 
 /* these are XPCOM only, one for every interface implemented */
-#define NS_DECL_ISUPPORTS
+# define NS_DECL_ISUPPORTS
 
 /** Returns @c true if @a rc represents a warning result code */
-#define SUCCEEDED_WARNING(rc)   (SUCCEEDED(rc) && (rc) != S_OK)
+# define SUCCEEDED_WARNING(rc)   (SUCCEEDED(rc) && (rc) != S_OK)
 
 /** Tests is a COM result code indicates that the process implementing the

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

@@ -25 +25 @@
 #include <cfgmgr32.h>
 #include <tchar.h>
-#include <objbase.h>
+#include <iprt/win/objbase.h>
 
 #include <crtdbg.h>

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -41 +41 @@
 #include <guiddef.h>
 #include <devguid.h>
-#include <objbase.h>
+#include <iprt/win/objbase.h>
 #include <iprt/win/setupapi.h>
 #include <shlobj.h>

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -31 +31 @@
 #include <lmerr.h>
 #include <msiquery.h>
-#include <objbase.h>
+#include <iprt/win/objbase.h>
 
 #include <shlobj.h>

trunk/src/VBox/Main/glue/com.cpp

@@ -18 +18 @@
 #if !defined (VBOX_WITH_XPCOM)
 
-# include <objbase.h>
+# include <iprt/win/objbase.h>
 
 #else /* !defined (VBOX_WITH_XPCOM) */

trunk/src/VBox/Main/glue/initterm.cpp

@@ -20 +20 @@
 
 # include <iprt/nt/nt-and-windows.h>
-# include <objbase.h>
+# include <iprt/win/objbase.h>
 
 #else /* !defined(VBOX_WITH_XPCOM) */

trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp

@@ -49 +49 @@
 # define _WIN32_WINNT 0x0501
 # include <iprt/win/windows.h>          /* ShellExecuteEx, ++ */
-# include <Objbase.h>                   /* CoInitializeEx */
+# include <iprt/win/objbase.h>                   /* CoInitializeEx */
 # ifdef DEBUG
 #  include <Sddl.h>

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -123 +123 @@
 # include <guiddef.h>
 # include <devguid.h>
-# include <objbase.h>
+# include <iprt/win/objbase.h>
 //# include <iprt/win/setupapi.h>
 # include <shlobj.h>

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

@@ -59 +59 @@
 #include <guiddef.h>
 #include <devguid.h>
-#include <objbase.h>
+#include <iprt/win/objbase.h>
 #include <iprt/win/setupapi.h>
 #include <shlobj.h>

trunk/src/VBox/Main/testcase/tstCollector.cpp

@@ -35 +35 @@
 #ifdef RT_OS_WINDOWS
 # define _WIN32_DCOM
-# include <objidl.h>
-# include <objbase.h>
+# include <iprt/win/objidl.h>
+# include <iprt/win/objbase.h>
 # include "../src-server/win/PerformanceWin.cpp"
 #endif