December 2023 - Wine-commits

Rémi Bernon : ntdll: Set main_(argc|argv|envp) as early as possible.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: bae3769ef9db585e765ff0cf62bca1533c4d1cc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/bae3769ef9db585e765ff0cf62bca1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Dec 2 12:52:57 2023 +0100 ntdll: Set main_(argc|argv|envp) as early as possible. Fixes: 62a979347a4dc1bd68f79b86397de85c016ec588 --- dlls/ntdll/unix/env.c | 6 +----- dlls/ntdll/unix/loader.c | 12 ++++++++++-- dlls/ntdll/unix/unix_private.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3cb86da8401..d540a6b72a7 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -892,7 +892,7 @@ static void init_locale(void) /*********************************************************************** * init_environment */ -void init_environment( int argc, char *argv[], char *envp[] ) +void init_environment(void) { USHORT *case_table; @@ -904,10 +904,6 @@ void init_environment( int argc, char *argv[], char *envp[] ) uctable = case_table + 2; lctable = case_table + case_table[1] + 2; } - - main_argc = argc; - main_argv = argv; - main_envp = envp; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5673fdb38cb..090f9906e9f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1890,9 +1890,13 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo java_object = (*env)->NewGlobalRef( env, obj ); + main_argc = argc; + main_argv = argv; + main_envp = environ; + init_paths( argv ); virtual_init(); - init_environment( argc, argv, environ ); + init_environment(); #ifdef __i386__ { @@ -2107,6 +2111,10 @@ static void check_command_line( int argc, char *argv[] ) */ DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] ) { + main_argc = argc; + main_argv = argv; + main_envp = envp; + init_paths( argv ); if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ @@ -2132,7 +2140,7 @@ DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] ) #endif virtual_init(); - init_environment( argc, argv, envp ); + init_environment(); #ifdef __APPLE__ apple_main_thread(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1362c3a04d8..07f2724eac7 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -176,7 +176,7 @@ extern SYSTEM_CPU_INFORMATION cpu_info; extern struct ldt_copy __wine_ldt_copy; #endif -extern void init_environment( int argc, char *argv[], char *envp[] ); +extern void init_environment(void); extern void init_startup_info(void); extern void *create_startup_info( const UNICODE_STRING *nt_image, ULONG process_flags, const RTL_USER_PROCESS_PARAMETERS *params,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 4cc7f8089c4f9b5771f61ccaa9824e617ee7c853 URL: https://gitlab.winehq.org/wine/wine/-/commit/4cc7f8089c4f9b5771f61ccaa9824e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Dec 5 00:28:54 2023 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3e7f686774d..a995ab7846c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-11-07 09:32+0200\n" +"PO-Revision-Date: 2023-12-05 00:28+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12626,10 +12626,8 @@ msgid "Duplex:" msgstr "Dvigubas:" #: dlls/wineps.drv/wineps.rc:45 -#, fuzzy -#| msgid "&Tray:" msgid "Paper &Tray:" -msgstr "Dėk&las:" +msgstr "Popieriaus dėk&las:" #: dlls/wininet/wininet.rc:53 dlls/wininet/wininet.rc:73 msgid "Realm"

1 0

