November 2022 - Wine-Commits

Alexandre Julliard : ntdll: Move the initialization of the thread register into signal_start_thread().
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: d3a68e434e9b19ac35066ebf47a01cea0a19b7da URL: https://gitlab.winehq.org/wine/wine/-/commit/d3a68e434e9b19ac35066ebf47a01c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 10 09:50:53 2022 +0100 ntdll: Move the initialization of the thread register into signal_start_thread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/signal_arm.c | 9 ------- dlls/ntdll/unix/signal_arm64.c | 10 ------- dlls/ntdll/unix/signal_i386.c | 22 ++++----------- dlls/ntdll/unix/signal_x86_64.c | 60 ++++++++++++++--------------------------- dlls/ntdll/unix/thread.c | 1 - dlls/ntdll/unix/unix_private.h | 1 - 7 files changed, 25 insertions(+), 79 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 896247e109a..9f24aa5eb68 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2166,7 +2166,6 @@ static void start_main_thread(void) signal_init_threading(); signal_alloc_thread( teb ); - signal_init_thread( teb ); dbg_init(); startup_info_size = server_init_process(); virtual_map_user_shared_data(); diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 9eef8ff7c69..d2f07236dc0 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1545,15 +1545,6 @@ void signal_free_thread( TEB *teb ) } -/********************************************************************** - * signal_init_thread - */ -void signal_init_thread( TEB *teb ) -{ - __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); -} - - /********************************************************************** * signal_init_process */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 66f11c1653b..5f0171fb020 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1338,16 +1338,6 @@ void signal_free_thread( TEB *teb ) } -/********************************************************************** - * signal_init_thread - */ -void signal_init_thread( TEB *teb ) -{ - /* Win64/ARM applications expect the TEB pointer to be in the x18 platform register. */ - __asm__ __volatile__( "mov x18, %0" : : "r" (teb) ); -} - - /********************************************************************** * signal_init_process */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 31187bb478e..f3c7f5b0ac7 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2367,21 +2367,6 @@ void signal_free_thread( TEB *teb ) } -/********************************************************************** - * signal_init_thread - */ -void signal_init_thread( TEB *teb ) -{ - const WORD fpu_cw = 0x27f; - struct x86_thread_data *thread_data = (struct x86_thread_data *)&teb->GdiTebBatch; - - ldt_set_fs( thread_data->fs, teb ); - thread_data->gs = get_gs(); - - __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); -} - - /********************************************************************** * signal_init_process */ @@ -2436,11 +2421,14 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B CONTEXT *ctx, context = { CONTEXT_ALL }; DWORD *stack; + ldt_set_fs( thread_data->fs, teb ); + thread_data->gs = get_gs(); + context.SegCs = get_cs(); context.SegDs = get_ds(); context.SegEs = get_ds(); - context.SegFs = get_fs(); - context.SegGs = get_gs(); + context.SegFs = thread_data->fs; + context.SegGs = thread_data->gs; context.SegSs = get_ds(); context.EFlags = 0x202; context.Eax = (DWORD)entry; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 3c61e0728cb..fcbe1c0f540 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2372,46 +2372,6 @@ static void *mac_thread_gsbase(void) #endif -/********************************************************************** - * signal_init_thread - */ -void signal_init_thread( TEB *teb ) -{ - const WORD fpu_cw = 0x27f; - -#if defined __linux__ - arch_prctl( ARCH_SET_GS, teb ); - arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); - if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, (char *)teb + teb->WowTebOffset ); -#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) - amd64_set_gsbase( teb ); -#elif defined(__NetBSD__) - sysarch( X86_64_SET_GSBASE, &teb ); -#elif defined (__APPLE__) - __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" - : - : "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self))); - __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" - : - : "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); - amd64_thread_data()->pthread_teb = mac_thread_gsbase(); - - /* alloc_tls_slot() needs to poke a value to an address relative to each - thread's gsbase. Have each thread record its gsbase pointer into its - TEB so alloc_tls_slot() can find it. */ - teb->Reserved5[0] = amd64_thread_data()->pthread_teb; -#else -# error Please define setting %gs for your architecture -#endif - -#ifdef __GNUC__ - __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); -#else - FIXME_(seh)("FPU setup not implemented for this platform.\n"); -#endif -} - - /********************************************************************** * signal_init_process */ @@ -2510,6 +2470,26 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B CONTEXT *ctx, context = { 0 }; I386_CONTEXT *wow_context; +#if defined __linux__ + arch_prctl( ARCH_SET_GS, teb ); + arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); + if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, (char *)teb + teb->WowTebOffset ); +#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) + amd64_set_gsbase( teb ); +#elif defined(__NetBSD__) + sysarch( X86_64_SET_GSBASE, &teb ); +#elif defined (__APPLE__) + __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self))); + __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); + amd64_thread_data()->pthread_teb = mac_thread_gsbase(); + /* alloc_tls_slot() needs to poke a value to an address relative to each + thread's gsbase. Have each thread record its gsbase pointer into its + TEB so alloc_tls_slot() can find it. */ + teb->Reserved5[0] = amd64_thread_data()->pthread_teb; +#else +# error Please define setting %gs for your architecture +#endif + context.ContextFlags = CONTEXT_ALL; context.Rcx = (ULONG_PTR)entry; context.Rdx = (ULONG_PTR)arg; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index c4eee74036d..43de6cefad3 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1069,7 +1069,6 @@ static void start_thread( TEB *teb ) thread_data->pthread_id = pthread_self(); pthread_setspecific( teb_key, teb ); - signal_init_thread( teb ); server_init_thread( thread_data->start, &suspend ); signal_start_thread( thread_data->start, thread_data->param, suspend, teb ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d2abf19aa25..f45e8462700 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -234,7 +234,6 @@ extern BOOL get_thread_times( int unix_pid, int unix_tid, LARGE_INTEGER *kernel_ extern void signal_init_threading(void) DECLSPEC_HIDDEN; extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; -extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_process(void) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ) DECLSPEC_HIDDEN;

