September 2022 - Wine-Commits

Zebediah Figura : tests: Mark test_hull_shader_relative_addressing() as broken on radv.
by Alexandre Julliard Sept. 19, 2022

Sept. 19, 2022

Module: vkd3d Branch: master Commit: 53d6966a5df60402aae43ec362ccf547711d7bee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/53d6966a5df60402aae43ec362ccf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 11 18:35:59 2022 -0500 tests: Mark test_hull_shader_relative_addressing() as broken on radv. Broken for me with "AMD Radeon RX 560 Series (RADV POLARIS11)" (1002:67ef) but works with llvmpipe; Mesa 22.2.0-rc3. --- tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 531ea1a4..89bfab79 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -35338,7 +35338,7 @@ static void test_hull_shader_relative_addressing(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - check_triangles(&rb.rb, &expected_triangle, 1); + bug_if(is_radv_device(context.device)) check_triangles(&rb.rb, &expected_triangle, 1); release_resource_readback(&rb); ID3D12Resource_Release(so_buffer);

1 0

Zebediah Figura : tests: Transition back to D3D12_RESOURCE_STATE_RENDER_TARGET in test_bufinfo_instruction().
by Alexandre Julliard Sept. 19, 2022

Sept. 19, 2022

Module: vkd3d Branch: master Commit: 7393e6ed135aed555d431540006a691504db9b5f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7393e6ed135aed555d431540006a6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 16 00:13:25 2022 -0500 tests: Transition back to D3D12_RESOURCE_STATE_RENDER_TARGET in test_bufinfo_instruction(). --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9fc199bc..531ea1a4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34655,6 +34655,8 @@ static void test_bufinfo_instruction(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &test->expected_result); reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); ID3D12Resource_Release(buffer); }

1 0

Rémi Bernon : winegstreamer: Wake thread when async reader user clock is modified.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: 4a1e95c814d2bffe20957937a95df56e7192ca7c URL: https://gitlab.winehq.org/wine/wine/-/commit/4a1e95c814d2bffe20957937a95df5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 14:00:09 2022 +0200 winegstreamer: Wake thread when async reader user clock is modified. --- dlls/winegstreamer/wm_asyncreader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index b4750592778..b882d205220 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -560,6 +560,7 @@ static HRESULT WINAPI WMReaderAdvanced_SetUserProvidedClock(IWMReaderAdvanced6 * EnterCriticalSection(&reader->callback_cs); reader->user_clock = !!user_clock; LeaveCriticalSection(&reader->callback_cs); + WakeConditionVariable(&reader->callback_cv); return S_OK; }

1 0

Alistair Leslie-Hughes : wininet: Clear cached credentials after the first failed attempt.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: b9d07d6cb4d8a8b6bf70601ffc6628ff0169719d URL: https://gitlab.winehq.org/wine/wine/-/commit/b9d07d6cb4d8a8b6bf70601ffc6628… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 4 12:41:33 2021 +1100 wininet: Clear cached credentials after the first failed attempt. Windows when using cached credentials will use them on the first challenge, if then a second 403 (ACCESS_DENIED) is received, the user is prompted again but this time with the password and save checkbox cleared. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/dialogs.c | 24 +++++++++++++++++++++++- dlls/wininet/internet.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index abd8621e76c..6b53a9f3272 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -152,9 +152,25 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, p = wcschr( szUserPass, ':' ); if( p ) { + struct WININET_ErrorDlgParams *params; + HWND hwnd; + + params = (struct WININET_ErrorDlgParams*) + GetWindowLongPtrW( hdlg, GWLP_USERDATA ); + *p = 0; SetWindowTextW( hUserItem, szUserPass ); - SetWindowTextW( hPassItem, p+1 ); + + if (!params->req->clear_auth) + { + SetWindowTextW( hPassItem, p+1 ); + + hwnd = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); + if (hwnd) + SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); + } + else + WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } return TRUE; @@ -264,6 +280,8 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, TRUE ); WININET_SetAuthorization( params->req, username, password, TRUE ); + params->req->clear_auth = TRUE; + EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; } @@ -340,6 +358,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, TRUE ); } WININET_SetAuthorization( params->req, username, password, FALSE ); + params->req->clear_auth = TRUE; EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; @@ -509,6 +528,9 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_AUTHDLG ), hWnd, WININET_PasswordDialog, (LPARAM) &params ); break; + case HTTP_STATUS_OK: + req->clear_auth = FALSE; + break; default: WARN("unhandled status %lu\n", req->status_code); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b361c0d1b4d..141613dd120 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -361,6 +361,7 @@ typedef struct LPWSTR statusText; DWORD bytesToWrite; DWORD bytesWritten; + BOOL clear_auth; /* Flag to clear the password field on the authorization dialog */ CRITICAL_SECTION headers_section; /* section to protect the headers array */ HTTPHEADERW *custHeaders;

