wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Francois Gouget : user32/tests: Fix the clipboard CF_LOCALE test.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: 948f20312b040d3c2ef2b238534569edc569f709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948f20312b040d3c2ef2b238… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 20 13:42:12 2021 +0200 user32/tests: Fix the clipboard CF_LOCALE test. By default CF_LOCALE matches the current input language, not the default user LCID. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index e2a2c332710..2fceab6c0f6 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -777,10 +777,11 @@ static void test_synthesized(void) case CF_LOCALE: { UINT *ptr = GlobalLock( data ); + DWORD layout = LOWORD( GetKeyboardLayout(0) ); ok( GlobalSize( data ) == sizeof(*ptr), "%u: size %lu\n", i, GlobalSize( data )); - ok( *ptr == GetUserDefaultLCID() || + ok( *ptr == layout || broken( *ptr == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )), - "%u: CF_LOCALE %08x/%08x\n", i, *ptr, GetUserDefaultLCID() ); + "%u: CF_LOCALE %04x/%04x\n", i, *ptr, layout ); GlobalUnlock( data ); break; }

1 0

Francois Gouget : user32/tests: Avoid copying the clipboard buffer sizes everywhere.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: a5639d62b5104f903fcd1eaaabdc29345263fc0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5639d62b5104f903fcd1eaa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 20 15:49:20 2021 +0200 user32/tests: Avoid copying the clipboard buffer sizes everywhere. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 6fc4325e985..e2a2c332710 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -381,7 +381,7 @@ static void test_RegisterClipboardFormatA(void) format_id2 = RegisterClipboardFormatA("MY_COOL_CLIPBOARD_FORMAT"); ok(format_id2 == format_id, "invalid clipboard format id %04x\n", format_id2); - len = GetClipboardFormatNameA(format_id, buf, 256); + len = GetClipboardFormatNameA(format_id, buf, ARRAY_SIZE(buf)); ok(len == lstrlenA("my_cool_clipboard_format"), "wrong format name length %d\n", len); ok(!lstrcmpA(buf, "my_cool_clipboard_format"), "wrong format name \"%s\"\n", buf); @@ -390,7 +390,7 @@ static void test_RegisterClipboardFormatA(void) lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); - len = GetAtomNameA((ATOM)format_id, buf, 256); + len = GetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); ok(len == 0, "GetAtomNameA should fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); @@ -398,7 +398,7 @@ todo_wine { lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); - len = GlobalGetAtomNameA((ATOM)format_id, buf, 256); + len = GlobalGetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); ok(len == 0, "GlobalGetAtomNameA should fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); } @@ -420,7 +420,7 @@ todo_wine for (format_id = 0; format_id < 0x10fff; format_id++) { SetLastError(0xdeadbeef); - len = GetClipboardFormatNameA(format_id, buf, 256); + len = GetClipboardFormatNameA(format_id, buf, ARRAY_SIZE(buf)); if (format_id < 0xc000 || format_id > 0xffff) ok(!len, "GetClipboardFormatNameA should fail, but it returned %d (%s)\n", len, buf); @@ -456,7 +456,7 @@ todo_wine while ((format_id = EnumClipboardFormats(format_id))) { ok(IsClipboardFormatAvailable(format_id), "format %04x was listed as available\n", format_id); - len = GetClipboardFormatNameA(format_id, buf, 256); + len = GetClipboardFormatNameA(format_id, buf, ARRAY_SIZE(buf)); trace("%04x: %s\n", format_id, len ? buf : ""); } @@ -1920,12 +1920,12 @@ static void test_GetUpdatedClipboardFormats(void) ok( !count, "wrong count %u\n", count ); SetLastError( 0xdeadbeef ); - r = pGetUpdatedClipboardFormats( formats, 256, NULL ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), NULL ); ok( !r, "succeeded\n" ); ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); count = 0xdeadbeef; - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( !count, "wrong count %u\n", count ); @@ -1935,7 +1935,7 @@ static void test_GetUpdatedClipboardFormats(void) ok( r, "gle %d\n", GetLastError() ); count = 0xdeadbeef; - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( !count, "wrong count %u\n", count ); @@ -1943,7 +1943,7 @@ static void test_GetUpdatedClipboardFormats(void) count = 0xdeadbeef; memset( formats, 0xcc, sizeof(formats) ); - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( count == 1, "wrong count %u\n", count ); ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); @@ -1952,7 +1952,7 @@ static void test_GetUpdatedClipboardFormats(void) SetClipboardData( CF_TEXT, 0 ); count = 0xdeadbeef; memset( formats, 0xcc, sizeof(formats) ); - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( count == 2, "wrong count %u\n", count ); ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); @@ -1978,7 +1978,7 @@ static void test_GetUpdatedClipboardFormats(void) count = 0xdeadbeef; memset( formats, 0xcc, sizeof(formats) ); - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( count == 4, "wrong count %u\n", count ); ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); @@ -2097,7 +2097,7 @@ static void test_string_data_process( int i ) data = GetClipboardData( CF_UNICODETEXT ); ok( data != 0, "%u: could not get data\n", i ); len = GlobalSize( data ); - len2 = MultiByteToWideChar( CP_ACP, 0, bufferA, test_data[i].len, bufferW, 12 ); + len2 = MultiByteToWideChar( CP_ACP, 0, bufferA, test_data[i].len, bufferW, ARRAY_SIZE(bufferW) ); ok( len == len2 * sizeof(WCHAR), "%u: wrong size %u / %u\n", i, len, len2 ); ok( !memcmp( data, bufferW, len ), "%u: wrong data %s\n", i, wine_dbgstr_wn( data, len2 )); } @@ -2117,7 +2117,7 @@ static void test_string_data_process( int i ) ok( data != 0, "%u: could not get data\n", i ); len = GlobalSize( data ); len2 = WideCharToMultiByte( CP_ACP, 0, bufferW, test_data[i].len / sizeof(WCHAR), - bufferA, 12, NULL, NULL ); + bufferA, ARRAY_SIZE(bufferA), NULL, NULL ); bufferA[len2 - 1] = 0; ok( len == len2, "%u: wrong size %u / %u\n", i, len, len2 ); ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data );

