[ros-diffs] [akhaldi] 61427: [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

Author: akhaldi
Date: Thu Dec 26 16:07:35 2013
New Revision: 61427

URL: http://svn.reactos.org/svn/reactos?rev=61427&view=rev
Log:
[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

Added:
    trunk/reactos/dll/win32/ole32/guid.c   (with props)
    trunk/reactos/dll/win32/ole32/precomp.h   (with props)
Removed:
    trunk/reactos/dll/win32/ole32/msvc.h
Modified:
    trunk/reactos/dll/win32/ole32/CMakeLists.txt
    trunk/reactos/dll/win32/ole32/antimoniker.c
    trunk/reactos/dll/win32/ole32/bindctx.c
    trunk/reactos/dll/win32/ole32/classmoniker.c
    trunk/reactos/dll/win32/ole32/clipboard.c
    trunk/reactos/dll/win32/ole32/comcat.c
    trunk/reactos/dll/win32/ole32/compobj.c
    trunk/reactos/dll/win32/ole32/compobj_private.h
    trunk/reactos/dll/win32/ole32/compositemoniker.c
    trunk/reactos/dll/win32/ole32/datacache.c
    trunk/reactos/dll/win32/ole32/defaulthandler.c
    trunk/reactos/dll/win32/ole32/dictionary.c
    trunk/reactos/dll/win32/ole32/dictionary.h
    trunk/reactos/dll/win32/ole32/enumx.c
    trunk/reactos/dll/win32/ole32/errorinfo.c
    trunk/reactos/dll/win32/ole32/filelockbytes.c
    trunk/reactos/dll/win32/ole32/filemoniker.c
    trunk/reactos/dll/win32/ole32/ftmarshal.c
    trunk/reactos/dll/win32/ole32/git.c
    trunk/reactos/dll/win32/ole32/hglobalstream.c
    trunk/reactos/dll/win32/ole32/ifs.c
    trunk/reactos/dll/win32/ole32/itemmoniker.c
    trunk/reactos/dll/win32/ole32/marshal.c
    trunk/reactos/dll/win32/ole32/memlockbytes.c
    trunk/reactos/dll/win32/ole32/moniker.c
    trunk/reactos/dll/win32/ole32/ole2.c
    trunk/reactos/dll/win32/ole32/ole2impl.c
    trunk/reactos/dll/win32/ole32/ole2stubs.c
    trunk/reactos/dll/win32/ole32/ole32_main.c
    trunk/reactos/dll/win32/ole32/oleobj.c
    trunk/reactos/dll/win32/ole32/oleproxy.c
    trunk/reactos/dll/win32/ole32/pointermoniker.c
    trunk/reactos/dll/win32/ole32/rpc.c
    trunk/reactos/dll/win32/ole32/stg_prop.c
    trunk/reactos/dll/win32/ole32/stg_stream.c
    trunk/reactos/dll/win32/ole32/storage32.c
    trunk/reactos/dll/win32/ole32/storage32.h
    trunk/reactos/dll/win32/ole32/stubmanager.c
    trunk/reactos/dll/win32/ole32/usrmarshal.c

Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/ole32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/CMakeLists.txt	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -59,6 +59,7 @@
     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 @@
     ${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)

Modified: trunk/reactos/dll/win32/ole32/antimoniker.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/antimonike…
==============================================================================
--- trunk/reactos/dll/win32/ole32/antimoniker.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/antimoniker.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/bindctx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/bindctx.c?…
==============================================================================
--- trunk/reactos/dll/win32/ole32/bindctx.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/bindctx.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/classmoniker.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/classmonik…
==============================================================================
--- trunk/reactos/dll/win32/ole32/classmoniker.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/classmoniker.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/clipboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.…
==============================================================================
--- trunk/reactos/dll/win32/ole32/clipboard.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/clipboard.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -58,31 +58,8 @@
  *
  */
 
-#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);
 

Modified: trunk/reactos/dll/win32/ole32/comcat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/comcat.c?r…
==============================================================================
--- trunk/reactos/dll/win32/ole32/comcat.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/comcat.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/compobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?…
==============================================================================
--- trunk/reactos/dll/win32/ole32/compobj.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/compobj.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/compobj_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr…
==============================================================================
--- trunk/reactos/dll/win32/ole32/compobj_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/compobj_private.h	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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;

Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem…
==============================================================================
--- trunk/reactos/dll/win32/ole32/compositemoniker.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/compositemoniker.c	[iso-8859-1] Thu Dec 26 16:07:35
2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/datacache.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.…
==============================================================================
--- trunk/reactos/dll/win32/ole32/datacache.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/datacache.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan…
==============================================================================
--- trunk/reactos/dll/win32/ole32/defaulthandler.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/defaulthandler.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -45,26 +45,9 @@
  * - 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);
 

Modified: trunk/reactos/dll/win32/ole32/dictionary.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dictionary…
==============================================================================
--- trunk/reactos/dll/win32/ole32/dictionary.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/dictionary.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/dictionary.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dictionary…
==============================================================================
--- trunk/reactos/dll/win32/ole32/dictionary.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/dictionary.h	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -21,10 +21,6 @@
  */
 #ifndef __DICTIONARY_H__
 #define __DICTIONARY_H__
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
 
 struct dictionary;
 

Modified: trunk/reactos/dll/win32/ole32/enumx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/enumx.c?re…
==============================================================================
--- trunk/reactos/dll/win32/ole32/enumx.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/enumx.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/errorinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/errorinfo.…
==============================================================================
--- trunk/reactos/dll/win32/ole32/errorinfo.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/errorinfo.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/filelockbytes.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filelockby…
==============================================================================
--- trunk/reactos/dll/win32/ole32/filelockbytes.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/filelockbytes.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -20,28 +20,8 @@
  * 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);
 

