From 0622ce1775a1a2fc45a6b5bebf1a1ce22a68eb7d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 17 Dec 2017 12:28:41 +0100 Subject: [PATCH] [COMDLG32_WINETEST] Add a PCH. --- .../winetests/comdlg32/CMakeLists.txt | 9 +++++++-- modules/rostests/winetests/comdlg32/filedlg.c | 16 +-------------- modules/rostests/winetests/comdlg32/finddlg.c | 11 +--------- modules/rostests/winetests/comdlg32/fontdlg.c | 14 +------------ modules/rostests/winetests/comdlg32/itemdlg.c | 10 ++-------- modules/rostests/winetests/comdlg32/precomp.h | 18 +++++++++++++++++ .../rostests/winetests/comdlg32/printdlg.c | 20 +------------------ 7 files changed, 31 insertions(+), 67 deletions(-) create mode 100644 modules/rostests/winetests/comdlg32/precomp.h diff --git a/modules/rostests/winetests/comdlg32/CMakeLists.txt b/modules/rostests/winetests/comdlg32/CMakeLists.txt index b61e43056cd..11afc77f499 100644 --- a/modules/rostests/winetests/comdlg32/CMakeLists.txt +++ b/modules/rostests/winetests/comdlg32/CMakeLists.txt @@ -7,10 +7,15 @@ list(APPEND SOURCE fontdlg.c itemdlg.c printdlg.c - testlist.c) + precomp.h) + +add_executable(comdlg32_winetest + ${SOURCE} + testlist.c + rsrc.rc) -add_executable(comdlg32_winetest ${SOURCE} rsrc.rc) target_link_libraries(comdlg32_winetest uuid) set_module_type(comdlg32_winetest win32cui) add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 ole32 shell32 msvcrt kernel32) +add_pch(comdlg32_winetest precomp.h SOURCE) add_rostests_file(TARGET comdlg32_winetest) diff --git a/modules/rostests/winetests/comdlg32/filedlg.c b/modules/rostests/winetests/comdlg32/filedlg.c index e779cd55367..514f2513a20 100644 --- a/modules/rostests/winetests/comdlg32/filedlg.c +++ b/modules/rostests/winetests/comdlg32/filedlg.c @@ -19,24 +19,10 @@ * */ -//#include - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include - -#include -#include -#include -#include -#include +#include "precomp.h" #include -#define COBJMACROS #include - #include #include diff --git a/modules/rostests/winetests/comdlg32/finddlg.c b/modules/rostests/winetests/comdlg32/finddlg.c index 5445d65e5e5..99c9eb1e226 100644 --- a/modules/rostests/winetests/comdlg32/finddlg.c +++ b/modules/rostests/winetests/comdlg32/finddlg.c @@ -19,16 +19,7 @@ * */ -//#include "windows.h" - -#define WIN32_NO_STATUS - -#include - -#include -#include -#include -#include +#include "precomp.h" static UINT ID_FINDMSGSTRING; diff --git a/modules/rostests/winetests/comdlg32/fontdlg.c b/modules/rostests/winetests/comdlg32/fontdlg.c index 6b59d7ba458..4a17bbcb1d5 100644 --- a/modules/rostests/winetests/comdlg32/fontdlg.c +++ b/modules/rostests/winetests/comdlg32/fontdlg.c @@ -19,21 +19,9 @@ * */ -#define WIN32_NO_STATUS +#include "precomp.h" -#include - -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include #include -#include -//#include "objbase.h" - -#include static int get_dpiy(void) { diff --git a/modules/rostests/winetests/comdlg32/itemdlg.c b/modules/rostests/winetests/comdlg32/itemdlg.c index e338dcb00e3..f14a298de85 100644 --- a/modules/rostests/winetests/comdlg32/itemdlg.c +++ b/modules/rostests/winetests/comdlg32/itemdlg.c @@ -19,15 +19,9 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include - -#define COBJMACROS -#define CONST_VTABLE +#include "precomp.h" +#include #include #define IDT_CHANGEFILETYPE 500 diff --git a/modules/rostests/winetests/comdlg32/precomp.h b/modules/rostests/winetests/comdlg32/precomp.h new file mode 100644 index 00000000000..86ad3d3cf6f --- /dev/null +++ b/modules/rostests/winetests/comdlg32/precomp.h @@ -0,0 +1,18 @@ +#ifndef _COMDLG32_WINETEST_PRECOMP_H_ +#define _COMDLG32_WINETEST_PRECOMP_H_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define COBJMACROS +#define CONST_VTABLE + +#include + +#include +#include +#include +#include +#include + +#endif /* !_COMDLG32_WINETEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/comdlg32/printdlg.c b/modules/rostests/winetests/comdlg32/printdlg.c index 5592b8c6c9c..b2c20744ee8 100644 --- a/modules/rostests/winetests/comdlg32/printdlg.c +++ b/modules/rostests/winetests/comdlg32/printdlg.c @@ -20,25 +20,7 @@ * */ -#define COBJMACROS -#define CONST_VTABLE -#define WIN32_NO_STATUS - -#include - -//#include -#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include -#include -#include - -#include -#include -#include +#include "precomp.h" /* ########################### */