- Wine-Commits - list.winehq.org

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

Alex Henrie : d3dcompiler_43/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: c64aa0006e4a33d755a57a693cd81dc1ed95fa9d URL: https://gitlab.winehq.org/wine/wine/-/commit/c64aa0006e4a33d755a57a693cd81d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 15 23:35:52 2023 -0700 d3dcompiler_43/tests: Use CRT allocation functions. --- dlls/d3dcompiler_43/tests/asm.c | 17 ++++++----------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 6d3e7013017..55d84213e1e 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1460,23 +1460,20 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i if (!strcmp(filename, "incl.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); - CopyMemory(buffer, include, sizeof(include)); + buffer = strdup(include); *bytes = sizeof(include); ok(!parent_data, "Wrong parent_data value.\n"); } else if (!strcmp(filename, "incl2.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); - CopyMemory(buffer, include2, sizeof(include2)); + buffer = strdup(include2); *bytes = sizeof(include2); ok(!parent_data, "Wrong parent_data value.\n"); ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); } else if (!strcmp(filename, "incl3.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include3)); - CopyMemory(buffer, include3, sizeof(include3)); + buffer = strdup(include3); *bytes = sizeof(include3); /* Also check for the correct parent_data content */ ok(parent_data != NULL @@ -1486,16 +1483,14 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i } else if (!strcmp(filename, "incl4.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include4)); - CopyMemory(buffer, include4, sizeof(include4)); + buffer = strdup(include4); *bytes = sizeof(include4); ok(parent_data == NULL, "Wrong parent_data value.\n"); ok(include_type == D3D_INCLUDE_SYSTEM, "Wrong include type %d.\n", include_type); } else if (!strcmp(filename, "includes/incl.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); - CopyMemory(buffer, include, sizeof(include)); + buffer = strdup(include); *bytes = sizeof(include); ok(!parent_data, "Wrong parent_data value.\n"); } @@ -1512,7 +1507,7 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i static HRESULT WINAPI testD3DInclude_close(ID3DInclude *iface, const void *data) { - HeapFree(GetProcessHeap(), 0, (void *)data); + free((void *)data); return S_OK; } diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index c6e7aa367f0..eed96db7248 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -18,7 +18,6 @@ */ #define COBJMACROS #include "wine/test.h" -#include "wine/heap.h" #include "d3dx9.h" #include "d3dcompiler.h" @@ -1515,26 +1514,26 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE if (!strcmp(filename, "include1.h")) { - buffer = heap_alloc(strlen(include1)); - CopyMemory(buffer, include1, strlen(include1)); + buffer = strdup(include1); *bytes = strlen(include1); + buffer[*bytes] = '$'; /* everything should still work without a null terminator */ ok(include_type == D3D_INCLUDE_LOCAL, "Unexpected include type %d.\n", include_type); ok(!strncmp(include2, parent_data, strlen(include2)) || !strncmp(include3, parent_data, strlen(include3)), "Unexpected parent_data value.\n"); } else if (!strcmp(filename, "include\\include2.h")) { - buffer = heap_alloc(strlen(include2)); - CopyMemory(buffer, include2, strlen(include2)); + buffer = strdup(include2); *bytes = strlen(include2); + buffer[*bytes] = '$'; /* everything should still work without a null terminator */ ok(!parent_data, "Unexpected parent_data value.\n"); ok(include_type == D3D_INCLUDE_LOCAL, "Unexpected include type %d.\n", include_type); } else if (!strcmp(filename, "include\\include3.h")) { - buffer = heap_alloc(strlen(include3)); - CopyMemory(buffer, include3, strlen(include3)); + buffer = strdup(include3); *bytes = strlen(include3); + buffer[*bytes] = '$'; /* everything should still work without a null terminator */ ok(!parent_data, "Unexpected parent_data value.\n"); ok(include_type == D3D_INCLUDE_LOCAL, "Unexpected include type %d.\n", include_type); } @@ -1550,7 +1549,7 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE static HRESULT WINAPI test_d3dinclude_close(ID3DInclude *iface, const void *data) { - heap_free((void *)data); + free((void *)data); return S_OK; }

1 0

