{ROSTESTS]

Fix compilation

svn path=/trunk/; revision=56418
This commit is contained in:
Timo Kreuzer 2012-04-25 12:42:40 +00:00
parent 652128646c
commit 3263e4fd82
9 changed files with 16 additions and 43 deletions

View file

@ -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 @@ void Test_CombineRgn_XOR()
START_TEST(CombineRgn)
{
Test_CombineRgn_Params();
Test_CombineRgn_COPY();
Test_CombineRgn_AND();
Test_CombineRgn_OR();

View file

@ -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) \

View file

@ -9,8 +9,6 @@
#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()
{
BOOL ret;

View file

@ -9,8 +9,6 @@
#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()
{
HDC hdcScreen, hdcMem;

View file

@ -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;

View file

@ -13,14 +13,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()
{
ULONG aulBits[2] = {0x5555AAAA, 0};

View file

@ -15,8 +15,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;
static void

View file

@ -11,12 +11,6 @@
#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)
{
char drive[5];

View file

@ -10,13 +10,6 @@
#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()
{