winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
472 discussions
Start a n
N
ew thread
Tag wine-6.0-rc6 : Alexandre Julliard : Release 6.0-rc6
by Alexandre Julliard
08 Jan '21
08 Jan '21
Module: wine Branch: refs/tags/wine-6.0-rc6 Tag: 936e28af2970470cb461d0cb87a22d895df1ba1e URL:
https://source.winehq.org/git/wine.git/?a=tag;h=936e28af2970470cb461d0cb87a…
Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 22:03:21 2021 +0100 Release 6.0-rc6
1
0
0
0
Alexandre Julliard : Release 6.0-rc6.
by Alexandre Julliard
08 Jan '21
08 Jan '21
Module: wine Branch: master Commit: 7d3186e029fb4cf417fab59483a37d8aece95b5d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7d3186e029fb4cf417fab594…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 22:03:21 2021 +0100 Release 6.0-rc6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 127 ++++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 ++++----- 3 files changed, 67 insertions(+), 80 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d3186e029fb4cf417fa…
1
0
0
0
Gabriel Ivăncescu : ntdll: Do not override existing context's RAX when dispatching user APC on x86_64.
by Alexandre Julliard
08 Jan '21
08 Jan '21
Module: wine Branch: master Commit: 22dba3f0fb60c5e477d7b876ce744b878c98f89b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=22dba3f0fb60c5e477d7b876…
Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 8 20:26:16 2021 +0200 ntdll: Do not override existing context's RAX when dispatching user APC on x86_64. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 1fd26d5bd76..cccbfc2a3be 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2049,6 +2049,7 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte { c.ContextFlags = CONTEXT_FULL; NtGetContextThread( GetCurrentThread(), &c ); + c.Rax = STATUS_USER_APC; context = &c; } memmove( &stack->context, context, sizeof(stack->context) ); @@ -2076,7 +2077,6 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "call " __ASM_NAME("setup_user_apc_dispatcher_stack") "\n\t" "movq %rax,%rsp\n\t" "leaq 0x30(%rsp),%rcx\n\t" /* context */ - "movq $0xc0,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ "movq %r12,%rdx\n\t" /* ctx */ "movq %r13,%r8\n\t" /* arg1 */ "movq %r14,%r9\n" /* arg2 */
1
0
0
0
Gabriel Ivăncescu : ntdll: Do not override existing context's EAX when dispatching user APC.
by Alexandre Julliard
08 Jan '21
08 Jan '21
Module: wine Branch: master Commit: 775dac0238845f6696d9ab5053a9238402b0b8a2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=775dac0238845f6696d9ab50…
Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 8 19:29:42 2021 +0200 ntdll: Do not override existing context's EAX when dispatching user APC. Fixes a regression introduced by 175a3649ba04daaad3f2b5b62d6bfe091d6a9e46, which caused Winamp's in_wave module to crash when playing a wav file (the previous behavior only changed EAX when there was no context). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index ff9d8a12c14..f2d58dc654d 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1696,6 +1696,7 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte { c.ContextFlags = CONTEXT_FULL; NtGetContextThread( GetCurrentThread(), &c ); + c.Eax = STATUS_USER_APC; context = &c; } memmove( &stack->context, context, sizeof(stack->context) ); @@ -1704,7 +1705,6 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte stack->arg1 = arg1; stack->arg2 = arg2; stack->func = func; - stack->context.Eax = STATUS_USER_APC; return stack; }
1
0
0
0
Nikolay Sivov : mfplat/tests: Get source events in async mode.
by Alexandre Julliard
08 Jan '21
08 Jan '21
Module: wine Branch: master Commit: f72f1ff9529e3c340f639fc9509011a7933fece8 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f72f1ff9529e3c340f639fc9…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 17:42:34 2021 +0300 mfplat/tests: Get source events in async mode. Fixes test crashes on Windows 7, that happen on synchronous GetEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 95 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b361d4da162..77ac299c918 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -191,6 +191,7 @@ struct test_callback IMFAsyncCallback IMFAsyncCallback_iface; HANDLE event; DWORD param; + IMFMediaEvent *media_event; }; static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) @@ -420,38 +421,77 @@ static const IMFAsyncCallbackVtbl test_create_from_file_handler_callback_vtbl = test_create_from_file_handler_callback_Invoke, }; +static HRESULT WINAPI source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + IMFMediaEventGenerator *generator; + HRESULT hr; + + ok(!!result, "Unexpected result object.\n"); + + generator = (IMFMediaEventGenerator *)IMFAsyncResult_GetStateNoAddRef(result); + + hr = IMFMediaEventGenerator_EndGetEvent(generator, result, &callback->media_event); + ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); + + SetEvent(callback->event); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl events_callback_vtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + source_events_callback_Invoke, +}; + static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected_event_type, PROPVARIANT *value) { + struct test_callback callback = { 0 }; MediaEventType event_type; - HRESULT hr, event_status; - IMFMediaEvent *event; + BOOL ret = FALSE; + HRESULT hr; - hr = IMFMediaEventGenerator_GetEvent(generator, 0, &event); - ok(hr == S_OK, "Failed to get event, hr %#x.\n", hr); + callback.IMFAsyncCallback_iface.lpVtbl = &events_callback_vtbl; + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); - hr = IMFMediaEvent_GetStatus(event, &event_status); - ok(hr == S_OK, "Failed to get status code, hr %#x.\n", hr); - ok(event_status == S_OK, "Unexpected event status code %#x.\n", event_status); + for (;;) + { + hr = IMFMediaEventGenerator_BeginGetEvent(generator, &callback.IMFAsyncCallback_iface, + (IUnknown *)generator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFMediaEvent_GetType(event, &event_type); - ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); - ok(event_type == expected_event_type, "Unexpected event type %u, expected %u.\n", event_type, expected_event_type); + if (WaitForSingleObject(callback.event, 1000) == WAIT_TIMEOUT) + { + ok(0, "timeout\n"); + break; + } - if (event_type != expected_event_type) - { - IMFMediaEvent_Release(event); - return FALSE; - } + Sleep(10); - if (value) - { - hr = IMFMediaEvent_GetValue(event, value); - ok(hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + hr = IMFMediaEvent_GetType(callback.media_event, &event_type); + ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); + + if ((ret = (event_type == expected_event_type))) + { + if (value) + { + hr = IMFMediaEvent_GetValue(callback.media_event, value); + ok(hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + } + + break; + } } - IMFMediaEvent_Release(event); + CloseHandle(callback.event); + if (callback.media_event) + IMFMediaEvent_Release(callback.media_event); - return TRUE; + return ret; } static void test_source_resolver(void) @@ -612,14 +652,13 @@ todo_wine hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); - get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); - ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); - video_stream = (IMFMediaStream *)var.punkVal; - - get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, NULL); + video_stream = NULL; + if (get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var)) + { + ok(var.vt == VT_UNKNOWN, "Unexpected value type.\n"); + video_stream = (IMFMediaStream *)var.punkVal; + } - /* Request samples, our file is 10 frames at 25fps */ - get_event((IMFMediaEventGenerator *)video_stream, MEStreamStarted, NULL); sample_count = 10; for (i = 0; i < sample_count; ++i)
1
0
0
0
Jacek Caban : configure: Check for linker delayload support on mingw hosts.
by Alexandre Julliard
08 Jan '21
08 Jan '21
Module: wine Branch: master Commit: 4b362d016c57c14570efeb9c38dfcc5cf2c0910d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4b362d016c57c14570efeb9c…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 8 14:56:45 2021 +0100 configure: Check for linker delayload support on mingw hosts. Fixes PE-only builds with llvm-mingw. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 27 ++++++++++++++++++++++++++- configure.ac | 3 ++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e6ee28a616d..75fef4144fc 100755 --- a/configure +++ b/configure @@ -17456,7 +17456,32 @@ fi ;; MSVCRTFLAGS="" case $host_os in - mingw32*) ;; + mingw32*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-delayload,autoconftest.dll" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-delayload,autoconftest.dll... " >&6; } +if ${ac_cv_cflags__Wl__delayload_autoconftest_dll+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-delayload,autoconftest.dll" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__delayload_autoconftest_dll=yes +else + ac_cv_cflags__Wl__delayload_autoconftest_dll=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__delayload_autoconftest_dll" >&5 +$as_echo "$ac_cv_cflags__Wl__delayload_autoconftest_dll" >&6; } +if test "x$ac_cv_cflags__Wl__delayload_autoconftest_dll" = xyes; then : + DELAYLOADFLAG="-Wl,-delayload," + +fi ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } if ${ac_cv_cflags__fno_builtin+:} false; then : diff --git a/configure.ac b/configure.ac index beabfeb761c..2c4bd667e8f 100644 --- a/configure.ac +++ b/configure.ac @@ -2060,7 +2060,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= dnl Disable gcc builtins except for Mingw AC_SUBST(MSVCRTFLAGS,"") case $host_os in - mingw32*) ;; + mingw32*) dnl Check for delayload linker support + WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll],[AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) ;; *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac
1
0
0
0
Francois Gouget : testbot/PatchUtils: Add support for .com program tests.
by Alexandre Julliard
08 Jan '21
08 Jan '21
Module: tools Branch: master Commit: deed0b3912a23a72cbd6379870c2f02a6153f39b URL:
https://source.winehq.org/git/tools.git/?a=commit;h=deed0b3912a23a72cbd6379…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 8 02:57:04 2021 +0100 testbot/PatchUtils: Add support for .com program tests. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=48090
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index df31a09..dbd14f2 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -177,7 +177,8 @@ sub _CreateTestInfo($$$) { my ($Impacts, $Root, $Dir) = @_; - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; + # Don't add an extension to programs that have one already + my $Module = ($Root eq "programs" and $Dir !~ /\./) ? "$Dir.exe" : $Dir; $Impacts->{BuildModules}->{$Module} = 1; $Impacts->{IsWinePatch} = 1;
1
0
0
0
Zebediah Figura : kernel32/tests: Add a regression test for a deadlock calling FLS callbacks on process exit.
by Alexandre Julliard
07 Jan '21
07 Jan '21
Module: wine Branch: master Commit: 9bc3a9f78bf5e6a09d4e9811f645def4a477f3d0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=9bc3a9f78bf5e6a09d4e9811…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 7 09:51:03 2021 -0600 kernel32/tests: Add a regression test for a deadlock calling FLS callbacks on process exit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 1b5d0d1393a..3c54351fa7b 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -776,8 +776,76 @@ static void test_FiberLocalStorageWithFibers(PFLS_CALLBACK_FUNCTION cbfunc) test_ConvertFiberToThread(); } +static void WINAPI fls_exit_deadlock_callback(void *arg) +{ + if (arg == (void *)1) + Sleep(INFINITE); + if (arg == (void *)2) + /* Unfortunately this test won't affect the exit code if it fails, but + * at least it will print a failure message. */ + ok(RtlDllShutdownInProgress(), "expected DLL shutdown\n"); +} + +static DWORD CALLBACK fls_exit_deadlock_thread(void *arg) +{ + FlsSetValue((DWORD_PTR)arg, (void *)1); + return 0; +} + +static void fls_exit_deadlock_child(void) +{ + DWORD index = FlsAlloc(fls_exit_deadlock_callback); + FlsSetValue(index, (void *)2); + CreateThread(NULL, 0, fls_exit_deadlock_thread, (void *)(DWORD_PTR)index, 0, NULL); + Sleep(100); + ExitProcess(0); +} + +static void test_fls_exit_deadlock(void) +{ + char **argv, cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + BOOL ret; + + /* Regression test for the following deadlock: + * + * Thread A Thread B + * ----------------------------- + * ExitThread + * acquire FLS lock + * call FLS callback + * ExitProcess + * terminate thread A + * acquire FLS lock + * + * Thread B deadlocks on acquiring the FLS lock (in order to itself call its + * FLS callbacks.) + */ + + winetest_get_mainargs(&argv); + sprintf(cmdline, "%s %s fls_exit_deadlock", argv[0], argv[1]); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "failed to create child, error %u\n", GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(!ret, "wait failed\n"); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + START_TEST(fiber) { + char **argv; + int argc; + + argc = winetest_get_mainargs(&argv); + + if (argc == 3 && !strcmp(argv[2], "fls_exit_deadlock")) + { + fls_exit_deadlock_child(); + return; + } + init_funcs(); if (!pCreateFiber) @@ -790,4 +858,5 @@ START_TEST(fiber) test_FiberLocalStorage(); test_FiberLocalStorageCallback(FiberLocalStorageProc); test_FiberLocalStorageWithFibers(FiberLocalStorageProc); + test_fls_exit_deadlock(); }
1
0
0
0
Zebediah Figura : ntdll: Set the process detaching flag before calling FLS callbacks.
by Alexandre Julliard
07 Jan '21
07 Jan '21
Module: wine Branch: master Commit: 16592ca918999dd28764e071384361ea44bdf11d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=16592ca918999dd28764e071…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 7 09:51:02 2021 -0600 ntdll: Set the process detaching flag before calling FLS callbacks. So that we will not deadlock trying to acquire fls_section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9b7e30b2c2b..3f43062f9f8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3182,12 +3182,14 @@ fail: */ void WINAPI LdrShutdownProcess(void) { + BOOL detaching = process_detaching; + TRACE("()\n"); - if (!process_detaching) + process_detaching = TRUE; + if (!detaching) RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 1 ); - process_detaching = TRUE; process_detach(); }
1
0
0
0
Zebediah Figura : user32: Send WM_CANCELMODE to the current capture window after initializing a modal dialog.
by Alexandre Julliard
07 Jan '21
07 Jan '21
Module: wine Branch: master Commit: 32f5dfde0db785b862af1c8a81152f268c08fa47 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=32f5dfde0db785b862af1c8a…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:48 2021 -0600 user32: Send WM_CANCELMODE to the current capture window after initializing a modal dialog. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=48860
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 5 +++++ dlls/user32/tests/dialog.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 9bf3470921d..c48f404eceb 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -667,6 +667,8 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (DIALOG_CreateControls32( hwnd, dlgTemplate, &template, hInst, unicode )) { + HWND capture; + /* Send initialisation messages and set focus */ if (dlgProc) @@ -695,6 +697,9 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } } + if (modal_owner && (capture = GetCapture())) + SendMessageW( capture, WM_CANCELMODE, 0, 0 ); + if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 33469377bcc..fcfaf5c12d6 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2192,7 +2192,7 @@ static INT_PTR CALLBACK capture_release_proc(HWND dialog, UINT message, WPARAM w HWND child = (HWND)lparam; DWORD style; - todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + ok(!GetCapture(), "got capture %p\n", GetCapture()); style = GetWindowLongA(child, GWL_STYLE); ok(!(style & WS_DISABLED), "child should not be disabled\n"); @@ -2233,12 +2233,12 @@ static void test_capture_release(void) SetCapture(child); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", NULL, capture_release_proc, (LPARAM)child); ok(ret == 1, "got %#Ix\n", ret); - todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + ok(!GetCapture(), "got capture %p\n", GetCapture()); SetCapture(child); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", window, capture_release_proc, (LPARAM)child); ok(ret == 1, "got %#Ix\n", ret); - todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + ok(!GetCapture(), "got capture %p\n", GetCapture()); SetCapture(child); dialog = CreateDialogParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG",
1
0
0
0
← Newer
1
...
40
41
42
43
44
45
46
47
48
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
Results per page:
10
25
50
100
200