June 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Add more tests for Wow64 contexts.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 9ae2b046ef2f645b122a2554cc8e32d3a3d79ccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ae2b046ef2f645b122a2554… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 17:08:11 2021 +0200 ntdll/tests: Add more tests for Wow64 contexts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 253 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 247 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ae2b046ef2f645b122a…

1 0

Zhiyi Zhang : comctl32/tests: Add UDS_SETBUDDY tests.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: e9a5cd2e5a87fb50814332f8d98e17f1757ed680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a5cd2e5a87fb50814332f8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 22 16:17:59 2021 +0800 comctl32/tests: Add UDS_SETBUDDY tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/updown.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index d0fff562499..a58ea899dc9 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -973,6 +973,42 @@ static void test_updown_pos_notifications(void) DestroyWindow(updown); } +static void test_UDS_SETBUDDY(void) +{ + static const int start_width = 100, start_height = 100; + int width, height, updown_width; + HWND updown; + RECT rect; + BOOL ret; + + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT | UDS_ARROWKEYS, g_edit); + ret = SetWindowPos(g_edit, 0, 100, 100, start_width, start_height, SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed, error %u.\n", GetLastError()); + ret = GetWindowRect(g_edit, &rect); + ok(ret, "GetWindowRect failed, error %u.\n", GetLastError()); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + ok(width == start_width, "Expected width %d, got %d.\n", start_width, width); + ok(height == start_height, "Expected height %d, got %d.\n", start_height, height); + + SendMessageA(updown, UDM_SETBUDDY, (WPARAM)g_edit, 0); + ret = GetWindowRect(g_edit, &rect); + ok(ret, "GetWindowRect failed, error %u.\n", GetLastError()); + updown_width = start_width - (rect.right - rect.left); + ok(updown_width > 0, "Expected updown width > 0, got %d.\n", updown_width); + + SendMessageA(updown, UDM_SETBUDDY, (WPARAM)g_edit, 0); + ret = GetWindowRect(g_edit, &rect); + ok(ret, "GetWindowRect failed, error %u.\n", GetLastError()); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + ok(width == start_width - 2 * updown_width, "Expected width %d, got %d.\n", + start_width - 2 * updown_width, width); + ok(height == start_height, "Expected height %d, got %d.\n", start_height, height); + + DestroyWindow(updown); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1002,6 +1038,7 @@ START_TEST(updown) test_updown_buddy(); test_updown_base(); test_updown_unicode(); + test_UDS_SETBUDDY(); test_UDS_SETBUDDYINT(); test_CreateUpDownControl(); test_updown_pos_notifications();

1 0

Zhiyi Zhang : winecfg: Set buddy window for the size up-down control only once.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: bf6ed90cd6fd769534e8d7c2f1880f8db01b418b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6ed90cd6fd769534e8d7c2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 22 16:18:05 2021 +0800 winecfg: Set buddy window for the size up-down control only once. Fix the size up-down control becoming smaller every time the apply button is pressed in the Desktop Integration tab. UDM_SETBUDDY always shrinks the buddy window for a up-down control according to tests. And a PSN_SETACTIVE notification is sent every time the apply button is pressed, thus init_dialog() gets called again and sends an extra UDM_SETBUDDY message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index b38b2ff26d6..687ea571311 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -434,6 +434,12 @@ static void enable_size_and_color_controls (HWND dialog, BOOL enable) } static void init_dialog (HWND dialog) +{ + SendDlgItemMessageW(dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETBUDDY, + (WPARAM)GetDlgItem(dialog, IDC_SYSPARAM_SIZE), 0); +} + +static void update_dialog (HWND dialog) { updating_ui = TRUE; @@ -452,7 +458,6 @@ static void init_dialog (HWND dialog) } theme_dirty = FALSE; - SendDlgItemMessageW(dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETBUDDY, (WPARAM)GetDlgItem(dialog, IDC_SYSPARAM_SIZE), 0); SendDlgItemMessageW(dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETRANGE, 0, MAKELONG(100, 8)); updating_ui = FALSE; @@ -1197,6 +1202,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) update_shell_folder_listview(hDlg); read_sysparams(hDlg); init_mime_types(hDlg); + init_dialog(hDlg); break; case WM_DESTROY: @@ -1349,7 +1355,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; } case PSN_SETACTIVE: { - init_dialog (hDlg); + update_dialog(hDlg); break; } }

