[KERNEL32_WINETEST] Add a PCH.

modules/rostests/winetests/kernel32/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
+add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x601)
 
 list(APPEND SOURCE
     actctx.c
@@ -36,9 +37,12 @@ list(APPEND SOURCE
     version.c
     virtual.c
     volume.c
-    testlist.c)
+    precomp.h)
 
-add_executable(kernel32_winetest ${SOURCE} resource.rc)
+add_executable(kernel32_winetest
+    ${SOURCE}
+    testlist.c
+    resource.rc)
 
 if(USE_CLANG_CL OR (NOT MSVC))
     add_target_compile_flags(kernel32_winetest "-Wno-format")
@@ -46,4 +50,5 @@ endif()
 
 set_module_type(kernel32_winetest win32cui)
 add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(kernel32_winetest precomp.h SOURCE)
 add_rostests_file(TARGET kernel32_winetest)

modules/rostests/winetests/kernel32/actctx.c

@@ -16,16 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <ntstatus.h>
+#include "precomp.h"
-#define WIN32_NO_STATUS
-#include <wine/test.h>
-#include <winbase.h>
-#include <windef.h>
-#include <winnt.h>
-#include <wine/winternl.h>
-#include <winnls.h>
-#include <stdio.h>
 
+#include <objbase.h>
 #include <oaidl.h>
 #include <initguid.h>
 

modules/rostests/winetests/kernel32/atom.c

@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "winuser.h"
 
 #define DOUBLE(x)       (WCHAR)((x<<8)|(x))
 

modules/rostests/winetests/kernel32/change.c

@@ -26,15 +26,7 @@
  *         FILE_NOTIFY_CHANGE_CREATION
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "wine/test.h"
-#include <windef.h>
-#include <winbase.h>
-#include <wine/winternl.h>
 
 static DWORD CALLBACK NotificationThread(LPVOID arg)
 {

modules/rostests/winetests/kernel32/codepage.c

@@ -19,14 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
-#include <limits.h>
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
 
 static const char foobarA[] = "foobar";
 static const WCHAR foobarW[] = {'f','o','o','b','a','r',0};

modules/rostests/winetests/kernel32/comm.c

@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdio.h>
+#include "precomp.h"
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "wine/test.h"
-#include "wine/winternl.h"
-#include "winbase.h"
-#include "winnls.h"
 
 #define TIMEOUT 1000   /* one second for Timeouts*/
 #define SLOWBAUD 150

modules/rostests/winetests/kernel32/console.c

@@ -19,9 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/test.h"
+#include "precomp.h"
-#include <windows.h>
-#include <stdio.h>
 
 static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR);
 static DWORD (WINAPI *pGetConsoleProcessList)(LPDWORD, DWORD);

modules/rostests/winetests/kernel32/cpu.c

@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/test.h"
+#include "precomp.h"
-#include "winbase.h"
-#include "winnls.h"
 
 static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR);
 

modules/rostests/winetests/kernel32/debugger.c

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdio.h>
+#include "precomp.h"
-#include <assert.h>
-
-#include <windows.h>
-#include <wine/winternl.h>
-#include <winreg.h>
-#include "wine/test.h"
 
 #ifndef STATUS_DEBUGGER_INACTIVE
 #define STATUS_DEBUGGER_INACTIVE         ((NTSTATUS) 0xC0000354)

modules/rostests/winetests/kernel32/directory.c

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wine/winternl.h"
 
 static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG);
 

modules/rostests/winetests/kernel32/drive.c

@@ -18,12 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
 
 static DWORD (WINAPI *pGetDiskFreeSpaceExA)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER);
 

modules/rostests/winetests/kernel32/environ.c

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "winnls.h"
 
 static CHAR string[MAX_PATH];
 #define ok_w(res, format, szString) \

modules/rostests/winetests/kernel32/fiber.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/test.h"
+#include "precomp.h"
 
 static LPVOID (WINAPI *pCreateFiber)(SIZE_T,LPFIBER_START_ROUTINE,LPVOID);
 static LPVOID (WINAPI *pConvertThreadToFiber)(LPVOID);

