wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Zhiyi Zhang : uxtheme: Do not hook DefDlgProc() for theming.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 9c9274990ee12cc990706c780d738b5d6b68b11e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c9274990ee12cc990706c78… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:13:19 2021 +0800 uxtheme: Do not hook DefDlgProc() for theming. Currently there is no need to hook DefDlgProc(). Tests show that dialog theming shouldn't be implemented in DefDlgProc(). Also fix a double free bug because WM_DESTROY in UXTHEME_DefDlgProc() calls CloseThemeData() even when the theme handle is not opened when handling WM_CREATE in UXTHEME_DefDlgProc(). The bug can be demonstrated by running comctl32/tests/propsheet.c tests with Light theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 9 ++----- dlls/comctl32/tests/static.c | 5 +--- dlls/user32/defdlg.c | 34 ++++++------------------ dlls/user32/hook.c | 1 - dlls/user32/user_private.h | 1 - dlls/uxtheme/Makefile.in | 1 - dlls/uxtheme/dialog.c | 59 ----------------------------------------- dlls/uxtheme/system.c | 1 - dlls/uxtheme/uxthemedll.h | 1 - include/winuser.h | 1 - 10 files changed, 11 insertions(+), 102 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 199b280879e..0b012df1cca 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1320,9 +1320,7 @@ static void test_WM_CTLCOLORSTATIC(void) todo_wine ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(pGetWindowTheme(hdlg) != NULL) ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) ok(pGetWindowTheme(sheethwnd) == NULL, "Expected NULL theme handle.\n"); memset(&cls, 0, sizeof(cls)); @@ -1336,18 +1334,15 @@ static void test_WM_CTLCOLORSTATIC(void) hwnd = CreateWindowA("TestClass", "test", WS_POPUP | WS_VISIBLE, 0, 0, 4, 4, 0, 0, 0, NULL); ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); theme = pOpenThemeData(hwnd, L"Tab"); - /* Light theme triggers a double free bug in uxtheme */ - todo_wine_if(!theme) ok(theme != NULL, "OpenThemeData failed.\n"); size.cx = 0; size.cy = 0; hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); - todo_wine_if(!theme) ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine_if(theme) + todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine_if(theme) + todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); pCloseThemeData(theme); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index b507cf1e02b..529396b3f0d 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -408,11 +408,11 @@ static void test_WM_CTLCOLORSTATIC(void) HWND parent, dialog, child; COLORREF color, old_color; HDC child_hdc, dialog_hdc; - BOOL ret, todo = FALSE; int mode, old_mode; HBRUSH brush; HRESULT hr; POINT org; + BOOL ret; struct { @@ -434,8 +434,6 @@ static void test_WM_CTLCOLORSTATIC(void) child = GetDlgItem(dialog, 100); ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - todo = !!pGetWindowTheme(dialog); - dialog_hdc = GetDC(dialog); child_hdc = GetDC(child); PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); @@ -447,7 +445,6 @@ static void test_WM_CTLCOLORSTATIC(void) ret = pIsThemeDialogTextureEnabled(dialog); ok(ret, "Expected theme dialog texture supported.\n"); - todo_wine_if(todo) ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 4f44a93cd49..81c7cb0f207 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -354,7 +354,10 @@ out: return dlgInfo; } -static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcA (USER32.@) + */ +LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -408,7 +411,10 @@ static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } -static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcW (USER32.@) + */ +LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -461,27 +467,3 @@ static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } - -LRESULT WINAPI USER_DefDlgProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) -{ - if (unicode) - return USER_DefDlgProcW( hwnd, msg, wParam, lParam ); - else - return USER_DefDlgProcA( hwnd, msg, wParam, lParam ); -} - -/*********************************************************************** - * DefDlgProcA (USER32.@) - */ -LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, FALSE ); -} - -/*********************************************************************** - * DefDlgProcW (USER32.@) - */ -LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, TRUE ); -} diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index f5b4c6ab8a1..159797020f2 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -83,7 +83,6 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); static struct user_api_hook original_user_api = { - USER_DefDlgProc, USER_ScrollBarDraw, USER_ScrollBarProc, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c2152900a9b..96704ac68ae 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -302,7 +302,6 @@ extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; #endif extern struct user_api_hook *user_api DECLSPEC_HIDDEN; -LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 933650f4261..01751d3243a 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = msimg32 C_SRCS = \ buffer.c \ - dialog.c \ draw.c \ main.c \ metric.c \ diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c deleted file mode 100644 index 776f54e1d31..00000000000 --- a/dlls/uxtheme/dialog.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Theming - Dialogs - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "uxthemedll.h" -#include "vssym32.h" -#include "wine/debug.h" - -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) -{ - HTHEME theme = GetWindowTheme ( hWnd ); - static const WCHAR themeClass[] = L"Window"; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - theme = OpenThemeData( hWnd, themeClass ); - return result; - - case WM_DESTROY: - CloseThemeData ( theme ); - SetWindowTheme( hWnd, NULL, NULL ); - OpenThemeData( hWnd, NULL ); - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - - default: - /* Call old proc */ - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - } - return 0; -} diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 37c484387ec..61a608e5962 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1245,7 +1245,6 @@ BOOL WINAPI ThemeHooksInstall(void) { struct user_api_hook hooks; - hooks.pDefDlgProc = UXTHEME_DefDlgProc; hooks.pScrollBarDraw = UXTHEME_ScrollBarDraw; hooks.pScrollBarWndProc = UXTHEME_ScrollbarWndProc; return RegisterUserApiHook(&hooks, &user_api); diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 67130774392..c43ad703884 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -106,7 +106,6 @@ extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..1d37bd44344 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4435,7 +4435,6 @@ struct SCROLL_TRACKING_INFO struct user_api_hook { - LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); void (WINAPI *pScrollBarDraw)(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL);

