January 2022 - Wine-Devel - list.winehq.org

[PATCH] bcrypt: Return BCryptSignHash len when only output is NULL
by Piotr Kleski Jan. 20, 2022

Jan. 20, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52426 Signed-off-by: Piotr Kleski <piotr.kleski(a)mobica.com> Signed-off-by: Michal Janiszewski <michal.janiszewski(a)mobica.com> --- dlls/bcrypt/gnutls.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c880c9c1d46..488a3605dcd 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1707,7 +1707,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) return STATUS_NOT_IMPLEMENTED; } - if (!params->input) + if (!params->input || !params->output) { *params->ret_len = key->u.a.bitlen / 8; return STATUS_SUCCESS; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3b32ea0349b..0f9456fee07 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2496,6 +2496,11 @@ static void test_BCryptSignHash(void) ok(!ret, "got %08x\n", ret); ok(len == 256, "got %u\n", len); + /* test len return when only output is NULL, as described in BCryptSignHash doc */ + ret = BCryptSignHash(key, &pad, hash, sizeof(hash), NULL, 0, &len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %08x\n", ret); + ok(len == 256, "got %u\n", len); + len = 0; ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_INTERNAL_ERROR) /* < win7 */, "got %08x\n", ret); -- 2.30.2

1 0

[PATCH 1/2] dwrite: Implement GetMatchingFontsByLOGFONT().
by Nikolay Sivov Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 4 ++- dlls/dwrite/gdiinterop.c | 15 ++++++++--- dlls/dwrite/tests/font.c | 57 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5815c09e8ae..2296c74c1e3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7501,6 +7501,8 @@ static IDWriteLocalizedStrings * fontset_entry_get_property(struct dwrite_fontse opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG, &value); else if (property == DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG) opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, &value); + else if (property == DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME) + opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &value); else WARN("Unsupported property %u.\n", property); @@ -7642,6 +7644,7 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE case DWRITE_FONT_PROPERTY_ID_FULL_NAME: case DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG: case DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG: + case DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME: if (!(value = fontset_entry_get_property(entry, props[i].propertyId))) return FALSE; @@ -7652,7 +7655,6 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME: - case DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG: case DWRITE_FONT_PROPERTY_ID_WEIGHT: case DWRITE_FONT_PROPERTY_ID_STRETCH: diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index e8b4a747e29..703b1e8170c 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -906,11 +906,20 @@ static HRESULT WINAPI gdiinterop1_GetFontSignature(IDWriteGdiInterop1 *iface, ID } static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, - IDWriteFontSet *fontset, IDWriteFontSet **subset) + IDWriteFontSet *fontset, IDWriteFontSet **subset) { - FIXME("%p, %p, %p, %p: stub.\n", iface, logfont, fontset, subset); + DWRITE_FONT_PROPERTY property; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p.\n", iface, logfont, fontset, subset); + + if (!logfont || !fontset) + return E_INVALIDARG; + + property.propertyId = DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME; + property.propertyValue = logfont->lfFaceName; + property.localeName = L""; + + return IDWriteFontSet_GetMatchingFonts(fontset, &property, 1, subset); } static const IDWriteGdiInterop1Vtbl gdiinteropvtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b185db49c13..b347a73a53e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -10319,6 +10319,62 @@ if (SUCCEEDED(hr)) DELETE_FONTFILE(path); } +static void test_GetMatchingFontsByLOGFONT(void) +{ + IDWriteFontSet *systemset, *set; + IDWriteGdiInterop1 *interop; + IDWriteGdiInterop *interop0; + IDWriteFactory3 *factory; + ULONG refcount, count; + LOGFONTW logfont; + HRESULT hr; + + factory = create_factory_iid(&IID_IDWriteFactory3); + if (!factory) + { + win_skip("Skipping GetMatchingFontsByLOGFONT() tests.\n"); + return; + } + + hr = IDWriteFactory3_GetSystemFontSet(factory, &systemset); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + interop = NULL; + hr = IDWriteFactory3_GetGdiInterop(factory, &interop0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteGdiInterop_QueryInterface(interop0, &IID_IDWriteGdiInterop1, (void **)&interop); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDWriteGdiInterop_Release(interop0); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_BOLD; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, L"tahoma"); + + hr = IDWriteGdiInterop1_GetMatchingFontsByLOGFONT(interop, NULL, systemset, &set); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteGdiInterop1_GetMatchingFontsByLOGFONT(interop, &logfont, NULL, &set); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteGdiInterop1_GetMatchingFontsByLOGFONT(interop, &logfont, systemset, &set); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteFontSet_GetFontCount(set); + ok(count > 0, "Unexpected count %u.\n", count); + + IDWriteFontSet_Release(set); + + IDWriteGdiInterop1_Release(interop); + IDWriteFontSet_Release(systemset); + + refcount = IDWriteFactory3_Release(factory); + ok(!refcount, "Factory wasn't released, %u.\n", refcount); +} + START_TEST(font) { IDWriteFactory *factory; @@ -10393,6 +10449,7 @@ START_TEST(font) test_family_font_set(); test_system_font_set(); test_CreateFontCollectionFromFontSet(); + test_GetMatchingFontsByLOGFONT(); IDWriteFactory_Release(factory); } -- 2.34.1

1 1

[PATCH] mfreadwrite/tests: Use CRT allocation functions.
by Nikolay Sivov Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index e3ff7f6e7aa..7e724344168 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -40,7 +40,6 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); #include "d3d9.h" #include "dxva2api.h" -#include "wine/heap.h" #include "wine/test.h" static ULONG get_refcount(void *iface) @@ -145,7 +144,7 @@ static ULONG WINAPI test_media_stream_Release(IMFMediaStream *iface) if (!refcount) { IMFMediaEventQueue_Release(stream->event_queue); - heap_free(stream); + free(stream); } return refcount; @@ -297,7 +296,7 @@ static ULONG WINAPI test_source_Release(IMFMediaSource *iface) if (!refcount) { IMFMediaEventQueue_Release(source->event_queue); - heap_free(source); + free(source); } return refcount; @@ -488,7 +487,7 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia BOOL selected; HRESULT hr; - stream = heap_alloc_zero(sizeof(*stream)); + stream = calloc(1, sizeof(*stream)); stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl; stream->refcount = 1; hr = MFCreateEventQueue(&stream->event_queue); @@ -509,7 +508,7 @@ static IMFMediaSource *create_test_source(int stream_count) struct test_source *source; int i; - source = heap_alloc_zero(sizeof(*source)); + source = calloc(1, sizeof(*source)); source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; source->refcount = 1; source->stream_count = stream_count; @@ -606,9 +605,7 @@ static ULONG WINAPI async_callback_Release(IMFSourceReaderCallback *iface) ULONG refcount = InterlockedDecrement(&callback->refcount); if (!refcount) - { - heap_free(callback); - } + free(callback); return refcount; } @@ -646,7 +643,7 @@ static struct async_callback *create_async_callback(void) { struct async_callback *callback; - callback = heap_alloc(sizeof(*callback)); + callback = calloc(1, sizeof(*callback)); callback->IMFSourceReaderCallback_iface.lpVtbl = &async_callback_vtbl; callback->refcount = 1; -- 2.34.1

