- Wine-Devel - list.winehq.org

[PATCH v2] mshtml: Implement HTMLAnchorElement_get_pathname().
by Hans Leidekker Nov. 5, 2021

Nov. 5, 2021

v2: Keep leading slash and use GetPathname(). I added some more tests which show that for some protocols IE will prepend a slash if it's not there in the URL. I left those as todo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlanchor.c | 11 +++++++++-- dlls/mshtml/tests/dom.js | 37 ++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a3608abbeb1..b11d39ae07f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -476,8 +476,15 @@ static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_pathname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString pathname_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* FIXME: IE prepends a slash for some protocols */ + nsAString_Init(&pathname_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetPathname(This->nsanchor, &pathname_str); + return return_nsstr(nsres, &pathname_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 3a2b96a7958..e2be69782fc 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -137,24 +137,39 @@ async_test("iframe_location", function() { }); sync_test("anchor", function() { - var iframe = document.body.firstChild; - var anchor = document.createElement("a"); - var anchor_tests = [ - { href: "http://www.winehq.org:123/about", protocol: "http:", host: "www.winehq.org:123" }, - { href: "https://www.winehq.org:123/about", protocol: "https:", host: "www.winehq.org:123" }, - { href: "about:blank", protocol: "about:", host: "" }, - { href: "file:///c:/dir/file.html", protocol: "file:", host: "" }, - { href: "http://www.winehq.org/about", protocol: "http:", host: "www.winehq.org:80", todo_host: true }, - { href: "https://www.winehq.org/about", protocol: "https:", host: "www.winehq.org:443", todo_host: true }, + { href: "http://www.winehq.org:123/about", + protocol: "http:", host: "www.winehq.org:123", path: "/about" }, + { href: "https://www.winehq.org:123/about", + protocol: "https:", host: "www.winehq.org:123", path: "/about" }, + { href: "about:blank", + protocol: "about:", host: "", path: "/blank", todo_pathname: 1 }, + { href: "unknown:path", + protocol: "unknown:", host: "", path: "path" }, + { href: "ftp:path", + protocol: "ftp:", host: "", path: "path" }, + { href: "mailto:path", + protocol: "mailto:", host: "", path: "path" }, + { href: "ws:path", + protocol: "ws:", host: "", path: "path" }, + { href: "file:path", + protocol: "file:", host: "", path: "/path", todo_pathname: 1 }, + { href: "file:///c:/dir/file.html", + protocol: "file:", host: "", path: "/c:/dir/file.html" }, + { href: "http://www.winehq.org/about", + protocol: "http:", host: "www.winehq.org", path: "/about" }, + { href: "https://www.winehq.org/about", + protocol: "https:", host: "www.winehq.org", path: "/about" }, ]; for(var i in anchor_tests) { var t = anchor_tests[i]; - anchor.href = t.href; + document.body.innerHTML = '<a href="' + t.href + '">'; + var anchor = document.body.firstChild; ok(anchor.protocol === t.protocol, "anchor(" + t.href + ").protocol = " + anchor.protocol); - todo_wine_if("todo_host" in t). ok(anchor.host === t.host, "anchor(" + t.href + ").host = " + anchor.host); + todo_wine_if("todo_pathname" in t). + ok(anchor.pathname === t.path, "anchor(" + t.href + ").pathname = " + anchor.pathname); } }); -- 2.30.2

3 2

