June 2020 - Wine-Commits - list.winehq.org

Jacek Caban : ntdll: Export builtin functions as cdecl.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: f2e886a0068e8662c239b5a7e412216e51e5c191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e886a0068e8662c239b5a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 8 18:13:44 2020 +0200 ntdll: Export builtin functions as cdecl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/large_int.c | 101 ++++++++++++++++++++---------------- dlls/ntdll/ntdll.spec | 16 +++--- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 16 +++--- 3 files changed, 71 insertions(+), 62 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index cf8a3df093..748d17adb9 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -545,6 +545,15 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( #ifdef __i386__ +/* those builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations */ +#if defined(__MINGW32__) || defined(_MSC_VER) +LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) asm("_alldiv"); +LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) asm("_allmul"); +LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) asm("_allrem"); +ULONGLONG WINAPI _aulldiv( ULONGLONG a, ULONGLONG b ) asm("_aulldiv"); +ULONGLONG WINAPI _aullrem( ULONGLONG a, ULONGLONG b ) asm("_aullrem"); +#endif + static ULONGLONG udivmod(ULONGLONG a, ULONGLONG b, ULONGLONG *rem) { const ULARGE_INTEGER n = { .QuadPart = a }; @@ -873,29 +882,29 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) * Returns the quotient of a and b in edx:eax. * Returns the remainder of a and b in ebx:ecx. */ -__ASM_STDCALL_FUNC( _alldvrm, 16, - "pushl %ebp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - "movl %esp,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "pushl 20(%ebp)\n\t" - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("_allrem") "\n\t" - "movl %edx,%ebx\n\t" - "pushl %eax\n\t" - "pushl 20(%ebp)\n\t" - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("_alldiv") "\n\t" - "popl %ecx\n\t" - "leave\n\t" - __ASM_CFI(".cfi_def_cfa %esp,4\n\t") - __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret $16" ) +__ASM_GLOBAL_FUNC( _alldvrm, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_allrem") "\n\t" + "movl %edx,%ebx\n\t" + "pushl %eax\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_alldiv") "\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) /****************************************************************************** * _aullrem (NTDLL.@) @@ -946,28 +955,28 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b ) * Returns the quotient of a and b in edx:eax. * Returns the remainder of a and b in ebx:ecx. */ -__ASM_STDCALL_FUNC( _aulldvrm, 16, - "pushl %ebp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - "movl %esp,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "pushl 20(%ebp)\n\t" - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("_aullrem") "\n\t" - "movl %edx,%ebx\n\t" - "pushl %eax\n\t" - "pushl 20(%ebp)\n\t" - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("_aulldiv") "\n\t" - "popl %ecx\n\t" - "leave\n\t" - __ASM_CFI(".cfi_def_cfa %esp,4\n\t") - __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret $16" ) +__ASM_GLOBAL_FUNC( _aulldvrm, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_aullrem") "\n\t" + "movl %edx,%ebx\n\t" + "pushl %eax\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_aulldiv") "\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) #endif /* __i386__ */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce5c580bd5..e054eabba3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1427,17 +1427,17 @@ @ cdecl __iscsym(long) NTDLL___iscsym @ cdecl __iscsymf(long) NTDLL___iscsymf @ cdecl __toascii(long) NTDLL___toascii -@ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) -@ stdcall -arch=i386 -ret64 _allmul(int64 int64) -@ stdcall -arch=i386 -norelay _alloca_probe() -@ stdcall -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -arch=i386 -norelay _alldvrm(int64 int64) +@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -arch=i386 -norelay _alloca_probe() +@ cdecl -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -ret64 _atoi64(str) -@ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) -@ stdcall -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) +@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ stub _fltused diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 902609b071..6acdec5dc5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1514,16 +1514,16 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ cdecl -private _abnormal_termination() -@ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) -@ stdcall -arch=i386 -ret64 _allmul(int64 int64) -@ stdcall -arch=i386 -norelay _alloca_probe() -@ stdcall -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -arch=i386 -norelay _alldvrm(int64 int64) +@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -arch=i386 -norelay _alloca_probe() +@ cdecl -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) -@ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) -@ stdcall -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) +@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)

1 0

Rémi Bernon : dinput: Use dedicated list for mouse and keyboard.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 306c40e67319cae8e4c448ec8fc8d3996f87943f URL: https://source.winehq.org/git/wine.git/?a=commit;h=306c40e67319cae8e4c448ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 8 09:47:09 2020 +0200 dinput: Use dedicated list for mouse and keyboard. Instead of using function pointer, which is also not very CPU friendly. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device_private.h | 1 - dlls/dinput/dinput_main.c | 54 ++++++++++++++++++++++++++++---------------- dlls/dinput/dinput_private.h | 3 ++- dlls/dinput/keyboard.c | 3 +-- dlls/dinput/mouse.c | 5 +--- 5 files changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 5879409c1d..fe5644f21c 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -68,7 +68,6 @@ struct IDirectInputDeviceImpl DWORD dwCoopLevel; HWND win; int acquired; - DI_EVENT_PROC event_proc; /* function to receive mouse & keyboard events */ LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ int queue_len; /* valid size of the queue */ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 4986e5857b..2e56150240 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -100,6 +100,8 @@ HINSTANCE DINPUT_instance; static BOOL check_hook_thread(void); static CRITICAL_SECTION dinput_hook_crit; static struct list direct_input_list = LIST_INIT( direct_input_list ); +static struct list acquired_mouse_list = LIST_INIT( acquired_mouse_list ); +static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); static struct list acquired_device_list = LIST_INIT( acquired_device_list ); static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwVersion); @@ -110,7 +112,12 @@ void dinput_hooks_acquire_device(LPDIRECTINPUTDEVICE8W iface) IDirectInputDeviceImpl *dev = impl_from_IDirectInputDevice8W(iface); EnterCriticalSection( &dinput_hook_crit ); - list_add_tail( &acquired_device_list, &dev->entry ); + if (IsEqualGUID( &dev->guid, &GUID_SysMouse )) + list_add_tail( &acquired_mouse_list, &dev->entry ); + else if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard )) + list_add_tail( &acquired_keyboard_list, &dev->entry ); + else + list_add_tail( &acquired_device_list, &dev->entry ); LeaveCriticalSection( &dinput_hook_crit ); } @@ -1659,13 +1666,15 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) if (code != HC_ACTION) return CallNextHookEx( 0, code, wparam, lparam ); EnterCriticalSection( &dinput_hook_crit ); - LIST_FOR_EACH_ENTRY( dev, &acquired_device_list, IDirectInputDeviceImpl, entry ) + LIST_FOR_EACH_ENTRY( dev, &acquired_mouse_list, IDirectInputDeviceImpl, entry ) { - if (dev->event_proc) - { - TRACE("calling %p->%p (%lx %lx)\n", dev, dev->event_proc, wparam, lparam); - skip |= dev->event_proc( &dev->IDirectInputDevice8A_iface, wparam, lparam ); - } + TRACE("calling dinput_mouse_hook (%p %lx %lx)\n", dev, wparam, lparam); + skip |= dinput_mouse_hook( &dev->IDirectInputDevice8A_iface, wparam, lparam ); + } + LIST_FOR_EACH_ENTRY( dev, &acquired_keyboard_list, IDirectInputDeviceImpl, entry ) + { + TRACE("calling dinput_keyboard_hook (%p %lx %lx)\n", dev, wparam, lparam); + skip |= dinput_keyboard_hook( &dev->IDirectInputDevice8A_iface, wparam, lparam ); } LeaveCriticalSection( &dinput_hook_crit ); @@ -1693,6 +1702,22 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); } } + LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_mouse_list, IDirectInputDeviceImpl, entry ) + { + if (msg->hwnd == dev->win && msg->hwnd != foreground) + { + TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); + IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); + } + } + LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_keyboard_list, IDirectInputDeviceImpl, entry ) + { + if (msg->hwnd == dev->win && msg->hwnd != foreground) + { + TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); + IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); + } + } LeaveCriticalSection( &dinput_hook_crit ); return CallNextHookEx( 0, code, wparam, lparam ); @@ -1713,7 +1738,6 @@ static DWORD WINAPI hook_thread_proc(void *param) if (msg.message == WM_USER+0x10) { - IDirectInputDeviceImpl *dev; HANDLE finished_event = (HANDLE)msg.lParam; TRACE( "Processing hook change notification wp:%ld lp:%#lx\n", msg.wParam, msg.lParam ); @@ -1727,18 +1751,8 @@ static DWORD WINAPI hook_thread_proc(void *param) } EnterCriticalSection( &dinput_hook_crit ); - - /* Count acquired keyboards and mice*/ - LIST_FOR_EACH_ENTRY( dev, &acquired_device_list, IDirectInputDeviceImpl, entry ) - { - if (!dev->event_proc) continue; - - if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard )) - kbd_cnt++; - else - if (IsEqualGUID( &dev->guid, &GUID_SysMouse )) - mice_cnt++; - } + kbd_cnt = list_count( &acquired_keyboard_list ); + mice_cnt = list_count( &acquired_mouse_list ); LeaveCriticalSection( &dinput_hook_crit ); if (kbd_cnt && !kbd_hook) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 121c487c2d..06a439d6a4 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -71,10 +71,11 @@ extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; extern void dinput_hooks_acquire_device(LPDIRECTINPUTDEVICE8W iface); extern void dinput_hooks_unacquire_device(LPDIRECTINPUTDEVICE8W iface); +extern int dinput_mouse_hook(LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam); +extern int dinput_keyboard_hook(LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam); extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W, BOOL) DECLSPEC_HIDDEN; extern void check_dinput_events(void) DECLSPEC_HIDDEN; -typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _copy_diactionformatAtoW(LPDIACTIONFORMATW, LPDIACTIONFORMATA) DECLSPEC_HIDDEN; extern void _copy_diactionformatWtoA(LPDIACTIONFORMATA, LPDIACTIONFORMATW) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 6675a79f84..9981372d95 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -103,7 +103,7 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers return scanCode; } -static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) +int dinput_keyboard_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; @@ -264,7 +264,6 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) newDevice->base.ref = 1; memcpy(&newDevice->base.guid, rguid, sizeof(*rguid)); newDevice->base.dinput = dinput; - newDevice->base.event_proc = KeyboardCallback; InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); newDevice->subtype = get_keyboard_subtype(); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index abf6fb9599..5e6f34f0ec 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -92,8 +92,6 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl return &This->base.IDirectInputDevice8W_iface; } -static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); - static void _dump_mouse_state(const DIMOUSESTATE2 *m_state) { int i; @@ -213,7 +211,6 @@ static SysMouseImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); newDevice->base.dinput = dinput; - newDevice->base.event_proc = dinput_mouse_hook; get_app_key(&hkey, &appkey); if (!get_config_key(hkey, appkey, "MouseWarpOverride", buffer, sizeof(buffer))) @@ -310,7 +307,7 @@ const struct dinput_device mouse_device = { */ /* low-level mouse hook */ -static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) +int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = impl_from_IDirectInputDevice8A(iface);

1 0

Daniel Lehman : server: Fail if non-empty directory marked for deletion.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: a302ab44acaf72ecc9b0307c82a7d11f759e6a72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a302ab44acaf72ecc9b0307c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu May 28 20:28:09 2020 -0700 server: Fail if non-empty directory marked for deletion. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 3 -- server/fd.c | 74 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31c18454f0..1d0682a633 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3185,17 +3185,14 @@ todo_wine CloseHandle( handle2 ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %x)\n", res ); fileDeleted = DeleteFileA( buffer ); ok( fileDeleted, "File should have been deleted\n" ); buffer[dirpos] = '\0'; CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); fileDeleted = RemoveDirectoryA( buffer ); -todo_wine ok( fileDeleted, "Directory should have been deleted\n" ); } diff --git a/server/fd.c b/server/fd.c index 06d1d81bdb..7ea8ac273e 100644 --- a/server/fd.c +++ b/server/fd.c @@ -23,6 +23,7 @@ #include "wine/port.h" #include <assert.h> +#include <dirent.h> #include <errno.h> #include <fcntl.h> #include <limits.h> @@ -2364,6 +2365,31 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl return fd; } +static int is_dir_empty( int fd ) +{ + DIR *dir; + int empty; + struct dirent *de; + + if ((fd = dup( fd )) == -1) + return -1; + + if (!(dir = fdopendir( fd ))) + { + close( fd ); + return -1; + } + + empty = 1; + while (empty && (de = readdir( dir ))) + { + if (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." )) continue; + empty = 0; + } + closedir( dir ); + return empty; +} + /* set disposition for the fd */ static void set_fd_disposition( struct fd *fd, int unlink ) { @@ -2381,24 +2407,38 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - if (fstat( fd->unix_fd, &st ) == -1) + if (unlink) { - file_set_error(); - return; - } - - /* can't unlink special files */ - if (unlink && !S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode)) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - - /* can't unlink files we don't have permission to write */ - if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) && !S_ISDIR(st.st_mode)) - { - set_error( STATUS_CANNOT_DELETE ); - return; + if (fstat( fd->unix_fd, &st ) == -1) + { + file_set_error(); + return; + } + if (S_ISREG( st.st_mode )) /* can't unlink files we don't have permission to write */ + { + if (!(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + { + set_error( STATUS_CANNOT_DELETE ); + return; + } + } + else if (S_ISDIR( st.st_mode )) /* can't remove non-empty directories */ + { + switch (is_dir_empty( fd->unix_fd )) + { + case -1: + file_set_error(); + return; + case 0: + set_error( STATUS_DIRECTORY_NOT_EMPTY ); + return; + } + } + else /* can't unlink special files */ + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } } fd->closed->unlink = unlink ? 1 : 0;

1 0

Huw Davies : gdi32: Move the scan conversion to a helper function.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 31605eb4178094e4637ebc0017b5f037b82a9684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31605eb4178094e4637ebc00… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 9 10:54:48 2020 +0100 gdi32: Move the scan conversion to a helper function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 154 +++++++++++++++++++++++++--------------------------- 1 file changed, 73 insertions(+), 81 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 93238b5a84..893b6d6f4d 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2583,67 +2583,25 @@ static void REGION_FreeStorage(ScanLineListBlock *pSLLBlock) } } -/*********************************************************************** - * create_polypolygon_region - * - * Helper for CreatePolyPolygonRgn. - */ -HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygons, INT mode, - const RECT *clip_rect ) +static void scan_convert( WINEREGION *obj, EdgeTable *ET, INT mode, const RECT *clip_rect ) { - HRGN hrgn = 0; - WINEREGION *obj = NULL; - INT y; /* current scanline */ - struct list WETE, *pWETE; /* Winding Edge Table */ - ScanLineList *pSLL; /* current scanLineList */ - EdgeTable ET; /* header node for ET */ - struct list AET; /* header for AET */ - EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ - ScanLineListBlock SLLBlock; /* header for scanlinelist */ + struct list AET; + ScanLineList *pSLL; struct edge_table_entry *active; - unsigned int nb_points; - int cur_band = 0, prev_band = 0; - INT i, poly, total, first = 1; + INT i, y, first = 1, cur_band = 0, prev_band = 0; - TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); - - /* special case a rectangle */ + if (clip_rect) ET->ymax = min( ET->ymax, clip_rect->bottom ); - if (((nbpolygons == 1) && ((*Count == 4) || - ((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) && - (((Pts[0].y == Pts[1].y) && - (Pts[1].x == Pts[2].x) && - (Pts[2].y == Pts[3].y) && - (Pts[3].x == Pts[0].x)) || - ((Pts[0].x == Pts[1].x) && - (Pts[1].y == Pts[2].y) && - (Pts[2].x == Pts[3].x) && - (Pts[3].y == Pts[0].y)))) - return CreateRectRgn( min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y), - max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) ); - - for(poly = total = 0; poly < nbpolygons; poly++) - total += Count[poly]; - if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) - return 0; - - nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); - if (!(obj = alloc_region( nb_points / 2 ))) - goto done; - - if (clip_rect) ET.ymax = min( ET.ymax, clip_rect->bottom ); list_init( &AET ); - pSLL = ET.scanlines.next; - if (mode != WINDING) { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL != NULL && y == pSLL->scanline) { + pSLL = ET->scanlines.next; + + if (mode != WINDING) + { + for (y = ET->ymin; y < ET->ymax; y++) + { + /* Add a new edge to the active edge table when we get to the next edge. */ + if (pSLL != NULL && y == pSLL->scanline) + { REGION_loadAET(&AET, &pSLL->edgelist); pSLL = pSLL->next; } @@ -2676,33 +2634,26 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } } - else { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL != NULL && y == pSLL->scanline) { + else /* mode == WINDING */ + { + struct list WETE, *pWETE; + + for (y = ET->ymin; y < ET->ymax; y++) + { + /* Add a new edge to the active edge table when we get to the next edge. */ + if (pSLL != NULL && y == pSLL->scanline) + { REGION_loadAET(&AET, &pSLL->edgelist); REGION_computeWAET( &AET, &WETE ); pSLL = pSLL->next; } pWETE = list_head( &WETE ); - /* - * for each active edge - */ if (!clip_rect || y >= clip_rect->top) { LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) { - /* - * add to the buffer only those edges that - * are in the Winding active edge table. - */ + /* Add to the buffer only those edges that are in the Winding active edge table. */ if (pWETE == &active->winding_entry) { if (first) @@ -2722,10 +2673,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } - /* - * recompute the winding active edge table if - * we just resorted or have exited an edge. - */ + /* Recompute the winding active edge table if we just resorted or have exited an edge. */ if (next_scanline( &AET, y )) REGION_computeWAET( &AET, &WETE ); if (obj->numRects) @@ -2736,7 +2684,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } - assert( obj->numRects <= nb_points / 2 ); + assert( obj->numRects <= obj->size ); if (obj->numRects) { @@ -2751,11 +2699,55 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } REGION_compact( obj ); +} - if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) - free_region( obj ); +/*********************************************************************** + * create_polypolygon_region + * + * Helper for CreatePolyPolygonRgn. + */ +HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygons, INT mode, + const RECT *clip_rect ) +{ + HRGN hrgn = 0; + WINEREGION *obj = NULL; + EdgeTable ET; /* header node for ET */ + EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ + ScanLineListBlock SLLBlock; /* header for scanlinelist */ + unsigned int nb_points; + INT poly, total; + + TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); + + /* special case a rectangle */ + + if (((nbpolygons == 1) && ((*Count == 4) || + ((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) && + (((Pts[0].y == Pts[1].y) && + (Pts[1].x == Pts[2].x) && + (Pts[2].y == Pts[3].y) && + (Pts[3].x == Pts[0].x)) || + ((Pts[0].x == Pts[1].x) && + (Pts[1].y == Pts[2].y) && + (Pts[2].x == Pts[3].x) && + (Pts[3].y == Pts[0].y)))) + return CreateRectRgn( min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y), + max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) ); + + for(poly = total = 0; poly < nbpolygons; poly++) + total += Count[poly]; + if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) + return 0; + + nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); + if ((obj = alloc_region( nb_points / 2 ))) + { + scan_convert( obj, &ET, mode, clip_rect ); + + if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) + free_region( obj ); + } -done: REGION_FreeStorage(SLLBlock.next); HeapFree( GetProcessHeap(), 0, pETEs ); return hrgn;

