Skip to content

W
wine-winehq
Commit e3b9aa14 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

wineoss: Limit Wow64 buffer allocations to 32-bit addresses.

Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent be15ed1d
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 6 deletions
dlls/wineoss.drv/oss.c
View file @ e3b9aa14
...@@ -535,6 +535,15 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, ...@@ -535,6 +535,15 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd,
return ret; return ret;
} }
static ULONG_PTR zero_bits(void)
{
#ifdef _WIN64
return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff;
#else
return 0;
#endif
}
static NTSTATUS create_stream(void *args) static NTSTATUS create_stream(void *args)
{ {
struct create_stream_params *params = args; struct create_stream_params *params = args;
...@@ -597,8 +606,8 @@ static NTSTATUS create_stream(void *args) ...@@ -597,8 +606,8 @@ static NTSTATUS create_stream(void *args)
if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE)
stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames;
size = stream->bufsize_frames * params->fmt->nBlockAlign; size = stream->bufsize_frames * params->fmt->nBlockAlign;
if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(),
MEM_COMMIT, PAGE_READWRITE)){ &size, MEM_COMMIT, PAGE_READWRITE)){
params->result = E_OUTOFMEMORY; params->result = E_OUTOFMEMORY;
goto exit; goto exit;
} }
...@@ -931,8 +940,8 @@ static NTSTATUS get_render_buffer(void *args) ...@@ -931,8 +940,8 @@ static NTSTATUS get_render_buffer(void *args)
stream->tmp_buffer = NULL; stream->tmp_buffer = NULL;
} }
size = frames * stream->fmt->nBlockAlign; size = frames * stream->fmt->nBlockAlign;
if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(),
MEM_COMMIT, PAGE_READWRITE)){ &size, MEM_COMMIT, PAGE_READWRITE)){
stream->tmp_buffer_frames = 0; stream->tmp_buffer_frames = 0;
return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY);
} }
...@@ -1041,8 +1050,8 @@ static NTSTATUS get_capture_buffer(void *args) ...@@ -1041,8 +1050,8 @@ static NTSTATUS get_capture_buffer(void *args)
stream->tmp_buffer = NULL; stream->tmp_buffer = NULL;
} }
size = *frames * stream->fmt->nBlockAlign; size = *frames * stream->fmt->nBlockAlign;
if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(),
MEM_COMMIT, PAGE_READWRITE)){ &size, MEM_COMMIT, PAGE_READWRITE)){
stream->tmp_buffer_frames = 0; stream->tmp_buffer_frames = 0;
return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment