October 2021 - Wine-Commits

Zhiyi Zhang : comctl32/status: Do not use theme metrics to compute height.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 8f6a4438b4d2b9d12c5eeccec9a136a80de0a8ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f6a4438b4d2b9d12c5eecce… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:24 2021 +0800 comctl32/status: Do not use theme metrics to compute height. Fix status test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 7bc9ec4386f..9078e4a70bc 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -102,7 +102,6 @@ static inline LPCSTR debugstr_t(LPCWSTR text, BOOL isW) static UINT STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) { - HTHEME theme; UINT height; TEXTMETRICW tm; int margin; @@ -111,21 +110,6 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) margin = (tm.tmInternalLeading ? tm.tmInternalLeading : 2); height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), infoPtr->minHeight) + infoPtr->verticalBorder; - if ((theme = GetWindowTheme(infoPtr->Self))) - { - /* Determine bar height from theme such that the content area is - * textHeight pixels large */ - HDC hdc = GetDC(infoPtr->Self); - RECT r; - - SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight)); - if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) - { - height = r.bottom - r.top; - } - ReleaseDC(infoPtr->Self, hdc); - } - TRACE(" textHeight=%d+%d, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height); return height; }

1 0

Zhiyi Zhang : comctl32/tests: Delete unused headers.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: f51a12f969796621b21d2982c8e1235a8cdcbff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51a12f969796621b21d2982… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:15 2021 +0800 comctl32/tests: Delete unused headers. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/rebar.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 462782a1b11..d0b201a8763 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -18,11 +18,9 @@ */ #include <assert.h> -#include <stdarg.h> #include <windows.h> #include <commctrl.h> -#include <uxtheme.h> #include "wine/heap.h" #include "wine/test.h"

1 0

Zhiyi Zhang : comctl32/rebar: Do not remove WS_BORDER when theming is on.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 106a5f43ec612b7d176513019ec1325e1c63b42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=106a5f43ec612b7d17651301… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:07 2021 +0800 comctl32/rebar: Do not remove WS_BORDER when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 17 +++------------ dlls/comctl32/tests/rebar.c | 50 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 84390bd0b52..6a065514e60 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2930,14 +2930,9 @@ REBAR_Create (REBAR_INFO *infoPtr, LPCREATESTRUCTW cs) cs->x, cs->y, cs->cx, cs->cy); } - TRACE("created!\n"); - - if (OpenThemeData (infoPtr->hwndSelf, themeClass)) - { - /* native seems to clear WS_BORDER when themed */ - infoPtr->dwStyle &= ~WS_BORDER; - } + OpenThemeData(infoPtr->hwndSelf, themeClass); + TRACE("created!\n"); return 0; } @@ -3508,8 +3503,6 @@ REBAR_StyleChanged (REBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpStyle) if (nType == GWL_STYLE) { infoPtr->orgStyle = infoPtr->dwStyle = lpStyle->styleNew; - if (GetWindowTheme (infoPtr->hwndSelf)) - infoPtr->dwStyle &= ~WS_BORDER; /* maybe it should be COMMON_STYLES like in toolbar */ if ((lpStyle->styleNew ^ lpStyle->styleOld) & CCS_VERT) REBAR_Layout(infoPtr); @@ -3522,11 +3515,7 @@ static LRESULT theme_changed (REBAR_INFO* infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); CloseThemeData (theme); - theme = OpenThemeData (infoPtr->hwndSelf, themeClass); - /* WS_BORDER disappears when theming is enabled and reappears when - * disabled... */ - infoPtr->dwStyle &= ~WS_BORDER; - infoPtr->dwStyle |= theme ? 0 : (infoPtr->orgStyle & WS_BORDER); + OpenThemeData(infoPtr->hwndSelf, themeClass); return 0; } diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 21b655b197f..462782a1b11 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -77,11 +77,11 @@ static void init_system_font_height(void) { system_font_height = tm.tmHeight; } -static HWND create_rebar_control(void) +static HWND create_rebar_control(DWORD style) { HWND hwnd; - hwnd = CreateWindowA(REBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, + hwnd = CreateWindowA(REBARCLASSNAMEA, NULL, style | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)17, GetModuleHandleA(NULL), NULL); ok(hwnd != NULL, "Failed to create Rebar\n"); @@ -499,7 +499,7 @@ static void test_layout(void) rbsize_results_init(); - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); check_sizes(); rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; @@ -559,7 +559,7 @@ static void test_layout(void) DestroyWindow(hRebar); - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); add_band_w(hRebar, "ABC", 70, 40, 100); add_band_w(hRebar, NULL, 40, 70, 100); add_band_w(hRebar, NULL, 170, 240, 100); @@ -602,7 +602,7 @@ static void test_layout(void) DestroyWindow(hRebar); /* VARHEIGHT resizing test on a horizontal rebar */ - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); SetWindowLongA(hRebar, GWL_STYLE, GetWindowLongA(hRebar, GWL_STYLE) | RBS_AUTOSIZE); check_sizes(); rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE; @@ -630,7 +630,7 @@ static void test_layout(void) DestroyWindow(hRebar); /* VARHEIGHT resizing on a vertical rebar */ - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); SetWindowLongA(hRebar, GWL_STYLE, GetWindowLongA(hRebar, GWL_STYLE) | CCS_VERT | RBS_AUTOSIZE); check_sizes(); rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE; @@ -661,7 +661,7 @@ static void test_layout(void) pImageList_Destroy(himl); /* One hidden band. */ - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_STYLE | RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; @@ -966,7 +966,7 @@ static void test_bandinfo(void) CHAR szABCD[] = "ABCD"; HWND hRebar; - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; if (!SendMessageA(hRebar, RB_INSERTBANDA, 0, (LPARAM)&rb)) @@ -1027,7 +1027,7 @@ static void test_colors(void) HWND hRebar; REBARBANDINFOA bi; - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); /* test default colors */ clr = SendMessageA(hRebar, RB_GETTEXTCOLOR, 0, 0); @@ -1106,7 +1106,7 @@ static void test_showband(void) REBARBANDINFOA rbi; BOOL ret; - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); /* no bands */ ret = SendMessageA(hRebar, RB_SHOWBAND, 0, TRUE); @@ -1135,7 +1135,7 @@ static void test_notification(void) MEASUREITEMSTRUCT mis; HWND rebar; - rebar = create_rebar_control(); + rebar = create_rebar_control(0); g_parent_measureitem = 0; SendMessageA(rebar, WM_MEASUREITEM, 0, (LPARAM)&mis); @@ -1144,6 +1144,33 @@ static void test_notification(void) DestroyWindow(rebar); } +static void test_style(void) +{ + STYLESTRUCT style_struct; + LONG style; + HWND hwnd; + RECT rect; + + /* WS_BORDER */ + hwnd = create_rebar_control(WS_BORDER); + ok(GetWindowLongW(hwnd, GWL_STYLE) & WS_BORDER, "Expected WS_BORDER.\n"); + + GetClientRect(hwnd, &rect); + SendMessageW(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(GetWindowLongW(hwnd, GWL_STYLE) & WS_BORDER, "Expected WS_BORDER.\n"); + + SendMessageW(hwnd, WM_THEMECHANGED, 0, 0); + style = GetWindowLongW(hwnd, GWL_STYLE); + ok(style & WS_BORDER, "Expected WS_BORDER.\n"); + + style_struct.styleOld = style; + style_struct.styleNew = style | WS_DLGFRAME; + SendMessageW(hwnd, WM_STYLECHANGED, (WPARAM)GWL_STYLE, (LPARAM)&style_struct); + ok(GetWindowLongW(hwnd, GWL_STYLE) & WS_BORDER, "Expected WS_BORDER.\n"); + + DestroyWindow(hwnd); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1176,6 +1203,7 @@ START_TEST(rebar) test_layout(); test_resize(); + test_style(); out: PostQuitMessage(0);

1 0

Eric Pouech : dbghelp: SymTagFunctionArgType's lexical parent is module, not SymTagFunctionType.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: dbcc714cef29d0d52dac9cd3b767e05ff1bd310d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbcc714cef29d0d52dac9cd3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:24 2021 +0200 dbghelp: SymTagFunctionArgType's lexical parent is module, not SymTagFunctionType. (as any other type) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/type.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 2fc5a7e5eca..474e76d52b6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -294,7 +294,6 @@ struct symt_function_arg_type { struct symt symt; struct symt* arg_type; - struct symt* container; }; struct symt_pointer diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 221dbe68f42..fc6ae3f7350 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -411,7 +411,6 @@ BOOL symt_add_function_signature_parameter(struct module* module, if (!arg) return FALSE; arg->symt.tag = SymTagFunctionArgType; arg->arg_type = param; - arg->container = &sig_type->symt; p = vector_add(&sig_type->vchildren, &module->pool); if (!p) return FALSE; /* FIXME we leak arg */ *p = &arg->symt; @@ -733,11 +732,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagThunk: X(DWORD) = symt_ptr2index(module, ((const struct symt_thunk*)type)->container); break; - case SymTagFunctionArgType: - X(DWORD) = symt_ptr2index(module, ((const struct symt_function_arg_type*)type)->container); - break; case SymTagUDT: case SymTagEnum: + case SymTagFunctionArgType: X(DWORD) = symt_ptr2index(module, &module->top->symt); break; default:

1 0

Eric Pouech : dbghelp: Silence FIXME when requesting SymTagExe lexical parent in SymGetTypeInfo().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 4bf83f21ca8407feb854a5fc105a5311e5144cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bf83f21ca8407feb854a5fc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:00:59 2021 +0200 dbghelp: Silence FIXME when requesting SymTagExe lexical parent in SymGetTypeInfo(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index ae601c0cda2..69b25bafef0 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -732,6 +732,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, default: FIXME("Unsupported sym-tag %s for get-lexical-parent\n", symt_get_tag_str(type->tag)); + /* fall through */ + case SymTagExe: return FALSE; } break;

1 0

Eric Pouech : dbghelp: Manage parent/child relationship between SymTagExe and SymTagCompiland.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 24a7de70a62f79f8642d7af248ce26d54fef0cf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a7de70a62f79f8642d7af2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:00:53 2021 +0200 dbghelp: Manage parent/child relationship between SymTagExe and SymTagCompiland. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/symbol.c | 4 ++++ dlls/dbghelp/type.c | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0587ce13914..2fc5a7e5eca 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -169,6 +169,7 @@ struct symt_block struct symt_module /* in fact any of .exe, .dll... */ { struct symt symt; /* module */ + struct vector vchildren; /* compilation units */ struct module* module; }; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e2fde00456a..091ea173305 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -191,6 +191,7 @@ struct symt_module* symt_new_module(struct module* module) { sym->symt.tag = SymTagExe; sym->module = module; + vector_init(&sym->vchildren, sizeof(struct symt*), 8); } return sym; } @@ -199,6 +200,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, ULONG_PTR address, unsigned src_idx) { struct symt_compiland* sym; + struct symt_compiland** p; TRACE_(dbghelp_symt)("Adding compiland symbol %s:%s\n", debugstr_w(module->modulename), source_get(module, src_idx)); @@ -210,6 +212,8 @@ struct symt_compiland* symt_new_compiland(struct module* module, sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); sym->user = NULL; + p = vector_add(&module->top->vchildren, &module->pool); + *p = sym; } return sym; } diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 91c334689ce..ae601c0cda2 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -549,6 +549,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, switch (type->tag) { + case SymTagExe: v = &((const struct symt_module*)type)->vchildren; break; case SymTagCompiland: v = &((const struct symt_compiland*)type)->vchildren; break; case SymTagUDT: v = &((const struct symt_udt*)type)->vchildren; break; case SymTagEnum: v = &((const struct symt_enum*)type)->vchildren; break; @@ -595,6 +596,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_CHILDRENCOUNT: switch (type->tag) { + case SymTagExe: + X(DWORD) = vector_length(&((const struct symt_module*)type)->vchildren); + break; case SymTagCompiland: X(DWORD) = vector_length(&((const struct symt_compiland*)type)->vchildren); break; @@ -703,6 +707,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_LEXICALPARENT: switch (type->tag) { + case SymTagCompiland: + X(DWORD) = symt_ptr2index(module, &((const struct symt_compiland*)type)->container->symt); + break; case SymTagBlock: X(DWORD) = symt_ptr2index(module, ((const struct symt_block*)type)->container); break;

1 0

Eric Pouech : dbghelp: Expose SymTagBlock's address and size in SymGetTypeInfo().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 11d8338f7ab36135f20c61164c225c8938f2b7c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d8338f7ab36135f20c6116… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:11 2021 +0200 dbghelp: Expose SymTagBlock's address and size in SymGetTypeInfo(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index e7c180f32d7..b9d90b000d7 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -141,6 +141,9 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) default: return FALSE; } break; + case SymTagBlock: + *addr = ((const struct symt_block*)type)->address; + break; case SymTagFunction: *addr = ((const struct symt_function*)type)->address; break; @@ -664,6 +667,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagFunction: X(DWORD64) = ((const struct symt_function*)type)->size; break; + case SymTagBlock: + X(DWORD64) = ((const struct symt_block*)type)->size; + break; case SymTagPointerType: X(DWORD64) = ((const struct symt_pointer*)type)->size; break;

1 0

Zhiyi Zhang : comctl32/rebar: Do not adjust non-client size when themed.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: a9165162dd6184840650711c13c0ddf06b520bfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9165162dd6184840650711c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:00 2021 +0800 comctl32/rebar: Do not adjust non-client size when themed. Fix rebar test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index af35008b692..84390bd0b52 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3207,19 +3207,13 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam) static inline LRESULT REBAR_NCCalcSize (const REBAR_INFO *infoPtr, RECT *rect) { - HTHEME theme; - if (infoPtr->dwStyle & WS_BORDER) { rect->left = min(rect->left + GetSystemMetrics(SM_CXEDGE), rect->right); rect->right = max(rect->right - GetSystemMetrics(SM_CXEDGE), rect->left); rect->top = min(rect->top + GetSystemMetrics(SM_CYEDGE), rect->bottom); rect->bottom = max(rect->bottom - GetSystemMetrics(SM_CYEDGE), rect->top); } - else if ((theme = GetWindowTheme (infoPtr->hwndSelf))) - { - /* FIXME: should use GetThemeInt */ - rect->top = min(rect->top + 1, rect->bottom); - } + TRACE("new client=(%s)\n", wine_dbgstr_rect(rect)); return 0; }

1 0

Zhiyi Zhang : comctl32/tests: Fix a treeview test failure when theming is on.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 0f2f195831ce078034bf070032b69e998709d07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f2f195831ce078034bf0700… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:33 2021 +0800 comctl32/tests: Fix a treeview test failure when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 02d914c249c..0d245cf9d15 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -27,12 +27,17 @@ #include "winuser.h" #include "winnls.h" #include "winreg.h" -#include "commctrl.h" +#include "commctrl.h" +#include "uxtheme.h" +#include "vsstyle.h" #include "wine/test.h" #include "v6util.h" #include "msg.h" +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static BOOL (WINAPI *pIsThemeBackgroundPartiallyTransparent)(HTHEME, int, int); + static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static const char *TEST_CALLBACK_TEXT = "callback_text"; @@ -2121,6 +2126,8 @@ static void test_TVS_SINGLEEXPAND(void) static void test_WM_PAINT(void) { + BOOL is_glyph_transparent; + HTHEME htheme; HWND hTree; COLORREF clr; LONG ret; @@ -2144,7 +2151,11 @@ static void test_WM_PAINT(void) ok(ret == 0, "got %d\n", ret); clr = GetPixel(hdc, 1, 1); - ok(clr == RGB(255, 0, 0) || broken(clr == RGB(0, 0, 0)) /* win98 */, + htheme = pGetWindowTheme(hTree); + is_glyph_transparent = htheme && pIsThemeBackgroundPartiallyTransparent(htheme, TVP_GLYPH, 0); + ok(clr == RGB(255, 0, 0) || broken(clr == RGB(0, 0, 0)) /* win98 */ + /* When theming is on and treeview glyphs are transparent, parent window needs to be repainted */ + || (is_glyph_transparent && clr == GetSysColor(COLOR_WINDOW)), "got 0x%x\n", clr); ReleaseDC(hMainWnd, hdc); @@ -2945,9 +2956,13 @@ static void test_right_click(void) static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + HMODULE hUxtheme = LoadLibraryA("uxtheme.dll"); + +#define X(module, f) p##f = (void*)GetProcAddress(module, #f); + X(hComCtl32, InitCommonControlsEx); -#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); - X(InitCommonControlsEx); + X(hUxtheme, GetWindowTheme); + X(hUxtheme, IsThemeBackgroundPartiallyTransparent); #undef X }

1 0

Conor McCarthy : vkd3d: Create and write descriptor sets for root signature unbounded ranges.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: vkd3d Branch: master Commit: 104626cc1d91d0a3568b8bc17ab782ebf062b858 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=104626cc1d91d0a3568b8bc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Oct 6 18:43:30 2021 +0200 vkd3d: Create and write descriptor sets for root signature unbounded ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 120 ++++++++++++++++++++++++------ libs/vkd3d/device.c | 114 ++++++++++++++++++++++++++++ libs/vkd3d/resource.c | 9 +++ libs/vkd3d/state.c | 181 +++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 40 +++++++++- tests/d3d12.c | 18 ++--- 6 files changed, 424 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=104626cc1d91d0a3568…

1 0