From c3fed1277e44e02fa4185a4d0201ad4b36915fa8 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Wed, 1 Mar 2017 09:35:44 +0000 Subject: [PATCH] [COMCTL32_APITEST} -Add some more tests and fix build. svn path=/trunk/; revision=74008 --- rostests/apitests/comctl32/button.c | 33 +++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/rostests/apitests/comctl32/button.c b/rostests/apitests/comctl32/button.c index 7a85c664c6a..275589f9e4e 100644 --- a/rostests/apitests/comctl32/button.c +++ b/rostests/apitests/comctl32/button.c @@ -188,7 +188,6 @@ void Test_GetIdealSizeNoThemes() - 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""); @@ -259,7 +258,32 @@ void Test_GetIdealSizeNoThemes() ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); /* image + its margins is so big that the height is dictated by them */ - ok_size(s, textent.cx + 5 + 2 + 1 + 100, 101); + ok_size(s, textent.cx + 5 + 2 + 1 + 100, (LONG)101); + + DestroyWindow(hwnd1); + + + + + + + hwnd1 = CreateWindowW(L"Button", L"Start", BS_VCENTER, 0, 0, 0, 0, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + font = (HFONT)SendMessageW(hwnd1, WM_GETFONT, 0, 0); + hdc = GetDC(hwnd1); + SelectObject(hdc, font); + GetTextExtentPoint32W(hdc, L"Start", 5, &textent); + + SetRect(&rc, 0,0,0,0); + ret = SendMessageW(hwnd1, BCM_SETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_SETTEXTMARGIN to succeed\n"); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, textent.cx + 5, textent.cy + 7); DestroyWindow(hwnd1); @@ -285,6 +309,7 @@ void Test_GetIdealSizeNoThemes() /* The hardcoded values are independent of the margin */ lf.lfHeight = 200; lf.lfWidth = 200; + lf.lfWeight = FW_BOLD; wcscpy(lf.lfFaceName, L"Arial"); font = CreateFontIndirectW(&lf); ok(font != NULL, "\n"); @@ -300,6 +325,10 @@ void Test_GetIdealSizeNoThemes() textent.cy + 7 + 2); DestroyWindow(hwnd1); + + + + } START_TEST(button)