Eric Pouech : dbghelp: No longer decorate ELF/Mach-O module names.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 8d75739b6a5b6fe4cc80686c1850f157be950bcb URL: https://gitlab.winehq.org/wine/wine/-/commit/8d75739b6a5b6fe4cc80686c1850f1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 16 18:38:02 2023 +0100 dbghelp: No longer decorate ELF/Mach-O module names. Rely solely on extended module information. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 5 +---- dlls/dbghelp/module.c | 23 +++++++++++++++-------- programs/winedbg/info.c | 37 ++++++++++++++++++++++--------------- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index e8f536e95a8..bce5a9c044d 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -716,7 +716,6 @@ extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs, ULONG_P void minidump_add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, ULONG rva); /* module.c */ -extern const WCHAR S_ElfW[]; extern const WCHAR S_WineLoaderW[]; extern const struct loader_ops no_loader_ops; extern const struct loader_ops empty_loader_ops; @@ -748,6 +747,7 @@ extern BOOL module_remove(struct process* pcs, struct module* module); extern void module_set_module(struct module* module, const WCHAR* name); extern WCHAR* get_wine_loader_name(struct process *pcs) __WINE_DEALLOC(HeapFree, 3) __WINE_MALLOC; +extern BOOL module_is_wine_host(const WCHAR* module_name, const WCHAR* ext); /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 5ada8c70c9b..303863c773b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1082,11 +1082,8 @@ static BOOL elf_load_debug_info_from_map(struct module* module, } lret = dwarf2_parse(module, module->reloc_delta, thunks, fmap); ret = ret || lret; - } - if (wcsstr(module->modulename, S_ElfW) || !wcscmp(module->modulename, S_WineLoaderW)) - { /* add the thunks for native libraries */ - if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) + if (module_is_wine_host(module->modulename, L".so")) elf_new_wine_thunks(module, ht_symtab, thunks); } /* add all the public symbols from symtab */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 62cff1260dc..ae90e8c5aa1 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); #define NOTE_GNU_BUILD_ID 3 -const WCHAR S_ElfW[] = L"<elf>"; const WCHAR S_WineLoaderW[] = L"<wine-loader>"; static const WCHAR * const ext[] = {L".acm", L".dll", L".drv", L".exe", L".ocx", L".vxd", NULL}; @@ -54,6 +53,20 @@ static int match_ext(const WCHAR* ptr, size_t len) return 0; } +/* FIXME: implemented from checking on modulename (ie foo.dll.so) + * and Wine loader, but fails to identify unixlib. + * Would require a stronger tagging of ELF modules. + */ +BOOL module_is_wine_host(const WCHAR* module_name, const WCHAR* ext) +{ + size_t len, extlen; + if (!wcscmp(module_name, S_WineLoaderW)) return TRUE; + len = wcslen(module_name); + extlen = wcslen(ext); + return len > extlen && !wcsicmp(&module_name[len - extlen], ext) && + match_ext(module_name, len - extlen); +} + static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) { const WCHAR* ptr; @@ -101,7 +114,7 @@ static BOOL is_wine_loader(const WCHAR *module) static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { const WCHAR *ptr, *endptr; - size_t len, l; + size_t len; endptr = in + lstrlenW(in); endptr -= match_ext(in, endptr - in); @@ -111,12 +124,6 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (is_wine_loader(out)) lstrcpynW(out, S_WineLoaderW, size); - else - { - if (len > 3 && !wcsicmp(&out[len - 3], L".so") && - (l = match_ext(out, len - 3))) - lstrcpyW(&out[len - l - 3], L"<elf>"); - } while ((*out = towlower(*out))) out++; } diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index ce33539321d..e74cca2573a 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -130,6 +130,17 @@ struct info_modules unsigned num_used; }; +static const char* get_module_type(const struct info_module* im) +{ + switch (im->ext_module_info.type) + { + case DMT_ELF: return "ELF"; + case DMT_MACHO: return "Mach-O"; + case DMT_PE: return "PE"; + default: return "----"; + } +} + static const char* get_symtype_str(const struct info_module* im) { switch (im->mi.SymType) @@ -180,13 +191,15 @@ static const char* get_machine_str(DWORD machine) static void module_print_info(const struct info_module *module, BOOL is_embedded, BOOL multi_machine) { if (multi_machine) - dbg_printf("%16I64x-%16I64x\t%s\t%-16s%s\n", + dbg_printf("%s%s\t%16I64x-%16I64x\t%s\t%-16s%s\n", + is_embedded ? " \\-" : "", get_module_type(module), module->mi.BaseOfImage, module->mi.BaseOfImage + module->mi.ImageSize, get_machine_str(module->mi.MachineType), is_embedded ? "\\" : get_symtype_str(module), module->name); else - dbg_printf("%*.*I64x-%*.*I64x\t%-16s%s\n", + dbg_printf("%s%s\t%*.*I64x-%*.*I64x\t%-16s%s\n", + is_embedded ? " \\-" : "", get_module_type(module), ADDRWIDTH, ADDRWIDTH, module->mi.BaseOfImage, ADDRWIDTH, ADDRWIDTH, module->mi.BaseOfImage + module->mi.ImageSize, is_embedded ? "\\" : get_symtype_str(module), module->name); @@ -206,7 +219,9 @@ static int __cdecl module_compare(const void* p1, const void* p2) static inline BOOL module_is_container(const struct info_module *wmod_cntnr, const struct info_module *wmod_child) { - return wmod_cntnr->mi.BaseOfImage <= wmod_child->mi.BaseOfImage && + return (wmod_cntnr->ext_module_info.type == DMT_ELF || wmod_cntnr->ext_module_info.type == DMT_MACHO) && + (wmod_child->ext_module_info.type == DMT_PE) && + wmod_cntnr->mi.BaseOfImage <= wmod_child->mi.BaseOfImage && wmod_cntnr->mi.BaseOfImage + wmod_cntnr->mi.ImageSize >= wmod_child->mi.BaseOfImage + wmod_child->mi.ImageSize; } @@ -288,33 +303,25 @@ void info_win32_module(DWORD64 base, BOOL multi_machine) (base < im.modules[i].mi.BaseOfImage || base >= im.modules[i].mi.BaseOfImage + im.modules[i].mi.ImageSize)) continue; if (!multi_machine && machine != im.modules[i].mi.MachineType) continue; - if (strstr(im.modules[i].name, "<elf>")) + if (im.modules[i].ext_module_info.type == DMT_ELF || im.modules[i].ext_module_info.type == DMT_MACHO) { - dbg_printf("ELF\t"); module_print_info(&im.modules[i], FALSE, multi_machine); /* print all modules embedded in this one */ for (j = 0; j < im.num_used; j++) { - if (!strstr(im.modules[j].name, "<elf>") && module_is_container(&im.modules[i], &im.modules[j])) - { - dbg_printf(" \\-PE\t"); + if (module_is_container(&im.modules[i], &im.modules[j])) module_print_info(&im.modules[j], TRUE, multi_machine); - } } } else { /* check module is not embedded in another module */ - for (j = 0; j < im.num_used; j++) + for (j = 0; j < im.num_used; j++) { - if (strstr(im.modules[j].name, "<elf>") && module_is_container(&im.modules[j], &im.modules[i])) + if (module_is_container(&im.modules[j], &im.modules[i])) break; } if (j < im.num_used) continue; - if (strstr(im.modules[i].name, ".so") || strchr(im.modules[i].name, '<')) - dbg_printf("ELF\t"); - else - dbg_printf("PE\t"); module_print_info(&im.modules[i], FALSE, multi_machine); } num_printed++;