1 0

Zebediah Figura : ntdll: Do not check for malloc() failure in get_initial_environment.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: f5b92137257b9564dca623ee9578c49b4495e220 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5b92137257b9564dca623ee9578c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 16 12:30:43 2022 -0500 ntdll: Do not check for malloc() failure in get_initial_environment. This is called early in process startup; malloc() should definitely never fail here. This fixes an uninitialized variable warning with gcc 12.2: In function ‘build_initial_params’, inlined from ‘init_startup_info’ at ../wine/dlls/ntdll/unix/env.c:2004:18: ../wine/dlls/ntdll/unix/env.c:1910:12: error: ‘env_pos’ may be used uninitialized [-Werror=maybe-uninitialized] 1910 | path = get_env_var( env, env_pos, pathW, 4 ); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../wine/dlls/ntdll/unix/env.c: In function ‘init_startup_info’: ../wine/dlls/ntdll/unix/env.c:1903:18: note: ‘env_pos’ declared here 1903 | SIZE_T size, env_pos, env_size; | ^~~~~~~ --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 105038a34cb..6e5004a6e11 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -920,7 +920,7 @@ static WCHAR *get_initial_environment( SIZE_T *pos, SIZE_T *size ) *size = 1; for (e = main_envp; *e; e++) *size += strlen(*e) + 1; - if (!(env = malloc( *size * sizeof(WCHAR) ))) return NULL; + env = malloc( *size * sizeof(WCHAR) ); ptr = env; end = env + *size - 1; for (e = main_envp; *e && ptr < end; e++)

1 0

Rémi Bernon : winegstreamer: Use a dedicated CS to serialize async reader commands.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: 359258560e9957a8762e7aaca549e604739f5b7a URL: https://gitlab.winehq.org/wine/wine/-/commit/359258560e9957a8762e7aaca549e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 14:21:07 2022 +0200 winegstreamer: Use a dedicated CS to serialize async reader commands. --- dlls/winegstreamer/wm_asyncreader.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 27195f2e094..54c601d109a 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -64,6 +64,8 @@ struct async_reader IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; IReferenceClock IReferenceClock_iface; + CRITICAL_SECTION cs; + IWMReaderCallbackAdvanced *callback_advanced; IWMReaderCallback *callback; void *context; @@ -390,11 +392,13 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, TRACE("reader %p, url %s, callback %p, context %p.\n", reader, debugstr_w(url), callback, context); + EnterCriticalSection(&reader->cs); EnterCriticalSection(&reader->reader.cs); if (reader->reader.wg_parser) { LeaveCriticalSection(&reader->reader.cs); + LeaveCriticalSection(&reader->cs); WARN("Stream is already open; returning E_UNEXPECTED.\n"); return E_UNEXPECTED; } @@ -404,6 +408,7 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, wm_reader_close(&reader->reader); LeaveCriticalSection(&reader->reader.cs); + LeaveCriticalSection(&reader->cs); return hr; } @@ -414,7 +419,7 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) TRACE("reader %p.\n", reader); - EnterCriticalSection(&reader->reader.cs); + EnterCriticalSection(&reader->cs); if (SUCCEEDED(hr = async_reader_queue_op(reader, ASYNC_OP_CLOSE, NULL))) { @@ -422,7 +427,7 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) hr = wm_reader_close(&reader->reader); } - LeaveCriticalSection(&reader->reader.cs); + LeaveCriticalSection(&reader->cs); return hr; } @@ -489,14 +494,14 @@ static HRESULT WINAPI WMReader_Start(IWMReader *iface, if (rate != 1.0f) FIXME("Ignoring rate %.8e.\n", rate); - EnterCriticalSection(&reader->reader.cs); + EnterCriticalSection(&reader->cs); if (!reader->callback_thread) hr = NS_E_INVALID_REQUEST; else hr = async_reader_queue_op(reader, ASYNC_OP_START, &data); - LeaveCriticalSection(&reader->reader.cs); + LeaveCriticalSection(&reader->cs); return hr; } @@ -508,14 +513,14 @@ static HRESULT WINAPI WMReader_Stop(IWMReader *iface) TRACE("reader %p.\n", reader); - EnterCriticalSection(&reader->reader.cs); + EnterCriticalSection(&reader->cs); if (!reader->callback_thread) hr = E_UNEXPECTED; else hr = async_reader_queue_op(reader, ASYNC_OP_STOP, NULL); - LeaveCriticalSection(&reader->reader.cs); + LeaveCriticalSection(&reader->cs); return hr; } @@ -867,11 +872,13 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, TRACE("reader %p, stream %p, callback %p, context %p.\n", reader, stream, callback, context); + EnterCriticalSection(&reader->cs); EnterCriticalSection(&reader->reader.cs); if (reader->reader.wg_parser) { LeaveCriticalSection(&reader->reader.cs); + LeaveCriticalSection(&reader->cs); WARN("Stream is already open; returning E_UNEXPECTED.\n"); return E_UNEXPECTED; } @@ -881,6 +888,7 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, wm_reader_close(&reader->reader); LeaveCriticalSection(&reader->reader.cs); + LeaveCriticalSection(&reader->cs); return hr; } @@ -1742,6 +1750,8 @@ static void async_reader_destroy(struct wm_reader *iface) reader->callback_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&reader->callback_cs); + reader->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&reader->cs); wm_reader_close(&reader->reader); @@ -1774,6 +1784,8 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; + InitializeCriticalSection(&object->cs); + object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.cs"); InitializeCriticalSection(&object->callback_cs); object->callback_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.callback_cs");

