September 2022 - Wine-Commits

Eric Pouech : dbghelp: Fix local scope reset upon module unloading.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: 25108ba26617ecbe10900d56977f1952f9bd2549 URL: https://gitlab.winehq.org/wine/wine/-/commit/25108ba26617ecbe10900d56977f19… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Sep 26 18:19:38 2022 +0200 dbghelp: Fix local scope reset upon module unloading. Change strategy for resetting local scope when unloading a module. Old strategy was keeping the local scoped symbol alive on some code path when unloading a module. This caused some bad behavior as we kept a pointer to a deleted object. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cd34b81460f..5a0769f25a4 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1009,6 +1009,23 @@ BOOL module_remove(struct process* pcs, struct module* module) TRACE("%s (%p)\n", debugstr_w(module->modulename), module); + /* remove local scope if symbol is from this module */ + if (pcs->localscope_symt) + { + struct symt* locsym = pcs->localscope_symt; + if (symt_check_tag(locsym, SymTagInlineSite)) + locsym = &symt_get_function_from_inlined((struct symt_inlinesite*)locsym)->symt; + if (symt_check_tag(locsym, SymTagFunction)) + { + locsym = ((struct symt_function*)locsym)->container; + if (symt_check_tag(locsym, SymTagCompiland) && + module == ((struct symt_compiland*)locsym)->container->module) + { + pcs->localscope_pc = 0; + pcs->localscope_symt = NULL; + } + } + } for (i = 0; i < DFI_LAST; i++) { if ((modfmt = module->format_info[i]) && modfmt->remove) @@ -1058,13 +1075,6 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) if (!pcs) return FALSE; module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); if (!module) return FALSE; - /* remove local scope if defined inside this module */ - if (pcs->localscope_pc >= module->module.BaseOfImage && - pcs->localscope_pc < module->module.BaseOfImage + module->module.ImageSize) - { - pcs->localscope_pc = 0; - pcs->localscope_symt = NULL; - } module_remove(pcs, module); return TRUE; }

1 0

Zhiyi Zhang : vulkan-1/tests: Fix test failures on llvmpipe.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: e3c0f6b3cedd7b27087976fddd6bbe6fd33fd84d URL: https://gitlab.winehq.org/wine/wine/-/commit/e3c0f6b3cedd7b27087976fddd6bbe… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 vulkan-1/tests: Fix test failures on llvmpipe. This happens because the llvmpipe virtual GPU is not in the RandR provider list when there is a hardware GPU driving the screen. So LUID for the llvmpipe is not generated in such cases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52931 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 11d20120d1d..b9a36a55653 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -212,11 +212,16 @@ static void test_enumerate_physical_device2(void) trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08lx:%08lx.\n", properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); + todo_wine_if(!id.deviceLUIDValid && strstr(properties2.properties.deviceName, "llvmpipe")) ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); - /* If deviceLUIDValid is VK_TRUE, deviceNodeMask must contain exactly one bit according - * to the Vulkan specification */ - ok(id.deviceNodeMask && !(id.deviceNodeMask & (id.deviceNodeMask - 1)), - "Expect deviceNodeMask to have only one bit set, got %#x.\n", id.deviceNodeMask); + if (id.deviceLUIDValid == VK_TRUE) + { + /* If deviceLUIDValid is VK_TRUE, deviceNodeMask must contain exactly one bit + * according to the Vulkan specification */ + ok(id.deviceNodeMask && !(id.deviceNodeMask & (id.deviceNodeMask - 1)), + "Expect deviceNodeMask to have only one bit set, got %#x.\n", + id.deviceNodeMask); + } } }

1 0

Brendan Shanks : rpcrt4: Set the name of internal threads.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: 3f0166fa89616e409e0381415e23302479100d3a URL: https://gitlab.winehq.org/wine/wine/-/commit/3f0166fa89616e409e0381415e2330… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Sep 23 09:49:25 2022 -0700 rpcrt4: Set the name of internal threads. --- dlls/rpcrt4/rpc_server.c | 2 ++ dlls/rpcrt4/rpc_transport.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index cb62c59e368..30ff585ad50 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -551,6 +551,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) ULONG auth_length; TRACE("(%p)\n", conn); + SetThreadDescription(GetCurrentThread(), L"wine_rpcrt4_io"); for (;;) { msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RPC_MESSAGE)); @@ -648,6 +649,7 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg) BOOL set_ready_event = FALSE; TRACE("(the_arg == ^%p)\n", the_arg); + SetThreadDescription(GetCurrentThread(), L"wine_rpcrt4_server"); for (;;) { objs = cps->ops->get_wait_array(cps, objs, &count); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8c615b71dd9..9509b2850b6 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1802,6 +1802,8 @@ static DWORD CALLBACK rpcrt4_http_timer_thread(PVOID param) HttpTimerThreadData data; DWORD timeout; + SetThreadDescription(GetCurrentThread(), L"wine_rpcrt4_http_timer"); + data = *data_in; HeapFree(GetProcessHeap(), 0, data_in);

