[OLEAUT32]

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

svn path=/trunk/; revision=61429

diff --git a/reactos/dll/win32/oleaut32/connpt.c b/reactos/dll/win32/oleaut32/connpt.c
index d5c396d..487a0b8 100644 (file)
--- a/reactos/dll/win32/oleaut32/connpt.c
+++ b/reactos/dll/win32/oleaut32/connpt.c
@@ -22,25 +22,9 @@
  * comments just above that function for information.
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
 #include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-//#include "winuser.h"
-#include <ole2.h>
-#include <olectl.h>
-//#include "connpt.h"
-
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/oleaut32/dispatch.c b/reactos/dll/win32/oleaut32/dispatch.c
index fe5158f..a332417 100644 (file)
--- a/reactos/dll/win32/oleaut32/dispatch.c
+++ b/reactos/dll/win32/oleaut32/dispatch.c
@@ -19,26 +19,7 @@
  *
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <stdlib.h>
-//#include <string.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <ctype.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <oleauto.h>
-//#include "winerror.h"
-
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/oleaut32/hash.c b/reactos/dll/win32/oleaut32/hash.c
index 613f4af..9099948 100644 (file)
--- a/reactos/dll/win32/oleaut32/hash.c
+++ b/reactos/dll/win32/oleaut32/hash.c
@@ -18,17 +18,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
-#define _INC_WINDOWS
 
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <objbase.h>
-//#include "oaidl.h"
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Bg.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Bg.rc
index 70b8deb..29a1d8f 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Bg.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Bg.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Cy.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Cy.rc
index af94280..fdd3492 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Cy.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Cy.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Cz.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Cz.rc
index 680143b..b5a212c 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Cz.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Cz.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Da.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Da.rc
index 1f54db3..225e0bd 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Da.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Da.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_De.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_De.rc
index 61a3c26..73206c2 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_De.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_De.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_El.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_El.rc
index 7374504..dd62343 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_El.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_El.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_En.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_En.rc
index f352004..27fe86c 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_En.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_En.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Es.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Es.rc
index eeb3d90..864d42f 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Es.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Es.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Fr.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Fr.rc
index 1583bd1..3d79fc9 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Fr.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Fr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_He.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_He.rc
index 2c51c09..d053ebe 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_He.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_He.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Hu.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Hu.rc
index 5705441..84ff5d9 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Hu.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Hu.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_It.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_It.rc
index 561675c..bf2ddec 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_It.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_It.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Ko.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Ko.rc
index a91be61..7a2ca72 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Ko.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Ko.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Lt.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Lt.rc
index 1eca35f..77bd64e 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Lt.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Lt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Nl.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Nl.rc
index 513ba61..9667ef3 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Nl.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Nl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_No.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_No.rc
index f1b6d63..8467bc8 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_No.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_No.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Pl.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Pl.rc
index f80bc80..3237f8e 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Pl.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Pl.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT 
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Pt.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Pt.rc
index 484990d..55c34fb 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Pt.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Pt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Ro.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Ro.rc
index 1b80fa2..8f71883 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Ro.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Ro.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Ru.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Ru.rc
index 1545bff..e2f0161 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Ru.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Ru.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Si.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Si.rc
index bf4e995..c0a4d23 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Si.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Si.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Sv.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Sv.rc
index 08bee95..09a5cb9 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Sv.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Sv.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Th.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Th.rc
index 0cc3831..bc96d2a 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Th.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Th.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc
index a2dd130..15e6197 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Uk.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Uk.rc
index 56bf352..38b020c 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Uk.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Uk.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Zh.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Zh.rc
index 7257f83..0005e4c 100644 (file)
--- a/reactos/dll/win32/oleaut32/lang/oleaut32_Zh.rc
+++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Zh.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oleaut32/oleaut.c b/reactos/dll/win32/oleaut32/oleaut.c
index 7a6b94a..8f77d18 100644 (file)
--- a/reactos/dll/win32/oleaut32/oleaut.c
+++ b/reactos/dll/win32/oleaut32/oleaut.c
@@ -18,30 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#include <stdarg.h>
-//#include <string.h>
-//#include <limits.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winerror.h"
-
-#include <ole2.h>
-#include <olectl.h>
-//#include "oleauto.h"
 #include <initguid.h>
-#include "typelib.h"
 #include <oleaut32_oaidl.h>
 
-#include <wine/debug.h>
-//#include "wine/unicode.h"
+#include "typelib.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 WINE_DECLARE_DEBUG_CHANNEL(heap);