[PATCH v5 1/3] uiautomationcore: Implement UiaGetReservedNotSupportedValue.
by Connor McAdams Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 131 +++++++++++++++++++++++++++++- 2 files changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..5a72ea144c4 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = uuid ole32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..77cacb7c4a4 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,134 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); +struct uia_object_wrapper +{ + IUnknown IUnknown_iface; + LONG refcount; + + IUnknown *marshaler; + IUnknown *marshal_object; +}; + +static struct uia_object_wrapper *impl_uia_object_wrapper_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct uia_object_wrapper, IUnknown_iface); +} + +static HRESULT WINAPI uia_object_wrapper_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + return IUnknown_QueryInterface(wrapper->marshal_object, riid, ppv); +} + +static ULONG WINAPI uia_object_wrapper_AddRef(IUnknown *iface) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI uia_object_wrapper_Release(IUnknown *iface) +{ + struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + if (!refcount) + { + IUnknown_Release(wrapper->marshaler); + heap_free(wrapper); + } + + return refcount; +} + +static const IUnknownVtbl uia_object_wrapper_vtbl = { + uia_object_wrapper_QueryInterface, + uia_object_wrapper_AddRef, + uia_object_wrapper_Release, +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, create a free + * threaded marshaler so that the pointer value is preserved. + */ +static HRESULT create_uia_object_wrapper(IUnknown *reserved, void **ppv) +{ + struct uia_object_wrapper *wrapper; + HRESULT hr; + + TRACE("%p, %p\n", reserved, ppv); + + wrapper = heap_alloc(sizeof(*wrapper)); + if (!wrapper) + return E_OUTOFMEMORY; + + wrapper->IUnknown_iface.lpVtbl = &uia_object_wrapper_vtbl; + wrapper->marshal_object = reserved; + wrapper->refcount = 1; + + if (FAILED(hr = CoCreateFreeThreadedMarshaler(&wrapper->IUnknown_iface, &wrapper->marshaler))) + { + heap_free(wrapper); + return hr; + } + + hr = IUnknown_QueryInterface(wrapper->marshaler, &IID_IMarshal, ppv); + IUnknown_Release(&wrapper->IUnknown_iface); + + return hr; +} + +/* + * UiaReservedNotSupportedValue object. + */ +static HRESULT WINAPI uia_reserved_obj_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + return create_uia_object_wrapper(iface, ppv); + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI uia_reserved_obj_AddRef(IUnknown *iface) +{ + return 1; +} + +static ULONG WINAPI uia_reserved_obj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl uia_reserved_obj_vtbl = { + uia_reserved_obj_QueryInterface, + uia_reserved_obj_AddRef, + uia_reserved_obj_Release, +}; + +static IUnknown uia_reserved_ns_iface = {&uia_reserved_obj_vtbl}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -46,8 +168,13 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) */ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value) { - FIXME("(%p) stub!\n", value); - *value = NULL; + TRACE("(%p)\n", value); + + if (!value) + return E_INVALIDARG; + + *value = &uia_reserved_ns_iface; + return S_OK; } -- 2.25.1

2 5

[PATCH] dxva2: Handle specified background color in VideoProcessBlt().
by Nikolay Sivov Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 46f5a7af485..401b5cc976b 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -258,6 +258,26 @@ static BOOL intersect_rect(RECT *dest, const RECT *src1, const RECT *src2) return TRUE; } +static D3DCOLOR video_processor_get_background_color(const DXVA2_AYUVSample16 *ayuv) +{ + float y, cb, cr; + BYTE r, g, b; + + y = (ayuv->Y >> 8) - 16; + cb = (ayuv->Cb >> 8) - 128; + cr = (ayuv->Cr >> 8) - 128; + + y = 255.0f * y / 219.0f; + cb = 255.0f * cb / 224.0f; + cr = 255.0f * cr / 224.0f; + + r = y + 1.402 * cr; + g = y - 0.344 * cb - 0.714 * cr; + b = y + 1.772 * cb; + + return D3DCOLOR_XRGB(r, g, b); +} + static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *iface, IDirect3DSurface9 *rt, const DXVA2_VideoProcessBltParams *params, const DXVA2_VideoSample *samples, UINT sample_count, HANDLE *complete_handle) @@ -269,14 +289,19 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if TRACE("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + if (params->BackgroundColor.Alpha != 0xffff) + { + WARN("Unexpected background alpha %#x.\n", params->BackgroundColor.Alpha); + return E_INVALIDARG; + } + if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device))) { WARN("Failed to get surface device, hr %#x.\n", hr); return hr; } - /* FIXME: use specified color */ - IDirect3DDevice9_ColorFill(device, rt, NULL, 0); + IDirect3DDevice9_ColorFill(device, rt, &params->TargetRect, video_processor_get_background_color(&params->BackgroundColor)); for (i = 0; i < sample_count; ++i) { -- 2.33.0

1 0

[PATCH] msvcp100: Export ctype<char>::table function.
by Piotr Caban Nov. 5, 2021

Nov. 5, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51978 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp140/msvcp140.spec | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-)

