June 2023 - Wine-commits - list.winehq.org

Eric Pouech : dbghelp/tests: Add explicit tests about loading ELF modules.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 1ed646ebf68c648d54ba733865956e053ca9b20a URL: https://gitlab.winehq.org/wine/wine/-/commit/1ed646ebf68c648d54ba733865956e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 23 11:04:55 2023 +0200 dbghelp/tests: Add explicit tests about loading ELF modules. Perhaps next time ELF loader is modified, it'll be noticed if it breaks things. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55058 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55096 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/dbghelp.c | 53 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 6e3edc7c952..1bd1122c642 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -300,6 +300,12 @@ static BOOL CALLBACK count_module_cb(const char* name, DWORD64 base, void* usr) return TRUE; } +static BOOL CALLBACK count_native_module_cb(const char* name, DWORD64 base, void* usr) +{ + if (strstr(name, ".so") || strchr(name, '<')) (*(unsigned*)usr)++; + return TRUE; +} + static unsigned get_module_count(HANDLE proc) { unsigned count = 0; @@ -310,6 +316,19 @@ static unsigned get_module_count(HANDLE proc) return count; } +static unsigned get_native_module_count(HANDLE proc) +{ + unsigned count = 0; + BOOL old, ret; + + old = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); + ret = SymEnumerateModules64(proc, count_native_module_cb, &count); + ok(ret, "SymEnumerateModules64 failed: %lu\n", GetLastError()); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, old); + + return count; +} + struct nth_module { HANDLE proc; @@ -681,6 +700,7 @@ static void test_loaded_modules(void) PROCESS_INFORMATION pi = {0}; STARTUPINFOA si = {0}; struct loaded_module_aggregation aggregation = {0}; + enum process_kind pcskind; ret = GetSystemDirectoryA(buffer, sizeof(buffer)); ok(ret, "got error %lu\n", GetLastError()); @@ -701,6 +721,7 @@ static void test_loaded_modules(void) ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); + pcskind = get_process_kind(pi.hProcess); if (is_win64) { ok(!aggregation.count_32bit && aggregation.count_64bit, "Wrong bitness aggregation count %u %u\n", @@ -720,7 +741,7 @@ static void test_loaded_modules(void) aggregation.count_32bit, aggregation.count_64bit); ok(aggregation.count_exe == 1 && aggregation.count_ntdll == 1, "Wrong kind aggregation count %u %u\n", aggregation.count_exe, aggregation.count_ntdll); - switch (get_process_kind(pi.hProcess)) + switch (pcskind) { case PCSKIND_ERROR: ok(0, "Unknown process kind\n"); @@ -743,8 +764,16 @@ static void test_loaded_modules(void) } ret = SymRefreshModuleList(pi.hProcess); + todo_wine_if(pcskind != PCSKIND_32BIT && pcskind != PCSKIND_WINE_OLD_WOW64) ok(ret || broken(GetLastError() == STATUS_PARTIAL_COPY /* Win11 in some cases */), "SymRefreshModuleList failed: %lu\n", GetLastError()); + if (!strcmp(winetest_platform, "wine")) + { + unsigned count = get_native_module_count(pi.hProcess); + todo_wine_if(pcskind != PCSKIND_32BIT && pcskind != PCSKIND_WINE_OLD_WOW64) + ok(count > 0, "Didn't find any native (ELF/Macho) modules\n"); + } + SymCleanup(pi.hProcess); TerminateProcess(pi.hProcess, 0); @@ -770,7 +799,8 @@ static void test_loaded_modules(void) ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); - switch (get_process_kind(pi.hProcess)) + pcskind = get_process_kind(pi.hProcess); + switch (pcskind) { default: ok(0, "Unknown process kind\n"); @@ -793,9 +823,17 @@ static void test_loaded_modules(void) "Wrong directory aggregation count %u %u\n", aggregation.count_systemdir, aggregation.count_wowdir); } + todo_wine_if(pcskind != PCSKIND_WINE_OLD_WOW64) ret = SymRefreshModuleList(pi.hProcess); ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError()); + if (!strcmp(winetest_platform, "wine")) + { + unsigned count = get_native_module_count(pi.hProcess); + todo_wine_if(pcskind != PCSKIND_WINE_OLD_WOW64) + ok(count > 0, "Didn't find any native (ELF/Macho) modules\n"); + } + SymCleanup(pi.hProcess); TerminateProcess(pi.hProcess, 0); } @@ -824,7 +862,8 @@ static void test_loaded_modules(void) ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation2); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); - switch (get_process_kind(pi.hProcess)) + pcskind = get_process_kind(pi.hProcess); + switch (pcskind) { case PCSKIND_ERROR: break; @@ -848,9 +887,17 @@ static void test_loaded_modules(void) break; } + todo_wine_if(pcskind != PCSKIND_WINE_OLD_WOW64) ret = SymRefreshModuleList(pi.hProcess); ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError()); + if (!strcmp(winetest_platform, "wine")) + { + unsigned count = get_native_module_count(pi.hProcess); + todo_wine_if(pcskind != PCSKIND_WINE_OLD_WOW64) + ok(count > 0, "Didn't find any native (ELF/Macho) modules\n"); + } + SymCleanup(pi.hProcess); TerminateProcess(pi.hProcess, 0); }

