[ros-diffs] [hbelusca] 60313: [ROSTESTS:APITESTS] Introduce a "apitest.h" header gathering special things for apitests (SEH macros, wine/test.h inclusion, and so on...).

Author: hbelusca
Date: Sun Sep 22 17:52:42 2013
New Revision: 60313

URL: http://svn.reactos.org/svn/reactos?rev=60313&view=rev
Log:
[ROSTESTS:APITESTS]
Introduce a "apitest.h" header gathering special things for apitests (SEH
macros, wine/test.h inclusion, and so on...).

Added:
    trunk/rostests/apitests/include/
    trunk/rostests/apitests/include/apitest.h   (with props)
Modified:
    trunk/rostests/apitests/CMakeLists.txt
    trunk/rostests/apitests/advapi32/CreateService.c
    trunk/rostests/apitests/advapi32/LockDatabase.c
    trunk/rostests/apitests/advapi32/QueryServiceConfig2.c
    trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c
    trunk/rostests/apitests/advapi32/testlist.c
    trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c
    trunk/rostests/apitests/browseui/testlist.c
    trunk/rostests/apitests/com/testlist.c
    trunk/rostests/apitests/crt/_vscprintf.c
    trunk/rostests/apitests/crt/_vscwprintf.c
    trunk/rostests/apitests/crt/_vsnprintf.c
    trunk/rostests/apitests/crt/_vsnwprintf.c
    trunk/rostests/apitests/crt/mbstowcs_s.c
    trunk/rostests/apitests/crt/sprintf.c
    trunk/rostests/apitests/crt/strcpy.c
    trunk/rostests/apitests/crt/testlist.c
    trunk/rostests/apitests/crt/wcstombs_s.c
    trunk/rostests/apitests/dciman32/DCICreatePrimary.c
    trunk/rostests/apitests/dciman32/testlist.c
    trunk/rostests/apitests/gdi32/AddFontResource.c
    trunk/rostests/apitests/gdi32/AddFontResourceEx.c
    trunk/rostests/apitests/gdi32/BeginPath.c
    trunk/rostests/apitests/gdi32/CombineRgn.c
    trunk/rostests/apitests/gdi32/CombineTransform.c
    trunk/rostests/apitests/gdi32/CreateBitmap.c
    trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c
    trunk/rostests/apitests/gdi32/CreateCompatibleDC.c
    trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c
    trunk/rostests/apitests/gdi32/CreateDIBitmap.c
    trunk/rostests/apitests/gdi32/CreateFont.c
    trunk/rostests/apitests/gdi32/CreateFontIndirect.c
    trunk/rostests/apitests/gdi32/CreateIconIndirect.c
    trunk/rostests/apitests/gdi32/CreatePen.c
    trunk/rostests/apitests/gdi32/CreateRectRgn.c
    trunk/rostests/apitests/gdi32/DPtoLP.c
    trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c
    trunk/rostests/apitests/gdi32/EngCreateSemaphore.c
    trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c
    trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c
    trunk/rostests/apitests/gdi32/ExtCreatePen.c
    trunk/rostests/apitests/gdi32/GdiConvertBitmap.c
    trunk/rostests/apitests/gdi32/GdiConvertBrush.c
    trunk/rostests/apitests/gdi32/GdiConvertDC.c
    trunk/rostests/apitests/gdi32/GdiConvertFont.c
    trunk/rostests/apitests/gdi32/GdiConvertPalette.c
    trunk/rostests/apitests/gdi32/GdiConvertRegion.c
    trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c
    trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c
    trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c
    trunk/rostests/apitests/gdi32/GdiGetLocalDC.c
    trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c
    trunk/rostests/apitests/gdi32/GdiSetAttrs.c
    trunk/rostests/apitests/gdi32/GetClipRgn.c
    trunk/rostests/apitests/gdi32/GetCurrentObject.c
    trunk/rostests/apitests/gdi32/GetDIBColorTable.c
    trunk/rostests/apitests/gdi32/GetDIBits.c
    trunk/rostests/apitests/gdi32/GetObject.c
    trunk/rostests/apitests/gdi32/GetPixel.c
    trunk/rostests/apitests/gdi32/GetRandomRgn.c
    trunk/rostests/apitests/gdi32/GetStockObject.c
    trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c
    trunk/rostests/apitests/gdi32/GetTextFace.c
    trunk/rostests/apitests/gdi32/MaskBlt.c
    trunk/rostests/apitests/gdi32/PatBlt.c
    trunk/rostests/apitests/gdi32/Rectangle.c
    trunk/rostests/apitests/gdi32/SelectObject.c
    trunk/rostests/apitests/gdi32/SetBrushOrgEx.c
    trunk/rostests/apitests/gdi32/SetDCPenColor.c
    trunk/rostests/apitests/gdi32/SetDIBits.c
    trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c
    trunk/rostests/apitests/gdi32/SetMapMode.c
    trunk/rostests/apitests/gdi32/SetPixel.c
    trunk/rostests/apitests/gdi32/SetSysColors.c
    trunk/rostests/apitests/gdi32/SetWindowExtEx.c
    trunk/rostests/apitests/gdi32/SetWorldTransform.c
    trunk/rostests/apitests/gdi32/testlist.c
    trunk/rostests/apitests/kernel32/FindFiles.c
    trunk/rostests/apitests/kernel32/GetCurrentDirectory.c
    trunk/rostests/apitests/kernel32/GetDriveType.c
    trunk/rostests/apitests/kernel32/GetModuleFileName.c
    trunk/rostests/apitests/kernel32/MultiByteToWideChar.c
    trunk/rostests/apitests/kernel32/SetCurrentDirectory.c
    trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c
    trunk/rostests/apitests/kernel32/lstrcpynW.c
    trunk/rostests/apitests/kernel32/testlist.c
    trunk/rostests/apitests/msvcrt/CommandLine.c
    trunk/rostests/apitests/msvcrt/ieee.c
    trunk/rostests/apitests/msvcrt/splitpath.c
    trunk/rostests/apitests/msvcrt/testlist.c

