From 1129d0f0995d87a84b96baebaebaa423d6748105 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 26 Dec 2013 18:50:10 +0000 Subject: [PATCH] [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 --- reactos/dll/win32/oleaut32/connpt.c | 18 +---------- reactos/dll/win32/oleaut32/dispatch.c | 21 +------------ reactos/dll/win32/oleaut32/hash.c | 11 +------ .../dll/win32/oleaut32/lang/oleaut32_Bg.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Cy.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Cz.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Da.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_De.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_El.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_En.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Es.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Fr.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_He.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Hu.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_It.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Ko.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Lt.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Nl.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_No.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Pl.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Pt.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Ro.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Ru.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Si.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Sv.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Th.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Tr.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Uk.rc | 2 -- .../dll/win32/oleaut32/lang/oleaut32_Zh.rc | 2 -- reactos/dll/win32/oleaut32/oleaut.c | 22 ++------------ reactos/dll/win32/oleaut32/oleaut32.rc | 6 ++-- reactos/dll/win32/oleaut32/olefont.c | 27 ++--------------- reactos/dll/win32/oleaut32/olepicture.c | 27 ++--------------- reactos/dll/win32/oleaut32/olepropframe.c | 15 +--------- reactos/dll/win32/oleaut32/precomp.h | 30 +++++++++++++++++++ reactos/dll/win32/oleaut32/recinfo.c | 18 +---------- reactos/dll/win32/oleaut32/resource.h | 3 +- reactos/dll/win32/oleaut32/safearray.c | 17 +---------- reactos/dll/win32/oleaut32/tmarshal.c | 29 ++---------------- reactos/dll/win32/oleaut32/typelib.c | 29 ++---------------- reactos/dll/win32/oleaut32/typelib.h | 6 ---- reactos/dll/win32/oleaut32/usrmarshal.c | 20 +------------ reactos/dll/win32/oleaut32/varformat.c | 19 +----------- reactos/dll/win32/oleaut32/variant.c | 19 +----------- reactos/dll/win32/oleaut32/variant.h | 9 ++---- reactos/dll/win32/oleaut32/vartype.c | 15 ++-------- 46 files changed, 61 insertions(+), 352 deletions(-) create mode 100644 reactos/dll/win32/oleaut32/precomp.h diff --git a/reactos/dll/win32/oleaut32/connpt.c b/reactos/dll/win32/oleaut32/connpt.c index d5c396d9e8d..487a0b8d40b 100644 --- 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 -#include -//#include - -#define COBJMACROS - -//#include "winerror.h" -#include -#include -//#include "wingdi.h" -//#include "winuser.h" -#include -#include -//#include "connpt.h" - -#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/dispatch.c b/reactos/dll/win32/oleaut32/dispatch.c index fe5158fd7b9..a3324178c04 100644 --- 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 - -//#include -//#include -#include -//#include -//#include - -#define COBJMACROS - -#include -#include -#include -#include -//#include "winerror.h" - -#include +#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 613f4afb16b..9099948d804 100644 --- 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 - -#include -#include -#include -#include -//#include "oaidl.h" -#include +#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 70b8debe73c..29a1d8fb7e8 100644 --- 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 af9428059e0..fdd3492bb89 100644 --- 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 680143b3127..b5a212c973f 100644 --- 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 1f54db37f0a..225e0bda597 100644 --- 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 61a3c260e41..73206c25a1d 100644 --- 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 73745041fac..dd62343477f 100644 --- 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 f35200465ce..27fe86c1a8d 100644 --- 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 eeb3d9080a6..864d42f7dd6 100644 --- 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 1583bd1d3c2..3d79fc9ccbc 100644 --- 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 2c51c093e8d..d053ebe5cc9 100644 --- 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 5705441b74a..84ff5d9aa3b 100644 --- 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 561675c43af..bf2ddecc93f 100644 --- 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 a91be617321..7a2ca726d03 100644 --- 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 1eca35f3734..77bd64e5674 100644 --- 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 513ba61cb6c..9667ef32973 100644 --- 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 f1b6d636506..8467bc8c587 100644 --- 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 f80bc80a1fb..3237f8e56c4 100644 --- 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 484990de8ad..55c34fb1863 100644 --- 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 1b80fa2fe2e..8f718833322 100644 --- 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 1545bffd07b..e2f0161e511 100644 --- 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 bf4e9953920..c0a4d23ec15 100644 --- 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 08bee95caaf..09a5cb97693 100644 --- 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 0cc3831f132..bc96d2adc7f 100644 --- 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 a2dd130e30a..15e61975108 100644 --- 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 56bf3520fe0..38b020c486b 100644 --- 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 7257f836ed2..0005e4cd43f 100644 --- 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 7a6b94a792d..8f77d18c8b7 100644 --- 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 -//#include -//#include - -#define COBJMACROS - -#include -#include -#include -//#include "winuser.h" -//#include "winerror.h" - -#include -#include -//#include "oleauto.h" #include -#include "typelib.h" #include -#include -//#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 737d902b574..7ce9f881b40 100644 --- 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 + +#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 b4f3101a6ce..770d6597f3d 100644 --- 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 -//#include -#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "winerror.h" -#include -//#include "winbase.h" -#include -//#include "winuser.h" + +#include "precomp.h" + #include -#include -#include -#include /* for SysAllocString(....) */ -//#include "ole2.h" -#include -#include -#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 a698c92ca07..f510d13202d 100644 --- 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 -//#include "wine/port.h" +#include "precomp.h" #ifdef HAVE_UNISTD_H # include #endif -//#include -#include -//#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "winerror.h" -#include -#include -#include -//#include "winuser.h" + #include -#include -//#include "oleauto.h" -#include "connpt.h" -//#include "urlmon.h" #include #include -#include -#include -//#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 eb9a1c39a9a..af5e2bed35d 100644 --- 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 - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include -#include -#include -#include -#include #include -#include 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 index 00000000000..9d390f862af --- /dev/null +++ b/reactos/dll/win32/oleaut32/precomp.h @@ -0,0 +1,30 @@ +#ifndef _OLEAUT32_PCH_ +#define _OLEAUT32_PCH_ + +#include + +#include +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#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 a27443334c9..22a889ba0b4 100644 --- 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 - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include -#include -#include -//#include "oaidl.h" -#include - -#include -#include +#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 550170afc61..daf3a4b3a49 100644 --- 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 - /* 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 f3f4c5a6d08..88a7e13f3b2 100644 --- 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 - -//#include -#include -//#include - -#define COBJMACROS - -#include -//#include "winerror.h" -#include -#include -#include +#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 ea814b23d2c..82eee54ca7b 100644 --- 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 -//#include "wine/port.h" - -#include -//#include -//#include -//#include -#include -//#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "winerror.h" -#include -#include -#include -#include -//#include "winuser.h" +#include "precomp.h" #include -//#include "propidl.h" /* for LPSAFEARRAY_User* functions */ + #include "typelib.h" -#include "variant.h" -#include + #include 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 f2b71c25695..48b5ff943ff 100644 --- 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 -//#include "wine/port.h" - -//#include -//#include -//#include -#include -//#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include -#include -#include -//#include "winnls.h" -#include -#include +#include "precomp.h" + #include #include -#include -#include #include "typelib.h" -#include -#include "variant.h" + #include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/typelib.h b/reactos/dll/win32/oleaut32/typelib.h index 0fb04f18647..8914a427d9f 100644 --- 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 - -//#include "windef.h" -//#include "winbase.h" -#include - #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 b6fe2e880e8..de9095141a5 100644 --- 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 -//#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include -#include -//#include "wingdi.h" -//#include "winuser.h" -//#include "winerror.h" +#include "precomp.h" #include -//#include "oleauto.h" -//#include "typelib.h" -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/varformat.c b/reactos/dll/win32/oleaut32/varformat.c index f571443f1bf..18279093c93 100644 --- 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 - -//#include -//#include -//#include -//#include - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -#include -//#include "winerror.h" -#include "variant.h" -#include +#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 67608e67211..5329bae1a16 100644 --- 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 - -//#include -//#include -//#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "windef.h" -//#include "winbase.h" -#include -//#include "winerror.h" -#include "variant.h" #include "resource.h" -#include WINE_DEFAULT_DEBUG_CHANNEL(variant); diff --git a/reactos/dll/win32/oleaut32/variant.h b/reactos/dll/win32/oleaut32/variant.h index 97bebfcb842..b2c0d614e41 100644 --- 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 -#include + +#pragma once + #include /* 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 5553d77a3c8..9a24323da86 100644 --- 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 -#include -//#include "winbase.h" -#include -//#include "winnt.h" -#include "variant.h" +#include "precomp.h" + #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); -- 2.17.1