December 2021 - Wine-devel - list.winehq.org

[PATCH 7/9] comctl32/propsheet: Handle WM_ERASEBKGND in the property sheet page window procedure.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

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> --- 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); -- 2.32.0

1 0

[PATCH 6/9] comctl32/propsheet: Handle WM_CTLCOLORSTATIC in the property sheet page window procedure.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

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> --- 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); -- 2.32.0

1 0

[PATCH 5/9] comctl32/tests: Test WM_CTLCOLORSTATIC for themed property sheets.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

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> --- dlls/comctl32/tests/propsheet.c | 326 +++++++++++++++++++++++++++++++- 1 file changed, 324 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 3089454d18d..eaaa00efe97 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -20,18 +20,24 @@ #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> +#include <vsstyle.h> #include "msg.h" #include "resources.h" #include "wine/test.h" +#include "v6util.h" + static HWND parenthwnd; static HWND sheethwnd; static BOOL rtl; static LONG active_page = -1; +static BOOL is_v6, is_theme_active; + #define IDC_APPLY_BUTTON 12321 static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageA)(const PROPSHEETPAGEA *desc); @@ -39,6 +45,14 @@ static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageW)(const PROPSHEETPAGEW * static BOOL (WINAPI *pDestroyPropertySheetPage)(HPROPSHEETPAGE proppage); static INT_PTR (WINAPI *pPropertySheetA)(const PROPSHEETHEADERA *header); +static HRESULT (WINAPI *pCloseThemeData)(HTHEME); +static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); +static HRESULT (WINAPI *pGetThemePartSize)(HTHEME, HDC, int, int, RECT *, THEMESIZE, SIZE *); +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static BOOL (WINAPI *pIsThemeActive)(void); +static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); +static HTHEME (WINAPI *pOpenThemeData)(HWND, LPCWSTR); + static void detect_locale(void) { DWORD reading_layout; @@ -1180,7 +1194,284 @@ static void test_bad_control_class(void) DestroyWindow((HWND)ret); } -static void init_functions(void) +static BOOL handle_WM_CTLCOLORSTATIC; + +static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + static HWND child; + + switch(msg) + { + case WM_INITDIALOG: + sheethwnd = 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; + + case WM_CTLCOLORSTATIC: + return (INT_PTR)(handle_WM_CTLCOLORSTATIC ? GetSysColorBrush(COLOR_MENU) : 0); + + case WM_CLOSE: + DestroyWindow(child); + return FALSE; + + default: + return FALSE; + } +} + +static void test_WM_CTLCOLORSTATIC(void) +{ + HWND hdlg, child, parent, hwnd; + COLORREF color, old_color; + int mode, old_mode, count; + HBRUSH hbrush, hbrush2; + HPROPSHEETPAGE hpsp[1]; + PROPSHEETHEADERA psh; + HDC child_hdc, hdc; + LOGBRUSH log_brush; + PROPSHEETPAGEA psp; + ULONG_PTR dlgproc; + WNDCLASSA cls; + HTHEME theme; + DWORD error; + BITMAP bmp; + HRESULT hr; + POINT org; + SIZE size; + BOOL ret; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.hInstance = GetModuleHandleA(NULL); + U(psp).pszTemplate = "prop_page1"; + psp.pfnDlgProc = test_WM_CTLCOLORSTATIC_proc; + hpsp[0] = pCreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; + psh.dwFlags = PSH_MODELESS; + psh.pszCaption = "caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + + hdlg = (HWND)pPropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "Got invalid handle value %p.\n", hdlg); + flush_events(); + + child = GetDlgItem(sheethwnd, 100); + ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); + parent = GetParent(child); + ok(parent == sheethwnd, "Expected parent %p, got %p.\n", sheethwnd, parent); + ok(sheethwnd != hdlg, "Expected handles not equal.\n"); + + /* Test that page dialog procedure is unchanged */ + dlgproc = GetWindowLongPtrA(sheethwnd, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_WM_CTLCOLORSTATIC_proc, "Unexpected dlgproc %#lx.\n", dlgproc); + + child_hdc = GetDC(child); + old_mode = SetBkMode(child_hdc, OPAQUE); + ok(old_mode != 0, "SetBkMode failed.\n"); + old_color = SetBkColor(child_hdc, 0xaa5511); + ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + + /* Test that brush origin is at (0,0) */ + 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)); + + /* Test that theme dialog texture is enabled for comctl32 v6, even when theming is off */ + ret = pIsThemeDialogTextureEnabled(sheethwnd); + todo_wine_if(!is_v6) + ok(ret == is_v6, "Wrong theme dialog texture status.\n"); + + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + if (is_v6 && is_theme_active) + { + /* Test that brush origin is changed after WM_CTLCOLORSTATIC */ + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + todo_wine + ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); + + /* 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) + 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"); + + 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, + log_brush.lbStyle); + + memset(&bmp, 0, sizeof(bmp)); + count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); + 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)); + cls.lpfnWndProc = DefWindowProcA; + cls.hInstance = GetModuleHandleA(NULL); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszClassName = "TestClass"; + RegisterClassA(&cls); + + 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) + ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); + todo_wine_if(theme) + ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); + + pCloseThemeData(theme); + + /* Test that other controls besides static controls also get the same brush */ + hdc = GetDC(hwnd); + 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); + UnregisterClassA("TestClass", GetModuleHandleA(NULL)); + + /* Test disabling theme dialog texture should change the brush */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + 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); + + /* Test re-enabling theme dialog texture with ETDT_ENABLE doesn't change the brush*/ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(hbrush2 != hbrush) + ok(hbrush2 == hbrush, "Expected the same brush.\n"); + + /* Test ETDT_ENABLE | ETDT_USETABTEXTURE should change the brush */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE | ETDT_USETABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(hbrush2 == hbrush) + ok(hbrush2 != hbrush, "Expected a different brush.\n"); + + /* Test ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE should change the brush */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + /* ETDT_USEAEROWIZARDTABTEXTURE is supported only on Vista+ */ + if (LOBYTE(LOWORD(GetVersion())) < 6) + ok(hbrush2 == hbrush, "Expected the same brush.\n"); + else + todo_wine_if(hbrush2 == hbrush) + ok(hbrush2 != hbrush, "Expected a different brush.\n"); + + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_DISABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE | ETDT_USETABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + + /* Test that the page procedure should take precedence if WM_CTLCOLORSTATIC is handled */ + handle_WM_CTLCOLORSTATIC = TRUE; + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(hbrush == GetSysColorBrush(COLOR_MENU), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_MENU), hbrush); + handle_WM_CTLCOLORSTATIC = FALSE; + + /* Test that the brush is not a system object and has only one reference and shouldn't be freed */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ret = DeleteObject(hbrush); + ok(ret, "DeleteObject failed, error %u.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); + error = GetLastError(); + todo_wine + ok(!ret, "GetObjectA succeeded.\n"); + todo_wine + ok(error == ERROR_INVALID_PARAMETER, "Expected error %u, got %u.\n", + ERROR_INVALID_PARAMETER, error); + ret = DeleteObject(hbrush); + todo_wine + ok(!ret, "DeleteObject succeeded.\n"); + + /* Should still report the same brush handle after the brush handle was freed */ + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(hbrush2 == hbrush, "Expected the same brush.\n"); + + /* Test that WM_THEMECHANGED should recreate the brush */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + SendMessageW(sheethwnd, WM_THEMECHANGED, 0, 0); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(is_theme_active) + ok(hbrush2 != hbrush, "Expected a different brush.\n"); + ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); + todo_wine + ok(!ret, "GetObjectA succeeded.\n"); + } + else + { + /* Test that brush origin is at (0,0) */ + 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)); + + todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + 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) + ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); + } + color = SetBkColor(child_hdc, old_color); + ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", + GetSysColor(COLOR_BTNFACE), color); + + ReleaseDC(child, child_hdc); + DestroyWindow(hdlg); +} + +static void init_comctl32_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1192,8 +1483,26 @@ static void init_functions(void) #undef X } +static void init_uxtheme_functions(void) +{ + HMODULE uxtheme = LoadLibraryA("uxtheme.dll"); + +#define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); + X(CloseThemeData) + X(EnableThemeDialogTexture) + X(GetThemePartSize) + X(GetWindowTheme) + X(IsThemeActive) + X(IsThemeDialogTextureEnabled) + X(OpenThemeData) +#undef X +} + START_TEST(propsheet) { + ULONG_PTR ctx_cookie; + HANDLE ctx; + detect_locale(); if (rtl) { @@ -1203,7 +1512,9 @@ START_TEST(propsheet) SetProcessDefaultLayout(LAYOUT_RTL); } - init_functions(); + init_comctl32_functions(); + init_uxtheme_functions(); + is_theme_active = pIsThemeActive(); test_bad_control_class(); test_title(); @@ -1216,4 +1527,15 @@ START_TEST(propsheet) test_PSM_ADDPAGE(); test_PSM_INSERTPAGE(); test_CreatePropertySheetPage(); + test_WM_CTLCOLORSTATIC(); + + if (!load_v6_module(&ctx_cookie, &ctx)) + return; + + init_comctl32_functions(); + is_v6 = TRUE; + + test_WM_CTLCOLORSTATIC(); + + unload_v6_module(ctx_cookie, ctx); } -- 2.32.0

