December 2023 - Wine-Commits

Rémi Bernon : winevulkan: Use an enumeration for make_vulkan unwrapping kinds.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

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: Remove redundant make_vulkan needs_unwrapping method.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

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: Use a dictionary for user driver entry points.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

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

Eric Pouech : kernel32/tests: Identify untouched fields returned from GetStartupInfo.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

Module: wine Branch: master Commit: 5545aef74ee6eb8fd6362d920c88f0b774a52068 URL: https://gitlab.winehq.org/wine/wine/-/commit/5545aef74ee6eb8fd6362d920c88f0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Dec 1 13:54:08 2023 +0100 kernel32/tests: Identify untouched fields returned from GetStartupInfo. GetStartupInfoW() doesn't set all the fields. So in CreateProcess() tests, always use a marker for STARTUP_INFO initialization; make use of that marker to properly identify the std handles gotten from GetStartupInfo. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8472da0bd70..5e46daac152 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -318,10 +318,13 @@ static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fm } /* bits 0..1 contains FILE_TYPE_{UNKNOWN, CHAR, PIPE, DISK} */ -#define HATTR_NULL 0x08 /* NULL handle value */ -#define HATTR_INVALID 0x04 /* INVALID_HANDLE_VALUE */ -#define HATTR_TYPE 0x0c /* valid handle, with type set */ -#define HATTR_INHERIT 0x10 /* inheritance flag set */ +#define HATTR_NULL 0x08 /* NULL handle value */ +#define HATTR_INVALID 0x04 /* INVALID_HANDLE_VALUE */ +#define HATTR_TYPE 0x0c /* valid handle, with type set */ +#define HATTR_INHERIT 0x10 /* inheritance flag set */ +#define HATTR_UNTOUCHED 0x20 /* Identify fields untouched by GetStartupInfoW */ + +#define HANDLE_UNTOUCHEDW (HANDLE)(DWORD_PTR)(0x5050505050505050ull) static unsigned encode_handle_attributes(HANDLE h) { @@ -332,6 +335,8 @@ static unsigned encode_handle_attributes(HANDLE h) result = HATTR_NULL; else if (h == INVALID_HANDLE_VALUE) result = HATTR_INVALID; + else if (h == HANDLE_UNTOUCHEDW) + result = HATTR_UNTOUCHED; else { result = HATTR_TYPE; @@ -372,6 +377,7 @@ static void doChild(const char* file, const char* option) if (hFile == INVALID_HANDLE_VALUE) return; /* output of startup info (Ansi) */ + memset(&siA, 0xA0, sizeof(siA)); GetStartupInfoA(&siA); childPrintf(hFile, "[StartupInfoA]\ncb=%08lu\nlpDesktop=%s\nlpTitle=%s\n" @@ -397,10 +403,7 @@ static void doChild(const char* file, const char* option) encode_handle_attributes(params->hStdInput), encode_handle_attributes(params->hStdOutput), encode_handle_attributes(params->hStdError)); - /* since GetStartupInfoW is only implemented in win2k, - * zero out before calling so we can notice the difference - */ - memset(&siW, 0, sizeof(siW)); + memset(&siW, 0x50, sizeof(siW)); GetStartupInfoW(&siW); childPrintf(hFile, "[StartupInfoW]\ncb=%08lu\nlpDesktop=%s\nlpTitle=%s\n" @@ -3251,42 +3254,42 @@ static void test_StdHandleInheritance(void) { /* all others handles type behave as H_DISK */ /* 0*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, - {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK, .is_todo = 4}, /* all others handles type behave as H_DISK */ {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, - {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, + {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK, .is_todo = 4}, }, nothing_gui[] = { /* testing all types because of discrepancies */ /* 0*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, - {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK, .is_todo = 4}, {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_PIPE, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_PIPE}, - {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_PIPE, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_PIPE}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_PIPE, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_PIPE, .is_todo = 4}, {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CHAR, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_CHAR}, -/* 5*/ {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CHAR, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_CHAR}, +/* 5*/ {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CHAR, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_CHAR, .is_todo = 4}, {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 7, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, - {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 1, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 5, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, /* all others handles type behave as H_DISK */ {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, - {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL}, + {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 4}, }, detached_cui[] = { - {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 4}, {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_CHAR, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, /* all others handles type behave as H_DISK */ - {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 4}, {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, }, detached_gui[] = { - {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 4}, {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 7, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, /* all others handles type behave as H_DISK */ - {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 4}, {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, }; static const struct @@ -3349,7 +3352,7 @@ static void test_StdHandleInheritance(void) okChildHexInt("StartupInfoA", "hStdOutputEncode", startup_expected, std_tests[i].is_broken); } - startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_NULL : std_tests[i].expected; + startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_UNTOUCHED : std_tests[i].expected; todo_wine_if(std_tests[i].is_todo & 4) {

1 0

Piotr Caban : msvcrt: Add partial support for managed handle demangling.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

