[tkreuzer] 56418: {ROSTESTS] Fix compilation

Author: tkreuzer
Date: Wed Apr 25 12:42:40 2012
New Revision: 56418

URL: http://svn.reactos.org/svn/reactos?rev=56418&view=rev
Log:
{ROSTESTS]
Fix compilation

Modified:
    trunk/rostests/apitests/gdi32/CombineRgn.c
    trunk/rostests/apitests/gdi32/CombineTransform.c
    trunk/rostests/apitests/gdi32/DPtoLP.c
    trunk/rostests/apitests/gdi32/GetDIBits.c
    trunk/rostests/apitests/gdi32/GetRandomRgn.c
    trunk/rostests/apitests/gdi32/PatBlt.c
    trunk/rostests/apitests/gdi32/SelectObject.c
    trunk/rostests/apitests/msvcrt/splitpath.c
    trunk/rostests/apitests/ntdll/SystemInfo.c

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] Wed Apr 25 12:42:40 2012
@@ -9,13 +9,21 @@
 #include <wine/test.h>
 #include <windows.h>
 
-#define ok_long(expression, result) \
-    { \
-        int _value = (expression); \
-        ok(_value == (result), "Wrong value for %s, expected " #result "
(0x%x), got 0x%x\n", \
-           #expression, (int)(result), _value); \
-    }
-
+void Test_CombineRgn_Params()
+{
+    HRGN hrgn1, hrgn2, hrgn3;
+
+    hrgn1 = CreateRectRgn(0, 0, 0, 0);
+    hrgn2 = CreateRectRgn(0, 0, 10, 10);
+    hrgn3 = CreateRectRgn(5, 5, 20, 20);
+
+    SetLastError(0xbadbabe);
+    ok_long(CombineRgn(NULL, NULL, NULL, 0), ERROR);
+    ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, 0), ERROR);
+    ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, 6), ERROR);
+    ok_long(GetLastError(), 0xbadbabe);
+
+}
 
 void Test_CombineRgn_COPY()
 {
@@ -189,6 +197,7 @@
 
 START_TEST(CombineRgn)
 {
+    Test_CombineRgn_Params();
     Test_CombineRgn_COPY();
     Test_CombineRgn_AND();
     Test_CombineRgn_OR();

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] Wed Apr 25 12:42:40
2012
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS api tests
  * LICENSE:         GPL - See COPYING in the top level directory
- * PURPOSE:         Test for CreatePen
+ * PURPOSE:         Test for CombineTransform
  * PROGRAMMERS:     Timo Kreuzer
  */
 
@@ -10,7 +10,6 @@
 #include <windows.h>
 #include <winddi.h>
 
-#define ok_int(x, y) ok(x == y, "Wrong value for " #x ", expected "
#y ", got %ld\n", (long)x);
 #define ok_flt(x, y) ok(x == y, "Wrong value for " #x ", expected "
#y ", got %f\n", (double)x);
 
 #define ok_xform(xform, m11, m12, m21, m22, dx, dy) \

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] Wed Apr 25 12:42:40 2012
@@ -8,8 +8,6 @@
 #include <stdio.h>
 #include <wine/test.h>
 #include <windows.h>
-
-#define ok_int(x, y) ok(x == y, "Wrong value for " #x ", expected "
#y ", got %ld\n", (long)x);
 
 void Test_DPtoLP_Params()
 {

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] Wed Apr 25 12:42:40 2012
@@ -8,8 +8,6 @@
 #include <stdio.h>
 #include <wine/test.h>
 #include <windows.h>
-
-#define ok_err(dwErr) ok(GetLastError() == dwErr, "LastError is wrong, expected %d,
got %ld\n", dwErr, GetLastError())
 
 void Test_GetDIBits()
 {

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] Wed Apr 25 12:42:40 2012
@@ -15,14 +15,6 @@
 #define SYSRGN  4
 #define RGN5    5
 
-#define ok_int(x, exp) \
-    ok((x) == (exp), "Failed test in line %d: value %s expected 0x%x, got
0x%x\n", \
-       (int)__LINE__, #x, (int)(exp), (int)(x))
-
-#define ok_long(x, exp) \
-    ok((x) == (exp), "Failed test in line %d: value %s expected 0x%x, got
0x%x\n", \
-       (int)__LINE__, #x, (int)(exp), (int)(x))
-
 HWND ghwnd;
 HDC ghdcWindow;
 

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] Wed Apr 25 12:42:40 2012
@@ -12,14 +12,6 @@
 HBITMAP ghbmpTarget;
 PULONG gpulTargetBits;
 HDC hdcTarget;
-
-#define ok_int(x, exp) \
-    ok((x) == (exp), "Failed test in line %d: value %s expected 0x%x, got
0x%x\n", \
-       (int)__LINE__, #x, (int)(exp), (int)(x))
-
-#define ok_long(x, exp) \
-    ok((x) == (exp), "Failed test in line %d: value %s expected 0x%x, got
0x%x\n", \
-       (int)__LINE__, #x, (int)(exp), (int)(x))
 
 void Test_BrushOrigin()
 {

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] Wed Apr 25 12:42:40 2012
@@ -14,8 +14,6 @@
 
 #define TEST(x) ok(x, #x"\n")
 #define RTEST(x) ok(x, #x"\n")
-
-#define ok_err(dwErr) ok(GetLastError() == dwErr, "Wrong LastError, expected %d, got
%ld\n", dwErr, GetLastError())
 
 HDC hdc1, hdc2;
 

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] Wed Apr 25 12:42:40 2012
@@ -10,12 +10,6 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <stdarg.h>
-
-#define ok_str(x, y) \
-    ok(strcmp(x, y) == 0, "got '%s', expected '%s'\n", x, y);
-
-#define ok_int(x, y) \
-    ok(x == y, "got %d, expected %d\n", x, y);
 
 START_TEST(splitpath)
 {

Modified: trunk/rostests/apitests/ntdll/SystemInfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/SystemInfo…
==============================================================================
--- trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] Wed Apr 25 12:42:40 2012
@@ -9,13 +9,6 @@
 #include <stdio.h>
 #include <wine/test.h>
 #include <ndk/ntndk.h>
-
-#define ok_long(x, y) \
-    ok(x == y, "got %ld, expected %ld\n", (long)x, (long)y);
-
-#define ok_ntstatus(status, expected) \
-    ok(status == expected, "got 0x%lx, expected 0x%lx\n", status, expected);
-//    ok(status == expected, "expected: " ##expected## ", got
0x%lx\n", status)
 
 void
 GetPrivilege()