1 0

Etaash Mathamsetty : ntoskrnl.exe: Implement KeInitializeGuardedMutex.
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: c212987dc56b565d9a5cc767c3ec240728a6dc4c URL: https://gitlab.winehq.org/wine/wine/-/commit/c212987dc56b565d9a5cc767c3ec24… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Oct 30 11:22:57 2022 -0400 ntoskrnl.exe: Implement KeInitializeGuardedMutex. --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/sync.c | 12 ++++++++++++ include/ddk/wdm.h | 17 +++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8f8edcac7a0..d3910c380df 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -577,6 +577,7 @@ @ stub KeInitializeInterrupt @ stub KeInitializeMutant @ stdcall KeInitializeMutex(ptr long) +@ stdcall KeInitializeGuardedMutex(ptr) @ stub KeInitializeQueue @ stdcall KeInitializeSemaphore(ptr long long) @ stdcall KeInitializeSpinLock(ptr) NTOSKRNL_KeInitializeSpinLock diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index ada468c73dc..d9b5726b920 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -427,6 +427,18 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX mutex, BOOLEAN wait ) return ret; } +/*********************************************************************** + * KeInitializeGuardedMutex (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeGuardedMutex(PKGUARDED_MUTEX mutex) +{ + TRACE("mutex %p.\n", mutex); + mutex->Count = FM_LOCK_BIT; + mutex->Owner = NULL; + mutex->Contention = 0; + KeInitializeEvent(&mutex->Event, SynchronizationEvent, FALSE); +} + static void CALLBACK ke_timer_complete_proc(PTP_CALLBACK_INSTANCE instance, void *timer_, PTP_TIMER tp_timer) { KTIMER *timer = timer_; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0aad83ade8c..bd6ddbd67c5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -253,6 +253,23 @@ typedef struct _FAST_MUTEX ULONG OldIrql; } FAST_MUTEX, *PFAST_MUTEX; +typedef struct _KGUARDED_MUTEX +{ + LONG Count; + PKTHREAD Owner; + ULONG Contention; + KEVENT Event; + union + { + struct + { + SHORT KernelApcDisable; + SHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; + }; +} KGUARDED_MUTEX, *PKGUARDED_MUTEX; + #define MAXIMUM_VOLUME_LABEL_LENGTH (32 * sizeof(WCHAR)) typedef struct _VPB {

