From d4505e4a7fcac9ad19770001bd7c688591527ff4 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 22 Jan 2019 23:01:08 +0900 Subject: [PATCH] [APITESTS][WIN32KNT_APITEST] Improve NtGdiEngCreatePalette testcase (#1284) Use ok and ok_long and ok_ptr macros instead of obsolete TEST macros. --- .../apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c index 29087ecff07..0606311ff68 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c @@ -15,12 +15,11 @@ START_TEST(NtGdiEngCreatePalette) hPal = NtGdiEngCreatePalette(PAL_RGB, 3, Colors, 0xff000000, 0x00ff0000, 0x0000ff00); - TEST(hPal != 0); - TEST(GDI_HANDLE_GET_TYPE(hPal) == GDI_OBJECT_TYPE_PALETTE); + ok(hPal != NULL, "hPal was NULL.\n"); + ok_int((int)GDI_HANDLE_GET_TYPE(hPal), (int)GDI_OBJECT_TYPE_PALETTE); pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(hPal)]; - TEST(pEntry->einfo.pobj != NULL); - TEST(pEntry->ObjectOwner.ulObj == GetCurrentProcessId()); - TEST(pEntry->pUser == 0); + ok(pEntry->einfo.pobj != NULL, "pEntry->einfo.pobj was NULL.\n"); + ok_long(pEntry->ObjectOwner.ulObj, GetCurrentProcessId()); + ok_ptr(pEntry->pUser, NULL); //TEST(pEntry->Type == (((UINT)hPal >> 16) | GDI_OBJECT_TYPE_PALETTE)); - } -- 2.17.1