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

Huw Davies : wineoss: Move midi_init to the unixlib.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: c4d7bfddff00b89fe4ce909c5db058f5a74b81d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d7bfddff00b89fe4ce909c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 19 07:38:44 2022 +0100 wineoss: Move midi_init to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/Makefile.in | 3 +- dlls/wineoss.drv/midi.c | 276 ++++------------------------------- dlls/wineoss.drv/oss.c | 1 + dlls/wineoss.drv/ossmidi.c | 335 +++++++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 38 +++++ 5 files changed, 403 insertions(+), 250 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4d7bfddff00b89fe4ce…

1 0

Huw Davies : winealsa: Wait for the notify buffer to empty, rather than dropping an event.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: ff1641ce0aee9e4f26aaadeb24630597b0cd7356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff1641ce0aee9e4f26aaadeb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 19 13:18:33 2022 +0100 winealsa: Wait for the notify buffer to empty, rather than dropping an event. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52828 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsamidi.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 4f3f5538891..b226dac310f 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -90,7 +90,8 @@ static int rec_cancel_pipe[2]; static pthread_t rec_thread_id; static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; +static pthread_cond_t notify_read_cond = PTHREAD_COND_INITIALIZER; +static pthread_cond_t notify_write_cond = PTHREAD_COND_INITIALIZER; static BOOL notify_quit; #define NOTIFY_BUFFER_SIZE 64 + 1 /* + 1 for the sentinel */ static struct notify_context notify_buffer[NOTIFY_BUFFER_SIZE]; @@ -156,19 +157,23 @@ static struct notify_context *notify_buffer_next(struct notify_context *notify) return notify; } -static void notify_buffer_add(struct notify_context *notify) +static BOOL notify_buffer_empty(void) { - struct notify_context *next = notify_buffer_next(notify_write); + return notify_read == notify_write; +} - if (next == notify_read) /* buffer is full - we can't issue a WARN() in a non-Win32 thread */ - notify_read = notify_buffer_next(notify_read); /* drop the oldest notification */ - *notify_write = *notify; - notify_write = next; +static BOOL notify_buffer_full(void) +{ + return notify_buffer_next(notify_write) == notify_read; } -static BOOL notify_buffer_empty(void) +static BOOL notify_buffer_add(struct notify_context *notify) { - return notify_read == notify_write; + if (notify_buffer_full()) return FALSE; + + *notify_write = *notify; + notify_write = notify_buffer_next(notify_write); + return TRUE; } static BOOL notify_buffer_remove(struct notify_context *notify) @@ -184,9 +189,15 @@ static void notify_post(struct notify_context *notify) { pthread_mutex_lock(&notify_mutex); - if (notify) notify_buffer_add(notify); + if (notify) + { + while (notify_buffer_full()) + pthread_cond_wait(&notify_write_cond, &notify_mutex); + + notify_buffer_add(notify); + } else notify_quit = TRUE; - pthread_cond_signal(&notify_cond); + pthread_cond_signal(&notify_read_cond); pthread_mutex_unlock(&notify_mutex); } @@ -1476,11 +1487,14 @@ NTSTATUS midi_notify_wait(void *args) pthread_mutex_lock(&notify_mutex); while (!notify_quit && notify_buffer_empty()) - pthread_cond_wait(&notify_cond, &notify_mutex); + pthread_cond_wait(&notify_read_cond, &notify_mutex); *params->quit = notify_quit; - if (!notify_quit) notify_buffer_remove(params->notify); - + if (!notify_quit) + { + notify_buffer_remove(params->notify); + pthread_cond_signal(&notify_write_cond); + } pthread_mutex_unlock(&notify_mutex); return STATUS_SUCCESS;

1 0

Nikolay Sivov : gdi32: Use NtUserGetSysColor() directly.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: f534e3f499dbee05352e155e43fbf9df0289d56f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f534e3f499dbee05352e155e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 14:00:32 2022 +0100 gdi32: Use NtUserGetSysColor() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/uniscribe/usp10.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index a5637dbf645..3e27fcc2a03 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -31,6 +31,7 @@ #include "windef.h" #include "winbase.h" #include "ntgdi.h" +#include "ntuser.h" #include "winuser.h" #include "winnls.h" #include "winreg.h" @@ -2107,19 +2108,6 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WOR return FALSE; } -static DWORD get_sys_color(INT index) -{ - static DWORD (WINAPI *pGetSysColor)(INT index); - - if (!pGetSysColor) - { - HMODULE user = GetModuleHandleW( L"user32.dll" ); - if (user) pGetSysColor = (void *)GetProcAddress( user, "GetSysColor" ); - } - - return pGetSysColor(index); -} - static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, int iX, int iY, @@ -2159,11 +2147,11 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, BkMode = GetBkMode(analysis->hdc); SetBkMode( analysis->hdc, OPAQUE); BkColor = GetBkColor(analysis->hdc); - SetBkColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHT)); + SetBkColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHT)); if (!fDisabled) { TextColor = GetTextColor(analysis->hdc); - SetTextColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHTTEXT)); + SetTextColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHTTEXT)); } } if (analysis->glyphs[iItem].fallbackFont)