1 0

Nikolay Sivov : dwrite: Do not require fontface object for HasCharacter().
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 745452ee948380261ce992ad681fc1dc6c16df2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=745452ee948380261ce992ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:35 2020 +0300 dwrite: Do not require fontface object for HasCharacter(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 41 +++++++ dlls/dwrite/font.c | 41 +++---- dlls/dwrite/opentype.c | 257 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 313 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=745452ee948380261ce9…

1 0

Nikolay Sivov : dwrite: Disallow recursing to reverse chaining substitution.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: fb5eec2c1eb8cffaa5ee1902469735baa7b404c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5eec2c1eb8cffaa5ee1902… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:34 2020 +0300 dwrite: Disallow recursing to reverse chaining substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 22ae106924..e502be1e12 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5482,6 +5482,9 @@ static BOOL opentype_layout_apply_gsub_reverse_chain_context_substitution(struct unsigned int offset = subtable_offset; UINT16 glyph, format; + if (context->nesting_level_left != SHAPE_MAX_NESTING_LEVEL) + return FALSE; + glyph = context->u.subst.glyphs[context->cur]; format = table_read_be_word(table, offset);

1 0

Nikolay Sivov : dwrite: Limit recursion level for context lookups.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 3c415128f1f63eb5b1d768b6b1d060c7ff319cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c415128f1f63eb5b1d768b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:33 2020 +0300 dwrite: Limit recursion level for context lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/opentype.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3d7884cb57..0bb5455a67 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -543,6 +543,8 @@ struct scriptshaping_context unsigned int cur; unsigned int glyph_count; + unsigned int nesting_level_left; + float emsize; DWRITE_MEASURING_MODE measuring_mode; float *advances; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8853f3a424..22ae106924 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -67,6 +67,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif +#define GLYPH_CONTEXT_MAX_LENGTH 64 +#define SHAPE_MAX_NESTING_LEVEL 6 + typedef struct { CHAR TTCTag[4]; DWORD Version; @@ -4616,6 +4619,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int i; BOOL ret; + context->nesting_level_left = SHAPE_MAX_NESTING_LEVEL; context->u.buffer.apply_context_lookup = opentype_layout_apply_gpos_context_lookup; opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); @@ -4993,8 +4997,6 @@ static BOOL opentype_layout_apply_gsub_lig_substitution(struct scriptshaping_con return FALSE; } -#define GLYPH_CONTEXT_MAX_LENGTH 64 - static BOOL opentype_layout_context_match_input(const struct match_context *mc, unsigned int count, const UINT16 *input, unsigned int *end_offset, unsigned int *match_positions) { @@ -5081,6 +5083,9 @@ static BOOL opentype_layout_context_apply_lookup(struct scriptshaping_context *c unsigned int i, j; int end, delta; + if (!context->nesting_level_left) + return TRUE; + end = context->cur + match_length; for (i = 0; i < lookup_count; ++i) @@ -5097,7 +5102,9 @@ static BOOL opentype_layout_context_apply_lookup(struct scriptshaping_context *c lookup_index = GET_BE_WORD(lookup_records[i+1]); + --context->nesting_level_left; context->u.buffer.apply_context_lookup(context, lookup_index); + ++context->nesting_level_left; delta = context->glyph_count - orig_len; if (!delta) @@ -5692,6 +5699,7 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int i; BOOL ret; + context->nesting_level_left = SHAPE_MAX_NESTING_LEVEL; context->u.buffer.apply_context_lookup = opentype_layout_apply_gsub_context_lookup; opentype_layout_collect_lookups(context, script_index, language_index, features, context->table, &lookups);

1 0

Alexandre Julliard : ntdll: Move the futex-based SRW lock implementation to the Unix library.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 246dedaa091308f140a3cac41845f5e978492e37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=246dedaa091308f140a3cac4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:35:01 2020 +0200 ntdll: Move the futex-based SRW lock implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 307 +----------------------------------- dlls/ntdll/unix/loader.c | 6 + dlls/ntdll/unix/sync.c | 345 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 7 + dlls/ntdll/unixlib.h | 10 +- 5 files changed, 373 insertions(+), 302 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=246dedaa091308f140a3…

1 0

Alexandre Julliard : ntdll: Move some more thread functions to the Unix library.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 4d70266274c1102c385dd00303d312d94453d19b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d70266274c1102c385dd003… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:34:37 2020 +0200 ntdll: Move some more thread functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 80 +++--------------------- dlls/ntdll/unix/loader.c | 8 ++- dlls/ntdll/unix/thread.c | 134 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 11 +++- 5 files changed, 157 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d70266274c1102c385d…

1 0

Alexandre Julliard : ntdll: Move signal handlers to the Unix library.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 2333099c52566c6cf3d3f981588a26d4ff408155 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2333099c52566c6cf3d3f981… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:32:41 2020 +0200 ntdll: Move signal handlers to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 71 -- dlls/ntdll/loader.c | 5 +- dlls/ntdll/ntdll_misc.h | 18 - dlls/ntdll/server.c | 153 ---- dlls/ntdll/signal_arm.c | 587 --------------- dlls/ntdll/signal_arm64.c | 458 ------------ dlls/ntdll/signal_i386.c | 1489 -------------------------------------- dlls/ntdll/signal_powerpc.c | 580 +-------------- dlls/ntdll/signal_x86_64.c | 718 +----------------- dlls/ntdll/thread.c | 12 +- dlls/ntdll/unix/loader.c | 6 - dlls/ntdll/unix/server.c | 33 +- dlls/ntdll/unix/signal_arm.c | 508 +++++++++++++ dlls/ntdll/unix/signal_arm64.c | 431 +++++++++++ dlls/ntdll/unix/signal_i386.c | 1310 ++++++++++++++++++++++++++++++++- dlls/ntdll/unix/signal_powerpc.c | 488 +++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 778 +++++++++++++++++++- dlls/ntdll/unix/thread.c | 11 +- dlls/ntdll/unix/unix_private.h | 15 +- dlls/ntdll/unix/virtual.c | 10 +- dlls/ntdll/unixlib.h | 10 +- dlls/ntdll/virtual.c | 44 +- 22 files changed, 3582 insertions(+), 4153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2333099c52566c6cf3d3…

1 0