November 2023 - Wine-Commits

Alexandros Frantzis : winewayland.drv: Implement vkCreateWin32SurfaceKHR.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: b6e9e8deda5d9ef3cccc81211fdd06a9fc41aeab URL: https://gitlab.winehq.org/wine/wine/-/commit/b6e9e8deda5d9ef3cccc81211fdd06… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Sep 15 19:08:53 2021 +0300 winewayland.drv: Implement vkCreateWin32SurfaceKHR. Create Win32 VkSurfaceKHR objects which are backed by native Wayland VkSurfaceKHR objects. For now we associate a dummy Wayland surface with the VkSurfaceKHR. --- dlls/winewayland.drv/vulkan.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index d22b8401422..15e5edf503b 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -40,7 +40,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN +#define VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR 1000006000 + +typedef struct VkWaylandSurfaceCreateInfoKHR +{ + VkStructureType sType; + const void *pNext; + VkWaylandSurfaceCreateFlagsKHR flags; + struct wl_display *display; + struct wl_surface *surface; +} VkWaylandSurfaceCreateInfoKHR; + static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); +static VkResult (*pvkCreateWaylandSurfaceKHR)(VkInstance, const VkWaylandSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); @@ -49,6 +61,23 @@ static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); static void *vulkan_handle; static const struct vulkan_funcs vulkan_funcs; +struct wine_vk_surface +{ + struct wl_surface *client; + VkSurfaceKHR native; +}; + +static struct wine_vk_surface *wine_vk_surface_from_handle(VkSurfaceKHR handle) +{ + return (struct wine_vk_surface *)(uintptr_t)handle; +} + +static void wine_vk_surface_destroy(struct wine_vk_surface *wine_vk_surface) +{ + if (wine_vk_surface->client) wl_surface_destroy(wine_vk_surface->client); + free(wine_vk_surface); +} + /* Helper function for converting between win32 and Wayland compatible VkInstanceCreateInfo. * Caller is responsible for allocation and cleanup of 'dst'. */ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, @@ -92,6 +121,14 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo return VK_SUCCESS; } +static const char *wine_vk_native_fn_name(const char *name) +{ + if (!strcmp(name, "vkCreateWin32SurfaceKHR")) + return "vkCreateWaylandSurfaceKHR"; + + return name; +} + static VkResult wayland_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) @@ -120,6 +157,62 @@ static VkResult wayland_vkCreateInstance(const VkInstanceCreateInfo *create_info return res; } +static VkResult wayland_vkCreateWin32SurfaceKHR(VkInstance instance, + const VkWin32SurfaceCreateInfoKHR *create_info, + const VkAllocationCallbacks *allocator, + VkSurfaceKHR *vk_surface) +{ + VkResult res; + VkWaylandSurfaceCreateInfoKHR create_info_host; + struct wine_vk_surface *wine_vk_surface; + + TRACE("%p %p %p %p\n", instance, create_info, allocator, vk_surface); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + wine_vk_surface = calloc(1, sizeof(*wine_vk_surface)); + if (!wine_vk_surface) + { + ERR("Failed to allocate memory for wayland vulkan surface\n"); + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + wine_vk_surface->client = wl_compositor_create_surface(process_wayland.wl_compositor); + if (!wine_vk_surface->client) + { + ERR("Failed to create client surface for hwnd=%p\n", create_info->hwnd); + /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + create_info_host.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR; + create_info_host.pNext = NULL; + create_info_host.flags = 0; /* reserved */ + create_info_host.display = process_wayland.wl_display; + create_info_host.surface = wine_vk_surface->client; + + res = pvkCreateWaylandSurfaceKHR(instance, &create_info_host, + NULL /* allocator */, + &wine_vk_surface->native); + if (res != VK_SUCCESS) + { + ERR("Failed to create vulkan wayland surface, res=%d\n", res); + goto err; + } + + *vk_surface = (uintptr_t)wine_vk_surface; + + TRACE("Created surface=0x%s\n", wine_dbgstr_longlong(*vk_surface)); + return VK_SUCCESS; + +err: + if (wine_vk_surface) wine_vk_surface_destroy(wine_vk_surface); + return res; +} + static void wayland_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *allocator) { @@ -179,6 +272,11 @@ static void *wayland_vkGetDeviceProcAddr(VkDevice device, const char *name) TRACE("%p, %s\n", device, debugstr_a(name)); + /* Do not return the driver function if the corresponding native function + * is not available. */ + if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = get_vulkan_driver_device_proc_addr(&vulkan_funcs, name))) return proc_addr; @@ -191,12 +289,22 @@ static void *wayland_vkGetInstanceProcAddr(VkInstance instance, const char *name TRACE("%p, %s\n", instance, debugstr_a(name)); + /* Do not return the driver function if the corresponding native function + * is not available. */ + if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name))) return proc_addr; return pvkGetInstanceProcAddr(instance, name); } +static VkSurfaceKHR wayland_wine_get_native_surface(VkSurfaceKHR surface) +{ + return wine_vk_surface_from_handle(surface)->native; +} + static void wine_vk_init(void) { if (!(vulkan_handle = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) @@ -207,6 +315,7 @@ static void wine_vk_init(void) #define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) goto fail LOAD_FUNCPTR(vkCreateInstance); + LOAD_FUNCPTR(vkCreateWaylandSurfaceKHR); LOAD_FUNCPTR(vkDestroyInstance); LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties); LOAD_FUNCPTR(vkGetDeviceProcAddr); @@ -223,10 +332,12 @@ fail: static const struct vulkan_funcs vulkan_funcs = { .p_vkCreateInstance = wayland_vkCreateInstance, + .p_vkCreateWin32SurfaceKHR = wayland_vkCreateWin32SurfaceKHR, .p_vkDestroyInstance = wayland_vkDestroyInstance, .p_vkEnumerateInstanceExtensionProperties = wayland_vkEnumerateInstanceExtensionProperties, .p_vkGetDeviceProcAddr = wayland_vkGetDeviceProcAddr, .p_vkGetInstanceProcAddr = wayland_vkGetInstanceProcAddr, + .p_wine_get_native_surface = wayland_wine_get_native_surface, }; /**********************************************************************

