- Wine-Devel - list.winehq.org

[website] German translation for release 6.0-rc4
by Julian Rüger Jan. 11, 2021

Jan. 11, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.0-rc3
by Julian Rüger Jan. 11, 2021

Jan. 11, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] server: Accept DBG_EXCEPTION_HANDLED parameter in continue_debug_event.
by Rémi Bernon Jan. 10, 2021

Jan. 10, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50453 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 27 ++++++++++++++------------- server/debugger.c | 1 + 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ca338775351..202a939b76f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1053,7 +1053,7 @@ static void test_exceptions(void) ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res ); } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -1081,7 +1081,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -1091,7 +1091,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -3288,7 +3288,7 @@ static void test_rtlraiseexception(void) run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -3316,7 +3316,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -3326,7 +3326,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -4252,7 +4252,7 @@ static void test_thread_context(void) #undef COMPARE } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -4280,7 +4280,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -4290,7 +4290,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -5500,7 +5500,7 @@ static void test_thread_context(void) #undef COMPARE } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -5528,7 +5528,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -5538,7 +5538,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -8346,7 +8346,8 @@ START_TEST(exception) #endif - test_debugger(); + test_debugger(DBG_EXCEPTION_HANDLED); + test_debugger(DBG_CONTINUE); test_thread_context(); test_outputdebugstring(1, FALSE); test_ripevent(1); diff --git a/server/debugger.c b/server/debugger.c index e4a6c1e43a8..ee95d4ee326 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -677,6 +677,7 @@ DECL_HANDLER(continue_debug_event) struct process *process; if (req->status != DBG_EXCEPTION_NOT_HANDLED && + req->status != DBG_EXCEPTION_HANDLED && req->status != DBG_CONTINUE && req->status != DBG_REPLY_LATER) { -- 2.29.2

3 7

Wine staging 6.0-rc6 release
by Alistair Leslie-Hughes Jan. 8, 2021

Jan. 8, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0-rc6 (784 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * [21014] dsound: IDirectSoundBuffer8 GetStatus return DSBSTATUS_LOCSOFTWARE for deferred buffers Updated: * ntdll-NtAlertThreadByThreadId Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] ntdll: Do not override existing context's RAX when dispatching user APC on x64.
by Gabriel Ivăncescu Jan. 8, 2021

Jan. 8, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- 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 1fd26d5..cccbfc2 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 */ -- 2.29.2

1 0

[PATCH] ntdll: Do not override existing context's EAX when dispatching user APC.
by Gabriel Ivăncescu Jan. 8, 2021

Jan. 8, 2021

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> --- 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 ff9d8a1..f2d58dc 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; } -- 2.29.2

2 2

[PATCH] configure: Check for linker delayload support on mingw hosts.
by Jacek Caban Jan. 8, 2021

Jan. 8, 2021

Fixes PE-only builds with llvm-mingw. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+)

2 3

Re: TestBot job 83876 results: [PATCH] mfplat/tests: Get source events in async mode.
by Nikolay Sivov Jan. 8, 2021

Jan. 8, 2021

On 1/8/21 5:50 PM, Marvin wrote: > === w7u_2qxl (32 bit report) === > > mfplat: > mfplat.c:5072: Test failed: Failed to allocate a queue, hr 0x80070057. > mfplat.c:5076: Test failed: Failed to queue work item, hr 0xc00d36bb. > mfplat.c:5009: Test failed: Timed out waiting for the child process > > === w7u_adm (32 bit report) === > > mfplat: > mfplat.c:5072: Test failed: Failed to allocate a queue, hr 0x80070057. > mfplat.c:5076: Test failed: Failed to queue work item, hr 0xc00d36bb. > mfplat.c:5009: Test failed: Timed out waiting for the child process That's fine, new failures that were not visible before due to earlier crash. > === wvistau64 (64 bit report) === > > mfplat: > mfplat: Timeout This one is sort of expected, it's about using some export from mfplat that does not exist on Vista.

1 0

[PATCH] mfplat/tests: Get source events in async mode.
by Nikolay Sivov Jan. 8, 2021

Jan. 8, 2021

Fixes test crashes on Windows 7, that happen on synchronous GetEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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) -- 2.29.2

2 1

[tools] testbot/PatchUtils: Add support for .com program tests.
by Francois Gouget Jan. 7, 2021

Jan. 7, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48090 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- 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 df31a095a7..dbd14f2005 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; -- 2.20.1

1 0