modules/rostests/winetests/kernel32/file.c

@@ -20,22 +20,9 @@
  *
  */
 
-/* ReplaceFile requires Windows 2000 or newer */
+#include "precomp.h"
-#define _WIN32_WINNT 0x0601
 
-#include <stdarg.h>
-#include <stdlib.h>
 #include <time.h>
-#include <stdio.h>
-
-#include <ntstatus.h>
-#define WIN32_NO_STATUS
-#include <wine/test.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winerror.h>
-#include <wine/winternl.h>
-#include <winnls.h>
 #include <fileapi.h>
 
 #undef DeleteFile  /* needed for FILE_DISPOSITION_INFO */

modules/rostests/winetests/kernel32/format_msg.c

@@ -17,12 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
 
 #define ULL(a,b)   (((ULONG64)(a) << 32) | (b))
 

modules/rostests/winetests/kernel32/heap.c

@@ -20,15 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "wine/winternl.h"
-#include "wine/test.h"
 
 #define MAGIC_DEAD 0xdeadbeef
 

modules/rostests/winetests/kernel32/loader.c

@@ -18,19 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
+#include "precomp.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <assert.h>
 
-#include "ntstatus.h"
+#include <delayloadhandler.h>
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "wine/winternl.h"
-#include "winuser.h"
-#include "wine/test.h"
-#include "delayloadhandler.h"
 
 /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */
 #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000)
@@ -1546,7 +1536,7 @@ static void test_import_resolution(void)
         nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress = DATA_RVA(&data.tls);
 
         memset( &data, 0, sizeof(data) );
-        data.descr[0].u.OriginalFirstThunk = DATA_RVA( data.original_thunks );
+        data.descr[0].OriginalFirstThunk = DATA_RVA( data.original_thunks );
         data.descr[0].FirstThunk = DATA_RVA( data.thunks );
         data.descr[0].Name = DATA_RVA( data.module );
         strcpy( data.module, "kernel32.dll" );

modules/rostests/winetests/kernel32/locale.c

@@ -25,19 +25,7 @@
  *  the control panel i8n page), we will still get the expected results.
  */
 
-#include <assert.h>
+#include "precomp.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#undef WINVER
-#define WINVER 0x0600
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "winnls.h"
 
 static const WCHAR upper_case[] = {'\t','J','U','S','T','!',' ','A',',',' ','T','E','S','T',';',' ','S','T','R','I','N','G',' ','1','/','*','+','-','.','\r','\n',0};
 static const WCHAR lower_case[] = {'\t','j','u','s','t','!',' ','a',',',' ','t','e','s','t',';',' ','s','t','r','i','n','g',' ','1','/','*','+','-','.','\r','\n',0};

modules/rostests/winetests/kernel32/mailslot.c

@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-
-#include "wine/test.h"
 
 static const char szmspath[] = "\\\\.\\mailslot\\wine_mailslot_test";
 

modules/rostests/winetests/kernel32/module.c

@@ -18,9 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/test.h"
+#include "precomp.h"
-#include <windows.h>
+
-#include <stdio.h>
 #include <psapi.h>
 
 static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR);

modules/rostests/winetests/kernel32/path.c

@@ -19,15 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
-#include <assert.h>
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winerror.h"
-#include "winnls.h"
 
 #define HAS_TRAIL_SLASH_A(string) (string[lstrlenA(string)-1]=='\\')
 

modules/rostests/winetests/kernel32/pipe.c

@@ -18,16 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "wine/winternl.h"
-#include "winioctl.h"
-#include "wine/test.h"
 
 #define PIPENAME "\\\\.\\PiPe\\tests_pipe.c"
 #define PIPENAME_SPECIAL "\\\\.\\PiPe\\tests->pipe.c"

modules/rostests/winetests/kernel32/precomp.h

@@ -0,0 +1,22 @@
+#ifndef _KERNEL32_WINETEST_PRECOMP_H_
+#define _KERNEL32_WINETEST_PRECOMP_H_
+
+#include <assert.h>
+#include <stdio.h>
+#include <ntstatus.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#define COBJMACROS
+
+#include <wine/test.h>
+#include <wine/winternl.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <wincon.h>
+#include <winnls.h>
+#include <winioctl.h>
+#include <tlhelp32.h>
+
+#endif /* !_KERNEL32_WINETEST_PRECOMP_H_ */