1 0

Alexandre Julliard : winebuild: Stop generating the syscall argument array and related data.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: e9afc9bf8f9643f27b81345123da592f352e1318 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9afc9bf8f9643f27b81345123da59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 10:16:21 2023 +0100 winebuild: Stop generating the syscall argument array and related data. --- dlls/ntdll/loader.c | 1 + dlls/win32u/main.c | 2 +- tools/winebuild/import.c | 9 --------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 89756c57433..4bc7e66d76b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -80,6 +80,7 @@ static DWORD (WINAPI *pCtrlRoutine)(void *); SYSTEM_DLL_INIT_BLOCK LdrSystemDllInitBlock = { 0xf0 }; +void *__wine_syscall_dispatcher = NULL; unixlib_handle_t __wine_unixlib_handle = 0; /* windows directory */ diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index e074186cd90..d650483fb99 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -27,7 +27,7 @@ #include "ntgdi.h" #include "wine/unixlib.h" -extern void *__wine_syscall_dispatcher DECLSPEC_HIDDEN; +void *__wine_syscall_dispatcher = NULL; static unixlib_handle_t win32u_handle; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c3a1dad4452..e3bb8b7f3db 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1519,15 +1519,6 @@ void output_syscalls( DLLSPEC *spec ) default: break; } - output( "\t.data\n" ); - output( "\t.balign %u\n", get_ptr_size() ); - output( "%s\n", asm_globl("__wine_syscall_dispatcher") ); - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* dispatcher */ - output( "\t.long 0xca110001\n" ); /* version */ - output( "\t.short %u\n", spec->syscall_table ); /* id */ - output( "\t.short %u\n", count ); /* limit */ - for (i = 0; i < count; i++) output( "\t.short %u\n", syscalls[i]->hint ); - for (i = 0; i < count; i++) output( "\t.byte %u\n", get_args_size( syscalls[i] )); }