1 0

[PATCH] evr/mixer: Set destination alpha to fully opaque.
by Nikolay Sivov Nov. 5, 2021

Nov. 5, 2021

It's necessary for HW devices, software reference device does not support blending. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index fb7fcf79d9c..bb3f938cb64 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1326,7 +1326,7 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) video_mixer_normalize_rect(&dst, &stream_vis, &norm); video_mixer_scale_rect(&samples[sample_count].DstRect, rt_desc.Width, rt_desc.Height, &norm); - samples[sample_count].PlanarAlpha = DXVA2FloatToFixed(1.0f); + samples[sample_count].PlanarAlpha = DXVA2_Fixed32OpaqueAlpha(); sample_count++; } @@ -1335,6 +1335,7 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) { SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); params.BackgroundColor = mixer->bkgnd_color.ayuv; + params.Alpha = DXVA2_Fixed32OpaqueAlpha(); if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, sample_count, NULL))) -- 2.33.0

1 0

[PATCH 5/5] comctl32/button: Correctly place parts for themed split buttons.
by Zhiyi Zhang Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7b617a199b0..19febd8b6ac 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2917,7 +2917,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT rc, content_rect, push_rect, dropdown_rect, focus_rect; + RECT rc, content_rect, push_rect, dropdown_rect, focus_rect, label_rect, image_rect, text_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2984,13 +2984,12 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { COLORREF old_color, color; INT old_bk_mode; - WCHAR *text; - if ((text = get_button_text(infoPtr))) - { - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &content_rect); - heap_free(text); - } + label_rect = content_rect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &label_rect, &image_rect, &text_rect); + if (dtFlags != (UINT)-1L) + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &image_rect, &text_rect, theme, + BP_PUSHBUTTON, state); GetThemeColor(theme, BP_PUSHBUTTON, state, TMT_TEXTCOLOR, &color); old_bk_mode = SetBkMode(hDC, TRANSPARENT); -- 2.32.0

1 0

[PATCH 4/5] comctl32/button: Correctly place parts for themed group boxes.
by Zhiyi Zhang Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 49 +++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 515dff03921..7b617a199b0 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2855,11 +2855,12 @@ cleanup: static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT bgRect, textRect, contentRect; - WCHAR *text = get_button_text(infoPtr); + RECT clientRect, contentRect, imageRect, textRect, bgRect; + HRGN region, textRegion = NULL; LOGFONTW lf; HFONT font, hPrevFont = NULL; BOOL created_font = FALSE; + TEXTMETRICW textMetric; HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { @@ -2875,37 +2876,41 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in SelectObject(hDC, infoPtr->font); } - GetClientRect(infoPtr->hwnd, &bgRect); - textRect = bgRect; + GetClientRect(infoPtr->hwnd, &clientRect); + GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &clientRect, &contentRect); + region = set_control_clipping(hDC, &clientRect); - if (text) + bgRect = contentRect; + GetTextMetricsW(hDC, &textMetric); + bgRect.top += (textMetric.tmHeight / 2) - 1; + + InflateRect(&contentRect, -7, 1); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &contentRect, &imageRect, &textRect); + if (dtFlags != (UINT)-1 && !show_image_only(infoPtr)) { - SIZE textExtent; - GetTextExtentPoint32W(hDC, text, lstrlenW(text), &textExtent); - bgRect.top += (textExtent.cy / 2); - textRect.left += 10; - textRect.bottom = textRect.top + textExtent.cy; - textRect.right = textRect.left + textExtent.cx + 4; - - ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom); + textRegion = CreateRectRgnIndirect(&textRect); + ExtSelectClipRgn(hDC, textRegion, RGN_DIFF); } - GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &bgRect, &contentRect); - ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); - if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); - SelectClipRgn(hDC, NULL); - - if (text) + if (dtFlags != (UINT)-1) { - InflateRect(&textRect, -2, 0); - DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); - heap_free(text); + contentRect.left--; + contentRect.right++; + contentRect.bottom++; + if (textRegion) + { + SelectClipRgn(hDC, textRegion); + DeleteObject(textRegion); + } + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, BP_GROUPBOX, state); } + SelectClipRgn(hDC, region); + if (region) DeleteObject(region); if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont); } -- 2.32.0

1 0

[PATCH 3/5] comctl32/button: Correctly place parts for themed check boxes.
by Zhiyi Zhang Nov. 5, 2021

Nov. 5, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 76 +++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 80635feaafc..515dff03921 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2748,18 +2748,20 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - SIZE sz; - RECT bgRect, textRect; + RECT client_rect, content_rect, old_label_rect, label_rect, box_rect, image_rect, text_rect; HFONT font, hPrevFont = NULL; DWORD dwStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + LONG ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; NMCUSTOMDRAW nmcd; LRESULT cdrf; LOGFONTW lf; HWND parent; - WCHAR *text; BOOL created_font = FALSE; + int text_offset; + SIZE box_size; + HRGN region; HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { @@ -2775,20 +2777,31 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (infoPtr->font) SelectObject(hDC, infoPtr->font); } - if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz))) - sz.cx = sz.cy = 13; + GetClientRect(infoPtr->hwnd, &client_rect); + GetThemeBackgroundContentRect(theme, hDC, part, state, &client_rect, &content_rect); + region = set_control_clipping(hDC, &client_rect); - GetClientRect(infoPtr->hwnd, &bgRect); - GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); - init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); + if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &box_size))) + { + box_size.cx = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + box_size.cy = box_size.cx; + } - if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ - bgRect.top = bgRect.top + (textRect.bottom - textRect.top - sz.cy) / 2; + GetCharWidthW(hDC, '0', '0', &text_offset); + text_offset /= 2; - /* adjust for the check/radio marker */ - bgRect.bottom = bgRect.top + sz.cy; - bgRect.right = bgRect.left + sz.cx; - textRect.left = bgRect.right + 6; + label_rect = content_rect; + if (dwStyle & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) + label_rect.right -= box_size.cx + text_offset; + else + label_rect.left += box_size.cx + text_offset; + + old_label_rect = label_rect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &label_rect, &image_rect, &text_rect); + box_rect = get_box_rect(dwStyle, ex_style, &content_rect, &label_rect, dtFlags != (UINT)-1L, + box_size); + + init_custom_draw(&nmcd, infoPtr, hDC, &client_rect); parent = GetParent(infoPtr->hwnd); if (!parent) parent = infoPtr->hwnd; @@ -2798,7 +2811,6 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); - DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); if (cdrf & CDRF_NOTIFYPOSTERASE) { @@ -2811,36 +2823,32 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; - text = get_button_text(infoPtr); - if (!(cdrf & CDRF_DOERASE) && text) - DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); + /* Draw label */ + if (!(cdrf & CDRF_DOERASE)) + { + DrawThemeBackground(theme, hDC, part, state, &box_rect, NULL); + if (dtFlags != (UINT)-1L) + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &image_rect, &text_rect, theme, part, state); + } if (cdrf & CDRF_NOTIFYPOSTPAINT) { nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } + if ((cdrf & CDRF_SKIPPOSTPAINT) || dtFlags == (UINT)-1L) goto cleanup; - if (text) + if (focused) { - if (!(cdrf & CDRF_SKIPPOSTPAINT) && focused) - { - RECT focusRect; - - focusRect = textRect; - - DrawTextW(hDC, text, lstrlenW(text), &focusRect, dtFlags | DT_CALCRECT); - - if (focusRect.right < textRect.right) focusRect.right++; - focusRect.bottom = textRect.bottom; - - DrawFocusRect( hDC, &focusRect ); - } - - heap_free(text); + label_rect.left--; + label_rect.right++; + IntersectRect(&label_rect, &label_rect, &old_label_rect); + DrawFocusRect(hDC, &label_rect); } cleanup: + SelectClipRgn(hDC, region); + if (region) DeleteObject(region); if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont); } -- 2.32.0