modules/rostests/winetests/kernel32/process.c

@@ -20,22 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
+#include "precomp.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wincon.h"
-#include "winnls.h"
-#include "wine/winternl.h"
-#include "tlhelp32.h"
-
-#include "wine/test.h"
 
 /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */
 #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000)

modules/rostests/winetests/kernel32/profile.c

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "windows.h"
 
 #define KEY      "ProfileInt"
 #define SECTION  "Test"

modules/rostests/winetests/kernel32/resource.c

@@ -18,10 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include "precomp.h"
-#include <stdio.h>
-
-#include "wine/test.h"
 
 static const char filename[] = "test_.exe";
 static DWORD GLE;

modules/rostests/winetests/kernel32/sync.c

@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#define _WIN32_WINNT 0x500
+#include "precomp.h"
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wine/winternl.h>
-
-#include <wine/test.h>
 
 #define QueryDepthSList(x) RtlQueryDepthSList(x)
 #define InterlockedPushEntrySList(x,y) RtlInterlockedPushEntrySList(x,y)

modules/rostests/winetests/kernel32/testlist.c

@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_actctx(void);
 extern void func_atom(void);

modules/rostests/winetests/kernel32/thread.c

@@ -18,25 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */
+#include "precomp.h"
-#define _WIN32_WINNT 0x0600
-
-#include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-/* the tests intentionally pass invalid pointers and need an exception handler */
-#define WINE_NO_INLINE_STRING
-
-#include <ntstatus.h>
-#define WIN32_NO_STATUS
-#include <windef.h>
-#include <winbase.h>
-#include <winnt.h>
-#include <winerror.h>
-#include <winnls.h>
-#include <wine/winternl.h>
-#include <wine/test.h>
 
 /* THREAD_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */
 #define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff)

modules/rostests/winetests/kernel32/time.c

@@ -19,10 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/test.h"
+#include "precomp.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "wine/winternl.h"
 
 static BOOL (WINAPI *pTzSpecificLocalTimeToSystemTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME);
 static BOOL (WINAPI *pSystemTimeToTzSpecificLocalTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME);

modules/rostests/winetests/kernel32/timer.c

@@ -18,11 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define _WIN32_WINNT 0x0501
+#include "precomp.h"
-
-#include "wine/test.h"
-#include "winbase.h"
-
 
 static void test_timer(void)
 {

modules/rostests/winetests/kernel32/toolhelp.c

@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "tlhelp32.h"
-#include "wine/test.h"
-#include "winuser.h"
 
 static char     selfname[MAX_PATH];
 

modules/rostests/winetests/kernel32/version.c

@@ -18,12 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* Needed for PRODUCT_* defines and GetProductInfo() */
+#include "precomp.h"
-#define _WIN32_WINNT 0x0600
-
-#include "wine/test.h"
-#include "winbase.h"
-#include "wine/winternl.h"
 
 static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *);
 static BOOL (WINAPI * pVerifyVersionInfoA)(LPOSVERSIONINFOEXA, DWORD, DWORDLONG);

modules/rostests/winetests/kernel32/virtual.c

@@ -18,19 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
 
-#include "ntstatus.h"
+#include <wine/exception.h>
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winnt.h"
-#include "wine/winternl.h"
-#include "winerror.h"
-#include "winuser.h"
-#include "wine/exception.h"
-#include "wine/test.h"
 
 #define NUM_THREADS 4
 #define MAPPING_SIZE 0x100000

modules/rostests/winetests/kernel32/volume.c

@@ -18,11 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/test.h"
+#include "precomp.h"
-#include "winbase.h"
+
-#include "winioctl.h"
+#include <wine/ddk/ntddcdvd.h>
-#include <stdio.h>
-#include "wine/ddk/ntddcdvd.h"
 
 #include <pshpack1.h>
 struct COMPLETE_DVD_LAYER_DESCRIPTOR