1 0

Alexandre Julliard : quartz/tests: Mark some tests as flaky.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: c738be12e1e425f0acd9e65d788d735f7214f892 URL: https://gitlab.winehq.org/wine/wine/-/commit/c738be12e1e425f0acd9e65d788d73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 19:57:55 2022 +0200 quartz/tests: Mark some tests as flaky. --- dlls/quartz/tests/filtergraph.c | 3 +++ dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 0e9a398ad2c..2c07dc49356 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -430,6 +430,7 @@ static void test_state_change(IFilterGraph2 *graph) hr = IMediaControl_Pause(control); ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); hr = IMediaControl_GetState(control, 1000, &state); + flaky_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(state == State_Paused, "Got state %ld.\n", state); @@ -519,10 +520,12 @@ static void test_media_event(IFilterGraph2 *graph) } } } + flaky_wine ok(got_eos, "didn't get EOS\n"); hr = IMediaSeeking_GetCurrentPosition(seeking, &current); ok(hr == S_OK, "Got hr %#lx.\n", hr); + flaky_wine ok(current == stop, "expected %s, got %s\n", wine_dbgstr_longlong(stop), wine_dbgstr_longlong(current)); hr = IMediaControl_Stop(control); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c76dae15e91..0c5f7f440ef 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1723,6 +1723,7 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw style = GetWindowLongA(hwnd, GWL_STYLE); ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#lx.\n", style); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); hr = IVideoWindow_get_WindowStyleEx(window, &style); @@ -2349,6 +2350,7 @@ static void test_video_window(void) filter = create_video_renderer(); flush_events(); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); IBaseFilter_FindPin(filter, L"In", &pin); @@ -2385,6 +2387,7 @@ static void test_video_window(void) hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == S_OK, "Got hr %#lx.\n", hr); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); test_video_window_caption(window, hwnd); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 88c82bec0d3..0e5aa89265a 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1725,6 +1725,7 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw style = GetWindowLongA(hwnd, GWL_STYLE); ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#lx.\n", style); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); hr = IVideoWindow_get_WindowStyleEx(window, &style); @@ -2354,6 +2355,7 @@ static void test_video_window(void) filter = create_vmr7(0); flush_events(); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -2407,6 +2409,7 @@ static void test_video_window(void) IMemAllocator_Release(allocator); } + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); test_video_window_caption(window, hwnd); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 405f7ee89ba..1d3fa207e18 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1949,6 +1949,7 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw style = GetWindowLongA(hwnd, GWL_STYLE); ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#lx.\n", style); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); hr = IVideoWindow_get_WindowStyleEx(window, &style); @@ -2580,6 +2581,7 @@ static void test_video_window(void) filter = create_vmr9(VMR9Mode_Windowed); flush_events(); + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -2632,6 +2634,7 @@ static void test_video_window(void) IMemAllocator_Release(allocator); } + flaky_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); test_video_window_caption(window, hwnd);

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.5.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: c3025582fd5be155ce8231ccce4d69916856dec7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3025582fd5be155ce8231ccce4d69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 10:57:38 2022 +0200 vkd3d: Import upstream release 1.5. --- libs/vkd3d/AUTHORS | 1 + libs/vkd3d/include/private/vkd3d_version.h | 2 +- libs/vkd3d/include/vkd3d.h | 3 + libs/vkd3d/include/vkd3d_shader.h | 22 + libs/vkd3d/libs/vkd3d-shader/hlsl.c | 643 ++++++++++++---- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 75 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 808 ++++++++++++++------- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 740 +++++++++++++------ libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 187 ++++- libs/vkd3d/libs/vkd3d-shader/hlsl_sm1.c | 13 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm4.c | 130 +++- libs/vkd3d/libs/vkd3d-shader/spirv.c | 20 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 1 + libs/vkd3d/libs/vkd3d/command.c | 41 +- libs/vkd3d/libs/vkd3d/device.c | 43 +- libs/vkd3d/libs/vkd3d/state.c | 21 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 5 +- 17 files changed, 2070 insertions(+), 685 deletions(-)

1 0

Brendan Shanks : ntdll: Set the name of internal thread pool threads.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: fa8e36fafa57e5bc2761669ae68fa6fe9ef89c09 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa8e36fafa57e5bc2761669ae68fa6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Sep 23 09:57:43 2022 -0700 ntdll: Set the name of internal thread pool threads. --- dlls/ntdll/threadpool.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 827232b2143..421d1ade133 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -396,6 +396,14 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } +static void set_thread_name(const WCHAR *name) +{ + THREAD_NAME_INFORMATION info; + + RtlInitUnicodeString(&info.ThreadName, name); + NtSetInformationThread(GetCurrentThread(), ThreadNameInformation, &info, sizeof(info)); +} + static void CALLBACK process_rtl_work_item( TP_CALLBACK_INSTANCE *instance, void *userdata ) { struct rtl_work_item *item = userdata; @@ -703,6 +711,7 @@ static void WINAPI timer_queue_thread_proc(LPVOID p) struct timer_queue *q = p; ULONG timeout_ms; + set_thread_name(L"wine_threadpool_timer_queue"); timeout_ms = INFINITE; for (;;) { @@ -1052,6 +1061,7 @@ static void CALLBACK timerqueue_thread_proc( void *param ) struct list *ptr; TRACE( "starting timer queue thread\n" ); + set_thread_name(L"wine_threadpool_timerqueue"); RtlEnterCriticalSection( &timerqueue.cs ); for (;;) @@ -1241,6 +1251,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) NTSTATUS status; TRACE( "starting wait queue thread\n" ); + set_thread_name(L"wine_threadpool_waitqueue"); RtlEnterCriticalSection( &waitqueue.cs ); @@ -1511,6 +1522,7 @@ static void CALLBACK ioqueue_thread_proc( void *param ) NTSTATUS status; TRACE( "starting I/O completion thread\n" ); + set_thread_name(L"wine_threadpool_ioqueue"); RtlEnterCriticalSection( &ioqueue.cs ); @@ -2323,6 +2335,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) struct list *ptr; TRACE( "starting worker thread for pool %p\n", pool ); + set_thread_name(L"wine_threadpool_worker"); RtlEnterCriticalSection( &pool->cs ); for (;;)

1 0

Alexandre Julliard : dinput/tests: Mark a mouse input test as flaky.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: 48f99c41455dd1b7727bcc82e07e24428820465b URL: https://gitlab.winehq.org/wine/wine/-/commit/48f99c41455dd1b7727bcc82e07e24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 19:59:14 2022 +0200 dinput/tests: Mark a mouse input test as flaky. --- dlls/dinput/tests/device8.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index ebe376d1127..e779b56092a 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -2032,12 +2032,16 @@ static void test_sys_mouse( DWORD version ) ok( hr == (version < 0x800 ? DI_OK : DI_BUFFEROVERFLOW), "GetDeviceData returned %#lx\n", hr ); count = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(objdata), &objdata, &count, 0 ); + + flaky_wine_if (hr == DIERR_NOTACQUIRED) ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); ok( count == 1, "got count %lu\n", count ); - hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "Unacquire returned %#lx\n", hr ); - + if (hr != DIERR_NOTACQUIRED) + { + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned %#lx\n", hr ); + } tmp_hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE, 50, 250, 200, 200, NULL, NULL, NULL, NULL );

1 0

