November 2022 - Wine-commits

Paul Gofman : wow64: Support MEM_ADDRESS_REQUIREMENTS in wow64_NtAllocateVirtualMemoryEx().
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: d2b91d56c4db97183b88acc9bdbe3e87418f3402 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2b91d56c4db97183b88acc9bdbe3e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 6 18:01:28 2022 -0500 wow64: Support MEM_ADDRESS_REQUIREMENTS in wow64_NtAllocateVirtualMemoryEx(). --- dlls/wow64/struct32.h | 7 +++++++ dlls/wow64/virtual.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 0a0324a22f3..9511f80523f 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -685,4 +685,11 @@ struct __server_request_info32 struct __server_iovec32 data[__SERVER_MAX_DATA]; }; +typedef struct +{ + ULONG LowestStartingAddress; + ULONG HighestEndingAddress; + ULONG Alignment; +} MEM_ADDRESS_REQUIREMENTS32; + #endif /* __WOW64_STRUCT32_H */ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index c41d0a930ca..44cf6cbe4f9 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -91,10 +91,42 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) void *addr; SIZE_T size; NTSTATUS status; + SIZE_T alloc_size = count * sizeof(*params); + MEM_EXTENDED_PARAMETER *params64; + 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); + else if (params[i].Type && params[i].Type < MemExtendedParameterMax) + FIXME( "Unsupported parameter type %d.\n", params[i].Type); + } + + params64 = Wow64AllocateTemp( alloc_size ); + memcpy( params64, params, count * sizeof(*params64) ); + 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; + + if (p->HighestEndingAddress > highest_user_address) return STATUS_INVALID_PARAMETER; + + buf->LowestStartingAddress = ULongToPtr(p->LowestStartingAddress); + buf->HighestEndingAddress = ULongToPtr(p->HighestEndingAddress); + buf->Alignment = p->Alignment; + params64[i].Pointer = buf; + ++buf; + } + } - if (count) FIXME( "%ld extended parameters %p\n", count, params ); status = NtAllocateVirtualMemoryEx( process, addr_32to64( &addr, addr32 ), size_32to64( &size, size32 ), - type, protect, params, count ); + type, protect, params64, count ); if (!status) { put_addr( addr32, addr );

1 0

