May 2022 - Wine-commits - list.winehq.org

Jacek Caban : winex11: Use ClipboardWindowProc driver entry point for clipboard manager.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 6f825503d9bebc6f657396b30bb34cbc88a7142e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f825503d9bebc6f657396b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 14:14:03 2022 +0200 winex11: Use ClipboardWindowProc driver entry point for clipboard manager. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 17 +++---- dlls/winex11.drv/dllmain.c | 102 ----------------------------------------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/unixlib.h | 11 ----- dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 1 - 7 files changed, 9 insertions(+), 126 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f2be4386e65..da451fad57c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2215,7 +2215,7 @@ static void xfixes_init(void) /************************************************************************** - * clipboard_thread + * clipboard_init * * Thread running inside the desktop process to manage the clipboard */ @@ -2250,20 +2250,18 @@ static BOOL clipboard_init( HWND hwnd ) /************************************************************************** * x11drv_clipboard_message */ -NTSTATUS x11drv_clipboard_message( void *arg ) +LRESULT X11DRV_ClipboardWindowProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - struct clipboard_message_params *params = arg; - - switch (params->msg) + switch (msg) { case WM_NCCREATE: - return clipboard_init( params->hwnd ); + return clipboard_init( hwnd ); case WM_CLIPBOARDUPDATE: if (is_clipboard_owner) break; /* ignore our own changes */ acquire_selection( thread_init_display() ); break; case WM_RENDERFORMAT: - if (render_format( params->wparam )) rendered_formats++; + if (render_format( wparam )) rendered_formats++; break; case WM_TIMER: if (!is_clipboard_owner) break; @@ -2272,12 +2270,11 @@ NTSTATUS x11drv_clipboard_message( void *arg ) case WM_DESTROYCLIPBOARD: TRACE( "WM_DESTROYCLIPBOARD: lost ownership\n" ); is_clipboard_owner = FALSE; - NtUserKillTimer( params->hwnd, 1 ); + NtUserKillTimer( hwnd, 1 ); break; } - return NtUserMessageCall( params->hwnd, params->msg, params->wparam, params->lparam, - NULL, NtUserDefWindowProc, FALSE ); + return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, NtUserDefWindowProc, FALSE ); } diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index b06c955c2a4..e2cbd51351d 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -21,112 +21,11 @@ #include "x11drv_dll.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(x11drv); - HMODULE x11drv_module = 0; static unixlib_handle_t x11drv_handle; NTSTATUS (CDECL *x11drv_unix_call)( enum x11drv_funcs code, void *params ); -/************************************************************************** - * wait_clipboard_mutex - * - * Make sure that there's only one clipboard thread per window station. - */ -static BOOL wait_clipboard_mutex(void) -{ - static const WCHAR prefix[] = {'_','_','w','i','n','e','_','c','l','i','p','b','o','a','r','d','_'}; - WCHAR buffer[MAX_PATH + ARRAY_SIZE( prefix )]; - HANDLE mutex; - - memcpy( buffer, prefix, sizeof(prefix) ); - if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_NAME, - buffer + ARRAY_SIZE( prefix ), - sizeof(buffer) - sizeof(prefix), NULL )) - { - ERR( "failed to get winstation name\n" ); - return FALSE; - } - mutex = CreateMutexW( NULL, TRUE, buffer ); - if (GetLastError() == ERROR_ALREADY_EXISTS) - { - TRACE( "waiting for mutex %s\n", debugstr_w( buffer )); - WaitForSingleObject( mutex, INFINITE ); - } - return TRUE; -} - - -/************************************************************************** - * clipboard_wndproc - * - * Window procedure for the clipboard manager. - */ -static LRESULT CALLBACK clipboard_wndproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) -{ - struct clipboard_message_params params; - - switch (msg) - { - case WM_NCCREATE: - case WM_CLIPBOARDUPDATE: - case WM_RENDERFORMAT: - case WM_TIMER: - case WM_DESTROYCLIPBOARD: - params.hwnd = hwnd; - params.msg = msg; - params.wparam = wp; - params.lparam = lp; - return X11DRV_CALL( clipboard_message, &params ); - } - - return DefWindowProcW( hwnd, msg, wp, lp ); -} - - -/************************************************************************** - * clipboard_thread - * - * Thread running inside the desktop process to manage the clipboard - */ -static DWORD WINAPI clipboard_thread( void *arg ) -{ - static const WCHAR clipboard_classname[] = {'_','_','w','i','n','e','_','c','l','i','p','b','o','a','r','d','_','m','a','n','a','g','e','r',0}; - WNDCLASSW class; - MSG msg; - - if (!wait_clipboard_mutex()) return 0; - - memset( &class, 0, sizeof(class) ); - class.lpfnWndProc = clipboard_wndproc; - class.lpszClassName = clipboard_classname; - - if (!RegisterClassW( &class ) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) - { - ERR( "could not register clipboard window class err %u\n", GetLastError() ); - return 0; - } - if (!CreateWindowW( clipboard_classname, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, 0, NULL )) - { - ERR( "failed to create clipboard window err %u\n", GetLastError() ); - return 0; - } - - while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); - return 0; -} - - -static NTSTATUS x11drv_clipboard_init( UINT arg ) -{ - DWORD id; - HANDLE thread = CreateThread( NULL, 0, clipboard_thread, NULL, 0, &id ); - - if (thread) CloseHandle( thread ); - else ERR( "failed to create clipboard thread\n" ); - return 0; -} - static NTSTATUS x11drv_load_icon( UINT id ) { @@ -137,7 +36,6 @@ static NTSTATUS x11drv_load_icon( UINT id ) typedef NTSTATUS (*callback_func)( UINT arg ); static const callback_func callback_funcs[] = { - x11drv_clipboard_init, x11drv_dnd_drop_event, x11drv_dnd_leave_event, x11drv_ime_get_cursor_pos, diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 3bdc05999f1..7c5a1acd7b6 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -425,6 +425,7 @@ static const struct user_driver_funcs x11drv_funcs = .pSetWindowText = X11DRV_SetWindowText, .pShowWindow = X11DRV_ShowWindow, .pSysCommand = X11DRV_SysCommand, + .pClipboardWindowProc = X11DRV_ClipboardWindowProc, .pUpdateClipboard = X11DRV_UpdateClipboard, .pUpdateLayeredWindow = X11DRV_UpdateLayeredWindow, .pWindowMessage = X11DRV_WindowMessage, diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 76cfad88f4d..451c308f0cd 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -21,7 +21,6 @@ enum x11drv_funcs { - unix_clipboard_message, unix_create_desktop, unix_init, unix_systray_clear, @@ -41,15 +40,6 @@ enum x11drv_funcs extern NTSTATUS (CDECL *x11drv_unix_call)( enum x11drv_funcs code, void *params ) DECLSPEC_HIDDEN; #define X11DRV_CALL(func, params) x11drv_unix_call( unix_ ## func, params ) -/* x11drv_clipboard_message params */ -struct clipboard_message_params -{ - HWND hwnd; - UINT msg; - WPARAM wparam; - LPARAM lparam; -}; - /* x11drv_create_desktop params */ struct create_desktop_params { @@ -108,7 +98,6 @@ C_ASSERT( client_func_last <= NtUserDriverCallbackLast + 1 ); /* simplified interface for client callbacks requiring only a single UINT parameter */ enum client_callback { - client_clipboard_init, client_dnd_drop_event, client_dnd_leave_event, client_ime_get_cursor_pos, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 07fb1515e24..5d9a93688c3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1913,7 +1913,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd ) CWOverrideRedirect | CWEventMask, &attr ); XFlush( data->display ); NtUserSetProp( hwnd, clip_window_prop, (HANDLE)data->clip_window ); - x11drv_client_call( client_clipboard_init, 0 ); X11DRV_DisplayDevices_RegisterEventHandlers(); } return TRUE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 222d7328387..307932b0bf0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -238,6 +238,7 @@ extern void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) D extern void X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) DECLSPEC_HIDDEN; extern UINT X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) DECLSPEC_HIDDEN; extern LRESULT X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; +extern LRESULT X11DRV_ClipboardWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) DECLSPEC_HIDDEN; extern void X11DRV_UpdateClipboard(void) DECLSPEC_HIDDEN; extern BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, const RECT *window_rect ) DECLSPEC_HIDDEN; @@ -833,7 +834,6 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) /* unixlib interface */ -extern NTSTATUS x11drv_clipboard_message( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_create_desktop( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_systray_clear( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_systray_dock( void *arg ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index a118757dfbe..dc987ae70a2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1302,7 +1302,6 @@ NTSTATUS x11drv_client_call( enum client_callback func, UINT arg ) const unixlib_entry_t __wine_unix_call_funcs[] = { - x11drv_clipboard_message, x11drv_create_desktop, x11drv_init, x11drv_systray_clear,

