[ros-diffs] [reactos] 01/01: [APITESTS][WINETESTS] Addendum to the recent PCH work.

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e36cf4acaf403964f9205…

commit e36cf4acaf403964f92053dedbf68ca4bb299682
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Mon Dec 18 13:21:47 2017 +0100

    [APITESTS][WINETESTS] Addendum to the recent PCH work.
---
 modules/rostests/apitests/advapi32/precomp.h    | 4 ++++
 modules/rostests/apitests/com/com_apitest.c     | 1 +
 modules/rostests/apitests/com/com_apitest.h     | 7 ++++++-
 modules/rostests/apitests/gdi32/precomp.h       | 4 ++++
 modules/rostests/apitests/kernel32/precomp.h    | 4 ++++
 modules/rostests/apitests/ntdll/NtSetValueKey.c | 2 ++
 modules/rostests/apitests/ntdll/precomp.h       | 7 +++++--
 modules/rostests/apitests/user32/precomp.h      | 6 +++++-
 modules/rostests/winetests/crypt32/precomp.h    | 5 +++++
 modules/rostests/winetests/gdi32/precomp.h      | 2 ++
 10 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/modules/rostests/apitests/advapi32/precomp.h
b/modules/rostests/apitests/advapi32/precomp.h
index 503d956465..a009b9676d 100644
--- a/modules/rostests/apitests/advapi32/precomp.h
+++ b/modules/rostests/apitests/advapi32/precomp.h
@@ -1,6 +1,10 @@
 #ifndef _ADVAPI32_APITEST_PRECOMP_H_
 #define _ADVAPI32_APITEST_PRECOMP_H_
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <apitest.h>
 #include <winreg.h>
 #include <winsvc.h>
diff --git a/modules/rostests/apitests/com/com_apitest.c
b/modules/rostests/apitests/com/com_apitest.c
index 7f72b0b835..1add9839b0 100644
--- a/modules/rostests/apitests/com/com_apitest.c
+++ b/modules/rostests/apitests/com/com_apitest.c
@@ -7,6 +7,7 @@
 
 #include "com_apitest.h"
 
+#include <winreg.h>
 #include <mshtmhst.h>
 #include <shlwapi.h>
 #include <commoncontrols.h>
diff --git a/modules/rostests/apitests/com/com_apitest.h
b/modules/rostests/apitests/com/com_apitest.h
index f841e58121..8820da294d 100644
--- a/modules/rostests/apitests/com/com_apitest.h
+++ b/modules/rostests/apitests/com/com_apitest.h
@@ -16,11 +16,16 @@
  * we usually don't want to be that strict */
 //#define FAIL_WRONG_OFFSET
 
-#define COBJMACROS
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#define COBJMACROS
 
 #include <wine/test.h>
 
+#include <wingdi.h>
+#include <winuser.h>
+#include <prsht.h>
 #include <objbase.h>
 #include <objsafe.h>
 #include <oleacc.h>
diff --git a/modules/rostests/apitests/gdi32/precomp.h
b/modules/rostests/apitests/gdi32/precomp.h
index a0331e74a7..ad6ebda215 100644
--- a/modules/rostests/apitests/gdi32/precomp.h
+++ b/modules/rostests/apitests/gdi32/precomp.h
@@ -1,6 +1,10 @@
 #ifndef _GDI32_APITEST_PRECOMP_H_
 #define _GDI32_APITEST_PRECOMP_H_
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <apitest.h>
 #include <wingdi.h>
 #include <winuser.h>
diff --git a/modules/rostests/apitests/kernel32/precomp.h
b/modules/rostests/apitests/kernel32/precomp.h
index cbc24c78ae..ffbf218a93 100644
--- a/modules/rostests/apitests/kernel32/precomp.h
+++ b/modules/rostests/apitests/kernel32/precomp.h
@@ -1,6 +1,10 @@
 #ifndef _KERNEL32_APITEST_PRECOMP_H_
 #define _KERNEL32_APITEST_PRECOMP_H_
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <apitest.h>
 #include <wincon.h>
 #include <winnls.h>
diff --git a/modules/rostests/apitests/ntdll/NtSetValueKey.c
b/modules/rostests/apitests/ntdll/NtSetValueKey.c
index 7a77839a19..caa2e34ef4 100644
--- a/modules/rostests/apitests/ntdll/NtSetValueKey.c
+++ b/modules/rostests/apitests/ntdll/NtSetValueKey.c
@@ -7,6 +7,8 @@
 
 #include "precomp.h"
 
+#include <winreg.h>
+
 START_TEST(NtSetValueKey)
 {
     NTSTATUS Status;
diff --git a/modules/rostests/apitests/ntdll/precomp.h
b/modules/rostests/apitests/ntdll/precomp.h
index 1552223a0b..39ff188224 100644
--- a/modules/rostests/apitests/ntdll/precomp.h
+++ b/modules/rostests/apitests/ntdll/precomp.h
@@ -2,10 +2,13 @@
 #define _NTDLL_APITEST_PRECOMP_H_
 
 #include <stdio.h>
-#include <apitest.h>
+
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <apitest.h>
 #include <ndk/ntndk.h>
-#include <winreg.h>
 #include <strsafe.h>
 
 #endif /* _NTDLL_APITEST_PRECOMP_H_ */
diff --git a/modules/rostests/apitests/user32/precomp.h
b/modules/rostests/apitests/user32/precomp.h
index 8cb2810b59..9159e4bd58 100644
--- a/modules/rostests/apitests/user32/precomp.h
+++ b/modules/rostests/apitests/user32/precomp.h
@@ -1,9 +1,13 @@
 #ifndef _USER32_APITEST_PRECOMP_H_
 #define _USER32_APITEST_PRECOMP_H_
 
-#define WIN32_NO_STATUS
 #include <assert.h>
 #include <stdio.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#define WIN32_NO_STATUS
+
 #include <apitest.h>
 #include <wingdi.h>
 #include <winuser.h>
diff --git a/modules/rostests/winetests/crypt32/precomp.h
b/modules/rostests/winetests/crypt32/precomp.h
index 1d2fc3b4e8..81c3376acc 100644
--- a/modules/rostests/winetests/crypt32/precomp.h
+++ b/modules/rostests/winetests/crypt32/precomp.h
@@ -2,6 +2,11 @@
 #define _CRYPT32_WINETEST_PRECOMP_H_
 
 #include <stdio.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <ntstatus.h>
+#define WIN32_NO_STATUS
 #include <wine/test.h>
 #include <winreg.h>
 #define CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS
diff --git a/modules/rostests/winetests/gdi32/precomp.h
b/modules/rostests/winetests/gdi32/precomp.h
index 11e9e70e51..bf8aea3a12 100644
--- a/modules/rostests/winetests/gdi32/precomp.h
+++ b/modules/rostests/winetests/gdi32/precomp.h
@@ -2,6 +2,8 @@
 #define _GDI32_WINETEST_PRECOMP_H_
 
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 #define NONAMELESSUNION
 
 #include <assert.h>