diff --git a/reactos/dll/win32/oleaut32/oleaut32.rc b/reactos/dll/win32/oleaut32/oleaut32.rc
index 737d902..7ce9f88 100644 (file)
--- a/reactos/dll/win32/oleaut32/oleaut32.rc
+++ b/reactos/dll/win32/oleaut32/oleaut32.rc
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "resource.h"
+#include <windef.h>
+
+#include "resource.h"
 
 #ifdef LANGUAGE_BG_BG
     #include "lang/oleaut32_Bg.rc"

diff --git a/reactos/dll/win32/oleaut32/olefont.c b/reactos/dll/win32/oleaut32/olefont.c
index b4f3101..770d659 100644 (file)
--- a/reactos/dll/win32/oleaut32/olefont.c
+++ b/reactos/dll/win32/oleaut32/olefont.c
@@ -21,31 +21,10 @@
  * 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
-#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 <wingdi.h>
-//#include "winuser.h"
+
+#include "precomp.h"
+
 #include <wine/list.h>
-#include <wine/unicode.h>
-#include <objbase.h>
-#include <oleauto.h>    /* for SysAllocString(....) */
-//#include "ole2.h"
-#include <olectl.h>
-#include <wine/debug.h>
-#include "connpt.h" /* for CreateConnectionPoint */
-//#include "oaidl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/oleaut32/olepicture.c b/reactos/dll/win32/oleaut32/olepicture.c
index a698c92..f510d13 100644 (file)
--- a/reactos/dll/win32/oleaut32/olepicture.c
+++ b/reactos/dll/win32/oleaut32/olepicture.c
@@ -36,38 +36,15 @@
  *
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-//#include "wine/port.h"
+#include "precomp.h"
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
+
 #include <ole2.h>
-#include <olectl.h>
-//#include "oleauto.h"
-#include "connpt.h"
-//#include "urlmon.h"
 #include <initguid.h>
 #include <wincodec.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "wine/library.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(olepicture);
 

diff --git a/reactos/dll/win32/oleaut32/olepropframe.c b/reactos/dll/win32/oleaut32/olepropframe.c
index eb9a1c3..af5e2be 100644 (file)
--- a/reactos/dll/win32/oleaut32/olepropframe.c
+++ b/reactos/dll/win32/oleaut32/olepropframe.c
@@ -19,22 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <ole2.h>
-#include <olectl.h>
 #include <oledlg.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/oleaut32/precomp.h b/reactos/dll/win32/oleaut32/precomp.h
new file mode 100644 (file)
index 0000000..9d390f8
--- /dev/null
+++ b/reactos/dll/win32/oleaut32/precomp.h
@@ -0,0 +1,30 @@
+#ifndef _OLEAUT32_PCH_
+#define _OLEAUT32_PCH_
+
+#include <config.h>
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winreg.h>
+#include <objbase.h>
+#include <olectl.h>
+#include <oleauto.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+#include "connpt.h"
+#include "variant.h"
+
+#endif /* _OLEAUT32_PCH_ */

diff --git a/reactos/dll/win32/oleaut32/recinfo.c b/reactos/dll/win32/oleaut32/recinfo.c
index a274433..22a889b 100644 (file)
--- a/reactos/dll/win32/oleaut32/recinfo.c
+++ b/reactos/dll/win32/oleaut32/recinfo.c
@@ -16,23 +16,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 <objbase.h>
-//#include "oaidl.h"
-#include <oleauto.h>
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/oleaut32/resource.h b/reactos/dll/win32/oleaut32/resource.h
index 550170a..daf3a4b 100644 (file)
--- a/reactos/dll/win32/oleaut32/resource.h
+++ b/reactos/dll/win32/oleaut32/resource.h
@@ -17,11 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #ifndef WINE_OLEAUT32_RESOURCE_H
 #define WINE_OLEAUT32_RESOURCE_H
 
-#include <windef.h>
-
 /* Localised boolean text */
 #define IDS_TRUE  100
 #define IDS_FALSE 101

diff --git a/reactos/dll/win32/oleaut32/safearray.c b/reactos/dll/win32/oleaut32/safearray.c
index f3f4c5a..88a7e13 100644 (file)
--- a/reactos/dll/win32/oleaut32/safearray.c
+++ b/reactos/dll/win32/oleaut32/safearray.c
@@ -31,22 +31,7 @@
  *  0x10: SAFEARRAYBOUNDS[0...]
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <string.h>
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-//#include "winerror.h"
-#include <winbase.h>
-#include <variant.h>
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(variant);
 

diff --git a/reactos/dll/win32/oleaut32/tmarshal.c b/reactos/dll/win32/oleaut32/tmarshal.c
index ea814b2..82eee54 100644 (file)
--- a/reactos/dll/win32/oleaut32/tmarshal.c
+++ b/reactos/dll/win32/oleaut32/tmarshal.c
@@ -21,35 +21,12 @@
  * 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 <assert.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <ctype.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <winreg.h>