1 0

[PATCH 4/9] include: Add more EnableThemeDialogTexture() option flags.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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); -- 2.32.0

1 0

[PATCH 3/9] comctl32/tests: Add more WM_CTLCOLORSTATIC tests for static controls in a dialog.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

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> --- 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; -- 2.32.0

1 0

[PATCH 2/9] uxtheme/tests: Add DrawThemeParentBackground() tests.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

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> --- 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(); -- 2.32.0

1 0

[PATCH 1/2] include: Add namespaceapi.h file.
by Mohamad Al-Jaf 07 Dec '21

07 Dec '21

Required by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/Makefile.in | 1 + include/namespaceapi.h | 43 ++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 include/namespaceapi.h diff --git a/include/Makefile.in b/include/Makefile.in index de40421edcb..302e0bb2a73 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -526,6 +526,7 @@ SOURCES = \ mtxdm.h \ mulres.idl \ multimon.h \ + namespaceapi.h \ natupnp.idl \ nb30.h \ ncrypt.h \ diff --git a/include/namespaceapi.h b/include/namespaceapi.h new file mode 100644 index 00000000000..9447ee26a53 --- /dev/null +++ b/include/namespaceapi.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2021 Mohamad Al-Jaf + * + * 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 + */ + +#ifndef _NAMESPACEAPI_H_ +#define _NAMESPACEAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* ClosePrivateNamespace flags */ +#define PRIVATE_NAMESPACE_FLAG_DESTROY 0x00000001 + +/* CreateBoundaryDescriptorW flags */ +#define CREATE_BOUNDARY_DESCRIPTOR_ADD_APPCONTAINER_SID 0x01 + +BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); +BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); +void WINAPI DeleteBoundaryDescriptor(HANDLE); +HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); + +#ifdef __cplusplus +} +#endif + +#endif /* _NAMESPACEAPI_H_ */ \ No newline at end of file diff --git a/include/winbase.h b/include/winbase.h index 2f7287f12b6..0a0bfde9d10 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -241,6 +241,8 @@ typedef struct _SECURITY_ATTRIBUTES BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#include <namespaceapi.h> + #ifndef _FILETIME_ #define _FILETIME_ /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ -- 2.34.1

