February 2022 - Wine-devel - list.winehq.org

[PATCH 6/6] win32u: Move IsWindow implementation from user32.
by Jacek Caban 25 Feb '22

25 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I considered using GetWindowThreadProcessId() for IsWindow instead, but that wouldn't do the right thing for things like desktops created directly by server. If we had shared handle table, both this patch and the previous one could be implemented on PE side (without syscall nor server call), but even then we'd need something exposed to drivers. dlls/user32/win.c | 21 +------------------ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 40 ++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 7 +++++++ 7 files changed, 57 insertions(+), 21 deletions(-)

3 2

[PATCH 5/6] win32u: Move GetWindowThreadProcessId implementation from user32.
by Jacek Caban 25 Feb '22

25 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 31 +-------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 53 ++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 ++++ include/ntuser.h | 7 +++++ 7 files changed, 70 insertions(+), 31 deletions(-)

2 1

[PATCH 4/6] win32u: Move call_hooks implementation from user32.
by Jacek Caban 25 Feb '22

25 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 155 ++--------------------------------- dlls/win32u/hook.c | 51 ++++++++++++ dlls/win32u/sysparams.c | 5 ++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 1 + 5 files changed, 65 insertions(+), 148 deletions(-)

3 2

[PATCH 3/6] win32u: Move NtUserCallNextHookEx implementation from user32.
by Jacek Caban 25 Feb '22

25 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 34 ---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/hook.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 8 files changed, 47 insertions(+), 36 deletions(-)

3 2

[PATCH 2/6] win32u: Move call_current_hook implementation from user32.
by Jacek Caban 25 Feb '22

25 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 46 +++++-------- dlls/user32/message.c | 13 +--- dlls/user32/user_main.c | 2 + dlls/user32/user_private.h | 16 ++--- dlls/win32u/hook.c | 121 ++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 8 +++ dlls/win32u/ntuser_private.h | 7 ++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 19 +++++- 9 files changed, 179 insertions(+), 54 deletions(-)

2 1

[PATCH 1/6] win32u: Partially move handle_internal_message from user32.
by Jacek Caban 25 Feb '22

25 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 21 ++------------------- dlls/user32/message.c | 22 +++++++++------------- dlls/win32u/driver.c | 1 + dlls/win32u/message.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +++ dlls/win32u/sysparams.c | 5 +++++ include/ntuser.h | 1 + 7 files changed, 49 insertions(+), 32 deletions(-)

2 1

[PATCH 1/5] dinput/tests: Add some windows.gaming.input hotplug tests.
by Rémi Bernon 25 Feb '22