1 0

Eric Pouech : dbghelp: Fix reading Wine loader's base address.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: eb1f62bb31b2f99f9390c4c9e4d9db4cbbfdca2b URL: https://gitlab.winehq.org/wine/wine/-/commit/eb1f62bb31b2f99f9390c4c9e4d9db… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 23 11:04:55 2023 +0200 dbghelp: Fix reading Wine loader's base address. Note: the 32bit tests in new wow mode are still marked todo as the ELF debug header is located above the 4G limit and "default" module management in dbghelp compiled in 32bit is (mostly) done with 32 bit addresses. The correct fix should be to always consider ELF (and macho-O) modules with 64bit addresses (which means likely to move all modules handling to 64bit even in 32bit compilations). But that goes far beyond this patch. This limitation will only impact debuggers compiled in 32bit, using 32bit builtin dbghelp on a 32bit debuggee. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55058 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55096 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 2 +- dlls/dbghelp/tests/dbghelp.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index d3003fc44d2..3ce3ef6f707 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -387,7 +387,7 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64) if (!pcs->is_64bit) peb_addr -= 0x1000; /* PEB32 => PEB64 */ if (!ReadProcessMemory(pcs->handle, peb_addr, &peb, sizeof(peb), NULL)) return FALSE; - base = peb.CloudFileFlags; + base = *(const DWORD64*)&peb.CloudFileFlags; pcs->is_system_64bit = TRUE; if (pcs->is_64bit) ReadProcessMemory(pcs->handle, diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 1bd1122c642..575b9f76d20 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -763,14 +763,16 @@ static void test_loaded_modules(void) } } + pcskind = get_process_kind(pi.hProcess); + ret = SymRefreshModuleList(pi.hProcess); - todo_wine_if(pcskind != PCSKIND_32BIT && pcskind != PCSKIND_WINE_OLD_WOW64) + todo_wine_if(pcskind == PCSKIND_WOW64) ok(ret || broken(GetLastError() == STATUS_PARTIAL_COPY /* Win11 in some cases */), "SymRefreshModuleList failed: %lu\n", GetLastError()); if (!strcmp(winetest_platform, "wine")) { unsigned count = get_native_module_count(pi.hProcess); - todo_wine_if(pcskind != PCSKIND_32BIT && pcskind != PCSKIND_WINE_OLD_WOW64) + todo_wine_if(pcskind == PCSKIND_WOW64) ok(count > 0, "Didn't find any native (ELF/Macho) modules\n"); } @@ -823,14 +825,12 @@ static void test_loaded_modules(void) "Wrong directory aggregation count %u %u\n", aggregation.count_systemdir, aggregation.count_wowdir); } - todo_wine_if(pcskind != PCSKIND_WINE_OLD_WOW64) ret = SymRefreshModuleList(pi.hProcess); ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError()); if (!strcmp(winetest_platform, "wine")) { unsigned count = get_native_module_count(pi.hProcess); - todo_wine_if(pcskind != PCSKIND_WINE_OLD_WOW64) ok(count > 0, "Didn't find any native (ELF/Macho) modules\n"); } @@ -887,14 +887,12 @@ static void test_loaded_modules(void) break; } - todo_wine_if(pcskind != PCSKIND_WINE_OLD_WOW64) ret = SymRefreshModuleList(pi.hProcess); ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError()); if (!strcmp(winetest_platform, "wine")) { unsigned count = get_native_module_count(pi.hProcess); - todo_wine_if(pcskind != PCSKIND_WINE_OLD_WOW64) ok(count > 0, "Didn't find any native (ELF/Macho) modules\n"); }