1 0

Zhiyi Zhang : comctl32/propsheet: Handle WM_ERASEBKGND in the property sheet page window procedure.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 7c5a62b4c50cea12e71425bceaa88e08f58a4af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5a62b4c50cea12e71425bc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:13:11 2021 +0800 comctl32/propsheet: Handle WM_ERASEBKGND in the property sheet page window procedure. Handle WM_ERASEBKGND in the property sheet page window procedure and use a pattern brush created from theme parts to fill background instead of calling DrawThemeBackground() directly. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/dialog.c | 38 ---------------- 2 files changed, 113 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4fe80241855..4c9b42e6ed7 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -63,6 +63,7 @@ #include "prsht.h" #include "comctl32.h" #include "uxtheme.h" +#include "vsstyle.h" #include "wine/debug.h" @@ -140,6 +141,7 @@ typedef struct */ static const WCHAR PropSheetInfoStr[] = L"PropertySheetInfo"; +static const WCHAR PropSheetPageBackgroundBrush[] = L"PropSheetPageBackgroundBrush"; #define PSP_INTERNAL_UNICODE 0x80000000 @@ -1196,16 +1198,107 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +static HBRUSH get_propsheet_background_brush(HWND hwnd) +{ + HBITMAP bitmap, old_bitmap; + HDC hdc, hdc_screen; + HBRUSH brush; + HTHEME theme; + HRESULT hr; + RECT rect; + SIZE size; + + brush = GetPropW(hwnd, PropSheetPageBackgroundBrush); + if (brush) + return brush; + + theme = OpenThemeData(NULL, L"Tab"); + if (!theme) + return NULL; + + hr = GetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); + if (FAILED(hr)) + { + size.cx = 10; + size.cy = 600; + } + + hdc_screen = GetDC(NULL); + hdc = CreateCompatibleDC(hdc_screen); + bitmap = CreateCompatibleBitmap(hdc_screen, size.cx, size.cy); + old_bitmap = SelectObject(hdc, bitmap); + + SetRect(&rect, 0, 0, size.cx, size.cy); + /* FIXME: XP draws the tab body bitmap directly without transparency even if there is */ + FillRect(hdc, &rect, GetSysColorBrush(COLOR_3DFACE)); + hr = DrawThemeBackground(theme, hdc, TABP_BODY, 0, &rect, NULL); + if (SUCCEEDED(hr)) + { + brush = CreatePatternBrush(bitmap); + SetPropW(hwnd, PropSheetPageBackgroundBrush, brush); + } + + SelectObject(hdc, old_bitmap); + DeleteDC(hdc); + ReleaseDC(NULL, hdc_screen); + CloseThemeData(theme); + return brush; +} + /* Subclassing window procedure for theming dialogs in property sheet pages */ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, UINT_PTR id, DWORD_PTR ref) { + POINT org, old_org; + LOGBRUSH logbrush; WNDPROC dlgproc; + HBRUSH brush; LRESULT lr; + RECT rect; HDC hdc; switch (msg) { + case WM_THEMECHANGED: + { + brush = GetPropW(hwnd, PropSheetPageBackgroundBrush); + if (brush) + { + RemovePropW(hwnd, PropSheetPageBackgroundBrush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } + InvalidateRect(hwnd, NULL, TRUE); + break; + } + case WM_ERASEBKGND: + { + if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) + break; + + dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + if (lr) + return lr; + + brush = get_propsheet_background_brush(hwnd); + if (!brush) + break; + + /* Using FillRect() to draw background could introduce a tiling effect if the destination + * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is + * visible on property sheet pages if system DPI is set to 192. However, the same bug also + * exists on XP and explains why vista+ don't use gradient tab body backgound anymore */ + hdc = (HDC)wp; + GetViewportOrgEx(hdc, &org); + SetBrushOrgEx(hdc, org.x, org.y, &old_org); + GetClientRect(hwnd, &rect); + FillRect(hdc, &rect, brush); + SetBrushOrgEx(hdc, old_org.x, old_org.y, NULL); + return TRUE; + } + case WM_CTLCOLORSTATIC: { if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) @@ -2385,6 +2478,8 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); PropPageInfo* oldPages; + LOGBRUSH logbrush; + HBRUSH brush; TRACE("index %d, hpage %p\n", index, hpage); if (!psInfo) { @@ -2445,6 +2540,14 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, else { RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + brush = GetPropW(psInfo->proppage[index].hwndPage, PropSheetPageBackgroundBrush); + if (brush) + { + RemovePropW(psInfo->proppage[index].hwndPage, PropSheetPageBackgroundBrush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } } /* Destroy page dialog window */ @@ -2743,6 +2846,8 @@ static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE page, const PropSheetInfo* psIn */ static void PROPSHEET_CleanUp(HWND hwndDlg) { + LOGBRUSH logbrush; + HBRUSH brush; int i; PropSheetInfo* psInfo = RemovePropW(hwndDlg, PropSheetInfoStr); @@ -2766,6 +2871,14 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) else { RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + brush = GetPropW(psInfo->proppage[i].hwndPage, PropSheetPageBackgroundBrush); + if (brush) + { + RemovePropW(psInfo->proppage[i].hwndPage, PropSheetPageBackgroundBrush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } } if(psInfo->proppage[i].hwndPage) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index bbfdaba639b..776f54e1d31 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -36,9 +36,6 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa { HTHEME theme = GetWindowTheme ( hWnd ); static const WCHAR themeClass[] = L"Window"; - BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); - BOOL doTheming = themingActive && (theme != NULL); - HRESULT hr = E_FAIL; LRESULT result; switch (msg) @@ -54,41 +51,6 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa OpenThemeData( hWnd, NULL ); return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - case WM_THEMECHANGED: - CloseThemeData ( theme ); - OpenThemeData( hWnd, themeClass ); - InvalidateRect( hWnd, NULL, TRUE ); - return 0; - - case WM_ERASEBKGND: - if (!doTheming) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - { - RECT rc; - WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - if (!CallWindowProcW(dlgp, hWnd, msg, wParam, lParam)) - { - /* Draw background*/ - GetClientRect (hWnd, &rc); - if (IsThemePartDefined (theme, WP_DIALOG, 0)) - /* Although there is a theme for the WINDOW class/DIALOG part, - * but I[res] haven't seen Windows using it yet... Even when - * dialog theming is activated, the good ol' BTNFACE - * background seems to be used. */ -#if 0 - DrawThemeBackground (theme, (HDC)wParam, WP_DIALOG, 0, &rc, - NULL); -#endif - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - /* We might have gotten a TAB theme class, so check if we can draw as a tab page */ - else if (IsThemePartDefined(theme, TABP_BODY, 0)) - hr = DrawThemeBackground(theme, (HDC)wParam, TABP_BODY, 0, &rc, NULL); - - if (FAILED(hr)) - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - } - return 1; - } - default: /* Call old proc */ return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode);

