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

Rémi Bernon : winex11: Create a global vulkan instance for xrandr.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 8c64979dcb2673659adacf39733e24d42b7fc01d URL: https://gitlab.winehq.org/wine/wine/-/commit/8c64979dcb2673659adacf39733e24… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 18 17:22:06 2024 +0200 winex11: Create a global vulkan instance for xrandr. --- dlls/winex11.drv/xrandr.c | 113 ++++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 55 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index edad0712927..d8e6f476cf7 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -48,9 +48,14 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #include "wine/vulkan.h" #include "wine/vulkan_driver.h" +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) + static void *xrandr_handle; -static void *vulkan_handle; -static void *(*p_vkGetInstanceProcAddr)(VkInstance, const char *); + +static VkInstance vk_instance; /* Vulkan instance for XRandR functions */ +static VkResult (*p_vkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); +static PFN_vkGetPhysicalDeviceProperties2KHR p_vkGetPhysicalDeviceProperties2KHR; +static PFN_vkEnumeratePhysicalDevices p_vkEnumeratePhysicalDevices; #define MAKE_FUNCPTR(f) static typeof(f) * p##f; MAKE_FUNCPTR(XRRConfigCurrentConfiguration) @@ -140,8 +145,31 @@ sym_not_found: #ifdef SONAME_LIBVULKAN +static void *vulkan_handle; +static void *(*p_vkGetInstanceProcAddr)(VkInstance, const char *); + static void vulkan_init_once(void) { + static const char *extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, + "VK_EXT_acquire_xlib_display", + "VK_EXT_direct_mode_display", + "VK_KHR_display", + VK_KHR_SURFACE_EXTENSION_NAME, + }; + VkInstanceCreateInfo create_info = + { + .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, + .ppEnabledExtensionNames = extensions, + .enabledExtensionCount = ARRAY_SIZE(extensions), + }; + + PFN_vkDestroyInstance p_vkDestroyInstance; + PFN_vkCreateInstance p_vkCreateInstance; + VkResult vr; + if (!(vulkan_handle = dlopen( SONAME_LIBVULKAN, RTLD_NOW ))) { ERR( "Failed to load %s\n", SONAME_LIBVULKAN ); @@ -153,12 +181,33 @@ static void vulkan_init_once(void) { \ ERR( "Failed to find " #f "\n" ); \ dlclose( vulkan_handle ); \ - vulkan_handle = NULL; \ return; \ } LOAD_FUNCPTR( vkGetInstanceProcAddr ); #undef LOAD_FUNCPTR + + p_vkCreateInstance = p_vkGetInstanceProcAddr( NULL, "vkCreateInstance" ); + if ((vr = p_vkCreateInstance( &create_info, NULL, &vk_instance ))) + { + WARN( "Failed to create a Vulkan instance, vr %d.\n", vr ); + return; + } + + p_vkDestroyInstance = p_vkGetInstanceProcAddr( vk_instance, "vkDestroyInstance" ); +#define LOAD_VK_FUNC(f) \ + if (!(p_##f = (void *)p_vkGetInstanceProcAddr( vk_instance, #f ))) \ + { \ + WARN("Failed to load " #f ".\n"); \ + p_vkDestroyInstance( vk_instance, NULL ); \ + vk_instance = NULL; \ + return; \ + } + + LOAD_VK_FUNC( vkEnumeratePhysicalDevices ) + LOAD_VK_FUNC( vkGetPhysicalDeviceProperties2KHR ) + LOAD_VK_FUNC( vkGetRandROutputDisplayEXT ) +#undef LOAD_VK_FUNC } #else /* SONAME_LIBVULKAN */ @@ -174,7 +223,7 @@ static BOOL vulkan_init(void) { static pthread_once_t init_once = PTHREAD_ONCE_INIT; pthread_once( &init_once, vulkan_init_once ); - return !!vulkan_handle; + return !!vk_instance; } static int XRandRErrorHandler(Display *dpy, XErrorEvent *event, void *arg) @@ -668,65 +717,20 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) crtc->y + crtc->height == primary.bottom; } -VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) - static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRProviderInfo *provider_info, struct x11drv_gpu *prev_gpus, int prev_gpu_count ) { - static const char *extensions[] = - { - VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, - VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, - "VK_EXT_acquire_xlib_display", - "VK_EXT_direct_mode_display", - "VK_KHR_display", - VK_KHR_SURFACE_EXTENSION_NAME, - }; - VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); - PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; - PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; uint32_t device_count, device_idx, output_idx, i; - PFN_vkDestroyInstance pvkDestroyInstance = NULL; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; - PFN_vkCreateInstance pvkCreateInstance; - VkInstanceCreateInfo create_info; VkPhysicalDeviceIDProperties id; - VkInstance vk_instance = NULL; VkDisplayKHR vk_display; BOOL ret = FALSE; VkResult vr; if (!vulkan_init()) goto done; - memset( &create_info, 0, sizeof(create_info) ); - create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - create_info.enabledExtensionCount = ARRAY_SIZE(extensions); - create_info.ppEnabledExtensionNames = extensions; - -#define LOAD_VK_FUNC(f) \ - if (!(p##f = (void *)p_vkGetInstanceProcAddr( vk_instance, #f ))) \ - { \ - WARN("Failed to load " #f ".\n"); \ - goto done; \ - } - - LOAD_VK_FUNC( vkCreateInstance ) - - vr = pvkCreateInstance( &create_info, NULL, &vk_instance ); - if (vr != VK_SUCCESS) - { - WARN( "Failed to create a Vulkan instance, vr %d.\n", vr ); - goto done; - } - - LOAD_VK_FUNC(vkEnumeratePhysicalDevices) - LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) - LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) - LOAD_VK_FUNC(vkDestroyInstance) -#undef LOAD_VK_FUNC - - vr = pvkEnumeratePhysicalDevices( vk_instance, &device_count, NULL ); + vr = p_vkEnumeratePhysicalDevices( vk_instance, &device_count, NULL ); if (vr != VK_SUCCESS || !device_count) { WARN("No Vulkan device found, vr %d, device_count %d.\n", vr, device_count); @@ -736,7 +740,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro if (!(vk_physical_devices = calloc( device_count, sizeof(*vk_physical_devices) ))) goto done; - vr = pvkEnumeratePhysicalDevices( vk_instance, &device_count, vk_physical_devices ); + vr = p_vkEnumeratePhysicalDevices( vk_instance, &device_count, vk_physical_devices ); if (vr != VK_SUCCESS) { WARN("vkEnumeratePhysicalDevices failed, vr %d.\n", vr); @@ -749,8 +753,8 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) { - vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, - provider_info->outputs[output_idx], &vk_display ); + vr = p_vkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, + provider_info->outputs[output_idx], &vk_display ); if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; @@ -759,7 +763,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; properties2.pNext = &id; - pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); + p_vkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); for (i = 0; i < prev_gpu_count; ++i) { if (!memcmp( &prev_gpus[i].vulkan_uuid, &id.deviceUUID, sizeof(id.deviceUUID) )) @@ -788,7 +792,6 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro done: free( vk_physical_devices ); - if (vk_instance && pvkDestroyInstance) pvkDestroyInstance( vk_instance, NULL ); return ret; }

1 0

Alex Henrie : ntdll: Fix handling of non-string types with RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 867af68b17c588e65fb7f53b9da70c35e4481267 URL: https://gitlab.winehq.org/wine/wine/-/commit/867af68b17c588e65fb7f53b9da70c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 19 22:09:58 2024 -0600 ntdll: Fix handling of non-string types with RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 19 ++++---- dlls/ntdll/tests/reg.c | 126 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 117 insertions(+), 28 deletions(-)

1 0

Elizabeth Figura : maintainers: Remove myself as a winegstreamer maintainer.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 85fd5e283afdca3c99d5373b2dc109b41932b339 URL: https://gitlab.winehq.org/wine/wine/-/commit/85fd5e283afdca3c99d5373b2dc109… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Jun 19 15:23:48 2024 -0500 maintainers: Remove myself as a winegstreamer maintainer. --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index d6631b1d69c..29fa77c0404 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -158,7 +158,7 @@ M: Marcus Meissner <marcus(a)jet.franken.de> F: dlls/gphoto2.ds/ GStreamer multimedia backend -M: Elizabeth Figura <zfigura(a)codeweavers.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/winegstreamer/

1 0

Ziqing Hui : mf/tests: Add tests for H264 encoder types.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 9dfc402cc34d1c0830f35dee031468b5590271b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/9dfc402cc34d1c0830f35dee031468… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 5 10:55:23 2024 +0800 mf/tests: Add tests for H264 encoder types. --- dlls/mf/tests/transform.c | 111 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 25 deletions(-)

1 0

Ziqing Hui : winegstreamer: Implement stubs for h264 encoder.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 417b4cb45331b11cb1d7dee8c4398ea36ea1c906 URL: https://gitlab.winehq.org/wine/wine/-/commit/417b4cb45331b11cb1d7dee8c4398e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 18 11:46:27 2024 +0800 winegstreamer: Implement stubs for h264 encoder. --- dlls/mf/tests/transform.c | 3 + dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/mfplat.c | 23 ++ dlls/winegstreamer/video_encoder.c | 338 +++++++++++++++++++++++++++ dlls/winegstreamer/winegstreamer_classes.idl | 6 + include/wmcodecdsp.idl | 6 + 7 files changed, 379 insertions(+)

1 0

Alexandre Julliard : ntdll: Add helper macros to define syscalls on ARM64EC.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 9f8d4d0b0a1b559a2c5dc79b73f63c0359020148 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f8d4d0b0a1b559a2c5dc79b73f63c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 15:38:36 2024 +0200 ntdll: Add helper macros to define syscalls on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 1635 +++++++------------------------------------ 1 file changed, 258 insertions(+), 1377 deletions(-)

1 0

Alexandre Julliard : ntdll: Send cross-process notification in memory functions on ARM64EC.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: b7a3023ca1ec5938b6713dc1b71bc5cbcf0096da URL: https://gitlab.winehq.org/wine/wine/-/commit/b7a3023ca1ec5938b6713dc1b71bc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 15:44:58 2024 +0200 ntdll: Send cross-process notification in memory functions on ARM64EC. Copied from the corresponding code in wow64.dll. --- dlls/ntdll/signal_arm64ec.c | 124 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 119 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 70d9884750d..2e974d389e1 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -52,6 +52,41 @@ static inline BOOL is_valid_arm64ec_frame( ULONG_PTR frame ) frame <= get_arm64ec_cpu_area()->EmulatorStackBase); } + +/********************************************************************** + * send_cross_process_notification + */ +static BOOL send_cross_process_notification( HANDLE process, UINT id, const void *addr, SIZE_T size, + int nb_args, ... ) +{ + CROSS_PROCESS_WORK_LIST *list; + CROSS_PROCESS_WORK_ENTRY *entry; + void *unused; + HANDLE section; + va_list args; + int i; + + RtlOpenCrossProcessEmulatorWorkConnection( process, &section, (void **)&list ); + if (!list) return FALSE; + if ((entry = RtlWow64PopCrossProcessWorkFromFreeList( &list->free_list ))) + { + entry->id = id; + entry->addr = (ULONG_PTR)addr; + entry->size = size; + if (nb_args) + { + va_start( args, nb_args ); + for (i = 0; i < nb_args; i++) entry->args[i] = va_arg( args, int ); + va_end( args ); + } + RtlWow64PushCrossProcessWorkOntoWorkList( &list->work_list, entry, &unused ); + } + NtUnmapViewOfSection( GetCurrentProcess(), list ); + NtClose( section ); + return TRUE; +} + + /******************************************************************* * syscalls */ @@ -84,8 +119,8 @@ DEFINE_SYSCALL(NtAlertThread, (HANDLE handle)) DEFINE_SYSCALL(NtAlertThreadByThreadId, (HANDLE tid)) DEFINE_SYSCALL(NtAllocateLocallyUniqueId, (LUID *luid)) DEFINE_SYSCALL(NtAllocateUuids, (ULARGE_INTEGER *time, ULONG *delta, ULONG *sequence, UCHAR *seed)) -DEFINE_SYSCALL(NtAllocateVirtualMemory, (HANDLE process, PVOID *ret, ULONG_PTR zero_bits, SIZE_T *size_ptr, ULONG type, ULONG protect)) -DEFINE_SYSCALL(NtAllocateVirtualMemoryEx, (HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, ULONG protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count)) +DEFINE_WRAPPED_SYSCALL(NtAllocateVirtualMemory, (HANDLE process, PVOID *ret, ULONG_PTR zero_bits, SIZE_T *size_ptr, ULONG type, ULONG protect)) +DEFINE_WRAPPED_SYSCALL(NtAllocateVirtualMemoryEx, (HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, ULONG protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count)) DEFINE_SYSCALL(NtAreMappedFilesTheSame, (PVOID addr1, PVOID addr2)) DEFINE_SYSCALL(NtAssignProcessToJobObject, (HANDLE job, HANDLE process)) DEFINE_SYSCALL(NtCallbackReturn, (void *ret_ptr, ULONG ret_len, NTSTATUS status)) @@ -141,11 +176,11 @@ DEFINE_SYSCALL(NtEnumerateValueKey, (HANDLE handle, ULONG index, KEY_VALUE_INFOR DEFINE_SYSCALL(NtFilterToken, (HANDLE token, ULONG flags, TOKEN_GROUPS *disable_sids, TOKEN_PRIVILEGES *privileges, TOKEN_GROUPS *restrict_sids, HANDLE *new_token)) DEFINE_SYSCALL(NtFindAtom, (const WCHAR *name, ULONG length, RTL_ATOM *atom)) DEFINE_SYSCALL(NtFlushBuffersFile, (HANDLE handle, IO_STATUS_BLOCK *io)) -DEFINE_SYSCALL(NtFlushInstructionCache, (HANDLE handle, const void *addr, SIZE_T size)) +DEFINE_WRAPPED_SYSCALL(NtFlushInstructionCache, (HANDLE handle, const void *addr, SIZE_T size)) DEFINE_SYSCALL(NtFlushKey, (HANDLE key)) DEFINE_SYSCALL(NtFlushProcessWriteBuffers, (void)) DEFINE_SYSCALL(NtFlushVirtualMemory, (HANDLE process, LPCVOID *addr_ptr, SIZE_T *size_ptr, ULONG unknown)) -DEFINE_SYSCALL(NtFreeVirtualMemory, (HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG type)) +DEFINE_WRAPPED_SYSCALL(NtFreeVirtualMemory, (HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG type)) DEFINE_SYSCALL(NtFsControlFile, (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size)) DEFINE_WRAPPED_SYSCALL(NtGetContextThread, (HANDLE handle, ARM64_NT_CONTEXT *context)) DEFINE_SYSCALL_(ULONG, NtGetCurrentProcessorNumber, (void)) @@ -193,7 +228,7 @@ DEFINE_SYSCALL(NtOpenThreadTokenEx, (HANDLE thread, DWORD access, BOOLEAN self, DEFINE_SYSCALL(NtOpenTimer, (HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr)) DEFINE_SYSCALL(NtPowerInformation, (POWER_INFORMATION_LEVEL level, void *input, ULONG in_size, void *output, ULONG out_size)) DEFINE_SYSCALL(NtPrivilegeCheck, (HANDLE token, PRIVILEGE_SET *privs, BOOLEAN *res)) -DEFINE_SYSCALL(NtProtectVirtualMemory, (HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG new_prot, ULONG *old_prot)) +DEFINE_WRAPPED_SYSCALL(NtProtectVirtualMemory, (HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG new_prot, ULONG *old_prot)) DEFINE_SYSCALL(NtPulseEvent, (HANDLE handle, LONG *prev_state)) DEFINE_SYSCALL(NtQueryAttributesFile, (const OBJECT_ATTRIBUTES *attr, FILE_BASIC_INFORMATION *info)) DEFINE_SYSCALL(NtQueryDefaultLocale, (BOOLEAN user, LCID *lcid)) @@ -311,6 +346,42 @@ DEFINE_SYSCALL(NtYieldExecution, (void)) DEFINE_SYSCALL(wine_nt_to_unix_file_name, (const OBJECT_ATTRIBUTES *attr, char *nameA, ULONG *size, UINT disposition)) DEFINE_SYSCALL(wine_unix_to_nt_file_name, (const char *name, WCHAR *buffer, ULONG *size)) +NTSTATUS SYSCALL_API NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR zero_bits, + SIZE_T *size_ptr, ULONG type, ULONG protect ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (!*ret && (type & MEM_COMMIT)) type |= MEM_RESERVE; + + if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualAlloc, + *ret, *size_ptr, 3, type, protect, 0 ); + + status = syscall_NtAllocateVirtualMemory( process, ret, zero_bits, size_ptr, type, protect ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualAlloc, + *ret, *size_ptr, 3, type, protect, status ); + return status; +} + +NTSTATUS SYSCALL_API NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (!*ret && (type & MEM_COMMIT)) type |= MEM_RESERVE; + + if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualAlloc, + *ret, *size_ptr, 3, type, protect, 0 ); + + status = syscall_NtAllocateVirtualMemoryEx( process, ret, size_ptr, type, protect, parameters, count ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualAlloc, + *ret, *size_ptr, 3, type, protect, status ); + return status; +} + NTSTATUS SYSCALL_API NtContinue( CONTEXT *context, BOOLEAN alertable ) { ARM64_NT_CONTEXT arm_ctx; @@ -319,6 +390,33 @@ NTSTATUS SYSCALL_API NtContinue( CONTEXT *context, BOOLEAN alertable ) return syscall_NtContinue( &arm_ctx, alertable ); } +NTSTATUS SYSCALL_API NtFlushInstructionCache( HANDLE process, const void *addr, SIZE_T size ) +{ + NTSTATUS status = syscall_NtFlushInstructionCache( process, addr, size ); + + if (!status) + { + if (!RtlIsCurrentProcess( process )) + send_cross_process_notification( process, CrossProcessFlushCache, addr, size, 0 ); + } + return status; +} + +NTSTATUS SYSCALL_API NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG type ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualFree, + *addr_ptr, *size_ptr, 2, type, 0 ); + + status = syscall_NtFreeVirtualMemory( process, addr_ptr, size_ptr, type ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualFree, + *addr_ptr, *size_ptr, 2, type, status ); + return status; +} + NTSTATUS SYSCALL_API NtGetContextThread( HANDLE handle, CONTEXT *context ) { ARM64_NT_CONTEXT arm_ctx = { .ContextFlags = ctx_flags_x64_to_arm( context->ContextFlags ) }; @@ -328,6 +426,22 @@ NTSTATUS SYSCALL_API NtGetContextThread( HANDLE handle, CONTEXT *context ) return status; } +NTSTATUS SYSCALL_API NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, + ULONG new_prot, ULONG *old_prot ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualProtect, + *addr_ptr, *size_ptr, 2, new_prot, 0 ); + + status = syscall_NtProtectVirtualMemory( process, addr_ptr, size_ptr, new_prot, old_prot ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualProtect, + *addr_ptr, *size_ptr, 2, new_prot, status ); + return status; +} + NTSTATUS SYSCALL_API NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { ARM64_NT_CONTEXT arm_ctx;

1 0

Alexandre Julliard : ntdll: Fix the fake 32-bit %cs value on ARM64EC.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 0d5936563dae36c8accbf995fbd4632b974c8763 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d5936563dae36c8accbf995fbd463… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 16:17:01 2024 +0200 ntdll: Fix the fake 32-bit %cs value on ARM64EC. --- dlls/ntdll/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 102e0c930a9..16bc445b7f9 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -249,7 +249,7 @@ NTSTATUS WINAPI RtlWow64GetThreadSelectorEntry( HANDLE handle, THREAD_DESCRIPTOR { /* hardcoded values */ #ifdef __arm64ec__ - context.SegCs = 0x33; + context.SegCs = 0x23; context.SegSs = 0x2b; context.SegFs = 0x53; #elif defined(__x86_64__)

1 0

Alexandre Julliard : ntdll: Don't set the TEB ExceptionList to -1 on 64-bit.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 6e82d33eb70d88a72eed03c2fc99ff4402a50a54 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e82d33eb70d88a72eed03c2fc99ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 16:23:25 2024 +0200 ntdll: Don't set the TEB ExceptionList to -1 on 64-bit. The tests show that it should be zero. --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 4b23d9954df..3981905bcd3 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3621,6 +3621,7 @@ static TEB *init_teb( void *ptr, BOOL is_wow ) if (is_wow) teb64->WowTebOffset = teb_offset; #else teb = (TEB *)teb32; + teb32->Tib.ExceptionList = ~0u; teb64->Peb = PtrToUlong( (char *)peb - page_size ); teb64->Tib.Self = PtrToUlong( teb64 ); teb64->Tib.ExceptionList = PtrToUlong( teb32 ); @@ -3639,7 +3640,6 @@ static TEB *init_teb( void *ptr, BOOL is_wow ) #endif teb->Peb = peb; teb->Tib.Self = &teb->Tib; - teb->Tib.ExceptionList = (void *)~0ul; teb->Tib.StackBase = (void *)~0ul; teb->ActivationContextStackPointer = &teb->ActivationContextStack; InitializeListHead( &teb->ActivationContextStack.FrameListCache );

1 0

Eric Pouech : cmd: Split parsing from executing FOR loops for file walking.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 0ca28d3a70dd17eccc5d9868789fd1c5bf7e2394 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ca28d3a70dd17eccc5d9868789fd1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 14 17:39:40 2024 +0200 cmd: Split parsing from executing FOR loops for file walking. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 6 +-- programs/cmd/wcmd.h | 12 ++++- programs/cmd/wcmdmain.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 151 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 86248231363..82ba8088b02 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -153,7 +153,7 @@ static struct {' ',' '} }; -static DIRECTORY_STACK *WCMD_dir_stack_create(const WCHAR *dir, const WCHAR *file) +DIRECTORY_STACK *WCMD_dir_stack_create(const WCHAR *dir, const WCHAR *file) { DIRECTORY_STACK *new = xalloc(sizeof(DIRECTORY_STACK)); @@ -177,7 +177,7 @@ static DIRECTORY_STACK *WCMD_dir_stack_create(const WCHAR *dir, const WCHAR *fil return new; } -static DIRECTORY_STACK *WCMD_dir_stack_free(DIRECTORY_STACK *dir) +DIRECTORY_STACK *WCMD_dir_stack_free(DIRECTORY_STACK *dir) { DIRECTORY_STACK *next; @@ -1790,7 +1790,7 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, * processed, and any other directory still to be processed, mimicking what * Windows does */ -static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) +void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { DIRECTORY_STACK *remainingDirs = dirsToWalk; WCHAR fullitem[MAX_PATH]; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c1a95c6223c..fd2b541c830 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -83,16 +83,20 @@ typedef struct _CMD_IF_CONDITION }; } CMD_IF_CONDITION; +#define CMD_FOR_FLAG_TREE_RECURSE (1u << 0) +#define CMD_FOR_FLAG_TREE_INCLUDE_FILES (1u << 1) +#define CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES (1u << 2) + typedef struct _CMD_FOR_CONTROL { - enum for_control_operator { - CMD_FOR_FILE_SET /* /F */, + enum for_control_operator {CMD_FOR_FILETREE, CMD_FOR_FILE_SET /* /F */, CMD_FOR_NUMBERS /* /L */} operator; unsigned flags; /* |-ed CMD_FOR_FLAG_* */ int variable_index; const WCHAR *set; union { + const WCHAR *root_dir; /* for CMD_FOR_FILETREE */ struct /* for CMD_FOR_FILE_SET */ { WCHAR eol; @@ -164,6 +168,10 @@ int WCMD_for_nexttoken(int lasttoken, const WCHAR *tokenstr, BOOL *duplicates); void WCMD_part_execute(CMD_NODE **cmdList, const WCHAR *firstcmd, BOOL isIF, BOOL executecmds); +struct _DIRECTORY_STACK; +void WCMD_add_dirstowalk(struct _DIRECTORY_STACK *dirsToWalk); +struct _DIRECTORY_STACK *WCMD_dir_stack_create(const WCHAR *dir, const WCHAR *file); +struct _DIRECTORY_STACK *WCMD_dir_stack_free(struct _DIRECTORY_STACK *dir); void WCMD_assoc (const WCHAR *, BOOL); void WCMD_batch (WCHAR *, WCHAR *, BOOL, WCHAR *, HANDLE); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 9bce77b19df..ec71e760348 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1000,6 +1000,9 @@ void for_control_dispose(CMD_FOR_CONTROL *for_ctrl) free((void*)for_ctrl->delims); free((void*)for_ctrl->tokens); break; + case CMD_FOR_FILETREE: + free((void*)for_ctrl->root_dir); + break; default: break; } @@ -1007,7 +1010,7 @@ void for_control_dispose(CMD_FOR_CONTROL *for_ctrl) const char *debugstr_for_control(const CMD_FOR_CONTROL *for_ctrl) { - static const char* for_ctrl_strings[] = {"file", "numbers"}; + static const char* for_ctrl_strings[] = {"tree", "file", "numbers"}; const char *flags, *options; if (for_ctrl->operator >= ARRAY_SIZE(for_ctrl_strings)) @@ -1016,9 +1019,18 @@ const char *debugstr_for_control(const CMD_FOR_CONTROL *for_ctrl) return wine_dbg_sprintf("<<%u>>", for_ctrl->operator); } - flags = ""; + if (for_ctrl->flags) + flags = wine_dbg_sprintf("flags=%s%s%s ", + (for_ctrl->flags & CMD_FOR_FLAG_TREE_RECURSE) ? "~recurse" : "", + (for_ctrl->flags & CMD_FOR_FLAG_TREE_INCLUDE_FILES) ? "~+files" : "", + (for_ctrl->flags & CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES) ? "~+dirs" : ""); + else + flags = ""; switch (for_ctrl->operator) { + case CMD_FOR_FILETREE: + options = wine_dbg_sprintf("root=(%ls) ", for_ctrl->root_dir); + break; case CMD_FOR_FILE_SET: { WCHAR eol_buf[4] = {L'\'', for_ctrl->eol, L'\'', L'\0'}; @@ -1045,6 +1057,9 @@ void for_control_create(enum for_control_operator for_op, unsigned flags, const for_ctrl->set = NULL; switch (for_ctrl->operator) { + case CMD_FOR_FILETREE: + for_ctrl->root_dir = options && *options ? xstrdupW(options) : NULL; + break; default: break; } @@ -2239,6 +2254,22 @@ CMD_FOR_CONTROL *for_control_parse(WCHAR *opts_var) } switch (mode) { + case L' ': + for_op = CMD_FOR_FILETREE; + flags = CMD_FOR_FLAG_TREE_INCLUDE_FILES; + break; + case L'D': + for_op = CMD_FOR_FILETREE; + flags = CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES; + break; + case L'X': + for_op = CMD_FOR_FILETREE; + flags = CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES | CMD_FOR_FLAG_TREE_RECURSE; + break; + case L'R': + for_op = CMD_FOR_FILETREE; + flags = CMD_FOR_FLAG_TREE_INCLUDE_FILES | /*CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES | */CMD_FOR_FLAG_TREE_RECURSE; + break; case L'L': for_op = CMD_FOR_NUMBERS; break; @@ -2249,7 +2280,7 @@ CMD_FOR_CONTROL *for_control_parse(WCHAR *opts_var) return NULL; } - if (mode == L'F') + if (mode == L'F' || mode == L'R') { /* Retrieve next parameter to see if is root/options (raw form required * with for /f, or unquoted in for /r) @@ -3205,6 +3236,104 @@ static CMD_NODE *for_control_execute_fileset(CMD_FOR_CONTROL *for_ctrl, CMD_NODE return body; } +static CMD_NODE *for_control_execute_set(CMD_FOR_CONTROL *for_ctrl, const WCHAR *from_dir, size_t ref_len, CMD_NODE *cmdList) +{ + CMD_NODE *body = NULL; + size_t len; + WCHAR set[MAXSTRING]; + WCHAR buffer[MAX_PATH]; + int i; + + if (from_dir) + { + len = wcslen(from_dir) + 1; + if (len >= ARRAY_SIZE(buffer)) return NULL; + wcscpy(buffer, from_dir); + wcscat(buffer, L"\\"); + } + else + len = 0; + + wcscpy(set, for_ctrl->set); + for (i = 0; ; i++) + { + WCHAR *element = WCMD_parameter(set, i, NULL, TRUE, FALSE); + if (!element || !*element) break; + if (len + wcslen(element) + 1 >= ARRAY_SIZE(buffer)) continue; + + wcscpy(&buffer[len], element); + + TRACE("Doing set element %ls\n", buffer); + + if (wcspbrk(element, L"?*")) + { + WIN32_FIND_DATAW fd; + HANDLE hff = FindFirstFileW(buffer, &fd); + size_t insert_pos = (wcsrchr(buffer, L'\\') ? wcsrchr(buffer, L'\\') + 1 - buffer : 0); + + if (hff == INVALID_HANDLE_VALUE) + { + TRACE("Couldn't FindFirstFile on %ls\n", buffer); + continue; + } + do + { + TRACE("Considering %ls\n", fd.cFileName); + if (!lstrcmpW(fd.cFileName, L"..") || !lstrcmpW(fd.cFileName, L".")) continue; + if (!(for_ctrl->flags & CMD_FOR_FLAG_TREE_INCLUDE_FILES) && + !(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + if (!(for_ctrl->flags & CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES) && + (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + + if (insert_pos + wcslen(fd.cFileName) + 1 >= ARRAY_SIZE(buffer)) continue; + wcscpy(&buffer[insert_pos], fd.cFileName); + + body = cmdList; + WCMD_set_for_loop_variable(for_ctrl->variable_index, buffer); + WCMD_part_execute(&body, CMD_node_get_command(body)->command + 3, FALSE, TRUE); + } while (FindNextFileW(hff, &fd) != 0); + FindClose(hff); + } + else + { + body = cmdList; + WCMD_set_for_loop_variable(for_ctrl->variable_index, buffer); + WCMD_part_execute(&body, CMD_node_get_command(body)->command + 3, FALSE, TRUE); + } + } + return body; +} + +static CMD_NODE *for_control_execute_walk_files(CMD_FOR_CONTROL *for_ctrl, CMD_NODE *cmdList) +{ + DIRECTORY_STACK *dirs_to_walk; + size_t ref_len; + CMD_NODE *body = NULL; + + if (for_ctrl->root_dir) + { + dirs_to_walk = WCMD_dir_stack_create(for_ctrl->root_dir, NULL); + } + else dirs_to_walk = WCMD_dir_stack_create(NULL, NULL); + ref_len = wcslen(dirs_to_walk->dirName); + + while (dirs_to_walk) + { + TRACE("About to walk %p %ls for %s\n", dirs_to_walk, dirs_to_walk->dirName, debugstr_for_control(for_ctrl)); + if (for_ctrl->flags & CMD_FOR_FLAG_TREE_RECURSE) + WCMD_add_dirstowalk(dirs_to_walk); + + body = for_control_execute_set(for_ctrl, dirs_to_walk->dirName, ref_len, cmdList); + /* If we are walking directories, move on to any which remain */ + dirs_to_walk = WCMD_dir_stack_free(dirs_to_walk); + } + TRACE("Finished all directories.\n"); + + return body; +} + static CMD_NODE *for_control_execute_numbers(CMD_FOR_CONTROL *for_ctrl, CMD_NODE *cmdList) { WCHAR set[MAXSTRING]; @@ -3250,6 +3379,12 @@ void for_control_execute(CMD_FOR_CONTROL *for_ctrl, CMD_NODE **cmdList) switch (for_ctrl->operator) { + case CMD_FOR_FILETREE: + if (for_ctrl->flags & CMD_FOR_FLAG_TREE_RECURSE) + last = for_control_execute_walk_files(for_ctrl, *cmdList); + else + last = for_control_execute_set(for_ctrl, NULL, 0, *cmdList); + break; case CMD_FOR_FILE_SET: last = for_control_execute_fileset(for_ctrl, *cmdList); break;

1 0