1 0

Jacek Caban : winemac: Use ClipboardWindowProc driver entry point for clipboard manager.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 2d4b85a9f7110b5b6d9ee6b28740a8a4053c040c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d4b85a9f7110b5b6d9ee6b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 00:23:21 2022 +0200 winemac: Use ClipboardWindowProc driver entry point for clipboard manager. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 133 ++++++++++--------------------------------- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 3 +- dlls/winemac.drv/window.c | 13 ----- 4 files changed, 33 insertions(+), 118 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index d431728036e..16eff401a98 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1425,7 +1425,7 @@ static UINT *get_clipboard_formats(UINT *size) for (;;) { if (!(ids = malloc(*size * sizeof(*ids)))) return NULL; - if (GetUpdatedClipboardFormats(ids, *size, size)) break; + if (NtUserGetUpdatedClipboardFormats(ids, *size, size)) break; free(ids); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; } @@ -1579,20 +1579,44 @@ static void update_clipboard(void) } +static BOOL init_clipboard(HWND hwnd) +{ + struct macdrv_window_features wf; + + memset(&wf, 0, sizeof(wf)); + clipboard_cocoa_window = macdrv_create_cocoa_window(&wf, CGRectMake(100, 100, 100, 100), hwnd, + macdrv_init_thread_data()->queue); + if (!clipboard_cocoa_window) + { + ERR("failed to create clipboard Cocoa window\n"); + return FALSE; + } + + clipboard_hwnd = hwnd; + clipboard_thread_id = GetCurrentThreadId(); + NtUserAddClipboardFormatListener(clipboard_hwnd); + register_builtin_formats(); + grab_win32_clipboard(); + + TRACE("clipboard thread %04x running\n", GetCurrentThreadId()); + return TRUE; +} + + /************************************************************************** - * clipboard_wndproc + * macdrv_ClipboardWindowProc * * Window procedure for the clipboard manager. */ -static LRESULT CALLBACK clipboard_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +LRESULT macdrv_ClipboardWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { switch (msg) { case WM_NCCREATE: - return TRUE; + return init_clipboard(hwnd); case WM_CLIPBOARDUPDATE: if (is_clipboard_owner) break; /* ignore our own changes */ - if ((LONG)(GetClipboardSequenceNumber() - last_get_seqno) <= 0) break; + if ((LONG)(NtUserGetClipboardSequenceNumber() - last_get_seqno) <= 0) break; set_mac_pasteboard_types_from_win32_clipboard(); break; case WM_RENDERFORMAT: @@ -1605,95 +1629,13 @@ static LRESULT CALLBACK clipboard_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM case WM_DESTROYCLIPBOARD: TRACE("WM_DESTROYCLIPBOARD: lost ownership\n"); is_clipboard_owner = FALSE; - KillTimer(hwnd, 1); + NtUserKillTimer(hwnd, 1); break; case WM_USER: update_clipboard(); break; } - return DefWindowProcW(hwnd, msg, wp, lp); -} - - -/************************************************************************** - * wait_clipboard_mutex - * - * Make sure that there's only one clipboard thread per window station. - */ -static BOOL wait_clipboard_mutex(void) -{ - static const WCHAR prefix[] = {'_','_','w','i','n','e','_','c','l','i','p','b','o','a','r','d','_'}; - WCHAR buffer[MAX_PATH + ARRAY_SIZE(prefix)]; - HANDLE mutex; - - memcpy(buffer, prefix, sizeof(prefix)); - if (!GetUserObjectInformationW(GetProcessWindowStation(), UOI_NAME, - buffer + ARRAY_SIZE(prefix), - sizeof(buffer) - sizeof(prefix), NULL)) - { - ERR("failed to get winstation name\n"); - return FALSE; - } - mutex = CreateMutexW(NULL, TRUE, buffer); - if (GetLastError() == ERROR_ALREADY_EXISTS) - { - TRACE("waiting for mutex %s\n", debugstr_w(buffer)); - WaitForSingleObject(mutex, INFINITE); - } - return TRUE; -} - - -/************************************************************************** - * clipboard_thread - * - * Thread running inside the desktop process to manage the clipboard - */ -static DWORD WINAPI clipboard_thread(void *arg) -{ - WNDCLASSW class; - struct macdrv_window_features wf; - MSG msg; - - if (!wait_clipboard_mutex()) return 0; - - memset(&class, 0, sizeof(class)); - class.lpfnWndProc = clipboard_wndproc; - class.lpszClassName = clipboard_classname; - - if (!RegisterClassW(&class) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) - { - ERR("could not register clipboard window class err %u\n", GetLastError()); - return 0; - } - if (!(clipboard_hwnd = CreateWindowW(clipboard_classname, NULL, 0, 0, 0, 0, 0, - HWND_MESSAGE, 0, 0, NULL))) - { - ERR("failed to create clipboard window err %u\n", GetLastError()); - return 0; - } - - memset(&wf, 0, sizeof(wf)); - clipboard_cocoa_window = macdrv_create_cocoa_window(&wf, CGRectMake(100, 100, 100, 100), clipboard_hwnd, - macdrv_init_thread_data()->queue); - if (!clipboard_cocoa_window) - { - ERR("failed to create clipboard Cocoa window\n"); - goto done; - } - - clipboard_thread_id = GetCurrentThreadId(); - NtUserAddClipboardFormatListener(clipboard_hwnd); - register_builtin_formats(); - grab_win32_clipboard(); - - TRACE("clipboard thread %04x running\n", GetCurrentThreadId()); - while (GetMessageW(&msg, 0, 0, 0)) DispatchMessageW(&msg); - -done: - macdrv_destroy_cocoa_window(clipboard_cocoa_window); - DestroyWindow(clipboard_hwnd); - return 0; + return NtUserMessageCall(hwnd, msg, wp, lp, NULL, NtUserDefWindowProc, FALSE); } @@ -1804,16 +1746,3 @@ void macdrv_lost_pasteboard_ownership(HWND hwnd) if (!macdrv_is_pasteboard_owner(clipboard_cocoa_window)) grab_win32_clipboard(); } - - -/************************************************************************** - * macdrv_init_clipboard - */ -void macdrv_init_clipboard(void) -{ - DWORD id; - HANDLE handle = CreateThread(NULL, 0, clipboard_thread, NULL, 0, &id); - - if (handle) CloseHandle(handle); - else ERR("failed to create clipboard thread\n"); -} diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 8d41778b472..3f83436d97a 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -266,8 +266,8 @@ static const struct user_driver_funcs macdrv_funcs = .pBeep = macdrv_Beep, .pChangeDisplaySettingsEx = macdrv_ChangeDisplaySettingsEx, .pClipCursor = macdrv_ClipCursor, + .pClipboardWindowProc = macdrv_ClipboardWindowProc, .pCreateDesktopWindow = macdrv_CreateDesktopWindow, - .pCreateWindow = macdrv_CreateWindow, .pDesktopWindowProc = macdrv_DesktopWindowProc, .pDestroyCursorIcon = macdrv_DestroyCursorIcon, .pDestroyWindow = macdrv_DestroyWindow, diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 26028247a96..9cd0509a39c 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -128,13 +128,13 @@ extern LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid) DECLSPEC_HIDDEN; extern BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags) DECLSPEC_HIDDEN; +extern LRESULT macdrv_ClipboardWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; extern void macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; extern BOOL macdrv_ClipCursor(LPCRECT clip) DECLSPEC_HIDDEN; extern BOOL macdrv_CreateDesktopWindow(HWND hwnd) DECLSPEC_HIDDEN; -extern BOOL macdrv_CreateWindow(HWND hwnd) DECLSPEC_HIDDEN; extern LRESULT macdrv_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN; extern void macdrv_DestroyWindow(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_SetFocus(HWND hwnd) DECLSPEC_HIDDEN; @@ -252,7 +252,6 @@ extern HKL macdrv_get_hkl_from_source(TISInputSourceRef input_source) DECLSPEC_H extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_UpdateClipboard(void) DECLSPEC_HIDDEN; -extern void macdrv_init_clipboard(void) DECLSPEC_HIDDEN; extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; extern void macdrv_lost_pasteboard_ownership(HWND hwnd) DECLSPEC_HIDDEN; extern const char *debugstr_format(UINT id) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 59788244c22..2f473730b2f 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1593,19 +1593,6 @@ LRESULT macdrv_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return NtUserMessageCall(hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE); } -/********************************************************************** - * CreateWindow (MACDRV.@) - */ -BOOL macdrv_CreateWindow(HWND hwnd) -{ - if (hwnd == NtUserGetDesktopWindow()) - { - macdrv_init_clipboard(); - } - return TRUE; -} - - /*********************************************************************** * DestroyWindow (MACDRV.@) */

