- Wine-Devel - list.winehq.org

[PATCH 4/7] wineoss: Limit Wow64 buffer allocations to 32-bit addresses.
by Huw Davies May 4, 2022

May 4, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/oss.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 986ed274445..40b8879ef47 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -535,6 +535,15 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, 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) { struct create_stream_params *params = args; @@ -597,8 +606,8 @@ static NTSTATUS create_stream(void *args) if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; size = stream->bufsize_frames * params->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), + &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto exit; } @@ -931,8 +940,8 @@ static NTSTATUS get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); } @@ -1041,8 +1050,8 @@ static NTSTATUS get_capture_buffer(void *args) stream->tmp_buffer = NULL; } size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); } -- 2.25.1

2 1

[PATCH 3/7] wineoss: Return offsets rather than ptrs to the strings.
by Huw Davies May 4, 2022

May 4, 2022

This will make the Wow64 syscall rather simpler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 12 +++++++----- dlls/wineoss.drv/oss.c | 18 ++++++++---------- dlls/wineoss.drv/unixlib.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c9aae98ec2e..9c1261ce05c 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -390,8 +390,10 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int name_size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); - unsigned int dev_size = strlen(params.endpoints[i].device) + 1; + WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + char *device = (char *)params.endpoints + params.endpoints[i].device; + unsigned int name_size = (wcslen(name) + 1) * sizeof(WCHAR); + unsigned int dev_size = strlen(device) + 1; OSSDevice *oss_dev; ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); @@ -401,12 +403,12 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu params.result = E_OUTOFMEMORY; goto end; } - memcpy(ids[i], params.endpoints[i].name, name_size); - get_device_guid(flow, params.endpoints[i].device, guids + i); + memcpy(ids[i], name, name_size); + get_device_guid(flow, device, guids + i); oss_dev->flow = flow; oss_dev->guid = guids[i]; - memcpy(oss_dev->devnode, params.endpoints[i].device, dev_size); + memcpy(oss_dev->devnode, device, dev_size); device_add(oss_dev); } *def_index = params.default_idx; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a628548ddcd..986ed274445 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -226,11 +226,10 @@ static NTSTATUS get_endpoint_ids(void *args) WCHAR name[ARRAY_SIZE(ai.name) + ARRAY_SIZE(outW)]; char device[OSS_DEVNODE_SIZE]; } *info; - unsigned int i, j, num, needed, name_len, device_len, default_idx = 0; + unsigned int i, j, num, needed, name_len, device_len, offset, default_idx = 0; char default_device[OSS_DEVNODE_SIZE]; struct endpoint *endpoint; int mixer_fd; - char *ptr; mixer_fd = open("/dev/mixer", O_RDONLY, 0); if(mixer_fd < 0){ @@ -333,9 +332,8 @@ static NTSTATUS get_endpoint_ids(void *args) } close(mixer_fd); - needed = num * sizeof(*params->endpoints); + offset = needed = num * sizeof(*params->endpoints); endpoint = params->endpoints; - ptr = (char *)(endpoint + num); for(i = 0; i < num; i++){ name_len = wcslen(info[i].name) + 1; @@ -343,12 +341,12 @@ static NTSTATUS get_endpoint_ids(void *args) needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); if(needed <= params->size){ - endpoint->name = (WCHAR *)ptr; - memcpy(endpoint->name, info[i].name, name_len * sizeof(WCHAR)); - ptr += name_len * sizeof(WCHAR); - endpoint->device = ptr; - memcpy(endpoint->device, info[i].device, device_len); - ptr += (device_len + 1) & ~1; + endpoint->name = offset; + memcpy((char *)params->endpoints + offset, info[i].name, name_len * sizeof(WCHAR)); + offset += name_len * sizeof(WCHAR); + endpoint->device = offset; + memcpy((char *)params->endpoints + offset, info[i].device, device_len); + offset += (device_len + 1) & ~1; endpoint++; } } diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 278dfdbe612..208dec7f69d 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -36,8 +36,8 @@ struct test_connect_params struct endpoint { - WCHAR *name; - char *device; + unsigned int name; + unsigned int device; }; struct get_endpoint_ids_params -- 2.25.1