1 0

Zhiyi Zhang : comctl32/propsheet: Handle WM_CTLCOLORSTATIC in the property sheet page window procedure.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: b1ccad4b5cb0ec763b046ad2f2739c95dc42c7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ccad4b5cb0ec763b046ad2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:13:03 2021 +0800 comctl32/propsheet: Handle WM_CTLCOLORSTATIC in the property sheet page window procedure. Move themed WM_CTLCOLORSTATIC handling from UXTHEME_DefDlgProc() to the property sheet page window procedure. Fix a regression from 2f1bbd8 that makes the static controls in file open dialog to have black background when using some themes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51987 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/propsheet.c | 12 +++--------- dlls/comctl32/tests/static.c | 5 ----- dlls/uxtheme/dialog.c | 28 --------------------------- 4 files changed, 45 insertions(+), 42 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 556d63f2c75..4fe80241855 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1196,6 +1196,36 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +/* Subclassing window procedure for theming dialogs in property sheet pages */ +static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + UINT_PTR id, DWORD_PTR ref) +{ + WNDPROC dlgproc; + LRESULT lr; + HDC hdc; + + switch (msg) + { + case WM_CTLCOLORSTATIC: + { + if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) + break; + + dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + if (lr) + return lr; + + hdc = (HDC)wp; + SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); + SetBkMode(hdc, TRANSPARENT); + return (LRESULT)GetStockObject(NULL_BRUSH); + } + } + + return DefSubclassProc(hwnd, msg, wp, lp); +} + /* * Get the size of an in-memory Template * @@ -1467,6 +1497,10 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, (DWORD_PTR)ppshpage); } + else + { + SetWindowSubclass(hwndPage, PROPSHEET_ThemedSubclassProc, 1, (DWORD_PTR)ppshpage); + } if (!(psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)) EnableThemeDialogTexture (hwndPage, ETDT_ENABLETAB); @@ -2408,6 +2442,10 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_WizardSubclassProc, 1); } + else + { + RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + } /* Destroy page dialog window */ DestroyWindow(psInfo->proppage[index].hwndPage); @@ -2725,6 +2763,10 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_WizardSubclassProc, 1); } + else + { + RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + } if(psInfo->proppage[i].hwndPage) DestroyWindow(psInfo->proppage[i].hwndPage); diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index eaaa00efe97..199b280879e 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1298,13 +1298,11 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that device context is set to transparent after WM_CTLCOLORSTATIC */ mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); /* Test that the brush is a pattern brush created from the tab body bitmap in the theme */ - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(hbrush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + todo_wine_if(is_theme_active) ok(hbrush != GetStockObject(NULL_BRUSH), "Expected a different brush.\n"); hbrush2 = SelectObject(child_hdc, GetSysColorBrush(COLOR_BTNFACE)); ok(hbrush2 != hbrush, "Expected a different brush.\n"); @@ -1312,7 +1310,6 @@ static void test_WM_CTLCOLORSTATIC(void) memset(&log_brush, 0, sizeof(log_brush)); count = GetObjectA(hbrush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); todo_wine ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, @@ -1360,10 +1357,8 @@ static void test_WM_CTLCOLORSTATIC(void) old_mode = SetBkMode(hdc, OPAQUE); ok(old_mode != 0, "SetBkMode failed.\n"); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) ok(hbrush2 == hbrush, "Expected the same brush.\n"); mode = SetBkMode(hdc, old_mode); - todo_wine ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); @@ -1374,7 +1369,6 @@ static void test_WM_CTLCOLORSTATIC(void) hr = pEnableThemeDialogTexture(sheethwnd, ETDT_DISABLE); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(hbrush2 != hbrush, "Expected a different brush.\n"); ok(hbrush2 == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), hbrush2); @@ -1456,11 +1450,11 @@ static void test_WM_CTLCOLORSTATIC(void) ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + todo_wine_if(is_theme_active) ok(hbrush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), hbrush); mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + todo_wine_if(is_theme_active) ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); } color = SetBkColor(child_hdc, old_color); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index ce21e03df3c..b507cf1e02b 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -42,7 +42,6 @@ static int g_nReceivedColorStatic; static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); static HTHEME (WINAPI *pGetWindowTheme)(HWND); -static BOOL (WINAPI *pIsThemeActive)(void); static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); /* try to make sure pending X events have been processed before continuing */ @@ -452,14 +451,12 @@ static void test_WM_CTLCOLORSTATIC(void) ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(todo) ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), brush); color = SetBkColor(child_hdc, old_color); ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", GetSysColor(COLOR_BTNFACE), color); mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(todo) ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); color = GetPixel(dialog_hdc, 40, 40); ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); @@ -475,7 +472,6 @@ static void test_WM_CTLCOLORSTATIC(void) ok(ret, "Expected theme dialog texture enabled.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(pIsThemeActive()) ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), brush); @@ -497,7 +493,6 @@ static void init_functions(void) #define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); X(EnableThemeDialogTexture) X(GetWindowTheme) - X(IsThemeActive) X(IsThemeDialogTextureEnabled) #undef X } diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index d0055e013a0..bbfdaba639b 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -89,34 +89,6 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa return 1; } - case WM_CTLCOLORSTATIC: - if (!doTheming) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - { - WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - LRESULT result = CallWindowProcW(dlgp, hWnd, msg, wParam, lParam); - if (!result) - { - /* Override defaults with more suitable values when themed */ - HDC controlDC = (HDC)wParam; - HWND controlWnd = (HWND)lParam; - WCHAR controlClass[32]; - - GetClassNameW (controlWnd, controlClass, ARRAY_SIZE(controlClass)); - if (lstrcmpiW (controlClass, WC_STATICW) == 0) - { - SetBkColor(controlDC, GetSysColor(COLOR_BTNFACE)); - SetBkMode (controlDC, TRANSPARENT); - - /* Return NULL brush since we painted the BG already */ - return (LRESULT)GetStockObject (NULL_BRUSH); - } - else - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - - } - return result; - } - default: /* Call old proc */ return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode);