1 0

Jacek Caban : win32u: Use user_callbacks for alertable NtWaitForMultipleObjects calls.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 7625e6ba20c70d59d61a73e5c2b2b5243e0e0143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7625e6ba20c70d59d61a73e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 02:36:03 2022 +0200 win32u: Use user_callbacks for alertable NtWaitForMultipleObjects calls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53020 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 1 + dlls/win32u/driver.c | 7 +++++-- dlls/win32u/ntuser_private.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 9cd9bd60146..e470d2ad688 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -162,6 +162,7 @@ static const struct user_callbacks user_funcs = EndMenu, ImmProcessKey, ImmTranslateMessage, + NtWaitForMultipleObjects, free_win_ptr, MENU_GetSysMenu, MENU_IsMenuActive, diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index b4cea3d42c8..1f538d100ed 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -813,8 +813,11 @@ static NTSTATUS nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE * { if (!count && timeout && !timeout->QuadPart) return WAIT_TIMEOUT; - return NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), - !!(flags & MWMO_ALERTABLE), timeout ); + if (!user_callbacks) + return NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), + !!(flags & MWMO_ALERTABLE), timeout ); + return user_callbacks->pNtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), + !!(flags & MWMO_ALERTABLE), timeout ); } static void nulldrv_ReleaseDC( HWND hwnd, HDC hdc ) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 931c87a6e1c..e39e3f54169 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -35,6 +35,7 @@ struct user_callbacks BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); + NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); void (CDECL *free_win_ptr)( struct tagWND *win ); HMENU (CDECL *get_sys_menu)( HWND hwnd, HMENU popup ); HWND (CDECL *is_menu_active)(void);