Modified: trunk/rostests/apitests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r…
==============================================================================
--- trunk/rostests/apitests/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/CMakeLists.txt	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -1,3 +1,5 @@
+include_directories(
+    include)
 
 add_library(apitest apitest.c)
 

Modified: trunk/rostests/apitests/advapi32/CreateService.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CreateS…
==============================================================================
--- trunk/rostests/apitests/advapi32/CreateService.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/advapi32/CreateService.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Thomas Faber
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <winreg.h>
 #include <winsvc.h>
 #include <strsafe.h>

Modified: trunk/rostests/apitests/advapi32/LockDatabase.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/LockDat…
==============================================================================
--- trunk/rostests/apitests/advapi32/LockDatabase.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/advapi32/LockDatabase.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <winsvc.h>
 #include <strsafe.h>
 

Modified: trunk/rostests/apitests/advapi32/QueryServiceConfig2.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/QuerySe…
==============================================================================
--- trunk/rostests/apitests/advapi32/QueryServiceConfig2.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/advapi32/QueryServiceConfig2.c	[iso-8859-1] Sun Sep 22
17:52:42 2013
@@ -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>

Modified: trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/SaferId…
==============================================================================
--- trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,16 +5,12 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
+#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)
 

Modified: trunk/rostests/apitests/advapi32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis…
==============================================================================
--- trunk/rostests/apitests/advapi32/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/advapi32/testlist.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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);

Modified: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/SHExplo…
==============================================================================
--- trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c	[iso-8859-1] Sun Sep 22
17:52:42 2013
@@ -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 @@
     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++)
     {

Modified: trunk/rostests/apitests/browseui/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/testlis…
==============================================================================
--- trunk/rostests/apitests/browseui/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/browseui/testlist.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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);
 

