huwcampbell.com / reactos
Reactos
fork atom

[WIN32KNT_APITEST] Replace remaining TESTX() (#1609)

Addendum to b7794e8112e31a58829bac63d44de53677318c3d.

authored by

Serge Gautherie and committed by
Katayama Hirofumi MZ 347a7478 9f573201

+6 -7
+2 -2
modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c
··· 102 102 TEST(pt.x == 56); 103 103 TEST(pt.y == 78); 104 104 GetWindowExtEx(hdc, &sz); 105 - TESTX(sz.cx == 123, "sz.cx == %ld\n", sz.cx); 106 - TESTX(sz.cy == 456, "sz.cy == %ld\n", sz.cy); 105 + ok(sz.cx == 123, "sz.cx == %ld\n", sz.cx); 106 + ok(sz.cy == 456, "sz.cy == %ld\n", sz.cy); 107 107 GetViewportExtEx(hdc, &sz); 108 108 TEST(sz.cx == 234); 109 109 TEST(sz.cy == 567);
+2 -2
modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c
··· 89 89 &bpp, 90 90 FALSE) == TRUE); 91 91 92 - TESTX(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); 92 + ok(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); 93 93 TEST((LPCTSTR)ResourceStr.Buffer == MAKEINTRESOURCE(IDI_ICON)); 94 94 TEST(bpp == 32); 95 95 ··· 101 101 &bpp, 102 102 TRUE) == TRUE); 103 103 104 - TESTX(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); 104 + ok(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); 105 105 TEST((LPCTSTR)ResourceStr.Buffer == MAKEINTRESOURCE(IDI_ICON)); 106 106 TEST(bpp == 32); 107 107
+2 -2
modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
··· 398 398 DWORD cbSize; 399 399 400 400 cbSize = sizeof(szReg); 401 - TESTX(QueryUserRegValueW(KEY_METRIC, pwszVal, &szReg, &cbSize, NULL) == ERROR_SUCCESS, "Value=%S\n", pwszVal); 402 - TESTX(_wcsicmp(szReg, L"1") == 0, "Value=%S\n", pwszVal); 401 + ok(QueryUserRegValueW(KEY_METRIC, pwszVal, &szReg, &cbSize, NULL) == ERROR_SUCCESS, "Value=%S\n", pwszVal); 402 + ok(_wcsicmp(szReg, L"1") == 0, "Value=%S\n", pwszVal); 403 403 404 404 } 405 405
-1
modules/rostests/apitests/win32nt/win32nt.h
··· 31 31 32 32 #define TEST(x) ok(x, "TEST failed: %s\n", #x) 33 33 #define RTEST(x) ok(x, "RTEST failed: %s\n", #x) 34 - #define TESTX ok 35 34 36 35 #define GdiHandleTable GdiQueryTable() 37 36