1 0

Akihiro Sagawa : winecoreaudio: Handle MIDI running status.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: ee56317d9d08b659279c4157ff029954a662996f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee56317d9d08b659279c4157… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 27 23:25:42 2022 +0900 winecoreaudio: Handle MIDI running status. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index bd5322cbc22..445b760be76 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -103,6 +103,7 @@ struct midi_dest MIDIOUTCAPSW caps; MIDIOPENDESC midiDesc; + BYTE runningStatus; WORD wFlags; }; @@ -598,6 +599,7 @@ static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, stru return MMSYSERR_ERROR; } } + dest->runningStatus = 0; dest->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); dest->midiDesc = *midi_desc; @@ -655,12 +657,30 @@ static UINT midi_out_data(WORD dev_id, UINT data) WARN("bad device ID : %d\n", dev_id); return MMSYSERR_BADDEVICEID; } + dest = dests + dev_id; bytes[0] = data & 0xff; - bytes[1] = (data >> 8) & 0xff; - bytes[2] = (data >> 16) & 0xff; + if (bytes[0] & 0x80) + { + bytes[1] = (data >> 8) & 0xff; + bytes[2] = (data >> 16) & 0xff; + if (bytes[0] < 0xF0) + dest->runningStatus = bytes[0]; + else if (bytes[0] <= 0xF7) + dest->runningStatus = 0; + } + else if (dest->runningStatus) + { + bytes[0] = dest->runningStatus; + bytes[1] = data & 0xff; + bytes[2] = (data >> 8) & 0xff; + } + else + { + FIXME("ooch %x\n", data); + return MMSYSERR_NOERROR; + } - dest = dests + dev_id; if (dest->caps.wTechnology == MOD_SYNTH) { sc = MusicDeviceMIDIEvent(dest->synth, bytes[0], bytes[1], bytes[2], 0); @@ -726,6 +746,7 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct else if (dest->caps.wTechnology == MOD_MIDIPORT) midi_send(midi_out_port, dest->dest, (UInt8 *)hdr->lpData, hdr->dwBufferLength); + dest->runningStatus = 0; hdr->dwFlags &= ~MHDR_INQUEUE; hdr->dwFlags |= MHDR_DONE; @@ -866,6 +887,8 @@ static UINT midi_out_reset(WORD dev_id) } else FIXME("MOD_MIDIPORT\n"); + dests[dev_id].runningStatus = 0; + /* FIXME: the LongData buffers must also be returned to the app */ return MMSYSERR_NOERROR; }

