[PATCH resend 3/7] comctl32/tests: add more static control tests
Rafał Harabień
rafalh92 at outlook.com
Sat Mar 26 07:22:33 CDT 2022
Signed-off-by: Rafał Harabień <rafalh92 at outlook.com>
---
dlls/comctl32/tests/static.c | 33 +++++++++++++++++++++++++++++----
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c
index b8f43142d6b..d1573b84d64 100644
--- a/dlls/comctl32/tests/static.c
+++ b/dlls/comctl32/tests/static.c
@@ -82,10 +82,29 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara
static void test_updates(int style, int flags)
{
HWND hStatic = create_static(style);
- RECT r1 = {20, 20, 30, 30};
+ RECT r1 = {20, 20, 30, 30}, rcClient;
int exp;
+ LONG exstyle;
flush_events();
+ trace("Testing style 0x%x\n", style);
+
+ exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE);
+ if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN)
+ todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle);
+ else
+ ok(exstyle == 0, "expected 0, got %d\n", exstyle);
+
+ GetClientRect(hStatic, &rcClient);
+ if (style == SS_ETCHEDVERT)
+ todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right);
+ else
+ ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right);
+ if (style == SS_ETCHEDHORZ)
+ todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom);
+ else
+ ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom);
+
g_nReceivedColorStatic = 0;
/* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */
InvalidateRect(hMainWnd, NULL, FALSE);
@@ -406,14 +425,20 @@ START_TEST(static)
ShowWindow(hMainWnd, SW_SHOW);
test_updates(0, 0);
- test_updates(SS_SIMPLE, 0);
test_updates(SS_ICON, 0);
- test_updates(SS_BITMAP, 0);
- test_updates(SS_BITMAP | SS_CENTERIMAGE, 0);
test_updates(SS_BLACKRECT, TODO_COUNT);
test_updates(SS_WHITERECT, TODO_COUNT);
+ test_updates(SS_BLACKFRAME, TODO_COUNT);
+ test_updates(SS_WHITEFRAME, TODO_COUNT);
+ test_updates(SS_USERITEM, TODO_COUNT);
+ test_updates(SS_SIMPLE, 0);
+ test_updates(SS_OWNERDRAW, 0);
+ test_updates(SS_BITMAP, 0);
+ test_updates(SS_BITMAP | SS_CENTERIMAGE, 0);
test_updates(SS_ETCHEDHORZ, TODO_COUNT);
test_updates(SS_ETCHEDVERT, TODO_COUNT);
+ test_updates(SS_ETCHEDFRAME, TODO_COUNT);
+ test_updates(SS_SUNKEN, 0);
test_set_text();
test_set_image();
test_STM_SETIMAGE();
--
2.25.1
More information about the wine-devel
mailing list