Modified: trunk/rostests/apitests/com/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?r…
==============================================================================
--- trunk/rostests/apitests/com/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/com/testlist.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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);

Modified: trunk/rostests/apitests/crt/_vscprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscprintf.c…
==============================================================================
--- trunk/rostests/apitests/crt/_vscprintf.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/_vscprintf.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -4,8 +4,9 @@
  * PURPOSE:         Test for _vscprintf
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <errno.h>
 

Modified: trunk/rostests/apitests/crt/_vscwprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.…
==============================================================================
--- trunk/rostests/apitests/crt/_vscwprintf.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/_vscwprintf.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -4,8 +4,9 @@
  * PURPOSE:         Test for _vscprintf
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <errno.h>
 

Modified: trunk/rostests/apitests/crt/_vsnprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnprintf.c…
==============================================================================
--- trunk/rostests/apitests/crt/_vsnprintf.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/_vsnprintf.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -4,16 +4,14 @@
  * 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, ...)
 {

Modified: trunk/rostests/apitests/crt/_vsnwprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnwprintf.…
==============================================================================
--- trunk/rostests/apitests/crt/_vsnwprintf.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/_vsnwprintf.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -4,16 +4,14 @@
  * 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, ...)
 {

Modified: trunk/rostests/apitests/crt/mbstowcs_s.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/mbstowcs_s.c…
==============================================================================
--- trunk/rostests/apitests/crt/mbstowcs_s.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/mbstowcs_s.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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))

Modified: trunk/rostests/apitests/crt/sprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re…
==============================================================================
--- trunk/rostests/apitests/crt/sprintf.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/sprintf.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,9 +5,10 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
+#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>
@@ -18,9 +19,6 @@
 #pragma GCC diagnostic ignored "-Wformat-zero-length"
 #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

Modified: trunk/rostests/apitests/crt/strcpy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strcpy.c?rev…
==============================================================================
--- trunk/rostests/apitests/crt/strcpy.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/strcpy.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -1,6 +1,7 @@
+
+#include <apitest.h>
 
 #include <stdio.h>
-#include <wine/test.h>
 
 START_TEST(strcpy)
 {

Modified: trunk/rostests/apitests/crt/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r…
==============================================================================
--- trunk/rostests/apitests/crt/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/testlist.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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);

Modified: trunk/rostests/apitests/crt/wcstombs_s.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstombs_s.c…
==============================================================================
--- trunk/rostests/apitests/crt/wcstombs_s.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/wcstombs_s.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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))