Rémi Bernon : winevulkan: Replace "loader_thunk" with dedicated dictionaries.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 7fee352576710bc203d0ad819a7278968dfff572 URL: https://gitlab.winehq.org/wine/wine/-/commit/7fee352576710bc203d0ad819a7278… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 4 14:16:19 2023 +0100 winevulkan: Replace "loader_thunk" with dedicated dictionaries. --- dlls/winevulkan/make_vulkan | 67 +++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e345c0d3287..aadde48872b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -177,18 +177,17 @@ class ThunkType(Enum): # - PUBLIC means the implementation is fully auto generated. # - PRIVATE thunks can be used in custom implementations for # struct conversion. -# - loader_thunk (default: ThunkType.PUBLIC): sets whether to create a thunk for unix funcs. FUNCTION_OVERRIDES = { # Global functions - "vkCreateInstance" : {"driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE, "extra_param" : "client_ptr"}, - "vkEnumerateInstanceExtensionProperties" : {"driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, - "vkEnumerateInstanceLayerProperties" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, - "vkEnumerateInstanceVersion" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, - "vkGetInstanceProcAddr" : {"driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, + "vkCreateInstance" : {"driver" : True, "thunk" : ThunkType.NONE, "extra_param" : "client_ptr"}, + "vkEnumerateInstanceExtensionProperties" : {"driver" : True, "thunk" : ThunkType.NONE}, + "vkEnumerateInstanceLayerProperties" : {"thunk" : ThunkType.NONE}, + "vkEnumerateInstanceVersion" : {"thunk" : ThunkType.NONE}, + "vkGetInstanceProcAddr" : {"driver" : True, "thunk" : ThunkType.NONE}, # Instance functions - "vkCreateDevice" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE, "extra_param" : "client_ptr"}, - "vkDestroyInstance" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, + "vkCreateDevice" : {"thunk" : ThunkType.NONE, "extra_param" : "client_ptr"}, + "vkDestroyInstance" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE}, "vkEnumerateDeviceExtensionProperties" : {"thunk" : ThunkType.NONE}, "vkEnumerateDeviceLayerProperties" : {"thunk" : ThunkType.NONE}, "vkEnumeratePhysicalDeviceGroups" : {"thunk" : ThunkType.NONE}, @@ -197,16 +196,14 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceExternalFenceProperties" : {"dispatch" : False, "thunk" : ThunkType.NONE}, "vkGetPhysicalDeviceExternalSemaphoreProperties" : {"dispatch" : False, "thunk" : ThunkType.NONE}, "vkGetPhysicalDeviceImageFormatProperties2" : {"thunk" : ThunkType.PRIVATE}, - "vkGetPhysicalDeviceProperties2" : {"loader_thunk" : ThunkType.PRIVATE}, - "vkGetPhysicalDeviceProperties2KHR" : {"loader_thunk" : ThunkType.PRIVATE}, # Device functions - "vkAllocateCommandBuffers" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, - "vkCreateCommandPool" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE, "extra_param" : "client_ptr"}, - "vkDestroyCommandPool" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, - "vkDestroyDevice" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, - "vkFreeCommandBuffers" : {"thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, - "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, + "vkAllocateCommandBuffers" : {"thunk" : ThunkType.NONE}, + "vkCreateCommandPool" : {"thunk" : ThunkType.NONE, "extra_param" : "client_ptr"}, + "vkDestroyCommandPool" : {"thunk" : ThunkType.NONE}, + "vkDestroyDevice" : {"thunk" : ThunkType.NONE}, + "vkFreeCommandBuffers" : {"thunk" : ThunkType.NONE}, + "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE}, "vkGetDeviceQueue" : {"thunk" : ThunkType.NONE}, "vkGetDeviceQueue2" : {"thunk" : ThunkType.NONE}, "vkAllocateMemory" : {"thunk" : ThunkType.PRIVATE}, @@ -273,6 +270,29 @@ FUNCTION_OVERRIDES = { "vkDestroyDebugReportCallbackEXT" : {"thunk" : ThunkType.NONE}, } +# loader functions which are entirely manually implemented +MANUAL_LOADER_FUNCTIONS = { + "vkEnumerateInstanceLayerProperties", + "vkGetDeviceProcAddr", + "vkGetInstanceProcAddr", +} + +# functions which loader thunks are manually implemented +MANUAL_LOADER_THUNKS = { + "vkAllocateCommandBuffers", + "vkCreateCommandPool", + "vkCreateDevice", + "vkCreateInstance", + "vkDestroyCommandPool", + "vkDestroyDevice", + "vkDestroyInstance", + "vkEnumerateInstanceExtensionProperties", + "vkEnumerateInstanceVersion", + "vkFreeCommandBuffers", + "vkGetPhysicalDeviceProperties2", + "vkGetPhysicalDeviceProperties2KHR", +} + STRUCT_CHAIN_CONVERSIONS = { # Ignore to not confuse host loader. "VkDeviceCreateInfo": ["VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO"], @@ -583,7 +603,6 @@ class VkFunction(object): self.dispatch = func_info.get("dispatch", True) self.driver = func_info.get("driver", False) self.thunk_type = func_info.get("thunk", ThunkType.PUBLIC) - self.loader_thunk_type = func_info.get("loader_thunk", ThunkType.PUBLIC) self.extra_param = func_info.get("extra_param", None) # Required is set while parsing which APIs and types are required @@ -693,7 +712,7 @@ class VkFunction(object): return self.dispatch def needs_private_thunk(self): - return self.needs_exposing() and self.loader_thunk_type != ThunkType.NONE and \ + return self.needs_exposing() and self.name not in MANUAL_LOADER_FUNCTIONS and \ self.thunk_type != ThunkType.PUBLIC def needs_exposing(self): @@ -2700,7 +2719,7 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue - if vk_func.loader_thunk_type == ThunkType.NONE: + if vk_func.name in MANUAL_LOADER_FUNCTIONS: continue f.write(vk_func.thunk(prefix="thunk64_")) @@ -2771,7 +2790,7 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue - if vk_func.loader_thunk_type == ThunkType.NONE: + if vk_func.name in MANUAL_LOADER_FUNCTIONS: continue if vk_func.is_perf_critical(): @@ -2795,7 +2814,7 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue - if vk_func.loader_thunk_type == ThunkType.NONE: + if vk_func.name in MANUAL_LOADER_FUNCTIONS: continue if vk_func.is_perf_critical(): @@ -2894,7 +2913,7 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue - if vk_func.loader_thunk_type != ThunkType.PUBLIC: + if vk_func.name in MANUAL_LOADER_THUNKS | MANUAL_LOADER_FUNCTIONS: continue f.write(vk_func.loader_thunk()) @@ -2979,7 +2998,7 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue - if vk_func.loader_thunk_type == ThunkType.NONE: + if vk_func.name in MANUAL_LOADER_FUNCTIONS: continue f.write(" unix_{0},\n".format(vk_func.name)) @@ -2989,7 +3008,7 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue - if vk_func.loader_thunk_type == ThunkType.NONE: + if vk_func.name in MANUAL_LOADER_FUNCTIONS: continue f.write("struct {0}_params\n".format(vk_func.name))

1 0

Rémi Bernon : winevulkan: Use a dictionary in make_vulkan for manual unix thunks.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 7c26c458588b629be8dbff4e4b22459cf8206108 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c26c458588b629be8dbff4e4b2245… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 4 14:22:03 2023 +0100 winevulkan: Use a dictionary in make_vulkan for manual unix thunks. --- dlls/winevulkan/make_vulkan | 148 ++++++++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 74 deletions(-)

1 0

Rémi Bernon : winevulkan: Use a dictionary for user driver entry points.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: b01883f02ff005594c8f732120f683aeacf9ed92 URL: https://gitlab.winehq.org/wine/wine/-/commit/b01883f02ff005594c8f732120f683… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 4 15:13:34 2023 +0100 winevulkan: Use a dictionary for user driver entry points. --- dlls/winevulkan/make_vulkan | 59 +++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4c2cc46726a..05c31587ed4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -166,44 +166,20 @@ DRIVER_VERSION = 11 # to do more work compared to a regular thunk or because they are # part of the driver interface. # - dispatch (default: True): set whether we need a function pointer in the device / instance dispatch table. -# - driver (default: False): sets whether the API is part of the driver interface. FUNCTION_OVERRIDES = { # Global functions - "vkCreateInstance" : {"driver" : True, "extra_param" : "client_ptr"}, - "vkEnumerateInstanceExtensionProperties" : {"driver" : True}, - "vkGetInstanceProcAddr" : {"driver" : True}, + "vkCreateInstance" : {"extra_param" : "client_ptr"}, # Instance functions "vkCreateDevice" : {"extra_param" : "client_ptr"}, - "vkDestroyInstance" : {"dispatch" : False, "driver" : True}, + "vkDestroyInstance" : {"dispatch" : False}, "vkGetPhysicalDeviceExternalBufferProperties" : {"dispatch" : False}, "vkGetPhysicalDeviceExternalFenceProperties" : {"dispatch" : False}, "vkGetPhysicalDeviceExternalSemaphoreProperties" : {"dispatch" : False}, # Device functions "vkCreateCommandPool" : {"extra_param" : "client_ptr"}, - "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True}, - - # VK_KHR_surface - "vkDestroySurfaceKHR" : {"driver" : True}, - "vkGetPhysicalDeviceSurfaceSupportKHR" : {"driver" : True}, - "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"driver" : True}, - "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"driver" : True}, - "vkGetPhysicalDeviceSurfacePresentModesKHR" : {"driver" : True}, - - # VK_KHR_get_surface_capabilities2 - "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"driver" : True}, - "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"driver" : True}, - - # VK_KHR_win32_surface - "vkCreateWin32SurfaceKHR" : {"driver" : True}, - "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"driver" : True}, - - # VK_KHR_swapchain - "vkCreateSwapchainKHR" : {"driver" : True}, - "vkDestroySwapchainKHR" : {"driver" : True}, - "vkGetSwapchainImagesKHR" : {"driver" : True}, - "vkQueuePresentKHR" : {"driver" : True}, + "vkGetDeviceProcAddr" : {"dispatch" : False}, # VK_KHR_external_fence_capabilities "vkGetPhysicalDeviceExternalFencePropertiesKHR" : {"dispatch" : False}, @@ -213,10 +189,30 @@ FUNCTION_OVERRIDES = { # VK_KHR_external_semaphore_capabilities "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR" : {"dispatch" : False}, +} - # VK_KHR_device_group - "vkGetDeviceGroupSurfacePresentModesKHR" : {"driver" : True}, - "vkGetPhysicalDevicePresentRectanglesKHR" : {"driver" : True}, +# functions for which a user driver entry must be generated +USER_DRIVER_FUNCS = { + "vkCreateInstance", + "vkCreateSwapchainKHR", + "vkCreateWin32SurfaceKHR", + "vkDestroyInstance", + "vkDestroySurfaceKHR", + "vkDestroySwapchainKHR", + "vkEnumerateInstanceExtensionProperties", + "vkGetDeviceGroupSurfacePresentModesKHR", + "vkGetDeviceProcAddr", + "vkGetInstanceProcAddr", + "vkGetPhysicalDevicePresentRectanglesKHR", + "vkGetPhysicalDeviceSurfaceCapabilities2KHR", + "vkGetPhysicalDeviceSurfaceCapabilitiesKHR", + "vkGetPhysicalDeviceSurfaceFormats2KHR", + "vkGetPhysicalDeviceSurfaceFormatsKHR", + "vkGetPhysicalDeviceSurfacePresentModesKHR", + "vkGetPhysicalDeviceSurfaceSupportKHR", + "vkGetPhysicalDeviceWin32PresentationSupportKHR", + "vkGetSwapchainImagesKHR", + "vkQueuePresentKHR", } # functions for which the unix thunk is manually implemented @@ -602,7 +598,6 @@ class VkFunction(object): # For some functions we need some extra metadata from FUNCTION_OVERRIDES. func_info = FUNCTION_OVERRIDES.get(self.name, {}) self.dispatch = func_info.get("dispatch", True) - self.driver = func_info.get("driver", False) self.extra_param = func_info.get("extra_param", None) # Required is set while parsing which APIs and types are required @@ -678,7 +673,7 @@ class VkFunction(object): def is_driver_func(self): """ Returns if function is part of Wine driver interface. """ - return self.driver + return self.name in USER_DRIVER_FUNCS def is_global_func(self): # Treat vkGetInstanceProcAddr as a global function as it