1 0

Alexandre Julliard : ntdll: Use a separate function pointer for the TEB hack on ARM64.
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: 2a5191a74ad9f1ad3ffde7e4aaa7e4ef8a0c8e44 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a5191a74ad9f1ad3ffde7e4aaa7e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 10 10:18:15 2022 +0100 ntdll: Use a separate function pointer for the TEB hack on ARM64. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm64.c | 4 +++- dlls/ntdll/unix/loader.c | 10 +++++++--- dlls/ntdll/unixlib.h | 5 +---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d9071bb826e..74e37fccbb6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1696,6 +1696,7 @@ @ stdcall __wine_ctrl_routine(ptr) @ extern __wine_syscall_dispatcher @ extern -arch=i386 __wine_ldt_copy +@ extern -arch=arm64 __wine_current_teb # Debugging @ stdcall -syscall -norelay __wine_dbg_write(ptr long) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index f644816fb1c..76108f69c9f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(threadname); +TEB * (* WINAPI __wine_current_teb)(void) = NULL; + typedef struct _SCOPE_TABLE { ULONG Count; @@ -1528,7 +1530,7 @@ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0xf000; ret" */ TEB * WINAPI NtCurrentTeb(void) { - return unix_funcs->NtCurrentTeb(); + return __wine_current_teb(); } #endif /* __aarch64__ */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9f24aa5eb68..c25b373bc5e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1071,6 +1071,13 @@ static void load_ntdll_functions( HMODULE module ) *p__wine_ldt_copy = &__wine_ldt_copy; } #endif +#ifdef __aarch64__ + { + void **p__wine_current_teb; + GET_FUNC( __wine_current_teb ); + *p__wine_current_teb = NtCurrentTeb; + } +#endif #undef GET_FUNC } @@ -2149,9 +2156,6 @@ static struct unix_funcs unix_funcs = init_builtin_dll, unwind_builtin_dll, RtlGetSystemTimePrecise, -#ifdef __aarch64__ - NtCurrentTeb, -#endif }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index cb184431f82..fa5fad73980 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 134 +#define NTDLL_UNIXLIB_VERSION 135 struct unix_funcs { @@ -37,9 +37,6 @@ struct unix_funcs CONTEXT *context ); /* other Win32 API functions */ LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); -#ifdef __aarch64__ - TEB * (WINAPI *NtCurrentTeb)(void); -#endif }; #endif /* __NTDLL_UNIXLIB_H */

1 0

