March 2024 - Wine-commits - list.winehq.org

Rémi Bernon : win32u: Move vkGet(Instance|Device)ProcAddr out the drivers.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: 9ee2adba14a9761c7ca5d893d83ecd8dc45cfbb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ee2adba14a9761c7ca5d893d83ecd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 21 17:40:34 2024 +0100 win32u: Move vkGet(Instance|Device)ProcAddr out the drivers. --- dlls/win32u/vulkan.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/vulkan.c | 32 ++------------------------------ dlls/winewayland.drv/vulkan.c | 30 ------------------------------ dlls/winex11.drv/vulkan.c | 32 ++------------------------------ 4 files changed, 46 insertions(+), 90 deletions(-)

1 0

Rémi Bernon : winevulkan: Stop generating the wine/vulkan_driver.h header.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: a75dde2c1f1e7e8157c7f190f25ecc54b794b452 URL: https://gitlab.winehq.org/wine/wine/-/commit/a75dde2c1f1e7e8157c7f190f25ecc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 12:33:03 2024 +0100 winevulkan: Stop generating the wine/vulkan_driver.h header. --- dlls/winevulkan/make_vulkan | 63 -------------------------------------------- include/wine/vulkan_driver.h | 20 +++++++++----- 2 files changed, 14 insertions(+), 69 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6b4debf20ff..809591b3c97 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3142,66 +3142,6 @@ class VkGenerator(object): f.write("#endif /* __WINE_VULKAN_H */\n") - def generate_vulkan_driver_h(self, f): - self._generate_copyright(f) - f.write("#ifndef __WINE_VULKAN_DRIVER_H\n") - f.write("#define __WINE_VULKAN_DRIVER_H\n\n") - - f.write("/* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */\n") - f.write("#define WINE_VULKAN_DRIVER_VERSION {0}\n\n".format(DRIVER_VERSION)) - - f.write("struct vulkan_funcs\n{\n") - f.write(" /* Vulkan global functions. These are the only calls at this point a graphics driver\n") - f.write(" * needs to provide. Other function calls will be provided indirectly by dispatch\n") - f.write(" * tables part of dispatchable Vulkan objects such as VkInstance or vkDevice.\n") - f.write(" */\n") - - for vk_func in self.registry.funcs.values(): - if not vk_func.is_driver_func(): - continue - - pfn = vk_func.pfn() - # Avoid PFN_vkVoidFunction in driver interface as Vulkan likes to put calling convention - # stuff in there. For simplicity substitute with "void *". - pfn = pfn.replace("PFN_vkVoidFunction", "void *") - f.write(" {0};\n".format(pfn)) - - f.write("\n") - f.write(" /* winevulkan specific functions */\n") - f.write(" VkSurfaceKHR (*p_wine_get_host_surface)(VkSurfaceKHR);\n") - f.write("};\n\n") - - f.write("static inline void *get_vulkan_driver_device_proc_addr(\n") - f.write(" const struct vulkan_funcs *vulkan_funcs, const char *name)\n{\n") - f.write(" if (!name || name[0] != 'v' || name[1] != 'k') return NULL;\n\n") - f.write(" name += 2;\n\n") - for vk_func in self.registry.funcs.values(): - if vk_func.is_driver_func() and vk_func.is_device_func(): - f.write(' if (!strcmp(name, "{0}"))\n'.format(vk_func.name[2:])) - f.write(' return vulkan_funcs->p_{0};\n'.format(vk_func.name)) - f.write("\n") - f.write(" return NULL;\n}\n\n") - - f.write("static inline void *get_vulkan_driver_instance_proc_addr(\n") - f.write(" const struct vulkan_funcs *vulkan_funcs, VkInstance instance, const char *name)\n{\n") - f.write(" if (!name || name[0] != 'v' || name[1] != 'k') return NULL;\n\n") - f.write(" name += 2;\n\n") - for vk_func in self.registry.funcs.values(): - if vk_func.is_driver_func() and vk_func.is_global_func() and vk_func.name != "vkGetInstanceProcAddr": - f.write(' if (!strcmp(name, "{0}"))\n'.format(vk_func.name[2:])) - f.write(' return vulkan_funcs->p_{0};\n'.format(vk_func.name)) - f.write("\n") - f.write(" if (!instance) return NULL;\n\n") - for vk_func in self.registry.funcs.values(): - if vk_func.is_driver_func() and (vk_func.is_instance_func() or vk_func.is_phys_dev_func()): - f.write(' if (!strcmp(name, "{0}"))\n'.format(vk_func.name[2:])) - f.write(' return vulkan_funcs->p_{0};\n'.format(vk_func.name)) - f.write("\n") - f.write(" name -= 2;\n\n") - f.write(" return get_vulkan_driver_device_proc_addr(vulkan_funcs, name);\n}\n\n") - - f.write("#endif /* __WINE_VULKAN_DRIVER_H */\n") - def generate_vulkan_spec(self, f): self._generate_copyright(f, spec_file=True) f.write("@ stdcall -private vk_icdGetInstanceProcAddr(ptr str)\n") @@ -3894,9 +3834,6 @@ def main(): with open(WINE_VULKAN_H, "w") as f: generator.generate_vulkan_h(f) - with open(WINE_VULKAN_DRIVER_H, "w") as f: - generator.generate_vulkan_driver_h(f) - with open(WINE_VULKAN_THUNKS_H, "w") as f: generator.generate_thunks_h(f, "wine_") diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 949dbc769b5..2cf6d99cfd8 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -1,12 +1,20 @@ -/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! +/* + * Copyright 2017-2018 Roderick Colenbrander + * Copyright 2022 Jacek Caban for CodeWeavers * - * This file is generated from Vulkan vk.xml file covered - * by the following copyright and permission notice: + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * Copyright 2015-2024 The Khronos Group Inc. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_VULKAN_DRIVER_H

