wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Alexandre Julliard : opengl32: Fix parsing of the DisabledExtensions option.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: e037822581933f2a3db70f8eb3fd4730fb119642 URL: https://gitlab.winehq.org/wine/wine/-/commit/e037822581933f2a3db70f8eb3fd47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 15:37:54 2022 +0100 opengl32: Fix parsing of the DisabledExtensions option. --- dlls/opengl32/unix_wgl.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 7a6b3bb0ca4..54f4b0709dd 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -234,6 +234,11 @@ static inline UINT asciiz_to_unicode( WCHAR *dst, const char *src ) return (p - dst) * sizeof(WCHAR); } +static inline void unicode_to_ascii( char *dst, const WCHAR *src, size_t len ) +{ + while (len--) *dst++ = *src++; +} + static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; @@ -281,16 +286,12 @@ static HKEY open_hkcu_key( const char *name ) return reg_open_key( hkcu, bufferW, asciiz_to_unicode( bufferW, name ) - sizeof(WCHAR) ); } -static ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +static NTSTATUS query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) { unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; - if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, - info, size, &size )) - return 0; - - return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + return NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); } /* build the extension string by filtering out the disabled extensions */ @@ -310,7 +311,14 @@ static BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLui KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; static WCHAR disabled_extensionsW[] = {'D','i','s','a','b','l','e','d','E','x','t','e','n','s','i','o','n','s',0}; - if (query_reg_value( hkey, disabled_extensionsW, value, sizeof(buffer) )) str = strdup( buffer ); + if (!query_reg_value( hkey, disabled_extensionsW, value, sizeof(buffer) )) + { + ULONG len = value->DataLength / sizeof(WCHAR); + + unicode_to_ascii( buffer, (WCHAR *)value->Data, len ); + buffer[len] = 0; + str = strdup( buffer ); + } NtClose( hkey ); } if (str)

1 0

Alexandre Julliard : winecrt0: Don't build with WINE_UNIX_LIB.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 3efc0fbf1a3151faa79b44dae52c412c5400232d URL: https://gitlab.winehq.org/wine/wine/-/commit/3efc0fbf1a3151faa79b44dae52c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 17:01:23 2022 +0100 winecrt0: Don't build with WINE_UNIX_LIB. These files end up in a .exe.so module, not in a real Unix library. --- dlls/winecrt0/exe_entry.c | 3 +++ dlls/winecrt0/exe_main.c | 3 +++ dlls/winecrt0/exe_wentry.c | 3 +++ dlls/winecrt0/exe_wmain.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index d4d1d7d6757..432c598286c 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -22,6 +22,9 @@ #pragma makedep unix #endif +/* this is actually part of a static lib linked into a .exe.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index 8861cbf1449..2465c83bdf0 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -22,6 +22,9 @@ #pragma makedep unix #endif +/* this is actually part of a static lib linked into a .exe.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index a4c1a0897fb..e15a39996fd 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -22,6 +22,9 @@ #pragma makedep unix #endif +/* this is actually part of a static lib linked into a .exe.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index e576a8baceb..4a567661ea5 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -22,6 +22,9 @@ #pragma makedep unix #endif +/* this is actually part of a static lib linked into a .exe.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + #include <stdarg.h> #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : Wine release 7.21
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: website Branch: master Commit: 5b78f34693691f3a1dcd64c157e0264b51b568e1 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/5b78f34693691f3a1dcd64c157… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 22:11:00 2022 +0100 Wine release 7.21 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022111101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2022111101.xml b/news/en/2022111101.xml new file mode 100644 index 00000000..7a9e76b9 --- /dev/null +++ b/news/en/2022111101.xml @@ -0,0 +1,18 @@ +<news> +<date>November 11, 2022</date> +<title>Wine 7.21 Released</title> +<body> + The Wine development release 7.21 is now available. + <a href="{$root}/announce/7.21">What's new</a> in this release: +<ul> + <li>OpenGL library converted to PE.</li> + <li>Support for multi-architecture PE builds.</li> + <li>More preparation work for Vulkan 32-on-64 support.</li> + <li>Support for creating import libraries without dlltool.</li> + <li>Locale data updates.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.21.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.21 : Alexandre Julliard : Release 7.21
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: refs/tags/wine-7.21 Tag: daa9d1a3b748e4e2addb2f709259792ba8b6a51d URL: https://gitlab.winehq.org/wine/wine/-/tags/daa9d1a3b748e4e2addb2f709259792b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 22:08:23 2022 +0100 Release 7.21

1 0