1 0

Jacek Caban : winex11: Use NtUserBuildHwndList for has_owned_popup implementation.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 2425488ef66d774485ba3da9277fc9973c8a6669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2425488ef66d774485ba3da9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:30:18 2022 +0200 winex11: Use NtUserBuildHwndList for has_owned_popup implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3f20fc9c7d2..c1fc008b7d3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -39,6 +39,8 @@ /* avoid conflict with field names in included win32 headers */ #undef Status +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -161,12 +163,6 @@ static void remove_startup_notification(Display *display, Window window) } -struct has_popup_result -{ - HWND hwnd; - BOOL found; -}; - static BOOL is_managed( HWND hwnd ) { struct x11drv_win_data *data = get_win_data( hwnd ); @@ -175,24 +171,39 @@ static BOOL is_managed( HWND hwnd ) return ret; } -static BOOL CALLBACK has_managed_popup( HWND hwnd, LPARAM lparam ) +static HWND *build_hwnd_list(void) { - struct has_popup_result *result = (struct has_popup_result *)lparam; + NTSTATUS status; + HWND *list; + UINT count = 128; - if (hwnd == result->hwnd) return FALSE; /* popups are always above owner */ - if (GetWindow( hwnd, GW_OWNER ) != result->hwnd) return TRUE; - result->found = is_managed( hwnd ); - return !result->found; + for (;;) + { + if (!(list = malloc( count * sizeof(*list) ))) return NULL; + status = NtUserBuildHwndList( 0, 0, 0, 0, 0, count, list, &count ); + if (!status) return list; + free( list ); + if (status != STATUS_BUFFER_TOO_SMALL) return NULL; + } } static BOOL has_owned_popups( HWND hwnd ) { - struct has_popup_result result; + HWND *list; + UINT i; + BOOL ret = FALSE; - result.hwnd = hwnd; - result.found = FALSE; - EnumWindows( has_managed_popup, (LPARAM)&result ); - return result.found; + if (!(list = build_hwnd_list())) return FALSE; + + for (i = 0; list[i] != HWND_BOTTOM; i++) + { + if (list[i] == hwnd) break; /* popups are always above owner */ + if (NtUserGetWindowRelative( list[i], GW_OWNER ) != hwnd) continue; + if ((ret = is_managed( list[i] ))) break; + } + + free( list ); + return ret; }

1 0

