Author: spetreolle
Date: Sun Oct 17 14:50:02 2010
New Revision: 49182
URL:
http://svn.reactos.org/svn/reactos?rev=49182&view=rev
Log:
[APITESTS]
Fix (R)TEST macros in gdi32_apitest,
ensures correct display and no crash report in testman.
Modified:
trunk/rostests/apitests/gdi32/GetDIBits.c
trunk/rostests/apitests/gdi32/GetStockObject.c
trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c
trunk/rostests/apitests/gdi32/GetTextFace.c
trunk/rostests/apitests/gdi32/SelectObject.c
trunk/rostests/apitests/gdi32/SetMapMode.c
trunk/rostests/apitests/gdi32/SetSysColors.c
trunk/rostests/apitests/gdi32/SetWindowExtEx.c
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 Oct 17 14:50:02 2010
@@ -9,8 +9,8 @@
#include <wine/test.h>
#include <windows.h>
-#define TEST(x) ok(x, #x)
-#define RTEST(x) ok(x, #x)
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
void Test_GetDIBits()
{
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 Oct 17 14:50:02 2010
@@ -12,8 +12,8 @@
#include <reactos/win32k/ntgdityp.h>
#include <reactos/win32k/ntgdihdl.h>
-#define TEST(x) ok(x, #x)
-#define RTEST(x) ok(x, #x)
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
void Test_GetStockObject()
{
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 Oct 17 14:50:02
2010
@@ -9,8 +9,8 @@
#include <wine/test.h>
#include <windows.h>
-#define TEST(x) ok(x, #x)
-#define RTEST(x) ok(x, #x)
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
void Test_GetTextExtentExPoint()
{
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 Oct 17 14:50:02 2010
@@ -9,8 +9,8 @@
#include <wine/test.h>
#include <windows.h>
-#define TEST(x) ok(x, #x)
-#define RTEST(x) ok(x, #x)
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
void Test_GetTextFace()
{
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 Oct 17 14:50:02 2010
@@ -12,8 +12,8 @@
#include <reactos/win32k/ntgdityp.h>
#include <reactos/win32k/ntgdihdl.h>
-#define TEST(x) ok(x, #x)
-#define RTEST(x) ok(x, #x)
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
void Test_SelectObject()
{
@@ -101,7 +101,7 @@
RTEST((UINT_PTR)SelectObject(hDC, hNewObj) == SIMPLEREGION); // ??? Why this?
DeleteObject(hNewObj);
// TEST(IsHandleValid(hNewObj) == TRUE);
-
+
RTEST(GetLastError() == ERROR_SUCCESS);
/* Test BITMAP */
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 Oct 17 14:50:02 2010
@@ -9,8 +9,8 @@
#include <wine/test.h>
#include <windows.h>
-#define TEST(x) ok(x, #x)
-#define RTEST(x) ok(x, #x)
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
void Test_SetMapMode()
{
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 Oct 17 14:50:02 2010
@@ -9,8 +9,8 @@
#include <wine/test.h>
#include <windows.h>
-#define TEST(x) ok(x, #x)
-#define RTEST(x) ok(x, #x)
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
#define NUM_SYSCOLORS 31
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 Oct 17 14:50:02 2010
@@ -9,8 +9,8 @@
#include <wine/test.h>
#include <windows.h>
-#define TEST(x) ok(x, #x)
-#define RTEST(x) ok(x, #x)
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
void Test_SetWindowExtEx()
{
@@ -101,7 +101,7 @@
//TEST(WindowExt.cy == 2700);
/* Values should be changed */
- ret = SetWindowExtEx(hDC,
+ ret = SetWindowExtEx(hDC,
4 * GetDeviceCaps(GetDC(0), HORZRES),
-4 * GetDeviceCaps(GetDC(0), VERTRES),
&WindowExt);