1 0

Eric Pouech : glu32: Fix GCC 12.2 warnings.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: af0fa4b8a80c716471bf0b1f1874c1b6c3782e1a URL: https://gitlab.winehq.org/wine/wine/-/commit/af0fa4b8a80c716471bf0b1f1874c1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 16 16:54:02 2022 +0200 glu32: Fix GCC 12.2 warnings. GCC complains about writing 4x4 floats into a pointer to a float. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/glu32/project.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/glu32/project.c b/dlls/glu32/project.c index dc104541b8f..0a71eabd98c 100644 --- a/dlls/glu32/project.c +++ b/dlls/glu32/project.c @@ -37,20 +37,20 @@ /* ** Make m an identity matrix */ -static void __gluMakeIdentityd(GLdouble m[16]) +static void __gluMakeIdentityd(GLdouble m[4][4]) { - m[0+4*0] = 1; m[0+4*1] = 0; m[0+4*2] = 0; m[0+4*3] = 0; - m[1+4*0] = 0; m[1+4*1] = 1; m[1+4*2] = 0; m[1+4*3] = 0; - m[2+4*0] = 0; m[2+4*1] = 0; m[2+4*2] = 1; m[2+4*3] = 0; - m[3+4*0] = 0; m[3+4*1] = 0; m[3+4*2] = 0; m[3+4*3] = 1; + m[0][0] = 1; m[0][1] = 0; m[0][2] = 0; m[0][3] = 0; + m[1][0] = 0; m[1][1] = 1; m[1][2] = 0; m[1][3] = 0; + m[2][0] = 0; m[2][1] = 0; m[2][2] = 1; m[2][3] = 0; + m[3][0] = 0; m[3][1] = 0; m[3][2] = 0; m[3][3] = 1; } -static void __gluMakeIdentityf(GLfloat m[16]) +static void __gluMakeIdentityf(GLfloat m[4][4]) { - m[0+4*0] = 1; m[0+4*1] = 0; m[0+4*2] = 0; m[0+4*3] = 0; - m[1+4*0] = 0; m[1+4*1] = 1; m[1+4*2] = 0; m[1+4*3] = 0; - m[2+4*0] = 0; m[2+4*1] = 0; m[2+4*2] = 1; m[2+4*3] = 0; - m[3+4*0] = 0; m[3+4*1] = 0; m[3+4*2] = 0; m[3+4*3] = 1; + m[0][0] = 1; m[0][1] = 0; m[0][2] = 0; m[0][3] = 0; + m[1][0] = 0; m[1][1] = 1; m[1][2] = 0; m[1][3] = 0; + m[2][0] = 0; m[2][1] = 0; m[2][2] = 1; m[2][3] = 0; + m[3][0] = 0; m[3][1] = 0; m[3][2] = 0; m[3][3] = 1; } /*********************************************************************** @@ -77,7 +77,7 @@ void WINAPI gluPerspective( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdo } cotangent = cos(radians) / sine; - __gluMakeIdentityd(&m[0][0]); + __gluMakeIdentityd(m); m[0][0] = cotangent / aspect; m[1][1] = cotangent; m[2][2] = -(zFar + zNear) / deltaZ; @@ -133,7 +133,7 @@ void WINAPI gluLookAt( GLdouble eyex, GLdouble eyey, GLdouble eyez, /* Recompute up as: up = side x forward */ cross(side, forward, up); - __gluMakeIdentityf(&m[0][0]); + __gluMakeIdentityf(m); m[0][0] = side[0]; m[1][0] = side[1]; m[2][0] = side[2];

