[OLE32]

* Create a main header and move some inclusions to it.
* Remove inclusions and definitions that already exist in the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61427

diff --git a/reactos/dll/win32/ole32/CMakeLists.txt b/reactos/dll/win32/ole32/CMakeLists.txt
index effff25..0f2d49c 100644 (file)
--- a/reactos/dll/win32/ole32/CMakeLists.txt
+++ b/reactos/dll/win32/ole32/CMakeLists.txt
@@ -59,6 +59,7 @@ list(APPEND SOURCE
     storage32.c
     stubmanager.c
     usrmarshal.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
     ${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/irot_c.c
@@ -69,11 +70,8 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/ole32.def)
 
-if(MSVC)
-    if(ARCH STREQUAL "i386")
-        list(APPEND SOURCE msvc-thiscall.c)
-    endif()
-    set_source_files_properties(stg_prop.c PROPERTIES COMPILE_FLAGS "/FImsvc.h")
+if(MSVC AND (ARCH STREQUAL "i386"))
+    list(APPEND SOURCE msvc-thiscall.c)
 endif()
 
 add_library(ole32 SHARED ${SOURCE} ole32res.rc)

diff --git a/reactos/dll/win32/ole32/antimoniker.c b/reactos/dll/win32/ole32/antimoniker.c
index 873a78f..93a7140 100644 (file)
--- a/reactos/dll/win32/ole32/antimoniker.c
+++ b/reactos/dll/win32/ole32/antimoniker.c
@@ -18,23 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <objbase.h>
-#include <wine/debug.h>
-#include "moniker.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/bindctx.c b/reactos/dll/win32/ole32/bindctx.c
index accb80f..18e52da 100644 (file)
--- a/reactos/dll/win32/ole32/bindctx.c
+++ b/reactos/dll/win32/ole32/bindctx.c
@@ -18,21 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <objbase.h>
-
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/classmoniker.c b/reactos/dll/win32/ole32/classmoniker.c
index 546c678..c3a937b 100644 (file)
--- a/reactos/dll/win32/ole32/classmoniker.c
+++ b/reactos/dll/win32/ole32/classmoniker.c
@@ -19,25 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <wine/debug.h>
-#include <ole2.h>
-#include <wine/unicode.h>
-#include "moniker.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/clipboard.c b/reactos/dll/win32/ole32/clipboard.c
index dd7900b..5e75697 100644 (file)
--- a/reactos/dll/win32/ole32/clipboard.c
+++ b/reactos/dll/win32/ole32/clipboard.c
@@ -58,32 +58,9 @@
  *
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <assert.h>
-//#include <stdarg.h>
-//#include <string.h>
-#include <stdio.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winerror.h"
-#include <winnls.h>
-#include <ole2.h>
-#include <wine/debug.h>
-//#include "olestd.h"
-
+#include "precomp.h"
 #include "storage32.h"
 
-#include "compobj_private.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 #define HANDLE_ERROR(err) do { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } while (0)

diff --git a/reactos/dll/win32/ole32/comcat.c b/reactos/dll/win32/ole32/comcat.c
index 5cef5db..0f23deb 100644 (file)
--- a/reactos/dll/win32/ole32/comcat.c
+++ b/reactos/dll/win32/ole32/comcat.c
@@ -18,26 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <string.h>
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-//#include "winerror.h"
-
-#include <ole2.h>
-#include <comcat.h>
-#include "compobj_private.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/compobj.c b/reactos/dll/win32/ole32/compobj.c
index b5df30c..5baffd1 100644 (file)
--- a/reactos/dll/win32/ole32/compobj.c
+++ b/reactos/dll/win32/ole32/compobj.c
@@ -36,39 +36,10 @@
  *
  */
 
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-#include <assert.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <ntstatus.h>
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "winreg.h"
-//#include "winuser.h"
-#define USE_COM_CONTEXT_DEF
-//#include "objbase.h"
-#include <ole2.h>
-#include <ole2ver.h>
+#include "precomp.h"
+
 #include <ctxtcall.h>
 #include <dde.h>
-#include <servprov.h>
-
-#include <initguid.h>
-#include "compobj_private.h"
-#include "moniker.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/compobj_private.h b/reactos/dll/win32/ole32/compobj_private.h
index 3a01f0b..dd3400d 100644 (file)
--- a/reactos/dll/win32/ole32/compobj_private.h
+++ b/reactos/dll/win32/ole32/compobj_private.h
@@ -27,17 +27,6 @@
 
 /* All private prototype functions used by OLE will be added to this header file */
 
-#include <stdarg.h>
-
-#include <wine/list.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include <dcom.h>
-#include "winreg.h"
-#include <winternl.h>
-
 struct apartment;
 typedef struct apartment APARTMENT;
 typedef struct LocalServer LocalServer;

diff --git a/reactos/dll/win32/ole32/compositemoniker.c b/reactos/dll/win32/ole32/compositemoniker.c
index bb20508..076033b 100644 (file)
--- a/reactos/dll/win32/ole32/compositemoniker.c
+++ b/reactos/dll/win32/ole32/compositemoniker.c
@@ -18,25 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include <ole2.h>
-#include "moniker.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/datacache.c b/reactos/dll/win32/ole32/datacache.c
index 53a312c..07b29bd 100644 (file)
--- a/reactos/dll/win32/ole32/datacache.c
+++ b/reactos/dll/win32/ole32/datacache.c
@@ -43,25 +43,8 @@
  *     header. I was able to figure-out where the extent of the object
  *     was stored and the aspect, but that's about it.
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winerror.h"
-#include <wine/unicode.h>
-#include <ole2.h>
-#include <wine/list.h>
-#include <wine/debug.h>
+
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/defaulthandler.c b/reactos/dll/win32/ole32/defaulthandler.c
index f1ca02b..f3a450a 100644 (file)
--- a/reactos/dll/win32/ole32/defaulthandler.c
+++ b/reactos/dll/win32/ole32/defaulthandler.c
@@ -45,27 +45,10 @@
  * - All the methods related to notification and advise sinks are
  *   in place but no notifications are sent to the sinks yet.
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
 
-//#include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winerror.h"
-#include <ole2.h>
-
-#include "compobj_private.h"
+#include "precomp.h"
 #include "storage32.h"
 
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 enum storage_state

diff --git a/reactos/dll/win32/ole32/dictionary.c b/reactos/dll/win32/ole32/dictionary.c
index 99574a4..7441f95 100644 (file)
--- a/reactos/dll/win32/ole32/dictionary.c
+++ b/reactos/dll/win32/ole32/dictionary.c
@@ -17,14 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#define WIN32_NO_STATUS
-
-#include <assert.h>
-//#include <stdarg.h>
-//#include "windef.h"
-//#include "winbase.h"
-#include "dictionary.h"
-#include <wine/debug.h>
+
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(storage);
 

diff --git a/reactos/dll/win32/ole32/dictionary.h b/reactos/dll/win32/ole32/dictionary.h
index af6785b..a72157d 100644 (file)
--- a/reactos/dll/win32/ole32/dictionary.h
+++ b/reactos/dll/win32/ole32/dictionary.h
@@ -22,10 +22,6 @@
 #ifndef __DICTIONARY_H__
 #define __DICTIONARY_H__
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-
 struct dictionary;
 
 /* Returns whether key a is less than, equal to, or greater than key b, in

diff --git a/reactos/dll/win32/ole32/enumx.c b/reactos/dll/win32/ole32/enumx.c
index f9851a3..7399a02 100644 (file)
--- a/reactos/dll/win32/ole32/enumx.c
+++ b/reactos/dll/win32/ole32/enumx.c
@@ -18,21 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-
-#include "enumx.h"
-
-#include <wine/list.h>
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/errorinfo.c b/reactos/dll/win32/ole32/errorinfo.c
index 5db64b9..3fa7726 100644 (file)
--- a/reactos/dll/win32/ole32/errorinfo.c
+++ b/reactos/dll/win32/ole32/errorinfo.c
@@ -23,24 +23,7 @@
  * TEB at offset 0xf80.
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <oleauto.h>
-//#include "winerror.h"
-
-#include <wine/unicode.h>
-#include "compobj_private.h"
-
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/filelockbytes.c b/reactos/dll/win32/ole32/filelockbytes.c
index c4d35e2..e151e55 100644 (file)
--- a/reactos/dll/win32/ole32/filelockbytes.c
+++ b/reactos/dll/win32/ole32/filelockbytes.c
@@ -20,29 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <assert.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-//#include <limits.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winerror.h"
-//#include "objbase.h"
-//#include "ole2.h"
-
+#include "precomp.h"
 #include "storage32.h"
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(storage);
 
 typedef struct FileLockBytesImpl

diff --git a/reactos/dll/win32/ole32/filemoniker.c b/reactos/dll/win32/ole32/filemoniker.c
index 396742c..d327e96 100644 (file)
--- a/reactos/dll/win32/ole32/filemoniker.c
+++ b/reactos/dll/win32/ole32/filemoniker.c
@@ -19,27 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "winnls.h"
-#include <wine/unicode.h>
-#include <wine/debug.h>
-#include <objbase.h>
-#include "moniker.h"
-
-//#include "compobj_private.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/ftmarshal.c b/reactos/dll/win32/ole32/ftmarshal.c
index d408139..c9d828f 100644 (file)
--- a/reactos/dll/win32/ole32/ftmarshal.c
+++ b/reactos/dll/win32/ole32/ftmarshal.c
@@ -18,26 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <stdlib.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-//#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-
-#include <wine/debug.h>
-
-#include "compobj_private.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/git.c b/reactos/dll/win32/ole32/git.c
index 13fc89c..0f20bdf 100644 (file)
--- a/reactos/dll/win32/ole32/git.c
+++ b/reactos/dll/win32/ole32/git.c
@@ -24,26 +24,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "objbase.h"
-#include <ole2.h>
-//#include "winerror.h"
-
-#include "compobj_private.h" 
-
-//#include "wine/list.h"
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/guid.c b/reactos/dll/win32/ole32/guid.c
new file mode 100644 (file)
index 0000000..27faec2
--- /dev/null
+++ b/reactos/dll/win32/ole32/guid.c
@@ -0,0 +1,14 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <initguid.h>
+
+DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 );
+
+DEFINE_OLEGUID( CLSID_FileMoniker,      0x303, 0, 0 );
+DEFINE_OLEGUID( CLSID_ItemMoniker,      0x304, 0, 0 );
+DEFINE_OLEGUID( CLSID_AntiMoniker,      0x305, 0, 0 );
+DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 );
+DEFINE_OLEGUID( CLSID_ClassMoniker,     0x31a, 0, 0 );
+DEFINE_OLEGUID( CLSID_PointerMoniker,   0x306, 0, 0 );
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

diff --git a/reactos/dll/win32/ole32/hglobalstream.c b/reactos/dll/win32/ole32/hglobalstream.c
index 5da53e1..d16df82 100644 (file)
--- a/reactos/dll/win32/ole32/hglobalstream.c
+++ b/reactos/dll/win32/ole32/hglobalstream.c
@@ -21,30 +21,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <assert.h>
-//#include <stdlib.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "objbase.h"
-#include <ole2.h>
-//#include "winerror.h"
-//#include "winternl.h"
-
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(storage);
 

diff --git a/reactos/dll/win32/ole32/ifs.c b/reactos/dll/win32/ole32/ifs.c
index 9c77502..b11d5da 100644 (file)
--- a/reactos/dll/win32/ole32/ifs.c
+++ b/reactos/dll/win32/ole32/ifs.c
@@ -18,26 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <ctype.h>
-#include <stdarg.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "winerror.h"
-
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(olemalloc);
 

diff --git a/reactos/dll/win32/ole32/itemmoniker.c b/reactos/dll/win32/ole32/itemmoniker.c
index d553deb..055b695 100644 (file)
--- a/reactos/dll/win32/ole32/itemmoniker.c
+++ b/reactos/dll/win32/ole32/itemmoniker.c
@@ -18,26 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <wine/debug.h>
-#include <ole2.h>
-#include <wine/unicode.h>
-#include "moniker.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/marshal.c b/reactos/dll/win32/ole32/marshal.c
index 6c043f4..11cceda 100644 (file)
--- a/reactos/dll/win32/ole32/marshal.c
+++ b/reactos/dll/win32/ole32/marshal.c
@@ -20,26 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <string.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "objbase.h"
-#include <ole2.h>
-//#include "winerror.h"
-//#include "wine/unicode.h"
-
-#include "compobj_private.h"
-
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/memlockbytes.c b/reactos/dll/win32/ole32/memlockbytes.c
index 5ce4b67..bef4e80 100644 (file)
--- a/reactos/dll/win32/ole32/memlockbytes.c
+++ b/reactos/dll/win32/ole32/memlockbytes.c
@@ -19,27 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <objbase.h>
-//#include "ole2.h"
-//#include "winerror.h"
-
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/moniker.c b/reactos/dll/win32/ole32/moniker.c
index 9de947c..23650d1 100644 (file)
--- a/reactos/dll/win32/ole32/moniker.c
+++ b/reactos/dll/win32/ole32/moniker.c
@@ -21,31 +21,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "wtypes.h"
-#include <ole2.h>
-
-//#include "wine/list.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include <wine/exception.h>
 
-#include "compobj_private.h"
-#include "moniker.h"
 #include <irot.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

diff --git a/reactos/dll/win32/ole32/msvc.h b/reactos/dll/win32/ole32/msvc.h
deleted file mode 100644 (file)
index 44d63b9..0000000
--- a/reactos/dll/win32/ole32/msvc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#define __ASM_STDCALL_FUNC(name,args,code)

diff --git a/reactos/dll/win32/ole32/ole2.c b/reactos/dll/win32/ole32/ole2.c
index 5196cb1..4620dba 100644 (file)
--- a/reactos/dll/win32/ole32/ole2.c
+++ b/reactos/dll/win32/ole32/ole2.c
@@ -23,36 +23,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <assert.h>
-//#include <stdlib.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "winreg.h"
-#include <ole2.h>
-#include <ole2ver.h>
-
-#include <wine/unicode.h>
-#include "compobj_private.h"
-//#include "wine/list.h"
-
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 WINE_DECLARE_DEBUG_CHANNEL(accel);

diff --git a/reactos/dll/win32/ole32/ole2impl.c b/reactos/dll/win32/ole32/ole2impl.c
index 3821e44..b6c9c11 100644 (file)
--- a/reactos/dll/win32/ole32/ole2impl.c
+++ b/reactos/dll/win32/ole32/ole2impl.c
@@ -18,24 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-#include <wine/debug.h>
-#include <ole2.h>
-//#include "olestd.h"
-#include "compobj_private.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/ole2stubs.c b/reactos/dll/win32/ole32/ole2stubs.c
index 60fcea8..47b5f7e 100644 (file)
--- a/reactos/dll/win32/ole32/ole2stubs.c
+++ b/reactos/dll/win32/ole32/ole2stubs.c
@@ -19,19 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "objidl.h"
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/ole32_main.c b/reactos/dll/win32/ole32/ole32_main.c
index 0a1b485..edfceac 100644 (file)
--- a/reactos/dll/win32/ole32/ole32_main.c
+++ b/reactos/dll/win32/ole32/ole32_main.c
@@ -18,23 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
-#include <objbase.h>
-//#include "ole2.h"
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/oleobj.c b/reactos/dll/win32/ole32/oleobj.c
index eea8847..afad866 100644 (file)
--- a/reactos/dll/win32/ole32/oleobj.c
+++ b/reactos/dll/win32/ole32/oleobj.c
@@ -19,24 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <ole2.h>
-
-//#include "compobj_private.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/oleproxy.c b/reactos/dll/win32/ole32/oleproxy.c
index 0e075c6..34c1e49 100644 (file)
--- a/reactos/dll/win32/ole32/oleproxy.c
+++ b/reactos/dll/win32/ole32/oleproxy.c
@@ -19,30 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <stdlib.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <objbase.h>
-//#include "ole2.h"
-//#include "rpc.h"
-
-#include "compobj_private.h"
-#include "moniker.h"
-#include <comcat.h>
+#include "precomp.h"
 
 /***********************************************************************
  *           DllGetClassObject [OLE32.@]

diff --git a/reactos/dll/win32/ole32/pointermoniker.c b/reactos/dll/win32/ole32/pointermoniker.c
index 2a0a80d..26e2d3b 100644 (file)
--- a/reactos/dll/win32/ole32/pointermoniker.c
+++ b/reactos/dll/win32/ole32/pointermoniker.c
@@ -19,24 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "winuser.h"
-#include <objbase.h>
-#include <oleidl.h>
-#include <wine/debug.h>
-#include "moniker.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/precomp.h b/reactos/dll/win32/ole32/precomp.h
new file mode 100644 (file)
index 0000000..af33392
--- /dev/null
+++ b/reactos/dll/win32/ole32/precomp.h
@@ -0,0 +1,39 @@
+#ifndef _OLE32_PCH_
+#define _OLE32_PCH_
+
+#include <config.h>
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define _INC_WINDOWS
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <ntstatus.h>
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <wingdi.h>
+#define USE_COM_CONTEXT_DEF
+#include <ole2.h>
+#include <ole2ver.h>
+#include <dcom.h>
+#include <comcat.h>
+#include <servprov.h>
+#include <winternl.h>
+
+#include <wine/debug.h>
+#include <wine/list.h>
+#include <wine/unicode.h>
+
+#include "compobj_private.h"
+#include "dictionary.h"
+#include "enumx.h"
+#include "moniker.h"
+
+#endif /* _OLE32_PCH_ */

diff --git a/reactos/dll/win32/ole32/rpc.c b/reactos/dll/win32/ole32/rpc.c
index 351adcb..eaf67f7 100644 (file)
--- a/reactos/dll/win32/ole32/rpc.c
+++ b/reactos/dll/win32/ole32/rpc.c
@@ -20,34 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
 #include <winsvc.h>
-//#include "objbase.h"
-#include <ole2.h>
-//#include "rpc.h"
-//#include "winerror.h"
-//#include "winreg.h"
-#include <servprov.h>
-#include <wine/unicode.h>
-
-#include "compobj_private.h"
-
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/ole32/stg_prop.c b/reactos/dll/win32/ole32/stg_prop.c
index 99325d0..499bc7b 100644 (file)
--- a/reactos/dll/win32/ole32/stg_prop.c
+++ b/reactos/dll/win32/ole32/stg_prop.c
@@ -36,32 +36,15 @@
  *   PropertyStorage_ReadFromStream
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <assert.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-//#include "winuser.h"
-#include <wine/unicode.h>
-#include <wine/debug.h>
-#include "dictionary.h"
+#include "precomp.h"
 #include "storage32.h"
-#include "enumx.h"
-#include <oleauto.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(storage);
 
+#ifdef _MSC_VER
+#define __ASM_STDCALL_FUNC(name,args,code)
+#endif
+
 static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface )
 {
     return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface);