Alexandre Julliard : mmdevapi/tests: Mark some capture tests as flaky.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: 2742660e08a3496f44ec9d0d4fbfc26b5f51f31e URL: https://gitlab.winehq.org/wine/wine/-/commit/2742660e08a3496f44ec9d0d4fbfc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 19:56:58 2022 +0200 mmdevapi/tests: Mark some capture tests as flaky. --- dlls/mmdevapi/tests/capture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 9d3d13dcaae..e7865457cbe 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -184,9 +184,11 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) * whereas GetCurrentPadding grows when input is not consumed. */ hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr); + flaky_wine ok(next < pad, "GetNextPacketSize %u vs. GCP %u\n", next, pad); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); ok(next == frames, "GetNextPacketSize %u vs. GetBuffer %u\n", next, frames); @@ -256,6 +258,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) } frames = period; + flaky_wine ok(next == frames, "GetNextPacketSize %u vs. GetDevicePeriod %u\n", next, frames); /* GetBufferSize is not a multiple of the period size! */ @@ -269,6 +272,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); trace("Overrun position %d pad %u flags %lx, amount of frames locked: %u\n", @@ -296,6 +300,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); trace("Cont'ed position %d pad %u flags %lx, amount of frames locked: %u\n", @@ -317,6 +322,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); @@ -324,6 +330,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) trace("Restart position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); + flaky_wine ok(pad > sum, "restarted GCP %u\n", pad); /* GCP is still near buffer size */ if(frames){ @@ -366,6 +373,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); trace("Running position %d pad %u flags %lx, amount of frames locked: %u\n", SUCCEEDED(hr) ? (UINT)pos : -1, pad, flags, frames);

1 0

Alexandre Julliard : user32/tests: Mark some input tests as flaky.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: 3af6ececec418698d84ef70dcd5068d183e003e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/3af6ececec418698d84ef70dcd5068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 18:43:28 2022 +0200 user32/tests: Mark some input tests as flaky. --- dlls/user32/tests/input.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 37b1a4aef6d..09e1ca1f961 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2584,6 +2584,7 @@ static void rawinput_test_process(void) raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = 0; + flaky_wine ok(rawinput_test_received_legacy, "%d: foreground process expected WM_MOUSEMOVE message\n", i); ok(rawinput_test_received_raw, "%d: foreground process expected WM_INPUT message\n", i); ok(rawinput_test_received_rawfg, "%d: foreground process expected RIM_INPUT message\n", i); @@ -2853,6 +2854,7 @@ static void test_rawinput(const char* argv0) SetEvent(process_done); SetEvent(params.done); + flaky_wine if (!skipped) { todo_wine_if(rawinput_tests[i].todo_legacy) @@ -3432,6 +3434,7 @@ static LRESULT CALLBACK mouse_move_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L POINT pt = {LOWORD(lparam), HIWORD(lparam)}; MapWindowPoints(hwnd, NULL, &pt, 1); + flaky if (pt.x != last_x) ok( pt.x == expect_x, "got unexpected WM_MOUSEMOVE x %ld, expected %ld\n", pt.x, expect_x ); expect_x = pt.x == 200 ? 210 : 200; @@ -3583,6 +3586,7 @@ static void test_Input_mouse(void) SetEvent(thread_data.end_event); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + flaky_wine ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); ok(!got_button_up, "unexpected WM_RBUTTONUP message\n");

1 0

Alexandre Julliard : tests: Do not report flaky tests as failures by default.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: c19f88646a594f2ca424b29a6b0dea3a30c8ac8a URL: https://gitlab.winehq.org/wine/wine/-/commit/c19f88646a594f2ca424b29a6b0dea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 10:43:46 2022 +0200 tests: Do not report flaky tests as failures by default. --- include/wine/test.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index e502c967d9b..94d92e19c57 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -44,8 +44,8 @@ extern int winetest_time; /* running in interactive mode? */ extern int winetest_interactive; -/* always count flaky tests as successful (BOOL) */ -extern int winetest_allow_flaky; +/* report failed flaky tests as failures (BOOL) */ +extern int winetest_report_flaky; /* report successful tests (BOOL) */ extern int winetest_report_success; @@ -207,8 +207,8 @@ int winetest_interactive = 0; /* current platform */ const char *winetest_platform = "windows"; -/* always count flaky tests as successful (BOOL) */ -int winetest_allow_flaky; +/* report failed flaky tests as failures (BOOL) */ +int winetest_report_flaky = 0; /* report successful tests (BOOL) */ int winetest_report_success = 0; @@ -731,7 +731,7 @@ static int run_test( const char *name ) winetest_print_unlock(); } status = failures + todo_failures; - if (!winetest_allow_flaky) status += flaky_failures; + if (winetest_report_flaky) status += flaky_failures; if (status > 255) status = 255; return status; } @@ -807,7 +807,7 @@ int main( int argc, char **argv ) } if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); - if (GetEnvironmentVariableA( "WINETEST_ALLOW_FLAKY", p, sizeof(p) )) winetest_allow_flaky = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_REPORT_FLAKY", p, sizeof(p) )) winetest_report_flaky = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); winetest_last_time = winetest_start_time = GetTickCount();

1 0