1 0

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

20 May '21

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

Zebediah Figura : wined3d: Remove no longer used wined3d_device functions.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: caa039466b08accef83654a02edd7f56d4199f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=caa039466b08accef83654a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 20 00:15:20 2021 -0500 wined3d: Remove no longer used wined3d_device functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 539 +--------------------------------------------- dlls/wined3d/wined3d.spec | 63 ------ include/wine/wined3d.h | 102 --------- 3 files changed, 1 insertion(+), 703 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=caa039466b08accef836…

1 0

Zebediah Figura : wined3d: Use wined3d_device_context functions internally where possible.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: ac7a67fa7f30cd8c57724147e83cda372260ef9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac7a67fa7f30cd8c57724147… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 20 00:15:19 2021 -0500 wined3d: Use wined3d_device_context functions internally where possible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a8383a89617..e4f0556fdbc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -933,16 +933,17 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { BOOL ds_enable = swapchain->state.desc.enable_auto_depth_stencil; + struct wined3d_device_context *context = &device->cs->c; unsigned int i; for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); + wined3d_device_context_set_rendertarget_view(context, i, NULL, FALSE); } if (device->back_buffer_view) - wined3d_device_set_rendertarget_view(device, 0, device->back_buffer_view, TRUE); + wined3d_device_context_set_rendertarget_view(context, 0, device->back_buffer_view, TRUE); - wined3d_device_set_depth_stencil_view(device, ds_enable ? device->auto_depth_stencil_view : NULL); + wined3d_device_context_set_depth_stencil_view(context, ds_enable ? device->auto_depth_stencil_view : NULL); } void wined3d_device_delete_opengl_contexts_cs(void *object) @@ -3979,9 +3980,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, TRACE("device %p, stateblock %p.\n", device, stateblock); if (changed->vertexShader) - wined3d_device_set_vertex_shader(device, state->vs); + wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_VERTEX, state->vs); if (changed->pixelShader) - wined3d_device_set_pixel_shader(device, state->ps); + wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_PIXEL, state->ps); for (start = 0; ; start = range.offset + range.size) { @@ -4136,12 +4137,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) { rasterizer_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); - wined3d_device_set_rasterizer_state(device, rasterizer_state); + wined3d_device_context_set_rasterizer_state(context, rasterizer_state); } else if (SUCCEEDED(wined3d_rasterizer_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &rasterizer_state))) { - wined3d_device_set_rasterizer_state(device, rasterizer_state); + wined3d_device_context_set_rasterizer_state(context, rasterizer_state); if (wine_rb_put(&device->rasterizer_states, &desc, &rasterizer_state->entry) == -1) { ERR("Failed to insert rasterizer state.\n"); @@ -4209,12 +4210,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->blend_states, &desc))) { blend_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_blend_state, entry); - wined3d_device_set_blend_state(device, blend_state, &colour, state->rs[WINED3D_RS_MULTISAMPLEMASK]); + wined3d_device_context_set_blend_state(context, blend_state, &colour, + state->rs[WINED3D_RS_MULTISAMPLEMASK]); } else if (SUCCEEDED(wined3d_blend_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &blend_state))) { - wined3d_device_set_blend_state(device, blend_state, &colour, state->rs[WINED3D_RS_MULTISAMPLEMASK]); + wined3d_device_context_set_blend_state(context, blend_state, &colour, + state->rs[WINED3D_RS_MULTISAMPLEMASK]); if (wine_rb_put(&device->blend_states, &desc, &blend_state->entry) == -1) { ERR("Failed to insert blend state.\n"); @@ -4276,12 +4279,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { depth_stencil_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_depth_stencil_state, entry); - wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); } else if (SUCCEEDED(wined3d_depth_stencil_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); if (wine_rb_put(&device->depth_stencil_states, &desc, &depth_stencil_state->entry) == -1) { ERR("Failed to insert depth/stencil state.\n"); @@ -4325,22 +4328,22 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } if (changed->indices) - wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_context_set_index_buffer(context, state->index_buffer, state->index_format, 0); wined3d_device_set_base_vertex_index(device, state->base_vertex_index); if (changed->vertexDecl) - wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + wined3d_device_context_set_vertex_declaration(context, state->vertex_declaration); if (changed->material) wined3d_device_set_material(device, &state->material); if (changed->viewport) - wined3d_device_set_viewports(device, 1, &state->viewport); + wined3d_device_context_set_viewports(context, 1, &state->viewport); if (changed->scissorRect) - wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + wined3d_device_context_set_scissor_rects(context, 1, &state->scissor_rect); map = changed->streamSource; while (map) { i = wined3d_bit_scan(&map); - wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + wined3d_device_context_set_stream_source(context, i, state->streams[i].buffer, state->streams[i].offset, state->streams[i].stride); } map = changed->streamFreq; @@ -5696,9 +5699,10 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_reset_cb callback, BOOL reset_state) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; + struct wined3d_device_context *context = &device->cs->c; struct wined3d_swapchain_state *swapchain_state; + struct wined3d_state *state = context->state; struct wined3d_swapchain_desc *current_desc; - struct wined3d_state *state = device->cs->c.state; struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_swapchain *swapchain; @@ -5737,9 +5741,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); + wined3d_device_context_set_rendertarget_view(context, i, NULL, FALSE); } - wined3d_device_set_depth_stencil_view(device, NULL); + wined3d_device_context_set_depth_stencil_view(context, NULL); if (reset_state) { @@ -5961,9 +5965,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, else { if ((view = device->back_buffer_view)) - wined3d_device_set_rendertarget_view(device, 0, view, FALSE); + wined3d_device_context_set_rendertarget_view(context, 0, view, FALSE); if ((view = device->auto_depth_stencil_view)) - wined3d_device_set_depth_stencil_view(device, view); + wined3d_device_context_set_depth_stencil_view(context, view); } if (reset_state)

1 0

Jacek Caban : winepulse: Move pulse_get_frequency to unix lib.
by Alexandre Julliard 20 May '21

20 May '21

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

Jacek Caban : winepulse: Move pulse_get_next_packet_size to unix lib.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: a6131544e87c554f70c21a04fb4697d8e1f508d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6131544e87c554f70c21a04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 22:27:30 2021 +0200 winepulse: Move pulse_get_next_packet_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 | 24 ++++-------------------- dlls/winepulse.drv/pulse.c | 21 +++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 9 +-------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index b85d9b5e80b..bf9a6672b05 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -638,18 +638,6 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, return pulse->get_latency(This->pulse_stream, latency); } -static void ACImpl_GetCapturePad(ACImpl *This, UINT32 *out) -{ - ACPacket *packet = This->pulse_stream->locked_ptr; - if (!packet && !list_empty(&This->pulse_stream->packet_filled_head)) { - packet = (ACPacket*)list_head(&This->pulse_stream->packet_filled_head); - This->pulse_stream->locked_ptr = packet; - list_remove(&packet->entry); - } - if (out) - *out = This->pulse_stream->held_bytes / pa_frame_size(&This->pulse_stream->ss); -} - static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out) { @@ -1234,17 +1222,13 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( ACImpl *This = impl_from_IAudioCaptureClient(iface); TRACE("(%p)->(%p)\n", This, frames); + if (!frames) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - pulse->lock(); - ACImpl_GetCapturePad(This, NULL); - if (This->pulse_stream->locked_ptr) - *frames = This->pulse_stream->period_bytes / pa_frame_size(&This->pulse_stream->ss); - else - *frames = 0; - pulse->unlock(); - return S_OK; + return pulse->get_next_packet_size(This->pulse_stream, frames); } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 4ff3753c189..43212822f4e 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -43,6 +43,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); +typedef struct _ACPacket +{ + struct list entry; + UINT64 qpcpos; + BYTE *data; + UINT32 discont; +} ACPacket; + static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; @@ -1674,6 +1682,18 @@ static HRESULT WINAPI pulse_get_current_padding(struct pulse_stream *stream, UIN return S_OK; } +static HRESULT WINAPI pulse_get_next_packet_size(struct pulse_stream *stream, UINT32 *frames) +{ + pulse_lock(); + pulse_capture_padding(stream); + if (stream->locked_ptr) + *frames = stream->period_bytes / pa_frame_size(&stream->ss); + else + *frames = 0; + 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) { @@ -1720,6 +1740,7 @@ static const struct unix_funcs unix_funcs = pulse_get_buffer_size, pulse_get_latency, pulse_get_current_padding, + pulse_get_next_packet_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 e3471607d26..956dc36e267 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -29,14 +29,6 @@ struct pulse_config unsigned int speakers_mask; }; -typedef struct _ACPacket -{ - struct list entry; - UINT64 qpcpos; - BYTE *data; - UINT32 discont; -} ACPacket; - struct pulse_stream { EDataFlow dataflow; @@ -90,6 +82,7 @@ struct unix_funcs 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); + HRESULT (WINAPI *get_next_packet_size)(struct pulse_stream *stream, UINT32 *frames); 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