Modified: trunk/rostests/apitests/dciman32/DCICreatePrimary.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/DCICrea…
==============================================================================
--- trunk/rostests/apitests/dciman32/DCICreatePrimary.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/dciman32/DCICreatePrimary.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
 
 void Test_DCICreatePrimary()
 {

Modified: trunk/rostests/apitests/dciman32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/testlis…
==============================================================================
--- trunk/rostests/apitests/dciman32/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/dciman32/testlist.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -1,7 +1,7 @@
 #define __ROS_LONG64__
 
 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>
 
 extern void func_DCICreatePrimary(void);
 

Modified: trunk/rostests/apitests/gdi32/AddFontResource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes…
==============================================================================
--- trunk/rostests/apitests/gdi32/AddFontResource.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/AddFontResource.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
+#include <apitest.h>
+
 #include <wine/test.h>
 #include <wingdi.h>
 

Modified: trunk/rostests/apitests/gdi32/AddFontResourceEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes…
==============================================================================
--- trunk/rostests/apitests/gdi32/AddFontResourceEx.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/AddFontResourceEx.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <libs/pseh/pseh2.h>
 

Modified: trunk/rostests/apitests/gdi32/BeginPath.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/BeginPath.…
==============================================================================
--- trunk/rostests/apitests/gdi32/BeginPath.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/BeginPath.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_BeginPath()

Modified: trunk/rostests/apitests/gdi32/CombineRgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineRgn…
==============================================================================
--- trunk/rostests/apitests/gdi32/CombineRgn.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CombineRgn.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_CombineRgn_Params()

Modified: trunk/rostests/apitests/gdi32/CombineTransform.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra…
==============================================================================
--- trunk/rostests/apitests/gdi32/CombineTransform.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CombineTransform.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 

Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateBitmap.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateBitmap.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 #define DEFAULT_BITMAP 21

Modified: trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_CreateBitmapIndirect()

Modified: trunk/rostests/apitests/gdi32/CreateCompatibleDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateComp…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateCompatibleDC.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateCompatibleDC.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBP…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,11 +5,10 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
-
 #include "init.h"
-
 
 void Test_CreateDIBPatternBrush()
 {

Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateDIBitmap.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 #include <pseh/pseh2.h>

Modified: trunk/rostests/apitests/gdi32/CreateFont.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateFont.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateFont.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 #define INVALIDFONT "ThisFontDoesNotExist"

Modified: trunk/rostests/apitests/gdi32/CreateFontIndirect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateFontIndirect.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateFontIndirect.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
-
 
 void
 Test_CreateFontIndirectA(void)

Modified: trunk/rostests/apitests/gdi32/CreateIconIndirect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateIcon…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateIconIndirect.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateIconIndirect.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -1,5 +1,6 @@
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/CreatePen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreatePen.…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreatePen.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreatePen.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>

Modified: trunk/rostests/apitests/gdi32/CreateRectRgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateRect…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreateRectRgn.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreateRectRgn.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
 
 void Test_CreateRectRgn()
 {

Modified: trunk/rostests/apitests/gdi32/DPtoLP.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/DPtoLP.c?r…
==============================================================================
--- trunk/rostests/apitests/gdi32/DPtoLP.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/DPtoLP.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngAcquire…
==============================================================================
--- trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 

Modified: trunk/rostests/apitests/gdi32/EngCreateSemaphore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngCreateS…
==============================================================================
--- trunk/rostests/apitests/gdi32/EngCreateSemaphore.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/EngCreateSemaphore.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 

Modified: trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngDeleteS…
==============================================================================
--- trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 

Modified: trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngRelease…
==============================================================================
--- trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 

Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP…
==============================================================================
--- trunk/rostests/apitests/gdi32/ExtCreatePen.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/ExtCreatePen.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>

Modified: trunk/rostests/apitests/gdi32/GdiConvertBitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertBitmap.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertBitmap.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm);

Modified: trunk/rostests/apitests/gdi32/GdiConvertBrush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertBrush.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertBrush.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr);

Modified: trunk/rostests/apitests/gdi32/GdiConvertDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertDC.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertDC.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HDC WINAPI GdiConvertDC(HDC hdc);

Modified: trunk/rostests/apitests/gdi32/GdiConvertFont.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertFont.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertFont.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HFONT WINAPI GdiConvertFont(HFONT);

Modified: trunk/rostests/apitests/gdi32/GdiConvertPalette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertPalette.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertPalette.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HPALETTE WINAPI GdiConvertPalette(HPALETTE);

Modified: trunk/rostests/apitests/gdi32/GdiConvertRegion.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiConvertRegion.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiConvertRegion.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HRGN WINAPI GdiConvertRegion(HRGN);

Modified: trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiDeleteL…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 BOOL WINAPI GdiDeleteLocalDC(HDC);

Modified: trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetChar…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_GdiGetCharDimensions()

Modified: trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr);

Modified: trunk/rostests/apitests/gdi32/GdiGetLocalDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiGetLocalDC.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiGetLocalDC.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HDC WINAPI GdiGetLocalDC(HDC);

Modified: trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiRelease…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 BOOL WINAPI GdiReleaseLocalDC(HDC);

