[ros-diffs] [gadamopoulos] 73995: [COMCTL32_APITEST]: Add one more test for BCM_GETIDEALSIZE, it is as if it completely ignores BS_BITMAP.

Author: gadamopoulos
Date: Mon Feb 27 11:06:45 2017
New Revision: 73995

URL: http://svn.reactos.org/svn/reactos?rev=73995&view=rev
Log:
[COMCTL32_APITEST]: Add one more test for BCM_GETIDEALSIZE, it is as if it completely ignores BS_BITMAP.

Modified:
    trunk/rostests/apitests/comctl32/button.c

Modified: trunk/rostests/apitests/comctl32/button.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/button.c...
==============================================================================
--- trunk/rostests/apitests/comctl32/button.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/comctl32/button.c	[iso-8859-1] Mon Feb 27 11:06:45 2017
@@ -122,6 +122,9 @@

DestroyWindow(hwnd1);

+
+
+
     hwnd1 = CreateWindowW(L"Button", L"", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL);
     ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n");
     SetWindowTheme(hwnd1, L"", L"");
@@ -166,6 +169,28 @@

DestroyWindow(hwnd1);

+
+
+
+    hwnd1 = CreateWindowW(L"Button", L" ", BS_BITMAP , 10, 10, 100, 100, 0, NULL, NULL, NULL);
+    ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n");
+    SetWindowTheme(hwnd1, L"", L"");
+
+    SendMessageW(hwnd1, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp);
+
+    memset(&s, 0, sizeof(s));
+    ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s);
+    ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n");
+
+    /* In xp and 2k3 the image is ignored, in vista+ its width is added to the text width */
+    ok_size(s, textent.cx + 2 * wi.cxWindowBorders - 1 + 2, 
+               textent.cy + 2 * wi.cyWindowBorders + 1 + 2); /* the last +2 is the text margin */
+
+    DestroyWindow(hwnd1);
+
+
+
+
     hwnd1 = CreateWindowW(L"Button", L" ", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL);
     ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n");
     SetWindowTheme(hwnd1, L"", L"");
@@ -218,6 +243,9 @@
                textent.cy + 2 * wi.cyWindowBorders + 1);

DestroyWindow(hwnd1);
+
+
+

/* Test again with some real text to see if the formula is correct */
     hwnd1 = CreateWindowW(L"Button", L"Some test text", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL);