wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Martin Storsjo : ntdll: Properly return errors when failing to unwind.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 46a8d39edc2f0e7b276accc2a9adcf969e4c2325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a8d39edc2f0e7b276accc2… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Apr 10 00:42:21 2020 +0300 ntdll: Properly return errors when failing to unwind. If libunwind is unavailable, make libunwind_virtual_unwind return an error. Likewise if there was no PE exception info and we didn't try unwinding using libunwind, we need to return an error when realizing we were unable to unwind, instead of just warning and returning success. This fixes hangs/infinite loops on crashes when unwinding fails. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ea9f47a767c20cdda3d912708b789314f09f8e28) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 6d72938809..d131160a76 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -597,8 +597,10 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX context->u.s.X24, context->u.s.X25, context->u.s.X26, context->u.s.X27 ); TRACE(" x28=%016lx fp=%016lx lr=%016lx sp=%016lx\n", context->u.s.X28, context->u.s.Fp, context->u.s.Lr, context->Sp ); -#endif return STATUS_SUCCESS; +#else + return STATUS_INVALID_DISPOSITION; +#endif } @@ -645,7 +647,11 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX return STATUS_SUCCESS; } } - else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + else + { + WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + return STATUS_INVALID_DISPOSITION; + } dispatch->EstablisherFrame = context->u.s.Fp; dispatch->LanguageHandler = NULL;

1 0

Paul Gofman : d3d11: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 1992dcb5d5df890bc0d082a548bb97e946da530d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1992dcb5d5df890bc0d082a5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 25 21:28:07 2020 +0300 d3d11: Use stricmp() instead of _strnicmp(..., -1). Fixes Epic Games Launcher crash with native ucrtbase.dll. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fa990afbbc4ac09f06be847d35e47389364acf98) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/inputlayout.c | 2 +- dlls/d3d11/shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 9bee927a7b..e27984212b 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -30,7 +30,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { - if (!_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx + if (!stricmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx && e[i].stream_idx == stream_idx) return &e[i]; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 6bec79740b..d51d8e4e60 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1024,7 +1024,7 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * continue; if (e1->Stream == e2->Stream - && !_strnicmp(e1->SemanticName, e2->SemanticName, -1) + && !stricmp(e1->SemanticName, e2->SemanticName) && e1->SemanticIndex == e2->SemanticIndex && e1->StartComponent < e2->StartComponent + e2->ComponentCount && e1->StartComponent + e1->ComponentCount > e2->StartComponent)

1 0

Brendan Shanks : dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 0ee6ca739ee6f6ea2777a861ed372dd5e26bd6e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ee6ca739ee6f6ea2777a861… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Mar 24 17:13:36 2020 -0700 dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f925becd4af104b196440442c50858ea88d3cf17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 01611b0e44..19dd9ad736 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -207,7 +207,7 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); TRACE(" - rglDirection: %p\n", eff->rglDirection); - if (dwFlags & DIEP_DIRECTION) { + if (dwFlags & DIEP_DIRECTION && eff->rglDirection) { TRACE(" "); for (i = 0; i < eff->cAxes; ++i) TRACE("%d ", eff->rglDirection[i]);

1 0

Alistair Leslie-Hughes : shell32: Correct if condition.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 5af9660066d74454922d443fbc8be7def4b2411f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5af9660066d74454922d443f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 20 11:01:42 2020 +1000 shell32: Correct if condition. Spotted by Rafał Mikrut. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49203 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 839f468dce6e716632965d348910e4278bff5a85) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index ff1332087d..63512deb4b 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1838,7 +1838,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView3 *iface, MSG FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%x wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); #endif - if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST)) + if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message<=WM_KEYLAST)) { TRACE("-- key=0x04%lx\n",lpmsg->wParam) ; }

1 0

Zhiyi Zhang : kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 07c2630b48a8164e5cfe238d1d2cccf1f690174a URL: https://source.winehq.org/git/wine.git/?a=commit;h=07c2630b48a8164e5cfe238d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 18 09:52:03 2020 +0800 kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49175 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3cbd9cda195be6afc4290202b6676417812e536b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 9b016a882e..e94904723d 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -3544,7 +3544,7 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(src_url), canonicalized, canonicalized_len, flags); - if (!src_url || !canonicalized || !canonicalized || !*canonicalized_len) + if (!src_url || !canonicalized || !canonicalized_len || !*canonicalized_len) return E_INVALIDARG; if (!*src_url)

1 0

Emilio Cobos Álvarez : widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 95daac2bc175394730c97266480dd6526e570abf URL: https://source.winehq.org/git/wine.git/?a=commit;h=95daac2bc175394730c97266… Author: Emilio Cobos Álvarez <emilio(a)crisal.io> Date: Sun May 17 01:02:04 2020 +0200 widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49173 Signed-off-by: Emilio Cobos Álvarez <emilio(a)crisal.io> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1084ff910864a44d6fd0e0bda6b2b6c64987b2e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/typegen.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a1db88a7c0..04280cbb72 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4813,20 +4813,21 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (is_array( arg->declspec.type ) || is_ptr( arg->declspec.type )) align = pointer_size; else type_memsize_and_alignment( arg->declspec.type, &align ); - if (align >= pointer_size) - fprintf( file, "%s;\n", arg->name ); - else - fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); + if (align < pointer_size) + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + fprintf( file, "%s;\n", arg->name ); } if (add_retval && !is_void( retval->declspec.type )) { print_file(file, 2, "%s", ""); - write_type_decl( file, &retval->declspec, retval->name ); - if (is_array( retval->declspec.type ) || is_ptr( retval->declspec.type ) || - type_memsize( retval->declspec.type ) == pointer_size) - fprintf( file, ";\n" ); - else - fprintf( file, " DECLSPEC_ALIGN(%u);\n", pointer_size ); + write_type_left( file, &retval->declspec, NAME_DEFAULT, TRUE, TRUE ); + if (needs_space_after( retval->declspec.type )) fputc( ' ', file ); + if (!is_array( retval->declspec.type ) && !is_ptr( retval->declspec.type ) && + type_memsize( retval->declspec.type ) != pointer_size) + { + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + } + fprintf( file, "%s;\n", retval->name ); } print_file(file, 1, "} %s;\n", var_decl ); if (needs_packing) print_file( file, 0, "#include <poppack.h>\n" );

1 0

Jacek Caban : widl: Use DECLSPEC_ALIGN in MSVC compatible way.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 5d414891cdf18bc1810ad1a3e3a1b94c7ea116cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d414891cdf18bc1810ad1a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 20:19:59 2020 +0200 widl: Use DECLSPEC_ALIGN in MSVC compatible way. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4fd8190ef1ba37c22904ccb499aea32cc6c0c0a3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9b8aa1a322..a1db88a7c0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4816,7 +4816,7 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (align >= pointer_size) fprintf( file, "%s;\n", arg->name ); else - fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); + fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); } if (add_retval && !is_void( retval->declspec.type )) {

1 0

Gijs Vermeulen : ucrtbase: Add more _o forwards.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: f6ae7c842f9920d9bf43728174ec0f0ca22a377a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ae7c842f9920d9bf437281… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 15 17:35:26 2020 +0200 ucrtbase: Add more _o forwards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49146 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8119865d479fe54bac27f996f153091b479735bf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 502 ++++++++++---------- dlls/ucrtbase/ucrtbase.spec | 504 ++++++++++----------- 2 files changed, 503 insertions(+), 503 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6ae7c842f9920d9bf43…

1 0

Jeff Smith : msvcrt: Stop forwarding iswctype functions to ntdll.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: d892c88c477133b3bdb7002486b59a8202ce4640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d892c88c477133b3bdb70024… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Mar 10 20:59:24 2020 +0100 msvcrt: Stop forwarding iswctype functions to ntdll. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89ca556ac54606879b788880e522f9da65196f63) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crtdll/crtdll.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/msvcrtd/msvcrtd.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 12 files changed, 41 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d892c88c477133b3bdb7…

1 0

Murray Colpman : winex11.drv: Interpret mouse 6/7 as horiz scroll.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: f13f1ec6faddeb916c4065b11c7ea70e4d1b0c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f13f1ec6faddeb916c4065b1… Author: Murray Colpman <muzer(a)tim32.org> Date: Tue May 12 00:39:02 2020 +0100 winex11.drv: Interpret mouse 6/7 as horiz scroll. X11 Mouse buttons 6 and 7 were set to translate into browser back/forward button events. However, this is based on an old convention where buttons 6 and 7 could either mean horizontal scroll or browser back/forward. Nowadays, 6 and 7 solely mean horizontal scroll, 8 and 9 being used for back/forward. In addition, the wide adoption of two-finger two-dimensional scrolling on laptop trackpads since this code was written has meant that back/forward events may be generated unintentionally, which can be very disruptive when using tools such as web browsers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49142 Signed-off-by: Murray Colpman <muzer(a)tim32.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 893080e4df5a45929320ebb88b8668eea316476c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/mouse.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7f0edd9be6..c8a5749a2f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -75,8 +75,8 @@ static const UINT button_down_flags[NB_BUTTONS] = MOUSEEVENTF_RIGHTDOWN, MOUSEEVENTF_WHEEL, MOUSEEVENTF_WHEEL, - MOUSEEVENTF_XDOWN, /* FIXME: horizontal wheel */ - MOUSEEVENTF_XDOWN, + MOUSEEVENTF_HWHEEL, + MOUSEEVENTF_HWHEEL, MOUSEEVENTF_XDOWN, MOUSEEVENTF_XDOWN }; @@ -88,8 +88,8 @@ static const UINT button_up_flags[NB_BUTTONS] = MOUSEEVENTF_RIGHTUP, 0, 0, - MOUSEEVENTF_XUP, - MOUSEEVENTF_XUP, + 0, + 0, MOUSEEVENTF_XUP, MOUSEEVENTF_XUP }; @@ -101,8 +101,8 @@ static const UINT button_down_data[NB_BUTTONS] = 0, WHEEL_DELTA, -WHEEL_DELTA, - XBUTTON1, - XBUTTON2, + -WHEEL_DELTA, + WHEEL_DELTA, XBUTTON1, XBUTTON2 }; @@ -114,8 +114,8 @@ static const UINT button_up_data[NB_BUTTONS] = 0, 0, 0, - XBUTTON1, - XBUTTON2, + 0, + 0, XBUTTON1, XBUTTON2 };

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020