- Wine-Devel - list.winehq.org

[PATCH 4/5] ntdll: Use syscall dispatcher for restoring context in x86_64 NtSetContextThread implementation.
by Jacek Caban Feb. 22, 2021

Feb. 22, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/server.c | 5 ++++- dlls/ntdll/unix/signal_arm.c | 10 ++++++++++ dlls/ntdll/unix/signal_arm64.c | 10 ++++++++++ dlls/ntdll/unix/signal_i386.c | 11 +++++++++++ dlls/ntdll/unix/signal_x86_64.c | 29 ++++++++++++++++++++++------- dlls/ntdll/unix/unix_private.h | 1 + tools/winebuild/import.c | 13 ++++++++++++- 7 files changed, 70 insertions(+), 9 deletions(-)

1 0

[PATCH 3/5] ntdll: Use NtContinue in RtlRestoreContext.
by Jacek Caban Feb. 22, 2021

Feb. 22, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 2/5] ntdll: Use NtContinue in NtRaiseException.
by Jacek Caban Feb. 22, 2021

Feb. 22, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/5] ntdll: Use syscall frames in x86_64 NtSetContextThread implementation.
by Jacek Caban Feb. 22, 2021

Feb. 22, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 163 +++++++++++++++++++------------- 1 file changed, 97 insertions(+), 66 deletions(-)

1 0

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

Feb. 22, 2021

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 Feb. 22, 2021

Feb. 22, 2021

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 Feb. 22, 2021

Feb. 22, 2021

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 Feb. 22, 2021

Feb. 22, 2021

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 Feb. 22, 2021

Feb. 22, 2021

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 Feb. 22, 2021

Feb. 22, 2021

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