August 2022 - Wine-Commits - list.winehq.org

Francois Gouget : winealsa.drv: Make functions static where possible.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 516e6dd9210d22ad9654c15d07c2548e9c9b652a URL: https://gitlab.winehq.org/wine/wine/-/commit/516e6dd9210d22ad9654c15d07c254… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 13:01:13 2022 +0200 winealsa.drv: Make functions static where possible. This helps detect dead code. --- dlls/winealsa.drv/alsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 882562bcf91..7ac404fd6a4 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -142,7 +142,7 @@ static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) return key; } -ULONG reg_query_value( HKEY hkey, const WCHAR *name, +static ULONG reg_query_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) { unsigned int name_size = name ? wcslen( name ) * sizeof(WCHAR) : 0;

1 0

Francois Gouget : crypt32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 49d4fb0d66e6406c2d622fa3913de86310e8d5c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/49d4fb0d66e6406c2d622fa3913de8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 12:28:19 2022 +0200 crypt32: Remove WINAPI on static functions where not needed. --- dlls/crypt32/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 8086ad2fc0a..8968eb9f15a 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4500,7 +4500,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCertId(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeOCSPRequestEntry(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnEncodeOCSPRequestEntry(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) {

1 0

Alexandre Julliard : gitlab: Run CI scripts as non-root user.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 4f75dd8c44d3f6ae8ed8ab09c18992987bd79673 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f75dd8c44d3f6ae8ed8ab09c18992… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 31 13:49:15 2022 +0200 gitlab: Run CI scripts as non-root user. --- tools/gitlab/image.docker | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index b3191079dee..c30e8f0de26 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -52,4 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ unixodbc-dev:amd64 unixodbc-dev:i386 \ x11proto-dev && \ apt-get install -y ccache && \ - apt-get clean + apt-get clean && \ + useradd -m gitlab + +USER gitlab

1 0

Alexandre Julliard : gitlab: Rename build-all job to build-linux.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 1a982894dd561d5048d2886fe6dff8d55d559c14 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a982894dd561d5048d2886fe6dff8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 31 13:34:29 2022 +0200 gitlab: Rename build-all job to build-linux. For symmetry with build-mac. --- tools/gitlab/{build-all => build-linux} | 0 tools/gitlab/build.yml | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gitlab/build-all b/tools/gitlab/build-linux similarity index 100% rename from tools/gitlab/build-all rename to tools/gitlab/build-linux diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 34e0268ca04..93a284a2d90 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -20,7 +20,7 @@ - export PATH="/usr/lib/ccache:$PATH" - mkdir -p build32 build64 -build-all: +build-linux: extends: .wine-build rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' @@ -31,7 +31,7 @@ build-all: - build32/config.log script: - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase - - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-all + - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux build-mac: extends: .wine-build

1 0

Jacek Caban : winevulkan: Get rid of unix_funcs.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 49752f34ca17668f77143bc5afe719928798d577 URL: https://gitlab.winehq.org/wine/wine/-/commit/49752f34ca17668f77143bc5afe719… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 28 23:23:21 2022 +0200 winevulkan: Get rid of unix_funcs. --- dlls/winevulkan/loader.c | 6 +- dlls/winevulkan/loader_thunks.c | 358 +++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 13 +- dlls/winevulkan/vulkan.c | 2 +- dlls/winevulkan/vulkan_loader.h | 8 +- dlls/winevulkan/vulkan_private.h | 2 +- dlls/winevulkan/vulkan_thunks.c | 7 +- 7 files changed, 192 insertions(+), 204 deletions(-)

1 0

Jacek Caban : winevulkan: Use __wine_unix_call for checking Vulkan functions availability.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 395061e3675be486698d7bc6e20dcd9548b837b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/395061e3675be486698d7bc6e20dcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 25 22:30:56 2022 +0200 winevulkan: Use __wine_unix_call for checking Vulkan functions availability. --- dlls/winevulkan/loader.c | 18 +++++++++++++++--- dlls/winevulkan/loader_thunks.h | 2 ++ dlls/winevulkan/make_vulkan | 6 ++++-- dlls/winevulkan/vulkan.c | 10 ++++++---- dlls/winevulkan/vulkan_loader.h | 14 ++++++++++++-- dlls/winevulkan/vulkan_private.h | 4 ++-- dlls/winevulkan/vulkan_thunks.c | 4 ++-- 7 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index fa596c1f9e5..d3f20e0d544 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -88,6 +88,18 @@ static void *wine_vk_get_global_proc_addr(const char *name) return NULL; } +static BOOL is_available_instance_function(VkInstance instance, const char *name) +{ + struct is_available_instance_function_params params = { .instance = instance, .name = name }; + return vk_unix_call(unix_is_available_instance_function, &params); +} + +static BOOL is_available_device_function(VkDevice device, const char *name) +{ + struct is_available_device_function_params params = { .device = device, .name = name }; + return vk_unix_call(unix_is_available_device_function, &params); +} + PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char *name) { void *func; @@ -111,7 +123,7 @@ PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char return NULL; } - if (!unix_funcs->p_is_available_instance_function(instance, name)) + if (!is_available_instance_function(instance, name)) return NULL; func = wine_vk_get_instance_proc_addr(name); @@ -142,7 +154,7 @@ PFN_vkVoidFunction WINAPI vkGetDeviceProcAddr(VkDevice device, const char *name) * vkCommandBuffer or vkQueue. * Loader takes care of filtering of extensions which are enabled or not. */ - if (unix_funcs->p_is_available_device_function(device, name)) + if (is_available_device_function(device, name)) { func = wine_vk_get_device_proc_addr(name); if (func) @@ -176,7 +188,7 @@ void * WINAPI vk_icdGetPhysicalDeviceProcAddr(VkInstance instance, const char *n { TRACE("%p, %s\n", instance, debugstr_a(name)); - if (!unix_funcs->p_is_available_instance_function(instance, name)) + if (!is_available_instance_function(instance, name)) return NULL; return wine_vk_get_phys_dev_proc_addr(name); diff --git a/dlls/winevulkan/loader_thunks.h b/dlls/winevulkan/loader_thunks.h index 3816b301f3a..e0c7dfafc55 100644 --- a/dlls/winevulkan/loader_thunks.h +++ b/dlls/winevulkan/loader_thunks.h @@ -15,6 +15,8 @@ enum unix_call { unix_init, + unix_is_available_instance_function, + unix_is_available_device_function, unix_vkAcquireNextImage2KHR, unix_vkAcquireNextImageKHR, unix_vkAcquirePerformanceConfigurationINTEL, diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index cb5d8b948c2..0adbd9a0d3b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2839,6 +2839,8 @@ class VkGenerator(object): f.write("const unixlib_entry_t __wine_unix_call_funcs[] =\n") f.write("{\n") f.write(" init_vulkan,\n") + f.write(" vk_is_available_instance_function,\n") + f.write(" vk_is_available_device_function,\n") for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue @@ -2857,8 +2859,6 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") f.write(" wine_vk_call,\n") - f.write(" wine_vk_is_available_instance_function,\n") - f.write(" wine_vk_is_available_device_function,\n") f.write("};\n") def generate_thunks_h(self, f, prefix): @@ -3050,6 +3050,8 @@ class VkGenerator(object): f.write("enum unix_call\n") f.write("{\n") f.write(" unix_init,\n") + f.write(" unix_is_available_instance_function,\n") + f.write(" unix_is_available_device_function,\n") for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index da89cdd5ba2..4c2350927d5 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1872,12 +1872,14 @@ NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) return res; } -BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) +NTSTATUS vk_is_available_instance_function(void *arg) { - return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); + struct is_available_instance_function_params *params = arg; + return !!vk_funcs->p_vkGetInstanceProcAddr(params->instance->instance, params->name); } -BOOL WINAPI wine_vk_is_available_device_function(VkDevice device, const char *name) +NTSTATUS vk_is_available_device_function(void *arg) { - return !!vk_funcs->p_vkGetDeviceProcAddr(device->device, name); + struct is_available_device_function_params *params = arg; + return !!vk_funcs->p_vkGetDeviceProcAddr(params->device->device, params->name); } diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 3ba945dbfcc..97aae6c438d 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -94,6 +94,18 @@ struct wine_vk_debug_report_params const char *message; }; +struct is_available_instance_function_params +{ + VkInstance instance; + const char *name; +}; + +struct is_available_device_function_params +{ + VkDevice device; + const char *name; +}; + extern const struct unix_funcs *unix_funcs; extern unixlib_handle_t unix_handle DECLSPEC_HIDDEN; @@ -105,8 +117,6 @@ static inline NTSTATUS vk_unix_call(enum unix_call code, void *params) struct unix_funcs { NTSTATUS (WINAPI *p_vk_call)(enum unix_call, void *); - BOOL (WINAPI *p_is_available_instance_function)(VkInstance, const char *); - BOOL (WINAPI *p_is_available_device_function)(VkDevice, const char *); }; #endif /* __WINE_VULKAN_LOADER_H */ diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 83a26988e8b..4a0f9b02a97 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -214,7 +214,7 @@ NTSTATUS init_vulkan(void *args) DECLSPEC_HIDDEN; extern const struct unix_funcs loader_funcs; -BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) DECLSPEC_HIDDEN; -BOOL WINAPI wine_vk_is_available_device_function(VkDevice device, const char *name) DECLSPEC_HIDDEN; +NTSTATUS vk_is_available_instance_function(void *arg) DECLSPEC_HIDDEN; +NTSTATUS vk_is_available_device_function(void *arg) DECLSPEC_HIDDEN; #endif /* __WINE_VULKAN_PRIVATE_H */ diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 91f476967a9..58c8cb44ecb 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -10289,6 +10289,8 @@ uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) const unixlib_entry_t __wine_unix_call_funcs[] = { init_vulkan, + vk_is_available_instance_function, + vk_is_available_device_function, wine_vkAcquireNextImage2KHR, wine_vkAcquireNextImageKHR, wine_vkAcquirePerformanceConfigurationINTEL, @@ -10757,6 +10759,4 @@ static NTSTATUS WINAPI wine_vk_call(enum unix_call code, void *params) const struct unix_funcs loader_funcs = { wine_vk_call, - wine_vk_is_available_instance_function, - wine_vk_is_available_device_function, };

1 0

Eric Pouech : msvcrt: Fix order of extended qualifiers and qualifiers.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 9a98276f981903bdd179705f1eaf0808f74ca678 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a98276f981903bdd179705f1eaf08… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 31 10:39:16 2022 +0200 msvcrt: Fix order of extended qualifiers and qualifiers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 7735da4ea89..b2b6a1909b7 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1310,6 +1310,7 @@ static void test_demangle(void) /* 146 */ {"?ptititi3@@3PEStititi@@IES1@", "unsigned int volatile tititi::* __ptr64 volatile __ptr64 ptititi3"}, /* 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 "}, }; int i, num_test = ARRAY_SIZE(test); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 424d977a2a7..8eb3a12057f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -456,10 +456,8 @@ static BOOL get_modifier(struct parsed_symbol *sym, struct datatype_t *xdt, cons case 'T': mod = "const volatile"; break; default: return FALSE; } - if (xdt->left && mod) - xdt->left = str_printf(sym, "%s %s", xdt->left, mod); - else if (mod) - xdt->left = mod; + if (mod) + xdt->left = xdt->left ? str_printf(sym, "%s %s", mod, xdt->left) : mod; if (ch >= 'Q' && ch <= 'T') /* pointer to member, fetch class */ { const char* class = get_class_name(sym);

1 0

Jacek Caban : winevulkan: Use vk_unix_call in loader.c.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 05d2576b1f296f118362e32dc8001995ec463326 URL: https://gitlab.winehq.org/wine/wine/-/commit/05d2576b1f296f118362e32dc80019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 25 21:42:47 2022 +0200 winevulkan: Use vk_unix_call in loader.c. --- dlls/winevulkan/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 1c45c036c18..fa596c1f9e5 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -242,7 +242,7 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, params.pCreateInfo = create_info; params.pAllocator = allocator; params.pInstance = instance; - return unix_funcs->p_vk_call(unix_vkCreateInstance, &params); + return vk_unix_call(unix_vkCreateInstance, &params); } VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, @@ -267,7 +267,7 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, params.pLayerName = layer_name; params.pPropertyCount = count; params.pProperties = properties; - return unix_funcs->p_vk_call(unix_vkEnumerateInstanceExtensionProperties, &params); + return vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, &params); } VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) @@ -283,7 +283,7 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) } params.pApiVersion = version; - return unix_funcs->p_vk_call(unix_vkEnumerateInstanceVersion, &params); + return vk_unix_call(unix_vkEnumerateInstanceVersion, &params); } static HANDLE get_display_device_init_mutex(void)

1 0

Eric Pouech : msvcrt: Use enum to clarify post-processing actions.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 638b06015b6696358f4e30037a72981672ae3730 URL: https://gitlab.winehq.org/wine/wine/-/commit/638b06015b6696358f4e30037a7298… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 31 10:39:16 2022 +0200 msvcrt: Use enum to clarify post-processing actions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/undname.c | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index a3ad3497c00..424d977a2a7 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1421,7 +1421,12 @@ done: static BOOL symbol_demangle(struct parsed_symbol* sym) { BOOL ret = FALSE; - unsigned do_after = 0; + enum { + PP_NONE, + PP_CONSTRUCTOR, + PP_DESTRUCTOR, + PP_CAST_OPERATOR, + } post_process = PP_NONE; /* FIXME seems wrong as name, as it demangles a simple data type */ if (sym->flags & UNDNAME_NO_ARGUMENTS) @@ -1455,8 +1460,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) /* C++ operator code (one character, or two if the first is '_') */ switch (*++sym->current) { - case '0': function_name = ""; do_after = 1; break; - case '1': function_name = ""; do_after = 2; break; + case '0': function_name = ""; post_process = PP_CONSTRUCTOR; break; + case '1': function_name = ""; post_process = PP_DESTRUCTOR; break; case '2': function_name = "operator new"; break; case '3': function_name = "operator delete"; break; case '4': function_name = "operator="; break; @@ -1466,7 +1471,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case '8': function_name = "operator=="; break; case '9': function_name = "operator!="; break; case 'A': function_name = "operator[]"; break; - case 'B': function_name = "operator"; do_after = 3; break; + case 'B': function_name = "operator"; post_process = PP_CAST_OPERATOR; break; case 'C': function_name = "operator->"; break; case 'D': function_name = "operator*"; break; case 'E': function_name = "operator++"; break; @@ -1506,7 +1511,10 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case '9': function_name = "`vcall'"; break; case 'A': function_name = "`typeof'"; break; case 'B': function_name = "`local static guard'"; break; - case 'C': function_name = "`string'"; do_after = 4; break; + case 'C': sym->result = (char*)"`string'"; /* string literal: followed by string encoding (native nevers undecode it) */ + /* FIXME: should unmangle the whole string for error reporting */ + if (*sym->current && sym->current[strlen(sym->current) - 1] == '@') ret = TRUE; + goto done; case 'D': function_name = "`vbase destructor'"; break; case 'E': function_name = "`vector deleting destructor'"; break; case 'F': function_name = "`default constructor closure'"; break; @@ -1601,18 +1609,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) if (args) function_name = function_name ? str_printf(sym, "%s%s", function_name, args) : args; sym->names.num = 0; } - switch (do_after) - { - case 4: - sym->result = (char*)function_name; - ret = TRUE; - goto done; - /* fall through */ - default: - if (!str_array_push(sym, function_name, -1, &sym->stack)) - return FALSE; - break; - } + if (!str_array_push(sym, function_name, -1, &sym->stack)) + return FALSE; } else if (*sym->current == '$') { @@ -1634,20 +1632,18 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) break; } - switch (do_after) + switch (post_process) { - case 0: default: break; - case 1: case 2: + case PP_NONE: default: break; + case PP_CONSTRUCTOR: case PP_DESTRUCTOR: /* it's time to set the member name for ctor & dtor */ if (sym->stack.num <= 1) goto done; - if (do_after == 1) - sym->stack.elts[0] = str_printf(sym, "%s%s", sym->stack.elts[1], sym->stack.elts[0]); - else - sym->stack.elts[0] = str_printf(sym, "~%s%s", sym->stack.elts[1], sym->stack.elts[0]); + sym->stack.elts[0] = str_printf(sym, "%s%s%s", post_process == PP_DESTRUCTOR ? "~" : NULL, + sym->stack.elts[1], sym->stack.elts[0]); /* ctors and dtors don't have return type */ sym->flags |= UNDNAME_NO_FUNCTION_RETURNS; break; - case 3: + case PP_CAST_OPERATOR: sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; break; } @@ -1656,7 +1652,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) if (*sym->current >= '0' && *sym->current <= '9') ret = handle_data(sym); else if ((*sym->current >= 'A' && *sym->current <= 'Z') || *sym->current == '$') - ret = handle_method(sym, do_after == 3); + ret = handle_method(sym, post_process == PP_CAST_OPERATOR); else ret = FALSE; done: if (ret) assert(sym->result);

1 0

Eric Pouech : msvcrt: Undecorate function signature as template argument.
by Alexandre Julliard Aug. 31, 2022

Aug. 31, 2022

Module: wine Branch: master Commit: 22362757adebe82f27c26a478a19ca86f1ee596c URL: https://gitlab.winehq.org/wine/wine/-/commit/22362757adebe82f27c26a478a19ca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 31 10:39:16 2022 +0200 msvcrt: Undecorate function signature as template argument. Introducing get_function_signaturei() to factorize parsing of function signature. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 6 ++ dlls/msvcrt/undname.c | 169 +++++++++++++++++++++++++++++++----------------- 2 files changed, 117 insertions(+), 58 deletions(-)

1 0