1 0

Alexandre Julliard : win32u: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 909e2b952a82b6d0248bf5df1dd4b9dbd7e4130d URL: https://gitlab.winehq.org/wine/wine/-/commit/909e2b952a82b6d0248bf5df1dd4b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 10:20:54 2023 +0100 win32u: Remove DECLSPEC_HIDDEN usage. --- dlls/win32u/dibdrv/dibdrv.h | 114 ++++++------- dlls/win32u/font.c | 2 +- dlls/win32u/imm.c | 4 +- dlls/win32u/ntgdi_private.h | 230 +++++++++++++------------- dlls/win32u/ntuser_private.h | 66 ++++---- dlls/win32u/win32u_private.h | 376 +++++++++++++++++++++---------------------- 6 files changed, 396 insertions(+), 396 deletions(-)

1 0

Alexandre Julliard : ntdll: Build the syscall argument array from the generated syscall list.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 1693784169d43ee2978066cf276168869a55866d URL: https://gitlab.winehq.org/wine/wine/-/commit/1693784169d43ee2978066cf276168… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 09:55:27 2023 +0100 ntdll: Build the syscall argument array from the generated syscall list. --- dlls/ntdll/unix/loader.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 42b5aa9d84e..c5ffbf1eb0a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -115,8 +115,6 @@ void *pRtlUserThreadStart = NULL; void *p__wine_ctrl_routine = NULL; SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; -static void *p__wine_syscall_dispatcher; - static void * const syscalls[] = { #define SYSCALL_ENTRY(id,name,args) name, @@ -128,9 +126,21 @@ static void * const syscalls[] = #undef SYSCALL_ENTRY }; -static BYTE syscall_args[ARRAY_SIZE(syscalls)]; +static BYTE syscall_args[ARRAY_SIZE(syscalls)] = +{ +#define SYSCALL_ENTRY(id,name,args) args, +#ifdef _WIN64 + ALL_SYSCALLS64 +#else + ALL_SYSCALLS32 +#endif +#undef SYSCALL_ENTRY +}; -SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; +SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4] = +{ + { (ULONG_PTR *)syscalls, NULL, ARRAY_SIZE(syscalls), syscall_args } +}; #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); @@ -1518,6 +1528,7 @@ NTSTATUS load_start_exe( WCHAR **image, void **module ) */ static void load_ntdll_functions( HMODULE module ) { + void **p__wine_syscall_dispatcher; void **p__wine_unix_call_dispatcher; unixlib_handle_t *p__wine_unixlib_handle; const IMAGE_EXPORT_DIRECTORY *exports; @@ -1541,6 +1552,7 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( __wine_syscall_dispatcher ); GET_FUNC( __wine_unix_call_dispatcher ); GET_FUNC( __wine_unixlib_handle ); + *p__wine_syscall_dispatcher = __wine_syscall_dispatcher; *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; *p__wine_unixlib_handle = (UINT_PTR)unix_call_funcs; #undef GET_FUNC @@ -1804,7 +1816,6 @@ static ULONG_PTR get_image_address(void) */ static void start_main_thread(void) { - SYSTEM_SERVICE_TABLE syscall_table = { (ULONG_PTR *)syscalls, NULL, ARRAY_SIZE(syscalls), syscall_args }; TEB *teb = virtual_alloc_first_teb(); signal_init_threading(); @@ -1822,7 +1833,6 @@ static void start_main_thread(void) load_ntdll(); load_wow64_ntdll( main_image_info.Machine ); load_apiset_dll(); - ntdll_init_syscalls( &syscall_table, p__wine_syscall_dispatcher ); server_init_process_done(); }

1 0