diff --git a/reactos/dll/win32/ole32/stg_stream.c b/reactos/dll/win32/ole32/stg_stream.c
index d8b9428..e5e6963 100644 (file)
--- a/reactos/dll/win32/ole32/stg_stream.c
+++ b/reactos/dll/win32/ole32/stg_stream.c
@@ -23,22 +23,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winternl.h"
-#include <wine/debug.h>
-
+#include "precomp.h"
 #include "storage32.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(storage);

diff --git a/reactos/dll/win32/ole32/storage32.c b/reactos/dll/win32/ole32/storage32.c
index 27b8fff..57a7fef 100644 (file)
--- a/reactos/dll/win32/ole32/storage32.c
+++ b/reactos/dll/win32/ole32/storage32.c
@@ -30,29 +30,10 @@
  *  residing in a compound file object.
  */
 
-#include <assert.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-//#include "winuser.h"
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
+#include "precomp.h"
 #include "storage32.h"
-#include <ole2.h>      /* For Write/ReadClassStm */
 
-//#include "winreg.h"
 #include <wine/wingdi16.h>
-#include "compobj_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(storage);
 

diff --git a/reactos/dll/win32/ole32/storage32.h b/reactos/dll/win32/ole32/storage32.h
index 25f4ed0..0313e97 100644 (file)
--- a/reactos/dll/win32/ole32/storage32.h
+++ b/reactos/dll/win32/ole32/storage32.h
@@ -30,19 +30,6 @@
 #ifndef __STORAGE32_H__
 #define __STORAGE32_H__
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnt.h"
-#include <objbase.h>
-#include <winreg.h>
-#include "winternl.h"
-#include <wine/list.h>
-
 /*
  * Definitions for the file format offsets.
  */

diff --git a/reactos/dll/win32/ole32/stubmanager.c b/reactos/dll/win32/ole32/stubmanager.c
index e617ec3..e1981e4 100644 (file)
--- a/reactos/dll/win32/ole32/stubmanager.c
+++ b/reactos/dll/win32/ole32/stubmanager.c
@@ -23,29 +23,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <assert.h>
-#include <stdarg.h>
-//#include <limits.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <objbase.h>
-//#include "rpc.h"
-
-#include <wine/debug.h>
-#include "compobj_private.h"
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-
 /* generates an ipid in the following format (similar to native version):
  * Data1 = apartment-local ipid counter
  * Data2 = apartment creator thread ID

diff --git a/reactos/dll/win32/ole32/usrmarshal.c b/reactos/dll/win32/ole32/usrmarshal.c
index 0c61b4f..eec4990 100644 (file)
--- a/reactos/dll/win32/ole32/usrmarshal.c
+++ b/reactos/dll/win32/ole32/usrmarshal.c
@@ -18,29 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdio.h>
-//#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winerror.h"
-
-#include <ole2.h>
-//#include "oleauto.h"
-//#include "rpcproxy.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);