[ROSTESTS:APITESTS]

Introduce a "apitest.h" header gathering special things for apitests (SEH macros, wine/test.h inclusion, and so on...). svn path=/trunk/; revision=60313
2025-04-05 05:01:03 +00:00 · 2013-09-22 17:52:42 +00:00 · 2013-09-22 17:52:42 +00:00 · 4b95e17c61
commit 4b95e17c61
parent e62911d355
91 changed files with 212 additions and 129 deletions
--- a/rostests/apitests/CMakeLists.txt
+++ b/rostests/apitests/CMakeLists.txt
@ -1,3 +1,5 @@
+include_directories(
+    include)

 add_library(apitest apitest.c)

--- a/rostests/apitests/advapi32/CreateService.c
+++ b/rostests/apitests/advapi32/CreateService.c
@ -5,7 +5,8 @@
 * PROGRAMMER:      Thomas Faber
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <winreg.h>
 #include <winsvc.h>
 #include <strsafe.h>
--- a/rostests/apitests/advapi32/LockDatabase.c
+++ b/rostests/apitests/advapi32/LockDatabase.c
@ -5,7 +5,8 @@
 * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <winsvc.h>
 #include <strsafe.h>

--- a/rostests/apitests/advapi32/QueryServiceConfig2.c
+++ b/rostests/apitests/advapi32/QueryServiceConfig2.c
@ -5,7 +5,8 @@
 * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <winreg.h>
 #include <winsvc.h>
 #include <strsafe.h>
--- a/rostests/apitests/advapi32/SaferIdentifyLevel.c
+++ b/rostests/apitests/advapi32/SaferIdentifyLevel.c
@ -5,17 +5,13 @@
 * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
-#include <wine/test.h>
 #include <windows.h>
 #include <ndk/ntndk.h>
 #include <winsafer.h>

-#define StartSeh()              ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY {
-#define EndSeh(ExpectedStatus)  } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus)
-
-#define InvalidPointer ((PVOID)0x5555555555555555ULL)
-
 #define SaferIdentifyLevel(c, p, h, r) SaferIdentifyLevel(c, (PSAFER_CODE_PROPERTIES)(p), h, r)

 START_TEST(SaferIdentifyLevel)
--- a/rostests/apitests/advapi32/testlist.c
+++ b/rostests/apitests/advapi32/testlist.c
@ -1,7 +1,7 @@
 #define __ROS_LONG64__

 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>

 extern void func_CreateService(void);
 extern void func_LockDatabase(void);
--- a/rostests/apitests/browseui/SHExplorerParseCmdLine.c
+++ b/rostests/apitests/browseui/SHExplorerParseCmdLine.c
@ -5,8 +5,9 @@
 * PROGRAMMER:      Thomas Faber
 */

-#define UNICODE
-#include <wine/test.h>
+#include <apitest.h>
+
+//#define UNICODE
 #include <strsafe.h>
 #include <shlobj.h>

@ -128,8 +129,8 @@ START_TEST(SHExplorerParseCmdLine)
    WCHAR OriginalCommandLine[1024];
    int i;