Alexandre Julliard : ntdll: Use a proper Unix syscall for init_builtin_dll().
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: 1d1690782b167f3ea24990c260665f71a0e70d1c URL: https://gitlab.winehq.org/wine/wine/-/commit/1d1690782b167f3ea24990c260665f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 10 10:30:30 2022 +0100 ntdll: Use a proper Unix syscall for init_builtin_dll(). --- dlls/ntdll/loader.c | 9 ++------- dlls/ntdll/unix/loader.c | 11 +++++++---- dlls/ntdll/unixlib.h | 4 ++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a301659ae82..1b541e79a99 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1574,7 +1574,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, reason ); if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) - unix_funcs->init_builtin_dll( wm->ldr.DllBase ); + NTDLL_UNIX_CALL( init_builtin_dll, wm->ldr.DllBase ); if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) @@ -4208,7 +4208,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); + if (wm->ldr.Flags & LDR_WINE_INTERNAL) NTDLL_UNIX_CALL( init_builtin_dll, wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); process_breakpoint(); } @@ -4602,10 +4602,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -static void CDECL init_builtin_dll_fallback( void *module ) -{ -} - static NTSTATUS CDECL unwind_builtin_dll_fallback( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) { @@ -4621,7 +4617,6 @@ static LONGLONG WINAPI RtlGetSystemTimePrecise_fallback(void) static const struct unix_funcs unix_fallbacks = { - init_builtin_dll_fallback, unwind_builtin_dll_fallback, RtlGetSystemTimePrecise_fallback, }; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 7d4b9f0ee0a..8c6febcbef4 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1931,7 +1931,7 @@ static BOOL get_relocbase(caddr_t mapbase, caddr_t *relocbase) /************************************************************************* * init_builtin_dll */ -static void CDECL init_builtin_dll( void *module ) +static NTSTATUS init_builtin_dll( void *module ) { #ifdef HAVE_DLINFO void *handle = NULL; @@ -1945,10 +1945,10 @@ static void CDECL init_builtin_dll( void *module ) const Elf32_Dyn *dyn; #endif - if (!(handle = get_builtin_so_handle( module ))) return; + if (!(handle = get_builtin_so_handle( module ))) return STATUS_SUCCESS; if (dlinfo( handle, RTLD_DI_LINKMAP, &map )) map = NULL; release_builtin_module( module ); - if (!map) return; + if (!map) return STATUS_SUCCESS; for (dyn = map->l_ld; dyn->d_tag; dyn++) { @@ -1976,6 +1976,7 @@ static void CDECL init_builtin_dll( void *module ) for (i = 0; i < init_arraysz / sizeof(*init_array); i++) init_array[i]( main_argc, main_argv, main_envp ); #endif + return STATUS_SUCCESS; } @@ -2154,7 +2155,6 @@ static ULONG_PTR get_image_address(void) */ static struct unix_funcs unix_funcs = { - init_builtin_dll, unwind_builtin_dll, RtlGetSystemTimePrecise, }; @@ -2166,10 +2166,12 @@ static struct unix_funcs unix_funcs = const unixlib_entry_t __wine_unix_call_funcs[] = { load_so_dll, + init_builtin_dll, }; static NTSTATUS wow64_load_so_dll( void *args ) { return STATUS_INVALID_IMAGE_FORMAT; } +static NTSTATUS wow64_init_builtin_dll( void *args ) { return STATUS_UNSUCCESSFUL; } /*********************************************************************** * __wine_unix_call_wow64_funcs @@ -2177,6 +2179,7 @@ static NTSTATUS wow64_load_so_dll( void *args ) { return STATUS_INVALID_IMAGE_FO const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { wow64_load_so_dll, + wow64_init_builtin_dll, }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index e41f7290bc2..fd23468ed80 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -34,6 +34,7 @@ struct load_so_dll_params enum ntdll_unix_funcs { unix_load_so_dll, + unix_init_builtin_dll, }; extern unixlib_handle_t ntdll_unix_handle; @@ -41,12 +42,11 @@ extern unixlib_handle_t ntdll_unix_handle; #define NTDLL_UNIX_CALL( func, params ) __wine_unix_call( ntdll_unix_handle, unix_ ## func, params ) /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 136 +#define NTDLL_UNIXLIB_VERSION 137 struct unix_funcs { /* loader functions */ - void (CDECL *init_builtin_dll)( void *module ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); /* other Win32 API functions */

1 0

Santino Mazza : user32/msgbox: Implement MB_SYSTEMMODAL.
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: 0c24f2b895038125d8f7d7d46ec81fcf77c45b38 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c24f2b895038125d8f7d7d46ec81f… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Nov 8 16:34:29 2022 -0300 user32/msgbox: Implement MB_SYSTEMMODAL. --- dlls/user32/msgbox.c | 10 ++++++---- dlls/user32/tests/dialog.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index cc53ab0457e..22ddc30efed 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -109,6 +109,12 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) lpszText = lpmb->lpszText; } + /* handle modal message boxes */ + if (((lpmb->dwStyle & MB_TASKMODAL) && (lpmb->hwndOwner==NULL))) + NtUserSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE ); + else if (lpmb->dwStyle & MB_SYSTEMMODAL) + NtUserSetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED ); + TRACE_(msgbox)("%s\n", debugstr_w(lpszText)); SetWindowTextW(GetDlgItem(hwnd, MSGBOX_IDTEXT), lpszText); @@ -309,10 +315,6 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) } } - /*handle modal message boxes*/ - if (((lpmb->dwStyle & MB_TASKMODAL) && (lpmb->hwndOwner==NULL)) || (lpmb->dwStyle & MB_SYSTEMMODAL)) - NtUserSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE ); - HeapFree( GetProcessHeap(), 0, buffer ); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b439b6f08c0..21958ddb193 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2160,7 +2160,7 @@ static LRESULT CALLBACK msgbox_sysmodal_hook_proc(INT code, WPARAM wParam, LPARA if (msgbox) { - todo_wine ok(exstyles & WS_EX_TOPMOST, "expected message box to have topmost exstyle set\n"); + ok(exstyles & WS_EX_TOPMOST, "expected message box to have topmost exstyle set\n"); SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONDOWN, 0, 0); SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONUP, 0, 0);

