From 67648cfb33dcd05caeaf49cbc7aa5c969ad9a4bb Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sat, 4 Nov 2017 11:02:00 +0900 Subject: [PATCH] improve CreateIconIndirect tests --- .../rostests/apitests/gdi32/CreateIconIndirect.c | 176 ++++++++++----------- 1 file changed, 87 insertions(+), 89 deletions(-) diff --git a/modules/rostests/apitests/gdi32/CreateIconIndirect.c b/modules/rostests/apitests/gdi32/CreateIconIndirect.c index bfd78e2add..579ae7f2dd 100644 --- a/modules/rostests/apitests/gdi32/CreateIconIndirect.c +++ b/modules/rostests/apitests/gdi32/CreateIconIndirect.c @@ -1,10 +1,15 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for CreateIconIndirect + * PROGRAMMERS: Katayama Hirofumi MZ + */ #include #include #include - // FIXME user32 void @@ -21,39 +26,39 @@ Test_GetIconInfo(BOOL fIcon) iconinfo.hbmColor = NULL; hicon = CreateIconIndirect(&iconinfo); - ok(hicon == 0, "should fail\n"); + ok(hicon == NULL, "should fail\n"); iconinfo.hbmMask = CreateBitmap(8, 16, 1, 1, NULL); hicon = CreateIconIndirect(&iconinfo); - ok(hicon != 0, "should not fail\n"); + ok(hicon != NULL, "should not fail\n"); - ok(GetIconInfo(hicon, &iconinfo2), "\n"); + ok_int(GetIconInfo(hicon, &iconinfo2), TRUE); ok(iconinfo2.fIcon == iconinfo.fIcon, "\n"); if (fIcon) { - ok(iconinfo2.xHotspot == 4, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 4, "%ld\n", iconinfo2.yHotspot); + ok_long(iconinfo2.xHotspot, 4); + ok_long(iconinfo2.yHotspot, 4); } else { - ok(iconinfo2.xHotspot == 0, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 0, "%ld\n", iconinfo2.yHotspot); + ok_long(iconinfo2.xHotspot, 0); + ok_long(iconinfo2.yHotspot, 0); } ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmMask != iconinfo.hbmMask, "\n"); ok(iconinfo2.hbmColor == NULL, "\n"); - ok(GetIconInfo(hicon, &iconinfo2), "\n"); + ok_int(GetIconInfo(hicon, &iconinfo2), TRUE); ok(iconinfo2.fIcon == iconinfo.fIcon, "\n"); if (fIcon) { - ok(iconinfo2.xHotspot == 4, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 4, "%ld\n", iconinfo2.yHotspot); + ok_long(iconinfo2.xHotspot, 4); + ok_long(iconinfo2.yHotspot, 4); } else { - ok(iconinfo2.xHotspot == 0, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 0, "%ld\n", iconinfo2.yHotspot); + ok_long(iconinfo2.xHotspot, 0); + ok_long(iconinfo2.yHotspot, 0); } ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmMask != iconinfo.hbmMask, "\n"); @@ -61,19 +66,19 @@ Test_GetIconInfo(BOOL fIcon) iconinfo.hbmColor = CreateBitmap(2, 2, 1, 1, NULL); hicon = CreateIconIndirect(&iconinfo); - ok(hicon != 0, "should not fail\n"); + ok(hicon != NULL, "should not fail\n"); - ok(GetIconInfo(hicon, &iconinfo2), "\n"); + ok_int(GetIconInfo(hicon, &iconinfo2), TRUE); ok(iconinfo2.fIcon == iconinfo.fIcon, "\n"); if (fIcon) { - ok(iconinfo2.xHotspot == 4, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 8, "%ld\n", iconinfo2.yHotspot); + ok_long(iconinfo2.xHotspot, 4); + ok_long(iconinfo2.yHotspot, 8); } else { - ok(iconinfo2.xHotspot == 0, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 0, "%ld\n", iconinfo2.yHotspot); + ok_long(iconinfo2.xHotspot, 0); + ok_long(iconinfo2.yHotspot, 0); } ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmMask != iconinfo.hbmMask, "\n"); @@ -81,61 +86,58 @@ Test_GetIconInfo(BOOL fIcon) ok(iconinfo2.hbmMask != iconinfo.hbmColor, "\n"); ok(GetObject(iconinfo2.hbmMask, sizeof(bitmap), &bitmap), "GetObject failed\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 8, "\n"); - ok(bitmap.bmHeight == 16, "\n"); - ok(bitmap.bmWidthBytes == 2, "\n"); - ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == 1, "\n"); + ok_long(bitmap.bmType, 0); + ok_long(bitmap.bmWidth, 8); + ok_long(bitmap.bmHeight, 16); + ok_long(bitmap.bmWidthBytes, 2); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 1); ok(bitmap.bmBits == NULL, "\n"); ok(GetObject(iconinfo2.hbmColor, sizeof(bitmap), &bitmap), "GetObject failed\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 8, "\n"); - ok(bitmap.bmHeight == 16, "\n"); - ok(bitmap.bmWidthBytes == 8 * bitmap.bmBitsPixel / 8, "\n"); - ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == 32, "\n"); + ok_long(bitmap.bmType, 0); + ok_long(bitmap.bmWidth, 8); + ok_long(bitmap.bmHeight, 16); + ok_long(bitmap.bmWidthBytes, 8 * bitmap.bmBitsPixel / 8); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 32); ok(bitmap.bmBits == NULL, "\n"); DeleteObject(iconinfo.hbmMask); iconinfo.hbmMask = NULL; hicon = CreateIconIndirect(&iconinfo); - ok(hicon == 0, "should fail\n"); + ok(hicon == NULL, "should fail\n"); DeleteObject(iconinfo.hbmColor); iconinfo.hbmColor = CreateCompatibleBitmap(GetDC(0), 16, 16); hicon = CreateIconIndirect(&iconinfo); - ok(hicon == 0, "should fail\n"); + ok(hicon == NULL, "should fail\n"); iconinfo.hbmMask = CreateCompatibleBitmap(GetDC(0), 8, 16); hicon = CreateIconIndirect(&iconinfo); - ok(hicon != 0, "should not fail\n"); + ok(hicon != NULL, "should not fail\n"); - ok(GetIconInfo(hicon, &iconinfo2), "\n"); + ok_int(GetIconInfo(hicon, &iconinfo2), TRUE); ok(GetObject(iconinfo2.hbmMask, sizeof(bitmap), &bitmap), "GetObject failed\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 8, "%ld\n", bitmap.bmWidth); - ok(bitmap.bmHeight == 16, "%ld\n", bitmap.bmHeight); - ok(bitmap.bmWidthBytes == 2, "%ld\n", bitmap.bmWidthBytes); - ok(bitmap.bmPlanes == 1, "%d\n", bitmap.bmPlanes); - ok(bitmap.bmBitsPixel == 1, "%d\n", bitmap.bmBitsPixel); + ok_long(bitmap.bmType, 0); + ok_long(bitmap.bmWidth, 8); + ok_long(bitmap.bmHeight, 16); + ok_long(bitmap.bmWidthBytes, 2); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 1); ok(bitmap.bmBits == NULL, "\n"); ok(GetObject(iconinfo2.hbmColor, sizeof(bitmap), &bitmap), "GetObject failed\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 8, "%ld\n", bitmap.bmWidth); - ok(bitmap.bmHeight == 16, "%ld\n", bitmap.bmHeight); - ok(bitmap.bmWidthBytes == 32, "%ld\n", bitmap.bmWidthBytes); - ok(bitmap.bmPlanes == 1, "%d\n", bitmap.bmPlanes); - ok(bitmap.bmBitsPixel == 32, "%d\n", bitmap.bmBitsPixel); + ok_long(bitmap.bmType, 0); + ok_long(bitmap.bmWidth, 8); + ok_long(bitmap.bmHeight, 16); + ok_long(bitmap.bmWidthBytes, 32); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 32); ok(bitmap.bmBits == NULL, "\n"); - - } - START_TEST(CreateIconIndirect) { HCURSOR hcursor; @@ -144,65 +146,61 @@ START_TEST(CreateIconIndirect) BITMAP bitmap; DWORD data[] = {0, 0, 0, 0, 0, 0}; - Test_GetIconInfo(0); - Test_GetIconInfo(1); + Test_GetIconInfo(FALSE); + Test_GetIconInfo(TRUE); hcursor = LoadCursor(NULL, IDC_APPSTARTING); - ok(hcursor != 0, "should not fail\n"); - ok(GetIconInfo(hcursor, &iconinfo2), "\n"); - ok(iconinfo2.fIcon == 0, "\n"); - ok(iconinfo2.xHotspot == 0, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 8, "%ld\n", iconinfo2.yHotspot); + ok(hcursor != NULL, "should not fail\n"); + ok_int(GetIconInfo(hcursor, &iconinfo2), TRUE); + ok_int(iconinfo2.fIcon, 0); + ok_long(iconinfo2.xHotspot, 0); + ok_long(iconinfo2.yHotspot, 8); ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmColor != NULL, "\n"); ok(GetObject(iconinfo2.hbmMask, sizeof(bitmap), &bitmap), "GetObject failed\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 32, "%ld\n", bitmap.bmWidth); - ok(bitmap.bmHeight == 32, "\n"); - ok(bitmap.bmWidthBytes == 4, "\n"); - ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == 1, "\n"); + ok_long(bitmap.bmType, 0); + ok_long(bitmap.bmWidth, 32); + ok_long(bitmap.bmHeight, 32); + ok_long(bitmap.bmWidthBytes, 4); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 1); ok(bitmap.bmBits == NULL, "\n"); ok(GetObject(iconinfo2.hbmColor, sizeof(bitmap), &bitmap), "GetObject failed\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 32, "\n"); - ok(bitmap.bmHeight == 32, "\n"); - ok(bitmap.bmWidthBytes == 32 * bitmap.bmBitsPixel / 8, "\n"); - ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == 32, "\n"); + ok_long(bitmap.bmType, 0); + ok_long(bitmap.bmWidth, 32); + ok_long(bitmap.bmHeight, 32); + ok_long(bitmap.bmWidthBytes, 32 * bitmap.bmBitsPixel / 8); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 32); ok(bitmap.bmBits == NULL, "\n"); hcursor = CreateCursor(NULL, 1, 2, 4, 4, data, data); - ok(hcursor != 0, "should not fail\n"); - ok(GetIconInfo(hcursor, &iconinfo2), "\n"); - ok(iconinfo2.fIcon == 0, "\n"); - ok(iconinfo2.xHotspot == 1, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 2, "%ld\n", iconinfo2.yHotspot); + ok(hcursor != NULL, "should not fail\n"); + ok_int(GetIconInfo(hcursor, &iconinfo2), TRUE); + ok_int(iconinfo2.fIcon, 0); + ok_long(iconinfo2.xHotspot, 1); + ok_long(iconinfo2.yHotspot, 2); ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmColor == NULL, "\n"); ok(GetObject(iconinfo2.hbmMask, sizeof(bitmap), &bitmap), "GetObject failed\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 4, "%ld\n", bitmap.bmWidth); - ok(bitmap.bmHeight == 8, "%ld\n", bitmap.bmHeight); - ok(bitmap.bmWidthBytes == 2, "%ld\n", bitmap.bmWidthBytes); - ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == 1, "\n"); + ok_long(bitmap.bmType, 0); + ok_long(bitmap.bmWidth, 4); + ok_long(bitmap.bmHeight, 8); + ok_long(bitmap.bmWidthBytes, 2); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 1); ok(bitmap.bmBits == NULL, "\n"); - hicon = CreateIcon(0, 4, 4, 1, 1, (PBYTE)data, (PBYTE)data); - ok(hicon != 0, "should not fail\n"); + ok(hicon != NULL, "should not fail\n"); - ok(GetIconInfo(hicon, &iconinfo2), "\n"); - ok(iconinfo2.fIcon == 0, "\n"); - ok(iconinfo2.xHotspot == 2, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 2, "%ld\n", iconinfo2.yHotspot); + ok_int(GetIconInfo(hicon, &iconinfo2), TRUE); + ok_int(iconinfo2.fIcon, 0); + ok_long(iconinfo2.xHotspot, 2); + ok_long(iconinfo2.yHotspot, 2); ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmColor == NULL, "\n"); - } - - -- 2.14.2