-//#include "winuser.h"
+#include "precomp.h"
 
 #include <ole2.h>
-//#include "propidl.h" /* for LPSAFEARRAY_User* functions */
+
 #include "typelib.h"
-#include "variant.h"
-#include <wine/debug.h>
+
 #include <wine/exception.h>
 
 static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0};

diff --git a/reactos/dll/win32/oleaut32/typelib.c b/reactos/dll/win32/oleaut32/typelib.c
index f2b71c2..48b5ff9 100644 (file)
--- a/reactos/dll/win32/oleaut32/typelib.c
+++ b/reactos/dll/win32/oleaut32/typelib.c
@@ -47,36 +47,13 @@
  *
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdlib.h>
-//#include <string.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <ctype.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <winerror.h>
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-#include <winreg.h>
-#include <winuser.h>
+#include "precomp.h"
+
 #include <winternl.h>
 #include <lzexpand.h>
 
-#include <wine/unicode.h>
-#include <objbase.h>
 #include "typelib.h"
-#include <wine/debug.h>
-#include "variant.h"
+
 #include <wine/list.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

diff --git a/reactos/dll/win32/oleaut32/typelib.h b/reactos/dll/win32/oleaut32/typelib.h
index 0fb04f1..8914a42 100644 (file)
--- a/reactos/dll/win32/oleaut32/typelib.h
+++ b/reactos/dll/win32/oleaut32/typelib.h
@@ -21,12 +21,6 @@
 #ifndef _WINE_TYPELIB_H
 #define _WINE_TYPELIB_H
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-#include <oleauto.h>
-
 #define HELPDLLFLAG (0x0100)
 #define DO_NOT_SEEK (-1)
 

diff --git a/reactos/dll/win32/oleaut32/usrmarshal.c b/reactos/dll/win32/oleaut32/usrmarshal.c
index b6fe2e8..de90951 100644 (file)
--- a/reactos/dll/win32/oleaut32/usrmarshal.c
+++ b/reactos/dll/win32/oleaut32/usrmarshal.c
@@ -19,27 +19,9 @@
  * 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 "winerror.h"
+#include "precomp.h"
 
 #include <ole2.h>
-//#include "oleauto.h"
-//#include "typelib.h"
-#include <ocidl.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/oleaut32/varformat.c b/reactos/dll/win32/oleaut32/varformat.c
index f571443..1827909 100644 (file)
--- a/reactos/dll/win32/oleaut32/varformat.c
+++ b/reactos/dll/win32/oleaut32/varformat.c
@@ -25,24 +25,7 @@
  *  Please submit a test case if you find a difference.
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <string.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-//#include "windef.h"
-//#include "winbase.h"
-#include <wine/unicode.h>
-//#include "winerror.h"
-#include "variant.h"
-#include <wine/debug.h>
+#include "precomp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(variant);
 

diff --git a/reactos/dll/win32/oleaut32/variant.c b/reactos/dll/win32/oleaut32/variant.c
index 67608e6..5329bae 100644 (file)
--- a/reactos/dll/win32/oleaut32/variant.c
+++ b/reactos/dll/win32/oleaut32/variant.c
@@ -25,26 +25,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 <string.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "windef.h"
-//#include "winbase.h"
-#include <wine/unicode.h>
-//#include "winerror.h"
-#include "variant.h"
 #include "resource.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(variant);
 

diff --git a/reactos/dll/win32/oleaut32/variant.h b/reactos/dll/win32/oleaut32/variant.h
index 97bebfc..b2c0d61 100644 (file)
--- a/reactos/dll/win32/oleaut32/variant.h
+++ b/reactos/dll/win32/oleaut32/variant.h
@@ -17,12 +17,9 @@
  * 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 NONAMELESSUNION
-#define NONAMELESSSTRUCT
-//#include "windef.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <oleauto.h>
+
+#pragma once
+
 #include <math.h>
 
 /* Get just the type from a variant pointer */

diff --git a/reactos/dll/win32/oleaut32/vartype.c b/reactos/dll/win32/oleaut32/vartype.c
index 5553d77..9a24323 100644 (file)
--- a/reactos/dll/win32/oleaut32/vartype.c
+++ b/reactos/dll/win32/oleaut32/vartype.c
@@ -18,19 +18,8 @@
  * 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 <wine/debug.h>
-#include <wine/unicode.h>
-//#include "winbase.h"
-#include <winuser.h>
-//#include "winnt.h"
-#include "variant.h"
+#include "precomp.h"
+
 #include "resource.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(variant);