1 0

Davide Beatrici : winealsa: Use mmdevapi's set_stream_volumes.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: f008d9a964d8992039d18df56c8a2bd87ecee809 URL: https://gitlab.winehq.org/wine/wine/-/commit/f008d9a964d8992039d18df56c8a2b… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 05:58:52 2023 +0200 winealsa: Use mmdevapi's set_stream_volumes. --- dlls/winealsa.drv/mmdevdrv.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d8596c9371c..43a44b0569d 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -85,6 +85,8 @@ extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); extern WCHAR *get_application_name(void); +extern void set_stream_volumes(struct audio_client *This); + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -201,18 +203,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static void set_stream_volumes(ACImpl *This) -{ - struct set_volumes_params params; - - params.stream = This->stream; - params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); - params.volumes = This->vols; - params.session_volumes = This->session->channel_vols; - - ALSA_CALL(set_volumes, &params); -} - HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) {

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's set_stream_volumes.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 9bd7d848a6225255eec390163021db886a77409a URL: https://gitlab.winehq.org/wine/wine/-/commit/9bd7d848a6225255eec390163021db… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 05:59:21 2023 +0200 winecoreaudio: Use mmdevapi's set_stream_volumes. --- dlls/winecoreaudio.drv/mmdevdrv.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 683e22e35a2..fc011021d68 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -79,6 +79,8 @@ extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); extern WCHAR *get_application_name(void); +extern void set_stream_volumes(struct audio_client *This); + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -198,18 +200,6 @@ static void get_device_guid(EDataFlow flow, const char *dev, GUID *guid) RegCloseKey(key); } -static void set_stream_volumes(ACImpl *This) -{ - struct set_volumes_params params; - - params.stream = This->stream; - params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; - params.volumes = This->vols; - params.session_volumes = This->session->channel_vols; - - UNIX_CALL(set_volumes, &params); -} - HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) {

1 0

Davide Beatrici : wineoss: Use mmdevapi's set_stream_volumes.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 694d713d1b7e8bca4c25caf9c45fa1af60d050b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/694d713d1b7e8bca4c25caf9c45fa1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 05:59:36 2023 +0200 wineoss: Use mmdevapi's set_stream_volumes. --- dlls/wineoss.drv/mmdevdrv.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 950b711bad0..bacf22a9029 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -91,6 +91,8 @@ extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); extern WCHAR *get_application_name(void); +extern void set_stream_volumes(struct audio_client *This); + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -215,17 +217,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static void set_stream_volumes(ACImpl *This) -{ - struct set_volumes_params params; - - params.stream = This->stream; - params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); - params.volumes = This->vols; - params.session_volumes = This->session->channel_vols; - OSS_CALL(set_volumes, &params); -} - static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) { OSSDevice *dev_item;

1 0

Davide Beatrici : winepulse: Use mmdevapi's set_stream_volumes.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 176d6a8be98696a316c40e9d3c63df65e6803072 URL: https://gitlab.winehq.org/wine/wine/-/commit/176d6a8be98696a316c40e9d3c63df… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 05:59:47 2023 +0200 winepulse: Use mmdevapi's set_stream_volumes. --- dlls/winepulse.drv/mmdevdrv.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 4efc75dc5a5..c932652f2e9 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -137,6 +137,8 @@ extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); extern WCHAR *get_application_name(void); +extern void set_stream_volumes(struct audio_client *This); + static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); @@ -149,16 +151,6 @@ static void pulse_call(enum unix_funcs code, void *params) assert(!status); } -static void set_stream_volumes(ACImpl *This) -{ - struct set_volumes_params params; - params.stream = This->stream; - params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; - params.volumes = This->vols; - params.session_volumes = This->session->channel_vols; - pulse_call(set_volumes, &params); -} - static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name, GUID *guid) { WCHAR key_name[MAX_PULSE_NAME_LEN + 2];

1 0

Davide Beatrici : winealsa: Use create_stream's channel count in AudioClient's Initialize.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: b115d90b9ae334283da3e424a480ac03f4c9a35f URL: https://gitlab.winehq.org/wine/wine/-/commit/b115d90b9ae334283da3e424a480ac… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 21 12:40:24 2023 +0200 winealsa: Use create_stream's channel count in AudioClient's Initialize. --- dlls/winealsa.drv/alsa.c | 1 + dlls/winealsa.drv/mmdevdrv.c | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 4930850e9dc..0f2211d77e7 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1050,6 +1050,7 @@ exit: free(stream->vols); free(stream); }else{ + *params->channel_count = params->fmt->nChannels; *params->stream = (stream_handle)(UINT_PTR)stream; } diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 43a44b0569d..497ea04cecb 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -550,7 +550,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; stream_handle stream; - unsigned int i; + unsigned int i, channel_count; WCHAR *name; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, @@ -598,7 +598,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; - params.channel_count = NULL; + params.channel_count = &channel_count; params.stream = &stream; ALSA_CALL(create_stream, &params); @@ -610,17 +610,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return params.result; } - This->channel_count = fmt->nChannels; - This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); + This->vols = HeapAlloc(GetProcessHeap(), 0, channel_count * sizeof(float)); if(!This->vols){ params.result = E_OUTOFMEMORY; goto exit; } - for(i = 0; i < This->channel_count; ++i) + for(i = 0; i < channel_count; ++i) This->vols[i] = 1.f; - params.result = get_audio_session(sessionguid, This->parent, This->channel_count, - &This->session); + params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session); if(FAILED(params.result)) goto exit; @@ -633,6 +631,7 @@ exit: This->vols = NULL; }else{ This->stream = stream; + This->channel_count = channel_count; set_stream_volumes(This); }

1 0

Davide Beatrici : winecoreaudio: Use create_stream's channel count in AudioClient's Initialize.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 546a62087d27f279e32085141ae1b47b3769215c URL: https://gitlab.winehq.org/wine/wine/-/commit/546a62087d27f279e32085141ae1b4… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 21 12:41:13 2023 +0200 winecoreaudio: Use create_stream's channel count in AudioClient's Initialize. --- dlls/winecoreaudio.drv/coreaudio.c | 4 +++- dlls/winecoreaudio.drv/mmdevdrv.c | 13 ++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f41118e62f5..1e712a624cb 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -776,8 +776,10 @@ end: if(stream->unit) AudioComponentInstanceDispose(stream->unit); free(stream->fmt); free(stream); - } else + } else { + *params->channel_count = params->fmt->nChannels; *params->stream = (stream_handle)(UINT_PTR)stream; + } return STATUS_SUCCESS; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index fc011021d68..f7f72f43d83 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -545,7 +545,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; stream_handle stream; - UINT32 i; + UINT32 i, channel_count; WCHAR *name; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, @@ -593,7 +593,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; - params.channel_count = NULL; + params.channel_count = &channel_count; params.stream = &stream; UNIX_CALL(create_stream, &params); @@ -605,18 +605,16 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return params.result; } - This->channel_count = fmt->nChannels; - - This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); + This->vols = HeapAlloc(GetProcessHeap(), 0, channel_count * sizeof(float)); if(!This->vols){ params.result = E_OUTOFMEMORY; goto end; } - for(i = 0; i < This->channel_count; ++i) + for(i = 0; i < channel_count; ++i) This->vols[i] = 1.f; - params.result = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); + params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session); if(FAILED(params.result)) goto end; list_add_tail(&This->session->clients, &This->entry); @@ -628,6 +626,7 @@ end: This->vols = NULL; }else{ This->stream = stream; + This->channel_count = channel_count; set_stream_volumes(This); }

1 0

Davide Beatrici : wineoss: Use create_stream's channel count in AudioClient's Initialize.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 5a79e98046743ae59a51181560b59f7483cde6e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a79e98046743ae59a51181560b59f… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 21 12:41:52 2023 +0200 wineoss: Use create_stream's channel count in AudioClient's Initialize. --- dlls/wineoss.drv/mmdevdrv.c | 13 ++++++------- dlls/wineoss.drv/oss.c | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index bacf22a9029..5f2236ce63e 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -527,7 +527,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; stream_handle stream; - unsigned int i; + unsigned int i, channel_count; WCHAR *name; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, @@ -575,7 +575,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; - params.channel_count = NULL; + params.channel_count = &channel_count; params.stream = &stream; OSS_CALL(create_stream, &params); @@ -587,17 +587,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return params.result; } - This->channel_count = fmt->nChannels; - This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); + This->vols = HeapAlloc(GetProcessHeap(), 0, channel_count * sizeof(float)); if(!This->vols){ params.result = E_OUTOFMEMORY; goto exit; } - for(i = 0; i < This->channel_count; ++i) + for(i = 0; i < channel_count; ++i) This->vols[i] = 1.f; - params.result = get_audio_session(sessionguid, This->parent, This->channel_count, - &This->session); + params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session); exit: if(FAILED(params.result)){ @@ -607,6 +605,7 @@ exit: } else { list_add_tail(&This->session->clients, &This->entry); This->stream = stream; + This->channel_count = channel_count; set_stream_volumes(This); } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 5049c711e98..2097137f749 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -674,6 +674,7 @@ exit: free(stream->fmt); free(stream); }else{ + *params->channel_count = params->fmt->nChannels; *params->stream = (stream_handle)(UINT_PTR)stream; }