Module: wine Branch: master Commit: bdd04f5f714c7bed42c30687977c4e40662ed519 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdd04f5f714c7bed42c30687977c4e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 5 19:25:59 2023 +0100 msvcrt: Add partial support for managed handle demangling. --- dlls/msvcrt/tests/cpp.c | 4 ++++ dlls/msvcrt/undname.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 2dec315ba68..d230659404d 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1320,6 +1320,10 @@ static void test_demangle(void) /* 147 */ {"?ptititi4@@3PETtititi@@IET1@", "unsigned int const volatile tititi::* __ptr64 const volatile __ptr64 ptititi4"}, /* 148 */ {"?ptititi4v@@3RETtititi@@IET1@", "unsigned int const volatile tititi::* __ptr64 const volatile __ptr64 ptititi4v"}, /* 149 */ {"?meth(a)AAA@@QFCEXXZ", "public: void __thiscall AAA::meth(void)volatile __unaligned "}, +/* 150 */ {"?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z", + "void __cdecl <CrtImplementationDetails>::RegisterModuleUninitializer(class System::EventHandler ^)"}, +/* 151 */ {"?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXBE$AAVEventHandler(a)System@@@Z", + "void __cdecl <CrtImplementationDetails>::RegisterModuleUninitializer(class System::EventHandler % __ptr64 volatile)"}, }; int i, num_test = ARRAY_SIZE(test); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 557f1ce13e0..91d4fdbc3eb 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -519,6 +519,28 @@ static BOOL get_qualified_type(struct datatype_t *ct, struct parsed_symbol* sym, ct->right = NULL; ct->flags = 0; + /* parse managed handle information */ + if (sym->current[0] == '$' && sym->current[1] == 'A') + { + sym->current += 2; + + switch (qualif) + { + case 'A': + case 'B': + ref = " %"; + break; + case 'P': + case 'Q': + case 'R': + case 'S': + ref = " ^"; + break; + default: + return FALSE; + } + } + if (get_qualifier(sym, &xdt2, &class)) { unsigned mark = sym->stack.num;

1 0

Piotr Caban : msvcrt: Accept <> characters in string literals in demangler.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

Module: wine Branch: master Commit: 5af51ce0af881ad0fbf63d8337dadfa8f7d4981e URL: https://gitlab.winehq.org/wine/wine/-/commit/5af51ce0af881ad0fbf63d8337dadf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 5 18:25:27 2023 +0100 msvcrt: Accept <> characters in string literals in demangler. --- dlls/msvcrt/undname.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 89052d433b0..557f1ce13e0 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -591,7 +591,8 @@ static char* get_literal_string(struct parsed_symbol* sym) if (!((*sym->current >= 'A' && *sym->current <= 'Z') || (*sym->current >= 'a' && *sym->current <= 'z') || (*sym->current >= '0' && *sym->current <= '9') || - *sym->current == '_' || *sym->current == '$')) { + *sym->current == '_' || *sym->current == '$' || + *sym->current == '<' || *sym->current == '>')) { TRACE("Failed at '%c' in %s\n", *sym->current, debugstr_a(ptr)); return NULL; }

1 0

Fabian Maurer : apisetschema: Add api-ms-win-core-com-l2-1-1.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

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

Rémi Bernon : winevulkan: Use a dictionary in make_vulkan for manual unix thunks.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

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

Zebediah Figura : d3d10core/tests: Mark a test as no longer todo.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

Module: wine Branch: master Commit: 5b97dbdb5891735a3e24d601c7775631b4dbabac URL: https://gitlab.winehq.org/wine/wine/-/commit/5b97dbdb5891735a3e24d601c77756… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 4 14:14:42 2023 -0600 d3d10core/tests: Mark a test as no longer todo. This was fixed by ef2908462d37951761f2f820b6fdb6446787543c. I misremembered when writing that commit's message; we don't actually invalidate STATE_SAMPLER when binding an SRV. Hence the code was not just "fragile" but in fact already broken. --- dlls/d3d10core/tests/d3d10core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index fadf9211640..9cb0ec118a4 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -14186,7 +14186,7 @@ static void test_unbind_shader_resource_view(void) ID3D10Device_PSSetShaderResources(device, 1, 1, &srv2); ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); draw_quad(&test_context); - todo_wine_if (!damavand) check_texture_color(test_context.backbuffer, 0x00000000, 1); + check_texture_color(test_context.backbuffer, 0x00000000, 1); ID3D10PixelShader_Release(ps); ID3D10ShaderResourceView_Release(srv);

1 0

Zebediah Figura : d3d11core/tests: Mark a test as no longer todo.
by Alexandre Julliard Dec. 5, 2023

Dec. 5, 2023

Module: wine Branch: master Commit: d9342e85db8a0dd2b73301fb0cc8c462e2474285 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9342e85db8a0dd2b73301fb0cc8c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 4 14:16:56 2023 -0600 d3d11core/tests: Mark a test as no longer todo. This was fixed by ef2908462d37951761f2f820b6fdb6446787543c. I misremembered when writing that commit's message; we don't actually invalidate STATE_SAMPLER when binding an SRV. Hence the code was not just "fragile" but in fact already broken. --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ecc01f50bfa..727f263731d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21859,7 +21859,7 @@ static void test_unbind_shader_resource_view(void) ID3D11DeviceContext_PSSetShaderResources(context, 1, 1, &srv2); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); draw_quad(&test_context); - todo_wine_if (!damavand) check_texture_color(test_context.backbuffer, 0x00000000, 1); + check_texture_color(test_context.backbuffer, 0x00000000, 1); ID3D11PixelShader_Release(ps); ID3D11ShaderResourceView_Release(srv);

1 0