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

[PATCH 1/3] api-ms-win-core-crt-l2-1-0: Update time() .spec file entry.
by Gijs Vermeulen 22 Feb '21

22 Feb '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec index 69f2629c8d50..86651e0a8bcf 100644 --- a/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec +++ b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec @@ -14,5 +14,5 @@ @ cdecl exit(long) msvcrt.exit @ stub hgets @ stub hwprintf -@ cdecl time(ptr) msvcrt.time +@ cdecl -arch=win32 time(ptr) msvcrt.time @ varargs wprintf(wstr) msvcrt.wprintf -- 2.30.1

2 3

[PATCH] comctl32/ipaddress: Only print an error when it actually occurs.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

IPADDRESS_GetPartIndex() is also used for handling WM_KILLFOCUS and WM_SETFOCUS messages. In this case, it's actually expected that the window receiving or losing focus may not be a IP Address part window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/ipaddress.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 82d47d4e576..c7b9ada1f6a 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -130,7 +130,6 @@ static int IPADDRESS_GetPartIndex(const IPADDRESS_INFO *infoPtr, HWND hwnd) for (i = 0; i < 4; i++) if (infoPtr->Part[i].EditHwnd == hwnd) return i; - ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd); return -1; } @@ -503,7 +502,11 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam); - if ( (index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) return 0; + if ((index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) + { + ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd); + return 0; + } part = &infoPtr->Part[index]; if (uMsg == WM_CHAR || uMsg == WM_KEYDOWN) { -- 2.27.0

1 0

[PATCH 6/6] uxtheme: Remove unused code.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/buffer.c | 2 -- dlls/uxtheme/msstyles.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index b07284f8e06..f159d5c1be0 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -52,8 +52,6 @@ static void free_paintbuffer(struct paintbuffer *buffer) static struct paintbuffer *get_buffer_obj(HPAINTBUFFER handle) { - if (!handle) - return NULL; return handle; } diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index cd7677e5783..ed22d923250 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -46,8 +46,6 @@ static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LP static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); -extern int alphaBlendMode; - #define MSSTYLES_VERSION 0x0003 static PTHEME_FILE tfActiveTheme; -- 2.27.0

1 0

[PATCH 5/6] uxtheme: Support DTT_FONTPROP for DrawThemeTextEx().
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 023b2dfd61b..8c3c4ae2218 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1660,6 +1660,7 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId COLORREF textColor; COLORREF oldTextColor; int oldBkMode; + int fontProp; TRACE("%p %p %d %d %s:%d 0x%08x %p %p\n", hTheme, hdc, iPartId, iStateId, debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options); @@ -1667,10 +1668,15 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId if(!hTheme) return E_HANDLE; - if (options->dwFlags & ~DTT_TEXTCOLOR) + if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP)) FIXME("unsupported flags 0x%08x\n", options->dwFlags); - - hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); + + if (options->dwFlags & DTT_FONTPROP) + fontProp = options->iFontPropId; + else + fontProp = TMT_FONT; + + hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, fontProp, &logfont); if(SUCCEEDED(hr)) { hFont = CreateFontIndirectW(&logfont); if(!hFont) -- 2.27.0

1 0

[PATCH 4/6] uxtheme: Support more font properties.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Add support for TMT_HEADING1FONT, TMT_HEADING2FONT and TMT_BODYFONT. TMT_BODYFONT is used by Command Links. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 3 +++ include/tmschema.h | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 1949028581c..20ed1305da8 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -83,6 +83,9 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_FONT, TMT_STATUSFONT, L"STATUSFONT"}, {TMT_FONT, TMT_MSGBOXFONT, L"MSGBOXFONT"}, {TMT_FONT, TMT_ICONTITLEFONT, L"ICONTITLEFONT"}, + {TMT_FONT, TMT_HEADING1FONT, L"HEADING1FONT"}, + {TMT_FONT, TMT_HEADING2FONT, L"HEADING2FONT"}, + {TMT_FONT, TMT_BODYFONT, L"BODYFONT"}, {TMT_BOOL, TMT_FLATMENUS, L"FLATMENUS"}, {TMT_SIZE, TMT_SIZINGBORDERWIDTH, L"SIZINGBORDERWIDTH"}, {TMT_SIZE, TMT_SCROLLBARWIDTH, L"SCROLLBARWIDTH"}, diff --git a/include/tmschema.h b/include/tmschema.h index 15afc48d5cc..2d2eccce11e 100644 --- a/include/tmschema.h +++ b/include/tmschema.h @@ -188,8 +188,11 @@ BEGIN_TM_PROPS() TM_PROP(804, TMT, STATUSFONT, FONT) TM_PROP(805, TMT, MSGBOXFONT, FONT) TM_PROP(806, TMT, ICONTITLEFONT, FONT) + TM_PROP(807, TMT, HEADING1FONT, FONT) + TM_PROP(808, TMT, HEADING2FONT, FONT) + TM_PROP(809, TMT, BODYFONT, FONT) # define TMT_FIRSTFONT TMT_CAPTIONFONT -# define TMT_LASTFONT TMT_ICONTITLEFONT +# define TMT_LASTFONT TMT_BODYFONT /* Bool theme metric properties */ TM_PROP(1001, TMT, FLATMENUS, BOOL) -- 2.27.0

