https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da5f10af774620e64b4c3dc583f7068714b69b2a
commit da5f10af774620e64b4c3dc583f7068714b69b2a Author: Amine Khaldi <[email protected]> AuthorDate: Fri Mar 9 12:55:20 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Fri Mar 9 12:55:20 2018 +0100 [COMDLG32_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/comdlg32/filedlg.c | 15 +++++++++++---- modules/rostests/winetests/comdlg32/finddlg.c | 5 ++++- modules/rostests/winetests/comdlg32/fontdlg.c | 14 ++++++++++++-- modules/rostests/winetests/comdlg32/itemdlg.c | 7 ++++--- modules/rostests/winetests/comdlg32/precomp.h | 4 ++-- modules/rostests/winetests/comdlg32/printdlg.c | 20 +++++++++++++++++++- modules/rostests/winetests/comdlg32/rsrc.rc | 4 ++-- 7 files changed, 54 insertions(+), 15 deletions(-) diff --git a/modules/rostests/winetests/comdlg32/filedlg.c b/modules/rostests/winetests/comdlg32/filedlg.c index 514f2513a2..4d940555a0 100644 --- a/modules/rostests/winetests/comdlg32/filedlg.c +++ b/modules/rostests/winetests/comdlg32/filedlg.c @@ -19,12 +19,19 @@ * */ -#include "precomp.h" +#include <windows.h> +#include <wine/test.h> -#include <shlguid.h> -#include <shobjidl.h> -#include <ole2.h> +#include "shlguid.h" +#define COBJMACROS +#include "shobjidl.h" +#include "commdlg.h" +#include "cderr.h" +#include "dlgs.h" + +#ifdef __REACTOS__ #include <reactos/undocuser.h> +#endif /* ##### */ diff --git a/modules/rostests/winetests/comdlg32/finddlg.c b/modules/rostests/winetests/comdlg32/finddlg.c index 99c9eb1e22..be983081c5 100644 --- a/modules/rostests/winetests/comdlg32/finddlg.c +++ b/modules/rostests/winetests/comdlg32/finddlg.c @@ -19,7 +19,10 @@ * */ -#include "precomp.h" +#include "windows.h" +#include "commdlg.h" +#include "cderr.h" +#include "wine/test.h" static UINT ID_FINDMSGSTRING; diff --git a/modules/rostests/winetests/comdlg32/fontdlg.c b/modules/rostests/winetests/comdlg32/fontdlg.c index 4a17bbcb1d..090053522d 100644 --- a/modules/rostests/winetests/comdlg32/fontdlg.c +++ b/modules/rostests/winetests/comdlg32/fontdlg.c @@ -19,9 +19,19 @@ * */ -#include "precomp.h" +#include <stdarg.h> -#include <winspool.h> +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winspool.h" +#include "winuser.h" +#include "objbase.h" + +#include "commdlg.h" + +#include "wine/test.h" static int get_dpiy(void) { diff --git a/modules/rostests/winetests/comdlg32/itemdlg.c b/modules/rostests/winetests/comdlg32/itemdlg.c index f14a298de8..d28e682b49 100644 --- a/modules/rostests/winetests/comdlg32/itemdlg.c +++ b/modules/rostests/winetests/comdlg32/itemdlg.c @@ -19,10 +19,11 @@ * */ -#include "precomp.h" +#define COBJMACROS +#define CONST_VTABLE -#include <wincon.h> -#include <shlobj.h> +#include "shlobj.h" +#include "wine/test.h" #define IDT_CHANGEFILETYPE 500 #define IDT_CLOSEDIALOG 501 diff --git a/modules/rostests/winetests/comdlg32/precomp.h b/modules/rostests/winetests/comdlg32/precomp.h index 86ad3d3cf6..5a2beaafa6 100644 --- a/modules/rostests/winetests/comdlg32/precomp.h +++ b/modules/rostests/winetests/comdlg32/precomp.h @@ -1,12 +1,12 @@ + #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 <windows.h> #include <wine/test.h> #include <wingdi.h> diff --git a/modules/rostests/winetests/comdlg32/printdlg.c b/modules/rostests/winetests/comdlg32/printdlg.c index b2c20744ee..4c6a47355c 100644 --- a/modules/rostests/winetests/comdlg32/printdlg.c +++ b/modules/rostests/winetests/comdlg32/printdlg.c @@ -20,7 +20,25 @@ * */ -#include "precomp.h" +#define COBJMACROS +#define CONST_VTABLE + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" + +#include "cderr.h" +#include "commdlg.h" +#include "dlgs.h" +#include "winspool.h" + +#include "wine/test.h" /* ########################### */ diff --git a/modules/rostests/winetests/comdlg32/rsrc.rc b/modules/rostests/winetests/comdlg32/rsrc.rc index e1bca96aa9..68ab468ff8 100644 --- a/modules/rostests/winetests/comdlg32/rsrc.rc +++ b/modules/rostests/winetests/comdlg32/rsrc.rc @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> +#include "windef.h" +#include "winuser.h" TEMPLATE1 DIALOG 5, 43, 227, 215 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS
