diff --git a/modules/rostests/apitests/include/user32testhelpers.h b/modules/rostests/apitests/include/user32testhelpers.h index 687af541a26..ef020ed4298 100644 --- a/modules/rostests/apitests/include/user32testhelpers.h +++ b/modules/rostests/apitests/include/user32testhelpers.h @@ -1,4 +1,6 @@ +#pragma once + static __inline ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName) { WNDCLASSEXW wcex; diff --git a/modules/rostests/apitests/user32/AttachThreadInput.c b/modules/rostests/apitests/user32/AttachThreadInput.c index 78b461d0c61..fbba7178720 100644 --- a/modules/rostests/apitests/user32/AttachThreadInput.c +++ b/modules/rostests/apitests/user32/AttachThreadInput.c @@ -5,14 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include - -#include -#include -#include -#include - -#define DESKTOP_ALL_ACCESS 0x01ff +#include "precomp.h" typedef struct { DWORD tid; diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 3b758836d41..5a0c2d1844a 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -38,13 +38,13 @@ list(APPEND SOURCE TrackMouseEvent.c WndProc.c wsprintf.c - testlist.c - user32_apitest.rc) + precomp.h) -add_executable(user32_apitest ${SOURCE}) +add_executable(user32_apitest ${SOURCE} testlist.c user32_apitest.rc) target_link_libraries(user32_apitest wine ${PSEH_LIB}) set_module_type(user32_apitest win32cui) add_importlibs(user32_apitest advapi32 gdi32 user32 msvcrt kernel32 ntdll) +add_pch(user32_apitest precomp.h SOURCE) add_rostests_file(TARGET user32_apitest) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/verclasstest1.manifest") diff --git a/modules/rostests/apitests/user32/CreateDialog.c b/modules/rostests/apitests/user32/CreateDialog.c index dfb33a5c008..0d7d718cc0c 100644 --- a/modules/rostests/apitests/user32/CreateDialog.c +++ b/modules/rostests/apitests/user32/CreateDialog.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Andreas Maier */ -#include -#include -#include - -#include -#include +#include "precomp.h" #define TEST_MAX_MSG 50 diff --git a/modules/rostests/apitests/user32/CreateIconFromResourceEx.c b/modules/rostests/apitests/user32/CreateIconFromResourceEx.c index 4c5d7b7deb7..25f75c42a7c 100644 --- a/modules/rostests/apitests/user32/CreateIconFromResourceEx.c +++ b/modules/rostests/apitests/user32/CreateIconFromResourceEx.c @@ -1,8 +1,5 @@ -#include - -#include -#include +#include "precomp.h" START_TEST(CreateIconFromResourceEx) { @@ -89,4 +86,4 @@ START_TEST(CreateIconFromResourceEx) ok(hcur1 == NULL, "\n"); err = GetLastError(); ok(err == 0x0badf00d, "err: %lu\n", err); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/CreateWindowEx.c b/modules/rostests/apitests/user32/CreateWindowEx.c index d377b3f0da4..24ac64d26f9 100644 --- a/modules/rostests/apitests/user32/CreateWindowEx.c +++ b/modules/rostests/apitests/user32/CreateWindowEx.c @@ -6,10 +6,7 @@ * Mark Jansen */ -#include -#include -#include -#include +#include "precomp.h" static void Test_Params(void) { diff --git a/modules/rostests/apitests/user32/DeferWindowPos.c b/modules/rostests/apitests/user32/DeferWindowPos.c index 223d4894960..ad18459cf4c 100644 --- a/modules/rostests/apitests/user32/DeferWindowPos.c +++ b/modules/rostests/apitests/user32/DeferWindowPos.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Thomas Faber */ -#include - -#include -#include -#include -#include +#include "precomp.h" HWND hWnd1, hWnd2, hWnd3, hWnd4; diff --git a/modules/rostests/apitests/user32/DestroyCursorIcon.c b/modules/rostests/apitests/user32/DestroyCursorIcon.c index df91a41e0de..da87d122f05 100644 --- a/modules/rostests/apitests/user32/DestroyCursorIcon.c +++ b/modules/rostests/apitests/user32/DestroyCursorIcon.c @@ -1,8 +1,5 @@ -#include - -#include -#include +#include "precomp.h" START_TEST(DestroyCursorIcon) { @@ -51,4 +48,4 @@ START_TEST(DestroyCursorIcon) /* clean up */ DeleteObject(iconinfo.hbmMask); DeleteObject(iconinfo.hbmColor); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/DrawIconEx.c b/modules/rostests/apitests/user32/DrawIconEx.c index b3a7cc354f3..41b1707e035 100644 --- a/modules/rostests/apitests/user32/DrawIconEx.c +++ b/modules/rostests/apitests/user32/DrawIconEx.c @@ -1,8 +1,5 @@ -#include - -#include -#include +#include "precomp.h" START_TEST(DrawIconEx) { @@ -55,4 +52,4 @@ START_TEST(DrawIconEx) hbmp = SelectObject(hdc, hbmp); DeleteObject(hbmp); DeleteDC(hdc); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/EmptyClipboard.c b/modules/rostests/apitests/user32/EmptyClipboard.c index a7d0140bd7f..0536736902f 100644 --- a/modules/rostests/apitests/user32/EmptyClipboard.c +++ b/modules/rostests/apitests/user32/EmptyClipboard.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include - -#include -#include - -#include -#include +#include "precomp.h" HWND hWnd1, hWnd2; diff --git a/modules/rostests/apitests/user32/EnumDisplaySettings.c b/modules/rostests/apitests/user32/EnumDisplaySettings.c index 0d058bb934b..06ee987a2cc 100644 --- a/modules/rostests/apitests/user32/EnumDisplaySettings.c +++ b/modules/rostests/apitests/user32/EnumDisplaySettings.c @@ -1,7 +1,5 @@ -#include -#include -#include +#include "precomp.h" #define SIZEOF_DEVMODEW_300_W 188 #define SIZEOF_DEVMODEW_400_W 212 diff --git a/modules/rostests/apitests/user32/GetDCEx.c b/modules/rostests/apitests/user32/GetDCEx.c index b9a183fa3b7..6900797ccbd 100644 --- a/modules/rostests/apitests/user32/GetDCEx.c +++ b/modules/rostests/apitests/user32/GetDCEx.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include -#include -#include +#include "precomp.h" #define DCX_USESTYLE 0x00010000 @@ -446,4 +444,3 @@ START_TEST(GetDCEx) Test_GetDCEx_CS_Mixed(); Test_GetDCEx_CS_SwitchedStyle(); } - diff --git a/modules/rostests/apitests/user32/GetIconInfo.c b/modules/rostests/apitests/user32/GetIconInfo.c index 6a36ad12475..b8da5148f8b 100644 --- a/modules/rostests/apitests/user32/GetIconInfo.c +++ b/modules/rostests/apitests/user32/GetIconInfo.c @@ -1,10 +1,5 @@ -#include - -#include -#include - -#include "resource.h" +#include "precomp.h" // FIXME user32 @@ -278,5 +273,3 @@ START_TEST(GetIconInfo) /* Delete cursor */ DestroyCursor(hcursor); } - - diff --git a/modules/rostests/apitests/user32/GetKeyState.c b/modules/rostests/apitests/user32/GetKeyState.c index df904610624..e539bdbf918 100644 --- a/modules/rostests/apitests/user32/GetKeyState.c +++ b/modules/rostests/apitests/user32/GetKeyState.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include - -#include -#include +#include "precomp.h" HHOOK hKbdHook, hKbdLLHook; @@ -133,4 +130,4 @@ void Test_GetKeyState() START_TEST(GetKeyState) { Test_GetKeyState(); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/GetPeekMessage.c b/modules/rostests/apitests/user32/GetPeekMessage.c index fc107252187..b947672a15a 100644 --- a/modules/rostests/apitests/user32/GetPeekMessage.c +++ b/modules/rostests/apitests/user32/GetPeekMessage.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Thomas Faber */ -#include - -#include +#include "precomp.h" void Test_GetMessage(HWND hWnd) { diff --git a/modules/rostests/apitests/user32/GetSystemMetrics.c b/modules/rostests/apitests/user32/GetSystemMetrics.c index f969a41cc40..9e6fd3feecb 100644 --- a/modules/rostests/apitests/user32/GetSystemMetrics.c +++ b/modules/rostests/apitests/user32/GetSystemMetrics.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include - -#include -#include +#include "precomp.h" void Test_GetSystemMetrics() { @@ -408,4 +405,3 @@ START_TEST(GetSystemMetrics) { Test_GetSystemMetrics(); } - diff --git a/modules/rostests/apitests/user32/GetUserObjectInformation.c b/modules/rostests/apitests/user32/GetUserObjectInformation.c index e509f31e0ad..31ad4472886 100644 --- a/modules/rostests/apitests/user32/GetUserObjectInformation.c +++ b/modules/rostests/apitests/user32/GetUserObjectInformation.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Thomas Faber */ -#include -#include -#include +#include "precomp.h" + #include #include #include @@ -465,4 +464,4 @@ START_TEST(GetUserObjectInformation) { TestGetUserObjectInfoW(); TestGetUserObjectInfoA(); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/GetWindowPlacement.c b/modules/rostests/apitests/user32/GetWindowPlacement.c index c5fe2072e84..5871ef6eb59 100644 --- a/modules/rostests/apitests/user32/GetWindowPlacement.c +++ b/modules/rostests/apitests/user32/GetWindowPlacement.c @@ -5,8 +5,7 @@ * PROGRAMMERS: Thomas Faber */ -#include -#include +#include "precomp.h" #define ALIGN_DOWN_BY(size, align) \ ((ULONG_PTR)(size) & ~((ULONG_PTR)(align) - 1)) diff --git a/modules/rostests/apitests/user32/InitializeLpkHooks.c b/modules/rostests/apitests/user32/InitializeLpkHooks.c index 5090baa53b1..eefaf7c6091 100644 --- a/modules/rostests/apitests/user32/InitializeLpkHooks.c +++ b/modules/rostests/apitests/user32/InitializeLpkHooks.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Magnus Olsen */ -#include - -#include +#include "precomp.h" typedef struct _LPK_LPEDITCONTROL_LIST { @@ -106,4 +104,3 @@ START_TEST(InitializeLpkHooks) { Test_InitializeLpkHooks(); } - diff --git a/modules/rostests/apitests/user32/LoadImage.c b/modules/rostests/apitests/user32/LoadImage.c index 39e09bd7150..586e86988ad 100644 --- a/modules/rostests/apitests/user32/LoadImage.c +++ b/modules/rostests/apitests/user32/LoadImage.c @@ -1,9 +1,5 @@ -#include - -#include -#include -#include +#include "precomp.h" START_TEST(LoadImage) { diff --git a/modules/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c b/modules/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c index 218da48a1b1..ac1392482fa 100644 --- a/modules/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c +++ b/modules/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c @@ -1,10 +1,5 @@ -#include - -#include -#include - -#include "resource.h" +#include "precomp.h" START_TEST(LookupIconIdFromDirectoryEx) { @@ -129,4 +124,4 @@ START_TEST(LookupIconIdFromDirectoryEx) ok(ChangeDisplaySettingsExW(NULL, &dm, NULL, 0, NULL) == DISP_CHANGE_SUCCESSFUL, "\n"); FreeResource(hMem); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/NextDlgItem.c b/modules/rostests/apitests/user32/NextDlgItem.c index a27ee23176c..38a0819881d 100644 --- a/modules/rostests/apitests/user32/NextDlgItem.c +++ b/modules/rostests/apitests/user32/NextDlgItem.c @@ -5,12 +5,8 @@ * PROGRAMMERS: Katayama Hirofumi MZ */ -#include -#include -#include +#include "precomp.h" -#include -#include #include #include diff --git a/modules/rostests/apitests/user32/RealGetWindowClass.c b/modules/rostests/apitests/user32/RealGetWindowClass.c index e47003f5991..856c28c71f8 100644 --- a/modules/rostests/apitests/user32/RealGetWindowClass.c +++ b/modules/rostests/apitests/user32/RealGetWindowClass.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Gregor Gullwi */ -#include - -#include -#include +#include "precomp.h" #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) @@ -189,4 +186,3 @@ START_TEST(RealGetWindowClass) Test_ClassAtoms(); Test_RealGetWindowClass(); } - diff --git a/modules/rostests/apitests/user32/RegisterClassEx.c b/modules/rostests/apitests/user32/RegisterClassEx.c index 8134b98c233..7a7f3456fc2 100644 --- a/modules/rostests/apitests/user32/RegisterClassEx.c +++ b/modules/rostests/apitests/user32/RegisterClassEx.c @@ -5,14 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include -#define WIN32_NO_STATUS -#include - -#include -#include -#include -#include +#include "precomp.h" static ATOM _RegisterClass(LPCWSTR lpwszClassName, HINSTANCE hInstance, UINT style, WNDPROC lpfnWndProc) { diff --git a/modules/rostests/apitests/user32/RegisterHotKey.c b/modules/rostests/apitests/user32/RegisterHotKey.c index 529797422e5..c3901572394 100644 --- a/modules/rostests/apitests/user32/RegisterHotKey.c +++ b/modules/rostests/apitests/user32/RegisterHotKey.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Thomas Faber */ -#include - -#include -#include -#include -#include +#include "precomp.h" #define msg_hotkey(msg, id, mod, vk) do \ { \ diff --git a/modules/rostests/apitests/user32/ScrollDC.c b/modules/rostests/apitests/user32/ScrollDC.c index 33bae38899a..4b3bee03e04 100644 --- a/modules/rostests/apitests/user32/ScrollDC.c +++ b/modules/rostests/apitests/user32/ScrollDC.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include - -#include -#include +#include "precomp.h" void Test_ScrollDC() { @@ -75,4 +72,3 @@ START_TEST(ScrollDC) { Test_ScrollDC(); } - diff --git a/modules/rostests/apitests/user32/ScrollWindowEx.c b/modules/rostests/apitests/user32/ScrollWindowEx.c index 2c0ce9679ed..4d403174aae 100644 --- a/modules/rostests/apitests/user32/ScrollWindowEx.c +++ b/modules/rostests/apitests/user32/ScrollWindowEx.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include - -#include -#include +#include "precomp.h" void Test_ScrollWindowEx() { @@ -61,4 +58,3 @@ START_TEST(ScrollWindowEx) { Test_ScrollWindowEx(); } - diff --git a/modules/rostests/apitests/user32/SendMessageTimeout.c b/modules/rostests/apitests/user32/SendMessageTimeout.c index 90fcc316288..e6331687323 100644 --- a/modules/rostests/apitests/user32/SendMessageTimeout.c +++ b/modules/rostests/apitests/user32/SendMessageTimeout.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Thomas Faber */ -#include -#include - -#include -#include +#include "precomp.h" static DWORD dwThread1; static DWORD dwThread2; diff --git a/modules/rostests/apitests/user32/SetActiveWindow.c b/modules/rostests/apitests/user32/SetActiveWindow.c index 4ba07cfd86f..110289b54b3 100644 --- a/modules/rostests/apitests/user32/SetActiveWindow.c +++ b/modules/rostests/apitests/user32/SetActiveWindow.c @@ -5,14 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include - -#include -#include -#include - -#include -#include +#include "precomp.h" HWND hWnd1, hWnd2; diff --git a/modules/rostests/apitests/user32/SetCursorPos.c b/modules/rostests/apitests/user32/SetCursorPos.c index 052e300e520..9ac6e2bfe0f 100644 --- a/modules/rostests/apitests/user32/SetCursorPos.c +++ b/modules/rostests/apitests/user32/SetCursorPos.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include - -#include -#include -#include +#include "precomp.h" HHOOK hMouseHookLL, hMouseHook; diff --git a/modules/rostests/apitests/user32/SetParent.c b/modules/rostests/apitests/user32/SetParent.c index 7ee1e406dd9..79452cb46bb 100644 --- a/modules/rostests/apitests/user32/SetParent.c +++ b/modules/rostests/apitests/user32/SetParent.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Thomas Faber */ -#include - -#include -#include -#include +#include "precomp.h" static HWND hWndList[5 + 1]; static const int hWndCount = sizeof(hWndList) / sizeof(hWndList[0]) - 1; diff --git a/modules/rostests/apitests/user32/SetProp.c b/modules/rostests/apitests/user32/SetProp.c index de57337c230..3d656fd9936 100644 --- a/modules/rostests/apitests/user32/SetProp.c +++ b/modules/rostests/apitests/user32/SetProp.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Thomas Faber */ -#include -#include -#include +#include "precomp.h" static ATOM Atom1, Atom2, Atom3; diff --git a/modules/rostests/apitests/user32/SetScrollInfo.c b/modules/rostests/apitests/user32/SetScrollInfo.c index 59faad01fb7..1d9d9f00c40 100644 --- a/modules/rostests/apitests/user32/SetScrollInfo.c +++ b/modules/rostests/apitests/user32/SetScrollInfo.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Thomas Faber */ -#include - -#include -#include +#include "precomp.h" START_TEST(SetScrollInfo) { diff --git a/modules/rostests/apitests/user32/SetScrollRange.c b/modules/rostests/apitests/user32/SetScrollRange.c index f73db6bf87b..75c54797373 100644 --- a/modules/rostests/apitests/user32/SetScrollRange.c +++ b/modules/rostests/apitests/user32/SetScrollRange.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Thomas Faber */ -#include - -#include -#include +#include "precomp.h" START_TEST(SetScrollRange) { diff --git a/modules/rostests/apitests/user32/SystemParametersInfo.c b/modules/rostests/apitests/user32/SystemParametersInfo.c index 2b845087154..64330bc79bb 100644 --- a/modules/rostests/apitests/user32/SystemParametersInfo.c +++ b/modules/rostests/apitests/user32/SystemParametersInfo.c @@ -5,14 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include - -#include -#include -#include - -#include -#include +#include "precomp.h" HWND hWnd1, hWnd2; @@ -193,4 +186,4 @@ START_TEST(SystemParametersInfo) DestroyWindow(hWnd1); DestroyWindow(hWnd2); UnregisterClassW(L"sysparamstest", 0); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/TrackMouseEvent.c b/modules/rostests/apitests/user32/TrackMouseEvent.c index 7cc76467e54..60244898422 100644 --- a/modules/rostests/apitests/user32/TrackMouseEvent.c +++ b/modules/rostests/apitests/user32/TrackMouseEvent.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include -#include -#include -#include - -#include -#include +#include "precomp.h" HWND hWnd1, hWnd2, hWnd3; HHOOK hMouseHookLL, hMouseHook; diff --git a/modules/rostests/apitests/user32/WndProc.c b/modules/rostests/apitests/user32/WndProc.c index bdcff2f8d57..185726f8cc2 100644 --- a/modules/rostests/apitests/user32/WndProc.c +++ b/modules/rostests/apitests/user32/WndProc.c @@ -5,10 +5,7 @@ * PROGRAMMERS: */ -#include - -#include -#include +#include "precomp.h" /* Used wine Redraw test for proof in principle. */ diff --git a/modules/rostests/apitests/user32/desktop.c b/modules/rostests/apitests/user32/desktop.c index e20450137e5..f7bffe07215 100644 --- a/modules/rostests/apitests/user32/desktop.c +++ b/modules/rostests/apitests/user32/desktop.c @@ -6,18 +6,10 @@ * Thomas Faber */ -#define WIN32_NO_STATUS -#include +#include "precomp.h" -#include -#include -#include -#include -#include #include -#define DESKTOP_ALL_ACCESS 0x01ff - struct test_info { WCHAR* ExpectedWinsta; WCHAR* ExpectedDesktp; diff --git a/modules/rostests/apitests/user32/precomp.h b/modules/rostests/apitests/user32/precomp.h new file mode 100644 index 00000000000..8cb2810b598 --- /dev/null +++ b/modules/rostests/apitests/user32/precomp.h @@ -0,0 +1,18 @@ +#ifndef _USER32_APITEST_PRECOMP_H_ +#define _USER32_APITEST_PRECOMP_H_ + +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#include +#include +#include + +#include "resource.h" + +#define DESKTOP_ALL_ACCESS 0x01ff + +#endif /* _USER32_APITEST_PRECOMP_H_ */