May 2023 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Support extended address requirements in NtMapViewOfSectionEx().
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 4b8f3dd9a56db4fd6a63895f7ee6ee26c1ef2bc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b8f3dd9a56db4fd6a63895f7ee6ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 17:07:08 2023 +0200 ntdll: Support extended address requirements in NtMapViewOfSectionEx(). --- dlls/ntdll/unix/server.c | 39 ++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 63 ++++++++++++++++++++++++++++++++++++++---- include/wine/server_protocol.h | 21 +++++++++++++- server/protocol.def | 21 +++++++++++++- server/thread.c | 1 + server/trace.c | 12 ++++++-- 6 files changed, 148 insertions(+), 9 deletions(-)

1 0

Alexandre Julliard : wow64: Convert MEM_EXTENDED_PARAMETER also for NtMapViewOfSectionEx().
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: f0a6c3f6bc908d1f389348730edc353bc8c257a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0a6c3f6bc908d1f389348730edc35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 18:20:40 2023 +0200 wow64: Convert MEM_EXTENDED_PARAMETER also for NtMapViewOfSectionEx(). --- dlls/wow64/virtual.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index e58ae805914..21ce0905654 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -375,15 +375,19 @@ NTSTATUS WINAPI wow64_NtMapViewOfSectionEx( UINT *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 ); + MEM_EXTENDED_PARAMETER32 *params32 = get_ptr( &args ); + ULONG count = get_ulong( &args ); void *addr; SIZE_T size; NTSTATUS status; + MEM_EXTENDED_PARAMETER *params64; + BOOL set_limit = (!*addr32 && process == GetCurrentProcess()); + + if ((status = mem_extended_parameters_32to64( &params64, params32, &count, set_limit ))) return status; - status = NtMapViewOfSectionEx( handle, process, addr_32to64( &addr, addr32 ), offset, size_32to64( &size, size32 ), alloc, - protect, params, params_count ); + status = NtMapViewOfSectionEx( handle, process, addr_32to64( &addr, addr32 ), offset, + size_32to64( &size, size32 ), alloc, protect, params64, count ); if (NT_SUCCESS(status)) { SECTION_IMAGE_INFORMATION info;

1 0

Davide Beatrici : winepulse: Move AudioStreamVolume into mmdevapi.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 7244666dc96a929090c68e24b482950fd65ab7db URL: https://gitlab.winehq.org/wine/wine/-/commit/7244666dc96a929090c68e24b48295… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 9 21:36:07 2023 +0200 winepulse: Move AudioStreamVolume into mmdevapi. --- dlls/mmdevapi/Makefile.in | 1 + dlls/mmdevapi/client.c | 208 +++++++++++++++++++++++++++++++++++++++++ dlls/mmdevapi/session.c | 25 +++-- dlls/winepulse.drv/Makefile.in | 1 + dlls/winepulse.drv/mmdevdrv.c | 168 +-------------------------------- 5 files changed, 223 insertions(+), 180 deletions(-)

1 0

Alexandre Julliard : wow64: Add a helper function to convert MEM_EXTENDED_PARAMETER.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: e0311411786c85a560b6f9969a7adf1f544982ab URL: https://gitlab.winehq.org/wine/wine/-/commit/e0311411786c85a560b6f9969a7adf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 18:18:21 2023 +0200 wow64: Add a helper function to convert MEM_EXTENDED_PARAMETER. And use the correct 32-bit types for the conversion. --- dlls/wow64/struct32.h | 23 ++++++++-- dlls/wow64/virtual.c | 122 +++++++++++++++++++++++++------------------------- 2 files changed, 82 insertions(+), 63 deletions(-) diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 76308a7f659..0a560ac0f92 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -667,9 +667,26 @@ typedef struct typedef struct { - ULONG LowestStartingAddress; - ULONG HighestEndingAddress; - ULONG Alignment; + ULONG LowestStartingAddress; + ULONG HighestEndingAddress; + ULONG Alignment; } MEM_ADDRESS_REQUIREMENTS32; +typedef struct DECLSPEC_ALIGN(8) +{ + struct + { + DWORD64 Type : MEM_EXTENDED_PARAMETER_TYPE_BITS; + DWORD64 Reserved : 64 - MEM_EXTENDED_PARAMETER_TYPE_BITS; + }; + union + { + DWORD64 ULong64; + ULONG Pointer; + ULONG Size; + ULONG Handle; + ULONG ULong; + }; +} MEM_EXTENDED_PARAMETER32; + #endif /* __WOW64_STRUCT32_H */ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 0f34e8aec27..e58ae805914 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -48,6 +48,64 @@ static MEMORY_RANGE_ENTRY *memory_range_entry_array_32to64( const MEMORY_RANGE_E return addresses; } +static NTSTATUS mem_extended_parameters_32to64( MEM_EXTENDED_PARAMETER **ret_params, + const MEM_EXTENDED_PARAMETER32 *params32, ULONG *count, + BOOL set_limit ) +{ + ULONG i; + MEM_EXTENDED_PARAMETER *params; + MEM_ADDRESS_REQUIREMENTS *req; + MEM_ADDRESS_REQUIREMENTS32 *req32 = NULL; + + if (*count && !params32) return STATUS_INVALID_PARAMETER; + + params = Wow64AllocateTemp( (*count + 1) * sizeof(*params) + sizeof(*req) ); + req = (MEM_ADDRESS_REQUIREMENTS *)(params + *count + 1); + + for (i = 0; i < *count; i++) + { + params[i].Type = params32[i].Type; + params[i].Reserved = 0; + switch (params[i].Type) + { + case MemExtendedParameterAddressRequirements: + req32 = ULongToPtr( params32[i].Pointer ); + params[i].Pointer = req; + break; + case MemExtendedParameterAttributeFlags: + case MemExtendedParameterNumaNode: + case MemExtendedParameterImageMachine: + params[i].ULong = params32[i].ULong; + break; + case MemExtendedParameterPartitionHandle: + case MemExtendedParameterUserPhysicalHandle: + params[i].Handle = ULongToHandle( params32[i].Handle ); + break; + } + } + + if (req32) + { + if (req32->HighestEndingAddress > highest_user_address) return STATUS_INVALID_PARAMETER; + req->LowestStartingAddress = ULongToPtr( req32->LowestStartingAddress ); + req->HighestEndingAddress = ULongToPtr( req32->HighestEndingAddress ); + req->Alignment = req32->Alignment; + } + else if (set_limit) + { + req->LowestStartingAddress = NULL; + req->HighestEndingAddress = (void *)highest_user_address; + req->Alignment = 0; + + params[i].Type = MemExtendedParameterAddressRequirements; + params[i].Reserved = 0; + params[i].Pointer = req; + *count = i + 1; + } + *ret_params = params; + return STATUS_SUCCESS; +} + /********************************************************************** * wow64_NtAllocateVirtualMemory */ @@ -85,75 +143,19 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) ULONG *size32 = get_ptr( &args ); ULONG type = get_ulong( &args ); ULONG protect = get_ulong( &args ); - MEM_EXTENDED_PARAMETER *params = get_ptr( &args ); + MEM_EXTENDED_PARAMETER32 *params32 = get_ptr( &args ); ULONG count = get_ulong( &args ); void *addr; SIZE_T size; NTSTATUS status; - SIZE_T alloc_size = count * sizeof(*params); MEM_EXTENDED_PARAMETER *params64; - BOOL set_highest_address = (!*addr32 && process == GetCurrentProcess()); - BOOL add_address_requirements = set_highest_address; - MEM_ADDRESS_REQUIREMENTS *buf; - unsigned int i; - - if (count && !params) return STATUS_INVALID_PARAMETER; - - for (i = 0; i < count; ++i) - { - if (params[i].Type == MemExtendedParameterAddressRequirements) - { - alloc_size += sizeof(MEM_ADDRESS_REQUIREMENTS); - add_address_requirements = FALSE; - } - else if (params[i].Type && params[i].Type < MemExtendedParameterMax) - { - FIXME( "Unsupported parameter type %d.\n", params[i].Type); - } - } + BOOL set_limit = (!*addr32 && process == GetCurrentProcess()); - if (add_address_requirements) - alloc_size += sizeof(*params) + sizeof(MEM_ADDRESS_REQUIREMENTS); - params64 = Wow64AllocateTemp( alloc_size ); - memcpy( params64, params, count * sizeof(*params64) ); - if (add_address_requirements) - { - buf = (MEM_ADDRESS_REQUIREMENTS *)((char *)params64 + (count + 1) * sizeof(*params64)); - params64[count].Type = MemExtendedParameterAddressRequirements; - params64[count].Pointer = buf; - memset(buf, 0, sizeof(*buf)); - buf->HighestEndingAddress = (void *)highest_user_address; - ++buf; - } - else - { - buf = (MEM_ADDRESS_REQUIREMENTS *)((char *)params64 + count * sizeof(*params64)); - } - for (i = 0; i < count; ++i) - { - if (params64[i].Type == MemExtendedParameterAddressRequirements) - { - MEM_ADDRESS_REQUIREMENTS32 *p = (MEM_ADDRESS_REQUIREMENTS32 *)params[i].Pointer; - - buf->LowestStartingAddress = ULongToPtr(p->LowestStartingAddress); - if (p->HighestEndingAddress) - { - if (p->HighestEndingAddress > highest_user_address) return STATUS_INVALID_PARAMETER; - buf->HighestEndingAddress = ULongToPtr(p->HighestEndingAddress); - } - else - { - buf->HighestEndingAddress = set_highest_address ? (void *)highest_user_address : NULL; - } - buf->Alignment = p->Alignment; - params64[i].Pointer = buf; - ++buf; - } - } + if ((status = mem_extended_parameters_32to64( &params64, params32, &count, set_limit ))) return status; status = NtAllocateVirtualMemoryEx( process, addr_32to64( &addr, addr32 ), size_32to64( &size, size32 ), - type, protect, params64, count + add_address_requirements ); + type, protect, params64, count ); if (!status) { put_addr( addr32, addr );

1 0

Alexandre Julliard : ntdll/tests: Add tests for address requirements in NtMapViewOfSectionEx().
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 9099289aff083abedd2ab36cbe59c6164e072f05 URL: https://gitlab.winehq.org/wine/wine/-/commit/9099289aff083abedd2ab36cbe59c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 17:07:38 2023 +0200 ntdll/tests: Add tests for address requirements in NtMapViewOfSectionEx(). Based on the similar tests for NtAllocateVirtualMemoryEx(). --- dlls/ntdll/tests/virtual.c | 120 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 425d02473ba..bfd27f498e2 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -490,7 +490,8 @@ static void test_NtAllocateVirtualMemoryEx(void) } } #endif - ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + ok(status == STATUS_INVALID_PARAMETER || status == STATUS_NOT_SUPPORTED, + "Unexpected status %08lx.\n", status); } static void test_NtAllocateVirtualMemoryEx_address_requirements(void) @@ -1370,6 +1371,9 @@ static void test_NtMapViewOfSectionEx(void) static const char testfile[] = "testfile.xxx"; static const char data[] = "test data for NtMapViewOfSectionEx"; char buffer[sizeof(data)]; + MEM_EXTENDED_PARAMETER ext[2]; + MEM_ADDRESS_REQUIREMENTS a; + SYSTEM_INFO si; HANDLE file, mapping, process; DWORD status, written; SIZE_T size, result; @@ -1384,23 +1388,24 @@ static void test_NtMapViewOfSectionEx(void) } if (!pIsWow64Process || !pIsWow64Process(NtCurrentProcess(), &is_wow64)) is_wow64 = FALSE; + GetSystemInfo(&si); 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); + SetFilePointer(file, 0x40000, NULL, FILE_BEGIN); SetEndOfFile(file); /* read/write mapping */ - mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, 4096, NULL); + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, 0x40000, NULL); ok(mapping != 0, "CreateFileMapping failed\n"); process = create_target_process("sleep"); ok(process != NULL, "Can't start process\n"); ptr = NULL; - size = 0; + size = 0x1000; offset.QuadPart = 0; status = pNtMapViewOfSectionEx(mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, NULL, 0); ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); @@ -1443,20 +1448,20 @@ static void test_NtMapViewOfSectionEx(void) { /* new memory region conflicts with previous mapping */ ptr2 = ptr; - size = 0; + size = 0x1000; 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; + size = 0x1000; 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; + size = 0x1000; 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); @@ -1467,7 +1472,7 @@ static void test_NtMapViewOfSectionEx(void) /* the address is rounded down if not on a page boundary */ ptr2 = (char *)ptr + 0x1001; - size = 0; + size = 0x1000; 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); @@ -1477,7 +1482,7 @@ static void test_NtMapViewOfSectionEx(void) ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); ptr2 = (char *)ptr + 0x2000; - size = 0; + size = 0x1000; 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); @@ -1500,6 +1505,103 @@ static void test_NtMapViewOfSectionEx(void) status = NtUnmapViewOfSection(process, ptr); ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + /* extended parameters */ + + memset(&ext, 0, sizeof(ext)); + ext[0].Type = 0; + size = 0x1000; + ptr = NULL; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + memset(&ext, 0, sizeof(ext)); + ext[0].Type = MemExtendedParameterMax; + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + memset(&a, 0, sizeof(a)); + ext[0].Type = MemExtendedParameterAddressRequirements; + ext[0].Pointer = &a; + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(!status, "Unexpected status %08lx.\n", status); + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + ext[1] = ext[0]; + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 2 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.LowestStartingAddress = NULL; + a.Alignment = 0; + a.HighestEndingAddress = (void *)(0x20001000 + 1); + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (void *)(0x20001000 - 2); + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (void *)(0x20000800 - 1); + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (char *)si.lpMaximumApplicationAddress + 0x1000; + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (char *)si.lpMaximumApplicationAddress; + size = 0x10000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(!status, "Unexpected status %08lx.\n", status); + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + a.HighestEndingAddress = (void *)(0x20001000 - 1); + size = 0x40000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(!status, "Unexpected status %08lx.\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "Unexpected addr %p.\n", ptr); + ok((ULONG_PTR)ptr + size <= 0x20001000, "Unexpected addr %p.\n", ptr); + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + size = 0x40000; + a.HighestEndingAddress = (void *)(0x20001000 - 1); + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = NULL; + a.Alignment = 0x30000; + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + for (a.Alignment = 1; a.Alignment; a.Alignment *= 2) + { + size = 0x1000; + ptr = NULL; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, ext, 1 ); + ok(status == STATUS_INVALID_PARAMETER, "Align %Ix unexpected status %08lx.\n", a.Alignment, status); + } + NtClose(mapping); CloseHandle(file);

1 0

Alexandre Julliard : ntdll: Add a helper function to process MEM_EXTENDED_PARAMETER parameters.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 185e168accf0e31044d2c25c98376fca9e143e42 URL: https://gitlab.winehq.org/wine/wine/-/commit/185e168accf0e31044d2c25c98376f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 17:05:34 2023 +0200 ntdll: Add a helper function to process MEM_EXTENDED_PARAMETER parameters. --- dlls/ntdll/unix/virtual.c | 60 ++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8154ff148eb..5c746df9693 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4041,22 +4041,11 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z } -/*********************************************************************** - * NtAllocateVirtualMemoryEx (NTDLL.@) - * ZwAllocateVirtualMemoryEx (NTDLL.@) - */ -NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, - ULONG protect, MEM_EXTENDED_PARAMETER *parameters, - ULONG count ) +static NTSTATUS get_extended_params( const MEM_EXTENDED_PARAMETER *parameters, ULONG count, + ULONG_PTR *limit, ULONG_PTR *align, ULONG *attributes ) { - ULONG_PTR limit = 0; - ULONG_PTR align = 0; - ULONG attributes = 0; MEM_ADDRESS_REQUIREMENTS *r = NULL; - unsigned int i; - - TRACE( "%p %p %08lx %x %08x %p %u\n", - process, *ret, *size_ptr, (int)type, (int)protect, parameters, (int)count ); + ULONG i; if (count && !parameters) return STATUS_INVALID_PARAMETER; @@ -4074,25 +4063,26 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s if (r->Alignment) { - if (*ret || (r->Alignment & (r->Alignment - 1)) || r->Alignment - 1 < granularity_mask) + if ((r->Alignment & (r->Alignment - 1)) || r->Alignment - 1 < granularity_mask) { WARN( "Invalid alignment %lu.\n", r->Alignment ); return STATUS_INVALID_PARAMETER; } - align = r->Alignment; + *align = r->Alignment; } - - limit = (ULONG_PTR)r->HighestEndingAddress; - if (limit && (*ret || limit > (ULONG_PTR)user_space_limit || ((limit + 1) & (page_mask - 1)))) + if (r->HighestEndingAddress) { - WARN( "Invalid limit %p.\n", r->HighestEndingAddress); - return STATUS_INVALID_PARAMETER; + *limit = (ULONG_PTR)r->HighestEndingAddress; + if (*limit > (ULONG_PTR)user_space_limit || ((*limit + 1) & (page_mask - 1))) + { + WARN( "Invalid limit %p.\n", r->HighestEndingAddress ); + return STATUS_INVALID_PARAMETER; + } } - TRACE( "limit %p, align %p.\n", (void *)limit, (void *)align ); break; case MemExtendedParameterAttributeFlags: - attributes = parameters[i].ULong; + *attributes = parameters[i].ULong; break; case MemExtendedParameterNumaNode: @@ -4107,14 +4097,36 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s return STATUS_INVALID_PARAMETER; } } + return STATUS_SUCCESS; +} + +/*********************************************************************** + * NtAllocateVirtualMemoryEx (NTDLL.@) + * ZwAllocateVirtualMemoryEx (NTDLL.@) + */ +NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, + ULONG count ) +{ + ULONG_PTR limit = 0; + ULONG_PTR align = 0; + ULONG attributes = 0; + unsigned int status; + + TRACE( "%p %p %08lx %x %08x %p %u\n", + process, *ret, *size_ptr, (int)type, (int)protect, parameters, (int)count ); + + status = get_extended_params( parameters, count, &limit, &align, &attributes ); + if (status) return status; + + if (*ret && (align || limit)) return STATUS_INVALID_PARAMETER; if (!*size_ptr) return STATUS_INVALID_PARAMETER; if (process != NtCurrentProcess()) { apc_call_t call; apc_result_t result; - unsigned int status; memset( &call, 0, sizeof(call) );

1 0

Zebediah Figura : wined3d: Do not declare resources as multisampled if the sample count is 1.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 9aac2d95ede5291dc491b6cd2594daac4547873a URL: https://gitlab.winehq.org/wine/wine/-/commit/9aac2d95ede5291dc491b6cd2594da… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 9 15:01:11 2023 -0500 wined3d: Do not declare resources as multisampled if the sample count is 1. Based on vkd3d commit d8ef0c69a817d059b1d4fc62520131eed80aba29. --- dlls/wined3d/shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7ee68a3436d..b4df79508ec 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1070,6 +1070,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co break; } reg_maps->resource_info[reg_idx].type = semantic->resource_type; + if (semantic->resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS && semantic->sample_count == 1) + reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + if (semantic->resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY && semantic->sample_count == 1) + reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY; reg_maps->resource_info[reg_idx].data_type = semantic->resource_data_type; wined3d_bitmap_set(reg_maps->resource_map, reg_idx); break;

1 0

Zebediah Figura : wined3d: Read the sm4 sample count in DCL instructions.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: d53fd401651285eeff30216a8858c5623f35b2e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d53fd401651285eeff30216a8858c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 9 15:00:07 2023 -0500 wined3d: Read the sm4 sample count in DCL instructions. Based on vkd3d commit ee52ad810635cf504a49d5267a5942fffb16836e. --- dlls/wined3d/shader_sm4.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b87d45b0fb7..78abdbe81ac 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -49,6 +49,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_RESOURCE_TYPE_SHIFT 11 #define WINED3D_SM4_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM4_RESOURCE_TYPE_SHIFT) +#define WINED3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT 16 +#define WINED3D_SM4_RESOURCE_SAMPLE_COUNT_MASK (0xfu << WINED3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT) + #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x3fu << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT) @@ -592,6 +595,13 @@ static void shader_sm4_read_dcl_resource(struct wined3d_shader_instruction *ins, { ins->declaration.semantic.resource_type = resource_type_table[resource_type]; } + + if (ins->declaration.semantic.resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS + || ins->declaration.semantic.resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY) + { + ins->declaration.semantic.sample_count = (opcode_token & WINED3D_SM4_RESOURCE_SAMPLE_COUNT_MASK) >> WINED3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; + } + reg_data_type = opcode == WINED3D_SM4_OP_DCL_RESOURCE ? WINED3D_DATA_RESOURCE : WINED3D_DATA_UAV; shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], reg_data_type, &ins->declaration.semantic.reg); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f793c6c0cde..d28a86f77c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1311,6 +1311,7 @@ struct wined3d_shader_semantic enum wined3d_decl_usage usage; UINT usage_idx; enum wined3d_shader_resource_type resource_type; + unsigned int sample_count; enum wined3d_data_type resource_data_type; struct wined3d_shader_dst_param reg; };

1 0

Zebediah Figura : wined3d: Do not forward texture references to the swapchain.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 2cfd75f7c5b0e8ffe0f4c161c3c174c4bfc3a046 URL: https://gitlab.winehq.org/wine/wine/-/commit/2cfd75f7c5b0e8ffe0f4c161c3c174… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 19:13:06 2023 -0500 wined3d: Do not forward texture references to the swapchain. Rely on the swapchain to reference its individual textures, and rely on the parent texture object to keep the swapchain alive if necessary. This is necessary to allow detaching textures from a swapchain. --- dlls/wined3d/texture.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4cd6d7035eb..1bf9adf869c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1513,9 +1513,6 @@ ULONG CDECL wined3d_texture_incref(struct wined3d_texture *texture) TRACE("texture %p, swapchain %p.\n", texture, texture->swapchain); - if (texture->swapchain) - return wined3d_swapchain_incref(texture->swapchain); - refcount = InterlockedIncrement(&texture->resource.ref); TRACE("%p increasing refcount to %u.\n", texture, refcount); @@ -1606,9 +1603,6 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) TRACE("texture %p, swapchain %p.\n", texture, texture->swapchain); - if (texture->swapchain) - return wined3d_swapchain_decref(texture->swapchain); - refcount = InterlockedDecrement(&texture->resource.ref); TRACE("%p decreasing refcount to %u.\n", texture, refcount);

1 0

Alexandre Julliard : ntdll: Pass limit instead of zero bits to internal memory mapping functions.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 04ef02f6ffd7eb19fb5883b29a646686572c5f5f URL: https://gitlab.winehq.org/wine/wine/-/commit/04ef02f6ffd7eb19fb5883b29a6466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 16:21:15 2023 +0200 ntdll: Pass limit instead of zero bits to internal memory mapping functions. --- dlls/ntdll/unix/loader.c | 20 +++++++-------- dlls/ntdll/unix/thread.c | 8 +++--- dlls/ntdll/unix/unix_private.h | 31 +++++++++++++++++++++--- dlls/ntdll/unix/virtual.c | 55 +++++++++++------------------------------- 4 files changed, 55 insertions(+), 59 deletions(-)

1 0