1 0

Rémi Bernon : winegstreamer: Check for already opened stream in wm_reader_open*.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: ed0d100ec9e090641dcd61b79872a4b59e5b52f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed0d100ec9e090641dcd61b79872a4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 14:26:39 2022 +0200 winegstreamer: Check for already opened stream in wm_reader_open*. --- dlls/winegstreamer/wm_asyncreader.c | 20 -------------------- dlls/winegstreamer/wm_reader.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 54c601d109a..5b09bc616a6 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -393,21 +393,11 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, reader, debugstr_w(url), callback, context); EnterCriticalSection(&reader->cs); - EnterCriticalSection(&reader->reader.cs); - - if (reader->reader.wg_parser) - { - LeaveCriticalSection(&reader->reader.cs); - LeaveCriticalSection(&reader->cs); - WARN("Stream is already open; returning E_UNEXPECTED.\n"); - return E_UNEXPECTED; - } if (SUCCEEDED(hr = wm_reader_open_file(&reader->reader, url)) && FAILED(hr = async_reader_open(reader, callback, context))) wm_reader_close(&reader->reader); - LeaveCriticalSection(&reader->reader.cs); LeaveCriticalSection(&reader->cs); return hr; } @@ -873,21 +863,11 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, TRACE("reader %p, stream %p, callback %p, context %p.\n", reader, stream, callback, context); EnterCriticalSection(&reader->cs); - EnterCriticalSection(&reader->reader.cs); - - if (reader->reader.wg_parser) - { - LeaveCriticalSection(&reader->reader.cs); - LeaveCriticalSection(&reader->cs); - WARN("Stream is already open; returning E_UNEXPECTED.\n"); - return E_UNEXPECTED; - } if (SUCCEEDED(hr = wm_reader_open_stream(&reader->reader, stream)) && FAILED(hr = async_reader_open(reader, callback, context))) wm_reader_close(&reader->reader); - LeaveCriticalSection(&reader->reader.cs); LeaveCriticalSection(&reader->cs); return hr; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 156f9d79446..243ebb20335 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1558,6 +1558,13 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream) EnterCriticalSection(&reader->cs); + if (reader->wg_parser) + { + LeaveCriticalSection(&reader->cs); + WARN("Stream is already open; returning E_UNEXPECTED.\n"); + return E_UNEXPECTED; + } + IStream_AddRef(reader->source_stream = stream); if (FAILED(hr = init_stream(reader, stat.cbSize.QuadPart))) { @@ -1591,6 +1598,14 @@ HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename) EnterCriticalSection(&reader->cs); + if (reader->wg_parser) + { + LeaveCriticalSection(&reader->cs); + WARN("Stream is already open; returning E_UNEXPECTED.\n"); + CloseHandle(file); + return E_UNEXPECTED; + } + reader->file = file; if (FAILED(hr = init_stream(reader, size.QuadPart)))

1 0