1 0

Zhiyi Zhang : comctl32/theme_scrollbar: Draw parent background before drawing control parts.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: f8671aaedd5668447ab5ec7c4cdb9ddadacfd4a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8671aaedd5668447ab5ec7c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 22 16:20:51 2021 +0800 comctl32/theme_scrollbar: Draw parent background before drawing control parts. Control parts may be transparent, thus they need to be drawn on top of parent window background. Otherwise, black artifacts may occur. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/theme_scrollbar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index 304ff5bacbc..7cc59bbd1e5 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -332,6 +332,8 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) else state = SZB_RIGHTALIGN; + if (IsThemeBackgroundPartiallyTransparent(theme, SBP_SIZEBOX, state)) + DrawThemeParentBackground(hwnd, dc, NULL); DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, &r, NULL); } else { SCROLLINFO si; @@ -365,6 +367,8 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) } } + DrawThemeParentBackground(hwnd, dc, NULL); + if (vertical) { SIZE upsize, downsize; int uparrowstate, downarrowstate;

1 0

Zhiyi Zhang : comctl32/treeview: Draw parent background before drawing control parts.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 02bfec6419dec45b018100526f327007d51168e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02bfec6419dec45b01810052… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 22 16:20:56 2021 +0800 comctl32/treeview: Draw parent background before drawing control parts. Fix residual glyphs on background when drawing treeview buttons with themes that contains transparent button glyphs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 98cf5489f2b..f4a387dd0d2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2901,6 +2901,7 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, HDC hdc, const RECT *rc) HWND hwnd = infoPtr->hwnd; RECT rect = *rc; TREEVIEW_ITEM *item; + HTHEME theme; if (infoPtr->clientHeight == 0 || infoPtr->clientWidth == 0) { @@ -2917,6 +2918,12 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, HDC hdc, const RECT *rc) return; } + if (infoPtr->dwStyle & TVS_HASBUTTONS && (theme = GetWindowTheme(infoPtr->hwnd))) + { + if (IsThemeBackgroundPartiallyTransparent(theme, TVP_GLYPH, 0)) + DrawThemeParentBackground(infoPtr->hwnd, hdc, NULL); + } + for (item = infoPtr->root->firstChild; item != NULL; item = TREEVIEW_GetNextListItem(infoPtr, item))

1 0