Paul Gofman : wow64: Set HighestEndingAddress in wow64_NtAllocateVirtualMemoryEx() if it is absent.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 2d12c4f8fdeb331c2fdafd4aa06da24e4d2fda96 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d12c4f8fdeb331c2fdafd4aa06da2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 6 18:22:52 2022 -0500 wow64: Set HighestEndingAddress in wow64_NtAllocateVirtualMemoryEx() if it is absent. To prevent 64 bit NtAllocateVirtualMemoryEx() allocating from above 32 bit user space limit. --- dlls/wow64/virtual.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 44cf6cbe4f9..0f34e8aec27 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -93,6 +93,8 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) 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; @@ -101,24 +103,49 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) 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); + } } + if (add_address_requirements) + alloc_size += sizeof(*params) + sizeof(MEM_ADDRESS_REQUIREMENTS); params64 = Wow64AllocateTemp( alloc_size ); memcpy( params64, params, count * sizeof(*params64) ); - buf = (MEM_ADDRESS_REQUIREMENTS *)((char *)params64 + 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; - if (p->HighestEndingAddress > highest_user_address) return STATUS_INVALID_PARAMETER; - buf->LowestStartingAddress = ULongToPtr(p->LowestStartingAddress); - buf->HighestEndingAddress = ULongToPtr(p->HighestEndingAddress); + 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; @@ -126,7 +153,7 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) } status = NtAllocateVirtualMemoryEx( process, addr_32to64( &addr, addr32 ), size_32to64( &size, size32 ), - type, protect, params64, count ); + type, protect, params64, count + add_address_requirements ); if (!status) { put_addr( addr32, addr );

1 0

Nikolay Sivov : d2d1/tests: Use correct flags constants with D3D11CreateDevice().
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 384b0b35c357ca31ccb080162e1f39f93ec70054 URL: https://gitlab.winehq.org/wine/wine/-/commit/384b0b35c357ca31ccb080162e1f39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 10 21:09:42 2022 +0300 d2d1/tests: Use correct flags constants with D3D11CreateDevice(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a065c8ddfb5..1dcce63381e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1066,13 +1066,13 @@ static ID3D11Device *create_d3d11_device(void) ID3D11Device *device; if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) + D3D11_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) + D3D11_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) + D3D11_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; return NULL;

1 0

Jacek Caban : winevulkan: Fix handling unions in needs_alignment().
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 8463c4f12393b752c74295e10d4e841fde81f49f URL: https://gitlab.winehq.org/wine/wine/-/commit/8463c4f12393b752c74295e10d4e84… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 16:13:54 2022 +0100 winevulkan: Fix handling unions in needs_alignment(). --- dlls/winevulkan/make_vulkan | 14 ++++--- dlls/winevulkan/vulkan_thunks.c | 87 ++++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 28 ++++++++++++- include/wine/vulkan.h | 40 +++++++++---------- 4 files changed, 140 insertions(+), 29 deletions(-)

1 0

Jacek Caban : winevulkan: Preserve const in array conversion output types.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 99a0d58dfdc26015c47dfd4c5aad6b24e46fa0ff URL: https://gitlab.winehq.org/wine/wine/-/commit/99a0d58dfdc26015c47dfd4c5aad6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 18:33:14 2022 +0100 winevulkan: Preserve const in array conversion output types. --- dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_thunks.c | 200 ++++++++++++++++++++-------------------- 2 files changed, 104 insertions(+), 102 deletions(-)

1 0

Jacek Caban : winevulkan: Add support for pointer array conversion.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: b88d373bfb052f281264efe5937b922a3a2c15aa URL: https://gitlab.winehq.org/wine/wine/-/commit/b88d373bfb052f281264efe5937b92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 18:17:37 2022 +0100 winevulkan: Add support for pointer array conversion. And use it for VkAccelerationStructureGeometryKHR. --- dlls/winevulkan/make_vulkan | 77 +++++++++++++++++++++++++---------------- dlls/winevulkan/vulkan_thunks.c | 68 +++++++++++++++++++++++++++++++++--- dlls/winevulkan/vulkan_thunks.h | 17 +++++++-- 3 files changed, 126 insertions(+), 36 deletions(-)

1 0

Jacek Caban : winevulkan: Use local params struct declarations for 32-bit thunks.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: ab36f7d5ed9a52b1a167b32fd08aa263dc1c7182 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab36f7d5ed9a52b1a167b32fd08aa2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 23 14:12:56 2022 +0200 winevulkan: Use local params struct declarations for 32-bit thunks. --- dlls/winevulkan/make_vulkan | 13 +- dlls/winevulkan/vulkan_thunks.c | 4019 ++++++++++++++++++++++++++++++++++----- 2 files changed, 3516 insertions(+), 516 deletions(-)

1 0

Jacek Caban : winevulkan: Fix host aliases declaration.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: c479ffcd5d37b3bef77b4c137c54281d00b2a955 URL: https://gitlab.winehq.org/wine/wine/-/commit/c479ffcd5d37b3bef77b4c137c5428… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 21:25:22 2022 +0100 winevulkan: Fix host aliases declaration. --- dlls/winevulkan/make_vulkan | 18 +++-- dlls/winevulkan/vulkan_thunks.h | 151 +++++++++++++++++++++++----------------- 2 files changed, 98 insertions(+), 71 deletions(-)

1 0

Jacek Caban : winevulkan: Use local structs declarations for 32-bit conversion functions.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 0b50354930fb7cdad3f3714a29275902672e1c95 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b50354930fb7cdad3f3714a292759… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 23 14:53:35 2022 +0200 winevulkan: Use local structs declarations for 32-bit conversion functions. --- dlls/winevulkan/make_vulkan | 52 +- dlls/winevulkan/vulkan_thunks.c | 2638 ++++++++++++++++++++++++++++++++------- 2 files changed, 2252 insertions(+), 438 deletions(-)

1 0

Jacek Caban : winevulkan: Get rid of *_host types.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: ef25dd2446e9c39b71a6199d8235a3734d1d20b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef25dd2446e9c39b71a6199d8235a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 21:51:26 2022 +0100 winevulkan: Get rid of *_host types. Use WINE_VK_HOST instead. --- dlls/winevulkan/make_vulkan | 73 +- dlls/winevulkan/vulkan.c | 16 +- dlls/winevulkan/vulkan_private.h | 1 + dlls/winevulkan/vulkan_thunks.c | 962 ++++++------- dlls/winevulkan/vulkan_thunks.h | 2764 +++----------------------------------- 5 files changed, 662 insertions(+), 3154 deletions(-)

1 0