1 0

Brendan Shanks : winemac.drv: Stop using deprecated kIOMasterPortDefault constant.
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: ce386a870b2328ccb7536e683efd32c4c12f02e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce386a870b2328ccb7536e683efd32… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 9 14:00:55 2022 -0800 winemac.drv: Stop using deprecated kIOMasterPortDefault constant. --- dlls/winemac.drv/cocoa_display.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index f64a6c0f6ad..04f6dda4481 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -250,7 +250,7 @@ static int macdrv_get_gpu_info_from_registry_id(struct macdrv_gpu* gpu, uint64_t int ret; io_registry_entry_t entry; - entry = IOServiceGetMatchingService(kIOMasterPortDefault, IORegistryEntryIDMatching(registry_id)); + entry = IOServiceGetMatchingService(0, IORegistryEntryIDMatching(registry_id)); ret = macdrv_get_gpu_info_from_entry(gpu, entry); IOObjectRelease(entry); return ret; @@ -422,7 +422,7 @@ static int macdrv_get_gpus_from_iokit(struct macdrv_gpu** new_gpus, int* count) if (!gpus) goto done; - if (IOServiceGetMatchingServices(kIOMasterPortDefault, IOServiceMatching("IOPCIDevice"), &iterator) + if (IOServiceGetMatchingServices(0, IOServiceMatching("IOPCIDevice"), &iterator) != kIOReturnSuccess) goto done;

1 0

Eric Pouech : cmd: Use CRT file I/O function inside 'for /F' handling.
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: e1c37c21da9a27b55aaad58ca50a3f8f8244b964 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1c37c21da9a27b55aaad58ca50a3f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jul 20 14:58:05 2022 +0200 cmd: Use CRT file I/O function inside 'for /F' handling. This allows: - to mimic native behavior when a stray '\0' is present in file (in 'FOR /F' execution, it's interpreted as an EOF marker) (prevents an infinite loop) - supports (with /USEBACKQ) unicode output (if BOM is present) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53386 --- programs/cmd/builtins.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index dd3ae5b509b..82008c3ec7a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2048,9 +2048,9 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, } /************************************************************************** - * WCMD_forf_getinputhandle + * WCMD_forf_getinput * - * Return a file handle which can be used for reading the input lines, + * Return a FILE* which can be used for reading the input lines, * either to a specific file (which may be quote delimited as we have to * read the parameters in raw mode) or to a command which we need to * execute. The command being executed runs in its own shell and stores @@ -2064,12 +2064,12 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, * * Returns a file handle which can be used to read the input lines from. */ -static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { +static FILE* WCMD_forf_getinput(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { WCHAR temp_str[MAX_PATH]; WCHAR temp_file[MAX_PATH]; WCHAR temp_cmd[MAXSTRING]; WCHAR *trimmed = NULL; - HANDLE hinput = INVALID_HANDLE_VALUE; + FILE* ret; /* Remove leading and trailing character (but there may be trailing whitespace too) */ if ((iscmd && (itemstr[0] == '`' && usebackq)) || @@ -2097,17 +2097,14 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd WCMD_execute (temp_cmd, temp_str, NULL, FALSE); /* Open the file, read line by line and process */ - hinput = CreateFileW(temp_file, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); - + ret = _wfopen(temp_file, L"rt,ccs=unicode"); } else { /* Open the file, read line by line and process */ WINE_TRACE("Reading input to parse from '%s'\n", wine_dbgstr_w(itemstr)); - hinput = CreateFileW(itemstr, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ret = _wfopen(itemstr, L"rt,ccs=unicode"); } heap_free(trimmed); - return hinput; + return ret; } /************************************************************************** @@ -2389,7 +2386,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else if (doFileset && ((!forf_usebackq && *itemStart != '"') || (forf_usebackq && *itemStart != '\''))) { - HANDLE input; + FILE *input; WCHAR *itemparm; WINE_TRACE("Processing for filespec from item %d '%s'\n", itemNum, @@ -2407,10 +2404,10 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Use item because the file to process is just the first item in the set */ itemparm = item; } - input = WCMD_forf_getinputhandle(forf_usebackq, itemparm, (itemparm==itemStart)); + input = WCMD_forf_getinput(forf_usebackq, itemparm, (itemparm==itemStart)); /* Process the input file */ - if (input == INVALID_HANDLE_VALUE) { + if (!input) { WCMD_print_error (); WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), item); errorlevel = 1; @@ -2419,12 +2416,20 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else { /* Read line by line until end of file */ - while (WCMD_fgets(buffer, ARRAY_SIZE(buffer), input)) { + while (fgetws(buffer, ARRAY_SIZE(buffer), input)) { + size_t len = wcslen(buffer); + /* Either our buffer isn't large enough to fit a full line, or there's a stray + * '\0' in the buffer. + */ + if (!feof(input) && (len == 0 || (buffer[len - 1] != '\n' && buffer[len - 1] != '\r'))) + break; + while (len && (buffer[len - 1] == '\n' || buffer[len - 1] == '\r')) + buffer[--len] = L'\0'; WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable[1], buffer, &doExecuted, &forf_skip, forf_eol, forf_delims, forf_tokens); buffer[0] = 0; } - CloseHandle (input); + fclose (input); } /* When we have processed the item as a whole command, abort future set processing */

1 0

Santino Mazza : user32/tests: Test for MB_SYSTEMMODAL.
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: 18b5cc5ee7a05e36e685fa420b15811d948d2bab URL: https://gitlab.winehq.org/wine/wine/-/commit/18b5cc5ee7a05e36e685fa420b1581… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Nov 8 16:33:44 2022 -0300 user32/tests: Test for MB_SYSTEMMODAL. --- dlls/user32/tests/dialog.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 3df1a0eab32..b439b6f08c0 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2151,6 +2151,25 @@ static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) return CallNextHookEx(NULL, code, wParam, lParam); } +static LRESULT CALLBACK msgbox_sysmodal_hook_proc(INT code, WPARAM wParam, LPARAM lParam) +{ + if (code == HCBT_ACTIVATE) + { + HWND msgbox = (HWND)wParam; + LONG exstyles = GetWindowLongA(msgbox, GWL_EXSTYLE); + + if (msgbox) + { + todo_wine ok(exstyles & WS_EX_TOPMOST, "expected message box to have topmost exstyle set\n"); + + SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONDOWN, 0, 0); + SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONUP, 0, 0); + } + } + + return CallNextHookEx(NULL, code, wParam, lParam); +} + static void test_MessageBox(void) { HHOOK hook; @@ -2162,6 +2181,13 @@ static void test_MessageBox(void) ok(ret == IDCANCEL, "got %d\n", ret); UnhookWindowsHookEx(hook); + + /* Test for MB_SYSTEMMODAL */ + hook = SetWindowsHookExA(WH_CBT, msgbox_sysmodal_hook_proc, NULL, GetCurrentThreadId()); + + MessageBoxA(NULL, NULL, "system modal", MB_OKCANCEL | MB_SYSTEMMODAL); + + UnhookWindowsHookEx(hook); } static INT_PTR CALLBACK custom_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)

1 0

Arkadiusz Hiler : cmd/tests: Make sure for /f doesn't loop infinitely on NULs.
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: 92e4cad8e08b64fc0e66c2a275896e2c1de45eba URL: https://gitlab.winehq.org/wine/wine/-/commit/92e4cad8e08b64fc0e66c2a275896e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Aug 1 17:53:29 2022 +0300 cmd/tests: Make sure for /f doesn't loop infinitely on NULs. --- programs/cmd/tests/batch.c | 22 ++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 27 insertions(+) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 3846693ef2e..ade6587be81 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -455,6 +455,24 @@ static int cmd_available(void) return FALSE; } +void create_nul_test_file(void) +{ + HANDLE file; + DWORD size; + BOOL bres; + char contents[] = "a b c\nd e\0f\ng h i"; + + file = CreateFileA("nul_test_file", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + if(file == INVALID_HANDLE_VALUE) + return; + + bres = WriteFile(file, contents, ARRAYSIZE(contents), &size, NULL); + ok(bres, "Could not write to file: %lu\n", GetLastError()); + CloseHandle(file); +} + START_TEST(batch) { int argc; @@ -479,9 +497,13 @@ START_TEST(batch) } shortpath_len = GetShortPathNameA(path, shortpath, ARRAY_SIZE(shortpath)); + create_nul_test_file(); + argc = winetest_get_mainargs(&argv); if(argc > 2) run_from_file(argv[2]); else EnumResourceNamesA(NULL, "TESTCMD", test_enum_proc, 0); + + DeleteFileA("nul_test_file"); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..3829be50f1a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1957,6 +1957,9 @@ FOR /F "delims=. tokens=1*" %%A IN (testfile) DO @echo 5:%%A,%%B FOR /F "delims=. tokens=2*" %%A IN (testfile) DO @echo 6:%%A,%%B FOR /F "delims=. tokens=3*" %%A IN (testfile) DO @echo 7:%%A,%%B del testfile +rem file contains NUL, created by the .exe +for /f %%A in (nul_test_file) DO echo %%A +for /f "tokens=*" %%A in (nul_test_file) DO echo %%A echo ------------ Testing del ------------ echo abc > file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..437ded18000 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1315,6 +1315,8 @@ h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o 4:3.14,%B 5:3,14 6:14, +a +a b c ------------ Testing del ------------ deleting 'file' errorlevel is 0, good

1 0

Alex Henrie : mscoree: Use standard C functions for memory allocation in assembly.c.
by Alexandre Julliard Nov. 10, 2022

Nov. 10, 2022

Module: wine Branch: master Commit: 15cbe4979867955d44f86d2617527dc5d270728a URL: https://gitlab.winehq.org/wine/wine/-/commit/15cbe4979867955d44f86d2617527d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 7 21:54:14 2022 -0700 mscoree: Use standard C functions for memory allocation in assembly.c. The big win here is getting rid of the reimplementation of wcsdup. --- dlls/mscoree/assembly.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 240225a14da..8a209dad425 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -79,20 +79,6 @@ struct tagASSEMBLY METADATAHDR *metadatahdr; }; -static inline LPWSTR strdupW(LPCWSTR src) -{ - LPWSTR dest; - - if (!src) - return NULL; - - dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); - if (dest) - lstrcpyW(dest, src); - - return dest; -} - static void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) { if (assembly->is_mapped_file) @@ -130,7 +116,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) metadatahdr = (METADATAHDR *)ptr; - assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR)); + assembly->metadatahdr = malloc(sizeof(METADATAHDR)); if (!assembly->metadatahdr) return E_OUTOFMEMORY; @@ -210,13 +196,13 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) *out = NULL; - assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); + assembly = calloc(1, sizeof(ASSEMBLY)); if (!assembly) return E_OUTOFMEMORY; assembly->is_mapped_file = TRUE; - assembly->path = strdupW(file); + assembly->path = wcsdup(file); if (!assembly->path) { hr = E_OUTOFMEMORY; @@ -264,7 +250,7 @@ HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) *out = NULL; - assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); + assembly = calloc(1, sizeof(ASSEMBLY)); if (!assembly) return E_OUTOFMEMORY; @@ -292,9 +278,9 @@ HRESULT assembly_release(ASSEMBLY *assembly) CloseHandle(assembly->hmap); CloseHandle(assembly->hfile); } - HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); - HeapFree(GetProcessHeap(), 0, assembly->path); - HeapFree(GetProcessHeap(), 0, assembly); + free(assembly->metadatahdr); + free(assembly->path); + free(assembly); return S_OK; }

1 0