1 0

Rémi Bernon : win32u: Move vkGet(Device|Instance)ProcAddr helpers inline.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: c11f9a8bc982b3bd148e1c2a2e3b42ed041b3857 URL: https://gitlab.winehq.org/wine/wine/-/commit/c11f9a8bc982b3bd148e1c2a2e3b42… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 12:35:00 2024 +0100 win32u: Move vkGet(Device|Instance)ProcAddr helpers inline. --- dlls/win32u/vulkan.c | 30 ++++++++++++++++++++------ include/wine/vulkan_driver.h | 51 -------------------------------------------- 2 files changed, 24 insertions(+), 57 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 77f5ee2da8d..853e0a973a3 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -48,21 +48,39 @@ static void *(*p_vkGetInstanceProcAddr)(VkInstance, const char *); static void *win32u_vkGetDeviceProcAddr( VkDevice device, const char *name ) { - void *proc_addr; - TRACE( "device %p, name %s\n", device, debugstr_a(name) ); - if ((proc_addr = get_vulkan_driver_device_proc_addr( &vulkan_funcs, name ))) return proc_addr; + if (!strcmp( name, "vkCreateSwapchainKHR" )) return vulkan_funcs.p_vkCreateSwapchainKHR; + if (!strcmp( name, "vkDestroySwapchainKHR" )) return vulkan_funcs.p_vkDestroySwapchainKHR; + if (!strcmp( name, "vkGetDeviceProcAddr" )) return win32u_vkGetDeviceProcAddr; + if (!strcmp( name, "vkGetSwapchainImagesKHR" )) return vulkan_funcs.p_vkGetSwapchainImagesKHR; + if (!strcmp( name, "vkQueuePresentKHR" )) return vulkan_funcs.p_vkQueuePresentKHR; + return p_vkGetDeviceProcAddr( device, name ); } static void *win32u_vkGetInstanceProcAddr( VkInstance instance, const char *name ) { - void *proc_addr; - TRACE( "instance %p, name %s\n", instance, debugstr_a(name) ); - if ((proc_addr = get_vulkan_driver_instance_proc_addr( &vulkan_funcs, instance, name ))) return proc_addr; + if (!strcmp( name, "vkCreateInstance" )) return vulkan_funcs.p_vkCreateInstance; + if (!strcmp( name, "vkEnumerateInstanceExtensionProperties" )) return vulkan_funcs.p_vkEnumerateInstanceExtensionProperties; + + if (!instance) return p_vkGetInstanceProcAddr( instance, name ); + + if (!strcmp( name, "vkCreateWin32SurfaceKHR" )) return vulkan_funcs.p_vkCreateWin32SurfaceKHR; + if (!strcmp( name, "vkDestroyInstance" )) return vulkan_funcs.p_vkDestroyInstance; + if (!strcmp( name, "vkDestroySurfaceKHR" )) return vulkan_funcs.p_vkDestroySurfaceKHR; + if (!strcmp( name, "vkGetInstanceProcAddr" )) return win32u_vkGetInstanceProcAddr; + if (!strcmp( name, "vkGetPhysicalDeviceWin32PresentationSupportKHR" )) return vulkan_funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR; + + /* vkGetInstanceProcAddr also loads any children of instance, so device functions as well. */ + if (!strcmp( name, "vkCreateSwapchainKHR" )) return vulkan_funcs.p_vkCreateSwapchainKHR; + if (!strcmp( name, "vkDestroySwapchainKHR" )) return vulkan_funcs.p_vkDestroySwapchainKHR; + if (!strcmp( name, "vkGetDeviceProcAddr" )) return win32u_vkGetDeviceProcAddr; + if (!strcmp( name, "vkGetSwapchainImagesKHR" )) return vulkan_funcs.p_vkGetSwapchainImagesKHR; + if (!strcmp( name, "vkQueuePresentKHR" )) return vulkan_funcs.p_vkQueuePresentKHR; + return p_vkGetInstanceProcAddr( instance, name ); } diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 2cf6d99cfd8..6c72548e02f 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -46,55 +46,4 @@ struct vulkan_funcs VkSurfaceKHR (*p_wine_get_host_surface)(VkSurfaceKHR); }; -static inline void *get_vulkan_driver_device_proc_addr( - const struct vulkan_funcs *vulkan_funcs, const char *name) -{ - if (!name || name[0] != 'v' || name[1] != 'k') return NULL; - - name += 2; - - if (!strcmp(name, "CreateSwapchainKHR")) - return vulkan_funcs->p_vkCreateSwapchainKHR; - if (!strcmp(name, "DestroySwapchainKHR")) - return vulkan_funcs->p_vkDestroySwapchainKHR; - if (!strcmp(name, "GetDeviceProcAddr")) - return vulkan_funcs->p_vkGetDeviceProcAddr; - if (!strcmp(name, "GetSwapchainImagesKHR")) - return vulkan_funcs->p_vkGetSwapchainImagesKHR; - if (!strcmp(name, "QueuePresentKHR")) - return vulkan_funcs->p_vkQueuePresentKHR; - - return NULL; -} - -static inline void *get_vulkan_driver_instance_proc_addr( - const struct vulkan_funcs *vulkan_funcs, VkInstance instance, const char *name) -{ - if (!name || name[0] != 'v' || name[1] != 'k') return NULL; - - name += 2; - - if (!strcmp(name, "CreateInstance")) - return vulkan_funcs->p_vkCreateInstance; - if (!strcmp(name, "EnumerateInstanceExtensionProperties")) - return vulkan_funcs->p_vkEnumerateInstanceExtensionProperties; - - if (!instance) return NULL; - - if (!strcmp(name, "CreateWin32SurfaceKHR")) - return vulkan_funcs->p_vkCreateWin32SurfaceKHR; - if (!strcmp(name, "DestroyInstance")) - return vulkan_funcs->p_vkDestroyInstance; - if (!strcmp(name, "DestroySurfaceKHR")) - return vulkan_funcs->p_vkDestroySurfaceKHR; - if (!strcmp(name, "GetInstanceProcAddr")) - return vulkan_funcs->p_vkGetInstanceProcAddr; - if (!strcmp(name, "GetPhysicalDeviceWin32PresentationSupportKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; - - name -= 2; - - return get_vulkan_driver_device_proc_addr(vulkan_funcs, name); -} - #endif /* __WINE_VULKAN_DRIVER_H */

1 0

Rémi Bernon : mfplat: Append MFVIDEOFORMAT user data after the structure padding.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: 26876b4a6edc2694320a4b4e715305bbb6997414 URL: https://gitlab.winehq.org/wine/wine/-/commit/26876b4a6edc2694320a4b4e715305… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 21 11:14:35 2024 +0100 mfplat: Append MFVIDEOFORMAT user data after the structure padding. Instead of using the last palette entry, which might be misaligned. --- dlls/mfplat/mediatype.c | 8 ++++++-- dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index df1334d51ff..370db8059f3 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3864,10 +3864,14 @@ HRESULT WINAPI MFInitMediaTypeFromMFVideoFormat(IMFMediaType *media_type, const if (format->compressedInfo.MaxKeyFrameSpacing) mediatype_set_uint32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, format->compressedInfo.MaxKeyFrameSpacing, &hr); - if ((palette_size = format->surfaceInfo.PaletteEntries * sizeof(*format->surfaceInfo.Palette))) + if (!(palette_size = format->surfaceInfo.PaletteEntries * sizeof(*format->surfaceInfo.Palette))) + user_data = format + 1; + else + { mediatype_set_blob(media_type, &MF_MT_PALETTE, (BYTE *)format->surfaceInfo.Palette, palette_size, &hr); + user_data = &format->surfaceInfo.Palette[format->surfaceInfo.PaletteEntries + 1]; + } - user_data = &format->surfaceInfo.Palette[format->surfaceInfo.PaletteEntries + 1]; if ((user_data_size = (BYTE *)format + format->dwSize - (BYTE *)user_data)) mediatype_set_blob(media_type, &MF_MT_USER_DATA, user_data, user_data_size, &hr); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2ff78a2b05a..904e8808305 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -8448,6 +8448,20 @@ static void test_MFInitMediaTypeFromMFVideoFormat(void) ok(!memcmp(user_data, expect_user_data, value32), "Unexpected user data.\n"); IMFMediaType_DeleteAllItems(media_type); + /* check that user data follows MFVIDEOFORMAT struct, which is padded, when no palette is present */ + format_buf->surfaceInfo.PaletteEntries = 0; + memmove(format_buf + 1, expect_user_data, sizeof(expect_user_data)); + format_buf->dwSize = sizeof(*format_buf) + sizeof(expect_user_data); + hr = MFInitMediaTypeFromMFVideoFormat(media_type, format_buf, format_buf->dwSize); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + value32 = 0xdeadbeef; + memset(&user_data, 0xcd, sizeof(user_data)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)user_data, sizeof(user_data), &value32); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value32 == sizeof(expect_user_data), "got %u.\n", value32); + ok(!memcmp(user_data, expect_user_data, value32), "Unexpected user data.\n"); + IMFMediaType_DeleteAllItems(media_type); + IMFMediaType_Release(media_type); }

1 0

Jinoh Kang : gitlab: Output collapsible section markers in test stage script.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: 0b0259c4767f26e17c4e337d23c24d6a37a6eb1a URL: https://gitlab.winehq.org/wine/wine/-/commit/0b0259c4767f26e17c4e337d23c24d… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Mar 21 23:58:24 2024 +0900 gitlab: Output collapsible section markers in test stage script. --- tools/gitlab/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index aaad7b31c36..4d04de64c1e 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -17,6 +17,9 @@ paths: - wine-mono-$MONO_VER-x86.msi before_script: + - | + printf '\e[0Ksection_start:%s:wine_test_prepare_env[collapsed=true]\r\e[0K' "$(date +%s)" + printf '\e[36;1mPreparing environment for Wine\e[0m\n' - export BASEDIR=$PWD - export PATH=$BASEDIR/usr/local/bin:$PATH - export DISPLAY=:0 @@ -42,6 +45,7 @@ - pulseaudio --start --exit-idle-time=-1 - wine wineboot.exe -u - wineserver -w + - printf '\e[0Ksection_end:%s:wine_test_prepare_env\r\e[0K' "$(date +%s)" test-linux-64: extends: .wine-test

1 0

Nikolay Sivov : msxml/tests: Move some of the validation tests to their modules.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: 91f3d8b0be7a81ebc2ab1f65bc5d79beffb3b397 URL: https://gitlab.winehq.org/wine/wine/-/commit/91f3d8b0be7a81ebc2ab1f65bc5d79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 22 19:18:13 2024 +0100 msxml/tests: Move some of the validation tests to their modules. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/schema.c | 158 ------------------------------- dlls/msxml4/tests/Makefile.in | 3 +- dlls/msxml4/tests/schema.c | 215 ++++++++++++++++++++++++++++++++++++++++++ dlls/msxml6/tests/Makefile.in | 3 +- dlls/msxml6/tests/schema.c | 215 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 434 insertions(+), 160 deletions(-)

1 0

Nikolay Sivov : msxml/tests: Move version-specific schema tests to corresponding modules.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: 19b7f33a6ec722f6d1c782f20cf28a693ab3226c URL: https://gitlab.winehq.org/wine/wine/-/commit/19b7f33a6ec722f6d1c782f20cf28a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 22 20:13:57 2024 +0100 msxml/tests: Move version-specific schema tests to corresponding modules. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/schema.c | 306 +-------------------------------------------- dlls/msxml4/tests/schema.c | 283 ++++++++++++++++++++++++++++++++++++++++- dlls/msxml6/tests/schema.c | 240 ++++++++++++++++++++++++++++++++++- 3 files changed, 517 insertions(+), 312 deletions(-)

1 0

Nikolay Sivov : include: Remove XMLSchemaCache60 from msxml2.idl.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: e1606d698f05d291a6b654d5c0948be8f1cfa37b URL: https://gitlab.winehq.org/wine/wine/-/commit/e1606d698f05d291a6b654d5c0948b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 22 20:35:14 2024 +0100 include: Remove XMLSchemaCache60 from msxml2.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/factory.c | 2 ++ dlls/msxml3/uuid.c | 2 ++ include/msxml2.idl | 8 -------- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 2a32b3b5b0d..e91666c6d79 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); +extern GUID CLSID_XMLSchemaCache60; + typedef HRESULT (*ClassFactoryCreateInstanceFunc)(void**); typedef HRESULT (*DOMFactoryCreateInstanceFunc)(MSXML_VERSION, void**); diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c index 4abbe5e4763..7e50b439146 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -54,3 +54,5 @@ * XMLDSOControl DSOControl * */ + +DEFINE_GUID(CLSID_XMLSchemaCache60, 0x88d96a07, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5); diff --git a/include/msxml2.idl b/include/msxml2.idl index ede4113ecbf..848bc13952a 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1750,14 +1750,6 @@ coclass XMLSchemaCache40 [default] interface IXMLDOMSchemaCollection2; } -[ - uuid(88d96a07-f192-11d4-a65f-0040963251e5) -] -coclass XMLSchemaCache60 -{ - [default] interface IXMLDOMSchemaCollection2; -} - [ helpstring("XML Schema Cache"), progid("Msxml2.XMLSchemaCache"),

1 0

Paul Gofman : ntdll: Don't use debug info presence to detect critical section global status.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: 2745228b14d138ea2c7f631c212440ecf7b8f453 URL: https://gitlab.winehq.org/wine/wine/-/commit/2745228b14d138ea2c7f631c212440… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 22 13:58:11 2024 -0600 ntdll: Don't use debug info presence to detect critical section global status. --- dlls/ntdll/sync.c | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 00ab614803f..a764d2afc09 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -163,29 +163,16 @@ static const char *crit_section_get_name( const RTL_CRITICAL_SECTION *crit ) static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) { - HANDLE ret = crit->LockSemaphore; - if (!ret) - { - HANDLE sem; - if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0; - if (!(ret = InterlockedCompareExchangePointer( &crit->LockSemaphore, sem, 0 ))) - ret = sem; - else - NtClose(sem); /* somebody beat us to it */ - } - return ret; + if ((ULONG_PTR)crit->LockSemaphore > 1) return crit->LockSemaphore; + return NULL; } static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) { LARGE_INTEGER time = {.QuadPart = timeout * (LONGLONG)-10000000}; + HANDLE sem = get_semaphore( crit ); - /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit )) - { - HANDLE sem = get_semaphore( crit ); - return NtWaitForSingleObject( sem, FALSE, &time ); - } + if (sem) return NtWaitForSingleObject( sem, FALSE, &time ); else { LONG *lock = (LONG *)&crit->LockSemaphore; @@ -276,6 +263,8 @@ ULONG WINAPI RtlSetCriticalSectionSpinCount( RTL_CRITICAL_SECTION *crit, ULONG s */ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) { + HANDLE sem; + crit->LockCount = -1; crit->RecursionCount = 0; crit->OwningThread = 0; @@ -288,11 +277,9 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) crit->DebugInfo = NULL; } } - else - { - NtClose( crit->LockSemaphore ); - crit->DebugInfo = NULL; - } + else crit->DebugInfo = NULL; + + if ((sem = get_semaphore( crit ))) NtClose( sem ); crit->LockSemaphore = 0; return STATUS_SUCCESS; } @@ -335,13 +322,9 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) { NTSTATUS ret; + HANDLE sem = get_semaphore( crit ); - /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit )) - { - HANDLE sem = get_semaphore( crit ); - ret = NtReleaseSemaphore( sem, 1, NULL ); - } + if (sem) ret = NtReleaseSemaphore( sem, 1, NULL ); else { LONG *lock = (LONG *)&crit->LockSemaphore;

1 0

Esme Povirk : user32/tests: Further updates for win11 TrackPopupMenu failures.
by Alexandre Julliard 22 Mar '24

22 Mar '24

Module: wine Branch: master Commit: 81e8513ef2a762c3a8731bddfd5b7572c685f762 URL: https://gitlab.winehq.org/wine/wine/-/commit/81e8513ef2a762c3a8731bddfd5b75… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Mar 22 20:17:06 2024 +0000 user32/tests: Further updates for win11 TrackPopupMenu failures. --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1169d82271c..473b4cfd4a1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2178,7 +2178,8 @@ static const struct message WmTrackPopupMenuMinimizeWindow[] = { { HCBT_ACTIVATE, hook|optional }, /* win11 */ { WM_NCACTIVATE, sent|optional }, /* win11 */ { WM_ACTIVATE, sent|optional }, /* win11 */ - { WM_CANCELMODE, sent }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, /* win11 */ + { WM_CANCELMODE, sent|optional }, /* not always sent on win11 */ { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc }, { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 },

1 0