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

Jacek Caban : vulkan-1/tests: Don't destroy device if it wasn't created.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: a0428db825a66a4d2e5e49a141cd54e406085ad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0428db825a66a4d2e5e49a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 20:19:22 2021 +0200 vulkan-1/tests: Don't destroy device if it wasn't created. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 1d23c4112cf..f222c631232 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -455,7 +455,6 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ uint32_t queue_family_index; VkPresentModeKHR *modes; VkSurfaceKHR surface; - VkDevice vk_device; uint32_t count; VkRect2D rect; VkBool32 bval; @@ -506,6 +505,8 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ if (pvkGetPhysicalDevicePresentRectanglesKHR) { + VkDevice vk_device; + count = 0; vr = pvkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, NULL); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); @@ -526,6 +527,15 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ vkDestroySurfaceKHR(vk_instance, surface, NULL); return; } + + if (0) + { + /* Causes access violation on Windows. */ + vr = vkGetDeviceGroupSurfacePresentModesKHR(vk_device, surface, &present_mode_flags); + ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); + } + + vkDestroyDevice(vk_device, NULL); } else { @@ -535,14 +545,6 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ win_skip("pvkGetPhysicalDevicePresentRectanglesKHR is no available.\n"); } - if (0) - { - /* Causes access violation on Windows. */ - vr = vkGetDeviceGroupSurfacePresentModesKHR(vk_device, surface, &present_mode_flags); - ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); - } - - vkDestroyDevice(vk_device, NULL); vkDestroySurfaceKHR(vk_instance, surface, NULL); }

1 0

Paul Gofman : server: Support process job lists.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: d430efb64a1b56aaffcf3eb8c245cacfb0c7c31a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d430efb64a1b56aaffcf3eb8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 20 03:29:04 2021 +0300 server: Support process job lists. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 260 +++++++++++++++++++++++++++++++++++++++++- server/process.c | 12 ++ 2 files changed, 268 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d430efb64a1b56aaffcf…

1 0