1 0

Eric Pouech : user32: Enable compilation with long types.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 9d72487f2102bd6eb245e199e73304c67bb5d41a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d72487f2102bd6eb245e199… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 31 11:38:38 2022 +0200 user32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 2 +- dlls/user32/combo.c | 6 +++--- dlls/user32/cursoricon.c | 36 ++++++++++++++++---------------- dlls/user32/dde_client.c | 16 +++++++------- dlls/user32/dde_misc.c | 54 ++++++++++++++++++++++++------------------------ dlls/user32/dde_server.c | 12 +++++------ dlls/user32/dialog.c | 12 +++++------ dlls/user32/edit.c | 16 +++++++------- dlls/user32/exticon.c | 8 +++---- dlls/user32/hook.c | 12 +++++------ dlls/user32/input.c | 2 +- dlls/user32/listbox.c | 4 ++-- dlls/user32/mdi.c | 18 ++++++++-------- dlls/user32/menu.c | 26 +++++++++++------------ dlls/user32/message.c | 22 ++++++++++---------- dlls/user32/misc.c | 34 +++++++++++++++--------------- dlls/user32/msgbox.c | 4 ++-- dlls/user32/nonclient.c | 16 +++++++------- dlls/user32/rawinput.c | 10 ++++----- dlls/user32/resource.c | 2 +- dlls/user32/scroll.c | 10 ++++----- dlls/user32/static.c | 4 ++-- dlls/user32/user_main.c | 4 ++-- dlls/user32/win.c | 10 ++++----- dlls/user32/winhelp.c | 2 +- dlls/user32/winpos.c | 2 +- dlls/user32/winproc.c | 12 +++++------ dlls/user32/winstation.c | 2 +- 28 files changed, 179 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d72487f2102bd6eb245…