2 1

[PATCH 2/7] wineoss: Use UINT64 handles to represent the stream.
by Huw Davies May 4, 2022

May 4, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 6 +++--- dlls/wineoss.drv/oss.c | 43 +++++++++++++++++++++---------------- dlls/wineoss.drv/unixlib.h | 40 +++++++++++++++++----------------- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 93bf775ebc8..c9aae98ec2e 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -96,7 +96,7 @@ struct ACImpl { EDataFlow dataflow; float *vols; UINT32 channel_count; - struct oss_stream *stream; + stream_handle stream; HANDLE timer_thread; @@ -239,7 +239,7 @@ int WINAPI AUDDRV_GetPriority(void) return params.priority; } -static HRESULT stream_release(struct oss_stream *stream, HANDLE timer_thread) +static HRESULT stream_release(stream_handle stream, HANDLE timer_thread) { struct release_stream_params params; @@ -651,7 +651,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, { ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; - struct oss_stream *stream; + stream_handle stream; unsigned int i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 6490081e069..a628548ddcd 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -111,6 +111,11 @@ static NTSTATUS oss_unlock_result(struct oss_stream *stream, return STATUS_SUCCESS; } +static struct oss_stream *handle_get_stream(stream_handle h) +{ + return (struct oss_stream *)(UINT_PTR)h; +} + static NTSTATUS test_connect(void *args) { struct test_connect_params *params = args; @@ -615,7 +620,7 @@ exit: free(stream->fmt); free(stream); }else{ - *params->stream = stream; + *params->stream = (stream_handle)(UINT_PTR)stream; } return STATUS_SUCCESS; @@ -624,7 +629,7 @@ exit: static NTSTATUS release_stream(void *args) { struct release_stream_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); SIZE_T size; if(params->timer_thread){ @@ -653,7 +658,7 @@ static NTSTATUS release_stream(void *args) static NTSTATUS start(void *args) { struct start_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -671,7 +676,7 @@ static NTSTATUS start(void *args) static NTSTATUS stop(void *args) { struct stop_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -687,7 +692,7 @@ static NTSTATUS stop(void *args) static NTSTATUS reset(void *args) { struct reset_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -860,7 +865,7 @@ static void oss_read_data(struct oss_stream *stream) static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); LARGE_INTEGER delay, now, next; int adjust; @@ -902,7 +907,7 @@ static NTSTATUS timer_loop(void *args) static NTSTATUS get_render_buffer(void *args) { struct get_render_buffer_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT32 write_pos, frames = params->frames; BYTE **data = params->data; SIZE_T size; @@ -968,7 +973,7 @@ static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 writ static NTSTATUS release_render_buffer(void *args) { struct release_render_buffer_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT32 written_frames = params->written_frames; UINT flags = params->flags; BYTE *buffer; @@ -1008,7 +1013,7 @@ static NTSTATUS release_render_buffer(void *args) static NTSTATUS get_capture_buffer(void *args) { struct get_capture_buffer_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT64 *devpos = params->devpos, *qpcpos = params->qpcpos; UINT32 *frames = params->frames; UINT *flags = params->flags; @@ -1074,7 +1079,7 @@ static NTSTATUS get_capture_buffer(void *args) static NTSTATUS release_capture_buffer(void *args) { struct release_capture_buffer_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT32 done = params->done; oss_lock(stream); @@ -1231,7 +1236,7 @@ static NTSTATUS get_mix_format(void *args) static NTSTATUS get_buffer_size(void *args) { struct get_buffer_size_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -1243,7 +1248,7 @@ static NTSTATUS get_buffer_size(void *args) static NTSTATUS get_latency(void *args) { struct get_latency_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -1257,7 +1262,7 @@ static NTSTATUS get_latency(void *args) static NTSTATUS get_current_padding(void *args) { struct get_current_padding_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -1269,7 +1274,7 @@ static NTSTATUS get_current_padding(void *args) static NTSTATUS get_next_packet_size(void *args) { struct get_next_packet_size_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT32 *frames = params->frames; oss_lock(stream); @@ -1282,7 +1287,7 @@ static NTSTATUS get_next_packet_size(void *args) static NTSTATUS get_frequency(void *args) { struct get_frequency_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT64 *freq = params->frequency; oss_lock(stream); @@ -1298,7 +1303,7 @@ static NTSTATUS get_frequency(void *args) static NTSTATUS get_position(void *args) { struct get_position_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT64 *pos = params->position, *qpctime = params->qpctime; oss_lock(stream); @@ -1342,7 +1347,7 @@ static NTSTATUS get_position(void *args) static NTSTATUS set_volumes(void *args) { struct set_volumes_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); stream->mute = !params->master_volume; @@ -1354,7 +1359,7 @@ static NTSTATUS set_volumes(void *args) static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -1374,7 +1379,7 @@ static NTSTATUS set_event_handle(void *args) static NTSTATUS is_started(void *args) { struct is_started_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 25e9a7007b3..278dfdbe612 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -18,7 +18,7 @@ #include "mmdeviceapi.h" -struct stream_oss; +typedef UINT64 stream_handle; /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority @@ -60,42 +60,42 @@ struct create_stream_params REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; - struct oss_stream **stream; + stream_handle *stream; }; struct release_stream_params { - struct oss_stream *stream; + stream_handle stream; HANDLE timer_thread; HRESULT result; }; struct start_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; }; struct stop_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; }; struct reset_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; }; struct timer_loop_params { - struct oss_stream *stream; + stream_handle stream; }; struct get_render_buffer_params { - struct oss_stream *stream; + stream_handle stream; UINT32 frames; HRESULT result; BYTE **data; @@ -103,7 +103,7 @@ struct get_render_buffer_params struct release_render_buffer_params { - struct oss_stream *stream; + stream_handle stream; UINT32 written_frames; UINT flags; HRESULT result; @@ -111,7 +111,7 @@ struct release_render_buffer_params struct get_capture_buffer_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; BYTE **data; UINT32 *frames; @@ -122,7 +122,7 @@ struct get_capture_buffer_params struct release_capture_buffer_params { - struct oss_stream *stream; + stream_handle stream; UINT32 done; HRESULT result; }; @@ -147,42 +147,42 @@ struct get_mix_format_params struct get_buffer_size_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT32 *size; }; struct get_latency_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; REFERENCE_TIME *latency; }; struct get_current_padding_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT32 *padding; }; struct get_next_packet_size_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT32 *frames; }; struct get_frequency_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT64 *frequency; }; struct get_position_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT64 *position; UINT64 *qpctime; @@ -190,7 +190,7 @@ struct get_position_params struct set_volumes_params { - struct oss_stream *stream; + stream_handle stream; float master_volume; const float *volumes; const float *session_volumes; @@ -198,14 +198,14 @@ struct set_volumes_params struct set_event_handle_params { - struct oss_stream *stream; + stream_handle stream; HANDLE event; HRESULT result; }; struct is_started_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; }; -- 2.25.1

2 1

[PATCH 1/7] wineoss: Pass a client ptr to the callback instead of a stream.
by Huw Davies May 4, 2022

May 4, 2022

This is to allow stream handles to be larger than sizeof(void *). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c282ff14f01..93bf775ebc8 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -252,10 +252,10 @@ static HRESULT stream_release(struct oss_stream *stream, HANDLE timer_thread) static DWORD WINAPI timer_thread(void *user) { - struct oss_stream *stream = user; struct timer_loop_params params; + struct ACImpl *This = user; - params.stream = stream; + params.stream = This->stream; OSS_CALL(timer_loop, &params); return 0; @@ -913,7 +913,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) OSS_CALL(start, &params); if(SUCCEEDED(params.result) && !This->timer_thread){ - This->timer_thread = CreateThread(NULL, 0, timer_thread, This->stream, 0, NULL); + This->timer_thread = CreateThread(NULL, 0, timer_thread, This, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } -- 2.25.1

2 1

[PATCH 0/1] MR29: mfplat: Avoid a race condition when releasing a tracked sample.
by Giovanni Mascellani (＠giomasce) May 4, 2022

May 4, 2022

Right now, if the same tracked sample is released at the same time from two different threads it might happen that neither of them calls the callback, because they might go through the critical section at the same time (while neither has decremented the reference count yet). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/29

3 4

[PATCH 0/11] MR36: winex11: PE conversion preparation
by Jacek Caban (＠jacek) May 4, 2022

May 4, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/36

2 11

[PATCH 1/2] ntdll: Add a partial implementation of NtMapViewOfSectionEx().
by Nikolay Sivov May 4, 2022

May 4, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/virtual.c | 149 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/virtual.c | 12 +++ dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 34 +++++++++ include/winternl.h | 1 + 7 files changed, 200 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ba29b21d61d..a7a39a0bce2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -253,6 +253,7 @@ # @ stub NtMapUserPhysicalPages # @ stub NtMapUserPhysicalPagesScatter @ stdcall -syscall NtMapViewOfSection(long long ptr long long ptr ptr long long long) +@ stdcall -syscall NtMapViewOfSectionEx(long long ptr ptr ptr long long ptr long) # @ stub NtModifyBootEntry @ stdcall -syscall NtNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) @ stdcall -syscall NtNotifyChangeKey(long long ptr ptr ptr long long ptr long long) @@ -1279,6 +1280,7 @@ # @ stub ZwMapUserPhysicalPages # @ stub ZwMapUserPhysicalPagesScatter @ stdcall -private -syscall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection +@ stdcall -private -syscall ZwMapViewOfSectionEx(long long ptr ptr ptr long long ptr long) NtMapViewOfSectionEx # @ stub ZwModifyBootEntry @ stdcall -private -syscall ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall -private -syscall ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 30a97ba9d94..aeef2ed8fb9 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -39,6 +39,9 @@ static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); +static NTSTATUS (WINAPI *pNtMapViewOfSectionEx)(HANDLE, HANDLE, PVOID *, const LARGE_INTEGER *, SIZE_T *, + ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); + static const BOOL is_win64 = sizeof(void*) != sizeof(int); static BOOL is_wow64; @@ -908,6 +911,150 @@ static void test_NtMapViewOfSection(void) CloseHandle(process); } +static void test_NtMapViewOfSectionEx(void) +{ + static const char testfile[] = "testfile.xxx"; + static const char data[] = "test data for NtMapViewOfSectionEx"; + char buffer[sizeof(data)]; + HANDLE file, mapping, process; + DWORD status, written; + SIZE_T size, result; + LARGE_INTEGER offset; + void *ptr, *ptr2; + BOOL ret; + + if (!pNtMapViewOfSectionEx) + { + win_skip("NtMapViewOfSectionEx() is not supported.\n"); + return; + } + + if (!pIsWow64Process || !pIsWow64Process(NtCurrentProcess(), &is_wow64)) is_wow64 = FALSE; + + file = CreateFileA(testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create test file\n"); + WriteFile(file, data, sizeof(data), &written, NULL); + SetFilePointer(file, 4096, NULL, FILE_BEGIN); + SetEndOfFile(file); + + /* read/write mapping */ + + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, 4096, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + process = create_target_process("sleep"); + ok(process != NULL, "Can't start process\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + + ret = ReadProcessMemory(process, ptr, buffer, sizeof(buffer), &result); + ok(ret, "ReadProcessMemory failed\n"); + ok(result == sizeof(buffer), "ReadProcessMemory didn't read all data (%Ix)\n", result); + ok(!memcmp(buffer, data, sizeof(buffer)), "Wrong data read\n"); + + /* mapping at the same page conflicts */ + ptr2 = ptr; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status); + + /* offset has to be aligned */ + ptr2 = ptr; + size = 0; + offset.QuadPart = 1; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_MAPPED_ALIGNMENT, "Unexpected status %08lx\n", status); + + /* ptr has to be aligned */ + ptr2 = (char *)ptr + 42; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_MAPPED_ALIGNMENT, "Unexpected status %08lx\n", status); + + /* still not 64k aligned */ + ptr2 = (char *)ptr + 0x1000; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_MAPPED_ALIGNMENT, "Unexpected status %08lx\n", status); + + if (!is_win64 && !is_wow64) + { + /* new memory region conflicts with previous mapping */ + ptr2 = ptr; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status); + + ptr2 = (char *)ptr + 42; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status); + + /* in contrary to regular NtMapViewOfSection, only 4kb align is enforced */ + ptr2 = (char *)ptr + 0x1000; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); + ok((char *)ptr2 == (char *)ptr + 0x1000, + "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2); + status = NtUnmapViewOfSection(process, ptr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + /* the address is rounded down if not on a page boundary */ + ptr2 = (char *)ptr + 0x1001; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); + ok((char *)ptr2 == (char *)ptr + 0x1000, + "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2); + status = NtUnmapViewOfSection(process, ptr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + ptr2 = (char *)ptr + 0x2000; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); + ok((char *)ptr2 == (char *)ptr + 0x2000, + "expected address %p, got %p\n", (char *)ptr + 0x2000, ptr2); + status = NtUnmapViewOfSection(process, ptr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + } + else + { + ptr2 = (char *)ptr + 0x1000; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + todo_wine + ok(status == STATUS_INVALID_PARAMETER_9 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %08lx\n", status); + } + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + NtClose(mapping); + + CloseHandle(file); + DeleteFileA(testfile); + + TerminateProcess(process, 0); + CloseHandle(process); +} + #define SUPPORTED_XSTATE_FEATURES ((1 << XSTATE_LEGACY_FLOATING_POINT) | (1 << XSTATE_LEGACY_SSE) | (1 << XSTATE_AVX)) static void test_user_shared_data(void) @@ -1160,6 +1307,7 @@ START_TEST(virtual) pRtlFindExportedRoutineByName = (void *)GetProcAddress(mod, "RtlFindExportedRoutineByName"); pRtlGetEnabledExtendedFeatures = (void *)GetProcAddress(mod, "RtlGetEnabledExtendedFeatures"); pNtAllocateVirtualMemoryEx = (void *)GetProcAddress(mod, "NtAllocateVirtualMemoryEx"); + pNtMapViewOfSectionEx = (void *)GetProcAddress(mod, "NtMapViewOfSectionEx"); NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); trace("system page size %#lx\n", sbi.PageSize); @@ -1169,6 +1317,7 @@ START_TEST(virtual) test_NtAllocateVirtualMemory(); test_RtlCreateUserStack(); test_NtMapViewOfSection(); + test_NtMapViewOfSectionEx(); test_user_shared_data(); test_syscalls(); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d1c42ddc0f3..cad760a1445 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -207,6 +207,7 @@ static void * const syscalls[] = NtLockVirtualMemory, NtMakeTemporaryObject, NtMapViewOfSection, + NtMapViewOfSectionEx, NtNotifyChangeDirectoryFile, NtNotifyChangeKey, NtNotifyChangeMultipleKeys, diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 94b300c5057..02478cceb06 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4536,6 +4536,18 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p offset_ptr, size_ptr, alloc_type, protect ); } +/*********************************************************************** + * NtMapViewOfSectionEx (NTDLL.@) + * ZwMapViewOfSectionEx (NTDLL.@) + */ +NTSTATUS WINAPI NtMapViewOfSectionEx( HANDLE handle, HANDLE process, PVOID *addr_ptr, const LARGE_INTEGER *offset_ptr, + SIZE_T *size_ptr, ULONG alloc_type, ULONG protect, MEM_EXTENDED_PARAMETER *params, ULONG params_count ) +{ + if (params) + FIXME("Ignoring extended parameters.\n"); + + return NtMapViewOfSection( handle, process, addr_ptr, 0, 0, offset_ptr, size_ptr, ViewShare, alloc_type, protect ); +} /*********************************************************************** * NtUnmapViewOfSection (NTDLL.@) diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index a3af9174c49..3b364d909d7 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -108,6 +108,7 @@ SYSCALL_ENTRY( NtLockVirtualMemory ) \ SYSCALL_ENTRY( NtMakeTemporaryObject ) \ SYSCALL_ENTRY( NtMapViewOfSection ) \ + SYSCALL_ENTRY( NtMapViewOfSectionEx ) \ SYSCALL_ENTRY( NtNotifyChangeDirectoryFile ) \ SYSCALL_ENTRY( NtNotifyChangeKey ) \ SYSCALL_ENTRY( NtNotifyChangeMultipleKeys ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index e89373f4239..61c84e5d7be 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -287,6 +287,40 @@ NTSTATUS WINAPI wow64_NtMapViewOfSection( UINT *args ) return status; } +/********************************************************************** + * wow64_NtMapViewOfSectionEx + */ +NTSTATUS WINAPI wow64_NtMapViewOfSectionEx( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE process = get_handle( &args ); + ULONG *addr32 = get_ptr( &args ); + const LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *size32 = get_ptr( &args ); + ULONG alloc = get_ulong( &args ); + ULONG protect = get_ulong( &args ); + MEM_EXTENDED_PARAMETER *params = get_ptr( &args ); + ULONG params_count = get_ulong( &args ); + + void *addr; + SIZE_T size; + NTSTATUS status; + + status = NtMapViewOfSectionEx( handle, process, addr_32to64( &addr, addr32 ), offset, size_32to64( &size, size32 ), alloc, + protect, params, params_count ); + if (NT_SUCCESS(status)) + { + SECTION_IMAGE_INFORMATION info; + + if (!NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL )) + { + if (info.Machine == current_machine) init_image_mapping( addr ); + } + put_addr( addr32, addr ); + put_size( size32, size ); + } + return status; +} /********************************************************************** * wow64_NtProtectVirtualMemory diff --git a/include/winternl.h b/include/winternl.h index b4942d86b4c..1d358fc0b2d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4007,6 +4007,7 @@ NTSYSAPI NTSTATUS WINAPI NtLockFile(HANDLE,HANDLE,PIO_APC_ROUTINE,void*,PIO_STA NTSYSAPI NTSTATUS WINAPI NtLockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtMakeTemporaryObject(HANDLE); NTSYSAPI NTSTATUS WINAPI NtMapViewOfSection(HANDLE,HANDLE,PVOID*,ULONG_PTR,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI NtMapViewOfSectionEx(HANDLE,HANDLE,PVOID*,const LARGE_INTEGER*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeMultipleKeys(HANDLE,ULONG,OBJECT_ATTRIBUTES*,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); -- 2.35.1

1 1

[PATCH 0/5] MR33: windows.gaming.input: Split async info to a separate struct.
by Rémi Bernon May 4, 2022

May 4, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/33

1 5

[PATCH v3 0/5] MR25: mf/tests: Add dmo / transform tests for the audio resampler and color converters.
by Rémi Bernon May 4, 2022

May 4, 2022

I believe this doesn't conflict with https://gitlab.winehq.org/wine/wine/-/merge_requests/22 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 -- v3: mf/tests: Add tests for the ColorConvertDMO video transform. mf/tests: Check VideoProcessorMFT transform media types. mf/tests: Add tests for the ResamplerMediaObject audio transform. mf/tests: Add more DMO class name, media type and interface checks. mf/tests: Check expected class GUID in create_transform. https://gitlab.winehq.org/wine/wine/-/merge_requests/25

1 5

[PATCH v2 0/1] MR23: shell32: Sanitize Program Manager icon and group names
by Alex Henrie (＠alexhenrie) May 4, 2022

May 4, 2022

All of the new tests that are marked todo_wine fail because Wine's PathCombineW does not handle ".", "...", "....", or "foobar." correctly. They will pass once PathCombineW is fixed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- v2: shell32: Sanitize Program Manager icon and group names https://gitlab.winehq.org/wine/wine/-/merge_requests/23

2 2