Alexandre Julliard : win32u: Store the service table entry directly into the ntdll variable.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 92b6ab2d6e2af1f70966fa4631cae2789d052730 URL: https://gitlab.winehq.org/wine/wine/-/commit/92b6ab2d6e2af1f70966fa4631cae2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 09:57:56 2023 +0100 win32u: Store the service table entry directly into the ntdll variable. --- dlls/ntdll/unix/loader.c | 31 ------------------------------- dlls/win32u/main.c | 2 +- dlls/win32u/syscall.c | 7 ++++--- include/wine/unixlib.h | 2 +- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index fa38cea0615..aa120ae38ec 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -919,37 +919,6 @@ static NTSTATUS dlopen_dll( const char *so_name, UNICODE_STRING *nt_name, void * } -/*********************************************************************** - * ntdll_init_syscalls - */ -NTSTATUS ntdll_init_syscalls( SYSTEM_SERVICE_TABLE *table, void **dispatcher ) -{ - struct syscall_info - { - void *dispatcher; - UINT version; - USHORT id; - USHORT limit; - /* USHORT names[limit]; */ - /* BYTE args[limit]; */ - } *info = (struct syscall_info *)dispatcher; - - if (info->version != 0xca110001) - { - ERR( "invalid syscall table version %x\n", info->version ); - NtTerminateProcess( GetCurrentProcess(), STATUS_INVALID_PARAMETER ); - } - if (info->limit != table->ServiceLimit) - { - ERR( "syscall count mismatch %u / %lu\n", info->limit, table->ServiceLimit ); - NtTerminateProcess( GetCurrentProcess(), STATUS_INVALID_PARAMETER ); - } - info->dispatcher = __wine_syscall_dispatcher; - KeServiceDescriptorTable[info->id] = *table; - return STATUS_SUCCESS; -} - - /*********************************************************************** * load_so_dll */ diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index fa75ad4f5c5..e074186cd90 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -61,7 +61,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) __wine_syscall_dispatcher = *dispatcher_ptr; if (!NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, &win32u_handle, sizeof(win32u_handle), NULL )) - __wine_unix_call( win32u_handle, 0, &__wine_syscall_dispatcher ); + __wine_unix_call( win32u_handle, 0, NULL ); break; } return TRUE; diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index b741df91c66..2320ac18744 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -58,7 +58,7 @@ static BYTE arguments[ARRAY_SIZE(syscalls)] = #undef SYSCALL_ENTRY }; -static SYSTEM_SERVICE_TABLE syscall_table = +static const SYSTEM_SERVICE_TABLE syscall_table = { (ULONG_PTR *)syscalls, 0, @@ -66,7 +66,7 @@ static SYSTEM_SERVICE_TABLE syscall_table = arguments }; -static NTSTATUS init( void *dispatcher ) +static NTSTATUS init( void *args ) { #ifdef _WIN64 if (NtCurrentTeb()->WowTebOffset) @@ -78,7 +78,8 @@ static NTSTATUS init( void *dispatcher ) } #endif - return ntdll_init_syscalls( &syscall_table, dispatcher ); + KeServiceDescriptorTable[1] = syscall_table; + return STATUS_SUCCESS; } const unixlib_entry_t __wine_unix_call_funcs[] = diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 81c59e732ba..2a615179e64 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -31,6 +31,7 @@ typedef NTSTATUS (*unixlib_entry_t)( void *args ); extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_funcs[]; extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_wow64_funcs[]; +extern DECLSPEC_EXPORT SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; /* some useful helpers from ntdll */ NTSYSAPI const char *ntdll_get_build_dir(void); @@ -39,7 +40,6 @@ NTSYSAPI DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD NTSYSAPI int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ); NTSYSAPI int ntdll_wcsicmp( const WCHAR *str1, const WCHAR *str2 ); NTSYSAPI int ntdll_wcsnicmp( const WCHAR *str1, const WCHAR *str2, int n ); -NTSYSAPI NTSTATUS ntdll_init_syscalls( SYSTEM_SERVICE_TABLE *table, void **dispatcher ); /* exception handling */

1 0

