Module: wine Branch: master Commit: 5cf597ba09f4e479ac2d8d7312e2b65748c1b1c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cf597ba09f4e479ac2d8d7312e2b65... Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 7 14:39:57 2023 -0700 winealsa: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/winealsa.drv/alsa.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 0f2211d77e7..17737012579 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -91,6 +91,8 @@ static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v'}; +static ULONG_PTR zero_bits = 0; + static NTSTATUS alsa_not_implemented(void *args) { return STATUS_SUCCESS; @@ -476,6 +478,20 @@ static WCHAR *alsa_get_card_name(int card) return ret; } +static NTSTATUS alsa_process_attach(void *args) +{ +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return STATUS_SUCCESS; +} + static NTSTATUS alsa_main_loop(void *args) { struct main_loop_params *params = args; @@ -781,15 +797,6 @@ static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 fram memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static NTSTATUS alsa_create_stream(void *args) { struct create_stream_params *params = args; @@ -1004,7 +1011,7 @@ static NTSTATUS alsa_create_stream(void *args) stream->fmt = &fmtex->Format; size = stream->bufsize_frames * params->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto exit; @@ -1718,7 +1725,7 @@ static NTSTATUS alsa_get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return alsa_unlock_result(stream, ¶ms->result, E_OUTOFMEMORY); @@ -1821,7 +1828,7 @@ static NTSTATUS alsa_get_capture_buffer(void *args) stream->tmp_buffer = NULL; } size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return alsa_unlock_result(stream, ¶ms->result, E_OUTOFMEMORY); @@ -2499,7 +2506,7 @@ static NTSTATUS alsa_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - alsa_not_implemented, + alsa_process_attach, alsa_not_implemented, alsa_main_loop, alsa_get_endpoint_ids, @@ -2953,7 +2960,7 @@ static NTSTATUS alsa_wow64_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - alsa_not_implemented, + alsa_process_attach, alsa_not_implemented, alsa_wow64_main_loop, alsa_wow64_get_endpoint_ids,