Jacek Caban : winepulse: Move pulse_release_capture_buffer to unix lib.
by Alexandre Julliard 20 May '21

20 May '21

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_capture_buffer to unix lib.
by Alexandre Julliard 20 May '21

20 May '21

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_current_padding to unix lib.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: 42d826bc8c1d625ed2985ff06c2cd047209a1916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d826bc8c1d625ed2985ff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 22:24:23 2021 +0200 winepulse: Move pulse_get_current_padding 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 | 37 +++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8938eac011c..654126e6dfe 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -638,11 +638,6 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, return pulse->get_latency(This->pulse_stream, latency); } -static void ACImpl_GetRenderPad(ACImpl *This, UINT32 *out) -{ - *out = This->pulse_stream->held_bytes / pa_frame_size(&This->pulse_stream->ss); -} - static void ACImpl_GetCapturePad(ACImpl *This, UINT32 *out) { ACPacket *packet = This->pulse_stream->locked_ptr; @@ -659,28 +654,15 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(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 (FAILED(hr)) { - pulse->unlock(); - return hr; - } - - if (This->dataflow == eRender) - ACImpl_GetRenderPad(This, out); - else - ACImpl_GetCapturePad(This, out); - pulse->unlock(); - - TRACE("%p Pad: %u ms (%u)\n", This, MulDiv(*out, 1000, This->pulse_stream->ss.rate), *out); - return S_OK; + return pulse->get_current_padding(This->pulse_stream, out); } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 711d9874818..a17bce283f6 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1416,6 +1416,23 @@ static void alloc_tmp_buffer(struct pulse_stream *stream, UINT32 bytes) stream->tmp_buffer_bytes = bytes; } +static UINT32 pulse_render_padding(struct pulse_stream *stream) +{ + return stream->held_bytes / pa_frame_size(&stream->ss); +} + +static UINT32 pulse_capture_padding(struct pulse_stream *stream) +{ + ACPacket *packet = stream->locked_ptr; + if (!packet && !list_empty(&stream->packet_filled_head)) + { + packet = (ACPacket*)list_head(&stream->packet_filled_head); + stream->locked_ptr = packet; + list_remove(&packet->entry); + } + return stream->held_bytes / pa_frame_size(&stream->ss); +} + static HRESULT WINAPI pulse_get_render_buffer(struct pulse_stream *stream, UINT32 frames, BYTE **data) { size_t bytes; @@ -1567,6 +1584,25 @@ static HRESULT WINAPI pulse_get_latency(struct pulse_stream *stream, REFERENCE_T return S_OK; } +static HRESULT WINAPI pulse_get_current_padding(struct pulse_stream *stream, UINT32 *out) +{ + pulse_lock(); + if (!pulse_stream_valid(stream)) + { + pulse_unlock(); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + + if (stream->dataflow == eRender) + *out = pulse_render_padding(stream); + else + *out = pulse_capture_padding(stream); + pulse_unlock(); + + TRACE("%p Pad: %u ms (%u)\n", stream, muldiv(*out, 1000, stream->ss.rate), *out); + return S_OK; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1610,6 +1646,7 @@ static const struct unix_funcs unix_funcs = pulse_release_render_buffer, pulse_get_buffer_size, pulse_get_latency, + pulse_get_current_padding, 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 8be3ba67264..6017d8052e8 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_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); 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

← Newer
1
...
23
24
25
26
27
28
29
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021