https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a024ae626fb2887da2ca615aace0d098752801b4
commit a024ae626fb2887da2ca615aace0d098752801b4 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Thu Jan 24 22:17:40 2019 +0900 Commit: GitHub <[email protected]> CommitDate: Thu Jan 24 22:17:40 2019 +0900 [APITESTS][WIN32KNT_APITEST] Improve NtGdiEnumFontOpen testcase (#1285) Use ok, ok_int and ok_ptr macros instead of obsolete TEST macros. --- .../apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c index 6f2d972d8a..b359bd951a 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c @@ -19,27 +19,28 @@ START_TEST(NtGdiEnumFontOpen) // FIXME: We should load the font first idEnum = NtGdiEnumFontOpen(hDC, 2, 0, 32, L"Courier", ANSI_CHARSET, &ulCount); - TEST(idEnum != 0); + ok(idEnum != 0, "idEnum was 0.\n"); if (idEnum == 0) + { + skip("idEnum == 0"); return; + } /* we should have a gdi handle here */ - TEST(GDI_HANDLE_GET_TYPE(idEnum) == GDI_OBJECT_TYPE_ENUMFONT); + ok_int((int)GDI_HANDLE_GET_TYPE(idEnum), (int)GDI_OBJECT_TYPE_ENUMFONT); pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(idEnum)]; - TEST(pEntry->einfo.pobj != NULL); - TEST(pEntry->ObjectOwner.ulObj == GetCurrentProcessId()); - TEST(pEntry->pUser == NULL); - TEST(pEntry->FullUnique == (idEnum >> 16)); - TEST(pEntry->Objt == GDI_OBJECT_TYPE_ENUMFONT >> 16); - TEST(pEntry->Flags == 0); + ok(pEntry->einfo.pobj != NULL, "pEntry->einfo.pobj was NULL.\n"); + ok_long(pEntry->ObjectOwner.ulObj, GetCurrentProcessId()); + ok_ptr(pEntry->pUser, NULL); + ok_int(pEntry->FullUnique, (idEnum >> 16)); + ok_int(pEntry->Objt, GDI_OBJECT_TYPE_ENUMFONT >> 16); + ok_int(pEntry->Flags, 0); /* We should not be able to use DeleteObject() on the handle */ - TEST(DeleteObject((HGDIOBJ)idEnum) == FALSE); + ok_int(DeleteObject((HGDIOBJ)idEnum), FALSE); NtGdiEnumFontClose(idEnum); // Test no logfont (NULL): should word // Test empty lfFaceName string: should not work - } -