Modified: trunk/reactos/dll/win32/ole32/filemoniker.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike…
==============================================================================
--- trunk/reactos/dll/win32/ole32/filemoniker.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/filemoniker.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/ftmarshal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ftmarshal.…
==============================================================================
--- trunk/reactos/dll/win32/ole32/ftmarshal.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ftmarshal.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/git.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/git.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/ole32/git.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/git.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Added: trunk/reactos/dll/win32/ole32/guid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/guid.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/ole32/guid.c	(added)
+++ trunk/reactos/dll/win32/ole32/guid.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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 */

Propchange: trunk/reactos/dll/win32/ole32/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/ole32/hglobalstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/hglobalstr…
==============================================================================
--- trunk/reactos/dll/win32/ole32/hglobalstream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/hglobalstream.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/ifs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/ole32/ifs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ifs.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike…
==============================================================================
--- trunk/reactos/dll/win32/ole32/itemmoniker.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/itemmoniker.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/marshal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?…
==============================================================================
--- trunk/reactos/dll/win32/ole32/marshal.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/marshal.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/memlockbytes.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/memlockbyt…
==============================================================================
--- trunk/reactos/dll/win32/ole32/memlockbytes.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/memlockbytes.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/moniker.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?…
==============================================================================
--- trunk/reactos/dll/win32/ole32/moniker.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/moniker.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -21,31 +21,10 @@
  * 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 <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 "precomp.h"
+
 #include <wine/exception.h>
 
-#include "compobj_private.h"
-#include "moniker.h"
 #include <irot.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

Removed: trunk/reactos/dll/win32/ole32/msvc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/msvc.h?rev…
==============================================================================
--- trunk/reactos/dll/win32/ole32/msvc.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/msvc.h	(removed)
@@ -1,2 +0,0 @@
-
-#define __ASM_STDCALL_FUNC(name,args,code)

Modified: trunk/reactos/dll/win32/ole32/ole2.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/ole32/ole2.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ole2.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);

Modified: trunk/reactos/dll/win32/ole32/ole2impl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2impl.c…
==============================================================================
--- trunk/reactos/dll/win32/ole32/ole2impl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ole2impl.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/ole2stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2stubs.…
==============================================================================
--- trunk/reactos/dll/win32/ole32/ole2stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ole2stubs.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/ole32_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_main…
==============================================================================
--- trunk/reactos/dll/win32/ole32/ole32_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ole32_main.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/oleobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleobj.c?r…
==============================================================================
--- trunk/reactos/dll/win32/ole32/oleobj.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/oleobj.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/oleproxy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c…
==============================================================================
--- trunk/reactos/dll/win32/ole32/oleproxy.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/oleproxy.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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.@]

Modified: trunk/reactos/dll/win32/ole32/pointermoniker.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/pointermon…
==============================================================================
--- trunk/reactos/dll/win32/ole32/pointermoniker.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/pointermoniker.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Added: trunk/reactos/dll/win32/ole32/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/precomp.h?…
==============================================================================
--- trunk/reactos/dll/win32/ole32/precomp.h	(added)
+++ trunk/reactos/dll/win32/ole32/precomp.h	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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_ */

Propchange: trunk/reactos/dll/win32/ole32/precomp.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/ole32/rpc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/ole32/rpc.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/rpc.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -20,34 +20,9 @@
  * 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 <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
+#include "precomp.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);
 

Modified: trunk/reactos/dll/win32/ole32/stg_prop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c…
==============================================================================
--- trunk/reactos/dll/win32/ole32/stg_prop.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/stg_prop.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -36,31 +36,14 @@
  *   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 )
 {

Modified: trunk/reactos/dll/win32/ole32/stg_stream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_stream…
==============================================================================
--- trunk/reactos/dll/win32/ole32/stg_stream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/stg_stream.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);

Modified: trunk/reactos/dll/win32/ole32/storage32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.…
==============================================================================
--- trunk/reactos/dll/win32/ole32/storage32.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/storage32.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/ole32/storage32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.…
==============================================================================
--- trunk/reactos/dll/win32/ole32/storage32.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/storage32.h	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -29,19 +29,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.

Modified: trunk/reactos/dll/win32/ole32/stubmanager.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stubmanage…
==============================================================================
--- trunk/reactos/dll/win32/ole32/stubmanager.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/stubmanager.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -23,28 +23,9 @@
  * 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

Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal…
==============================================================================
--- trunk/reactos/dll/win32/ole32/usrmarshal.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/usrmarshal.c	[iso-8859-1] Thu Dec 26 16:07:35 2013
@@ -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);