Zhiyi Zhang : comctl32/toolbar: Remove a redundant theme handle check in TOOLBAR_NCCreate().
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: a769679113a627d0e900aabd4bfb3c54e305c504 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a769679113a627d0e900aabd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 22 16:21:02 2021 +0800 comctl32/toolbar: Remove a redundant theme handle check in TOOLBAR_NCCreate(). This is a no-op. In TOOLBAR_NCCreate(), GetWindowTheme() always returns NULL because the theme handle is not open by OpenThemeData() by that time. Also tests show that TBSTYLE_TRANSPARENT is not added when theming is active. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 81 +++++++++++++++++++++++++++++++++++++------ dlls/comctl32/toolbar.c | 3 +- 2 files changed, 71 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index b7e03c3e378..9cfdcc689d9 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -26,11 +26,13 @@ #include "winuser.h" #include "winnls.h" #include "winreg.h" -#include "commctrl.h" +#include "commctrl.h" +#include "uxtheme.h" #include "resources.h" #include "wine/test.h" +#include "v6util.h" #include "msg.h" @@ -44,6 +46,10 @@ static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); static HIMAGELIST (WINAPI *pImageList_LoadImageA)(HINSTANCE, LPCSTR, int, int, COLORREF, UINT, UINT); +static BOOL (WINAPI *pIsThemeActive)(VOID); + +static BOOL is_theme_active; + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND hMainWnd; @@ -2203,7 +2209,7 @@ static LRESULT CALLBACK cbt_hook_proc(int code, WPARAM wParam, LPARAM lParam) return CallNextHookEx(g_tbhook, code, wParam, lParam); } -static void test_create(void) +static void test_create(BOOL v6) { HWND hwnd, tooltip; DWORD style; @@ -2217,16 +2223,32 @@ static void test_create(void) hwnd = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); - CHECK_CALLED(g_hook_create); - CHECK_CALLED(g_hook_WM_NCCREATE); - CHECK_CALLED(g_hook_WM_CREATE); + if (v6) + { + expect(called_g_hook_create, FALSE); + expect(called_g_hook_WM_NCCREATE, FALSE); + expect(called_g_hook_WM_CREATE, FALSE); + } + else + { + CHECK_CALLED(g_hook_create); + CHECK_CALLED(g_hook_WM_NCCREATE); + CHECK_CALLED(g_hook_WM_CREATE); + } style = GetWindowLongA(hwnd, GWL_STYLE); - ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + if (v6) + { + ok(!(style & TBSTYLE_TOOLTIPS), "got 0x%08x\n", style); + } + else + { + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); - tooltip = (HWND)SendMessageA(hwnd, TB_GETTOOLTIPS, 0, 0); - ok(tooltip != NULL, "got %p\n", tooltip); - ok(GetParent(tooltip) == hMainWnd, "got %p, %p\n", hMainWnd, hwnd); + tooltip = (HWND)SendMessageA(hwnd, TB_GETTOOLTIPS, 0, 0); + ok(tooltip != NULL, "got %p\n", tooltip); + ok(GetParent(tooltip) == hMainWnd, "got %p, %p\n", hMainWnd, hwnd); + } DestroyWindow(hwnd); UnhookWindowsHook(WH_CBT, cbt_hook_proc); @@ -2243,6 +2265,24 @@ static void test_create(void) ok((style & TBSTYLE_TRANSPARENT) == TBSTYLE_TRANSPARENT, "got 0x%08x\n", style); DestroyWindow(hwnd); + + if (!is_theme_active) + { + skip("Theming is not active, skipping following tests.\n"); + return; + } + + hwnd = CreateWindowA(TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS + | TBSTYLE_TOOLTIPS | TBSTYLE_GROUP, 0, 0, 0, 0, hMainWnd, (HMENU)5, + GetModuleHandleA(NULL), NULL); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(!(style & TBSTYLE_TRANSPARENT), "got 0x%08x\n", style); + + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok(!(style & TBSTYLE_TRANSPARENT), "got 0x%08x\n", style); + + DestroyWindow(hwnd); } typedef struct { @@ -2536,7 +2576,10 @@ static void test_imagelist(void) static void init_functions(void) { - HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + HMODULE hComCtl32, hUxtheme; + + hComCtl32 = LoadLibraryA("comctl32.dll"); + hUxtheme = LoadLibraryA("uxtheme.dll"); #define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); X(CreateToolbarEx); @@ -2545,17 +2588,26 @@ static void init_functions(void) X(ImageList_LoadImageA); X(ImageList_Destroy); #undef X + +#define X(f) p##f = (void*)GetProcAddress(hUxtheme, #f) + X(IsThemeActive); +#undef X } START_TEST(toolbar) { + ULONG_PTR ctx_cookie; WNDCLASSA wc; + HANDLE ctx; MSG msg; RECT rc; init_msg_sequences(sequences, NUM_MSG_SEQUENCES); init_functions(); + if (pIsThemeActive) + is_theme_active = pIsThemeActive(); + wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -2586,17 +2638,24 @@ START_TEST(toolbar) test_getstring(); test_tooltip(); test_get_set_style(); - test_create(); + test_create(FALSE); test_TB_GET_SET_EXTENDEDSTYLE(); test_noresize(); test_save(); test_drawtext_flags(); test_imagelist(); + if (!load_v6_module(&ctx_cookie, &ctx)) + return; + + test_create(TRUE); + PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg); DispatchMessageA(&msg); } DestroyWindow(hMainWnd); + + unload_v6_module(ctx_cookie, ctx); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1aeb499c45f..a8777ae5480 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6104,8 +6104,7 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs) * (Guy Albertelli 9/2001) * */ - if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) - && !(lpcs->style & TBSTYLE_TRANSPARENT)) + if ((infoPtr->dwStyle & TBSTYLE_FLAT) && !(lpcs->style & TBSTYLE_TRANSPARENT)) styleadd |= TBSTYLE_TRANSPARENT; if (!(lpcs->style & (CCS_TOP | CCS_NOMOVEY))) { styleadd |= CCS_TOP; /* default to top */