1 0

Rémi Bernon : winevulkan: Remove redundant make_vulkan needs_unwrapping method.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 28cbd5bf20ee0114b59044985d0ec77b65374003 URL: https://gitlab.winehq.org/wine/wine/-/commit/28cbd5bf20ee0114b59044985d0ec7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 1 10:40:16 2023 +0100 winevulkan: Remove redundant make_vulkan needs_unwrapping method. --- dlls/winevulkan/make_vulkan | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 05c31587ed4..8da262ccd66 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1165,8 +1165,6 @@ class VkHandle(object): def is_wrapped(self): return self.host_handle("test") is not None - def needs_unwrapping(self): - return self.is_wrapped() class VkVariable(object): def __init__(self, const=False, type_info=None, type=None, name=None, pointer=None, array_len=None, @@ -1312,14 +1310,14 @@ class VkVariable(object): return not self.handle.is_dispatchable() return False - def needs_unwrapping(self): + def is_wrapped(self): """ Returns if variable needs unwrapping of handle. """ if self.is_struct(): - return self.struct.needs_unwrapping() + return self.struct.is_wrapped() if self.is_handle(): - return self.handle.needs_unwrapping() + return self.handle.is_wrapped() if self.is_generic_handle(): return True @@ -1519,7 +1517,7 @@ class VkMember(VkVariable): else: # Nothing needed this yet. LOGGER.warn("TODO: implement copying of static array for {0}.{1}".format(self.type, self.name)) - elif self.is_handle() and self.needs_unwrapping(): + elif self.is_handle() and self.is_wrapped(): handle = self.type_info["data"] if direction == Direction.OUTPUT: LOGGER.err("OUTPUT parameter {0}.{1} cannot be unwrapped".format(self.type, self.name)) @@ -1749,7 +1747,7 @@ class VkParam(VkVariable): def copy(self, direction, conv, unwrap, prefix=""): win_type = "win32" if conv else "win64" - wrap_part = "" if unwrap or not self.needs_unwrapping() else "unwrapped_" + wrap_part = "" if unwrap or not self.is_wrapped() else "unwrapped_" if direction == Direction.INPUT: ctx_param = "ctx, " if self.needs_alloc(conv, unwrap) else "" if self.is_dynamic_array(): @@ -2113,13 +2111,13 @@ class VkStruct(Sequence): return True return False - def needs_unwrapping(self): + def is_wrapped(self): """ Returns if struct members need unwrapping of handle. """ for m in self.members: if self.name == m.type: continue - if m.needs_unwrapping(): + if m.is_wrapped(): return True return False @@ -2270,7 +2268,7 @@ class StructConversionFunction(object): self.operand = struct self.type = struct.name self.conv = conv - self.unwrap = unwrap or not self.operand.needs_unwrapping() + self.unwrap = unwrap or not self.operand.is_wrapped() self.const = const name = "convert_{0}_".format(self.type) @@ -2472,7 +2470,7 @@ class ArrayConversionFunction(object): self.direction = direction self.type = array.type self.conv = conv - self.unwrap = unwrap or not array.needs_unwrapping() + self.unwrap = unwrap or not array.is_wrapped() if array.is_static_array() and direction == Direction.INPUT: LOGGER.error("Static array input conversion is not supported")