1 0

Zhiyi Zhang : comctl32/tests: Test WM_CTLCOLORSTATIC for themed property sheets.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: ee1b19aa161b9b582b40ca7cf0f648210181ad6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee1b19aa161b9b582b40ca7c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:55 2021 +0800 comctl32/tests: Test WM_CTLCOLORSTATIC for themed property sheets. These tests show that it's the themed property sheet page window procedure that sets device contexts transparent and return a pattern brush created from the tab body part in a theme. Combined with test_WM_CTLCOLORSTATIC() in dlls/comctl32/tests/static.c, we can conclude that UXTHEME_DefDlgProc() shouldn't handle WM_CTLCOLORSTATIC. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 326 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 324 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee1b19aa161b9b582b40…

1 0

Zhiyi Zhang : include: Add more EnableThemeDialogTexture() option flags.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 15eef4c8f7fad3f8df5f1b5fb42999e53cbcd6b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15eef4c8f7fad3f8df5f1b5f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:43 2021 +0800 include: Add more EnableThemeDialogTexture() option flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uxtheme.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index 384c3655b41..b44e06de611 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -96,7 +96,10 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,RECT*, #define ETDT_DISABLE 0x00000001 #define ETDT_ENABLE 0x00000002 #define ETDT_USETABTEXTURE 0x00000004 +#define ETDT_USEAEROWIZARDTABTEXTURE 0x00000008 #define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE) +#define ETDT_ENABLEAEROWIZARDTAB (ETDT_ENABLE|ETDT_USEAEROWIZARDTABTEXTURE) +#define ETDT_VALIDBITS (ETDT_DISABLE|ETDT_ENABLE|ETDT_USETABTEXTURE|ETDT_USEAEROWIZARDTABTEXTURE) HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD); HRESULT WINAPI EnableTheming(BOOL);