1 0

Zhiyi Zhang : comctl32/toolbar: Test that toolbar shouldn't use outside theme handles.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 677c459b86ae2785a63b373c68b8bb979f70d877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=677c459b86ae2785a63b373c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 22 16:21:09 2021 +0800 comctl32/toolbar: Test that toolbar shouldn't use outside theme handles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 114 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 9cfdcc689d9..d6ee358b04a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -46,7 +46,10 @@ static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); static HIMAGELIST (WINAPI *pImageList_LoadImageA)(HINSTANCE, LPCSTR, int, int, COLORREF, UINT, UINT); +static HRESULT (WINAPI *pCloseThemeData)(HTHEME); static BOOL (WINAPI *pIsThemeActive)(VOID); +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static HTHEME (WINAPI *pOpenThemeData)(HWND, LPCWSTR); static BOOL is_theme_active; @@ -139,6 +142,40 @@ static void MakeButton(TBBUTTON *p, int idCommand, int fsStyle, int nString) { p->iString = nString; } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + +static BOOL equal_dc(HDC hdc1, HDC hdc2, int width, int height) +{ + int x, y; + + for (x = 0; x < width; ++x) + { + for (y = 0; y < height; ++y) + { + if (GetPixel(hdc1, x, y) != GetPixel(hdc2, x, y)) + return FALSE; + } + } + + return TRUE; +} + static void *alloced_str; static LRESULT parent_wnd_notify(LPARAM lParam) @@ -2574,6 +2611,79 @@ static void test_imagelist(void) DestroyWindow(hwnd); } +static void test_visual(void) +{ + HBITMAP mem_bitmap1, mem_bitmap2; + HDC mem_dc1, mem_dc2, toolbar_dc; + TBBUTTON tbbutton; + int width, height; + HTHEME theme; + HWND toolbar; + RECT rect; + BOOL ret; + + if (!is_theme_active) + { + skip("Theming is not active, skipping visual tests.\n"); + return; + } + + /* Test that toolbar shouldn't use outside theme handles */ + toolbar = CreateWindowA(TOOLBARCLASSNAMEA, "", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hMainWnd, 0, 0, NULL); + ok(!!toolbar, "Failed to create a toolbar window.\n"); + + /* Toolbar needs data for it to show */ + memset(&tbbutton, 0, sizeof(tbbutton)); + tbbutton.fsState = TBSTATE_ENABLED; + tbbutton.iString = (INT_PTR)"test"; + SendMessageA(toolbar, TB_BUTTONSTRUCTSIZE, sizeof(tbbutton), 0); + ret = SendMessageA(toolbar, TB_ADDBUTTONSA, 1, (LPARAM)&tbbutton); + ok(ret, "TB_ADDBUTTONSA failed.\n"); + + theme = pGetWindowTheme(toolbar); + todo_wine + ok(!theme, "Expected theme not opened by window.\n"); + + toolbar_dc = GetDC(toolbar); + GetClientRect(toolbar, &rect); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + + ret = RedrawWindow(toolbar, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW); + ok(ret, "RedrawWindow failed.\n"); + flush_events(); + + mem_dc1 = CreateCompatibleDC(toolbar_dc); + mem_bitmap1 = CreateCompatibleBitmap(toolbar_dc, width, height); + SelectObject(mem_dc1, mem_bitmap1); + BitBlt(mem_dc1, 0, 0, width, height, toolbar_dc, 0, 0, SRCCOPY); + + if (theme) + pCloseThemeData(theme); + theme = pOpenThemeData(toolbar, L"Rebar"); + ok(!!theme, "OpenThemeData failed.\n"); + + ret = RedrawWindow(toolbar, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW); + ok(ret, "RedrawWindow failed.\n"); + + mem_dc2 = CreateCompatibleDC(toolbar_dc); + mem_bitmap2 = CreateCompatibleBitmap(toolbar_dc, width, height); + SelectObject(mem_dc2, mem_bitmap2); + BitBlt(mem_dc2, 0, 0, width, height, toolbar_dc, 0, 0, SRCCOPY); + + ret = equal_dc(mem_dc1, mem_dc2, width, height); + todo_wine + ok(ret, "Expected same content.\n"); + + pCloseThemeData(theme); + DeleteObject(mem_bitmap2); + DeleteObject(mem_bitmap1); + DeleteDC(mem_dc2); + DeleteDC(mem_dc1); + ReleaseDC(toolbar, toolbar_dc); + DestroyWindow(toolbar); +} + static void init_functions(void) { HMODULE hComCtl32, hUxtheme; @@ -2590,7 +2700,10 @@ static void init_functions(void) #undef X #define X(f) p##f = (void*)GetProcAddress(hUxtheme, #f) + X(GetWindowTheme); X(IsThemeActive); + X(OpenThemeData); + X(CloseThemeData); #undef X } @@ -2649,6 +2762,7 @@ START_TEST(toolbar) return; test_create(TRUE); + test_visual(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) {

1 0

Zhiyi Zhang : comctl32/toolbar: Don't use outside theme handles.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 8107462b8aa9f91a5f0ada710e8d1c4d6a95a3a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8107462b8aa9f91a5f0ada71… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 22 16:21:15 2021 +0800 comctl32/toolbar: Don't use outside theme handles. Fix Spy++ Toolbar buttons have artifacts. Spy++ first creates a Toolbar window, then calls OpenThemeData(hwnd, "Rebar") with the Toolbar window. Then when the Toolbar control uses the theme handle from GetWindowTheme(), it gets a Rebar theme the next time it draws, thus drawing wrong theme parts. According the tests, not all of the common controls have such behaviors. Some of them do have theme handles opened by their window and then use that theme handle afterwards even it's changed from the outside. However, for other controls, the behaviors are not very consistent across all Windows versions. Also no applications depend on such behaviors for other controls yet. So, only modify the Toolbar control for now. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 2 -- dlls/comctl32/toolbar.c | 36 ++++++++++++++++-------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d6ee358b04a..87b4611d056 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2641,7 +2641,6 @@ static void test_visual(void) ok(ret, "TB_ADDBUTTONSA failed.\n"); theme = pGetWindowTheme(toolbar); - todo_wine ok(!theme, "Expected theme not opened by window.\n"); toolbar_dc = GetDC(toolbar); @@ -2672,7 +2671,6 @@ static void test_visual(void) BitBlt(mem_dc2, 0, 0, width, height, toolbar_dc, 0, 0, SRCCOPY); ret = equal_dc(mem_dc1, mem_dc2, width, height); - todo_wine ok(ret, "Expected same content.\n"); pCloseThemeData(theme); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a8777ae5480..2585e11530e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -142,6 +142,7 @@ typedef struct INT iListGap; /* default gap between text and image for toolbar with list style */ HFONT hDefaultFont; HFONT hFont; /* text font */ + HTHEME hTheme; /* theme */ HIMAGELIST himlInt; /* image list created internally */ PIMLENTRY *himlDef; /* default image list array */ INT cimlDef; /* default image list array count */ @@ -780,7 +781,7 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, INT left, I } else if (tbcd->nmcd.uItemState & CDIS_CHECKED || ((tbcd->nmcd.uItemState & CDIS_HOT) - && ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)))) + && ((infoPtr->dwStyle & TBSTYLE_FLAT) || infoPtr->hTheme))) { /* if hot, attempt to draw with hot image list, if fails, use default image list */ @@ -900,7 +901,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, INT oldBkMode; DWORD dwItemCustDraw; DWORD dwItemCDFlag; - HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + HTHEME theme = infoPtr->hTheme; rc = btnPtr->rect; rcArrow = rc; @@ -1053,8 +1054,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, ((tbcd.nmcd.uItemState & CDIS_CHECKED) || (tbcd.nmcd.uItemState & CDIS_INDETERMINATE))) TOOLBAR_DrawPattern (&rc, &tbcd); - if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) - && (tbcd.nmcd.uItemState & CDIS_HOT)) + if (((infoPtr->dwStyle & TBSTYLE_FLAT) || theme) && (tbcd.nmcd.uItemState & CDIS_HOT)) { if ( dwItemCDFlag & TBCDRF_HILITEHOTTRACK ) { @@ -3506,7 +3506,7 @@ TOOLBAR_GetHotImageList (const TOOLBAR_INFO *infoPtr, WPARAM wParam) static LRESULT TOOLBAR_GetHotItem (const TOOLBAR_INFO *infoPtr) { - if (!((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf))) + if (!((infoPtr->dwStyle & TBSTYLE_FLAT) || infoPtr->hTheme)) return -1; if (infoPtr->nHotItem < 0) @@ -5313,8 +5313,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW (&logFont); - - OpenThemeData (hwnd, themeClass); + infoPtr->hTheme = OpenThemeData (NULL, themeClass); TOOLBAR_CheckStyle (infoPtr); @@ -5358,8 +5357,8 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) /* delete default font */ DeleteObject (infoPtr->hDefaultFont); - - CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); + + CloseThemeData (infoPtr->hTheme); /* free toolbar info data */ SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); @@ -5375,7 +5374,6 @@ TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) NMTBCUSTOMDRAW tbcd; INT ret = FALSE; DWORD ntfret; - HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); DWORD dwEraseCustDraw = 0; /* the app has told us not to redraw the toolbar */ @@ -5405,7 +5403,7 @@ TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) /* If the toolbar is "transparent" then pass the WM_ERASEBKGND up * to my parent for processing. */ - if (theme || (infoPtr->dwStyle & TBSTYLE_TRANSPARENT)) { + if (infoPtr->hTheme || (infoPtr->dwStyle & TBSTYLE_TRANSPARENT)) { POINT pt, ptorig; HDC hdc = (HDC)wParam; HWND parent; @@ -5957,7 +5955,7 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if ((infoPtr->dwStyle & TBSTYLE_TOOLTIPS) && (infoPtr->hwndToolTip == NULL)) TOOLBAR_TooltipCreateControl(infoPtr); - if ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) { + if ((infoPtr->dwStyle & TBSTYLE_FLAT) || infoPtr->hTheme) { /* fill in the TRACKMOUSEEVENT struct */ trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; @@ -5985,8 +5983,7 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); - if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) - && (!infoPtr->bAnchor || button)) + if (((infoPtr->dwStyle & TBSTYLE_FLAT) || infoPtr->hTheme) && (!infoPtr->bAnchor || button)) TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE); if (infoPtr->nOldHit != nHit) @@ -6550,12 +6547,11 @@ TOOLBAR_SysColorChange (void) /* update theme after a WM_THEMECHANGED message */ -static LRESULT theme_changed (HWND hwnd) +static LRESULT theme_changed (TOOLBAR_INFO *infoPtr) { - HTHEME theme = GetWindowTheme (hwnd); - CloseThemeData (theme); - OpenThemeData (hwnd, themeClass); - InvalidateRect (hwnd, NULL, TRUE); + CloseThemeData (infoPtr->hTheme); + infoPtr->hTheme = OpenThemeData (NULL, themeClass); + InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return 0; } @@ -6945,7 +6941,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SysColorChange (); case WM_THEMECHANGED: - return theme_changed (hwnd); + return theme_changed (infoPtr); /* case WM_WININICHANGE: */

1 0

Zhiyi Zhang : comctl32/trackbar: Update control parts when style changed.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 6799667b71c74547a7cb66ad59e81295c561255b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6799667b71c74547a7cb66ad… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 22 16:21:22 2021 +0800 comctl32/trackbar: Update control parts when style changed. Fix trackbar draws incorrectly after changing style. For example, adding TBS_BOTH should cause a total repaint. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/trackbar.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 1859cf0f516..ce6a20c6c63 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1502,6 +1502,19 @@ TRACKBAR_InitializeThumb (TRACKBAR_INFO *infoPtr) return 0; } +static void TRACKBAR_RecalculateAll (TRACKBAR_INFO *infoPtr) +{ + if (infoPtr->dwStyle & TBS_FIXEDLENGTH) + { + TRACKBAR_CalcChannel(infoPtr); + TRACKBAR_UpdateThumb(infoPtr); + } + else + { + TRACKBAR_InitializeThumb(infoPtr); + } + TRACKBAR_AlignBuddies(infoPtr); +} static LRESULT TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) @@ -1677,14 +1690,7 @@ TRACKBAR_SetFocus (TRACKBAR_INFO *infoPtr) static LRESULT TRACKBAR_Size (TRACKBAR_INFO *infoPtr) { - if (infoPtr->dwStyle & TBS_FIXEDLENGTH) - { - TRACKBAR_CalcChannel(infoPtr); - TRACKBAR_UpdateThumb(infoPtr); - } - else - TRACKBAR_InitializeThumb(infoPtr); - TRACKBAR_AlignBuddies (infoPtr); + TRACKBAR_RecalculateAll(infoPtr); TRACKBAR_InvalidateAll(infoPtr); return 0; @@ -1697,7 +1703,8 @@ TRACKBAR_StyleChanged (TRACKBAR_INFO *infoPtr, WPARAM wStyleType, if (wStyleType != GWL_STYLE) return 0; infoPtr->dwStyle = lpss->styleNew; - + TRACKBAR_RecalculateAll(infoPtr); + TRACKBAR_InvalidateAll(infoPtr); return 0; }

1 0

Francois Gouget : pdh: Update PdhAddEnglishCounterA/W() to match Windows 10 >= 2004.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 071292bedd888b4cb3c690b40e5bb04cac7b65ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=071292bedd888b4cb3c690b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 22 12:03:21 2021 +0200 pdh: Update PdhAddEnglishCounterA/W() to match Windows 10 >= 2004. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh_main.c | 6 ++++-- dlls/pdh/tests/pdh.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 73d4fef2a14..3840b9d0288 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -284,7 +284,8 @@ PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, { TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); - if (!query) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_ARGUMENT; + if (!query) return PDH_INVALID_HANDLE; return PdhAddCounterA( query, path, userdata, counter ); } @@ -296,7 +297,8 @@ PDH_STATUS WINAPI PdhAddEnglishCounterW( PDH_HQUERY query, LPCWSTR path, { TRACE("%p %s %lx %p\n", query, debugstr_w(path), userdata, counter); - if (!query) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_ARGUMENT; + if (!query) return PDH_INVALID_HANDLE; return PdhAddCounterW( query, path, userdata, counter ); } diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 71603f8c6ba..8165f32f50a 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -240,7 +240,8 @@ static void test_PdhAddEnglishCounterA( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterA failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterA( NULL, "\\System\\System Up Time", 0, &counter ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterA failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || broken(ret == PDH_INVALID_ARGUMENT) /* win10 <= 1909 */, + "PdhAddEnglishCounterA failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterA( query, NULL, 0, &counter ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterA failed 0x%08x\n", ret); @@ -281,7 +282,8 @@ static void test_PdhAddEnglishCounterW( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterW( NULL, system_uptime, 0, &counter ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || broken(ret == PDH_INVALID_ARGUMENT) /* win10 <= 1909 */, + "PdhAddEnglishCounterW failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterW( query, NULL, 0, &counter ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret);

1 0