25 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/Makefile.in | 2 +- dlls/dinput/tests/hotplug.c | 244 ++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 5ba0e5be4d7..d32092ca03b 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dinput.dll -IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm +IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm combase driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 39f80774012..49cc5423807 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -32,11 +32,21 @@ #include "dinputd.h" #include "devguid.h" #include "dbt.h" +#include "unknwn.h" +#include "winstring.h" #include "wine/hid.h" #include "dinput_test.h" +#include "initguid.h" +#include "roapi.h" +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Gaming_Input +#include "windows.gaming.input.h" + static BOOL test_input_lost( DWORD version ) { #include "psh_hid_macros.h" @@ -322,6 +332,7 @@ static void test_RegisterDeviceNotification(void) while (device_change_count < device_change_expect) { + MsgWaitForMultipleObjects( 0, NULL, FALSE, INFINITE, QS_ALLINPUT ); while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) { TranslateMessage( &msg ); @@ -355,6 +366,7 @@ static void test_RegisterDeviceNotification(void) while (device_change_count < device_change_expect) { + MsgWaitForMultipleObjects( 0, NULL, FALSE, INFINITE, QS_ALLINPUT ); while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) { TranslateMessage( &msg ); @@ -385,6 +397,7 @@ static void test_RegisterDeviceNotification(void) while (device_change_count < device_change_expect) { + MsgWaitForMultipleObjects( 0, NULL, FALSE, INFINITE, QS_ALLINPUT ); while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) { TranslateMessage( &msg ); @@ -404,6 +417,236 @@ static void test_RegisterDeviceNotification(void) UnregisterClassW( class.lpszClassName, class.hInstance ); } +struct controller_handler +{ + IEventHandler_RawGameController IEventHandler_RawGameController_iface; + BOOL invoked; +}; + +static inline struct controller_handler *impl_from_IEventHandler_RawGameController( IEventHandler_RawGameController *iface ) +{ + return CONTAINING_RECORD( iface, struct controller_handler, IEventHandler_RawGameController_iface ); +} + +static HRESULT WINAPI controller_handler_QueryInterface( IEventHandler_RawGameController *iface, REFIID iid, void **out ) +{ + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IEventHandler_RawGameController )) + { + IUnknown_AddRef( iface ); + *out = iface; + return S_OK; + } + + trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI controller_handler_AddRef( IEventHandler_RawGameController *iface ) +{ + return 2; +} + +static ULONG WINAPI controller_handler_Release( IEventHandler_RawGameController *iface ) +{ + return 1; +} + +static HRESULT WINAPI controller_handler_Invoke( IEventHandler_RawGameController *iface, + IInspectable *sender, IRawGameController *controller ) +{ + struct controller_handler *impl = impl_from_IEventHandler_RawGameController( iface ); + + trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); + + ok( sender == NULL, "got sender %p\n", sender ); + impl->invoked = TRUE; + + return S_OK; +} + +static const IEventHandler_RawGameControllerVtbl controller_handler_vtbl = +{ + controller_handler_QueryInterface, + controller_handler_AddRef, + controller_handler_Release, + controller_handler_Invoke, +}; + +static struct controller_handler controller_removed = {{&controller_handler_vtbl}}; +static struct controller_handler controller_added = {{&controller_handler_vtbl}}; + +static LRESULT CALLBACK windows_gaming_input_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + if (msg == WM_DEVICECHANGE) + { + winetest_push_context( "%u", device_change_count ); + if (device_change_count++ >= device_change_expect / 2) + { + ok( wparam == DBT_DEVICEREMOVECOMPLETE, "got wparam %#Ix\n", wparam ); + ok( controller_added.invoked, "controller added handler not invoked\n" ); + ok( controller_removed.invoked, "controller removed handler not invoked\n" ); + } + else + { + ok( wparam == DBT_DEVICEARRIVAL, "got wparam %#Ix\n", wparam ); + ok( !controller_added.invoked, "controller added handler not invoked\n" ); + ok( !controller_removed.invoked, "controller removed handler invoked\n" ); + } + winetest_pop_context(); + } + + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +static void test_windows_gaming_input(void) +{ + static const WCHAR *class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; + DEV_BROADCAST_DEVICEINTERFACE_A iface_filter_a = + { + .dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE_A), + .dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE, + .dbcc_classguid = GUID_DEVINTERFACE_HID, + }; + WNDCLASSEXW class = + { + .cbSize = sizeof(WNDCLASSEXW), + .hInstance = GetModuleHandleW( NULL ), + .lpszClassName = L"devnotify", + .lpfnWndProc = windows_gaming_input_wndproc, + }; + EventRegistrationToken controller_removed_token; + IVectorView_RawGameController *controller_view; + EventRegistrationToken controller_added_token; + IRawGameControllerStatics *statics; + HANDLE hwnd, thread, stop_event; + HDEVNOTIFY devnotify; + BOOL removed; + HSTRING str; + UINT32 size; + HRESULT hr; + MSG msg; + + hr = RoInitialize( RO_INIT_MULTITHREADED ); + ok( hr == RPC_E_CHANGED_MODE, "RoInitialize failed, hr %#lx\n", hr ); + + hr = WindowsCreateString( class_name, wcslen( class_name ), &str ); + ok( hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr ); + + hr = RoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&statics ); + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "RoGetActivationFactory failed, hr %#lx\n", hr ); + WindowsDeleteString( str ); + + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( class_name ) ); + RoUninitialize(); + return; + } + + hr = IRawGameControllerStatics_add_RawGameControllerAdded( statics, &controller_added.IEventHandler_RawGameController_iface, + &controller_added_token ); + ok( hr == S_OK, "add_RawGameControllerAdded returned %#lx\n", hr ); + todo_wine + ok( controller_added_token.value, "got token %I64u\n", controller_added_token.value ); + if (!controller_added_token.value) goto done; + + hr = IRawGameControllerStatics_add_RawGameControllerRemoved( statics, &controller_removed.IEventHandler_RawGameController_iface, + &controller_removed_token ); + ok( hr == S_OK, "add_RawGameControllerAdded returned %#lx\n", hr ); + + hr = IRawGameControllerStatics_get_RawGameControllers( statics, &controller_view ); + ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); + + RegisterClassExW( &class ); + + hwnd = CreateWindowW( class.lpszClassName, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL ); + ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); + + devnotify = RegisterDeviceNotificationA( hwnd, &iface_filter_a, DEVICE_NOTIFY_WINDOW_HANDLE ); + ok( !!devnotify, "RegisterDeviceNotificationA failed, error %lu\n", GetLastError() ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + + device_change_count = 0; + device_change_expect = 2; + device_change_hwnd = hwnd; + device_change_all = FALSE; + stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!stop_event, "CreateEventW failed, error %lu\n", GetLastError() ); + thread = CreateThread( NULL, 0, dinput_test_device_thread, stop_event, 0, NULL ); + ok( !!thread, "CreateThread failed, error %lu\n", GetLastError() ); + + removed = FALSE; + while (device_change_count < device_change_expect) + { + MsgWaitForMultipleObjects( 0, NULL, FALSE, 50, QS_ALLINPUT ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + ok( msg.message != WM_DEVICECHANGE, "got WM_DEVICECHANGE\n" ); + DispatchMessageW( &msg ); + } + if (controller_added.invoked && !removed) + { + ok( !controller_removed.invoked, "controller removed handler invoked\n" ); + removed = TRUE; + + hr = IVectorView_RawGameController_get_Size( controller_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); + + IVectorView_RawGameController_Release( controller_view ); + hr = IRawGameControllerStatics_get_RawGameControllers( statics, &controller_view ); + ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); + + hr = IVectorView_RawGameController_get_Size( controller_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 1, "got size %u\n", size ); + + SetEvent( stop_event ); + } + } + + ok( controller_added.invoked, "controller added handler not invoked\n" ); + ok( controller_removed.invoked, "controller removed handler not invoked\n" ); + + hr = IVectorView_RawGameController_get_Size( controller_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 1, "got size %u\n", size ); + + IVectorView_RawGameController_Release( controller_view ); + hr = IRawGameControllerStatics_get_RawGameControllers( statics, &controller_view ); + ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); + + hr = IVectorView_RawGameController_get_Size( controller_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); + + hr = IRawGameControllerStatics_remove_RawGameControllerAdded( statics, controller_added_token ); + ok( hr == S_OK, "remove_RawGameControllerAdded returned %#lx\n", hr ); + hr = IRawGameControllerStatics_remove_RawGameControllerRemoved( statics, controller_removed_token ); + ok( hr == S_OK, "remove_RawGameControllerRemoved returned %#lx\n", hr ); + hr = IRawGameControllerStatics_remove_RawGameControllerRemoved( statics, controller_removed_token ); + ok( hr == S_OK, "remove_RawGameControllerRemoved returned %#lx\n", hr ); + + IVectorView_RawGameController_Release( controller_view ); + IRawGameControllerStatics_Release( statics ); + + WaitForSingleObject( thread, INFINITE ); + CloseHandle( thread ); + CloseHandle( stop_event ); + + UnregisterDeviceNotification( devnotify ); + + DestroyWindow( hwnd ); + UnregisterClassW( class.lpszClassName, class.hInstance ); + +done: + RoUninitialize(); +} + START_TEST( hotplug ) { if (!dinput_test_init()) return; @@ -415,6 +658,7 @@ START_TEST( hotplug ) test_input_lost( 0x800 ); test_RegisterDeviceNotification(); + test_windows_gaming_input(); } CoUninitialize(); -- 2.34.1

3 8

[PATCH 1/2] kernel32: Import RtlCaptureContext() instead of forwarding.
by Paul Gofman 25 Feb '22

25 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3cf85be10fd..168cbdb531c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1302,7 +1302,7 @@ @ stdcall RestoreLastError(long) NTDLL.RtlRestoreLastWin32Error @ stdcall -import ResumeThread(long) @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) NTDLL.RtlAddFunctionTable -@ stdcall -norelay RtlCaptureContext(ptr) NTDLL.RtlCaptureContext +@ stdcall -norelay -import RtlCaptureContext(ptr) @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) NTDLL.RtlCaptureStackBackTrace @ stdcall -arch=arm,arm64,x86_64 RtlCompareMemory(ptr ptr long) NTDLL.RtlCompareMemory @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) NTDLL.RtlCopyMemory -- 2.35.1

1 1

[PATCH 6/6] winealsa: Move set_event_handle to the unixlib.
by Huw Davies 25 Feb '22

25 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 21 +++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 22 +++++----------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 26fbc080f20..2ce3c896dff 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1879,6 +1879,26 @@ static NTSTATUS get_current_padding(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_event_handle(void *args) +{ + struct set_event_handle_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED); + + if (stream->event){ + FIXME("called twice\n"); + return alsa_unlock_result(stream, &params->result, HRESULT_FROM_WIN32(ERROR_INVALID_NAME)); + } + + stream->event = params->event; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1893,4 +1913,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, + set_event_handle, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fa05cb00968..7a99a6b5d43 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1038,7 +1038,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct set_event_handle_params params; TRACE("(%p)->(%p)\n", This, event); @@ -1048,24 +1048,12 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - alsa_unlock(stream); - return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; - } - - if (stream->event){ - alsa_unlock(stream); - FIXME("called twice\n"); - return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - } - - stream->event = event; + params.stream = This->stream; + params.event = event; - alsa_unlock(stream); + ALSA_CALL(set_event_handle, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 3d88d8d7f9b..bd3a1a4bc6a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -153,6 +153,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct set_event_handle_params +{ + struct alsa_stream *stream; + HANDLE event; + HRESULT result; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -167,6 +174,7 @@ enum alsa_funcs alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, + alsa_set_event_handle, }; extern unixlib_handle_t alsa_handle; -- 2.25.1

1 0

[PATCH 5/6] winealsa: Move reset to the unixlib.
by Huw Davies 25 Feb '22

25 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 36 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 37 ++++-------------------------------- dlls/winealsa.drv/unixlib.h | 7 +++++++ 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 5d54df512ac..26fbc080f20 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1514,6 +1514,41 @@ static NTSTATUS stop(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS reset(void *args) +{ + struct reset_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if(stream->started) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + if(stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_OPERATION_PENDING); + + if(snd_pcm_drop(stream->pcm_handle) < 0) + WARN("snd_pcm_drop failed\n"); + + if(snd_pcm_reset(stream->pcm_handle) < 0) + WARN("snd_pcm_reset failed\n"); + + if(snd_pcm_prepare(stream->pcm_handle) < 0) + WARN("snd_pcm_prepare failed\n"); + + if(stream->flow == eRender){ + stream->written_frames = 0; + stream->last_pos_frames = 0; + }else{ + stream->written_frames += stream->held_frames; + } + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->wri_offs_frames = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; @@ -1851,6 +1886,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, start, stop, + reset, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d9e96b7790c..fa05cb00968 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1020,47 +1020,18 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct reset_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - if(stream->started){ - alsa_unlock(stream); - return AUDCLNT_E_NOT_STOPPED; - } - - if(stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_BUFFER_OPERATION_PENDING; - } - - if(snd_pcm_drop(stream->pcm_handle) < 0) - WARN("snd_pcm_drop failed\n"); - - if(snd_pcm_reset(stream->pcm_handle) < 0) - WARN("snd_pcm_reset failed\n"); - - if(snd_pcm_prepare(stream->pcm_handle) < 0) - WARN("snd_pcm_prepare failed\n"); - - if(stream->flow == eRender){ - stream->written_frames = 0; - stream->last_pos_frames = 0; - }else{ - stream->written_frames += stream->held_frames; - } - stream->held_frames = 0; - stream->lcl_offs_frames = 0; - stream->wri_offs_frames = 0; + params.stream = This->stream; - alsa_unlock(stream); + ALSA_CALL(reset, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 1c3caabcc26..3d88d8d7f9b 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -103,6 +103,12 @@ struct stop_params HRESULT result; }; +struct reset_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct alsa_stream *stream; @@ -154,6 +160,7 @@ enum alsa_funcs alsa_release_stream, alsa_start, alsa_stop, + alsa_reset, alsa_timer_loop, alsa_is_format_supported, alsa_get_mix_format, -- 2.25.1

1 0