1 0

[PATCH 3/6] uxtheme: Add Command Link part and state definitions.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 13 +++++++++++++ include/tmschema.h | 21 +++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index b38b18b623d..1949028581c 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -374,6 +374,19 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_RADIOBUTTON, GBS_NORMAL, L"NORMAL"}, {BP_RADIOBUTTON, GBS_DISABLED, L"DISABLED"}, {BP_USERBUTTON, 0, L"USERBUTTON"}, + {BP_COMMANDLINK, 0, L"COMMANDLINK"}, + {BP_COMMANDLINK, CMDLS_NORMAL, L"NORMAL"}, + {BP_COMMANDLINK, CMDLS_HOT, L"HOT"}, + {BP_COMMANDLINK, CMDLS_PRESSED, L"PRESSED"}, + {BP_COMMANDLINK, CMDLS_DISABLED, L"DISABLED"}, + {BP_COMMANDLINK, CMDLS_DEFAULTED, L"DEFAULTED"}, + {BP_COMMANDLINK, CMDLS_DEFAULTED_ANIMATING, L"DEFAULTED_ANIMATING"}, + {BP_COMMANDLINKGLYPH, 0, L"COMMANDLINKGLYPH"}, + {BP_COMMANDLINKGLYPH, CMDLGS_NORMAL, L"NORMAL"}, + {BP_COMMANDLINKGLYPH, CMDLGS_HOT, L"HOT"}, + {BP_COMMANDLINKGLYPH, CMDLGS_PRESSED, L"PRESSED"}, + {BP_COMMANDLINKGLYPH, CMDLGS_DISABLED, L"DISABLED"}, + {BP_COMMANDLINKGLYPH, CMDLGS_DEFAULTED, L"DEFAULTED"}, {0, 0, L""} }; diff --git a/include/tmschema.h b/include/tmschema.h index 910de19e2a6..15afc48d5cc 100644 --- a/include/tmschema.h +++ b/include/tmschema.h @@ -411,6 +411,8 @@ BEGIN_TM_CLASS_PARTS(BUTTON) TM_PART(3, BP, CHECKBOX) TM_PART(4, BP, GROUPBOX) TM_PART(5, BP, USERBUTTON) + TM_PART(6, BP, COMMANDLINK) + TM_PART(7, BP, COMMANDLINKGLYPH) END_TM_CLASS_PARTS() /* BUTTON - PUSHBUTTON states */ @@ -456,6 +458,25 @@ BEGIN_TM_PART_STATES(GROUPBOX) TM_STATE(2, GBS, DISABLED) END_TM_PART_STATES() +/* BUTTON - COMMANDLINK states */ +BEGIN_TM_PART_STATES(COMMANDLINK) + TM_STATE(1, CMDLS, NORMAL) + TM_STATE(2, CMDLS, HOT) + TM_STATE(3, CMDLS, PRESSED) + TM_STATE(4, CMDLS, DISABLED) + TM_STATE(5, CMDLS, DEFAULTED) + TM_STATE(6, CMDLS, DEFAULTED_ANIMATING) +END_TM_PART_STATES() + +/* BUTTON - COMMANDLINKGLYPH states */ +BEGIN_TM_PART_STATES(COMMANDLINKGLYPH) + TM_STATE(1, CMDLGS, NORMAL) + TM_STATE(2, CMDLGS, HOT) + TM_STATE(3, CMDLGS, PRESSED) + TM_STATE(4, CMDLGS, DISABLED) + TM_STATE(5, CMDLGS, DEFAULTED) +END_TM_PART_STATES() + /* CLOCK parts */ BEGIN_TM_CLASS_PARTS(CLOCK) TM_PART(1, CLP, TIME) -- 2.27.0