2 4

[PATCH v2] include: Add namespaceapi.h file.
by Mohamad Al-Jaf 07 Dec '21

07 Dec '21

Required by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Move CreateBoundaryDescriptorW flag to winnt.h (Thanks Jactry Zeng). - Add missing WINBASEAPI function type. --- include/Makefile.in | 1 + include/namespaceapi.h | 40 ++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 2 ++ include/winnt.h | 3 +++ 4 files changed, 46 insertions(+) create mode 100644 include/namespaceapi.h diff --git a/include/Makefile.in b/include/Makefile.in index de40421edcb..302e0bb2a73 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -526,6 +526,7 @@ SOURCES = \ mtxdm.h \ mulres.idl \ multimon.h \ + namespaceapi.h \ natupnp.idl \ nb30.h \ ncrypt.h \ diff --git a/include/namespaceapi.h b/include/namespaceapi.h new file mode 100644 index 00000000000..512e8d1d278 --- /dev/null +++ b/include/namespaceapi.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2021 Mohamad Al-Jaf + * + * 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 + */ + +#ifndef _NAMESPACEAPI_H_ +#define _NAMESPACEAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* ClosePrivateNamespace flags */ +#define PRIVATE_NAMESPACE_FLAG_DESTROY 0x00000001 + +WINBASEAPI BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); +WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); +WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); +WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); + +#ifdef __cplusplus +} +#endif + +#endif /* _NAMESPACEAPI_H_ */ \ No newline at end of file diff --git a/include/winbase.h b/include/winbase.h index 2f7287f12b6..0a0bfde9d10 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -241,6 +241,8 @@ typedef struct _SECURITY_ATTRIBUTES BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#include <namespaceapi.h> + #ifndef _FILETIME_ #define _FILETIME_ /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ diff --git a/include/winnt.h b/include/winnt.h index 2ab74ab123c..0e5aebe8be3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3748,6 +3748,9 @@ typedef struct _SID { } SID,*PISID; #endif /* !defined(SID_DEFINED) */ +/* CreateBoundaryDescriptorW flag */ +#define CREATE_BOUNDARY_DESCRIPTOR_ADD_APPCONTAINER_SID 0x01 + #define SID_REVISION (1) /* Current revision */ #define SID_MAX_SUB_AUTHORITIES (15) /* current max subauths */ #define SID_RECOMMENDED_SUB_AUTHORITIES (1) /* recommended subauths */ -- 2.34.1