1 0

Alexandre Julliard : kernelbase: Reimplement CompareStringEx using the sortkey generation code.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: d8c973ad95ba5e8a9a51df0dd9be587950179ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8c973ad95ba5e8a9a51df0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 22:38:28 2022 +0200 kernelbase: Reimplement CompareStringEx using the sortkey generation code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 117 +++++++++------------ dlls/kernelbase/locale.c | 237 +++++++++++++++++-------------------------- 2 files changed, 142 insertions(+), 212 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c973ad95ba5e8a9a51…

1 0

Alexandre Julliard : kernelbase: Reimplement FindNLSStringEx/W using the sortkey generation code.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: e613d294504a6fe69102b0c1bc050ebd33a1c64e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e613d294504a6fe69102b0c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 22:40:23 2022 +0200 kernelbase: Reimplement FindNLSStringEx/W using the sortkey generation code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 79 ++++++++---------------- dlls/kernelbase/locale.c | 143 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 143 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e613d294504a6fe69102…

1 0

Alexandre Julliard : kernelbase: Remove no longer needed case table initialization.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 99cbbb8998b58f9279a7785689eb5842782902be URL: https://source.winehq.org/git/wine.git/?a=commit;h=99cbbb8998b58f9279a77856… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 31 11:42:38 2022 +0200 kernelbase: Remove no longer needed case table initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 7152490268f..6ec80596355 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -300,7 +300,8 @@ struct norm_table /* WORD[] composition character sequences */ }; -static NLSTABLEINFO nls_info; +static CPTABLEINFO ansi_cpinfo; +static CPTABLEINFO oem_cpinfo; static UINT unix_cp = CP_UTF8; static LCID system_lcid; static LCID user_lcid; @@ -1933,7 +1934,8 @@ void init_locale( HMODULE module ) ansi_ptr = NtCurrentTeb()->Peb->AnsiCodePageData ? NtCurrentTeb()->Peb->AnsiCodePageData : utf8; oem_ptr = NtCurrentTeb()->Peb->OemCodePageData ? NtCurrentTeb()->Peb->OemCodePageData : utf8; - RtlInitNlsTables( ansi_ptr, oem_ptr, (USHORT *)sort.casemap, &nls_info ); + RtlInitCodePageTable( ansi_ptr, &ansi_cpinfo ); + RtlInitCodePageTable( oem_ptr, &oem_cpinfo ); RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Nls", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &nls_key, NULL ); @@ -2092,14 +2094,14 @@ static WCHAR compose_chars( WCHAR ch1, WCHAR ch2 ) static UINT get_locale_codepage( const NLS_LOCALE_DATA *locale, ULONG flags ) { UINT ret = locale->idefaultansicodepage; - if ((flags & LOCALE_USE_CP_ACP) || ret == CP_UTF8) ret = nls_info.AnsiTableInfo.CodePage; + if ((flags & LOCALE_USE_CP_ACP) || ret == CP_UTF8) ret = ansi_cpinfo.CodePage; return ret; } static UINT get_lcid_codepage( LCID lcid, ULONG flags ) { - UINT ret = nls_info.AnsiTableInfo.CodePage; + UINT ret = ansi_cpinfo.CodePage; if (!(flags & LOCALE_USE_CP_ACP) && lcid != system_lcid) { @@ -2121,9 +2123,9 @@ static const CPTABLEINFO *get_codepage_table( UINT codepage ) switch (codepage) { case CP_ACP: - return &nls_info.AnsiTableInfo; + return &ansi_cpinfo; case CP_OEMCP: - return &nls_info.OemTableInfo; + return &oem_cpinfo; case CP_MACCP: codepage = system_locale->idefaultmaccodepage; break; @@ -2131,8 +2133,8 @@ static const CPTABLEINFO *get_codepage_table( UINT codepage ) codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale, 0 ); break; } - if (codepage == nls_info.AnsiTableInfo.CodePage) return &nls_info.AnsiTableInfo; - if (codepage == nls_info.OemTableInfo.CodePage) return &nls_info.OemTableInfo; + if (codepage == ansi_cpinfo.CodePage) return &ansi_cpinfo; + if (codepage == oem_cpinfo.CodePage) return &oem_cpinfo; if (codepage == CP_UTF8) return &utf8_cpinfo; if (codepage == CP_UTF7) return &utf7_cpinfo; @@ -5271,7 +5273,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source, */ UINT WINAPI GetACP(void) { - return nls_info.AnsiTableInfo.CodePage; + return ansi_cpinfo.CodePage; } @@ -5653,7 +5655,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetNLSVersionEx( NLS_FUNCTION func, const WCHAR *l */ UINT WINAPI GetOEMCP(void) { - return nls_info.OemTableInfo.CodePage; + return oem_cpinfo.CodePage; } @@ -6149,7 +6151,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsCharXDigitW( WCHAR wc ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsDBCSLeadByte( BYTE testchar ) { - return nls_info.AnsiTableInfo.DBCSCodePage && nls_info.AnsiTableInfo.DBCSOffsets[testchar]; + return ansi_cpinfo.DBCSCodePage && ansi_cpinfo.DBCSOffsets[testchar]; }