Modified: trunk/rostests/apitests/gdi32/GdiSetAttrs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiSetAttr…
==============================================================================
--- trunk/rostests/apitests/gdi32/GdiSetAttrs.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GdiSetAttrs.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 BOOL WINAPI GdiSetAttrs(HDC);

Modified: trunk/rostests/apitests/gdi32/GetClipRgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipRgn…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetClipRgn.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetClipRgn.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/GetCurrentObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetCurrent…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetCurrentObject.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetCurrentObject.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <winuser.h>

Modified: trunk/rostests/apitests/gdi32/GetDIBColorTable.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBColo…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetDIBColorTable.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetDIBColorTable.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_GetDIBColorTable()

Modified: trunk/rostests/apitests/gdi32/GetDIBits.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetDIBits.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetDIBits.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/GetObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetObject.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetObject.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <winuser.h>

Modified: trunk/rostests/apitests/gdi32/GetPixel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetPixel.c…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetPixel.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetPixel.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Jérôme Gardou
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_GetPixel_1bpp()

Modified: trunk/rostests/apitests/gdi32/GetRandomRgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetRandomR…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetRandomRgn.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetRandomRgn.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,8 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/GetStockObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetStockOb…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetStockObject.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetStockObject.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>

Modified: trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextExt…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,8 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/GetTextFace.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextFac…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetTextFace.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetTextFace.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 #define TEST(x) ok(x, #x"\n")

Modified: trunk/rostests/apitests/gdi32/MaskBlt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/MaskBlt.c?…
==============================================================================
--- trunk/rostests/apitests/gdi32/MaskBlt.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/MaskBlt.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/PatBlt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/PatBlt.c?r…
==============================================================================
--- trunk/rostests/apitests/gdi32/PatBlt.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/PatBlt.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,8 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 
 HBITMAP ghbmpTarget;

Modified: trunk/rostests/apitests/gdi32/Rectangle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/Rectangle.…
==============================================================================
--- trunk/rostests/apitests/gdi32/Rectangle.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/Rectangle.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Jérôme Gardou
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_Rectangle(void)

Modified: trunk/rostests/apitests/gdi32/SelectObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje…
==============================================================================
--- trunk/rostests/apitests/gdi32/SelectObject.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SelectObject.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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>

Modified: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBrushOr…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetBrushOrgEx.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetBrushOrgEx.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <pseh/pseh2.h>
 

Modified: trunk/rostests/apitests/gdi32/SetDCPenColor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDCPenCo…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetDCPenColor.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetDCPenColor.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/SetDIBits.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBits.…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetDIBits.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetDIBits.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Jérôme Gardou
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_SetDIBits()

Modified: trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBitsT…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
-
 #include "init.h"
 
 static void

Modified: trunk/rostests/apitests/gdi32/SetMapMode.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetMapMode…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetMapMode.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetMapMode.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/SetPixel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetPixel.c…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetPixel.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetPixel.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <mmsystem.h>
 

Modified: trunk/rostests/apitests/gdi32/SetSysColors.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetSysColo…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetSysColors.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetSysColors.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/SetWindowExtEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWindowE…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetWindowExtEx.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetWindowExtEx.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/SetWorldTransform.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWorldTr…
==============================================================================
--- trunk/rostests/apitests/gdi32/SetWorldTransform.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SetWorldTransform.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 

Modified: trunk/rostests/apitests/gdi32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c…
==============================================================================
--- trunk/rostests/apitests/gdi32/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/testlist.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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);

Added: trunk/rostests/apitests/include/apitest.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/apitest.…
==============================================================================
--- trunk/rostests/apitests/include/apitest.h	(added)
+++ trunk/rostests/apitests/include/apitest.h	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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 */