1 0

Zhiyi Zhang : comctl32/tests: Add more WM_CTLCOLORSTATIC tests for static controls in a dialog.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: fa1294faa64cdfca2d4f7bff5ece3ce513c6d62a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1294faa64cdfca2d4f7bff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:34 2021 +0800 comctl32/tests: Add more WM_CTLCOLORSTATIC tests for static controls in a dialog. Mostly to test that even when theme texture is enabled for a dialog, the default dialog procedure still returns the stock COLOR_BTNFACE brush in response to WM_CTLCOLORSTATIC. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 61 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 99738f7b513..ce21e03df3c 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -40,6 +40,11 @@ static HWND hMainWnd; static int g_nReceivedColorStatic; +static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static BOOL (WINAPI *pIsThemeActive)(void); +static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -385,7 +390,7 @@ static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM switch (msg) { case WM_INITDIALOG: - child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, hwnd, (HMENU)100, 0, NULL); ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); return FALSE; @@ -401,14 +406,14 @@ static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM static void test_WM_CTLCOLORSTATIC(void) { - HTHEME (WINAPI *pGetWindowTheme)(HTHEME) = NULL; HWND parent, dialog, child; COLORREF color, old_color; HDC child_hdc, dialog_hdc; + BOOL ret, todo = FALSE; int mode, old_mode; - BOOL todo = FALSE; - HMODULE uxtheme; HBRUSH brush; + HRESULT hr; + POINT org; struct { @@ -430,13 +435,7 @@ static void test_WM_CTLCOLORSTATIC(void) child = GetDlgItem(dialog, 100); ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - uxtheme = LoadLibraryA("uxtheme.dll"); - if (uxtheme) - { - pGetWindowTheme = (void*)GetProcAddress(uxtheme, "GetWindowTheme"); - if (pGetWindowTheme) - todo = !!pGetWindowTheme(dialog); - } + todo = !!pGetWindowTheme(dialog); dialog_hdc = GetDC(dialog); child_hdc = GetDC(child); @@ -447,6 +446,11 @@ static void test_WM_CTLCOLORSTATIC(void) old_color = SetBkColor(child_hdc, 0xaa5511); ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + ret = pIsThemeDialogTextureEnabled(dialog); + ok(ret, "Expected theme dialog texture supported.\n"); + todo_wine_if(todo) + ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); todo_wine_if(todo) ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", @@ -460,11 +464,42 @@ static void test_WM_CTLCOLORSTATIC(void) color = GetPixel(dialog_hdc, 40, 40); ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); + /* Test that EnableThemeDialogTexture() doesn't make WM_CTLCOLORSTATIC return a different brush */ + hr = pEnableThemeDialogTexture(dialog, ETDT_DISABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ret = pIsThemeDialogTextureEnabled(dialog); + ok(!ret, "Expected theme dialog texture disabled.\n"); + hr = pEnableThemeDialogTexture(dialog, ETDT_ENABLETAB); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ret = pIsThemeDialogTextureEnabled(dialog); + ok(ret, "Expected theme dialog texture enabled.\n"); + + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(pIsThemeActive()) + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush); + + /* Test that WM_CTLCOLORSTATIC doesn't change brush origin */ + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + ReleaseDC(child, child_hdc); ReleaseDC(dialog, dialog_hdc); EndDialog(dialog, 0); DestroyWindow(parent); - FreeLibrary(uxtheme); +} + +static void init_functions(void) +{ + HMODULE uxtheme = LoadLibraryA("uxtheme.dll"); + +#define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); + X(EnableThemeDialogTexture) + X(GetWindowTheme) + X(IsThemeActive) + X(IsThemeDialogTextureEnabled) +#undef X } START_TEST(static) @@ -477,6 +512,8 @@ START_TEST(static) if (!load_v6_module(&ctx_cookie, &hCtx)) return; + init_functions(); + wndclass.cbSize = sizeof(wndclass); wndclass.style = CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = WndProc;

1 0

Zhiyi Zhang : uxtheme/tests: Add DrawThemeParentBackground() tests.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: f685eda9085ae14761124983d1e1b3030e542128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f685eda9085ae14761124983… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:27 2021 +0800 uxtheme/tests: Add DrawThemeParentBackground() tests. Test that DrawThemeParentBackground() always send WM_ERASEBKGND and WM_PRINTCLIENT on success, which can be used to indicate if DrawThemeParentBackground() is called. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 10857115061..b085e639784 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1438,6 +1438,100 @@ done: DestroyWindow(hwnd); } +static const struct message DrawThemeParentBackground_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_PRINTCLIENT, sent | lparam, 0, PRF_CLIENT}, + {0} +}; + +static LRESULT WINAPI test_DrawThemeParentBackground_proc(HWND hwnd, UINT message, WPARAM wp, + LPARAM lp) +{ + static LONG defwndproc_counter; + struct message msg = {0}; + LRESULT lr; + POINT org; + BOOL ret; + + switch (message) + { + /* Test that DrawThemeParentBackground() doesn't change brush origins */ + case WM_ERASEBKGND: + case WM_PRINTCLIENT: + ret = GetBrushOrgEx((HDC)wp, &org); + ok(ret, "GetBrushOrgEx failed, error %d.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + break; + + default: + break; + } + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wp; + msg.lParam = lp; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + + InterlockedIncrement(&defwndproc_counter); + lr = DefWindowProcA(hwnd, message, wp, lp); + InterlockedDecrement(&defwndproc_counter); + return lr; +} + +static void test_DrawThemeParentBackground(void) +{ + HWND child, parent; + WNDCLASSA cls; + HRESULT hr; + POINT org; + RECT rect; + BOOL ret; + HDC hdc; + + memset(&cls, 0, sizeof(cls)); + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpfnWndProc = test_DrawThemeParentBackground_proc; + cls.lpszClassName = "TestDrawThemeParentBackgroundClass"; + RegisterClassA(&cls); + + parent = CreateWindowA("TestDrawThemeParentBackgroundClass", "parent", WS_POPUP | WS_VISIBLE, 0, + 0, 100, 100, 0, 0, 0, 0); + ok(parent != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, parent, 0, 0, + NULL); + ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + hdc = GetDC(child); + ret = GetBrushOrgEx(hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %d.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + + hr = DrawThemeParentBackground(child, hdc, NULL); + ok(SUCCEEDED(hr), "DrawThemeParentBackground failed, hr %#x.\n", hr); + ok_sequence(sequences, PARENT_SEQ_INDEX, DrawThemeParentBackground_seq, + "DrawThemeParentBackground parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + GetClientRect(child, &rect); + hr = DrawThemeParentBackground(child, hdc, &rect); + ok(SUCCEEDED(hr), "DrawThemeParentBackground failed, hr %#x.\n", hr); + ok_sequence(sequences, PARENT_SEQ_INDEX, DrawThemeParentBackground_seq, + "DrawThemeParentBackground parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ReleaseDC(child, hdc); + DestroyWindow(parent); + UnregisterClassA("TestDrawThemeParentBackgroundClass", GetModuleHandleA(0)); +} + START_TEST(system) { init_funcs(); @@ -1459,6 +1553,7 @@ START_TEST(system) test_buffered_paint(); test_GetThemeIntList(); test_GetThemeTransitionDuration(); + test_DrawThemeParentBackground(); /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming();

1 0

Zhiyi Zhang : gdi32/tests: Test deleting the bitmap used for pattern brush creation.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 1febcf692f820880b85cbc23c5e1b2370cc4e390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1febcf692f820880b85cbc23… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:16 2021 +0800 gdi32/tests: Test deleting the bitmap used for pattern brush creation. Test that the bitmap for pattern brush creation can be deleted after CreatePatternBrush() and the created brush will still function normally. However, the bitmap object can not be retrieved from LOGBRUSH.lbHatch if the bitmap is deleted. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/brush.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index f04ee22ab6d..0841eb2f2e1 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -120,9 +120,14 @@ static void test_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD) + 32 * 32 / 8]; BITMAPINFO *info = (BITMAPINFO *)buffer; - HBRUSH brush; - HBITMAP bitmap; + HBITMAP bitmap, bitmap2, old_bitmap; + HBRUSH brush, brush2; + HDC hdc, hdc_screen; + COLORREF color; + BOOL result; LOGBRUSH br; + BITMAP bm; + RECT rect; INT ret; void *bits; DIBSECTION dib; @@ -269,6 +274,64 @@ static void test_pattern_brush(void) ok( !brush, "CreatePatternBrush succeeded\n" ); GlobalFree( mem ); + + /* Test deleting bitmap after brush creation */ + /* Create hdc and bitmaps */ + hdc_screen = GetDC( NULL ); + hdc = CreateCompatibleDC( hdc_screen ); + bitmap = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + bitmap2 = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + + /* Fill the first bitmap with 0xff5511 */ + old_bitmap = SelectObject( hdc, bitmap ); + SetRect( &rect, 0, 0, 16, 16 ); + brush = CreateSolidBrush( 0xff5511 ); + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + DeleteObject( brush ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + + /* Create a pattern brush with the first bitmap filled with 0xff5511 */ + brush = CreatePatternBrush( bitmap ); + ok( brush != NULL, "CreatePatternBrush failed, error %u.\n", GetLastError() ); + + /* Delete the first bitmap used for pattern brush creation */ + SelectObject( hdc, bitmap2 ); + DeleteObject( bitmap ); + + memset( &br, 0, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + + /* The first bitmap is now invalid */ + memset( &bm, 0, sizeof (bm)); + ret = GetObjectW( bitmap, sizeof(bm), &bm ); + ok( !ret, "wrong size %u\n", ret ); + + /* Fill hdc with 0xabcdef */ + brush2 = CreateSolidBrush( 0xabcdef ); + result = FillRect( hdc, &rect, brush2 ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xabcdef, "Expected color %#x, got %#x.\n", 0xabcdef, color ); + DeleteObject( brush2 ); + + /* Fill hdc with the brush created with the deleted bitmap */ + /* FillRect() succeeds and hdc is filled with the deleted bitmap content */ + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + DeleteObject( brush ); + + SelectObject( hdc, old_bitmap ); + DeleteObject( bitmap2 ); + DeleteDC( hdc ); + ReleaseDC( NULL, hdc_screen ); } static void test_palette_brush(void)

1 0

Florian Will : dsound: Skip resampling/mixing inaudible buffers.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 835dfaab023175028161974c5cd8585b77df101c URL: https://source.winehq.org/git/wine.git/?a=commit;h=835dfaab023175028161974c… Author: Florian Will <florian.will(a)gmail.com> Date: Mon Dec 6 13:08:24 2021 -0600 dsound: Skip resampling/mixing inaudible buffers. In some situations, "ZUSI 3" has a lot of secondary buffers in the PLAYING state, but most of these buffers have a really low volume, so these buffers are multiplied by 0 before mixing (and possibly after resampling). There can be hundreds of inaudible buffers at the same time. In these situations, the dsound mixthread is unable to mix fast enough, resulting in sound stuttering and generally poor performance. To resolve this performance issue, skip the mixing (and possibly resampling) step for all inaudible secondary buffers. Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 11 +++++++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 18 +++++++++++++----- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index c595b19dd63..9084ccd9928 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1197,6 +1197,17 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) TRACE("(%p) released\n", This); } +BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) +{ + UINT i; + for (i = 0; i < This->device->pwfx->nChannels; i++) { + if (This->volpan.dwTotalAmpFactor[i] != 0) + return TRUE; + } + + return FALSE; +} + HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 9ec96504a50..18dc369db5c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -193,6 +193,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( IDirectSoundBufferImpl **ppdsb, IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; +BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; extern const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; extern const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; extern const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index e9d8a6e3cdd..d28cc8dc5aa 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -290,6 +290,9 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count) UINT committed_samples = 0; DWORD channel, i; + if (!secondarybuffer_is_audible(dsb)) + return count; + if(dsb->use_committed) { committed_samples = (dsb->writelead - dsb->committed_mixpos) / istride; committed_samples = committed_samples <= count ? committed_samples : count; @@ -329,6 +332,11 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * len += fir_cachesize; len *= sizeof(float); + *freqAccNum = freqAcc_end % dsb->freqAdjustDen; + + if (!secondarybuffer_is_audible(dsb)) + return max_ipos; + if (!dsb->device->cp_buffer) { dsb->device->cp_buffer = HeapAlloc(GetProcessHeap(), 0, len); dsb->device->cp_buffer_len = len; @@ -386,8 +394,6 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * } } - *freqAccNum = freqAcc_end % dsb->freqAdjustDen; - return max_ipos; } @@ -535,10 +541,12 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DSOUND_MixToTemporary(dsb, frames); ibuf = dsb->device->tmp_buffer; - /* Apply volume if needed */ - DSOUND_MixerVol(dsb, frames); + if (secondarybuffer_is_audible(dsb)) { + /* Apply volume if needed */ + DSOUND_MixerVol(dsb, frames); - mixieee32(ibuf, mix_buffer, frames * dsb->device->pwfx->nChannels); + mixieee32(ibuf, mix_buffer, frames * dsb->device->pwfx->nChannels); + } /* check for notification positions */ if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY &&

1 0

Jactry Zeng : include: Add some COM+ error codes.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 17a0f2c53a93d00c98860a0d38c89364c141e6ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=17a0f2c53a93d00c98860a0d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Dec 2 02:38:46 2021 -0600 include: Add some COM+ error codes. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 377c61e724b..f412989a6a4 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3040,6 +3040,21 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define CO_E_DECODEFAILED _HRESULT_TYPEDEF_(0x8004021A) #define CO_E_ACNOTINITIALIZED _HRESULT_TYPEDEF_(0x8004021B) +#define CONTEXT_S_FIRST _HRESULT_TYPEDEF_(0x0004e000) +#define CONTEXT_S_LAST _HRESULT_TYPEDEF_(0x0004e02f) +#define CONTEXT_E_FIRST _HRESULT_TYPEDEF_(0x8004e000) +#define CONTEXT_E_ABORTED _HRESULT_TYPEDEF_(0x8004e002) +#define CONTEXT_E_ABORTING _HRESULT_TYPEDEF_(0x8004e003) +#define CONTEXT_E_NOCONTEXT _HRESULT_TYPEDEF_(0x8004e004) +#define CONTEXT_E_WOULD_DEADLOCK _HRESULT_TYPEDEF_(0x8004e005) +#define CONTEXT_E_SYNCH_TIMEOUT _HRESULT_TYPEDEF_(0x8004e006) +#define CONTEXT_E_OLDREF _HRESULT_TYPEDEF_(0x8004e007) +#define CONTEXT_E_ROLENOTFOUND _HRESULT_TYPEDEF_(0x8004e00c) +#define CONTEXT_E_TMNOTAVAILABLE _HRESULT_TYPEDEF_(0x8004e00f) +#define CONTEXT_E_NOJIT _HRESULT_TYPEDEF_(0x8004e026) +#define CONTEXT_E_NOTRANSACTION _HRESULT_TYPEDEF_(0x8004e027) +#define CONTEXT_E_LAST _HRESULT_TYPEDEF_(0x8004e02f) + /* Task Scheduler Service Error Codes */ #define SCHED_S_TASK_READY _HRESULT_TYPEDEF_(0x00041300) #define SCHED_S_TASK_RUNNING _HRESULT_TYPEDEF_(0x00041301)

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021