1 0

Davide Beatrici : winepulse: Refactor AudioClient's Initialize to match other drivers.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 58b545fb60c795c1d96c572479224b8a9547fca1 URL: https://gitlab.winehq.org/wine/wine/-/commit/58b545fb60c795c1d96c572479224b… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 22 20:36:48 2023 +0200 winepulse: Refactor AudioClient's Initialize to match other drivers. --- dlls/winepulse.drv/mmdevdrv.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index c932652f2e9..299d5dc67c5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -563,10 +563,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, { ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; - unsigned int i, channel_count; + UINT32 i, channel_count; stream_handle stream; WCHAR *name; - HRESULT hr; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -599,10 +598,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - if (FAILED(hr = main_loop_start())) + if (FAILED(params.result = main_loop_start())) { sessions_unlock(); - return hr; + return params.result; } params.name = name = get_application_name(); @@ -617,38 +616,37 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.channel_count = &channel_count; pulse_call(create_stream, &params); free(name); - if (FAILED(hr = params.result)) + if (FAILED(params.result)) { sessions_unlock(); - return hr; + return params.result; } if (!(This->vols = malloc(channel_count * sizeof(*This->vols)))) { - stream_release(stream, NULL); - sessions_unlock(); - return E_OUTOFMEMORY; + params.result = E_OUTOFMEMORY; + goto exit; } for (i = 0; i < channel_count; i++) This->vols[i] = 1.f; - hr = get_audio_session(sessionguid, This->parent, channel_count, &This->session); - if (FAILED(hr)) - { + params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session); + +exit: + if (FAILED(params.result)) { + stream_release(stream, NULL); free(This->vols); This->vols = NULL; - sessions_unlock(); - stream_release(stream, NULL); - return E_OUTOFMEMORY; + } else { + list_add_tail(&This->session->clients, &This->entry); + This->stream = stream; + This->channel_count = channel_count; + set_stream_volumes(This); } - This->stream = stream; - This->channel_count = channel_count; - list_add_tail(&This->session->clients, &This->entry); - set_stream_volumes(This); - sessions_unlock(); - return S_OK; + + return params.result; } extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface,

1 0