https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6846527f67243a3df27791...
commit 6846527f67243a3df27791625cd2e00d90e090cd Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Tue Jan 22 01:38:20 2019 +0900 Commit: Hermès BÉLUSCA - MAÏTO hermes.belusca-maito@reactos.org CommitDate: Mon Jan 21 17:38:20 2019 +0100
[APITESTS][WIN32KNT_APITEST] Use ok_long for NtGdiGetBitmapBits/NtGdiSetBitmapBits (#1275) --- .../apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c | 36 +++++++++++----------- .../apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c | 36 +++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c index 07f4010ec4..51520b433b 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c @@ -13,56 +13,56 @@ START_TEST(NtGdiGetBitmapBits) HBITMAP hBitmap;
SetLastError(ERROR_SUCCESS); - RTEST(NtGdiGetBitmapBits(0, 0, 0) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiGetBitmapBits(0, 0, 0), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE);
/* Test NULL bitmap handle */ SetLastError(ERROR_SUCCESS); - RTEST(NtGdiGetBitmapBits(0, 5, Bits) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiGetBitmapBits(0, 5, Bits), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE);
/* Test invalid bitmap handle */ hBitmap = (HBITMAP)CreatePen(PS_SOLID, 1, RGB(1,2,3)); SetLastError(ERROR_SUCCESS); - RTEST(NtGdiGetBitmapBits(hBitmap, 5, Bits) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiGetBitmapBits(hBitmap, 5, Bits), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); DeleteObject(hBitmap);
hBitmap = CreateBitmap(3, 3, 1, 8, NULL); SetLastError(ERROR_SUCCESS);
/* test NULL pointer and count buffer size != 0 */ - RTEST(NtGdiGetBitmapBits(hBitmap, 5, NULL) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 5, NULL), 12);
/* test NULL pointer and buffer size == 0*/ - RTEST(NtGdiGetBitmapBits(hBitmap, 0, NULL) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 0, NULL), 12);
/* test bad pointer */ - RTEST(NtGdiGetBitmapBits(hBitmap, 5, (PBYTE)0x500) == 0); + ok_long(NtGdiGetBitmapBits(hBitmap, 5, (PBYTE)0x500), 0);
/* Test if we can set a number of bytes between lines */ - RTEST(NtGdiGetBitmapBits(hBitmap, 5, Bits) == 5); + ok_long(NtGdiGetBitmapBits(hBitmap, 5, Bits), 5);
/* Test alignment */ - RTEST(NtGdiGetBitmapBits(hBitmap, 4, Bits+1) == 4); + ok_long(NtGdiGetBitmapBits(hBitmap, 4, Bits+1), 4);
/* Test 1 byte too much */ - RTEST(NtGdiGetBitmapBits(hBitmap, 10, Bits) == 10); + ok_long(NtGdiGetBitmapBits(hBitmap, 10, Bits), 10);
/* Test one row too much */ - RTEST(NtGdiGetBitmapBits(hBitmap, 12, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 12, Bits), 12);
- RTEST(NtGdiGetBitmapBits(hBitmap, 13, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 13, Bits), 12);
- RTEST(NtGdiGetBitmapBits(hBitmap, 100, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 100, Bits), 12);
/* Test huge bytes count */ - RTEST(NtGdiGetBitmapBits(hBitmap, 12345678, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 12345678, Bits), 12);
/* Test negative bytes count */ - RTEST(NtGdiGetBitmapBits(hBitmap, -5, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, -5, Bits), 12);
- RTEST(GetLastError() == ERROR_SUCCESS); + ok_long(GetLastError(), ERROR_SUCCESS);
DeleteObject(hBitmap); } diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c index 4675f55c7d..6924492bf9 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c @@ -13,56 +13,56 @@ START_TEST(NtGdiSetBitmapBits) HBITMAP hBitmap;
SetLastError(ERROR_SUCCESS); - RTEST(NtGdiSetBitmapBits(0, 0, 0) == 0); - RTEST(GetLastError() == ERROR_SUCCESS); + ok_long(NtGdiSetBitmapBits(0, 0, 0), 0); + ok_long(GetLastError(), ERROR_SUCCESS);
/* Test NULL bitnap handle */ SetLastError(ERROR_SUCCESS); - RTEST(NtGdiSetBitmapBits(0, 5, Bits) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiSetBitmapBits(0, 5, Bits), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE);
/* Test invalid bitmap handle */ hBitmap = (HBITMAP)CreatePen(PS_SOLID, 1, RGB(1,2,3)); SetLastError(ERROR_SUCCESS); - RTEST(NtGdiSetBitmapBits(hBitmap, 5, Bits) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiSetBitmapBits(hBitmap, 5, Bits), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); DeleteObject(hBitmap);
hBitmap = CreateBitmap(3, 3, 1, 8, NULL); SetLastError(ERROR_SUCCESS);
/* test NULL pointer and count buffer size != 0 */ - RTEST(NtGdiSetBitmapBits(hBitmap, 5, NULL) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, 5, NULL), 0);
/* test NULL pointer and buffer size == 0*/ - RTEST(NtGdiSetBitmapBits(hBitmap, 0, NULL) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, 0, NULL), 0);
/* test bad pointer */ - RTEST(NtGdiSetBitmapBits(hBitmap, 5, (PBYTE)0x500) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, 5, (PBYTE)0x500), 0);
/* Test if we can set a number of bytes between lines */ - RTEST(NtGdiSetBitmapBits(hBitmap, 5, Bits) == 5); + ok_long(NtGdiSetBitmapBits(hBitmap, 5, Bits), 5);
/* Test alignment */ - RTEST(NtGdiSetBitmapBits(hBitmap, 4, Bits+1) == 4); + ok_long(NtGdiSetBitmapBits(hBitmap, 4, Bits+1), 4);
/* Test 1 byte too much */ - RTEST(NtGdiSetBitmapBits(hBitmap, 10, Bits) == 10); + ok_long(NtGdiSetBitmapBits(hBitmap, 10, Bits), 10);
/* Test one row too much */ - RTEST(NtGdiSetBitmapBits(hBitmap, 12, Bits) == 12); + ok_long(NtGdiSetBitmapBits(hBitmap, 12, Bits), 12);
- RTEST(NtGdiSetBitmapBits(hBitmap, 13, Bits) == 12); + ok_long(NtGdiSetBitmapBits(hBitmap, 13, Bits), 12);
- RTEST(NtGdiSetBitmapBits(hBitmap, 100, Bits) == 12); + ok_long(NtGdiSetBitmapBits(hBitmap, 100, Bits), 12);
/* Test huge bytes count */ - TEST(NtGdiSetBitmapBits(hBitmap, 12345678, Bits) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, 12345678, Bits), 0);
/* Test negative bytes count */ - RTEST(NtGdiSetBitmapBits(hBitmap, -5, Bits) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, -5, Bits), 0);
- RTEST(GetLastError() == ERROR_SUCCESS); + ok_long(GetLastError(), ERROR_SUCCESS);
DeleteObject(hBitmap); }