https://git.reactos.org/?p=reactos.git;a=commitdiff;h=347a74785e76e5bf89f4ce3e2a0794e4fc64d8ae
commit 347a74785e76e5bf89f4ce3e2a0794e4fc64d8ae Author: Serge Gautherie <[email protected]> AuthorDate: Tue Jun 4 04:48:04 2019 +0200 Commit: Katayama Hirofumi MZ <[email protected]> CommitDate: Tue Jun 4 11:48:04 2019 +0900 [WIN32KNT_APITEST] Replace remaining TESTX() (#1609) Addendum to b7794e8112e31a58829bac63d44de53677318c3d. --- modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c | 4 ++-- modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c | 4 ++-- modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c | 4 ++-- modules/rostests/apitests/win32nt/win32nt.h | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c index cb5640db112..1eafc20b6a2 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c @@ -102,8 +102,8 @@ Test_IsSpecialState(HDC hdc, BOOL bMemDC) TEST(pt.x == 56); TEST(pt.y == 78); GetWindowExtEx(hdc, &sz); - TESTX(sz.cx == 123, "sz.cx == %ld\n", sz.cx); - TESTX(sz.cy == 456, "sz.cy == %ld\n", sz.cy); + ok(sz.cx == 123, "sz.cx == %ld\n", sz.cx); + ok(sz.cy == 456, "sz.cy == %ld\n", sz.cy); GetViewportExtEx(hdc, &sz); TEST(sz.cx == 234); TEST(sz.cy == 567); diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c index 2df139a5d7a..a5a2129987c 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c @@ -89,7 +89,7 @@ START_TEST(NtUserGetIconInfo) &bpp, FALSE) == TRUE); - TESTX(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); + ok(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); TEST((LPCTSTR)ResourceStr.Buffer == MAKEINTRESOURCE(IDI_ICON)); TEST(bpp == 32); @@ -101,7 +101,7 @@ START_TEST(NtUserGetIconInfo) &bpp, TRUE) == TRUE); - TESTX(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); + ok(hInstStr.Buffer == NULL, "hInstStr.buffer : %p\n", hInstStr.Buffer); TEST((LPCTSTR)ResourceStr.Buffer == MAKEINTRESOURCE(IDI_ICON)); TEST(bpp == 32); diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c index 33f7b26a598..1f0dfedbc95 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c @@ -398,8 +398,8 @@ Test_MetricKey(PCWSTR pwszVal, INT iVal) DWORD cbSize; cbSize = sizeof(szReg); - TESTX(QueryUserRegValueW(KEY_METRIC, pwszVal, &szReg, &cbSize, NULL) == ERROR_SUCCESS, "Value=%S\n", pwszVal); - TESTX(_wcsicmp(szReg, L"1") == 0, "Value=%S\n", pwszVal); + ok(QueryUserRegValueW(KEY_METRIC, pwszVal, &szReg, &cbSize, NULL) == ERROR_SUCCESS, "Value=%S\n", pwszVal); + ok(_wcsicmp(szReg, L"1") == 0, "Value=%S\n", pwszVal); } diff --git a/modules/rostests/apitests/win32nt/win32nt.h b/modules/rostests/apitests/win32nt/win32nt.h index 6b0f6178d98..001e15388da 100644 --- a/modules/rostests/apitests/win32nt/win32nt.h +++ b/modules/rostests/apitests/win32nt/win32nt.h @@ -31,7 +31,6 @@ #define TEST(x) ok(x, "TEST failed: %s\n", #x) #define RTEST(x) ok(x, "RTEST failed: %s\n", #x) -#define TESTX ok #define GdiHandleTable GdiQueryTable()
