From c71475e3bb5f27532f150be20a2d2700bf7b31ea Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 5 Feb 2013 17:54:22 +0000 Subject: [PATCH] * Addendum to r58214. svn path=/trunk/; revision=58290 --- rostests/apitests/advapi32/CreateService.c | 3 ++- rostests/apitests/advapi32/LockDatabase.c | 2 +- .../apitests/advapi32/QueryServiceConfig2.c | 3 ++- rostests/apitests/advapi32/testlist.c | 4 +--- rostests/apitests/apitest.h | 6 ++++-- rostests/apitests/crt/testlist.c | 4 +--- rostests/apitests/dciman32/DCICreatePrimary.c | 2 -- rostests/apitests/dciman32/testlist.c | 4 +--- rostests/apitests/gdi32/AddFontResource.c | 2 +- rostests/apitests/gdi32/AddFontResourceEx.c | 3 +-- rostests/apitests/gdi32/BeginPath.c | 3 +-- rostests/apitests/gdi32/CombineRgn.c | 3 +-- rostests/apitests/gdi32/CombineTransform.c | 3 +-- rostests/apitests/gdi32/CreateBitmap.c | 3 +-- .../apitests/gdi32/CreateBitmapIndirect.c | 3 +-- rostests/apitests/gdi32/CreateCompatibleDC.c | 4 ++-- .../apitests/gdi32/CreateDIBPatternBrush.c | 4 ++-- rostests/apitests/gdi32/CreateDIBitmap.c | 6 ++++-- rostests/apitests/gdi32/CreateFont.c | 3 +-- rostests/apitests/gdi32/CreateFontIndirect.c | 3 +-- rostests/apitests/gdi32/CreateIconIndirect.c | 4 ++-- rostests/apitests/gdi32/CreatePen.c | 3 +-- rostests/apitests/gdi32/CreateRectRgn.c | 2 -- rostests/apitests/gdi32/DPtoLP.c | 4 ++-- rostests/apitests/gdi32/EngAcquireSemaphore.c | 3 +-- rostests/apitests/gdi32/EngCreateSemaphore.c | 3 +-- rostests/apitests/gdi32/EngDeleteSemaphore.c | 3 +-- rostests/apitests/gdi32/EngReleaseSemaphore.c | 3 +-- rostests/apitests/gdi32/ExtCreatePen.c | 3 +-- rostests/apitests/gdi32/GdiConvertBitmap.c | 3 +-- rostests/apitests/gdi32/GdiConvertBrush.c | 3 +-- rostests/apitests/gdi32/GdiConvertDC.c | 3 +-- rostests/apitests/gdi32/GdiConvertFont.c | 3 +-- rostests/apitests/gdi32/GdiConvertPalette.c | 3 +-- rostests/apitests/gdi32/GdiConvertRegion.c | 3 +-- rostests/apitests/gdi32/GdiDeleteLocalDC.c | 3 +-- .../apitests/gdi32/GdiGetCharDimensions.c | 3 +-- rostests/apitests/gdi32/GdiGetLocalBrush.c | 3 +-- rostests/apitests/gdi32/GdiGetLocalDC.c | 3 +-- rostests/apitests/gdi32/GdiReleaseLocalDC.c | 3 +-- rostests/apitests/gdi32/GdiSetAttrs.c | 3 +-- rostests/apitests/gdi32/GetClipRgn.c | 4 ++-- rostests/apitests/gdi32/GetCurrentObject.c | 4 ++-- rostests/apitests/gdi32/GetDIBColorTable.c | 3 +-- rostests/apitests/gdi32/GetDIBits.c | 5 +++-- rostests/apitests/gdi32/GetObject.c | 5 +++-- rostests/apitests/gdi32/GetPixel.c | 4 +--- rostests/apitests/gdi32/GetRandomRgn.c | 3 ++- rostests/apitests/gdi32/GetStockObject.c | 3 +-- .../apitests/gdi32/GetTextExtentExPoint.c | 4 ++-- rostests/apitests/gdi32/GetTextFace.c | 3 +-- rostests/apitests/gdi32/MaskBlt.c | 4 ++-- rostests/apitests/gdi32/PatBlt.c | 3 +-- rostests/apitests/gdi32/Rectangle.c | 3 +-- rostests/apitests/gdi32/SelectObject.c | 4 +++- rostests/apitests/gdi32/SetBrushOrgEx.c | 4 ++-- rostests/apitests/gdi32/SetDCPenColor.c | 4 ++-- rostests/apitests/gdi32/SetDIBits.c | 4 +--- rostests/apitests/gdi32/SetDIBitsToDevice.c | 4 ++-- rostests/apitests/gdi32/SetMapMode.c | 4 ++-- rostests/apitests/gdi32/SetPixel.c | 4 ++-- rostests/apitests/gdi32/SetSysColors.c | 4 ++-- rostests/apitests/gdi32/SetWindowExtEx.c | 4 ++-- rostests/apitests/gdi32/SetWorldTransform.c | 4 ++-- rostests/apitests/gdi32/init.c | 3 ++- rostests/apitests/gdi32/testlist.c | 4 +--- rostests/apitests/kernel32/GetDriveType.c | 2 -- .../apitests/kernel32/GetModuleFileName.c | 5 ++++- .../apitests/kernel32/MultiByteToWideChar.c | 3 +-- rostests/apitests/kernel32/lstrcpynW.c | 1 - rostests/apitests/kernel32/testlist.c | 4 +--- .../apitests/msvcrt/CmdLineUtil/CmdLineUtil.c | 5 +++-- rostests/apitests/msvcrt/CommandLine.c | 2 +- rostests/apitests/msvcrt/testlist.c | 4 +--- rostests/apitests/ntdll/LdrEnumResources.c | 1 - .../apitests/ntdll/NtAllocateVirtualMemory.c | 1 - rostests/apitests/ntdll/NtFreeVirtualMemory.c | 4 ++-- .../ntdll/NtQuerySystemEnvironmentValue.c | 5 +++-- rostests/apitests/ntdll/RtlBitmap.c | 1 - rostests/apitests/ntdll/RtlInitializeBitMap.c | 3 +-- rostests/apitests/ntdll/SystemInfo.c | 3 +-- rostests/apitests/ntdll/ZwContinue.c | 1 - rostests/apitests/ntdll/testlist.c | 4 +--- rostests/apitests/powrprof/power.c | 13 ++++-------- rostests/apitests/powrprof/testlist.c | 12 +++++------ rostests/apitests/user32/AttachThreadInput.c | 5 ++--- .../user32/CreateIconFromResourceEx.c | 4 +--- rostests/apitests/user32/DeferWindowPos.c | 3 +-- rostests/apitests/user32/DestroyCursorIcon.c | 5 ++--- rostests/apitests/user32/DrawIconEx.c | 5 ++--- rostests/apitests/user32/GetIconInfo.c | 6 +++--- rostests/apitests/user32/GetKeyState.c | 4 +--- rostests/apitests/user32/GetPeekMessage.c | 3 +-- rostests/apitests/user32/GetSystemMetrics.c | 4 ++-- rostests/apitests/user32/InitializeLpkHooks.c | 4 +--- rostests/apitests/user32/LoadImage.c | 5 ++--- rostests/apitests/user32/RealGetWindowClass.c | 2 +- rostests/apitests/user32/ScrollDC.c | 4 ++-- rostests/apitests/user32/ScrollWindowEx.c | 4 ++-- rostests/apitests/user32/SetActiveWindow.c | 4 ++-- rostests/apitests/user32/SetCursorPos.c | 4 ++-- .../apitests/user32/SystemParametersInfo.c | 4 ++-- rostests/apitests/user32/TrackMouseEvent.c | 4 ++-- rostests/apitests/user32/WndProc.c | 4 ++-- rostests/apitests/user32/desktop.c | 4 ++-- rostests/apitests/user32/helper.c | 2 +- rostests/apitests/user32/testlist.c | 4 +--- rostests/apitests/user32/user32_apitest.rc | 2 +- .../apitests/w32kdll/w32kdll_2k3sp2/main.c | 2 +- .../apitests/w32kdll/w32kdll_2ksp4/main.c | 2 +- rostests/apitests/w32kdll/w32kdll_ros/main.c | 2 +- .../apitests/w32kdll/w32kdll_vista/main.c | 2 +- .../apitests/w32kdll/w32kdll_xpsp2/main.c | 2 +- rostests/apitests/w32knapi/w32knapi.h | 14 +++++++------ rostests/apitests/w32knapi/w32knapi.rc | 3 +-- rostests/apitests/winhttp/WinHttpOpen.c | 5 +++++ rostests/apitests/winhttp/testlist.c | 4 +--- rostests/apitests/wininet/InternetOpen.c | 5 +++++ rostests/apitests/wininet/testlist.c | 4 +--- rostests/apitests/ws2_32/WSAStartup.c | 3 +++ rostests/apitests/ws2_32/getaddrinfo.c | 6 +++++- rostests/apitests/ws2_32/helpers.c | 1 + rostests/apitests/ws2_32/ioctlsocket.c | 2 +- rostests/apitests/ws2_32/recv.c | 1 - rostests/apitests/ws2_32/testlist.c | 4 +--- rostests/apitests/ws2_32/ws2_32.h | 3 +++ rostests/kmtests/include/kmt_platform.h | 21 ++++++++++++------- rostests/kmtests/kmtest/kmtest.rc | 2 +- rostests/kmtests/kmtest_drv/kmtest_drv.rc | 2 +- rostests/rosautotest/precomp.h | 8 ++++--- rostests/tests/pseh2/psehtest.c | 8 ------- 131 files changed, 223 insertions(+), 274 deletions(-) diff --git a/rostests/apitests/advapi32/CreateService.c b/rostests/apitests/advapi32/CreateService.c index cd1e34d556c..eef0df83e54 100644 --- a/rostests/apitests/advapi32/CreateService.c +++ b/rostests/apitests/advapi32/CreateService.c @@ -6,7 +6,8 @@ */ #include -#include +#include +#include #include static int MakeService(SC_HANDLE hScm, const wchar_t *serviceName, SC_HANDLE *hService, DWORD *tag) diff --git a/rostests/apitests/advapi32/LockDatabase.c b/rostests/apitests/advapi32/LockDatabase.c index ca194c57b50..3933c36939e 100644 --- a/rostests/apitests/advapi32/LockDatabase.c +++ b/rostests/apitests/advapi32/LockDatabase.c @@ -6,7 +6,7 @@ */ #include -#include +#include #include #define TESTING_SERVICE L"Spooler" diff --git a/rostests/apitests/advapi32/QueryServiceConfig2.c b/rostests/apitests/advapi32/QueryServiceConfig2.c index aeffce56286..d5c920c78da 100644 --- a/rostests/apitests/advapi32/QueryServiceConfig2.c +++ b/rostests/apitests/advapi32/QueryServiceConfig2.c @@ -6,7 +6,8 @@ */ #include -#include +#include +#include #include #define TESTING_SERVICEW L"Spooler" diff --git a/rostests/apitests/advapi32/testlist.c b/rostests/apitests/advapi32/testlist.c index d7b25577196..f0301125922 100644 --- a/rostests/apitests/advapi32/testlist.c +++ b/rostests/apitests/advapi32/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_CreateService(void); extern void func_LockDatabase(void); diff --git a/rostests/apitests/apitest.h b/rostests/apitests/apitest.h index e3e08e0609f..eaf6deca61d 100644 --- a/rostests/apitests/apitest.h +++ b/rostests/apitests/apitest.h @@ -2,9 +2,11 @@ #define _APITEST_H #include -#include #include -#include +#include +#include +#include +#include #define APISTATUS_NORMAL 0 #define APISTATUS_NOT_FOUND 1 diff --git a/rostests/apitests/crt/testlist.c b/rostests/apitests/crt/testlist.c index 31db2079ba9..557a19c5593 100644 --- a/rostests/apitests/crt/testlist.c +++ b/rostests/apitests/crt/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include #if defined(TEST_MSVCRT) extern void func_mbstowcs_s(void); diff --git a/rostests/apitests/dciman32/DCICreatePrimary.c b/rostests/apitests/dciman32/DCICreatePrimary.c index e6409e9794e..e368f59cb30 100644 --- a/rostests/apitests/dciman32/DCICreatePrimary.c +++ b/rostests/apitests/dciman32/DCICreatePrimary.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include void Test_DCICreatePrimary() { diff --git a/rostests/apitests/dciman32/testlist.c b/rostests/apitests/dciman32/testlist.c index 4dba1298ec4..c1d8a80e327 100644 --- a/rostests/apitests/dciman32/testlist.c +++ b/rostests/apitests/dciman32/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_DCICreatePrimary(void); diff --git a/rostests/apitests/gdi32/AddFontResource.c b/rostests/apitests/gdi32/AddFontResource.c index 236da3f351a..434603097f0 100644 --- a/rostests/apitests/gdi32/AddFontResource.c +++ b/rostests/apitests/gdi32/AddFontResource.c @@ -7,7 +7,7 @@ #include #include -#include +#include #define COUNT 26 diff --git a/rostests/apitests/gdi32/AddFontResourceEx.c b/rostests/apitests/gdi32/AddFontResourceEx.c index 5c374d9a5e4..c6b5254057c 100644 --- a/rostests/apitests/gdi32/AddFontResourceEx.c +++ b/rostests/apitests/gdi32/AddFontResourceEx.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #include void Test_AddFontResourceExW() diff --git a/rostests/apitests/gdi32/BeginPath.c b/rostests/apitests/gdi32/BeginPath.c index aba1201b014..1458d1bd5de 100644 --- a/rostests/apitests/gdi32/BeginPath.c +++ b/rostests/apitests/gdi32/BeginPath.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include void Test_BeginPath() { diff --git a/rostests/apitests/gdi32/CombineRgn.c b/rostests/apitests/gdi32/CombineRgn.c index 5ff84cfd4da..209f7207e6c 100644 --- a/rostests/apitests/gdi32/CombineRgn.c +++ b/rostests/apitests/gdi32/CombineRgn.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include void Test_CombineRgn_Params() { diff --git a/rostests/apitests/gdi32/CombineTransform.c b/rostests/apitests/gdi32/CombineTransform.c index 60bc92ba091..7085b5e2126 100644 --- a/rostests/apitests/gdi32/CombineTransform.c +++ b/rostests/apitests/gdi32/CombineTransform.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #include typedef union diff --git a/rostests/apitests/gdi32/CreateBitmap.c b/rostests/apitests/gdi32/CreateBitmap.c index a33d448c4c0..e4da9ee91ad 100644 --- a/rostests/apitests/gdi32/CreateBitmap.c +++ b/rostests/apitests/gdi32/CreateBitmap.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #define DEFAULT_BITMAP 21 diff --git a/rostests/apitests/gdi32/CreateBitmapIndirect.c b/rostests/apitests/gdi32/CreateBitmapIndirect.c index 4593bccb3d7..25d81c39151 100644 --- a/rostests/apitests/gdi32/CreateBitmapIndirect.c +++ b/rostests/apitests/gdi32/CreateBitmapIndirect.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include #include -#include +#include void Test_CreateBitmapIndirect() { diff --git a/rostests/apitests/gdi32/CreateCompatibleDC.c b/rostests/apitests/gdi32/CreateCompatibleDC.c index 59c66df6493..e4cb51bbcfa 100644 --- a/rostests/apitests/gdi32/CreateCompatibleDC.c +++ b/rostests/apitests/gdi32/CreateCompatibleDC.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_CreateCompatibleDC() { diff --git a/rostests/apitests/gdi32/CreateDIBPatternBrush.c b/rostests/apitests/gdi32/CreateDIBPatternBrush.c index 8d850b76dc3..36578e4cd9d 100644 --- a/rostests/apitests/gdi32/CreateDIBPatternBrush.c +++ b/rostests/apitests/gdi32/CreateDIBPatternBrush.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include + #include "init.h" diff --git a/rostests/apitests/gdi32/CreateDIBitmap.c b/rostests/apitests/gdi32/CreateDIBitmap.c index 4a3d4cd748f..0c75f16fbc1 100644 --- a/rostests/apitests/gdi32/CreateDIBitmap.c +++ b/rostests/apitests/gdi32/CreateDIBitmap.c @@ -5,9 +5,11 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include +#include + #include "init.h" #define CBM_CREATDIB 2 diff --git a/rostests/apitests/gdi32/CreateFont.c b/rostests/apitests/gdi32/CreateFont.c index 3c77eef52ba..0422395776f 100644 --- a/rostests/apitests/gdi32/CreateFont.c +++ b/rostests/apitests/gdi32/CreateFont.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #define INVALIDFONT "ThisFontDoesNotExist" diff --git a/rostests/apitests/gdi32/CreateFontIndirect.c b/rostests/apitests/gdi32/CreateFontIndirect.c index cac0a933567..fe8127147c8 100644 --- a/rostests/apitests/gdi32/CreateFontIndirect.c +++ b/rostests/apitests/gdi32/CreateFontIndirect.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include void diff --git a/rostests/apitests/gdi32/CreateIconIndirect.c b/rostests/apitests/gdi32/CreateIconIndirect.c index 14478e4e1d8..59e70009103 100644 --- a/rostests/apitests/gdi32/CreateIconIndirect.c +++ b/rostests/apitests/gdi32/CreateIconIndirect.c @@ -1,7 +1,7 @@ -#include #include -#include +#include +#include // FIXME user32 diff --git a/rostests/apitests/gdi32/CreatePen.c b/rostests/apitests/gdi32/CreatePen.c index af9ff431881..1f818b4c287 100644 --- a/rostests/apitests/gdi32/CreatePen.c +++ b/rostests/apitests/gdi32/CreatePen.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #include #include #include diff --git a/rostests/apitests/gdi32/CreateRectRgn.c b/rostests/apitests/gdi32/CreateRectRgn.c index 3f5c70b80f1..bbe17692554 100644 --- a/rostests/apitests/gdi32/CreateRectRgn.c +++ b/rostests/apitests/gdi32/CreateRectRgn.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include void Test_CreateRectRgn() { diff --git a/rostests/apitests/gdi32/DPtoLP.c b/rostests/apitests/gdi32/DPtoLP.c index 74d59455636..3ecd0faf6d8 100644 --- a/rostests/apitests/gdi32/DPtoLP.c +++ b/rostests/apitests/gdi32/DPtoLP.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_DPtoLP_Params() { diff --git a/rostests/apitests/gdi32/EngAcquireSemaphore.c b/rostests/apitests/gdi32/EngAcquireSemaphore.c index 9dea204121a..fadb8f937e7 100644 --- a/rostests/apitests/gdi32/EngAcquireSemaphore.c +++ b/rostests/apitests/gdi32/EngAcquireSemaphore.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include #include -#include +#include #include void Test_EngAcquireSemaphore() diff --git a/rostests/apitests/gdi32/EngCreateSemaphore.c b/rostests/apitests/gdi32/EngCreateSemaphore.c index 478ed9161fe..e2d487715b5 100644 --- a/rostests/apitests/gdi32/EngCreateSemaphore.c +++ b/rostests/apitests/gdi32/EngCreateSemaphore.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include #include -#include +#include #include void Test_EngCreateSemaphore() diff --git a/rostests/apitests/gdi32/EngDeleteSemaphore.c b/rostests/apitests/gdi32/EngDeleteSemaphore.c index 10a8005b00b..25dad71f2b9 100644 --- a/rostests/apitests/gdi32/EngDeleteSemaphore.c +++ b/rostests/apitests/gdi32/EngDeleteSemaphore.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include #include -#include +#include #include void Test_EngDeleteSemaphore() diff --git a/rostests/apitests/gdi32/EngReleaseSemaphore.c b/rostests/apitests/gdi32/EngReleaseSemaphore.c index 9efdc60816a..c1e3e7cbad5 100644 --- a/rostests/apitests/gdi32/EngReleaseSemaphore.c +++ b/rostests/apitests/gdi32/EngReleaseSemaphore.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include #include -#include +#include #include void Test_EngReleaseSemaphore() diff --git a/rostests/apitests/gdi32/ExtCreatePen.c b/rostests/apitests/gdi32/ExtCreatePen.c index 608bcd4e796..84c0f95d9a0 100644 --- a/rostests/apitests/gdi32/ExtCreatePen.c +++ b/rostests/apitests/gdi32/ExtCreatePen.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #include #include #include diff --git a/rostests/apitests/gdi32/GdiConvertBitmap.c b/rostests/apitests/gdi32/GdiConvertBitmap.c index 7799485b943..fb3a0a02774 100644 --- a/rostests/apitests/gdi32/GdiConvertBitmap.c +++ b/rostests/apitests/gdi32/GdiConvertBitmap.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm); diff --git a/rostests/apitests/gdi32/GdiConvertBrush.c b/rostests/apitests/gdi32/GdiConvertBrush.c index 259fe93d9eb..640a268cfe8 100644 --- a/rostests/apitests/gdi32/GdiConvertBrush.c +++ b/rostests/apitests/gdi32/GdiConvertBrush.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr); diff --git a/rostests/apitests/gdi32/GdiConvertDC.c b/rostests/apitests/gdi32/GdiConvertDC.c index e6b2d545492..4ad2b1ba33b 100644 --- a/rostests/apitests/gdi32/GdiConvertDC.c +++ b/rostests/apitests/gdi32/GdiConvertDC.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include HDC WINAPI GdiConvertDC(HDC hdc); diff --git a/rostests/apitests/gdi32/GdiConvertFont.c b/rostests/apitests/gdi32/GdiConvertFont.c index 0e20dd345f0..48bdc79eb26 100644 --- a/rostests/apitests/gdi32/GdiConvertFont.c +++ b/rostests/apitests/gdi32/GdiConvertFont.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include HFONT WINAPI GdiConvertFont(HFONT); diff --git a/rostests/apitests/gdi32/GdiConvertPalette.c b/rostests/apitests/gdi32/GdiConvertPalette.c index b98eff89bd9..7721beb6656 100644 --- a/rostests/apitests/gdi32/GdiConvertPalette.c +++ b/rostests/apitests/gdi32/GdiConvertPalette.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include HPALETTE WINAPI GdiConvertPalette(HPALETTE); diff --git a/rostests/apitests/gdi32/GdiConvertRegion.c b/rostests/apitests/gdi32/GdiConvertRegion.c index 1db7e16d6cc..503fd4db08c 100644 --- a/rostests/apitests/gdi32/GdiConvertRegion.c +++ b/rostests/apitests/gdi32/GdiConvertRegion.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include HRGN WINAPI GdiConvertRegion(HRGN); diff --git a/rostests/apitests/gdi32/GdiDeleteLocalDC.c b/rostests/apitests/gdi32/GdiDeleteLocalDC.c index 5eec2d1e62e..76194c2f03b 100644 --- a/rostests/apitests/gdi32/GdiDeleteLocalDC.c +++ b/rostests/apitests/gdi32/GdiDeleteLocalDC.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include BOOL WINAPI GdiDeleteLocalDC(HDC); diff --git a/rostests/apitests/gdi32/GdiGetCharDimensions.c b/rostests/apitests/gdi32/GdiGetCharDimensions.c index 600ee7d7848..24672e620ab 100644 --- a/rostests/apitests/gdi32/GdiGetCharDimensions.c +++ b/rostests/apitests/gdi32/GdiGetCharDimensions.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include void Test_GdiGetCharDimensions() { diff --git a/rostests/apitests/gdi32/GdiGetLocalBrush.c b/rostests/apitests/gdi32/GdiGetLocalBrush.c index 7a8f182cf04..76e13237f60 100644 --- a/rostests/apitests/gdi32/GdiGetLocalBrush.c +++ b/rostests/apitests/gdi32/GdiGetLocalBrush.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr); diff --git a/rostests/apitests/gdi32/GdiGetLocalDC.c b/rostests/apitests/gdi32/GdiGetLocalDC.c index e8de9c0d032..2c9b1cf40e0 100644 --- a/rostests/apitests/gdi32/GdiGetLocalDC.c +++ b/rostests/apitests/gdi32/GdiGetLocalDC.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include HDC WINAPI GdiGetLocalDC(HDC); diff --git a/rostests/apitests/gdi32/GdiReleaseLocalDC.c b/rostests/apitests/gdi32/GdiReleaseLocalDC.c index 8eea7d76b64..a65f63a8251 100644 --- a/rostests/apitests/gdi32/GdiReleaseLocalDC.c +++ b/rostests/apitests/gdi32/GdiReleaseLocalDC.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include BOOL WINAPI GdiReleaseLocalDC(HDC); diff --git a/rostests/apitests/gdi32/GdiSetAttrs.c b/rostests/apitests/gdi32/GdiSetAttrs.c index b0bd6b249e0..7e7ef1c1eb8 100644 --- a/rostests/apitests/gdi32/GdiSetAttrs.c +++ b/rostests/apitests/gdi32/GdiSetAttrs.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include BOOL WINAPI GdiSetAttrs(HDC); diff --git a/rostests/apitests/gdi32/GetClipRgn.c b/rostests/apitests/gdi32/GetClipRgn.c index 35221489f78..619836ce772 100644 --- a/rostests/apitests/gdi32/GetClipRgn.c +++ b/rostests/apitests/gdi32/GetClipRgn.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_GetClipRgn() { diff --git a/rostests/apitests/gdi32/GetCurrentObject.c b/rostests/apitests/gdi32/GetCurrentObject.c index 4ed448d152d..65a175951a4 100644 --- a/rostests/apitests/gdi32/GetCurrentObject.c +++ b/rostests/apitests/gdi32/GetCurrentObject.c @@ -5,10 +5,10 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #include +#include #include #include diff --git a/rostests/apitests/gdi32/GetDIBColorTable.c b/rostests/apitests/gdi32/GetDIBColorTable.c index b765d0ac81e..feeac824d00 100644 --- a/rostests/apitests/gdi32/GetDIBColorTable.c +++ b/rostests/apitests/gdi32/GetDIBColorTable.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include void Test_GetDIBColorTable() { diff --git a/rostests/apitests/gdi32/GetDIBits.c b/rostests/apitests/gdi32/GetDIBits.c index db63c78adb9..7f03a81e919 100644 --- a/rostests/apitests/gdi32/GetDIBits.c +++ b/rostests/apitests/gdi32/GetDIBits.c @@ -5,9 +5,10 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include + #include "init.h" void diff --git a/rostests/apitests/gdi32/GetObject.c b/rostests/apitests/gdi32/GetObject.c index 61e075201d2..4797856bc08 100644 --- a/rostests/apitests/gdi32/GetObject.c +++ b/rostests/apitests/gdi32/GetObject.c @@ -5,10 +5,11 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #include +#include +#include #include #include diff --git a/rostests/apitests/gdi32/GetPixel.c b/rostests/apitests/gdi32/GetPixel.c index faa5d482fcd..d8e14cff9a9 100644 --- a/rostests/apitests/gdi32/GetPixel.c +++ b/rostests/apitests/gdi32/GetPixel.c @@ -5,10 +5,8 @@ * PROGRAMMERS: Jérôme Gardou */ -#include #include -#include - +#include void Test_GetPixel_1bpp() { diff --git a/rostests/apitests/gdi32/GetRandomRgn.c b/rostests/apitests/gdi32/GetRandomRgn.c index b661d68d7e0..947dd4e89c7 100644 --- a/rostests/apitests/gdi32/GetRandomRgn.c +++ b/rostests/apitests/gdi32/GetRandomRgn.c @@ -7,7 +7,8 @@ #include #include -#include +#include +#include #define CLIPRGN 1 #define METARGN 2 diff --git a/rostests/apitests/gdi32/GetStockObject.c b/rostests/apitests/gdi32/GetStockObject.c index 86d028d8499..14c9336543e 100644 --- a/rostests/apitests/gdi32/GetStockObject.c +++ b/rostests/apitests/gdi32/GetStockObject.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #include #include #include diff --git a/rostests/apitests/gdi32/GetTextExtentExPoint.c b/rostests/apitests/gdi32/GetTextExtentExPoint.c index b0368363c65..af7efd70fc2 100644 --- a/rostests/apitests/gdi32/GetTextExtentExPoint.c +++ b/rostests/apitests/gdi32/GetTextExtentExPoint.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include #define TEST(x) ok(x, #x"\n") #define RTEST(x) ok(x, #x"\n") diff --git a/rostests/apitests/gdi32/GetTextFace.c b/rostests/apitests/gdi32/GetTextFace.c index 7e6c7f97487..dba06d3acc2 100644 --- a/rostests/apitests/gdi32/GetTextFace.c +++ b/rostests/apitests/gdi32/GetTextFace.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include #define TEST(x) ok(x, #x"\n") #define RTEST(x) ok(x, #x"\n") diff --git a/rostests/apitests/gdi32/MaskBlt.c b/rostests/apitests/gdi32/MaskBlt.c index ae3ac6db95e..492aa9a2930 100644 --- a/rostests/apitests/gdi32/MaskBlt.c +++ b/rostests/apitests/gdi32/MaskBlt.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_MaskBlt_1bpp() { diff --git a/rostests/apitests/gdi32/PatBlt.c b/rostests/apitests/gdi32/PatBlt.c index e6e728934d1..de4e3637060 100644 --- a/rostests/apitests/gdi32/PatBlt.c +++ b/rostests/apitests/gdi32/PatBlt.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include HBITMAP ghbmpTarget; PULONG gpulTargetBits; diff --git a/rostests/apitests/gdi32/Rectangle.c b/rostests/apitests/gdi32/Rectangle.c index 44030a9a048..4dfa212977f 100644 --- a/rostests/apitests/gdi32/Rectangle.c +++ b/rostests/apitests/gdi32/Rectangle.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Jérôme Gardou */ -#include #include -#include +#include void Test_Rectangle(void) { diff --git a/rostests/apitests/gdi32/SelectObject.c b/rostests/apitests/gdi32/SelectObject.c index 3049dd07895..77cfb3a1db9 100644 --- a/rostests/apitests/gdi32/SelectObject.c +++ b/rostests/apitests/gdi32/SelectObject.c @@ -7,8 +7,10 @@ #include #include -#include +#include #include +#include +#include #include #include diff --git a/rostests/apitests/gdi32/SetBrushOrgEx.c b/rostests/apitests/gdi32/SetBrushOrgEx.c index 99ea3173c9a..576d1355428 100644 --- a/rostests/apitests/gdi32/SetBrushOrgEx.c +++ b/rostests/apitests/gdi32/SetBrushOrgEx.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD dwErrExp) { diff --git a/rostests/apitests/gdi32/SetDCPenColor.c b/rostests/apitests/gdi32/SetDCPenColor.c index 9e6468f65fd..bd3c4689bb8 100644 --- a/rostests/apitests/gdi32/SetDCPenColor.c +++ b/rostests/apitests/gdi32/SetDCPenColor.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_SetDCPenColor() { diff --git a/rostests/apitests/gdi32/SetDIBits.c b/rostests/apitests/gdi32/SetDIBits.c index 50fcc52374a..84405fac1f6 100644 --- a/rostests/apitests/gdi32/SetDIBits.c +++ b/rostests/apitests/gdi32/SetDIBits.c @@ -5,10 +5,8 @@ * PROGRAMMERS: Jérôme Gardou */ -#include #include -#include - +#include void Test_SetDIBits() { diff --git a/rostests/apitests/gdi32/SetDIBitsToDevice.c b/rostests/apitests/gdi32/SetDIBitsToDevice.c index c2c3eb0807d..18f4a88bdc2 100644 --- a/rostests/apitests/gdi32/SetDIBitsToDevice.c +++ b/rostests/apitests/gdi32/SetDIBitsToDevice.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include + #include "init.h" static void diff --git a/rostests/apitests/gdi32/SetMapMode.c b/rostests/apitests/gdi32/SetMapMode.c index b0bdd3e5136..fd795835c58 100644 --- a/rostests/apitests/gdi32/SetMapMode.c +++ b/rostests/apitests/gdi32/SetMapMode.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include #define TEST(x) ok(x, #x"\n") #define RTEST(x) ok(x, #x"\n") diff --git a/rostests/apitests/gdi32/SetPixel.c b/rostests/apitests/gdi32/SetPixel.c index bd9af8e7268..aded5936e0e 100644 --- a/rostests/apitests/gdi32/SetPixel.c +++ b/rostests/apitests/gdi32/SetPixel.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include static struct { diff --git a/rostests/apitests/gdi32/SetSysColors.c b/rostests/apitests/gdi32/SetSysColors.c index 6be405cc233..7250e1aa897 100644 --- a/rostests/apitests/gdi32/SetSysColors.c +++ b/rostests/apitests/gdi32/SetSysColors.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include #define TEST(x) ok(x, #x"\n") diff --git a/rostests/apitests/gdi32/SetWindowExtEx.c b/rostests/apitests/gdi32/SetWindowExtEx.c index ef53fea7d0c..5338234e2c9 100644 --- a/rostests/apitests/gdi32/SetWindowExtEx.c +++ b/rostests/apitests/gdi32/SetWindowExtEx.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include #define TEST(x) ok(x, #x"\n") #define RTEST(x) ok(x, #x"\n") diff --git a/rostests/apitests/gdi32/SetWorldTransform.c b/rostests/apitests/gdi32/SetWorldTransform.c index f9aa0f3f6f0..5c73ece790e 100644 --- a/rostests/apitests/gdi32/SetWorldTransform.c +++ b/rostests/apitests/gdi32/SetWorldTransform.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_SetWorldTransform() { diff --git a/rostests/apitests/gdi32/init.c b/rostests/apitests/gdi32/init.c index 2721290aedc..e19253515ff 100644 --- a/rostests/apitests/gdi32/init.c +++ b/rostests/apitests/gdi32/init.c @@ -1,6 +1,7 @@ #include -#include +#include +#include HBITMAP ghbmpDIB32; HDC ghdcDIB32; diff --git a/rostests/apitests/gdi32/testlist.c b/rostests/apitests/gdi32/testlist.c index 923a9350ea6..2724d3b0e79 100644 --- a/rostests/apitests/gdi32/testlist.c +++ b/rostests/apitests/gdi32/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_AddFontResource(void); extern void func_AddFontResourceEx(void); diff --git a/rostests/apitests/kernel32/GetDriveType.c b/rostests/apitests/kernel32/GetDriveType.c index 010eb362de7..e5b79c8dfe2 100644 --- a/rostests/apitests/kernel32/GetDriveType.c +++ b/rostests/apitests/kernel32/GetDriveType.c @@ -1,6 +1,4 @@ -#include #include -#include #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR) diff --git a/rostests/apitests/kernel32/GetModuleFileName.c b/rostests/apitests/kernel32/GetModuleFileName.c index 5c3c00a137f..7022d91df52 100644 --- a/rostests/apitests/kernel32/GetModuleFileName.c +++ b/rostests/apitests/kernel32/GetModuleFileName.c @@ -6,10 +6,13 @@ */ #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define UNICODE #include #include -#include +#include +#include #include static diff --git a/rostests/apitests/kernel32/MultiByteToWideChar.c b/rostests/apitests/kernel32/MultiByteToWideChar.c index 96fc8bd07b7..0dd6ce62192 100644 --- a/rostests/apitests/kernel32/MultiByteToWideChar.c +++ b/rostests/apitests/kernel32/MultiByteToWideChar.c @@ -5,9 +5,8 @@ * PROGRAMMER: Mike "tamlin" Nordell */ -#include -#include #include +#include START_TEST(MultiByteToWideChar) diff --git a/rostests/apitests/kernel32/lstrcpynW.c b/rostests/apitests/kernel32/lstrcpynW.c index 102b371f0e4..7bdd6efbc39 100644 --- a/rostests/apitests/kernel32/lstrcpynW.c +++ b/rostests/apitests/kernel32/lstrcpynW.c @@ -7,7 +7,6 @@ #define WIN32_NO_STATUS #include #include -#include START_TEST(lstrcpynW) { diff --git a/rostests/apitests/kernel32/testlist.c b/rostests/apitests/kernel32/testlist.c index a0b5d034802..e19100d7747 100644 --- a/rostests/apitests/kernel32/testlist.c +++ b/rostests/apitests/kernel32/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_GetCurrentDirectory(void); extern void func_GetDriveType(void); diff --git a/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c b/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c index 4abcc46e45e..e2c4e55cb87 100644 --- a/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c +++ b/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c @@ -7,8 +7,9 @@ #define WIN32_NO_STATUS #include -#include -#include +#include +#include +#include #include "CmdLineUtil.h" diff --git a/rostests/apitests/msvcrt/CommandLine.c b/rostests/apitests/msvcrt/CommandLine.c index 96bef12d234..c466d550669 100644 --- a/rostests/apitests/msvcrt/CommandLine.c +++ b/rostests/apitests/msvcrt/CommandLine.c @@ -9,7 +9,7 @@ #define UNICODE #include #include -#include +#include #include "./CmdLineUtil/CmdLineUtil.h" diff --git a/rostests/apitests/msvcrt/testlist.c b/rostests/apitests/msvcrt/testlist.c index e55fbdaadb1..505205e6fdb 100644 --- a/rostests/apitests/msvcrt/testlist.c +++ b/rostests/apitests/msvcrt/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_CommandLine(void); extern void func_ieee(void); diff --git a/rostests/apitests/ntdll/LdrEnumResources.c b/rostests/apitests/ntdll/LdrEnumResources.c index 493c7470448..f9bf3b7ed11 100644 --- a/rostests/apitests/ntdll/LdrEnumResources.c +++ b/rostests/apitests/ntdll/LdrEnumResources.c @@ -7,7 +7,6 @@ #define WIN32_NO_STATUS #define UNICODE -#include #include #include #include diff --git a/rostests/apitests/ntdll/NtAllocateVirtualMemory.c b/rostests/apitests/ntdll/NtAllocateVirtualMemory.c index 472190ba295..03884d651a9 100644 --- a/rostests/apitests/ntdll/NtAllocateVirtualMemory.c +++ b/rostests/apitests/ntdll/NtAllocateVirtualMemory.c @@ -6,7 +6,6 @@ */ #define WIN32_NO_STATUS -#include #include #include #include diff --git a/rostests/apitests/ntdll/NtFreeVirtualMemory.c b/rostests/apitests/ntdll/NtFreeVirtualMemory.c index 075b4f41b00..d534221f8d8 100644 --- a/rostests/apitests/ntdll/NtFreeVirtualMemory.c +++ b/rostests/apitests/ntdll/NtFreeVirtualMemory.c @@ -1,7 +1,7 @@ #define WIN32_NO_STATUS -#include #include -#include +#include +#include static void Test_NtFreeVirtualMemory(void) { diff --git a/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c b/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c index 0c640513a39..7c41038ba23 100644 --- a/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c +++ b/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c @@ -6,9 +6,10 @@ */ #define WIN32_NO_STATUS -#include #include -#include +#include +#include +#include // Arbitrary-defined constants #define MIN_BUFFER_LENGTH 4L diff --git a/rostests/apitests/ntdll/RtlBitmap.c b/rostests/apitests/ntdll/RtlBitmap.c index f8060062cac..dfaff4f6f91 100644 --- a/rostests/apitests/ntdll/RtlBitmap.c +++ b/rostests/apitests/ntdll/RtlBitmap.c @@ -1,6 +1,5 @@ #define WIN32_NO_STATUS -#include #include #include #include diff --git a/rostests/apitests/ntdll/RtlInitializeBitMap.c b/rostests/apitests/ntdll/RtlInitializeBitMap.c index 21a8c7395c6..75a1c5aa94e 100644 --- a/rostests/apitests/ntdll/RtlInitializeBitMap.c +++ b/rostests/apitests/ntdll/RtlInitializeBitMap.c @@ -6,9 +6,8 @@ */ #define WIN32_NO_STATUS -#include #include -#include +#include void Test_RtlInitializeBitmap() { diff --git a/rostests/apitests/ntdll/SystemInfo.c b/rostests/apitests/ntdll/SystemInfo.c index 40aaa8a0979..d63d6546628 100644 --- a/rostests/apitests/ntdll/SystemInfo.c +++ b/rostests/apitests/ntdll/SystemInfo.c @@ -6,9 +6,8 @@ */ #define WIN32_NO_STATUS -#include #include -#include +#include void GetPrivilege() diff --git a/rostests/apitests/ntdll/ZwContinue.c b/rostests/apitests/ntdll/ZwContinue.c index 0b181e31be1..17cbbe454aa 100644 --- a/rostests/apitests/ntdll/ZwContinue.c +++ b/rostests/apitests/ntdll/ZwContinue.c @@ -6,7 +6,6 @@ */ #include -#include #include #include diff --git a/rostests/apitests/ntdll/testlist.c b/rostests/apitests/ntdll/testlist.c index 1d1e208a686..ac23a9b12ac 100644 --- a/rostests/apitests/ntdll/testlist.c +++ b/rostests/apitests/ntdll/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void); diff --git a/rostests/apitests/powrprof/power.c b/rostests/apitests/powrprof/power.c index c1950a148a1..8e956b56bbf 100644 --- a/rostests/apitests/powrprof/power.c +++ b/rostests/apitests/powrprof/power.c @@ -8,17 +8,12 @@ */ #include -#include "ntstatus.h" +#include #define WIN32_NO_STATUS #define STANDALONE -#include "wine/test.h" -#include "winternl.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "powrprof.h" -#include "assert.h" -#include "winnt.h" +#include +#include +#include /* LONG WINAPI RegOpenCurrentUser(REGSAM a,PHKEY b) diff --git a/rostests/apitests/powrprof/testlist.c b/rostests/apitests/powrprof/testlist.c index 3575ce2458b..0c723feb826 100644 --- a/rostests/apitests/powrprof/testlist.c +++ b/rostests/apitests/powrprof/testlist.c @@ -1,11 +1,11 @@ /* Automatically generated file; DO NOT EDIT!! */ /* stdarg.h is needed for Winelib */ -#include -#include -#include -#include "windef.h" -#include "winbase.h" +//#include +//#include +//#include +//#include "windef.h" +//#include "winbase.h" struct test { @@ -22,4 +22,4 @@ const struct test winetest_testlist[] = }; #define WINETEST_WANT_MAIN -#include "wine/test.h" +#include diff --git a/rostests/apitests/user32/AttachThreadInput.c b/rostests/apitests/user32/AttachThreadInput.c index 79f517f8548..3f8e3b0d534 100644 --- a/rostests/apitests/user32/AttachThreadInput.c +++ b/rostests/apitests/user32/AttachThreadInput.c @@ -5,11 +5,10 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include -#include #include +#include +#include #include "helper.h" -#include #define DESKTOP_ALL_ACCESS 0x01ff diff --git a/rostests/apitests/user32/CreateIconFromResourceEx.c b/rostests/apitests/user32/CreateIconFromResourceEx.c index baf3b6b9a35..42ce1e8a13a 100644 --- a/rostests/apitests/user32/CreateIconFromResourceEx.c +++ b/rostests/apitests/user32/CreateIconFromResourceEx.c @@ -1,7 +1,5 @@ -#include #include -#include -#include "resource.h" +#include START_TEST(CreateIconFromResourceEx) { diff --git a/rostests/apitests/user32/DeferWindowPos.c b/rostests/apitests/user32/DeferWindowPos.c index 65f28f01973..ee38a82ddc3 100644 --- a/rostests/apitests/user32/DeferWindowPos.c +++ b/rostests/apitests/user32/DeferWindowPos.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Thomas Faber */ -#include #include -#include +#include #include "helper.h" #include diff --git a/rostests/apitests/user32/DestroyCursorIcon.c b/rostests/apitests/user32/DestroyCursorIcon.c index 38b2fef99e5..f1dd06f1822 100644 --- a/rostests/apitests/user32/DestroyCursorIcon.c +++ b/rostests/apitests/user32/DestroyCursorIcon.c @@ -1,7 +1,6 @@ -#include #include -#include -#include "resource.h" +#include +#include START_TEST(DestroyCursorIcon) { diff --git a/rostests/apitests/user32/DrawIconEx.c b/rostests/apitests/user32/DrawIconEx.c index 820e713e591..5642bba2c03 100644 --- a/rostests/apitests/user32/DrawIconEx.c +++ b/rostests/apitests/user32/DrawIconEx.c @@ -1,7 +1,6 @@ -#include #include -#include -#include "resource.h" +#include +#include START_TEST(DrawIconEx) { diff --git a/rostests/apitests/user32/GetIconInfo.c b/rostests/apitests/user32/GetIconInfo.c index 3352aa0253f..7945113d828 100644 --- a/rostests/apitests/user32/GetIconInfo.c +++ b/rostests/apitests/user32/GetIconInfo.c @@ -1,7 +1,7 @@ - -#include #include -#include +#include +#include + #include "resource.h" // FIXME user32 diff --git a/rostests/apitests/user32/GetKeyState.c b/rostests/apitests/user32/GetKeyState.c index 759457675d5..292eddd2aaf 100644 --- a/rostests/apitests/user32/GetKeyState.c +++ b/rostests/apitests/user32/GetKeyState.c @@ -5,13 +5,11 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include #include -#include +#include #include HHOOK hKbdHook, hKbdLLHook; - LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam, LPARAM lParam) { diff --git a/rostests/apitests/user32/GetPeekMessage.c b/rostests/apitests/user32/GetPeekMessage.c index 2cf24d2c71a..da1f33625a0 100644 --- a/rostests/apitests/user32/GetPeekMessage.c +++ b/rostests/apitests/user32/GetPeekMessage.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Thomas Faber */ -#include #include -#include +#include void Test_GetMessage(HWND hWnd) { diff --git a/rostests/apitests/user32/GetSystemMetrics.c b/rostests/apitests/user32/GetSystemMetrics.c index 328b8280632..f4e335d5b09 100644 --- a/rostests/apitests/user32/GetSystemMetrics.c +++ b/rostests/apitests/user32/GetSystemMetrics.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_GetSystemMetrics() { diff --git a/rostests/apitests/user32/InitializeLpkHooks.c b/rostests/apitests/user32/InitializeLpkHooks.c index 462b65c4c83..a10fded0e87 100644 --- a/rostests/apitests/user32/InitializeLpkHooks.c +++ b/rostests/apitests/user32/InitializeLpkHooks.c @@ -5,10 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include #include -#include - +#include typedef struct _LPK_LPEDITCONTROL_LIST { diff --git a/rostests/apitests/user32/LoadImage.c b/rostests/apitests/user32/LoadImage.c index 3ae9dda3898..914d8190c83 100644 --- a/rostests/apitests/user32/LoadImage.c +++ b/rostests/apitests/user32/LoadImage.c @@ -1,8 +1,7 @@ - #include #include -#include -#include "resource.h" +#include +#include START_TEST(LoadImage) { diff --git a/rostests/apitests/user32/RealGetWindowClass.c b/rostests/apitests/user32/RealGetWindowClass.c index a8fe9db85b2..622a01ec0d7 100644 --- a/rostests/apitests/user32/RealGetWindowClass.c +++ b/rostests/apitests/user32/RealGetWindowClass.c @@ -7,7 +7,7 @@ #include #include -#include +#include #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) diff --git a/rostests/apitests/user32/ScrollDC.c b/rostests/apitests/user32/ScrollDC.c index 2bc1172207d..97211cafc9e 100644 --- a/rostests/apitests/user32/ScrollDC.c +++ b/rostests/apitests/user32/ScrollDC.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_ScrollDC() { diff --git a/rostests/apitests/user32/ScrollWindowEx.c b/rostests/apitests/user32/ScrollWindowEx.c index 2fd3a9dc35e..a765ed3df8f 100644 --- a/rostests/apitests/user32/ScrollWindowEx.c +++ b/rostests/apitests/user32/ScrollWindowEx.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include #include -#include +#include +#include void Test_ScrollWindowEx() { diff --git a/rostests/apitests/user32/SetActiveWindow.c b/rostests/apitests/user32/SetActiveWindow.c index f53bf135c57..d3a9963481b 100644 --- a/rostests/apitests/user32/SetActiveWindow.c +++ b/rostests/apitests/user32/SetActiveWindow.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include #include -#include +#include +#include #include "helper.h" #include diff --git a/rostests/apitests/user32/SetCursorPos.c b/rostests/apitests/user32/SetCursorPos.c index 3236f366aee..2aea43ab590 100644 --- a/rostests/apitests/user32/SetCursorPos.c +++ b/rostests/apitests/user32/SetCursorPos.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include #include -#include +#include +#include #include HHOOK hMouseHookLL, hMouseHook; diff --git a/rostests/apitests/user32/SystemParametersInfo.c b/rostests/apitests/user32/SystemParametersInfo.c index 5616665532a..a86b249fbb3 100644 --- a/rostests/apitests/user32/SystemParametersInfo.c +++ b/rostests/apitests/user32/SystemParametersInfo.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include #include -#include +#include +#include #include "helper.h" #include diff --git a/rostests/apitests/user32/TrackMouseEvent.c b/rostests/apitests/user32/TrackMouseEvent.c index 417ed6fd816..4e78b5e9efa 100644 --- a/rostests/apitests/user32/TrackMouseEvent.c +++ b/rostests/apitests/user32/TrackMouseEvent.c @@ -5,9 +5,9 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include #include -#include +#include +#include #include "helper.h" #include diff --git a/rostests/apitests/user32/WndProc.c b/rostests/apitests/user32/WndProc.c index e9c70f1210a..5288104c27d 100644 --- a/rostests/apitests/user32/WndProc.c +++ b/rostests/apitests/user32/WndProc.c @@ -5,9 +5,9 @@ * PROGRAMMERS: */ -#include #include -#include +#include +#include /* Used wine Redraw test for proof in principle. */ diff --git a/rostests/apitests/user32/desktop.c b/rostests/apitests/user32/desktop.c index a03ff449127..69c343da6cd 100644 --- a/rostests/apitests/user32/desktop.c +++ b/rostests/apitests/user32/desktop.c @@ -7,9 +7,9 @@ #include #include -#include +#include +#include #include "helper.h" -#include #define STATUS_DLL_INIT_FAILED (0xC0000142) #define DESKTOP_ALL_ACCESS 0x01ff diff --git a/rostests/apitests/user32/helper.c b/rostests/apitests/user32/helper.c index c59a25694ad..4d30db4eefe 100644 --- a/rostests/apitests/user32/helper.c +++ b/rostests/apitests/user32/helper.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include "helper.h" #include diff --git a/rostests/apitests/user32/testlist.c b/rostests/apitests/user32/testlist.c index 2b030a13a3c..008c11ffae1 100644 --- a/rostests/apitests/user32/testlist.c +++ b/rostests/apitests/user32/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_AttachThreadInput(void); extern void func_CreateIconFromResourceEx(void); diff --git a/rostests/apitests/user32/user32_apitest.rc b/rostests/apitests/user32/user32_apitest.rc index 8c40b58552d..18a60b3e11c 100644 --- a/rostests/apitests/user32/user32_apitest.rc +++ b/rostests/apitests/user32/user32_apitest.rc @@ -1,4 +1,4 @@ -#include +#include #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c b/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c index ea545d282a5..f1ed9aa79e7 100644 --- a/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c +++ b/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c @@ -1,4 +1,4 @@ -#include +#include #ifdef BUILD_DLL #define DLL_EXPORT __declspec(dllexport) diff --git a/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c b/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c index 13a149cc27e..064044b59af 100644 --- a/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c +++ b/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c @@ -1,4 +1,4 @@ -#include +#include #ifdef BUILD_DLL #define DLL_EXPORT __declspec(dllexport) diff --git a/rostests/apitests/w32kdll/w32kdll_ros/main.c b/rostests/apitests/w32kdll/w32kdll_ros/main.c index 13a149cc27e..064044b59af 100644 --- a/rostests/apitests/w32kdll/w32kdll_ros/main.c +++ b/rostests/apitests/w32kdll/w32kdll_ros/main.c @@ -1,4 +1,4 @@ -#include +#include #ifdef BUILD_DLL #define DLL_EXPORT __declspec(dllexport) diff --git a/rostests/apitests/w32kdll/w32kdll_vista/main.c b/rostests/apitests/w32kdll/w32kdll_vista/main.c index ea545d282a5..f1ed9aa79e7 100644 --- a/rostests/apitests/w32kdll/w32kdll_vista/main.c +++ b/rostests/apitests/w32kdll/w32kdll_vista/main.c @@ -1,4 +1,4 @@ -#include +#include #ifdef BUILD_DLL #define DLL_EXPORT __declspec(dllexport) diff --git a/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c b/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c index 13a149cc27e..064044b59af 100644 --- a/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c +++ b/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c @@ -1,4 +1,4 @@ -#include +#include #ifdef BUILD_DLL #define DLL_EXPORT __declspec(dllexport) diff --git a/rostests/apitests/w32knapi/w32knapi.h b/rostests/apitests/w32knapi/w32knapi.h index d78e38dd662..9ac0b888307 100644 --- a/rostests/apitests/w32knapi/w32knapi.h +++ b/rostests/apitests/w32knapi/w32knapi.h @@ -4,15 +4,17 @@ /* SDK/NDK Headers */ #define NTOS_MODE_USER #define WIN32_NO_STATUS -#include -#include -#include -#include -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #include +#include +#include +#include #include #include -#include #include /* Public Win32K Headers */ diff --git a/rostests/apitests/w32knapi/w32knapi.rc b/rostests/apitests/w32knapi/w32knapi.rc index 4e631d954c6..2dc0341d7eb 100644 --- a/rostests/apitests/w32knapi/w32knapi.rc +++ b/rostests/apitests/w32knapi/w32knapi.rc @@ -1,5 +1,4 @@ -#include +#include #include "resource.h" IDI_ICON ICON "resource/system.ico" - diff --git a/rostests/apitests/winhttp/WinHttpOpen.c b/rostests/apitests/winhttp/WinHttpOpen.c index 54c65704d4d..f9d84cff914 100644 --- a/rostests/apitests/winhttp/WinHttpOpen.c +++ b/rostests/apitests/winhttp/WinHttpOpen.c @@ -6,6 +6,11 @@ */ #define UNICODE + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include #include #include #include diff --git a/rostests/apitests/winhttp/testlist.c b/rostests/apitests/winhttp/testlist.c index fa5cd82646f..44d09ab8589 100644 --- a/rostests/apitests/winhttp/testlist.c +++ b/rostests/apitests/winhttp/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_WinHttpOpen(void); diff --git a/rostests/apitests/wininet/InternetOpen.c b/rostests/apitests/wininet/InternetOpen.c index 54806243b36..5ae5ce5a252 100644 --- a/rostests/apitests/wininet/InternetOpen.c +++ b/rostests/apitests/wininet/InternetOpen.c @@ -6,6 +6,11 @@ */ #define UNICODE + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include #include #include #include diff --git a/rostests/apitests/wininet/testlist.c b/rostests/apitests/wininet/testlist.c index 8083e603077..b406b3a0660 100644 --- a/rostests/apitests/wininet/testlist.c +++ b/rostests/apitests/wininet/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_InternetOpen(void); diff --git a/rostests/apitests/ws2_32/WSAStartup.c b/rostests/apitests/ws2_32/WSAStartup.c index 5e2c1a39baf..374139375ad 100644 --- a/rostests/apitests/ws2_32/WSAStartup.c +++ b/rostests/apitests/ws2_32/WSAStartup.c @@ -6,6 +6,9 @@ */ #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include #include #include #include diff --git a/rostests/apitests/ws2_32/getaddrinfo.c b/rostests/apitests/ws2_32/getaddrinfo.c index 50ff0a27b7c..021e19e884b 100644 --- a/rostests/apitests/ws2_32/getaddrinfo.c +++ b/rostests/apitests/ws2_32/getaddrinfo.c @@ -6,7 +6,11 @@ */ #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #include #include #include diff --git a/rostests/apitests/ws2_32/helpers.c b/rostests/apitests/ws2_32/helpers.c index 44af7e93174..7a011ef1368 100644 --- a/rostests/apitests/ws2_32/helpers.c +++ b/rostests/apitests/ws2_32/helpers.c @@ -8,6 +8,7 @@ #include #include + #include "ws2_32.h" int CreateSocket(SOCKET* psck) diff --git a/rostests/apitests/ws2_32/ioctlsocket.c b/rostests/apitests/ws2_32/ioctlsocket.c index 83b0d05a00c..3df5ad434aa 100644 --- a/rostests/apitests/ws2_32/ioctlsocket.c +++ b/rostests/apitests/ws2_32/ioctlsocket.c @@ -7,7 +7,7 @@ #include #include -#include + #include "ws2_32.h" int Test_ioctlsocket() diff --git a/rostests/apitests/ws2_32/recv.c b/rostests/apitests/ws2_32/recv.c index d23d6a9b167..79927b648a2 100644 --- a/rostests/apitests/ws2_32/recv.c +++ b/rostests/apitests/ws2_32/recv.c @@ -8,7 +8,6 @@ #include #include #include -#include #include "ws2_32.h" #define RECV_BUF 4 diff --git a/rostests/apitests/ws2_32/testlist.c b/rostests/apitests/ws2_32/testlist.c index 4f2378cd4e6..356b6d2cada 100644 --- a/rostests/apitests/ws2_32/testlist.c +++ b/rostests/apitests/ws2_32/testlist.c @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include #define STANDALONE -#include "wine/test.h" +#include extern void func_getaddrinfo(void); extern void func_ioctlsocket(void); diff --git a/rostests/apitests/ws2_32/ws2_32.h b/rostests/apitests/ws2_32/ws2_32.h index e6fedc264b4..b8415bf1025 100644 --- a/rostests/apitests/ws2_32/ws2_32.h +++ b/rostests/apitests/ws2_32/ws2_32.h @@ -9,6 +9,9 @@ #ifndef _WS2_32_APITESTS_H #define _WS2_32_APITESTS_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #include /* Simple macro for executing a socket command and doing cleanup operations in case of a failure */ diff --git a/rostests/kmtests/include/kmt_platform.h b/rostests/kmtests/include/kmt_platform.h index 092c280d383..7b081bf5a85 100644 --- a/rostests/kmtests/include/kmt_platform.h +++ b/rostests/kmtests/include/kmt_platform.h @@ -12,20 +12,28 @@ #error include kmt_test.h instead of including kmt_platform.h! #endif /* !defined _KMTEST_TEST_H_ */ +#include +#include +#include + #if defined KMT_KERNEL_MODE || defined KMT_STANDALONE_DRIVER #include #include -#include +#include +#include +#include +#include #include #elif defined KMT_USER_MODE -#define WIN32_LEAN_AND_MEAN #define WIN32_NO_STATUS #define UNICODE -#include -#include +#include +#include +#include +#include +#include #include -#include #ifdef KMT_EMULATE_KERNEL #define ok_irql(i) @@ -48,8 +56,5 @@ typedef ULONG LOGICAL, *PLOGICAL; #endif /* defined KMT_USER_MODE */ #include -#include -#include -#include #endif /* !defined _KMTEST_PLATFORM_H_ */ diff --git a/rostests/kmtests/kmtest/kmtest.rc b/rostests/kmtests/kmtest/kmtest.rc index 890e56eb43d..38d8d001fdb 100644 --- a/rostests/kmtests/kmtest/kmtest.rc +++ b/rostests/kmtests/kmtest/kmtest.rc @@ -5,7 +5,7 @@ * PROGRAMMER: Thomas Faber */ -#include +#include #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kernel-Mode Test Suite Loader Application\0" #define REACTOS_STR_INTERNAL_NAME "kmtest.exe\0" diff --git a/rostests/kmtests/kmtest_drv/kmtest_drv.rc b/rostests/kmtests/kmtest_drv/kmtest_drv.rc index 50a28eb7c50..5455e5499df 100644 --- a/rostests/kmtests/kmtest_drv/kmtest_drv.rc +++ b/rostests/kmtests/kmtest_drv/kmtest_drv.rc @@ -5,7 +5,7 @@ * PROGRAMMER: Thomas Faber */ -#include +#include #define REACTOS_FILETYPE VFT_DRV #define REACTOS_FILESUBTYPE VFT2_DRV_SYSTEM diff --git a/rostests/rosautotest/precomp.h b/rostests/rosautotest/precomp.h index 351f32850f9..1960bc6e6ba 100644 --- a/rostests/rosautotest/precomp.h +++ b/rostests/rosautotest/precomp.h @@ -2,15 +2,17 @@ #include #include #include -#include #include #include using namespace std; #define WIN32_NO_STATUS -#include -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #include #include #include diff --git a/rostests/tests/pseh2/psehtest.c b/rostests/tests/pseh2/psehtest.c index e2f155a4ba7..3af2639f8de 100644 --- a/rostests/tests/pseh2/psehtest.c +++ b/rostests/tests/pseh2/psehtest.c @@ -20,16 +20,8 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include - #include -#define WIN32_LEAN_AND_MEAN -#include - #define STANDALONE #include