1 0

Alexandre Julliard : make_unicode: Get rid of the old collation table.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 66fb3bf63134647f4ca4d326ea8b857da868e8f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66fb3bf63134647f4ca4d326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 22:41:06 2022 +0200 make_unicode: Get rid of the old collation table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 - dlls/kernelbase/collation.c | 1393 ------------------------------------------- tools/make_unicode | 105 ---- 3 files changed, 1499 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66fb3bf63134647f4ca4…

1 0

Jinoh Kang : include: Define fast fail codes and the __fastfail() intrinsic.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 253a2e2edb618371d7ab63e7c406134f1342e2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=253a2e2edb618371d7ab63e7… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Dec 8 03:12:41 2021 +0900 include: Define fast fail codes and the __fastfail() intrinsic. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 7aafbcf0cfe..87c4b4da92d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -934,6 +934,78 @@ NTSYSAPI PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ NTSYSAPI WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER); +/* Fast fail (__fastfail) codes */ + +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_CERTIFICATION_FAILURE 20 +#define FAST_FAIL_INVALID_EXCEPTION_CHAIN 21 +#define FAST_FAIL_CRYPTO_LIBRARY 22 +#define FAST_FAIL_INVALID_CALL_IN_DLL_CALLOUT 23 +#define FAST_FAIL_INVALID_IMAGE_BASE 24 +#define FAST_FAIL_DLOAD_PROTECTION_FAILURE 25 +#define FAST_FAIL_UNSAFE_EXTENSION_CALL 26 +#define FAST_FAIL_DEPRECATED_SERVICE_INVOKED 27 +#define FAST_FAIL_INVALID_BUFFER_ACCESS 28 +#define FAST_FAIL_INVALID_BALANCED_TREE 29 +#define FAST_FAIL_INVALID_NEXT_THREAD 30 +#define FAST_FAIL_GUARD_ICALL_CHECK_SUPPRESSED 31 +#define FAST_FAIL_APCS_DISABLED 32 +#define FAST_FAIL_INVALID_IDLE_STATE 33 +#define FAST_FAIL_MRDATA_PROTECTION_FAILURE 34 +#define FAST_FAIL_UNEXPECTED_HEAP_EXCEPTION 35 +#define FAST_FAIL_INVALID_LOCK_STATE 36 +#define FAST_FAIL_GUARD_JUMPTABLE 37 +#define FAST_FAIL_INVALID_LONGJUMP_TARGET 38 +#define FAST_FAIL_INVALID_DISPATCH_CONTEXT 39 +#define FAST_FAIL_INVALID_THREAD 40 +#define FAST_FAIL_INVALID_SYSCALL_NUMBER 41 +#define FAST_FAIL_INVALID_FILE_OPERATION 42 +#define FAST_FAIL_LPAC_ACCESS_DENIED 43 +#define FAST_FAIL_GUARD_SS_FAILURE 44 +#define FAST_FAIL_LOADER_CONTINUITY_FAILURE 45 +#define FAST_FAIL_GUARD_EXPORT_SUPPRESSION_FAILURE 46 +#define FAST_FAIL_INVALID_CONTROL_STACK 47 +#define FAST_FAIL_SET_CONTEXT_DENIED 48 +#define FAST_FAIL_INVALID_IAT 49 +#define FAST_FAIL_HEAP_METADATA_CORRUPTION 50 +#define FAST_FAIL_PAYLOAD_RESTRICTION_VIOLATION 51 +#define FAST_FAIL_LOW_LABEL_ACCESS_DENIED 52 +#define FAST_FAIL_ENCLAVE_CALL_FAILURE 53 +#define FAST_FAIL_UNHANDLED_LSS_EXCEPTON 54 +#define FAST_FAIL_ADMINLESS_ACCESS_DENIED 55 +#define FAST_FAIL_UNEXPECTED_CALL 56 +#define FAST_FAIL_CONTROL_INVALID_RETURN_ADDRESS 57 +#define FAST_FAIL_UNEXPECTED_HOST_BEHAVIOR 58 +#define FAST_FAIL_FLAGS_CORRUPTION 59 +#define FAST_FAIL_VEH_CORRUPTION 60 +#define FAST_FAIL_ETW_CORRUPTION 61 +#define FAST_FAIL_RIO_ABORT 62 +#define FAST_FAIL_INVALID_PFN 63 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE_XFG 64 +#define FAST_FAIL_CAST_GUARD 65 +#define FAST_FAIL_HOST_VISIBILITY_CHANGE 66 +#define FAST_FAIL_KERNEL_CET_SHADOW_STACK_ASSIST 67 +#define FAST_FAIL_PATCH_CALLBACK_FAILED 68 +#define FAST_FAIL_NTDLL_PATCH_FAILED 69 +#define FAST_FAIL_INVALID_FLS_DATA 70 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001 @@ -6318,6 +6390,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #pragma intrinsic(_InterlockedDecrement16) #pragma intrinsic(_InterlockedOr) #pragma intrinsic(_InterlockedXor) +#pragma intrinsic(__fastfail) BOOLEAN _BitScanForward(unsigned long*,unsigned long); BOOLEAN _BitScanReverse(unsigned long*,unsigned long); @@ -6332,6 +6405,7 @@ long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); long _InterlockedXor(long volatile *,long); +DECLSPEC_NORETURN void __fastfail(unsigned int); static FORCEINLINE long InterlockedAdd( long volatile *dest, long val ) { @@ -6514,6 +6588,19 @@ static FORCEINLINE void MemoryBarrier(void) __sync_synchronize(); } +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ +#if defined(__x86_64__) || defined(__i386__) + for (;;) __asm__ __volatile__( "int $0x29" :: "c" ((ULONG_PTR)code) : "memory" ); +#elif defined(__aarch64__) + register ULONG_PTR val __asm__("x0") = code; + for (;;) __asm__ __volatile__( "brk #0xf003" :: "r" (val) : "memory" ); +#elif defined(__arm__) + register ULONG_PTR val __asm__("r0") = code; + for (;;) __asm__ __volatile__( "udf #0xfb" :: "r" (val) : "memory" ); +#endif +} + #endif /* __GNUC__ */ #ifdef _WIN64

1 0