Rémi Bernon : winegstreamer: Introduce a new async_reader_deliver_sample helper.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: daf10989f876bdff048b40d9e66eb5376d353193 URL: https://gitlab.winehq.org/wine/wine/-/commit/daf10989f876bdff048b40d9e66eb5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 08:20:42 2022 +0200 winegstreamer: Introduce a new async_reader_deliver_sample helper. --- dlls/winegstreamer/wm_asyncreader.c | 67 +++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index b882d205220..27195f2e094 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -44,6 +44,14 @@ struct async_op struct list entry; }; +struct sample +{ + INSSBuffer *buffer; + QWORD pts, duration; + DWORD flags; + WORD stream; +}; + struct async_reader { struct wm_reader reader; @@ -121,42 +129,57 @@ static bool async_reader_wait_pts(struct async_reader *reader, QWORD pts) return false; } +static void async_reader_deliver_sample(struct async_reader *reader, struct sample *sample) +{ + IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; + IWMReaderCallback *callback = reader->callback; + struct wm_stream *stream; + BOOL read_compressed; + HRESULT hr; + + TRACE("reader %p, stream %u, pts %s, duration %s, flags %#lx, buffer %p.\n", + reader, sample->stream, debugstr_time(sample->pts), debugstr_time(sample->duration), + sample->flags, sample->buffer); + + stream = wm_reader_get_stream_by_stream_number(&reader->reader, sample->stream); + read_compressed = stream->read_compressed; + + LeaveCriticalSection(&reader->callback_cs); + if (read_compressed) + hr = IWMReaderCallbackAdvanced_OnStreamSample(callback_advanced, sample->stream, + sample->pts, sample->duration, sample->flags, sample->buffer, reader->context); + else + hr = IWMReaderCallback_OnSample(callback, sample->stream - 1, sample->pts, sample->duration, + sample->flags, sample->buffer, reader->context); + EnterCriticalSection(&reader->callback_cs); + + TRACE("Callback returned %#lx.\n", hr); + + INSSBuffer_Release(sample->buffer); +} + static void callback_thread_run(struct async_reader *reader) { IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; IWMReaderCallback *callback = reader->callback; static const DWORD zero; - QWORD pts, duration; - WORD stream_number; - INSSBuffer *sample; HRESULT hr = S_OK; - DWORD flags; while (reader->running && list_empty(&reader->async_ops)) { + struct sample sample; + LeaveCriticalSection(&reader->callback_cs); - hr = wm_reader_get_stream_sample(&reader->reader, callback_advanced, 0, &sample, &pts, &duration, &flags, &stream_number); + hr = wm_reader_get_stream_sample(&reader->reader, callback_advanced, 0, &sample.buffer, + &sample.pts, &sample.duration, &sample.flags, &sample.stream); EnterCriticalSection(&reader->callback_cs); if (hr != S_OK) break; - if (async_reader_wait_pts(reader, pts)) - { - struct wm_stream *stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); - - LeaveCriticalSection(&reader->callback_cs); - if (stream->read_compressed) - hr = IWMReaderCallbackAdvanced_OnStreamSample(callback_advanced, - stream_number, pts, duration, flags, sample, reader->context); - else - hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, - flags, sample, reader->context); - EnterCriticalSection(&reader->callback_cs); - - TRACE("Callback returned %#lx.\n", hr); - } - - INSSBuffer_Release(sample); + if (async_reader_wait_pts(reader, sample.pts)) + async_reader_deliver_sample(reader, &sample); + else + INSSBuffer_Release(sample.buffer); } if (hr == NS_E_NO_MORE_SAMPLES)

1 0

Davide Beatrici : winecoreaudio: Adapt "create_stream_params" struct to mmdevapi's.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: de9da9bcdb8873a5582e1ae85d81a4880f0ccc5d URL: https://gitlab.winehq.org/wine/wine/-/commit/de9da9bcdb8873a5582e1ae85d81a4… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 08:41:43 2022 +0200 winecoreaudio: Adapt "create_stream_params" struct to mmdevapi's. --- dlls/winecoreaudio.drv/coreaudio.c | 6 ++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 3 +++ dlls/winecoreaudio.drv/unixlib.h | 3 +++ 3 files changed, 12 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index e3e697dad88..4f469b582ce 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1707,23 +1707,29 @@ static NTSTATUS unix_wow64_create_stream(void *args) { struct { + PTR32 name; PTR32 device; EDataFlow flow; AUDCLNT_SHAREMODE share; + DWORD flags; REFERENCE_TIME duration; REFERENCE_TIME period; PTR32 fmt; HRESULT result; + PTR32 channel_count; PTR32 stream; } *params32 = args; struct create_stream_params params = { + .name = ULongToPtr(params32->name), .device = ULongToPtr(params32->device), .flow = params32->flow, .share = params32->share, + .flags = params32->flags, .duration = params32->duration, .period = params32->period, .fmt = ULongToPtr(params32->fmt), + .channel_count = ULongToPtr(params32->channel_count), .stream = ULongToPtr(params32->stream) }; unix_create_stream(&params); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2d061db4e1b..79d617650f4 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -734,12 +734,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } + params.name = NULL; params.device = This->device_name; params.flow = This->dataflow; params.share = mode; + params.flags = flags; params.duration = duration; params.period = period; params.fmt = fmt; + params.channel_count = NULL; params.stream = &stream; UNIX_CALL(create_stream, &params); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index a01999daffd..2c22eef5cc4 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -39,13 +39,16 @@ struct get_endpoint_ids_params struct create_stream_params { + const char *name; const char *device; EDataFlow flow; AUDCLNT_SHAREMODE share; + DWORD flags; REFERENCE_TIME duration; REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; + UINT32 *channel_count; stream_handle *stream; };

1 0