May 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : dssenh/tests: Add CryptAcquireContextA last error check.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: c5bdc2408fc0278bf893039a5010bcf8e22b9652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5bdc2408fc0278bf893039a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:10 2021 +0200 dssenh/tests: Add CryptAcquireContextA last error check. When container key doesn't exist yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 4d33fc86cd8..b72b1e3a614 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -71,6 +71,19 @@ static void test_acquire_context(void) /* test base DSS provider (PROV_DSS) */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); + if (!result) + { + todo_wine ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, CRYPT_NEWKEYSET); + } + ok(result, "CryptAcquireContextA succeeded\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "CryptReleaseContext failed.\n"); + result = CryptAcquireContextA( &hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); if(!result)

1 0

Jacek Caban : winepulse: Build with msvcrt.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 70f59eb179d6a1c1b4dbc9e0a45b5731cd260793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70f59eb179d6a1c1b4dbc9e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 24 18:22:40 2021 +0200 winepulse: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 2 ++ dlls/winepulse.drv/mmdevdrv.c | 15 ++------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index d05d63e92e3..9a04eaee5ee 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = dxguid uuid winmm user32 advapi32 ole32 EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS) EXTRAINCL = $(PULSE_CFLAGS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mmdevdrv.c \ mult.c \ diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0d55b0fc2d0..bc28bce137e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -18,25 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS -#define _GNU_SOURCE - -#include "config.h" #include <stdarg.h> -#include <unistd.h> -#include <math.h> -#include <stdio.h> -#include <errno.h> #include "windef.h" #include "winbase.h" -#include "winnls.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "ole2.h" @@ -145,7 +134,7 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; }; -static const WCHAR defaultW[] = {'P','u','l','s','e','a','u','d','i','o',0}; +static const WCHAR defaultW[] = L"Pulseaudio"; static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; @@ -216,7 +205,7 @@ static char *get_application_name(void) char *str; GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); - name = strrchrW(path, '\\'); + name = wcsrchr(path, '\\'); if (!name) name = path; else

1 0

Jacek Caban : winepulse: Simplify IAudioStreamVolume::GetChannelVolume implementation.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 4432b66e372caf0096df56f45502d7dea1f1800c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4432b66e372caf0096df56f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 24 18:22:10 2021 +0200 winepulse: Simplify IAudioStreamVolume::GetChannelVolume implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 84ab5b6adec..df38bb594c7 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1494,21 +1494,21 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( IAudioStreamVolume *iface, UINT32 index, float *level) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - float volumes[PA_CHANNELS_MAX]; - HRESULT hr; TRACE("(%p)->(%d, %p)\n", This, index, level); if (!level) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; if (index >= This->channel_count) return E_INVALIDARG; - hr = AudioStreamVolume_GetAllVolumes(iface, This->channel_count, volumes); - if (SUCCEEDED(hr)) - *level = volumes[index]; - return hr; + pulse->lock(); + *level = This->vol[index]; + pulse->unlock(); + return S_OK; } static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl =

1 0