1 0

[PATCH 2/5] comctl32/button: Correctly place parts for themed push buttons.
by Zhiyi Zhang Nov. 5, 2021

Nov. 5, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51916 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 47 +++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 70ac6b1c2da..80635feaafc 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1761,6 +1761,38 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, heap_free(text); } +static void BUTTON_DrawThemedLabel(const BUTTON_INFO *info, HDC hdc, UINT text_flags, + const RECT *image_rect, const RECT *text_rect, HTHEME theme, + int part, int state) +{ + HBRUSH brush = NULL; + UINT image_flags; + WCHAR *text; + + if (show_image(info)) + { + image_flags = IsWindowEnabled(info->hwnd) ? DSS_NORMAL : DSS_DISABLED; + + if ((GetWindowLongW(info->hwnd, GWL_STYLE) & BS_PUSHLIKE) + && (info->state & BST_INDETERMINATE)) + { + brush = GetSysColorBrush(COLOR_GRAYTEXT); + image_flags |= DSS_MONO; + } + + BUTTON_DrawImage(info, hdc, brush, image_flags, image_rect); + } + + if (show_image_only(info)) + return; + + if (!(text = get_button_text(info))) + return; + + DrawThemeText(theme, hdc, part, state, text, lstrlenW(text), text_flags, 0, text_rect); + heap_free(text); +} + /********************************************************************** * Push Button Functions */ @@ -2661,17 +2693,16 @@ cleanup: */ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT bgRect, textRect, focusRect; + RECT bgRect, labelRect, imageRect, textRect, focusRect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; - WCHAR *text; if (infoPtr->font) SelectObject(hDC, infoPtr->font); GetClientRect(infoPtr->hwnd, &bgRect); - GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); - focusRect = textRect; + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &labelRect); + focusRect = labelRect; init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); @@ -2697,10 +2728,12 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) return; - if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) + if (!(cdrf & CDRF_DOERASE)) { - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); - heap_free(text); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); + if (dtFlags != (UINT)-1L) + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, + BP_PUSHBUTTON, state); } if (cdrf & CDRF_NOTIFYPOSTPAINT) -- 2.32.0

1 0

[PATCH 1/5] comctl32/button: Correctly place parts for buttons with WS_EX_RIGHT.
by Zhiyi Zhang Nov. 5, 2021

Nov. 5, 2021

WS_EX_RIGHT has the same effect as BS_RIGHT. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 6a463cb3460..70ac6b1c2da 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1547,17 +1547,15 @@ static BOOL CL_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) */ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *labelRc, RECT *imageRc, RECT *textRc) { - LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); - LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); - LONG split_style = infoPtr->imagelist.himl ? BUTTON_ILStoBS(infoPtr->imagelist.uAlign) : style; WCHAR *text = get_button_text(infoPtr); SIZE imageSize = BUTTON_GetImageSize(infoPtr); - UINT dtStyle = BUTTON_BStoDT(style, ex_style); RECT labelRect, imageRect, imageRectWithMargin, textRect; LONG imageMarginWidth, imageMarginHeight; const RECT *textMargin = BUTTON_GetTextMargin(infoPtr); + LONG style, ex_style, split_style; RECT emptyMargin = {0}; LONG maxTextWidth; + UINT dtStyle; /* Calculate label rectangle according to label type */ if ((imageSize.cx == 0 && imageSize.cy == 0) && (text == NULL || text[0] == '\0')) @@ -1569,6 +1567,14 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la return (UINT)-1; } + style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + /* Add BS_RIGHT directly. When both WS_EX_RIGHT and BS_LEFT are present, it becomes BS_CENTER */ + if (ex_style & WS_EX_RIGHT) + style |= BS_RIGHT; + split_style = infoPtr->imagelist.himl ? BUTTON_ILStoBS(infoPtr->imagelist.uAlign) : style; + dtStyle = BUTTON_BStoDT(style, ex_style); + SetRect(&imageRect, 0, 0, imageSize.cx, imageSize.cy); imageRectWithMargin = imageRect; if (infoPtr->imagelist.himl) -- 2.32.0

1 0