[PATCH 0/2] MR9287: uxtheme: Handle NULL options in DrawThemeTextEx().
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54927 --- dlls/uxtheme/draw.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index eec73d67d07..832501943df 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1779,10 +1779,10 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId HFONT hFont = NULL; HGDIOBJ oldFont = NULL; LOGFONTW logfont; - COLORREF textColor; + COLORREF textColor = CLR_INVALID; COLORREF oldTextColor; int oldBkMode; - int fontProp; + int fontProp = TMT_FONT; TRACE("%p %p %d %d %s:%d 0x%08lx %p %p\n", hTheme, hdc, iPartId, iStateId, debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options); @@ -1790,13 +1790,21 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId if(!hTheme) return E_HANDLE; - if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP)) - FIXME("unsupported flags 0x%08lx\n", options->dwFlags); + if (options) + { + if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP)) + FIXME("unsupported flags 0x%08lx\n", options->dwFlags); + if (options->dwFlags & DTT_FONTPROP) + fontProp = options->iFontPropId; + if (options->dwFlags & DTT_TEXTCOLOR) + textColor = options->crText; + } - if (options->dwFlags & DTT_FONTPROP) - fontProp = options->iFontPropId; - else - fontProp = TMT_FONT; + if (textColor == CLR_INVALID) + { + if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTCOLOR, &textColor))) + textColor = GetTextColor(hdc); + } hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, fontProp, &logfont); if(SUCCEEDED(hr)) { @@ -1808,12 +1816,6 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId if(hFont) oldFont = SelectObject(hdc, hFont); - if (options->dwFlags & DTT_TEXTCOLOR) - textColor = options->crText; - else { - if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTCOLOR, &textColor))) - textColor = GetTextColor(hdc); - } oldTextColor = SetTextColor(hdc, textColor); oldBkMode = SetBkMode(hdc, TRANSPARENT); DrawTextW(hdc, pszText, iCharCount, rect, flags); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9287
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/uxtheme/tests/system.c | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 6597dc274cd..c1786fea9d9 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2798,6 +2798,49 @@ static void test_DrawThemeEdge(void) DestroyWindow(hwnd); } +static void test_DrawThemeTextEx(void) +{ + DTTOPTS options; + HTHEME htheme; + HRESULT hr; + RECT rect; + HWND hwnd; + HDC hdc; + + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %#lx.\n", GetLastError()); + htheme = OpenThemeData(hwnd, L"Button"); + if (!htheme) + { + skip("Theming is inactive.\n"); + DestroyWindow(hwnd); + return; + } + + hdc = GetDC(hwnd); + SetRect(&rect, 0, 0, 1, 1); + + hr = DrawThemeTextEx(NULL, hdc, 0, 0, L"Wine", -1, DT_CENTER, &rect, NULL); + ok(hr == E_HANDLE, "Got unexpected hr %#lx.\n", hr); + + hr = DrawThemeTextEx(htheme, hdc, 0, 0, L"Wine", -1, DT_CENTER, &rect, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + options.dwSize = sizeof(options); + options.dwFlags = DTT_VALIDBITS; + options.iFontPropId = TMT_BODYFONT; + hr = DrawThemeTextEx(htheme, hdc, 0, 0, L"Wine", -1, DT_CENTER, &rect, &options); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + options.crText = CLR_INVALID; + hr = DrawThemeTextEx(htheme, hdc, 0, 0, L"Wine", -1, DT_CENTER, &rect, &options); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ReleaseDC(hwnd, hdc); + CloseThemeData(htheme); + DestroyWindow(hwnd); +} + START_TEST(system) { ULONG_PTR ctx_cookie; @@ -2827,6 +2870,7 @@ START_TEST(system) test_ShouldSystemUseDarkMode(); test_ShouldAppsUseDarkMode(); test_DrawThemeEdge(); + test_DrawThemeTextEx(); if (load_v6_module(&ctx_cookie, &ctx)) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9287
Nikolay Sivov (@nsivov) commented about dlls/uxtheme/draw.c:
+ FIXME("unsupported flags 0x%08lx\n", options->dwFlags); + if (options->dwFlags & DTT_FONTPROP) + fontProp = options->iFontPropId; + if (options->dwFlags & DTT_TEXTCOLOR) + textColor = options->crText; + }
- if (options->dwFlags & DTT_FONTPROP) - fontProp = options->iFontPropId; - else - fontProp = TMT_FONT; + if (textColor == CLR_INVALID) + { + if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTCOLOR, &textColor))) + textColor = GetTextColor(hdc); + } Existing code seems wrong already. TMT_FONT and TMT_TEXTCOLOR are not properties, but property types. But this change makes it worse with CLR_INVALID.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/9287#note_119724
On Sun Oct 26 23:21:24 2025 +0000, Nikolay Sivov wrote:
Existing code seems wrong already. TMT_FONT and TMT_TEXTCOLOR are not properties, but property types. But this change makes it worse with CLR_INVALID. Actually TMT_TEXTCOLOR looks fine, but TMT_FONT should probably be using TMT_GLYPHFONT.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/9287#note_119753
participants (3)
-
Mohamad Al-Jaf -
Mohamad Al-Jaf (＠maljaf)
-
Nikolay Sivov (＠nsivov)