1 0

Rémi Bernon : winevulkan: Introduce a new convert_suffix make_vulkan helper.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: fc2ea1bebaabb1f340c477ddb3e91992593e730e URL: https://gitlab.winehq.org/wine/wine/-/commit/fc2ea1bebaabb1f340c477ddb3e919… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 1 10:40:49 2023 +0100 winevulkan: Introduce a new convert_suffix make_vulkan helper. --- dlls/winevulkan/make_vulkan | 80 ++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 41 deletions(-)

1 0

Rémi Bernon : winevulkan: Use an enumeration for make_vulkan unwrapping kinds.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: f6febfda51e6a6eb402c68d8cbf3994511e3256f URL: https://gitlab.winehq.org/wine/wine/-/commit/f6febfda51e6a6eb402c68d8cbf399… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 4 15:04:12 2023 +0100 winevulkan: Use an enumeration for make_vulkan unwrapping kinds. --- dlls/winevulkan/make_vulkan | 86 +++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 35 deletions(-)

1 0

Rémi Bernon : winevulkan: Unwrap to driver or host depending on the function.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 85026ab2b3f9ff7cfe78e257fee1980e3df2005a URL: https://gitlab.winehq.org/wine/wine/-/commit/85026ab2b3f9ff7cfe78e257fee198… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 5 17:11:11 2023 +0100 winevulkan: Unwrap to driver or host depending on the function. --- dlls/winevulkan/make_vulkan | 30 ++++++++++++++++++++++++------ dlls/winevulkan/vulkan_thunks.c | 16 ++++++++-------- 2 files changed, 32 insertions(+), 14 deletions(-)

1 0

Fabian Maurer : apisetschema: Add api-ms-win-core-com-l2-1-1.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: c24bbd13c8d6cf9b77df12bb6a6c82ccffb2689a URL: https://gitlab.winehq.org/wine/wine/-/commit/c24bbd13c8d6cf9b77df12bb6a6c82… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 4 19:33:07 2023 +0100 apisetschema: Add api-ms-win-core-com-l2-1-1. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55075 --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index 9b09f01e5e0..c7da8a6a806 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -9,6 +9,7 @@ apiset api-ms-win-core-atoms-l1-1-0 = kernel32.dll apiset api-ms-win-core-backgroundtask-l1-1-0 = kernelbase.dll apiset api-ms-win-core-calendar-l1-1-0 = kernel32.dll apiset api-ms-win-core-com-l1-1-1 = combase.dll +apiset api-ms-win-core-com-l2-1-1 = coml2.dll apiset api-ms-win-core-com-midlproxystub-l1-1-0 = combase.dll apiset api-ms-win-core-com-private-l1-1-0 = combase.dll apiset api-ms-win-core-com-private-l1-2-0 = combase.dll

1 0