1 0

[PATCH v2 2/2] server: Strip terminating '\0' from the registry key name.
by Dmitry Timoshkov 07 Dec '21

07 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 18 +++++++++++++++++- server/registry.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 74d82b85be4..024d9026785 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -457,6 +457,14 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -631,13 +639,21 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); diff --git a/server/registry.c b/server/registry.c index 00b8e47be03..d87bb4d2dae 100644 --- a/server/registry.c +++ b/server/registry.c @@ -479,6 +479,8 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + while (str->len && !str->str[str->len / sizeof(WCHAR) - 1]) str->len -= sizeof(WCHAR); + if (skip_root && str->len >= sizeof(root_name) && !memicmp_strW( str->str, root_name, sizeof(root_name) )) { str->str += ARRAY_SIZE( root_name ); -- 2.34.1

1 0

[PATCH v2 1/2] server: Terminating '\' in the registry root name is optional.
by Dmitry Timoshkov 07 Dec '21

07 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 2 -- server/registry.c | 26 +++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..74d82b85be4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -417,7 +417,6 @@ todo_wine pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); pNtClose( key ); pRtlFreeUnicodeString( &str ); @@ -569,7 +568,6 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); diff --git a/server/registry.c b/server/registry.c index b00abdbc004..00b8e47be03 100644 --- a/server/registry.c +++ b/server/registry.c @@ -127,7 +127,7 @@ static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between peri static struct timeout_user *save_timeout_user; /* saving timer */ static enum prefix_type { PREFIX_UNKNOWN, PREFIX_32BIT, PREFIX_64BIT } prefix_type; -static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; +static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y' }; static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; static const WCHAR symlink_value[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e'}; static const struct unicode_str symlink_str = { symlink_value, sizeof(symlink_value) }; @@ -411,7 +411,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) { static const WCHAR backslash = '\\'; struct key *key = (struct key *) obj; - data_size_t len = sizeof(root_name) - sizeof(WCHAR); + data_size_t len = sizeof(root_name); char *ret; if (key->flags & KEY_DELETED) @@ -431,7 +431,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } - memcpy( ret, root_name, sizeof(root_name) - sizeof(WCHAR) ); + memcpy( ret, root_name, sizeof(root_name) ); return (WCHAR *)ret; } @@ -483,6 +483,11 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) { str->str += ARRAY_SIZE( root_name ); str->len -= sizeof(root_name); + if (str->len && str->str[0] == '\\') + { + str->str++; + str->len -= sizeof(WCHAR); + } } } @@ -734,6 +739,11 @@ static struct key *follow_symlink( struct key *key, int iteration ) if (memicmp_strW( path.str, root_name, sizeof(root_name) )) return NULL; path.str += ARRAY_SIZE( root_name ); path.len -= sizeof(root_name); + if (path.len && path.str[0] == '\\') + { + path.str++; + path.len -= sizeof(WCHAR); + } key = root_key; token.str = NULL; @@ -2156,6 +2166,11 @@ DECL_HANDLER(create_key) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.len && name.str[0] == '\\') + { + name.str++; + name.len -= sizeof(WCHAR); + } } /* NOTE: no access rights are required from the parent handle to create a key */ @@ -2314,6 +2329,11 @@ DECL_HANDLER(load_registry) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.len && name.str[0] == '\\') + { + name.str++; + name.len -= sizeof(WCHAR); + } } if ((parent = get_parent_hkey_obj( objattr->rootdir ))) -- 2.34.1

1 0