Alexandre Julliard : win32u: Build the syscall argument array from the generated syscall list.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: c8ecc35966f7a640050d12ccf7676a40cd1ae9d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8ecc35966f7a640050d12ccf7676a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 09:57:14 2023 +0100 win32u: Build the syscall argument array from the generated syscall list. --- dlls/ntdll/unix/loader.c | 1 - dlls/win32u/syscall.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c5ffbf1eb0a..fa38cea0615 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -945,7 +945,6 @@ NTSTATUS ntdll_init_syscalls( SYSTEM_SERVICE_TABLE *table, void **dispatcher ) NtTerminateProcess( GetCurrentProcess(), STATUS_INVALID_PARAMETER ); } info->dispatcher = __wine_syscall_dispatcher; - memcpy( table->ArgumentTable, (USHORT *)(info + 1) + info->limit, table->ServiceLimit ); KeServiceDescriptorTable[info->id] = *table; return STATUS_SUCCESS; } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 64bba9fbf99..b741df91c66 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -47,7 +47,16 @@ static void * const syscalls[] = #undef SYSCALL_ENTRY }; -static BYTE arguments[ARRAY_SIZE(syscalls)]; +static BYTE arguments[ARRAY_SIZE(syscalls)] = +{ +#define SYSCALL_ENTRY(id,name,args) args, +#ifdef _WIN64 + ALL_SYSCALLS64 +#else + ALL_SYSCALLS32 +#endif +#undef SYSCALL_ENTRY +}; static SYSTEM_SERVICE_TABLE syscall_table = {

1 0

Alexandre Julliard : win32u: Set the syscall dispatcher on the PE side.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: f799f6f47172e5feed9e1541979e6515a0e5d0b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/f799f6f47172e5feed9e1541979e65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 09:56:37 2023 +0100 win32u: Set the syscall dispatcher on the PE side. --- dlls/win32u/main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index d2cd039b701..fa75ad4f5c5 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -47,11 +47,18 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { + HMODULE ntdll; + void **dispatcher_ptr; + const UNICODE_STRING ntdll_name = RTL_CONSTANT_STRING( L"ntdll.dll" ); + switch (reason) { case DLL_PROCESS_ATTACH: LdrDisableThreadCalloutsForDll( inst ); if (__wine_syscall_dispatcher) break; /* already set through Wow64Transition */ + LdrGetDllHandle( NULL, 0, &ntdll_name, &ntdll ); + dispatcher_ptr = RtlFindExportedRoutineByName( ntdll, "__wine_syscall_dispatcher" ); + __wine_syscall_dispatcher = *dispatcher_ptr; if (!NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, &win32u_handle, sizeof(win32u_handle), NULL )) __wine_unix_call( win32u_handle, 0, &__wine_syscall_dispatcher );

1 0

Alexandre Julliard : wow64: Build the syscall argument array from the generated list.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 85dbc0466f2c40f25e6734083cbca7511200bf38 URL: https://gitlab.winehq.org/wine/wine/-/commit/85dbc0466f2c40f25e6734083cbca7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 10:00:48 2023 +0100 wow64: Build the syscall argument array from the generated list. --- dlls/wow64/syscall.c | 102 ++++-------------------------------------------- dlls/wow64win/syscall.c | 10 ++--- 2 files changed, 12 insertions(+), 100 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 11d2bebfae2..764f5fb2c05 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -49,22 +49,18 @@ static const syscall_thunk syscall_thunks[] = #undef SYSCALL_ENTRY }; -static const char *syscall_names[] = +static BYTE syscall_args[ARRAY_SIZE(syscall_thunks)] = { -#define SYSCALL_ENTRY(id,name,args) #name, +#define SYSCALL_ENTRY(id,name,args) args, ALL_SYSCALLS32 #undef SYSCALL_ENTRY }; -static const SYSTEM_SERVICE_TABLE ntdll_syscall_table = +static SYSTEM_SERVICE_TABLE syscall_tables[4] = { - (ULONG_PTR *)syscall_thunks, - (ULONG_PTR *)syscall_names, - ARRAY_SIZE(syscall_thunks) + { (ULONG_PTR *)syscall_thunks, NULL, ARRAY_SIZE(syscall_thunks), syscall_args } }; -static SYSTEM_SERVICE_TABLE syscall_tables[4]; - /* header for Wow64AllocTemp blocks; probably not the right layout */ struct mem_header { @@ -94,9 +90,6 @@ struct user_apc_frame SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; -/* wow64win syscall table */ -static const SYSTEM_SERVICE_TABLE *psdwhwin32; -static HMODULE win32u_module; static WOW64INFO *wow64info; /* cpu backend dll functions */ @@ -643,81 +636,6 @@ NTSTATUS WINAPI wow64_NtWow64IsProcessorFeaturePresent( UINT *args ) } -/********************************************************************** - * get_rva - */ -static void *get_rva( HMODULE module, DWORD rva ) -{ - return (void *)((char *)module + rva); -} - - -/********************************************************************** - * init_syscall_table - */ -static void init_syscall_table( HMODULE module, void *dispatcher, const SYSTEM_SERVICE_TABLE *orig_table ) -{ - static syscall_thunk thunks[2048]; - static ULONG start_pos; - - struct syscall_info32 - { - UINT dispatcher; - UINT version; - USHORT id; - USHORT limit; - /* USHORT names[limit]; */ - /* BYTE args[limit]; */ - } *info = dispatcher; - - const USHORT *name_ptrs = (const USHORT *)(info + 1); - const IMAGE_EXPORT_DIRECTORY *exports; - const ULONG *names; - ULONG id, exp_size, wrap_pos; - const char **syscall_names = (const char **)orig_table->CounterTable; - - if (info->version != 0xca110001) - { - WARN( "invalid syscall table version %x\n", info->version ); - return; - } - if (syscall_tables[info->id].ServiceTable) return; /* already initialized */ - - exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); - names = get_rva( module, exports->AddressOfNames ); - - for (id = wrap_pos = 0; id < info->limit; id++) - { - char *name = get_rva( module, names[name_ptrs[id]] ); - int res = -1; - - if (wrap_pos < orig_table->ServiceLimit) res = strcmp( name, syscall_names[wrap_pos] ); - - if (!res) /* got a match */ - { - if (start_pos + id < ARRAY_SIZE(thunks)) - thunks[start_pos + id] = (syscall_thunk)orig_table->ServiceTable[wrap_pos++]; - else - ERR( "invalid syscall id %04lx for %s\n", id, name ); - } - else if (res > 0) - { - FIXME( "no export for syscall %s\n", syscall_names[wrap_pos] ); - wrap_pos++; - id--; /* try again */ - } - else FIXME( "missing wrapper for syscall %04lx %s\n", id, name ); - } - - for ( ; wrap_pos < orig_table->ServiceLimit; wrap_pos++) - FIXME( "no export for syscall %s\n", syscall_names[wrap_pos] ); - - syscall_tables[info->id].ServiceTable = (ULONG_PTR *)(thunks + start_pos); - syscall_tables[info->id].ServiceLimit = info->limit; - start_pos += info->limit; -} - - /********************************************************************** * init_image_mapping */ @@ -725,13 +643,7 @@ void init_image_mapping( HMODULE module ) { ULONG *ptr = RtlFindExportedRoutineByName( module, "Wow64Transition" ); - if (!ptr) return; - *ptr = PtrToUlong( pBTCpuGetBopCode() ); - if (!win32u_module && RtlFindExportedRoutineByName( module, "NtUserInitializeClientPfnArrays" )) - { - win32u_module = module; - init_syscall_table( win32u_module, ptr, psdwhwin32 ); - } + if (ptr) *ptr = PtrToUlong( pBTCpuGetBopCode() ); } @@ -842,6 +754,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex UNICODE_STRING str = RTL_CONSTANT_STRING( L"ntdll.dll" ); SYSTEM_BASIC_INFORMATION info; ULONG *p__wine_syscall_dispatcher, *p__wine_unix_call_dispatcher; + const SYSTEM_SERVICE_TABLE *psdwhwin32; RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); if (!current_machine) current_machine = native_machine; @@ -883,6 +796,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex module = load_64bit_module( L"wow64win.dll" ); GET_PTR( sdwhwin32 ); + syscall_tables[1] = *psdwhwin32; pBTCpuProcessInit(); @@ -895,8 +809,6 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex *p__wine_syscall_dispatcher = PtrToUlong( pBTCpuGetBopCode() ); *p__wine_unix_call_dispatcher = PtrToUlong( p__wine_get_unix_opcode() ); - init_syscall_table( module, p__wine_syscall_dispatcher, &ntdll_syscall_table ); - if (wow64info->CpuFlags & WOW64_CPUFLAGS_SOFTWARE) create_cross_process_work_list( wow64info ); init_file_redirects(); diff --git a/dlls/wow64win/syscall.c b/dlls/wow64win/syscall.c index 5d08e1fd905..55b9dec9722 100644 --- a/dlls/wow64win/syscall.c +++ b/dlls/wow64win/syscall.c @@ -35,19 +35,19 @@ static void * const win32_syscalls[] = #undef SYSCALL_ENTRY }; -static const char * const win32_syscall_names[] = +static BYTE arguments[ARRAY_SIZE(win32_syscalls)] = { -#define SYSCALL_ENTRY(id,name,args) #name, +#define SYSCALL_ENTRY(id,name,args) args, ALL_SYSCALLS32 #undef SYSCALL_ENTRY }; -SYSTEM_SERVICE_TABLE sdwhwin32 = +const SYSTEM_SERVICE_TABLE sdwhwin32 = { (ULONG_PTR *)win32_syscalls, - (ULONG_PTR *)win32_syscall_names, + NULL, ARRAY_SIZE(win32_syscalls), - NULL + arguments };

1 0

Marc-Aurel Zent : ntdll: Implement thread-ID alerts using kqueue/kevent.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: c23c72fe8e0308e8f8180990c9d2da4a755fc729 URL: https://gitlab.winehq.org/wine/wine/-/commit/c23c72fe8e0308e8f8180990c9d2da… Author: Marc-Aurel Zent <marc_aurel(a)me.com> Date: Mon Oct 9 09:47:38 2023 +0200 ntdll: Implement thread-ID alerts using kqueue/kevent. --- dlls/ntdll/unix/sync.c | 96 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index b21fcc0b046..bfbcaf4a851 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -49,11 +49,11 @@ #include <stdlib.h> #include <time.h> #ifdef __APPLE__ -# include <mach/mach.h> -# include <mach/task.h> -# include <mach/semaphore.h> # include <mach/mach_time.h> #endif +#ifdef HAVE_KQUEUE +# include <sys/event.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2354,8 +2354,8 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { -#ifdef __APPLE__ - semaphore_t sem; +#ifdef HAVE_KQUEUE + int kq; #else HANDLE event; #ifdef __linux__ @@ -2396,15 +2396,35 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; -#ifdef __APPLE__ - if (!entry->sem) +#ifdef HAVE_KQUEUE + if (!entry->kq) { - semaphore_t sem; + int kq = kqueue(); + static const struct kevent init_event = + { + .ident = 1, + .filter = EVFILT_USER, + .flags = EV_ADD | EV_CLEAR, + .fflags = 0, + .data = 0, + .udata = NULL + }; + + if (kq == -1) + { + ERR( "kqueue failed with error: %d (%s)\n", errno, strerror( errno ) ); + return NULL; + } - if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) + if (kevent( kq, &init_event, 1, NULL, 0, NULL) == -1) + { + ERR( "kevent creation failed with error: %d (%s)\n", errno, strerror( errno ) ); + close( kq ); return NULL; - if (InterlockedCompareExchange( (LONG *)&entry->sem, sem, 0 )) - semaphore_destroy( mach_task_self(), sem ); + } + + if (InterlockedCompareExchange( (LONG *)&entry->kq, kq, 0 )) + close( kq ); } #else #ifdef __linux__ @@ -2438,9 +2458,21 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; -#ifdef __APPLE__ - semaphore_signal( entry->sem ); - return STATUS_SUCCESS; +#ifdef HAVE_KQUEUE + { + static const struct kevent signal_event = + { + .ident = 1, + .filter = EVFILT_USER, + .flags = 0, + .fflags = NOTE_TRIGGER, + .data = 0, + .udata = NULL + }; + + kevent( entry->kq, &signal_event, 1, NULL, 0, NULL ); + return STATUS_SUCCESS; + } #else #ifdef __linux__ if (use_futexes()) @@ -2457,7 +2489,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) } -#if defined(__linux__) || defined(__APPLE__) +#if defined(__linux__) || defined(HAVE_KQUEUE) static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2480,7 +2512,7 @@ static LONGLONG update_timeout( ULONGLONG end ) #endif -#ifdef __APPLE__ +#ifdef HAVE_KQUEUE /*********************************************************************** * NtWaitForAlertByThreadId (NTDLL.@) @@ -2488,14 +2520,14 @@ static LONGLONG update_timeout( ULONGLONG end ) NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) { union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); - semaphore_t sem; ULONGLONG end; - kern_return_t ret; + int ret; + struct timespec timespec; + struct kevent wait_event; TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); if (!entry) return STATUS_INVALID_CID; - sem = entry->sem; if (timeout) { @@ -2505,27 +2537,29 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG end = get_absolute_timeout( timeout ); } - for (;;) + do { if (timeout) { LONGLONG timeleft = update_timeout( end ); - mach_timespec_t timespec; timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; - ret = semaphore_timedwait( sem, timespec ); + if (timespec.tv_sec > 0x7FFFFFFF) timeout = NULL; } - else - ret = semaphore_wait( sem ); - switch (ret) - { - case KERN_SUCCESS: return STATUS_ALERTED; - case KERN_ABORTED: continue; - case KERN_OPERATION_TIMED_OUT: return STATUS_TIMEOUT; - default: return STATUS_INVALID_HANDLE; - } + ret = kevent( entry->kq, NULL, 0, &wait_event, 1, timeout ? &timespec : NULL ); + } while (ret == -1 && errno == EINTR); + + switch (ret) + { + case 1: + return STATUS_ALERTED; + case 0: + return STATUS_TIMEOUT; + default: + ERR( "kevent failed with error: %d (%s)\n", errno, strerror( errno ) ); + return STATUS_INVALID_HANDLE; } }

1 0

Alex Henrie : ntoskrnl/tests: Put test_input on the stack in the main_test function.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 6e45c17182224723f0bafa94623b1e37d81e89c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e45c17182224723f0bafa94623b1e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 5 22:02:27 2023 -0700 ntoskrnl/tests: Put test_input on the stack in the main_test function. --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 6ca4324f11b..13258b05291 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -44,7 +44,6 @@ #include "ddk/hidsdi.h" #include "ddk/hidpi.h" #include "wine/test.h" -#include "wine/heap.h" #include "wine/mssign.h" #include "driver.h" @@ -397,21 +396,18 @@ static ULONG64 modified_value; static void main_test(void) { - struct main_test_input *test_input; + struct main_test_input test_input; DWORD size; BOOL res; - test_input = heap_alloc( sizeof(*test_input) ); - test_input->process_id = GetCurrentProcessId(); - test_input->teststr_offset = (SIZE_T)((BYTE *)&teststr - (BYTE *)NtCurrentTeb()->Peb->ImageBaseAddress); - test_input->modified_value = &modified_value; + test_input.process_id = GetCurrentProcessId(); + test_input.teststr_offset = (SIZE_T)((BYTE *)&teststr - (BYTE *)NtCurrentTeb()->Peb->ImageBaseAddress); + test_input.modified_value = &modified_value; modified_value = 0; - res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, sizeof(*test_input), NULL, 0, &size, NULL); + res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, &test_input, sizeof(test_input), NULL, 0, &size, NULL); ok(res, "DeviceIoControl failed: %lu\n", GetLastError()); ok(!size, "got size %lu\n", size); - - heap_free(test_input); } static void test_basic_ioctl(void)

1 0