-    CommandLine = GetCommandLine();
-    (VOID)StringCbCopy(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine);
+    CommandLine = GetCommandLineW();
+    StringCbCopyW(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine);

    for (i = 0; i < TestCount; i++)
    {
--- a/rostests/apitests/browseui/testlist.c
+++ b/rostests/apitests/browseui/testlist.c
@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>

 #define STANDALONE
-#include "wine/test.h"
+#include <apitest.h>

 extern void func_SHExplorerParseCmdLine(void);

--- a/rostests/apitests/com/testlist.c
+++ b/rostests/apitests/com/testlist.c
@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>

 #define STANDALONE
-#include "wine/test.h"
+#include <apitest.h>

 extern void func_browseui(void);
 extern void func_ieframe(void);
--- a/rostests/apitests/crt/_vscprintf.c
+++ b/rostests/apitests/crt/_vscprintf.c
@ -4,8 +4,9 @@
 * PURPOSE:         Test for _vscprintf
 */

+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <errno.h>

--- a/rostests/apitests/crt/_vscwprintf.c
+++ b/rostests/apitests/crt/_vscwprintf.c
@ -4,8 +4,9 @@
 * PURPOSE:         Test for _vscprintf
 */

+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <errno.h>

--- a/rostests/apitests/crt/_vsnprintf.c
+++ b/rostests/apitests/crt/_vsnprintf.c
@ -4,17 +4,15 @@
 * PURPOSE:         Test for _vsnprintf
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <pseh/pseh2.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/rtlfuncs.h>

-#define StartSeh()              ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY {
-#define EndSeh(ExpectedStatus)  } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus)
-
 static void call_varargs(char* buf, size_t buf_size, int expected_ret, LPCSTR formatString, ...)
 {
    va_list args;
--- a/rostests/apitests/crt/_vsnwprintf.c
+++ b/rostests/apitests/crt/_vsnwprintf.c
@ -4,17 +4,15 @@
 * PURPOSE:         Test for _vsnprintf
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <pseh/pseh2.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/rtlfuncs.h>

-#define StartSeh()              ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY {
-#define EndSeh(ExpectedStatus)  } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus)
-
 static void call_varargs(wchar_t* buf, size_t buf_size, int expected_ret, LPCWSTR formatString, ...)
 {
    va_list args;
--- a/rostests/apitests/crt/mbstowcs_s.c
+++ b/rostests/apitests/crt/mbstowcs_s.c
@ -4,10 +4,11 @@
 * PURPOSE:         Test for mbstowcs_s
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
 #include <stdlib.h>
-#include <wine/test.h>
 #include <specstrings.h>

 #define ok_errno(x) ok_hex(errno, (x))
--- a/rostests/apitests/crt/sprintf.c
+++ b/rostests/apitests/crt/sprintf.c
@ -5,9 +5,10 @@
 * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <pseh/pseh2.h>
 #include <ndk/mmfuncs.h>
@ -19,9 +20,6 @@
 #pragma GCC diagnostic ignored "-Wnonnull"
 #endif

-#define StartSeh()              ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY {
-#define EndSeh(ExpectedStatus)  } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus)
-
 static
 PVOID
 AllocateGuarded(
--- a/rostests/apitests/crt/strcpy.c
+++ b/rostests/apitests/crt/strcpy.c
@ -1,6 +1,7 @@

+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>

 START_TEST(strcpy)
 {
--- a/rostests/apitests/crt/testlist.c
+++ b/rostests/apitests/crt/testlist.c
@ -1,7 +1,7 @@
 #define __ROS_LONG64__

 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>

 #if defined(TEST_MSVCRT)
 extern void func_mbstowcs_s(void);
--- a/rostests/apitests/crt/wcstombs_s.c
+++ b/rostests/apitests/crt/wcstombs_s.c
@ -4,10 +4,11 @@
 * PURPOSE:         Test for wcstombs_s
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
 #include <stdlib.h>
-#include <wine/test.h>
 #include <specstrings.h>

 #define ok_errno(x) ok_hex(errno, (x))
--- a/rostests/apitests/dciman32/DCICreatePrimary.c
+++ b/rostests/apitests/dciman32/DCICreatePrimary.c
@ -5,7 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>

 void Test_DCICreatePrimary()
 {
--- a/rostests/apitests/dciman32/testlist.c
+++ b/rostests/apitests/dciman32/testlist.c
@ -1,7 +1,7 @@
 #define __ROS_LONG64__

 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>

 extern void func_DCICreatePrimary(void);

--- a/rostests/apitests/gdi32/AddFontResource.c
+++ b/rostests/apitests/gdi32/AddFontResource.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <stdio.h>
+#include <apitest.h>
+
 #include <wine/test.h>
 #include <wingdi.h>

--- a/rostests/apitests/gdi32/AddFontResourceEx.c
+++ b/rostests/apitests/gdi32/AddFontResourceEx.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <libs/pseh/pseh2.h>

--- a/rostests/apitests/gdi32/BeginPath.c
+++ b/rostests/apitests/gdi32/BeginPath.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 void Test_BeginPath()
--- a/rostests/apitests/gdi32/CombineRgn.c
+++ b/rostests/apitests/gdi32/CombineRgn.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 void Test_CombineRgn_Params()
--- a/rostests/apitests/gdi32/CombineTransform.c
+++ b/rostests/apitests/gdi32/CombineTransform.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>

--- a/rostests/apitests/gdi32/CreateBitmap.c
+++ b/rostests/apitests/gdi32/CreateBitmap.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 #define DEFAULT_BITMAP 21
--- a/rostests/apitests/gdi32/CreateBitmapIndirect.c
+++ b/rostests/apitests/gdi32/CreateBitmapIndirect.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Magnus Olsen
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 void Test_CreateBitmapIndirect()
--- a/rostests/apitests/gdi32/CreateCompatibleDC.c
+++ b/rostests/apitests/gdi32/CreateCompatibleDC.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/CreateDIBPatternBrush.c
+++ b/rostests/apitests/gdi32/CreateDIBPatternBrush.c
@ -5,12 +5,11 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
-
 #include "init.h"

-
 void Test_CreateDIBPatternBrush()
 {

--- a/rostests/apitests/gdi32/CreateDIBitmap.c
+++ b/rostests/apitests/gdi32/CreateDIBitmap.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 #include <pseh/pseh2.h>
--- a/rostests/apitests/gdi32/CreateFont.c
+++ b/rostests/apitests/gdi32/CreateFont.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 #define INVALIDFONT "ThisFontDoesNotExist"
--- a/rostests/apitests/gdi32/CreateFontIndirect.c
+++ b/rostests/apitests/gdi32/CreateFontIndirect.c
@ -5,9 +5,9 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
-#include <wingdi.h>
+#include <apitest.h>

+#include <wingdi.h>

 void
 Test_CreateFontIndirectA(void)
--- a/rostests/apitests/gdi32/CreateIconIndirect.c
+++ b/rostests/apitests/gdi32/CreateIconIndirect.c
@ -1,5 +1,6 @@

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/CreatePen.c
+++ b/rostests/apitests/gdi32/CreatePen.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>
--- a/rostests/apitests/gdi32/CreateRectRgn.c
+++ b/rostests/apitests/gdi32/CreateRectRgn.c
@ -5,7 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>

 void Test_CreateRectRgn()
 {
--- a/rostests/apitests/gdi32/DPtoLP.c
+++ b/rostests/apitests/gdi32/DPtoLP.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/EngAcquireSemaphore.c
+++ b/rostests/apitests/gdi32/EngAcquireSemaphore.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Magnus Olsen
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>

--- a/rostests/apitests/gdi32/EngCreateSemaphore.c
+++ b/rostests/apitests/gdi32/EngCreateSemaphore.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Magnus Olsen
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>

--- a/rostests/apitests/gdi32/EngDeleteSemaphore.c
+++ b/rostests/apitests/gdi32/EngDeleteSemaphore.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Magnus Olsen
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>

--- a/rostests/apitests/gdi32/EngReleaseSemaphore.c
+++ b/rostests/apitests/gdi32/EngReleaseSemaphore.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Magnus Olsen
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>

--- a/rostests/apitests/gdi32/ExtCreatePen.c
+++ b/rostests/apitests/gdi32/ExtCreatePen.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>
--- a/rostests/apitests/gdi32/GdiConvertBitmap.c
+++ b/rostests/apitests/gdi32/GdiConvertBitmap.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm);
--- a/rostests/apitests/gdi32/GdiConvertBrush.c
+++ b/rostests/apitests/gdi32/GdiConvertBrush.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr);
--- a/rostests/apitests/gdi32/GdiConvertDC.c
+++ b/rostests/apitests/gdi32/GdiConvertDC.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 HDC WINAPI GdiConvertDC(HDC hdc);
--- a/rostests/apitests/gdi32/GdiConvertFont.c
+++ b/rostests/apitests/gdi32/GdiConvertFont.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 HFONT WINAPI GdiConvertFont(HFONT);
--- a/rostests/apitests/gdi32/GdiConvertPalette.c
+++ b/rostests/apitests/gdi32/GdiConvertPalette.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 HPALETTE WINAPI GdiConvertPalette(HPALETTE);
--- a/rostests/apitests/gdi32/GdiConvertRegion.c
+++ b/rostests/apitests/gdi32/GdiConvertRegion.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 HRGN WINAPI GdiConvertRegion(HRGN);
--- a/rostests/apitests/gdi32/GdiDeleteLocalDC.c
+++ b/rostests/apitests/gdi32/GdiDeleteLocalDC.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 BOOL WINAPI GdiDeleteLocalDC(HDC);
--- a/rostests/apitests/gdi32/GdiGetCharDimensions.c
+++ b/rostests/apitests/gdi32/GdiGetCharDimensions.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 void Test_GdiGetCharDimensions()
--- a/rostests/apitests/gdi32/GdiGetLocalBrush.c
+++ b/rostests/apitests/gdi32/GdiGetLocalBrush.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr);
--- a/rostests/apitests/gdi32/GdiGetLocalDC.c
+++ b/rostests/apitests/gdi32/GdiGetLocalDC.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 HDC WINAPI GdiGetLocalDC(HDC);
--- a/rostests/apitests/gdi32/GdiReleaseLocalDC.c
+++ b/rostests/apitests/gdi32/GdiReleaseLocalDC.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 BOOL WINAPI GdiReleaseLocalDC(HDC);
--- a/rostests/apitests/gdi32/GdiSetAttrs.c
+++ b/rostests/apitests/gdi32/GdiSetAttrs.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 BOOL WINAPI GdiSetAttrs(HDC);
--- a/rostests/apitests/gdi32/GetClipRgn.c
+++ b/rostests/apitests/gdi32/GetClipRgn.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/GetCurrentObject.c
+++ b/rostests/apitests/gdi32/GetCurrentObject.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <winuser.h>
--- a/rostests/apitests/gdi32/GetDIBColorTable.c
+++ b/rostests/apitests/gdi32/GetDIBColorTable.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 void Test_GetDIBColorTable()
--- a/rostests/apitests/gdi32/GetDIBits.c
+++ b/rostests/apitests/gdi32/GetDIBits.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/GetObject.c
+++ b/rostests/apitests/gdi32/GetObject.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <winuser.h>
--- a/rostests/apitests/gdi32/GetPixel.c
+++ b/rostests/apitests/gdi32/GetPixel.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Jérôme Gardou
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 void Test_GetPixel_1bpp()
--- a/rostests/apitests/gdi32/GetRandomRgn.c
+++ b/rostests/apitests/gdi32/GetRandomRgn.c
@ -5,8 +5,9 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/GetStockObject.c
+++ b/rostests/apitests/gdi32/GetStockObject.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>
--- a/rostests/apitests/gdi32/GetTextExtentExPoint.c
+++ b/rostests/apitests/gdi32/GetTextExtentExPoint.c
@ -5,8 +5,9 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/GetTextFace.c
+++ b/rostests/apitests/gdi32/GetTextFace.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 #define TEST(x) ok(x, #x"\n")
--- a/rostests/apitests/gdi32/MaskBlt.c
+++ b/rostests/apitests/gdi32/MaskBlt.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/PatBlt.c
+++ b/rostests/apitests/gdi32/PatBlt.c
@ -5,8 +5,9 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>

 HBITMAP ghbmpTarget;
--- a/rostests/apitests/gdi32/Rectangle.c
+++ b/rostests/apitests/gdi32/Rectangle.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Jérôme Gardou
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 void Test_Rectangle(void)
--- a/rostests/apitests/gdi32/SelectObject.c
+++ b/rostests/apitests/gdi32/SelectObject.c
@ -5,8 +5,9 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 #include <winddi.h>
 #include <winuser.h>
--- a/rostests/apitests/gdi32/SetBrushOrgEx.c
+++ b/rostests/apitests/gdi32/SetBrushOrgEx.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <pseh/pseh2.h>

--- a/rostests/apitests/gdi32/SetDCPenColor.c
+++ b/rostests/apitests/gdi32/SetDCPenColor.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/SetDIBits.c
+++ b/rostests/apitests/gdi32/SetDIBits.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Jérôme Gardou
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>

 void Test_SetDIBits()
--- a/rostests/apitests/gdi32/SetDIBitsToDevice.c
+++ b/rostests/apitests/gdi32/SetDIBitsToDevice.c
@ -5,9 +5,9 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
-#include <wingdi.h>
+#include <apitest.h>

+#include <wingdi.h>
 #include "init.h"

 static void
--- a/rostests/apitests/gdi32/SetMapMode.c
+++ b/rostests/apitests/gdi32/SetMapMode.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/SetPixel.c
+++ b/rostests/apitests/gdi32/SetPixel.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <mmsystem.h>

--- a/rostests/apitests/gdi32/SetSysColors.c
+++ b/rostests/apitests/gdi32/SetSysColors.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/SetWindowExtEx.c
+++ b/rostests/apitests/gdi32/SetWindowExtEx.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/SetWorldTransform.c
+++ b/rostests/apitests/gdi32/SetWorldTransform.c
@ -5,7 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>

--- a/rostests/apitests/gdi32/testlist.c
+++ b/rostests/apitests/gdi32/testlist.c
@ -1,7 +1,7 @@
 #define __ROS_LONG64__

 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>

 extern void func_AddFontResource(void);
 extern void func_AddFontResourceEx(void);
--- a/rostests/apitests/include/apitest.h
+++ b/rostests/apitests/include/apitest.h
@ -0,0 +1,28 @@
+#ifndef _APITEST_H
+#define _APITEST_H
+
+// #define __ROS_LONG64__
+
+#define WIN32_NO_STATUS
+
+/* The user must #define STANDALONE if it uses this header in testlist.c */
+#include <wine/test.h>
+#include <pseh/pseh2.h>
+
+/* See kmtests/include/kmt_test.h */
+#define InvalidPointer ((PVOID)0x5555555555555555ULL)
+
+#define StartSeh()                                  \
+    ExceptionStatus = STATUS_SUCCESS;               \
+    _SEH2_TRY                                       \
+    {
+#define EndSeh(ExpectedStatus)                      \
+    }                                               \
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)         \
+    {                                               \
+        ExceptionStatus = _SEH2_GetExceptionCode(); \
+    }                                               \
+    _SEH2_END;                                      \
+    ok(ExceptionStatus == ExpectedStatus, "Exception 0x%08lx, expected 0x%08lx\n", ExceptionStatus, ExpectedStatus)
+
+#endif /* _APITEST_H */
--- a/rostests/apitests/kernel32/FindFiles.c
+++ b/rostests/apitests/kernel32/FindFiles.c
@ -5,7 +5,8 @@
 * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <windows.h>

 /*
--- a/rostests/apitests/kernel32/GetCurrentDirectory.c
+++ b/rostests/apitests/kernel32/GetCurrentDirectory.c
@ -5,9 +5,10 @@
 * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/rtltypes.h>

 static
--- a/rostests/apitests/kernel32/GetDriveType.c
+++ b/rostests/apitests/kernel32/GetDriveType.c
@ -1,4 +1,4 @@
-#include <wine/test.h>
+#include <apitest.h>

 #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR)

--- a/rostests/apitests/kernel32/GetModuleFileName.c
+++ b/rostests/apitests/kernel32/GetModuleFileName.c
@ -5,12 +5,12 @@
 * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#define UNICODE
 #include <stdio.h>
-#include <wine/test.h>
 #include <winreg.h>
 #include <winnls.h>
 #include <shlwapi.h>
@ -24,7 +24,7 @@ StartChild(char **argv)
    PWSTR FileName;
    PWSTR Slash;
    WCHAR CommandLine[MAX_PATH];
-    STARTUPINFO StartupInfo;
+    STARTUPINFOW StartupInfo;
    PROCESS_INFORMATION ProcessInfo;
    DWORD Ret;
    int Length;
@ -48,7 +48,7 @@ StartChild(char **argv)
        FileName++;
        FileName[-1] = L'\0';

-        Success = SetCurrentDirectory(Path);
+        Success = SetCurrentDirectoryW(Path);
        ok(Success == TRUE, "SetCurrentDirectory failed for path '%ls'\n", Path);

        trace("Starting '%ls' in path '%ls'\n", FileName, Path);
@ -64,16 +64,16 @@ StartChild(char **argv)
    RtlZeroMemory(&StartupInfo, sizeof(StartupInfo));
    StartupInfo.cb = sizeof(StartupInfo);

-    Success = CreateProcess(FileName,
-                            CommandLine,
-                            NULL,
-                            NULL,
-                            FALSE,
-                            0,
-                            NULL,
-                            NULL,
-                            &StartupInfo,
-                            &ProcessInfo);
+    Success = CreateProcessW(FileName,
+                             CommandLine,
+                             NULL,
+                             NULL,
+                             FALSE,
+                             0,
+                             NULL,
+                             NULL,
+                             &StartupInfo,
+                             &ProcessInfo);
    if (!Success)
    {
        skip("CreateProcess failed with %lu\n", GetLastError());
--- a/rostests/apitests/kernel32/MultiByteToWideChar.c
+++ b/rostests/apitests/kernel32/MultiByteToWideChar.c
@ -5,9 +5,9 @@
 * PROGRAMMER:      Mike "tamlin" Nordell
 */

-#include <wine/test.h>
-#include <winnls.h>
+#include <apitest.h>

+#include <winnls.h>

 START_TEST(MultiByteToWideChar)
 {
--- a/rostests/apitests/kernel32/SetCurrentDirectory.c
+++ b/rostests/apitests/kernel32/SetCurrentDirectory.c
@ -5,9 +5,10 @@
 * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/rtltypes.h>

 static
--- a/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c
+++ b/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c
@ -5,9 +5,10 @@
 * PROGRAMMER:      Mike "tamlin" Nordell
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/rtltypes.h>
 #include <xmmintrin.h>

--- a/rostests/apitests/kernel32/lstrcpynW.c
+++ b/rostests/apitests/kernel32/lstrcpynW.c
@ -4,9 +4,10 @@
 * PURPOSE:         Test for lstrcpynW
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>

 START_TEST(lstrcpynW)
 {
--- a/rostests/apitests/kernel32/testlist.c
+++ b/rostests/apitests/kernel32/testlist.c
@ -1,7 +1,7 @@
 #define __ROS_LONG64__

 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>

 extern void func_FindFiles(void);
 extern void func_GetCurrentDirectory(void);
--- a/rostests/apitests/msvcrt/CommandLine.c
+++ b/rostests/apitests/msvcrt/CommandLine.c
@ -5,10 +5,10 @@
 * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO <hermes.belusca@sfr.fr>
 */

+#include <apitest.h>
+
 #define WIN32_NO_STATUS
-#define UNICODE
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/umtypes.h>

 #include "./CmdLineUtil/CmdLineUtil.h"
--- a/rostests/apitests/msvcrt/ieee.c
+++ b/rostests/apitests/msvcrt/ieee.c
@ -6,7 +6,8 @@
 * REFERENCES:      http://msdn.microsoft.com/en-US/library/h7zkk1bz%28v=VS.80%29.aspx
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <float.h>
 #include <math.h>

--- a/rostests/apitests/msvcrt/splitpath.c
+++ b/rostests/apitests/msvcrt/splitpath.c
@ -5,7 +5,8 @@
 * PROGRAMMER:      Timo Kreuzer
 */

-#include <wine/test.h>
+#include <apitest.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
--- a/rostests/apitests/msvcrt/testlist.c
+++ b/rostests/apitests/msvcrt/testlist.c
@ -1,7 +1,7 @@
 #define __ROS_LONG64__

 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>

 extern void func_CommandLine(void);
 extern void func_ieee(void);