1 0

Eric Pouech : dbghelp: Remove DMT_ entries for .DBG and .PDB files.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 416d29e26c47a56ea0493565291cd4fb55333bec URL: https://gitlab.winehq.org/wine/wine/-/commit/416d29e26c47a56ea0493565291cd4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 16 18:38:02 2023 +0100 dbghelp: Remove DMT_ entries for .DBG and .PDB files. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/msc.c | 4 +- dlls/dbghelp/path.c | 146 ++++++++++++++--------------------------- dlls/dbghelp/pe_module.c | 2 +- 4 files changed, 53 insertions(+), 103 deletions(-)

1 0

Alexandre Julliard : wow64cpu: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 79b6d8d949243857133eeba41538e58102d753ad URL: https://gitlab.winehq.org/wine/wine/-/commit/79b6d8d949243857133eeba41538e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 16:07:25 2023 +0100 wow64cpu: Remove DECLSPEC_HIDDEN usage. --- dlls/wow64cpu/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index acfd21f474b..49fde60d63d 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -171,7 +171,7 @@ static void copy_context_64to32( I386_CONTEXT *ctx32, DWORD flags, AMD64_CONTEXT * * Execute a 64-bit syscall from 32-bit code, then return to 32-bit. */ -extern void WINAPI syscall_32to64(void) DECLSPEC_HIDDEN; +extern void WINAPI syscall_32to64(void); __ASM_GLOBAL_FUNC( syscall_32to64, /* cf. BTCpuSimulate prolog */ __ASM_SEH(".seh_stackalloc 0x28\n\t") @@ -234,7 +234,7 @@ __ASM_GLOBAL_FUNC( syscall_32to64, * * Execute a 64-bit Unix call from 32-bit code, then return to 32-bit. */ -extern void WINAPI unix_call_32to64(void) DECLSPEC_HIDDEN; +extern void WINAPI unix_call_32to64(void); __ASM_GLOBAL_FUNC( unix_call_32to64, /* cf. BTCpuSimulate prolog */ __ASM_SEH(".seh_stackalloc 0x28\n\t")

1 0