1 0

[PATCH] bcrypt: Return BCryptSignHash len when only output is NULL
by Piotr Kleski Jan. 20, 2022

Jan. 20, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52426 Signed-off-by: Piotr Kleski <piotr.kleski(a)mobica.com> Signed-off-by: Michal Janiszewski <michal.janiszewski(a)mobica.com> --- dlls/bcrypt/gnutls.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c880c9c1d46..488a3605dcd 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1707,7 +1707,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) return STATUS_NOT_IMPLEMENTED; } - if (!params->input) + if (!params->input || !params->output) { *params->ret_len = key->u.a.bitlen / 8; return STATUS_SUCCESS; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3b32ea0349b..0f9456fee07 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2496,6 +2496,11 @@ static void test_BCryptSignHash(void) ok(!ret, "got %08x\n", ret); ok(len == 256, "got %u\n", len); + /* test len return when only output is NULL, as described in BCryptSignHash doc */ + ret = BCryptSignHash(key, &pad, hash, sizeof(hash), NULL, 0, &len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %08x\n", ret); + ok(len == 256, "got %u\n", len); + len = 0; ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_INTERNAL_ERROR) /* < win7 */, "got %08x\n", ret); -- 2.30.2

1 0

[PATCH] programs/cmd/tests: test paths which length exceeds MAX_PATH
by Eric Pouech Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 47b028207ac..a4cb8ec100c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3333,6 +3333,26 @@ if errorlevel 1 echo Normal+tab+garbage drive change failed popd +echo ------------ Testing length wrt. MAX_PATH ------------ +rem native cmd limits all path lengths to MAX_PATH=260 +rem so cannot create more than 23 10-letter subdirs: +rem 260-2(C:)-1(\0)=23*11(\abcdefghij)+5 +pushd +set depth=30 +for /L %d in (0,1,30) do ( + mkdir abcdefghij + if errorlevel 0 ( + cd abcdefghij + set depth=%d + ) +) +popd +if depth gtr 23 (echo Failure) else echo Success +rem even relative paths are transformed to absolute, and tested against MAX_PATH +echo abc > 0123456789 +if exist 0123456789 (echo Failure) else echo Success +popd +rmdir /s /q abcdefghij echo ------------ Testing combined CALLs/GOTOs ------------ echo @echo off>foo.cmd echo goto :eof>>foot.cmd diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4c7bc3e0c02..b6fc2fda894 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1687,6 +1687,10 @@ Normal+space+garbage Quoted should fail Normal+tab Normal+tab+garbage +------------ Testing length wrt. MAX_PATH ------------ +(a)pwd@ +(a)todo_wine@Success +(a)todo_wine@Success ------------ Testing combined CALLs/GOTOs ------------ world cheball

2 1

[PATCH 5/5] comctl32/status: Do not draw background for status text.
by Zhiyi Zhang Jan. 20, 2022

Jan. 20, 2022

DrawStatusTextW() always draws the text background, so it's unfit to use it directly to draw status text because status control draws its own background. Fix status control text having wrong background when themed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 67 ++++++++++++++++++++++------------------ dlls/comctl32/status.c | 3 +- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 44d3b43ab9b..f9ed8b84ffd 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -182,6 +182,7 @@ extern COMCTL32_SysColor comctl32_color DECLSPEC_HIDDEN; /* Internal function */ HWND COMCTL32_CreateToolTip (HWND) DECLSPEC_HIDDEN; +void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background) DECLSPEC_HIDDEN; VOID COMCTL32_RefreshSysColors(void) DECLSPEC_HIDDEN; void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal) DECLSPEC_HIDDEN; void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground) DECLSPEC_HIDDEN; diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index b457bdcb8be..c707703ccd2 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -460,39 +460,25 @@ GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, const INT *lpInfo) } while (*lpRun); } - -/*********************************************************************** - * DrawStatusTextW [COMCTL32.@] - * - * Draws text with borders, like in a status bar. - * - * PARAMS - * hdc [I] handle to the window's display context - * lprc [I] pointer to a rectangle - * text [I] pointer to the text - * style [I] drawing style - * - * RETURNS - * No return value. - * - * NOTES - * The style variable can have one of the following values: - * (will be written ...) - */ - -void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) +void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background) { RECT r = *lprc; - UINT border = BDR_SUNKENOUTER; + UINT border; COLORREF oldbkcolor; - if (style & SBT_POPOUT) - border = BDR_RAISEDOUTER; - else if (style & SBT_NOBORDERS) - border = 0; + if (draw_background) + { + if (style & SBT_POPOUT) + border = BDR_RAISEDOUTER; + else if (style & SBT_NOBORDERS) + border = 0; + else + border = BDR_SUNKENOUTER; - oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace); - DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST); + oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace); + DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST); + SetBkColor (hdc, oldbkcolor); + } /* now draw text */ if (text) { @@ -524,10 +510,31 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) SetBkMode (hdc, oldbkmode); SetTextColor (hdc, oldtextcolor); } - - SetBkColor (hdc, oldbkcolor); } +/*********************************************************************** + * DrawStatusTextW [COMCTL32.@] + * + * Draws text with borders, like in a status bar. + * + * PARAMS + * hdc [I] handle to the window's display context + * lprc [I] pointer to a rectangle + * text [I] pointer to the text + * style [I] drawing style + * + * RETURNS + * No return value. + * + * NOTES + * The style variable can have one of the following values: + * (will be written ...) + */ + +void WINAPI DrawStatusTextW(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) +{ + COMCTL32_DrawStatusText(hdc, lprc, text, style, TRUE); +} /*********************************************************************** * DrawStatusText [COMCTL32.@] diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 6fcdc32086a..e804c0418f4 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -139,7 +139,6 @@ STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); } - static void STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { @@ -187,7 +186,7 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART SendMessageW (infoPtr->Notify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } else { r.left += x; - DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); + COMCTL32_DrawStatusText(hdc, &r, part->text, 0, FALSE); } } -- 2.32.0

1 0

[PATCH 4/5] comctl32/status: Calculate border for part background only when theming is off.
by Zhiyi Zhang Jan. 20, 2022

Jan. 20, 2022

This is a no-op. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/status.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 786fcbd291d..6fcdc32086a 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -144,16 +144,12 @@ static void STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { RECT r = part->bound; - UINT border = BDR_SUNKENOUTER; + UINT border; HTHEME theme = GetWindowTheme (infoPtr->Self); int themePart = SP_PANE; int x = 0; TRACE("part bound %s\n", wine_dbgstr_rect(&r)); - if (part->style & SBT_POPOUT) - border = BDR_RAISEDOUTER; - else if (part->style & SBT_NOBORDERS) - border = 0; if (theme) { @@ -163,7 +159,15 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART DrawThemeBackground(theme, hdc, themePart, 0, &r, NULL); } else + { + if (part->style & SBT_POPOUT) + border = BDR_RAISEDOUTER; + else if (part->style & SBT_NOBORDERS) + border = 0; + else + border = BDR_SUNKENOUTER; DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST); + } if (part->hIcon) { INT cy = r.bottom - r.top; -- 2.32.0

1 0

[PATCH 3/5] comctl32/status: Remove redundant background drawing code.
by Zhiyi Zhang Jan. 20, 2022

Jan. 20, 2022

The part background is already painted in STATUSBAR_Refresh(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/status.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index ac93d7712c0..786fcbd291d 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -191,9 +191,6 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART static void STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { - HBRUSH hbrBk; - HTHEME theme; - TRACE("item %d\n", itemID); if (part->bound.right < part->bound.left) return; @@ -201,23 +198,6 @@ STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPA if (!RectVisible(hdc, &part->bound)) return; - if ((theme = GetWindowTheme (infoPtr->Self))) - { - RECT cr; - GetClientRect (infoPtr->Self, &cr); - DrawThemeBackground(theme, hdc, 0, 0, &cr, &part->bound); - } - else - { - if (infoPtr->clrBk != CLR_DEFAULT) - hbrBk = CreateSolidBrush (infoPtr->clrBk); - else - hbrBk = GetSysColorBrush (COLOR_3DFACE); - FillRect(hdc, &part->bound, hbrBk); - if (infoPtr->clrBk != CLR_DEFAULT) - DeleteObject (hbrBk); - } - STATUSBAR_DrawPart (infoPtr, hdc, part, itemID); } -- 2.32.0

1 0

[PATCH 2/5] comctl32/treeview: Support themed check boxes for TVS_CHECKBOXES style.
by Zhiyi Zhang Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/treeview.c | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index f4a387dd0d2..1368105f271 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2962,6 +2962,52 @@ TREEVIEW_Invalidate(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) InvalidateRect(infoPtr->hwnd, NULL, TRUE); } +static BOOL TREEVIEW_InitThemedCheckboxes(TREEVIEW_INFO *info) +{ + HBITMAP bitmap, old_bitmap; + HDC hdc, hdc_screen; + HTHEME theme; + RECT rect; + SIZE size; + + if (!GetWindowTheme(info->hwnd)) + return FALSE; + + theme = OpenThemeDataForDpi(NULL, L"Button", GetDpiForWindow(info->hwnd)); + if (!theme) + return FALSE; + + hdc_screen = GetDC(0); + hdc = CreateCompatibleDC(hdc_screen); + GetThemePartSize(theme, hdc, BP_CHECKBOX, 0, NULL, TS_DRAW, &size); + bitmap = CreateCompatibleBitmap(hdc_screen, size.cx * 3, size.cy); + old_bitmap = SelectObject(hdc, bitmap); + + SetRect(&rect, 0, 0, size.cx * 3, size.cy); + FillRect(hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + + rect.left = size.cx; + rect.right = rect.left + size.cx; + DrawThemeBackground(theme, hdc, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, &rect, NULL); + + rect.left = size.cx * 2; + rect.right = rect.left + size.cx; + DrawThemeBackground(theme, hdc, BP_CHECKBOX, CBS_CHECKEDNORMAL, &rect, NULL); + + SelectObject(hdc, old_bitmap); + info->himlState = ImageList_Create(size.cx, size.cy, ILC_COLOR32, 3, 0); + ImageList_Add(info->himlState, bitmap, NULL); + + DeleteObject(bitmap); + DeleteDC(hdc); + ReleaseDC(0, hdc_screen); + CloseThemeData(theme); + + info->stateImageWidth = size.cx; + info->stateImageHeight = size.cy; + return TRUE; +} + static void TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { @@ -2970,6 +3016,9 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) HDC hdc, hdcScreen; int nIndex; + if (TREEVIEW_InitThemedCheckboxes(infoPtr)) + return; + infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); hdcScreen = GetDC(0); -- 2.32.0

1 0

[PATCH 1/5] comctl32/listview: Support themed check boxes for LVS_EX_CHECKBOXES style.
by Zhiyi Zhang Jan. 20, 2022

Jan. 20, 2022

Fix check boxes in the list items of 7-zip options dialog not being themed even when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/listview.c | 52 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9e35f7879b7..044e64bfa53 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -139,6 +139,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" +#include "vsstyle.h" #include "shlwapi.h" #include "wine/debug.h" @@ -8424,15 +8425,62 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) * Creates the checkbox imagelist. Helper for LISTVIEW_SetExtendedListViewStyle * */ +static HIMAGELIST LISTVIEW_CreateThemedCheckBoxImageList(const LISTVIEW_INFO *info) +{ + HBITMAP bitmap, old_bitmap; + HIMAGELIST image_list; + HDC hdc, mem_hdc; + HTHEME theme; + RECT rect; + SIZE size; + + if (!GetWindowTheme(info->hwndSelf)) + return NULL; + + theme = OpenThemeDataForDpi(NULL, L"Button", GetDpiForWindow(info->hwndSelf)); + if (!theme) + return NULL; + + hdc = GetDC(info->hwndSelf); + GetThemePartSize(theme, hdc, BP_CHECKBOX, 0, NULL, TS_DRAW, &size); + SetRect(&rect, 0, 0, size.cx, size.cy); + image_list = ImageList_Create(size.cx, size.cy, ILC_COLOR32, 2, 2); + mem_hdc = CreateCompatibleDC(hdc); + bitmap = CreateCompatibleBitmap(hdc, size.cx, size.cy); + old_bitmap = SelectObject(mem_hdc, bitmap); + ReleaseDC(info->hwndSelf, hdc); + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_CHECKBOX, CBS_UNCHECKEDNORMAL)) + FillRect(mem_hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + DrawThemeBackground(theme, mem_hdc, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, &rect, NULL); + ImageList_Add(image_list, bitmap, NULL); + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_CHECKBOX, CBS_CHECKEDNORMAL)) + FillRect(mem_hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + DrawThemeBackground(theme, mem_hdc, BP_CHECKBOX, CBS_CHECKEDNORMAL, &rect, NULL); + ImageList_Add(image_list, bitmap, NULL); + + SelectObject(mem_hdc, old_bitmap); + DeleteObject(bitmap); + DeleteDC(mem_hdc); + CloseThemeData(theme); + return image_list; +} + static HIMAGELIST LISTVIEW_CreateCheckBoxIL(const LISTVIEW_INFO *infoPtr) { HDC hdc_wnd, hdc; HBITMAP hbm_im, hbm_mask, hbm_orig; RECT rc; - HBRUSH hbr_white = GetStockObject(WHITE_BRUSH); - HBRUSH hbr_black = GetStockObject(BLACK_BRUSH); + HBRUSH hbr_white, hbr_black; HIMAGELIST himl; + himl = LISTVIEW_CreateThemedCheckBoxImageList(infoPtr); + if (himl) + return himl; + + hbr_white = GetStockObject(WHITE_BRUSH); + hbr_black = GetStockObject(BLACK_BRUSH); himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_MASK, 2, 2); hdc_wnd = GetDC(infoPtr->hwndSelf); -- 2.32.0

1 0