1 0

[PATCH 2/6] comctl32/button: Turn off themed painting if parts are unavailable for Command Links.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Themed painting for Command Links requires BP_COMMANDLINK and BP_COMMANDLINKGLYPH to be defined in the theme. However, Wine currently only supports the v3 theme file format used by XP, which doesn't support Command Links. So turn off themed painting for Command Links if user uses a third party theme that doesn't have the required parts. Otherwise, only plain text is drawn. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 67bf5ceae48..0dcbb38d202 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -276,6 +276,20 @@ static LONG get_default_glyph_size(const BUTTON_INFO *infoPtr) return GetSystemMetrics(SM_CYMENUCHECK); } +static BOOL is_themed_paint_supported(HTHEME theme, UINT btn_type) +{ + if (!theme || !btnThemedPaintFunc[btn_type]) + return FALSE; + + if (btn_type == BS_COMMANDLINK || btn_type == BS_DEFCOMMANDLINK) + { + if (!IsThemePartDefined(theme, BP_COMMANDLINK, 0)) + return FALSE; + } + + return TRUE; +} + static void init_custom_draw(NMCUSTOMDRAW *nmcd, const BUTTON_INFO *infoPtr, HDC hdc, const RECT *rc) { nmcd->hdr.hwndFrom = infoPtr->hwnd; @@ -548,7 +562,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L theme = GetWindowTheme( hWnd ); hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); - if (theme && btnThemedPaintFunc[btn_type]) + if (is_themed_paint_supported(theme, btn_type)) { int drawState = get_draw_state(infoPtr); UINT dtflags = BUTTON_BStoDT(style, GetWindowLongW(hWnd, GWL_EXSTYLE)); -- 2.27.0

1 0

[PATCH 1/6] comctl32/theme_scrollbar: Remove an unused variable.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/theme_scrollbar.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index bb42267bf21..27d31bd4ac5 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -334,16 +334,12 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, &r, NULL); } else { - SCROLLBARINFO sbi; SCROLLINFO si; unsigned int thumbpos, thumbsize; int uppertrackstate, lowertrackstate, thumbstate; RECT partrect, trackrect; SIZE grippersize; - sbi.cbSize = sizeof(sbi); - GetScrollBarInfo(hwnd, OBJID_CLIENT, &sbi); - si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwnd, SB_CTL, &si); -- 2.27.0

1 0

[PATCH] include: Avoid using C++ keyword.
by Jactry Zeng 22 Feb '21

22 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50670 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/shobjidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index e264a3b18e4..52e0c5c9db1 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3984,7 +3984,7 @@ interface IFileOperation : IUnknown [in, unique] IFileOperationProgressSink *sink); HRESULT DeleteItems([in] IUnknown *items); HRESULT NewItem([in] IShellItem *folder, [in] DWORD attributes, - [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template, + [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template_name, [in, unique] IFileOperationProgressSink *sink); HRESULT PerformOperations(); HRESULT GetAnyOperationsAborted([out] BOOL *aborted); -- 2.30.0

1 0

[PATCH] user32/tests: Add optional messages to test sequences.
by Zhiyi Zhang 22 Feb '21

22 Feb '21

Fix a possible test failure on Win10 2009. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix a test failure like in https://testbot.winehq.org/JobDetails.pl?Key=85952#k302 dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 11fb764e6cd..63040ef8e45 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13917,6 +13917,7 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_QUERYNEWPALETTE, sent|optional }, { WM_PALETTEISCHANGING, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOMOVE|SWP_NOSIZE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOREDRAW }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, -- 2.27.0

2 1