Jacek Caban : winex11: Use build_hwnd_list for X11DRV_DisplayDevices_Update implementation.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 29062759676e87551848de5b2787304d7f950b49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29062759676e87551848de5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:30:26 2022 +0200 winex11: Use build_hwnd_list for X11DRV_DisplayDevices_Update implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 50 +++++++++++++++++++++++----------------------- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 ++ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a7229d3a256..928d2bd16f0 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -174,35 +174,13 @@ void X11DRV_DisplayDevices_RegisterEventHandlers(void) handler->register_event_handlers(); } -static BOOL CALLBACK update_windows_on_display_change(HWND hwnd, LPARAM lparam) -{ - struct x11drv_win_data *data; - UINT mask = (UINT)lparam; - - if (!(data = get_win_data(hwnd))) - return TRUE; - - /* update the full screen state */ - update_net_wm_states(data); - - if (mask && data->whole_window) - { - POINT pos = virtual_screen_to_root(data->whole_rect.left, data->whole_rect.top); - XWindowChanges changes; - changes.x = pos.x; - changes.y = pos.y; - XReconfigureWMWindow(data->display, data->whole_window, data->vis.screen, mask, &changes); - } - release_win_data(data); - return TRUE; -} - void X11DRV_DisplayDevices_Update(BOOL send_display_change) { RECT old_virtual_rect, new_virtual_rect; DWORD tid, pid; HWND foreground; - UINT mask = 0; + UINT mask = 0, i; + HWND *list; old_virtual_rect = NtUserGetVirtualScreenRect(); X11DRV_DisplayDevices_Init(TRUE); @@ -215,7 +193,29 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) mask |= CWY; X11DRV_resize_desktop(send_display_change); - EnumWindows(update_windows_on_display_change, (LPARAM)mask); + + list = build_hwnd_list(); + for (i = 0; list && list[i] != HWND_BOTTOM; i++) + { + struct x11drv_win_data *data; + + if (!(data = get_win_data( list[i] ))) continue; + + /* update the full screen state */ + update_net_wm_states(data); + + if (mask && data->whole_window) + { + POINT pos = virtual_screen_to_root(data->whole_rect.left, data->whole_rect.top); + XWindowChanges changes; + changes.x = pos.x; + changes.y = pos.y; + XReconfigureWMWindow(data->display, data->whole_window, data->vis.screen, mask, &changes); + } + release_win_data(data); + } + + free( list ); /* forward clip_fullscreen_window request to the foreground window */ if ((foreground = NtUserGetForegroundWindow()) && diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c1fc008b7d3..4c4e47884ff 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -171,7 +171,7 @@ static BOOL is_managed( HWND hwnd ) return ret; } -static HWND *build_hwnd_list(void) +HWND *build_hwnd_list(void) { NTSTATUS status; HWND *list; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 95e4b4ff29a..086e66b2366 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -28,6 +28,7 @@ #include <limits.h> #include <stdarg.h> +#include <stdlib.h> #include <pthread.h> #include <X11/Xlib.h> #include <X11/Xresource.h> @@ -690,6 +691,7 @@ extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN; extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN; extern DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) DECLSPEC_HIDDEN; +extern HWND *build_hwnd_list(void) DECLSPEC_HIDDEN; typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void *arg );

1 0

Jacek Caban : winex11: Use pthread_once in create_x11_physdev.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: aae54301207c1ce10f7f845c9ab6c5725036e2b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae54301207c1ce10f7f845c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:30:40 2022 +0200 winex11: Use pthread_once in create_x11_physdev. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 3447e7bc69f..88d09145f8e 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -37,7 +37,7 @@ static int palette_size; static Pixmap stock_bitmap_pixmap; /* phys bitmap for the default stock bitmap */ -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; +static pthread_once_t init_once = PTHREAD_ONCE_INIT; static const struct user_driver_funcs x11drv_funcs; static const struct gdi_dc_funcs *xrender_funcs; @@ -59,7 +59,7 @@ void init_recursive_mutex( pthread_mutex_t *mutex ) * * Perform initializations needed upon creation of the first device. */ -static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context ) +static void device_init(void) { /* Initialize XRender */ xrender_funcs = X11DRV_XRender_Init(); @@ -70,8 +70,6 @@ static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context ) palette_size = X11DRV_PALETTE_Init(); stock_bitmap_pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 1 ); - - return TRUE; } @@ -79,7 +77,7 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) { X11DRV_PDEVICE *physDev; - InitOnceExecuteOnce( &init_once, device_init, NULL, NULL ); + pthread_once( &init_once, device_init ); if (!(physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ))) return NULL;

1 0

Jacek Caban : win32u: Expose public parts of user_thread_info in ntuser.h.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 356f37466fe1db8216c86c7a5bbe41876b07f196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=356f37466fe1db8216c86c7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:31:01 2022 +0200 win32u: Expose public parts of user_thread_info in ntuser.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 12 ++++++------ dlls/user32/win.c | 6 +++--- dlls/win32u/driver.c | 2 +- dlls/win32u/message.c | 12 ++++++------ dlls/win32u/ntuser_private.h | 6 +----- dlls/win32u/sysparams.c | 2 +- dlls/win32u/window.c | 6 +++--- dlls/win32u/winstation.c | 6 +++--- include/ntuser.h | 15 +++++++++++++++ 9 files changed, 39 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=356f37466fe1db8216c8…

1 0

Jacek Caban : winex11: Use NtUserGetThreadInfo to access thread data.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 3e94864540fd1cd7dbd71f48a4c5e81a915357c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e94864540fd1cd7dbd71f48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:31:17 2022 +0200 winex11: Use NtUserGetThreadInfo to access thread data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 3 --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- include/ntuser.h | 6 ------ 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 535f3bdb95b..32da544c157 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4638,9 +4638,6 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_GetInputState: return get_input_state(); - case NtUserCallNoParam_GetMessagePos: - return NtUserGetThreadInfo()->message_pos; - case NtUserCallNoParam_ReleaseCapture: return release_capture(); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 147865e7af6..7ac31e326c6 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -572,7 +572,7 @@ static void set_input_focus( struct x11drv_win_data *data ) if (EVENT_x11_time_to_win32_time(0)) /* ICCCM says don't use CurrentTime, so try to use last message time if possible */ /* FIXME: this is not entirely correct */ - timestamp = GetMessageTime() - EVENT_x11_time_to_win32_time(0); + timestamp = NtUserGetThreadInfo()->message_time - EVENT_x11_time_to_win32_time(0); else timestamp = CurrentTime; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 3a6b9855ab0..82d3e17a0d1 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1617,7 +1617,7 @@ void move_resize_window( HWND hwnd, int dir ) if (!(win = X11DRV_get_whole_window( hwnd ))) return; - pt = NtUserGetMessagePos(); + pt = NtUserGetThreadInfo()->message_pos; pos = virtual_screen_to_root( (short)LOWORD( pt ), (short)HIWORD( pt ) ); if (NtUserGetKeyState( VK_LBUTTON ) & 0x8000) button = 1; diff --git a/include/ntuser.h b/include/ntuser.h index 2f1f9893ea9..e391940d63e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -596,7 +596,6 @@ enum { NtUserCallNoParam_GetDesktopWindow, NtUserCallNoParam_GetInputState, - NtUserCallNoParam_GetMessagePos, NtUserCallNoParam_ReleaseCapture, /* temporary exports */ NtUserExitingThread, @@ -614,11 +613,6 @@ static inline BOOL NtUserGetInputState(void) return NtUserCallNoParam( NtUserCallNoParam_GetInputState ); } -static inline DWORD NtUserGetMessagePos(void) -{ - return NtUserCallNoParam( NtUserCallNoParam_GetMessagePos ); -} - static inline BOOL NtUserReleaseCapture(void) { return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture );

1 0

Jacek Caban : winex11: Use TEB to store driver thread data.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: db9b7b0f511197255d0cbe81605a42e34bf630d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db9b7b0f511197255d0cbe81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:31:41 2022 +0200 winex11: Use TEB to store driver thread data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/x11drv.h | 6 +----- dlls/winex11.drv/x11drv_main.c | 9 +++------ include/ntuser.h | 1 + 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7ac31e326c6..900f24c4002 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -478,8 +478,8 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { + struct x11drv_thread_data *data = x11drv_thread_data(); DWORD ret; - struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); if (!data) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 086e66b2366..23886936dd4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -395,14 +395,10 @@ struct x11drv_thread_data }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN; -extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - DWORD err = GetLastError(); /* TlsGetValue always resets last error */ - struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); - SetLastError( err ); - return data; + return NtUserGetThreadInfo()->driver_data; } /* retrieve the thread display, or NULL if not created yet */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 203237f24aa..14ee13dc676 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -81,7 +81,6 @@ BOOL client_side_with_render = TRUE; BOOL shape_layered_windows = TRUE; int copy_default_colors = 128; int alloc_system_colors = 256; -DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; int xrender_error_base = 0; HMODULE x11drv_module = 0; char *process_name = NULL; @@ -650,8 +649,6 @@ static BOOL process_attach(void) setup_options(); - if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; - /* Open display */ if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); @@ -702,7 +699,7 @@ static BOOL process_attach(void) */ void X11DRV_ThreadDetach(void) { - struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + struct x11drv_thread_data *data = x11drv_thread_data(); if (data) { @@ -712,7 +709,7 @@ void X11DRV_ThreadDetach(void) XCloseDisplay( data->display ); HeapFree( GetProcessHeap(), 0, data ); /* clear data in case we get re-entered from user32 before the thread is truly dead */ - TlsSetValue( thread_data_tls_index, NULL ); + NtUserGetThreadInfo()->driver_data = NULL; } } @@ -773,7 +770,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) if (TRACE_ON(synchronous)) XSynchronize( data->display, True ); set_queue_display_fd( data->display ); - TlsSetValue( thread_data_tls_index, data ); + NtUserGetThreadInfo()->driver_data = data; if (use_xim) X11DRV_SetupXIM(); diff --git a/include/ntuser.h b/include/ntuser.h index e391940d63e..8eafd78beef 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -45,6 +45,7 @@ enum /* TEB thread info, not compatible with Windows */ struct ntuser_thread_info { + void *driver_data; /* driver-specific data */ DWORD message_time; /* value for GetMessageTime */ DWORD message_pos; /* value for GetMessagePos */ ULONG_PTR message_extra; /* value for GetMessageExtraInfo */

1 0

Jacek Caban : winex11: Directly use ntdll in display_device_init mutex.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 12cb04fd2f13707e5b7eeed24f0ef916e71cd4fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=12cb04fd2f13707e5b7eeed2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:31:53 2022 +0200 winex11: Directly use ntdll in display_device_init mutex. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 928d2bd16f0..f90cc455c36 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -29,17 +29,21 @@ struct x11drv_display_device_handler desktop_handler; HANDLE get_display_device_init_mutex(void) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; - HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); - - WaitForSingleObject(mutex, INFINITE); + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t'}; + UNICODE_STRING name = { sizeof(init_mutexW), sizeof(init_mutexW), (WCHAR *)init_mutexW }; + OBJECT_ATTRIBUTES attr; + HANDLE mutex = 0; + + InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); + NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ); + if (mutex) NtWaitForSingleObject( mutex, FALSE, NULL ); return mutex; } void release_display_device_init_mutex(HANDLE mutex) { - ReleaseMutex(mutex); - CloseHandle(mutex); + NtReleaseMutant( mutex, NULL ); + NtClose( mutex ); } POINT virtual_screen_to_root(INT x, INT y)

1 0