February 2021 - Wine-Commits

Zhiyi Zhang : uxtheme: Add Command Link part and state definitions.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 061ac08d6b5710db43cccaba3226c0d185e8ff6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=061ac08d6b5710db43cccaba… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:32:36 2021 +0800 uxtheme: Add Command Link part and state definitions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Zhiyi Zhang : uxtheme: Support DTT_FONTPROP for DrawThemeTextEx().
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 300ecff14545a508d42f97406c5ba5130a5d9c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=300ecff14545a508d42f9740… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:32:56 2021 +0800 uxtheme: Support DTT_FONTPROP for DrawThemeTextEx(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Zhiyi Zhang : uxtheme: Remove unused code.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: c6b100ef98a48585214b501aa93b2cc5c46f1057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b100ef98a48585214b501a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:33:08 2021 +0800 uxtheme: Remove unused code. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Zhiyi Zhang : user32/tests: Add optional messages to test sequences.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: a11ffeec96e5205d281862d9ff61d073e81576f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a11ffeec96e5205d281862d9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 21:39:32 2021 +0800 user32/tests: Add optional messages to test sequences. Fix a possible test failure on Win10 2009. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 11fb764e6cd..7eaa2c67945 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5412,7 +5412,7 @@ static void test_messages(void) { ShowWindow(hwnd, SW_RESTORE); flush_events(); - ok_sequence(WmShowRestoreMinOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", TRUE); + ok_sequence(WmShowRestoreMinOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", FALSE); flush_sequence(); } @@ -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 },

1 0

Jactry Zeng : include: Avoid using C++ keyword.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 27040a4f009f1e35a540882dc150d14431de64a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27040a4f009f1e35a540882d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Feb 22 22:19:46 2021 +0800 include: Avoid using C++ keyword. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50670 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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);

1 0

Zhiyi Zhang : ntoskrnl.exe: Exclude large integer APIs from relay tracing.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: d7a4d757ce576c13ed68194e75f16a10e1f94cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7a4d757ce576c13ed68194e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 18:05:05 2021 +0800 ntoskrnl.exe: Exclude large integer APIs from relay tracing. Similar to 8d7ec7968df1750c9c525817f1366b57fa72d839 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 22968913300..145ea3099d7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1527,16 +1527,16 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ cdecl -private _abnormal_termination() -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() -@ cdecl -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)

1 0

Alexandre Julliard : drmclien: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 7e33f3871b2f3f131907947381697b5dabff836e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e33f3871b2f3f1319079473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:58 2021 +0100 drmclien: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/drmclien/Makefile.in | 2 +- dlls/drmclien/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/drmclien/Makefile.in b/dlls/drmclien/Makefile.in index ebe2df62c28..f0644668bc8 100644 --- a/dlls/drmclien/Makefile.in +++ b/dlls/drmclien/Makefile.in @@ -1,6 +1,6 @@ MODULE = drmclien.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/drmclien/main.c b/dlls/drmclien/main.c index 8483f9fca93..f60b9cbf26f 100644 --- a/dlls/drmclien/main.c +++ b/dlls/drmclien/main.c @@ -26,20 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(drmclien); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - /*********************************************************************** * DllRegisterServer (drmclien.@) */

1 0

Alexandre Julliard : dxva2: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: f24ac09ae6d94e4f2841ed304a2f39a633c299fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f24ac09ae6d94e4f2841ed30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:25:06 2021 +0100 dxva2: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/Makefile.in | 2 +- dlls/dxva2/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index d331512f019..efa37464a9b 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -2,7 +2,7 @@ MODULE = dxva2.dll IMPORTS = uuid ole32 IMPORTLIB = dxva2 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index d784e1b46ab..069f03d8077 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -1212,18 +1212,3 @@ BOOL WINAPI SetVCPFeature( HMONITOR monitor, BYTE vcpCode, DWORD value ) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : davclnt: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: fdd3217558c63125d50679f2b5964874dc50ed94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdd3217558c63125d50679f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:46 2021 +0100 davclnt: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/davclnt/Makefile.in | 2 +- dlls/davclnt/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/davclnt/Makefile.in b/dlls/davclnt/Makefile.in index 70dea6f4e60..f15116f5b61 100644 --- a/dlls/davclnt/Makefile.in +++ b/dlls/davclnt/Makefile.in @@ -1,6 +1,6 @@ MODULE = davclnt.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c index 485de927a42..5859c3c06c5 100644 --- a/dlls/davclnt/main.c +++ b/dlls/davclnt/main.c @@ -29,20 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(davclnt); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - /*********************************************************************** * DavRegisterAuthCallback (davclnt.@) */

1 0

Alexandre Julliard : dwmapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: e701ce3afaab40696eaee46beb07b67838eacafd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e701ce3afaab40696eaee46b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:25:02 2021 +0100 dwmapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/Makefile.in | 2 +- dlls/dwmapi/dwmapi_main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index 3a3691326f8..682bf68b111 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = dwmapi.dll IMPORTLIB = dwmapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ dwmapi_main.c diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 45c33c2169a..b6c89f3a7f8 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -32,20 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hInstDLL ); - break; - } - return TRUE; -} - /********************************************************************** * DwmIsCompositionEnabled (DWMAPI.@) */

1 0