Jacek Caban : winepulse: Move pulse_get_latency to unix lib.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 30c17619e5401618122ca330cf0909f49b170a59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30c17619e5401618122ca330… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 22:24:13 2021 +0200 winepulse: Move pulse_get_latency 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 | 24 +++--------------------- dlls/winepulse.drv/pulse.c | 22 ++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 751f272c4b4..8938eac011c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -627,33 +627,15 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency) { ACImpl *This = impl_from_IAudioClient3(iface); - const pa_buffer_attr *attr; - REFERENCE_TIME lat; - HRESULT hr; TRACE("(%p)->(%p)\n", This, latency); if (!latency) 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; - } - attr = pa_stream_get_buffer_attr(This->pulse_stream->stream); - if (This->dataflow == eRender){ - lat = attr->minreq / pa_frame_size(&This->pulse_stream->ss); - }else - lat = attr->fragsize / pa_frame_size(&This->pulse_stream->ss); - *latency = 10000000; - *latency *= lat; - *latency /= This->pulse_stream->ss.rate; - *latency += pulse_config.modes[0].def_period; - pulse->unlock(); - TRACE("Latency: %u ms\n", (DWORD)(*latency / 10000)); - return S_OK; + return pulse->get_latency(This->pulse_stream, latency); } static void ACImpl_GetRenderPad(ACImpl *This, UINT32 *out) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 0b8c187c254..711d9874818 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1546,6 +1546,27 @@ static HRESULT WINAPI pulse_get_buffer_size(struct pulse_stream *stream, UINT32 return hr; } +static HRESULT WINAPI pulse_get_latency(struct pulse_stream *stream, REFERENCE_TIME *latency) +{ + const pa_buffer_attr *attr; + REFERENCE_TIME lat; + + pulse_lock(); + if (!pulse_stream_valid(stream)) { + pulse_unlock(); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + attr = pa_stream_get_buffer_attr(stream->stream); + if (stream->dataflow == eRender) + lat = attr->minreq / pa_frame_size(&stream->ss); + else + lat = attr->fragsize / pa_frame_size(&stream->ss); + *latency = (lat * 10000000) / stream->ss.rate + pulse_def_period[0]; + pulse_unlock(); + TRACE("Latency: %u ms\n", (DWORD)(*latency / 10000)); + return S_OK; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1588,6 +1609,7 @@ static const struct unix_funcs unix_funcs = pulse_get_render_buffer, pulse_release_render_buffer, pulse_get_buffer_size, + pulse_get_latency, 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 22bcf9c4bc2..8be3ba67264 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -85,6 +85,7 @@ struct unix_funcs HRESULT (WINAPI *release_render_buffer)(struct pulse_stream *stream, UINT32 written_frames, DWORD flags); HRESULT (WINAPI *get_buffer_size)(struct pulse_stream *stream, UINT32 *out); + HRESULT (WINAPI *get_latency)(struct pulse_stream *stream, REFERENCE_TIME *latency); 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

Henri Verbeet : winedump: Make print_longlong() work on 64-bit.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 4ae9f399112a56777dfb343450450ba3d5554fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae9f399112a56777dfb3434… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 20 13:53:47 2021 +0200 winedump: Make print_longlong() work on 64-bit. In particular, when long is a 64-bit type, the upper 32 bits would previously be printed twice. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index aa679103e59..161ba3b248e 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -182,7 +182,7 @@ static inline void print_dword(const char *title, DWORD value) static inline void print_longlong(const char *title, ULONGLONG value) { printf(" %-34s 0x", title); - if(value >> 32) + if (sizeof(value) > sizeof(unsigned long) && value >> 32) printf("%lx%08lx\n", (unsigned long)(value >> 32), (unsigned long)value); else printf("%lx\n", (unsigned long)value);

1 0

Rémi Bernon : user32: Add a default WindowPosChanging implementation.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 454712a94d62849324d20014c786b0e7c452bf61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=454712a94d62849324d20014… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:09 2021 +0200 user32: Add a default WindowPosChanging implementation. Which creates an off-screen window surface for top-level non-layered or SLWA-layered windows. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 3 +- dlls/user32/user_private.h | 3 +- dlls/user32/win.c | 131 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 23 +++++++- dlls/wineandroid.drv/window.c | 9 +-- dlls/winemac.drv/window.c | 5 +- dlls/winex11.drv/window.c | 7 ++- 7 files changed, 168 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=454712a94d62849324d2…

1 0

Jacek Caban : winepulse: Move pulse_release_capture_buffer to unix lib.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 80b996c53c767fef4614f097f14c310285d9c081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80b996c53c767fef4614f097… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 22:27:08 2021 +0200 winepulse: Move pulse_release_capture_buffer 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 | 26 ++++---------------------- dlls/winepulse.drv/pulse.c | 30 ++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 7e2877f184e..b85d9b5e80b 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1222,28 +1222,10 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( TRACE("(%p)->(%u)\n", This, done); - pulse->lock(); - if (!This->pulse_stream->locked && done) { - pulse->unlock(); - return AUDCLNT_E_OUT_OF_ORDER; - } - if (done && This->pulse_stream->locked != done) { - pulse->unlock(); - return AUDCLNT_E_INVALID_SIZE; - } - if (done) { - ACPacket *packet = This->pulse_stream->locked_ptr; - This->pulse_stream->locked_ptr = NULL; - This->pulse_stream->held_bytes -= This->pulse_stream->period_bytes; - if (packet->discont) - This->pulse_stream->clock_written += 2 * This->pulse_stream->period_bytes; - else - This->pulse_stream->clock_written += This->pulse_stream->period_bytes; - list_add_tail(&This->pulse_stream->packet_free_head, &packet->entry); - } - This->pulse_stream->locked = 0; - pulse->unlock(); - return S_OK; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; + + return pulse->release_capture_buffer(This->pulse_stream, done); } static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 15173647836..4ff3753c189 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1591,6 +1591,35 @@ static HRESULT WINAPI pulse_get_capture_buffer(struct pulse_stream *stream, BYTE return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; } +static HRESULT WINAPI pulse_release_capture_buffer(struct pulse_stream *stream, BOOL done) +{ + pulse_lock(); + if (!stream->locked && done) + { + pulse_unlock(); + return AUDCLNT_E_OUT_OF_ORDER; + } + if (done && stream->locked != done) + { + pulse_unlock(); + return AUDCLNT_E_INVALID_SIZE; + } + if (done) + { + ACPacket *packet = stream->locked_ptr; + stream->locked_ptr = NULL; + stream->held_bytes -= stream->period_bytes; + if (packet->discont) + stream->clock_written += 2 * stream->period_bytes; + else + stream->clock_written += stream->period_bytes; + list_add_tail(&stream->packet_free_head, &packet->entry); + } + stream->locked = 0; + pulse_unlock(); + return S_OK; +} + static HRESULT WINAPI pulse_get_buffer_size(struct pulse_stream *stream, UINT32 *out) { HRESULT hr = S_OK; @@ -1687,6 +1716,7 @@ static const struct unix_funcs unix_funcs = pulse_get_render_buffer, pulse_release_render_buffer, pulse_get_capture_buffer, + pulse_release_capture_buffer, pulse_get_buffer_size, pulse_get_latency, pulse_get_current_padding, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index ad6dd2da1f5..e3471607d26 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -86,6 +86,7 @@ struct unix_funcs DWORD flags); HRESULT (WINAPI *get_capture_buffer)(struct pulse_stream *stream, BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, UINT64 *qpcpos); + HRESULT (WINAPI *release_capture_buffer)(struct pulse_stream *stream, BOOL done); HRESULT (WINAPI *get_buffer_size)(struct pulse_stream *stream, UINT32 *out); HRESULT (WINAPI *get_latency)(struct pulse_stream *stream, REFERENCE_TIME *latency); HRESULT (WINAPI *get_current_padding)(struct pulse_stream *stream, UINT32 *out);

1 0

Jacek Caban : winepulse: Move pulse_get_buffer_size to unix lib.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: af84907ccad3e28f364ecfaa75ccb5fedf7f5a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af84907ccad3e28f364ecfaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 22:24:02 2021 +0200 winepulse: Move pulse_get_buffer_size 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 | 11 +++-------- dlls/winepulse.drv/pulse.c | 15 +++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 292d85a1c1f..751f272c4b4 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -612,20 +612,15 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr; TRACE("(%p)->(%p)\n", This, out); if (!out) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - pulse->lock(); - hr = pulse_stream_valid(This); - if (SUCCEEDED(hr)) - *out = This->pulse_stream->bufsize_frames; - pulse->unlock(); - - return hr; + return pulse->get_buffer_size(This->pulse_stream, out); } static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 3fc238faf39..0b8c187c254 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1532,6 +1532,20 @@ static HRESULT WINAPI pulse_release_render_buffer(struct pulse_stream *stream, U return S_OK; } +static HRESULT WINAPI pulse_get_buffer_size(struct pulse_stream *stream, UINT32 *out) +{ + HRESULT hr = S_OK; + + pulse_lock(); + if (!pulse_stream_valid(stream)) + hr = AUDCLNT_E_DEVICE_INVALIDATED; + else + *out = stream->bufsize_frames; + pulse_unlock(); + + return hr; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1573,6 +1587,7 @@ static const struct unix_funcs unix_funcs = pulse_timer_loop, pulse_get_render_buffer, pulse_release_render_buffer, + pulse_get_buffer_size, 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 9242cb3856b..22bcf9c4bc2 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -84,6 +84,7 @@ struct unix_funcs HRESULT (WINAPI *get_render_buffer)(struct pulse_stream *stream, UINT32 frames, BYTE **data); HRESULT (WINAPI *release_render_buffer)(struct pulse_stream *stream, UINT32 written_frames, DWORD flags); + HRESULT (WINAPI *get_buffer_size)(struct pulse_stream *stream, UINT32 *out); 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

Paul Gofman : ntdll: Validate job handles at process creation.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: ddd161f3393d626d41e4c33b65a0567686cfa753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd161f3393d626d41e4c33b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 20 03:29:03 2021 +0300 ntdll: Validate job handles at process creation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 20 +++++++++++++++++--- include/wine/server_protocol.h | 5 ++++- server/process.c | 27 +++++++++++++++++++++++++++ server/protocol.def | 2 ++ server/request.h | 3 ++- server/trace.c | 3 +++ 7 files changed, 82 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddd161f3393d626d41e4…

1 0

Jacek Caban : winepulse: Move pulse_get_capture_buffer to unix lib.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 459e911b653c7519a335661a6c0b0894e86d2f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=459e911b653c7519a335661a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 22:27:00 2021 +0200 winepulse: Move pulse_get_capture_buffer 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 | 35 +++-------------------------------- dlls/winepulse.drv/pulse.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 2 ++ 3 files changed, 48 insertions(+), 32 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 654126e6dfe..7e2877f184e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1200,48 +1200,19 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - HRESULT hr; - ACPacket *packet; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); if (!data) return E_POINTER; - *data = NULL; - if (!frames || !flags) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr) || This->pulse_stream->locked) { - pulse->unlock(); - return FAILED(hr) ? hr : AUDCLNT_E_OUT_OF_ORDER; - } - - ACImpl_GetCapturePad(This, NULL); - if ((packet = This->pulse_stream->locked_ptr)) { - *frames = This->pulse_stream->period_bytes / pa_frame_size(&This->pulse_stream->ss); - *flags = 0; - if (packet->discont) - *flags |= AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY; - if (devpos) { - if (packet->discont) - *devpos = (This->pulse_stream->clock_written + This->pulse_stream->period_bytes) / pa_frame_size(&This->pulse_stream->ss); - else - *devpos = This->pulse_stream->clock_written / pa_frame_size(&This->pulse_stream->ss); - } - if (qpcpos) - *qpcpos = packet->qpcpos; - *data = packet->data; - } - else - *frames = 0; - This->pulse_stream->locked = *frames; - pulse->unlock(); - return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; + return pulse->get_capture_buffer(This->pulse_stream, data, frames, flags, devpos, qpcpos); } static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index a17bce283f6..15173647836 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1549,6 +1549,48 @@ static HRESULT WINAPI pulse_release_render_buffer(struct pulse_stream *stream, U return S_OK; } +static HRESULT WINAPI pulse_get_capture_buffer(struct pulse_stream *stream, BYTE **data, + UINT32 *frames, DWORD *flags, UINT64 *devpos, UINT64 *qpcpos) +{ + ACPacket *packet; + + pulse_lock(); + if (!pulse_stream_valid(stream)) + { + pulse_unlock(); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + if (stream->locked) + { + pulse_unlock(); + return AUDCLNT_E_OUT_OF_ORDER; + } + + pulse_capture_padding(stream); + if ((packet = stream->locked_ptr)) + { + *frames = stream->period_bytes / pa_frame_size(&stream->ss); + *flags = 0; + if (packet->discont) + *flags |= AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY; + if (devpos) + { + if (packet->discont) + *devpos = (stream->clock_written + stream->period_bytes) / pa_frame_size(&stream->ss); + else + *devpos = stream->clock_written / pa_frame_size(&stream->ss); + } + if (qpcpos) + *qpcpos = packet->qpcpos; + *data = packet->data; + } + else + *frames = 0; + stream->locked = *frames; + pulse_unlock(); + return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; +} + static HRESULT WINAPI pulse_get_buffer_size(struct pulse_stream *stream, UINT32 *out) { HRESULT hr = S_OK; @@ -1644,6 +1686,7 @@ static const struct unix_funcs unix_funcs = pulse_timer_loop, pulse_get_render_buffer, pulse_release_render_buffer, + pulse_get_capture_buffer, pulse_get_buffer_size, pulse_get_latency, pulse_get_current_padding, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 6017d8052e8..ad6dd2da1f5 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -84,6 +84,8 @@ struct unix_funcs HRESULT (WINAPI *get_render_buffer)(struct pulse_stream *stream, UINT32 frames, BYTE **data); HRESULT (WINAPI *release_render_buffer)(struct pulse_stream *stream, UINT32 written_frames, DWORD flags); + HRESULT (WINAPI *get_capture_buffer)(struct pulse_stream *stream, BYTE **data, UINT32 *frames, + DWORD *flags, UINT64 *devpos, UINT64 *qpcpos); HRESULT (WINAPI *get_buffer_size)(struct pulse_stream *stream, UINT32 *out); HRESULT (WINAPI *get_latency)(struct pulse_stream *stream, REFERENCE_TIME *latency); HRESULT (WINAPI *get_current_padding)(struct pulse_stream *stream, UINT32 *out);

1 0

Jacek Caban : winepulse: Move pulse_get_frequency to unix lib.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 44e4132489c28b429737be022f6d4044c5beab3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e4132489c28b429737be02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 22:27:36 2021 +0200 winepulse: Move pulse_get_frequency 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 | 14 ++++---------- dlls/winepulse.drv/pulse.c | 17 +++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index bf9a6672b05..1fe0d0bd50e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1283,19 +1283,13 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); - HRESULT hr; TRACE("(%p)->(%p)\n", This, freq); - pulse->lock(); - hr = pulse_stream_valid(This); - if (SUCCEEDED(hr)) { - *freq = This->pulse_stream->ss.rate; - if (This->pulse_stream->share == AUDCLNT_SHAREMODE_SHARED) - *freq *= pa_frame_size(&This->pulse_stream->ss); - } - pulse->unlock(); - return hr; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; + + return pulse->get_frequency(This->pulse_stream, freq); } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 43212822f4e..b9dceb911d0 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1694,6 +1694,22 @@ static HRESULT WINAPI pulse_get_next_packet_size(struct pulse_stream *stream, UI return S_OK; } +static HRESULT WINAPI pulse_get_frequency(struct pulse_stream *stream, UINT64 *freq) +{ + pulse_lock(); + if (!pulse_stream_valid(stream)) + { + pulse_unlock(); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + + *freq = stream->ss.rate; + if (stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq *= pa_frame_size(&stream->ss); + pulse_unlock(); + return S_OK; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1741,6 +1757,7 @@ static const struct unix_funcs unix_funcs = pulse_get_latency, pulse_get_current_padding, pulse_get_next_packet_size, + pulse_get_frequency, 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 956dc36e267..d9c6ef057bb 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -83,6 +83,7 @@ struct unix_funcs HRESULT (WINAPI *get_latency)(struct pulse_stream *stream, REFERENCE_TIME *latency); 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); 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