Propchange: trunk/rostests/apitests/include/apitest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/rostests/apitests/kernel32/FindFiles.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/FindFil…
==============================================================================
--- trunk/rostests/apitests/kernel32/FindFiles.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/FindFiles.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <windows.h>
 
 /*

Modified: trunk/rostests/apitests/kernel32/GetCurrentDirectory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetCurr…
==============================================================================
--- trunk/rostests/apitests/kernel32/GetCurrentDirectory.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/GetCurrentDirectory.c	[iso-8859-1] Sun Sep 22
17:52:42 2013
@@ -5,9 +5,10 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/rtltypes.h>
 
 static

Modified: trunk/rostests/apitests/kernel32/GetDriveType.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetDriv…
==============================================================================
--- trunk/rostests/apitests/kernel32/GetDriveType.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/GetDriveType.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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)
 

Modified: trunk/rostests/apitests/kernel32/GetModuleFileName.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetModu…
==============================================================================
--- trunk/rostests/apitests/kernel32/GetModuleFileName.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/GetModuleFileName.c	[iso-8859-1] Sun Sep 22 17:52:42
2013
@@ -5,12 +5,12 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
+#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 @@
     PWSTR FileName;
     PWSTR Slash;
     WCHAR CommandLine[MAX_PATH];
-    STARTUPINFO StartupInfo;
+    STARTUPINFOW StartupInfo;
     PROCESS_INFORMATION ProcessInfo;
     DWORD Ret;
     int Length;
@@ -48,7 +48,7 @@
         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 @@
     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());

Modified: trunk/rostests/apitests/kernel32/MultiByteToWideChar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/MultiBy…
==============================================================================
--- trunk/rostests/apitests/kernel32/MultiByteToWideChar.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/MultiByteToWideChar.c	[iso-8859-1] Sun Sep 22
17:52:42 2013
@@ -5,9 +5,9 @@
  * PROGRAMMER:      Mike "tamlin" Nordell
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <winnls.h>
-
 
 START_TEST(MultiByteToWideChar)
 {

Modified: trunk/rostests/apitests/kernel32/SetCurrentDirectory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetCurr…
==============================================================================
--- trunk/rostests/apitests/kernel32/SetCurrentDirectory.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/SetCurrentDirectory.c	[iso-8859-1] Sun Sep 22
17:52:42 2013
@@ -5,9 +5,10 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/rtltypes.h>
 
 static

Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetUnha…
==============================================================================
--- trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c	[iso-8859-1]
(original)
+++ trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c	[iso-8859-1] Sun Sep 22
17:52:42 2013
@@ -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>
 

Modified: trunk/rostests/apitests/kernel32/lstrcpynW.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/lstrcpy…
==============================================================================
--- trunk/rostests/apitests/kernel32/lstrcpynW.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/lstrcpynW.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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)
 {

Modified: trunk/rostests/apitests/kernel32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis…
==============================================================================
--- trunk/rostests/apitests/kernel32/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/kernel32/testlist.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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);

Modified: trunk/rostests/apitests/msvcrt/CommandLine.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi…
==============================================================================
--- trunk/rostests/apitests/msvcrt/CommandLine.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/CommandLine.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,10 +5,10 @@
  * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO &lt;hermes.belusca(a)sfr.fr&gt;
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
-#define UNICODE
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/umtypes.h>
 
 #include "./CmdLineUtil/CmdLineUtil.h"

Modified: trunk/rostests/apitests/msvcrt/ieee.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/ieee.c?re…
==============================================================================
--- trunk/rostests/apitests/msvcrt/ieee.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/ieee.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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>
 

Modified: trunk/rostests/apitests/msvcrt/splitpath.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/splitpath…
==============================================================================
--- trunk/rostests/apitests/msvcrt/splitpath.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/splitpath.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>

Modified: trunk/rostests/apitests/msvcrt/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/testlist.…
==============================================================================
--- trunk/rostests/apitests/msvcrt/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/msvcrt/testlist.c	[iso-8859-1] Sun Sep 22 17:52:42 2013
@@ -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);