diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 86107d733db..06edd1b9c33 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -19,6 +19,7 @@ list(APPEND SOURCE LoadLibraryExW.c lstrcpynW.c lstrlen.c + Mailslot.c MultiByteToWideChar.c PrivMoveFileIdentityW.c SetConsoleWindowInfo.c @@ -27,14 +28,14 @@ list(APPEND SOURCE TerminateProcess.c TunnelCache.c WideCharToMultiByte.c - testlist.c - Mailslot.c) + precomp.h) -add_executable(kernel32_apitest ${SOURCE}) +add_executable(kernel32_apitest ${SOURCE} testlist.c) target_link_libraries(kernel32_apitest wine ${PSEH_LIB}) set_module_type(kernel32_apitest win32cui) add_delay_importlibs(kernel32_apitest advapi32 shlwapi) add_importlibs(kernel32_apitest msvcrt kernel32 ntdll) +add_pch(kernel32_apitest precomp.h SOURCE) add_rostests_file(TARGET kernel32_apitest) list(APPEND MANIFEST_FILES diff --git a/modules/rostests/apitests/kernel32/Console.c b/modules/rostests/apitests/kernel32/Console.c index 32632910869..21dfd4b9e7d 100644 --- a/modules/rostests/apitests/kernel32/Console.c +++ b/modules/rostests/apitests/kernel32/Console.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Katayama Hirofumi MZ */ -#include -#include -#include +#include "precomp.h" #define okCURSOR(hCon, c) do { \ CONSOLE_SCREEN_BUFFER_INFO __sbi; \ diff --git a/modules/rostests/apitests/kernel32/CreateProcess.c b/modules/rostests/apitests/kernel32/CreateProcess.c index a9ef26fd7d6..f1d17d854ed 100644 --- a/modules/rostests/apitests/kernel32/CreateProcess.c +++ b/modules/rostests/apitests/kernel32/CreateProcess.c @@ -5,10 +5,9 @@ * PROGRAMMERS: Mark Jansen */ -#include -#include -#include +#include "precomp.h" +#include START_TEST(CreateProcess) { diff --git a/modules/rostests/apitests/kernel32/DefaultActCtx.c b/modules/rostests/apitests/kernel32/DefaultActCtx.c index 579480459da..c5d7118e0f4 100644 --- a/modules/rostests/apitests/kernel32/DefaultActCtx.c +++ b/modules/rostests/apitests/kernel32/DefaultActCtx.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include -#include - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" START_TEST(DefaultActCtx) { diff --git a/modules/rostests/apitests/kernel32/DeviceIoControl.c b/modules/rostests/apitests/kernel32/DeviceIoControl.c index be3086eddaf..0a678997eaa 100644 --- a/modules/rostests/apitests/kernel32/DeviceIoControl.c +++ b/modules/rostests/apitests/kernel32/DeviceIoControl.c @@ -5,10 +5,9 @@ * PROGRAMMER: Pierre Schweitzer */ -#include -#include +#include "precomp.h" + #include -#include #include WCHAR Letter; diff --git a/modules/rostests/apitests/kernel32/FindActCtxSectionStringW.c b/modules/rostests/apitests/kernel32/FindActCtxSectionStringW.c index 7b2ba3ab67a..de2a07545a7 100644 --- a/modules/rostests/apitests/kernel32/FindActCtxSectionStringW.c +++ b/modules/rostests/apitests/kernel32/FindActCtxSectionStringW.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" #define STRSECTION_MAGIC 0x64487353 /* dHsS */ diff --git a/modules/rostests/apitests/kernel32/FindFiles.c b/modules/rostests/apitests/kernel32/FindFiles.c index 52a031aa64e..d4a0c6d69dc 100644 --- a/modules/rostests/apitests/kernel32/FindFiles.c +++ b/modules/rostests/apitests/kernel32/FindFiles.c @@ -5,9 +5,7 @@ * PROGRAMMER: Hermès BÉLUSCA - MAÏTO */ -#include - -#include +#include "precomp.h" /* * NOTE: This test supposes the following requirements: diff --git a/modules/rostests/apitests/kernel32/GetComputerNameEx.c b/modules/rostests/apitests/kernel32/GetComputerNameEx.c index 1beb70ceec3..3e93165821b 100644 --- a/modules/rostests/apitests/kernel32/GetComputerNameEx.c +++ b/modules/rostests/apitests/kernel32/GetComputerNameEx.c @@ -5,12 +5,7 @@ * PROGRAMMER: Thomas Faber */ -#include - -#define WIN32_NO_STATUS -#include -#include -#include +#include "precomp.h" static VOID diff --git a/modules/rostests/apitests/kernel32/GetCurrentDirectory.c b/modules/rostests/apitests/kernel32/GetCurrentDirectory.c index c8aafb784ab..f3dcc2620f1 100644 --- a/modules/rostests/apitests/kernel32/GetCurrentDirectory.c +++ b/modules/rostests/apitests/kernel32/GetCurrentDirectory.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber */ -#include - -#define WIN32_NO_STATUS -#include -#include +#include "precomp.h" static BOOLEAN diff --git a/modules/rostests/apitests/kernel32/GetDriveType.c b/modules/rostests/apitests/kernel32/GetDriveType.c index 657cf79e166..b6db1d92969 100644 --- a/modules/rostests/apitests/kernel32/GetDriveType.c +++ b/modules/rostests/apitests/kernel32/GetDriveType.c @@ -1,5 +1,4 @@ -#include -#include +#include "precomp.h" #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR) diff --git a/modules/rostests/apitests/kernel32/GetModuleFileName.c b/modules/rostests/apitests/kernel32/GetModuleFileName.c index 43c5ec338e3..ba1572c9209 100644 --- a/modules/rostests/apitests/kernel32/GetModuleFileName.c +++ b/modules/rostests/apitests/kernel32/GetModuleFileName.c @@ -5,14 +5,8 @@ * PROGRAMMER: Thomas Faber */ -#include +#include "precomp.h" -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include -#include -#include #include static diff --git a/modules/rostests/apitests/kernel32/GetVolumeInformation.c b/modules/rostests/apitests/kernel32/GetVolumeInformation.c index 7d2cf8bf3f6..5184f1c9c3e 100644 --- a/modules/rostests/apitests/kernel32/GetVolumeInformation.c +++ b/modules/rostests/apitests/kernel32/GetVolumeInformation.c @@ -5,10 +5,7 @@ * PROGRAMMER: Pierre Schweitzer */ -#include - -#define WIN32_NO_STATUS -#include +#include "precomp.h" static VOID TestGetVolumeInformationA(VOID) diff --git a/modules/rostests/apitests/kernel32/IsDBCSLeadByteEx.c b/modules/rostests/apitests/kernel32/IsDBCSLeadByteEx.c index 77548e50114..f7fcfdba442 100644 --- a/modules/rostests/apitests/kernel32/IsDBCSLeadByteEx.c +++ b/modules/rostests/apitests/kernel32/IsDBCSLeadByteEx.c @@ -5,13 +5,7 @@ * PROGRAMMER: Katayama Hirofumi MZ */ -#include - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include -#include +#include "precomp.h" #define MAX_RANGE 4 diff --git a/modules/rostests/apitests/kernel32/LoadLibraryExW.c b/modules/rostests/apitests/kernel32/LoadLibraryExW.c index 2e8d6a114fe..7e32f18468c 100644 --- a/modules/rostests/apitests/kernel32/LoadLibraryExW.c +++ b/modules/rostests/apitests/kernel32/LoadLibraryExW.c @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" HANDLE _CreateActCtxFromFile(LPCWSTR FileName, int line); VOID _ActivateCtx(HANDLE h, ULONG_PTR *cookie, int line); diff --git a/modules/rostests/apitests/kernel32/Mailslot.c b/modules/rostests/apitests/kernel32/Mailslot.c index 4cd701f2f9a..d2cc5d1a7b2 100644 --- a/modules/rostests/apitests/kernel32/Mailslot.c +++ b/modules/rostests/apitests/kernel32/Mailslot.c @@ -5,10 +5,7 @@ * PROGRAMMER: Nikita Pechenkin (n.pechenkin@mail.ru) */ -#include - -#define WIN32_NO_STATUS -#include +#include "precomp.h" #define LMS TEXT("\\\\.\\mailslot\\rostest_slot") #define MSG (0x50DA) diff --git a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c index 00242a6d114..120ce60f903 100644 --- a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c +++ b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c @@ -5,9 +5,7 @@ * PROGRAMMER: Mike "tamlin" Nordell */ -#include - -#include +#include "precomp.h" START_TEST(MultiByteToWideChar) { diff --git a/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c b/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c index 39fd0a1ef11..fcc557c4961 100644 --- a/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c +++ b/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c @@ -5,11 +5,9 @@ * PROGRAMMER: Pierre Schweitzer */ -#include +#include "precomp.h" -#define WIN32_NO_STATUS #include -#include static const WCHAR FileName[] = L"TestFile.xxx"; static const CHAR FileNameA[] = "TestFile.xxx"; diff --git a/modules/rostests/apitests/kernel32/SetConsoleWindowInfo.c b/modules/rostests/apitests/kernel32/SetConsoleWindowInfo.c index 763e99afd33..46db2fa5920 100644 --- a/modules/rostests/apitests/kernel32/SetConsoleWindowInfo.c +++ b/modules/rostests/apitests/kernel32/SetConsoleWindowInfo.c @@ -5,8 +5,7 @@ * PROGRAMMER: Hermes Belusca-Maito */ -#include -#include +#include "precomp.h" static VOID ResizeTextConsole( diff --git a/modules/rostests/apitests/kernel32/SetCurrentDirectory.c b/modules/rostests/apitests/kernel32/SetCurrentDirectory.c index c19b968afa9..f6f862dab0d 100644 --- a/modules/rostests/apitests/kernel32/SetCurrentDirectory.c +++ b/modules/rostests/apitests/kernel32/SetCurrentDirectory.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber */ -#include - -#define WIN32_NO_STATUS -#include -#include +#include "precomp.h" static VOID diff --git a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c index ddf6b3f5093..fb7e9f73815 100644 --- a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c +++ b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c @@ -5,11 +5,8 @@ * PROGRAMMER: Mike "tamlin" Nordell */ -#include +#include "precomp.h" -#define WIN32_NO_STATUS -#include -#include #include /* diff --git a/modules/rostests/apitests/kernel32/TerminateProcess.c b/modules/rostests/apitests/kernel32/TerminateProcess.c index 1120bea7730..cdcfc432b5d 100644 --- a/modules/rostests/apitests/kernel32/TerminateProcess.c +++ b/modules/rostests/apitests/kernel32/TerminateProcess.c @@ -5,10 +5,9 @@ * PROGRAMMER: Thomas Faber */ -#include +#include "precomp.h" #include -#include static HANDLE diff --git a/modules/rostests/apitests/kernel32/TunnelCache.c b/modules/rostests/apitests/kernel32/TunnelCache.c index 74e2e5a2dc4..23632a7157b 100644 --- a/modules/rostests/apitests/kernel32/TunnelCache.c +++ b/modules/rostests/apitests/kernel32/TunnelCache.c @@ -5,11 +5,7 @@ * PROGRAMMER: Pierre Schweitzer */ -#include - -#define WIN32_NO_STATUS -#include -#include +#include "precomp.h" static void diff --git a/modules/rostests/apitests/kernel32/WideCharToMultiByte.c b/modules/rostests/apitests/kernel32/WideCharToMultiByte.c index 34881ce5547..80b56a6a2e9 100644 --- a/modules/rostests/apitests/kernel32/WideCharToMultiByte.c +++ b/modules/rostests/apitests/kernel32/WideCharToMultiByte.c @@ -5,9 +5,7 @@ * PROGRAMMER: Thomas Faber */ -#include - -#include +#include "precomp.h" #define ntv6(x) (LOBYTE(LOWORD(GetVersion())) >= 6 ? (x) : 0) diff --git a/modules/rostests/apitests/kernel32/dosdev.c b/modules/rostests/apitests/kernel32/dosdev.c index ce393248be5..36531c68e14 100644 --- a/modules/rostests/apitests/kernel32/dosdev.c +++ b/modules/rostests/apitests/kernel32/dosdev.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" #define SUBST_DRIVE_LETTER 'M' #define SUBST_DRIVE "M:" diff --git a/modules/rostests/apitests/kernel32/interlck.c b/modules/rostests/apitests/kernel32/interlck.c index e67fb5fc20a..f205977f366 100644 --- a/modules/rostests/apitests/kernel32/interlck.c +++ b/modules/rostests/apitests/kernel32/interlck.c @@ -18,12 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" static void test_InterlockedCompareExchange(void) { diff --git a/modules/rostests/apitests/kernel32/lstrcpynW.c b/modules/rostests/apitests/kernel32/lstrcpynW.c index a6e953b570b..6bc49c63200 100644 --- a/modules/rostests/apitests/kernel32/lstrcpynW.c +++ b/modules/rostests/apitests/kernel32/lstrcpynW.c @@ -4,10 +4,7 @@ * PURPOSE: Test for lstrcpynW */ -#include - -#define WIN32_NO_STATUS -#include +#include "precomp.h" START_TEST(lstrcpynW) { diff --git a/modules/rostests/apitests/kernel32/lstrlen.c b/modules/rostests/apitests/kernel32/lstrlen.c index 69db9ae18e7..45dbc582c8c 100644 --- a/modules/rostests/apitests/kernel32/lstrlen.c +++ b/modules/rostests/apitests/kernel32/lstrlen.c @@ -5,10 +5,7 @@ * PROGRAMMER: Hermes Belusca-Maito */ -#include - -#define WIN32_NO_STATUS -#include +#include "precomp.h" LONG WINAPI VEHandler_1(PEXCEPTION_POINTERS ExceptionInfo) { diff --git a/modules/rostests/apitests/kernel32/precomp.h b/modules/rostests/apitests/kernel32/precomp.h new file mode 100644 index 00000000000..cbc24c78ae8 --- /dev/null +++ b/modules/rostests/apitests/kernel32/precomp.h @@ -0,0 +1,11 @@ +#ifndef _KERNEL32_APITEST_PRECOMP_H_ +#define _KERNEL32_APITEST_PRECOMP_H_ + +#include +#include +#include +#include +#include +#include + +#endif /* _KERNEL32_APITEST_PRECOMP_H_ */