Alexandre Julliard : Release 7.21.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: 053ee2d23d825f800baa16e455a218834aa2dec0 URL: https://gitlab.winehq.org/wine/wine/-/commit/053ee2d23d825f800baa16e455a218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 22:03:05 2022 +0100 Release 7.21. --- ANNOUNCE | 855 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 456 insertions(+), 420 deletions(-)

1 0

Paul Gofman : ntdll: Support specified alignment in NtAllocateVirtualMemoryEx().
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: 17328f4f5c2c6e9ccca64c8efe154143e2a57196 URL: https://gitlab.winehq.org/wine/wine/-/commit/17328f4f5c2c6e9ccca64c8efe1541… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 6 21:10:56 2022 -0500 ntdll: Support specified alignment in NtAllocateVirtualMemoryEx(). --- dlls/ntdll/tests/virtual.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/server.c | 7 +++++-- dlls/ntdll/unix/virtual.c | 24 ++++++++++++++++++------ include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/trace.c | 1 + 6 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 2c5e1d6ecc3..6831fe3c522 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -584,6 +584,48 @@ static void test_NtAllocateVirtualMemoryEx_address_requirements(void) size = 0; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); ok(!status, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (void *)(0x20001000 - 1); + a.Alignment = 0x20000000; + size = 0x2000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_NO_MEMORY, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = NULL; + a.Alignment = 0x8000; + size = 0x1000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.Alignment = 0x30000; + size = 0x1000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.Alignment = 0x40000; + size = 0x1000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(!status, "Unexpected status %08lx.\n", status); + ok(!((ULONG_PTR)addr & 0x3ffff), "Unexpected addr %p.\n", addr); + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_COMMIT, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); + ok(!status, "Unexpected status %08lx.\n", status); + + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); } struct test_stack_size_thread_args diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index b7d8733f2bc..07d9c8d3acd 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -358,7 +358,7 @@ static NTSTATUS invoke_user_apc( CONTEXT *context, const user_apc_t *apc, NTSTAT */ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOOL self ) { - SIZE_T size, bits, limit; + SIZE_T size, bits, limit, align; void *addr; memset( result, 0, sizeof(*result) ); @@ -416,9 +416,12 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO addr = wine_server_get_ptr( call->virtual_alloc_ex.addr ); size = call->virtual_alloc_ex.size; limit = min( (ULONG_PTR)sbi.HighestUserAddress, call->virtual_alloc_ex.limit ); - if ((ULONG_PTR)addr == call->virtual_alloc_ex.addr && size == call->virtual_alloc_ex.size) + align = call->virtual_alloc_ex.align; + if ((ULONG_PTR)addr == call->virtual_alloc_ex.addr && size == call->virtual_alloc_ex.size + && align == call->virtual_alloc_ex.align) { r.HighestEndingAddress = (void *)limit; + r.Alignment = align; result->virtual_alloc_ex.status = NtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr, &size, call->virtual_alloc_ex.op_type, call->virtual_alloc_ex.prot, &ext, 1 ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b1caaff8a13..3367913d4e2 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3738,7 +3738,7 @@ void virtual_set_large_address_space(void) * NtAllocateVirtualMemory[Ex] implementation. */ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG type, ULONG protect, - ULONG_PTR limit ) + ULONG_PTR limit, ULONG_PTR align ) { void *base; unsigned int vprot; @@ -3800,7 +3800,7 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ if (vprot & VPROT_WRITECOPY) status = STATUS_INVALID_PAGE_PROTECTION; else if (is_dos_memory) status = allocate_dos_memory( &view, vprot ); else status = map_view( &view, base, size, type & MEM_TOP_DOWN, vprot, limit, - granularity_mask ); + align ? align - 1 : granularity_mask ); if (status == STATUS_SUCCESS) base = view->base; } @@ -3888,7 +3888,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z else limit = 0; - return allocate_virtual_memory( ret, size_ptr, type, protect, limit ); + return allocate_virtual_memory( ret, size_ptr, type, protect, limit, 0 ); } @@ -3901,6 +3901,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s ULONG count ) { ULONG_PTR limit = 0; + ULONG_PTR align = 0; TRACE("%p %p %08lx %x %08x %p %u\n", process, *ret, *size_ptr, type, protect, parameters, count ); @@ -3930,17 +3931,27 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s } r = (MEM_ADDRESS_REQUIREMENTS *)parameters[i].Pointer; - if (r->LowestStartingAddress || r->Alignment) + if (r->LowestStartingAddress) FIXME( "Not supported requirements LowestStartingAddress %p, Alignment %p.\n", r->LowestStartingAddress, (void *)r->Alignment ); + if (r->Alignment) + { + if (*ret || (r->Alignment & (r->Alignment - 1)) || r->Alignment - 1 < granularity_mask) + { + WARN( "Invalid alignment %lu.\n", r->Alignment ); + return STATUS_INVALID_PARAMETER; + } + align = r->Alignment; + } + limit = (ULONG_PTR)r->HighestEndingAddress; if (limit && (*ret || 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.\n", (void *)limit ); + TRACE( "limit %p, align %p.\n", (void *)limit, (void *)align ); } } @@ -3958,6 +3969,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s call.virtual_alloc_ex.addr = wine_server_client_ptr( *ret ); call.virtual_alloc_ex.size = *size_ptr; call.virtual_alloc_ex.limit = limit; + call.virtual_alloc_ex.align = align; call.virtual_alloc_ex.op_type = type; call.virtual_alloc_ex.prot = protect; status = server_queue_process_apc( process, &call, &result ); @@ -3971,7 +3983,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s return result.virtual_alloc_ex.status; } - return allocate_virtual_memory( ret, size_ptr, type, protect, limit ); + return allocate_virtual_memory( ret, size_ptr, type, protect, limit, align ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 58dd870a6ce..472c0ea709d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -526,6 +526,7 @@ typedef union client_ptr_t addr; mem_size_t size; mem_size_t limit; + mem_size_t align; unsigned int prot; } virtual_alloc_ex; struct @@ -6355,7 +6356,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 757 +#define SERVER_PROTOCOL_VERSION 758 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 06977c29054..8c2fbeb4afe 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -542,6 +542,7 @@ typedef union client_ptr_t addr; /* requested address */ mem_size_t size; /* allocation size */ mem_size_t limit; /* allocation address limit */ + mem_size_t align; /* allocation alignment */ unsigned int prot; /* memory protection flags */ } virtual_alloc_ex; struct diff --git a/server/trace.c b/server/trace.c index 560a1b617ea..a0076d5449b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -193,6 +193,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) dump_uint64( "APC_VIRTUAL_ALLOC,addr==", &call->virtual_alloc_ex.addr ); dump_uint64( ",size=", &call->virtual_alloc_ex.size ); dump_uint64( ",limit=", &call->virtual_alloc_ex.limit ); + dump_uint64( ",align=", &call->virtual_alloc_ex.align ); fprintf( stderr, ",op_type=%x,prot=%x", call->virtual_alloc_ex.op_type, call->virtual_alloc_ex.prot ); break; case APC_VIRTUAL_FREE:

1 0

Paul Gofman : ntdll: Pass alignemnt mask to map_view().
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: bf9dc3ff1f5eda01102b4f01ddd90cd058f3c336 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf9dc3ff1f5eda01102b4f01ddd90c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 24 11:25:39 2022 -0500 ntdll: Pass alignemnt mask to map_view(). --- dlls/ntdll/unix/virtual.c | 64 ++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 29 deletions(-)

1 0

Jacek Caban : winevulkan: Don't generate private thunk prototypes for PE-only functions.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: 866c7de65fc9ad1f976ffc771423b3daa655522f URL: https://gitlab.winehq.org/wine/wine/-/commit/866c7de65fc9ad1f976ffc771423b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 1 14:21:34 2022 +0100 winevulkan: Don't generate private thunk prototypes for PE-only functions. --- dlls/winevulkan/make_vulkan | 9 ++++----- dlls/winevulkan/vulkan_thunks.h | 3 --- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ff964505bd9..75121c8eef6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2,6 +2,7 @@ # Wine Vulkan generator # # Copyright 2017-2018 Roderick Colenbrander +# Copyright 2022 Jacek Caban for CodeWeavers # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -645,11 +646,9 @@ class VkFunction(object): def needs_dispatch(self): return self.dispatch - def needs_thunk(self): - return self.thunk_type != ThunkType.NONE - def needs_private_thunk(self): - return self.thunk_type == ThunkType.PRIVATE + return self.needs_exposing() and self.loader_thunk_type != ThunkType.NONE and \ + self.thunk_type != ThunkType.PUBLIC def needs_exposing(self): # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED @@ -2556,7 +2555,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.needs_exposing() or vk_func.thunk_type == ThunkType.PUBLIC: + if not vk_func.needs_private_thunk(): continue f.write("{0};\n".format(vk_func.prototype(prefix=prefix, postfix="DECLSPEC_HIDDEN", is_thunk=True))) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index c8da040a235..24c94e2b5ee 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -31,17 +31,14 @@ void wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const V VkResult wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pPropertyCount, VkLayerProperties *pProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; -VkResult wine_vkEnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkLayerProperties *pProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumerateInstanceVersion(uint32_t *pApiVersion) DECLSPEC_HIDDEN; VkResult wine_vkEnumeratePhysicalDeviceGroups(VkInstance instance, uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumeratePhysicalDeviceGroupsKHR(VkInstance instance, uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN; void wine_vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers) DECLSPEC_HIDDEN; VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT *pTimestampInfos, uint64_t *pTimestamps, uint64_t *pMaxDeviation) DECLSPEC_HIDDEN; -PFN_vkVoidFunction wine_vkGetDeviceProcAddr(VkDevice device, const char *pName) DECLSPEC_HIDDEN; void wine_vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue) DECLSPEC_HIDDEN; void wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue) DECLSPEC_HIDDEN; -PFN_vkVoidFunction wine_vkGetInstanceProcAddr(VkInstance instance, const char *pName) DECLSPEC_HIDDEN; VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice physicalDevice, uint32_t *pTimeDomainCount, VkTimeDomainEXT *pTimeDomains) DECLSPEC_HIDDEN; void wine_vkGetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties) DECLSPEC_HIDDEN; void wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winevulkan: Move needs_unwrapping implementation to VkVariable.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: ee4c61a1b55051a793ad9e7065d5f193ec026c0a URL: https://gitlab.winehq.org/wine/wine/-/commit/ee4c61a1b55051a793ad9e7065d5f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 16:33:03 2022 +0100 winevulkan: Move needs_unwrapping implementation to VkVariable. --- dlls/winevulkan/make_vulkan | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index da6e4568c18..ff964505bd9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1203,6 +1203,20 @@ class VkVariable(object): return not self.handle.is_dispatchable() return False + def needs_unwrapping(self): + """ Returns if variable needs unwrapping of handle. """ + + if self.is_struct(): + return self.struct.needs_unwrapping() + + if self.is_handle(): + return self.handle.needs_unwrapping() + + if self.is_generic_handle(): + return True + + return False + def needs_alloc(self, conv, unwrap): """ Returns True if conversion needs allocation """ if self.is_dynamic_array(): @@ -1425,20 +1439,6 @@ class VkMember(VkVariable): def is_bit_field(self): return self.bit_width is not None - def needs_unwrapping(self): - """ Structures with wrapped handles need unwrapping. """ - - if self.is_struct(): - return self.struct.needs_unwrapping() - - if self.is_handle(): - return self.handle.is_wrapped() - - if self.is_generic_handle(): - return True - - return False - def needs_conversion(self, conv, unwrap, direction, struct_const): """ Check if member needs conversion. """ @@ -1678,18 +1678,6 @@ class VkParam(VkVariable): return True return False - def needs_unwrapping(self): - """ Returns if parameter needs unwrapping of handle. """ - - # Wrapped handle parameters are handled separately, only look for wrapped handles in structs - if self.is_struct(): - return self.struct.needs_unwrapping() - - if self.is_handle() and self.is_dynamic_array(): - return self.handle.needs_unwrapping() - - return False - def spec(self): """ Generate spec file entry for this parameter. """