Alexandre Julliard : ntdll: Always put the pthread stack at the top of the 64-bit stack if there's one.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 118bd9fee324c347283de17388055e4cdbd6d493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=118bd9fee324c347283de173… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 11:17:23 2021 +0200 ntdll: Always put the pthread stack at the top of the 64-bit stack if there's one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 55 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index b14b441c094..1ac87352b39 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -787,36 +787,67 @@ void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) { - INITIAL_TEB stack, stack64; + INITIAL_TEB stack; NTSTATUS status; - if ((status = virtual_alloc_thread_stack( &stack, zero_bits, reserve_size, commit_size, pthread_size ))) - return status; - - if (teb->WowTebOffset && !(status = virtual_alloc_thread_stack( &stack64, 0, 0x40000, 0x40000, NULL ))) + if (teb->WowTebOffset) { + WOW64_CPURESERVED *cpu; SIZE_T cpusize = sizeof(WOW64_CPURESERVED) + ((get_machine_context_size( main_image_info.Machine ) + 7) & ~7) + sizeof(ULONG64); - WOW64_CPURESERVED *cpu = (WOW64_CPURESERVED *)(((ULONG_PTR)stack64.StackBase - cpusize) & ~15); + #ifdef _WIN64 TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); + + /* 32-bit stack */ + if ((status = virtual_alloc_thread_stack( &stack, zero_bits, reserve_size, commit_size, NULL ))) + return status; teb32->Tib.StackBase = PtrToUlong( stack.StackBase ); teb32->Tib.StackLimit = PtrToUlong( stack.StackLimit ); teb32->DeallocationStack = PtrToUlong( stack.DeallocationStack ); - stack64.StackBase = teb->TlsSlots[WOW64_TLS_CPURESERVED] = cpu; - stack = stack64; + + /* 64-bit stack */ + if ((status = virtual_alloc_thread_stack( &stack, 0, 0x40000, 0x40000, pthread_size ))) + return status; + cpu = (WOW64_CPURESERVED *)(((ULONG_PTR)stack.StackBase - cpusize) & ~15); + cpu->Machine = main_image_info.Machine; + teb->Tib.StackBase = teb->TlsSlots[WOW64_TLS_CPURESERVED] = cpu; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; + + if (pthread_size) + { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; + thread_data->start_stack = stack.StackBase; + *pthread_size += (char *)stack.StackBase - (char *)cpu; + } + return STATUS_SUCCESS; #else TEB64 *teb64 = (TEB64 *)((char *)teb + teb->WowTebOffset); + + /* 64-bit stack */ + if ((status = virtual_alloc_thread_stack( &stack, 0, 0x40000, 0x40000, NULL ))) return status; + + cpu = (WOW64_CPURESERVED *)(((ULONG_PTR)stack.StackBase - cpusize) & ~15); + cpu->Machine = main_image_info.Machine; teb64->Tib.StackBase = teb64->TlsSlots[WOW64_TLS_CPURESERVED] = PtrToUlong( cpu ); - teb64->Tib.StackLimit = PtrToUlong( stack64.StackLimit ); - teb64->DeallocationStack = PtrToUlong( stack64.DeallocationStack ); + teb64->Tib.StackLimit = PtrToUlong( stack.StackLimit ); + teb64->DeallocationStack = PtrToUlong( stack.DeallocationStack ); #endif - cpu->Machine = main_image_info.Machine; } + + /* native stack */ + if ((status = virtual_alloc_thread_stack( &stack, zero_bits, reserve_size, commit_size, pthread_size ))) + return status; teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; - return status; + if (pthread_size) + { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; + thread_data->start_stack = stack.StackBase; + } + return STATUS_SUCCESS; }

1 0

Zebediah Figura : ntdll: Implement IOCTL_AFD_POLL.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 834e2f04c606d433ad4d9c4e3da6cb91f9bbcc32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=834e2f04c606d433ad4d9c4e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 24 23:13:41 2021 -0500 ntdll: Implement IOCTL_AFD_POLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50975 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 157 +++++++++++++++++++++ include/wine/afd.h | 30 ++++ include/wine/server_protocol.h | 35 ++++- server/protocol.def | 24 ++++ server/request.h | 8 ++ server/sock.c | 306 ++++++++++++++++++++++++++++++++++++++++- server/trace.c | 49 +++++++ 7 files changed, 605 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=834e2f04c606d433ad4d…

1 0

Alexandre Julliard : ntdll: Free the initial process parameters once they are copied.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 2b03b2873e675ecb8e0d92fdb950487bfafc8029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b03b2873e675ecb8e0d92fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 17:16:30 2021 +0200 ntdll: Free the initial process parameters once they are copied. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index c11960db165..bb8931a556b 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -634,7 +634,7 @@ void WINAPI RtlDestroyProcessParameters( RTL_USER_PROCESS_PARAMETERS *params ) void init_user_process_params(void) { WCHAR *env; - SIZE_T env_size; + SIZE_T size = 0, env_size; RTL_USER_PROCESS_PARAMETERS *new_params, *params = NtCurrentTeb()->Peb->ProcessParameters; UNICODE_STRING curdir; @@ -671,15 +671,16 @@ void init_user_process_params(void) new_params->dwFlags = params->dwFlags; new_params->wShowWindow = params->wShowWindow; - NtCurrentTeb()->Peb->ProcessParameters = params = new_params; + NtCurrentTeb()->Peb->ProcessParameters = new_params; + NtFreeVirtualMemory( GetCurrentProcess(), (void **)&params, &size, MEM_RELEASE ); - if (RtlSetCurrentDirectory_U( &params->CurrentDirectory.DosPath )) + if (RtlSetCurrentDirectory_U( &new_params->CurrentDirectory.DosPath )) { MESSAGE("wine: could not open working directory %s, starting in the Windows directory.\n", - debugstr_w( params->CurrentDirectory.DosPath.Buffer )); + debugstr_w( new_params->CurrentDirectory.DosPath.Buffer )); RtlInitUnicodeString( &curdir, windows_dir ); RtlSetCurrentDirectory_U( &curdir ); } - set_wow64_environment( &params->Environment ); - params->EnvironmentSize = RtlSizeHeap( GetProcessHeap(), 0, params->Environment ); + set_wow64_environment( &new_params->Environment ); + new_params->EnvironmentSize = RtlSizeHeap( GetProcessHeap(), 0, new_params->Environment ); }

1 0

Jacek Caban : winepulse: Allocate ACImpl volumes when channel count is known.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: e19d97ff4e2f5a7800d6df77b8acce95130b84c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e19d97ff4e2f5a7800d6df77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 24 18:22:33 2021 +0200 winepulse: Allocate ACImpl volumes when channel count is known. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 52 ++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index df38bb594c7..0d55b0fc2d0 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -30,8 +30,6 @@ #include <stdio.h> #include <errno.h> -#include <pulse/pulseaudio.h> - #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -134,7 +132,7 @@ struct ACImpl { IUnknown *marshal; IMMDevice *parent; struct list entry; - float vol[PA_CHANNELS_MAX]; + float *vol; LONG ref; EDataFlow dataflow; @@ -293,7 +291,6 @@ int WINAPI AUDDRV_GetPriority(void) HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; - int i; EDataFlow dataflow; HRESULT hr; @@ -319,8 +316,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; This->dataflow = dataflow; This->parent = dev; - for (i = 0; i < PA_CHANNELS_MAX; ++i) - This->vol[i] = 1.f; hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); if (hr) { @@ -533,8 +528,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); + unsigned int i, channel_count; + struct pulse_stream *stream; char *name; - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -583,21 +580,40 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, name = get_application_name(); hr = pulse->create_stream(name, This->dataflow, mode, flags, duration, period, fmt, - &This->channel_count, &This->pulse_stream); + &channel_count, &stream); free(name); - if (SUCCEEDED(hr)) { - hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); - if (SUCCEEDED(hr)) { - set_stream_volumes(This); - list_add_tail(&This->session->clients, &This->entry); - } else { - pulse->release_stream(This->pulse_stream, NULL); - This->pulse_stream = NULL; - } + if (FAILED(hr)) + { + pulse->unlock(); + return hr; + } + + if (!(This->vol = malloc(channel_count * sizeof(*This->vol)))) + { + pulse->release_stream(stream, NULL); + pulse->unlock(); + return E_OUTOFMEMORY; + } + for (i = 0; i < channel_count; i++) + This->vol[i] = 1.f; + + hr = get_audio_session(sessionguid, This->parent, channel_count, &This->session); + if (FAILED(hr)) + { + free(This->vol); + This->vol = NULL; + pulse->unlock(); + pulse->release_stream(stream, NULL); + return E_OUTOFMEMORY; } + This->pulse_stream = stream; + This->channel_count = channel_count; + list_add_tail(&This->session->clients, &This->entry); + set_stream_volumes(This); + pulse->unlock(); - return hr; + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface,

1 0

Jacek Caban : winepulse: Move pulse_is_started to unix lib.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: aba40bd50a065b3ac913dbc1263c38535fb5d9e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aba40bd50a065b3ac913dbc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 24 18:21:56 2021 +0200 winepulse: Move pulse_is_started to unix lib. And move pulse_stream to pulse.c since it's accessed only from unix lib now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/pulse.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 32 +++----------------------------- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8e717f9d18f..cac169567ea 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1611,7 +1611,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, goto out; } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) { - if (client->pulse_stream->started) { + if (client->pulse_stream && pulse->is_started(client->pulse_stream)) { *state = AudioSessionStateActive; goto out; } diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 063c92605b6..05e1dacd68e 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -43,6 +43,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); +struct pulse_stream +{ + EDataFlow dataflow; + + pa_stream *stream; + pa_sample_spec ss; + pa_channel_map map; + pa_buffer_attr attr; + + DWORD flags; + AUDCLNT_SHAREMODE share; + HANDLE event; + float vol[PA_CHANNELS_MAX]; + BOOL mute; + + INT32 locked; + UINT32 bufsize_frames, real_bufsize_bytes, period_bytes; + UINT32 started, peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; + UINT32 tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; + BYTE *local_buffer, *tmp_buffer, *peek_buffer; + void *locked_ptr; + BOOL please_quit, just_started, just_underran; + pa_usec_t last_time, mmdev_period_usec; + + INT64 clock_lastpos, clock_written; + + struct list packet_free_head; + struct list packet_filled_head; +}; + typedef struct _ACPacket { struct list entry; @@ -1770,6 +1800,11 @@ static HRESULT WINAPI pulse_set_event_handle(struct pulse_stream *stream, HANDLE return hr; } +static BOOL WINAPI pulse_is_started(struct pulse_stream *stream) +{ + return pulse_stream_valid(stream) && stream->started; +} + static const struct unix_funcs unix_funcs = { pulse_lock, @@ -1795,6 +1830,7 @@ static const struct unix_funcs unix_funcs = pulse_set_volumes, pulse_set_event_handle, pulse_test_connect, + pulse_is_started, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index f1546d42d76..13793c734cd 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -18,6 +18,8 @@ #include "wine/list.h" +struct pulse_stream; + struct pulse_config { struct @@ -29,35 +31,6 @@ struct pulse_config unsigned int speakers_mask; }; -struct pulse_stream -{ - EDataFlow dataflow; - - pa_stream *stream; - pa_sample_spec ss; - pa_channel_map map; - pa_buffer_attr attr; - - DWORD flags; - AUDCLNT_SHAREMODE share; - HANDLE event; - float vol[PA_CHANNELS_MAX]; - - INT32 locked; - UINT32 bufsize_frames, real_bufsize_bytes, period_bytes; - UINT32 started, peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; - UINT32 tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; - BYTE *local_buffer, *tmp_buffer, *peek_buffer; - void *locked_ptr; - BOOL please_quit, just_started, just_underran; - pa_usec_t last_time, mmdev_period_usec; - - INT64 clock_lastpos, clock_written; - - struct list packet_free_head; - struct list packet_filled_head; -}; - struct unix_funcs { void (WINAPI *lock)(void); @@ -89,4 +62,5 @@ struct unix_funcs const float *volumes, const float *session_volumes); HRESULT (WINAPI *set_event_handle)(struct pulse_stream *stream, HANDLE event); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config); + BOOL (WINAPI *is_started)(struct pulse_stream *stream); };

1 0

Jacek Caban : winepulse: Move pulse_get_position to unix lib.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 1518e73b23211af738ae448a80466c0199f24419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1518e73b23211af738ae448a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 24 18:21:49 2021 +0200 winepulse: Move pulse_get_position to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 46 +++++++++++-------------------------------- dlls/winepulse.drv/pulse.c | 34 ++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 1fe0d0bd50e..0178cdb9e7b 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1296,42 +1296,15 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); if (!pos) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr)) { - pulse->unlock(); - return hr; - } - - *pos = This->pulse_stream->clock_written - This->pulse_stream->held_bytes; - - if (This->pulse_stream->share == AUDCLNT_SHAREMODE_EXCLUSIVE) - *pos /= pa_frame_size(&This->pulse_stream->ss); - - /* Make time never go backwards */ - if (*pos < This->pulse_stream->clock_lastpos) - *pos = This->pulse_stream->clock_lastpos; - else - This->pulse_stream->clock_lastpos = *pos; - pulse->unlock(); - - TRACE("%p Position: %u\n", This, (unsigned)*pos); - - if (qpctime) { - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - return S_OK; + return pulse->get_position(This->pulse_stream, FALSE, pos, qpctime); } static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, @@ -1382,10 +1355,15 @@ static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock2(iface); - HRESULT hr = AudioClock_GetPosition(&This->IAudioClock_iface, pos, qpctime); - if (SUCCEEDED(hr) && This->pulse_stream->share == AUDCLNT_SHAREMODE_SHARED) - *pos /= pa_frame_size(&This->pulse_stream->ss); - return hr; + + TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); + + if (!pos) + return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; + + return pulse->get_position(This->pulse_stream, TRUE, pos, qpctime); } static const IAudioClock2Vtbl AudioClock2_Vtbl = diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index b9dceb911d0..063c92605b6 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1710,6 +1710,39 @@ static HRESULT WINAPI pulse_get_frequency(struct pulse_stream *stream, UINT64 *f return S_OK; } +static HRESULT WINAPI pulse_get_position(struct pulse_stream *stream, BOOL device, UINT64 *pos, UINT64 *qpctime) +{ + pulse_lock(); + if (!pulse_stream_valid(stream)) + { + pulse_unlock(); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + + *pos = stream->clock_written - stream->held_bytes; + + if (stream->share == AUDCLNT_SHAREMODE_EXCLUSIVE || device) + *pos /= pa_frame_size(&stream->ss); + + /* Make time never go backwards */ + if (*pos < stream->clock_lastpos) + *pos = stream->clock_lastpos; + else + stream->clock_lastpos = *pos; + pulse_unlock(); + + TRACE("%p Position: %u\n", stream, (unsigned)*pos); + + if (qpctime) + { + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return S_OK; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1758,6 +1791,7 @@ static const struct unix_funcs unix_funcs = pulse_get_current_padding, pulse_get_next_packet_size, pulse_get_frequency, + pulse_get_position, pulse_set_volumes, pulse_set_event_handle, pulse_test_connect, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index d9c6ef057bb..f1546d42d76 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -84,6 +84,7 @@ struct unix_funcs HRESULT (WINAPI *get_current_padding)(struct pulse_stream *stream, UINT32 *out); HRESULT (WINAPI *get_next_packet_size)(struct pulse_stream *stream, UINT32 *frames); HRESULT (WINAPI *get_frequency)(struct pulse_stream *stream, UINT64 *freq); + HRESULT (WINAPI *get_position)(struct pulse_stream *stream, BOOL device, UINT64 *pos, UINT64 *qpctime); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes); HRESULT (WINAPI *set_event_handle)(struct pulse_stream *stream, HANDLE event);

1 0

Alexandre Julliard : server: Use a standard user APC also for timers.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: e1716530d92611026f84622546a596dc7a7d21d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1716530d92611026f846225… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 13:03:49 2021 +0200 server: Use a standard user APC also for timers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 32 ++++++++++---------------------- dlls/ntdll/unix/thread.c | 10 +++++----- include/wine/server_protocol.h | 25 ++++++------------------- server/async.c | 10 +++++----- server/protocol.def | 23 +++++------------------ server/thread.c | 1 - server/timer.c | 11 ++++++----- server/trace.c | 12 ++++-------- 8 files changed, 41 insertions(+), 83 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 10f53bea8ab..ca712e4a56c 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -351,30 +351,18 @@ static int wait_select_reply( void *cookie ) } -static void invoke_apc( CONTEXT *context, const user_apc_t *apc ) +/*********************************************************************** + * invoke_user_apc + */ +static void invoke_user_apc( CONTEXT *context, const user_apc_t *apc ) { - switch( apc->type ) - { - case APC_USER: - call_user_apc_dispatcher( context, apc->user.args[0], apc->user.args[1], apc->user.args[2], - wine_server_get_ptr( apc->user.func ), pKiUserApcDispatcher ); - break; - case APC_TIMER: - call_user_apc_dispatcher( context, (ULONG_PTR)wine_server_get_ptr( apc->user.args[1] ), - (DWORD)apc->timer.time, (DWORD)(apc->timer.time >> 32), - wine_server_get_ptr( apc->user.func ), pKiUserApcDispatcher ); - break; - default: - server_protocol_error( "get_apc_request: bad type %d\n", apc->type ); - break; - } + call_user_apc_dispatcher( context, apc->args[0], apc->args[1], apc->args[2], + wine_server_get_ptr( apc->func ), pKiUserApcDispatcher ); } + /*********************************************************************** - * invoke_apc - * - * Invoke a single APC. - * + * invoke_system_apc */ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOOL self ) { @@ -702,7 +690,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f } ret = server_select( select_op, size, flags, abs_timeout, NULL, NULL, &apc ); - if (ret == STATUS_USER_APC) invoke_apc( NULL, &apc ); + if (ret == STATUS_USER_APC) invoke_user_apc( NULL, &apc ); /* A test on Windows 2000 shows that Windows always yields during a wait, but a wait that is hit by an event gets a priority @@ -723,7 +711,7 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) if (alertable) { status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); - if (status == STATUS_USER_APC) invoke_apc( context, &apc ); + if (status == STATUS_USER_APC) invoke_user_apc( context, &apc ); } status = NtSetContextThread( GetCurrentThread(), context ); if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 1ac87352b39..54b748e99cb 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1296,11 +1296,11 @@ NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1 req->handle = wine_server_obj_handle( handle ); if (func) { - req->call.type = APC_USER; - req->call.user.user.func = wine_server_client_ptr( func ); - req->call.user.user.args[0] = arg1; - req->call.user.user.args[1] = arg2; - req->call.user.user.args[2] = arg3; + req->call.type = APC_USER; + req->call.user.func = wine_server_client_ptr( func ); + req->call.user.args[0] = arg1; + req->call.user.args[1] = arg2; + req->call.user.args[2] = arg3; } else req->call.type = APC_NONE; /* wake up only */ ret = wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e48154fb120..730bb3c151c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -455,7 +455,6 @@ enum apc_type { APC_NONE, APC_USER, - APC_TIMER, APC_ASYNC_IO, APC_VIRTUAL_ALLOC, APC_VIRTUAL_FREE, @@ -471,24 +470,12 @@ enum apc_type APC_BREAK_PROCESS }; -typedef union +typedef struct { - enum apc_type type; - struct - { - enum apc_type type; - int __pad; - client_ptr_t func; - apc_param_t args[3]; - } user; - struct - { - enum apc_type type; - int __pad; - client_ptr_t func; - abstime_t time; - client_ptr_t arg; - } timer; + enum apc_type type; + int __pad; + client_ptr_t func; + apc_param_t args[3]; } user_apc_t; typedef union @@ -6300,7 +6287,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 705 +#define SERVER_PROTOCOL_VERSION 706 /* ### protocol_version end ### */ diff --git a/server/async.c b/server/async.c index 27af3be52ff..d6d3a8ad86a 100644 --- a/server/async.c +++ b/server/async.c @@ -406,11 +406,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota { apc_call_t data; memset( &data, 0, sizeof(data) ); - data.type = APC_USER; - data.user.user.func = async->data.apc; - data.user.user.args[0] = async->data.apc_context; - data.user.user.args[1] = async->data.iosb; - data.user.user.args[2] = 0; + data.type = APC_USER; + data.user.func = async->data.apc; + data.user.args[0] = async->data.apc_context; + data.user.args[1] = async->data.iosb; + data.user.args[2] = 0; thread_queue_apc( NULL, async->thread, NULL, &data ); } else if (async->data.apc_context && (async->pending || diff --git a/server/protocol.def b/server/protocol.def index db50e03c691..f0a9107cfbe 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -471,7 +471,6 @@ enum apc_type { APC_NONE, APC_USER, - APC_TIMER, APC_ASYNC_IO, APC_VIRTUAL_ALLOC, APC_VIRTUAL_FREE, @@ -487,24 +486,12 @@ enum apc_type APC_BREAK_PROCESS }; -typedef union +typedef struct { - enum apc_type type; - struct - { - enum apc_type type; /* APC_USER */ - int __pad; - client_ptr_t func; /* void (__stdcall *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR); */ - apc_param_t args[3]; /* arguments for user function */ - } user; - struct - { - enum apc_type type; /* APC_TIMER */ - int __pad; - client_ptr_t func; /* void (__stdcall *func)(void*, unsigned int, unsigned int); */ - abstime_t time; /* time of expiration */ - client_ptr_t arg; /* user argument */ - } timer; + enum apc_type type; /* APC_USER */ + int __pad; + client_ptr_t func; /* void (__stdcall *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR); */ + apc_param_t args[3]; /* arguments for user function */ } user_apc_t; typedef union diff --git a/server/thread.c b/server/thread.c index 4077a752e4a..0c7f11c0da1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1071,7 +1071,6 @@ static inline struct list *get_apc_queue( struct thread *thread, enum apc_type t case APC_NONE: return NULL; case APC_USER: - case APC_TIMER: return &thread->user_apc; default: return &thread->system_apc; diff --git a/server/timer.c b/server/timer.c index 0c787d0b7e0..5e265d2ddf6 100644 --- a/server/timer.c +++ b/server/timer.c @@ -128,10 +128,11 @@ static void timer_callback( void *private ) assert (timer->callback); memset( &data, 0, sizeof(data) ); - data.type = APC_TIMER; - data.user.timer.func = timer->callback; - data.user.timer.time = timer->when; - data.user.timer.arg = timer->arg; + data.type = APC_USER; + data.user.func = timer->callback; + data.user.args[0] = timer->arg; + data.user.args[1] = (unsigned int)timer->when; + data.user.args[2] = timer->when >> 32; if (!thread_queue_apc( NULL, timer->thread, &timer->obj, &data )) { @@ -165,7 +166,7 @@ static int cancel_timer( struct timer *timer ) } if (timer->thread) { - thread_cancel_apc( timer->thread, &timer->obj, APC_TIMER ); + thread_cancel_apc( timer->thread, &timer->obj, APC_USER ); release_object( timer->thread ); timer->thread = NULL; } diff --git a/server/trace.c b/server/trace.c index d9ca82bd228..1420f1e799f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -156,16 +156,12 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) fprintf( stderr, "APC_NONE" ); break; case APC_USER: - dump_uint64( "APC_USER,func=", &call->user.user.func ); - dump_uint64( ",args={", &call->user.user.args[0] ); - dump_uint64( ",", &call->user.user.args[1] ); - dump_uint64( ",", &call->user.user.args[2] ); + dump_uint64( "APC_USER,func=", &call->user.func ); + dump_uint64( ",args={", &call->user.args[0] ); + dump_uint64( ",", &call->user.args[1] ); + dump_uint64( ",", &call->user.args[2] ); fputc( '}', stderr ); break; - case APC_TIMER: - dump_timeout( "APC_TIMER,time=", &call->user.timer.time ); - dump_uint64( ",arg=", &call->user.timer.arg ); - break; case APC_ASYNC_IO: dump_uint64( "APC_ASYNC_IO,user=", &call->async_io.user ); dump_uint64( ",sb=", &call->async_io.sb );

1 0