1 0

Jacek Caban : winevulkan: Remove no longer used make_vulkan functions.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: a2dc7a4ad0864ee2fbab6a0a76c1ebc39446c06a URL: https://gitlab.winehq.org/wine/wine/-/commit/a2dc7a4ad0864ee2fbab6a0a76c1eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 16:25:10 2022 +0100 winevulkan: Remove no longer used make_vulkan functions. --- dlls/winevulkan/make_vulkan | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 26045f36055..da6e4568c18 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -642,18 +642,6 @@ class VkFunction(object): def returns_longlong(self): return self.type in ["uint64_t", "VkDeviceAddress"] - def needs_unwrapping(self): - """ Check if the function needs any input/output type unwrapping. - Functions need input/output unwrapping if struct parameters have - wrapped handles. - """ - - for p in self.params: - if p.needs_unwrapping(): - return True - - return False - def needs_dispatch(self): return self.dispatch @@ -747,7 +735,7 @@ class VkFunction(object): body += " return params.result;\n" return body - def body(self, conv, unwrap=True, params_prefix=""): + def body(self, conv, unwrap, params_prefix=""): body = "" needs_alloc = False @@ -2235,17 +2223,6 @@ class StructConversionFunction(object): return body - def _set_name(self): - name = "convert_{0}_".format(self.type) - win_type = "win32" if self.conv else "win64" - host_part = "host" if self.unwrap else "unwrapped_host" - if self.direction == Direction.INPUT: - name += "{0}_to_{1}".format(win_type, host_part) - else: # Direction.OUTPUT - name += "{0}_to_{1}".format(host_part, win_type) - - self.name = name - class ArrayConversionFunction(object): def __init__(self, array, direction, conv, unwrap):

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022