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

Alex Henrie : wldap32: Clean up LDAP_OPT_API_INFO.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: e24bcef1578fdaff3f14068e02181663bd453584 URL: https://gitlab.winehq.org/wine/wine/-/commit/e24bcef1578fdaff3f14068e021816… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jun 10 12:26:51 2023 -0600 wldap32: Clean up LDAP_OPT_API_INFO. Fix memory leaks on error paths, don't call memset unnecessarily, and ensure that all output fields are initialized. --- dlls/wldap32/option.c | 77 +++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 3d63b116e10..c3e17f81b47 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -63,28 +63,33 @@ ULONG CDECL ldap_get_optionA( LDAP *ld, int option, void *value ) LDAPAPIInfoW infoW; LDAPAPIInfoA *infoA = value; - memset( &infoW, 0, sizeof(infoW) ); infoW.ldapai_info_version = infoA->ldapai_info_version; ret = ldap_get_optionW( ld, option, &infoW ); - if (ret == WLDAP32_LDAP_SUCCESS) - { - infoA->ldapai_api_version = infoW.ldapai_api_version; - infoA->ldapai_protocol_version = infoW.ldapai_protocol_version; + if (ret != WLDAP32_LDAP_SUCCESS) return ret; - if (infoW.ldapai_extensions && !(infoA->ldapai_extensions = strarrayWtoA( infoW.ldapai_extensions ))) - return WLDAP32_LDAP_NO_MEMORY; - if (infoW.ldapai_vendor_name && !(infoA->ldapai_vendor_name = strWtoA( infoW.ldapai_vendor_name ))) - { - ldap_value_freeW( infoW.ldapai_extensions ); - return WLDAP32_LDAP_NO_MEMORY; - } - infoA->ldapai_vendor_version = infoW.ldapai_vendor_version; + infoA->ldapai_extensions = strarrayWtoA( infoW.ldapai_extensions ); + if (infoW.ldapai_extensions && !infoA->ldapai_extensions) + { + strarrayfreeW( infoW.ldapai_extensions ); + free( infoW.ldapai_vendor_name ); + return WLDAP32_LDAP_NO_MEMORY; + } - ldap_value_freeW( infoW.ldapai_extensions ); - ldap_memfreeW( infoW.ldapai_vendor_name ); + infoA->ldapai_vendor_name = strWtoA( infoW.ldapai_vendor_name ); + if (infoW.ldapai_vendor_name && !infoA->ldapai_vendor_name) + { + strarrayfreeW( infoW.ldapai_extensions ); + free( infoW.ldapai_vendor_name ); + strarrayfreeA( infoA->ldapai_extensions ); + return WLDAP32_LDAP_NO_MEMORY; } - return ret; + + infoA->ldapai_api_version = infoW.ldapai_api_version; + infoA->ldapai_protocol_version = infoW.ldapai_protocol_version; + infoA->ldapai_vendor_version = infoW.ldapai_vendor_version; + + return WLDAP32_LDAP_SUCCESS; } case WLDAP32_LDAP_OPT_DEREF: @@ -184,28 +189,34 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value ) LDAPAPIInfo infoU; LDAPAPIInfoW *infoW = value; - memset( &infoU, 0, sizeof(infoU) ); infoU.ldapai_info_version = infoW->ldapai_info_version; - ret = map_error( ldap_get_option( CTX(ld), option, &infoU ) ); - if (ret == WLDAP32_LDAP_SUCCESS) - { - infoW->ldapai_api_version = infoU.ldapai_api_version; - infoW->ldapai_protocol_version = infoU.ldapai_protocol_version; + ret = ldap_get_option( CTX(ld), option, &infoU ); + if (ret != LDAP_SUCCESS) return map_error( ret ); - if (infoU.ldapai_extensions && !(infoW->ldapai_extensions = strarrayUtoW( infoU.ldapai_extensions ))) - return WLDAP32_LDAP_NO_MEMORY; - if (infoU.ldapai_vendor_name && !(infoW->ldapai_vendor_name = strUtoW( infoU.ldapai_vendor_name ))) - { - ldap_memvfree( (void **)infoU.ldapai_extensions ); - return WLDAP32_LDAP_NO_MEMORY; - } - infoW->ldapai_vendor_version = infoU.ldapai_vendor_version; + infoW->ldapai_extensions = strarrayUtoW( infoU.ldapai_extensions ); + if (infoU.ldapai_extensions && !infoW->ldapai_extensions) + { + ret = WLDAP32_LDAP_NO_MEMORY; + strarrayfreeU( infoU.ldapai_extensions ); + free( infoU.ldapai_vendor_name ); + return WLDAP32_LDAP_NO_MEMORY; + } - ldap_memvfree( (void **)infoU.ldapai_extensions ); - ldap_memfree( infoU.ldapai_vendor_name ); + infoW->ldapai_vendor_name = strUtoW( infoU.ldapai_vendor_name ); + if (infoU.ldapai_vendor_name && !infoW->ldapai_vendor_name) + { + strarrayfreeU( infoU.ldapai_extensions ); + free( infoU.ldapai_vendor_name ); + strarrayfreeW( infoW->ldapai_extensions ); + return WLDAP32_LDAP_NO_MEMORY; } - return ret; + + infoW->ldapai_api_version = infoU.ldapai_api_version; + infoW->ldapai_protocol_version = infoU.ldapai_protocol_version; + infoW->ldapai_vendor_version = infoU.ldapai_vendor_version; + + return WLDAP32_LDAP_SUCCESS; } case WLDAP32_LDAP_OPT_DEREF:

1 0

Rémi Bernon : winex11: Don't grab the cursor if another process is focused.
by Alexandre Julliard June 15, 2023

June 15, 2023

Module: wine Branch: master Commit: 89415925b7a43d11317c5ffc27ef2d29c20d0970 URL: https://gitlab.winehq.org/wine/wine/-/commit/89415925b7a43d11317c5ffc27ef2d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 15 09:34:53 2023 +0200 winex11: Don't grab the cursor if another process is focused. This might be the case when in virtual desktop mode for instance, where we don't change Wine foreground window when the virtual desktop is focused out. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55046 --- dlls/winex11.drv/event.c | 25 +++++++++++++------------ dlls/winex11.drv/mouse.c | 6 ++++-- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 55709a0bc5f..6bdf9bcbf4f 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -746,6 +746,18 @@ static const char * const focus_modes[] = "NotifyWhileGrabbed" }; +BOOL is_current_process_focused(void) +{ + Display *display = x11drv_thread_data()->display; + Window focus; + int revert; + HWND hwnd; + + XGetInputFocus( display, &focus, &revert ); + if (focus && !XFindContext( display, focus, winContext, (char **)&hwnd )) return TRUE; + return FALSE; +} + /********************************************************************** * X11DRV_FocusIn */ @@ -799,10 +811,6 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) */ static void focus_out( Display *display , HWND hwnd ) { - HWND hwnd_tmp; - Window focus_win; - int revert; - if (xim_in_compose_mode()) return; x11drv_thread_data()->last_focus = hwnd; @@ -820,14 +828,7 @@ static void focus_out( Display *display , HWND hwnd ) /* don't reset the foreground window, if the window which is getting the focus is a Wine window */ - XGetInputFocus( display, &focus_win, &revert ); - if (focus_win) - { - if (XFindContext( display, focus_win, winContext, (char **)&hwnd_tmp ) != 0) - focus_win = 0; - } - - if (!focus_win) + if (!is_current_process_focused()) { /* Abey : 6-Oct-99. Check again if the focus out window is the Foreground window, because in most cases the messages sent diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 46d26726264..faf0c26021d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -359,8 +359,10 @@ static BOOL grab_clipping_window( const RECT *clip ) HCURSOR cursor; POINT pos; - if (NtUserGetWindowThread( NtUserGetDesktopWindow(), NULL ) == GetCurrentThreadId()) - return TRUE; /* don't clip in the desktop process */ + /* don't clip in the desktop process */ + if (NtUserGetWindowThread( NtUserGetDesktopWindow(), NULL ) == GetCurrentThreadId()) return TRUE; + /* don't clip the cursor if the X input focus is on another process window */ + if (!is_current_process_focused()) return TRUE; if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8827d0cc0c2..0abf30a4c58 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -676,6 +676,7 @@ extern XContext winContext DECLSPEC_HIDDEN; /* X context to associate an X cursor to a Win32 cursor handle */ extern XContext cursor_context DECLSPEC_HIDDEN; +extern BOOL is_current_process_focused(void) DECLSPEC_HIDDEN; extern void X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : winex11: Simplify the cursor clipping retry mechanism.
by Alexandre Julliard June 15, 2023

June 15, 2023

Module: wine Branch: master Commit: 1f90d03b7888f902d2aa6101bd60aa47766071cd URL: https://gitlab.winehq.org/wine/wine/-/commit/1f90d03b7888f902d2aa6101bd60aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 15 08:53:08 2023 +0200 winex11: Simplify the cursor clipping retry mechanism. If the focus changes between Wine windows, the wineserver logic will decide to reset the clipping rectangle. However winex11 also needs to support the case when focus changes to a host window, in virtual desktop mode, and in this case the foreground window doesn't actually change. To fix this, in virtual desktop mode, release the cursor on focus out events, and reapply the cursor clipping rect when the virtual desktop window is focused again. We can use the same logic on NotifyGrab events, when the WM grabs the keyboard, and later reapply the Wine clipping rect when we are notified about the keyboard ungrab. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55046 --- dlls/winex11.drv/event.c | 60 ++++++++++++----------------------------------- dlls/winex11.drv/mouse.c | 22 ++++------------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 21 insertions(+), 62 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6bdf9bcbf4f..c3c8d9a4070 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -764,31 +764,23 @@ BOOL is_current_process_focused(void) static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) { XFocusChangeEvent *event = &xev->xfocus; + BOOL was_grabbed; if (!hwnd) return FALSE; TRACE( "win %p xwin %lx detail=%s mode=%s\n", hwnd, event->window, focus_details[event->detail], focus_modes[event->mode] ); if (event->detail == NotifyPointer) return FALSE; + /* when focusing in the virtual desktop window, re-apply the cursor clipping rect */ + if (is_virtual_desktop() && hwnd == NtUserGetDesktopWindow()) retry_grab_clipping_window(); if (hwnd == NtUserGetDesktopWindow()) return FALSE; - switch (event->mode) - { - case NotifyGrab: - /* these are received when moving undecorated managed windows on mutter */ - keyboard_grabbed = TRUE; - return FALSE; - case NotifyWhileGrabbed: - keyboard_grabbed = TRUE; - break; - case NotifyNormal: - keyboard_grabbed = FALSE; - break; - case NotifyUngrab: - keyboard_grabbed = FALSE; - retry_grab_clipping_window(); - return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ - } + /* when keyboard grab is released, re-apply the cursor clipping rect */ + was_grabbed = keyboard_grabbed; + keyboard_grabbed = event->mode == NotifyGrab || event->mode == NotifyWhileGrabbed; + if (was_grabbed > keyboard_grabbed) retry_grab_clipping_window(); + /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ + if (event->mode == NotifyGrab || event->mode == NotifyUngrab) return FALSE; xim_set_focus( hwnd, TRUE ); @@ -816,11 +808,7 @@ static void focus_out( Display *display , HWND hwnd ) x11drv_thread_data()->last_focus = hwnd; xim_set_focus( hwnd, FALSE ); - if (is_virtual_desktop()) - { - if (hwnd == NtUserGetDesktopWindow()) NtUserClipCursor( NULL ); - return; - } + if (is_virtual_desktop()) return; if (hwnd != NtUserGetForegroundWindow()) return; if (!(NtUserGetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE)) send_message( hwnd, WM_CANCELMODE, 0, 0 ); @@ -860,29 +848,11 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) } if (!hwnd) return FALSE; - switch (event->mode) - { - case NotifyUngrab: - /* these are received when moving undecorated managed windows on mutter */ - keyboard_grabbed = FALSE; - return FALSE; - case NotifyNormal: - keyboard_grabbed = FALSE; - break; - case NotifyWhileGrabbed: - keyboard_grabbed = TRUE; - break; - case NotifyGrab: - keyboard_grabbed = TRUE; - - /* This will do nothing due to keyboard_grabbed == TRUE, but it - * will save the current clipping rect so we can restore it on - * FocusIn with NotifyUngrab mode. - */ - retry_grab_clipping_window(); - - return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ - } + /* in virtual desktop mode or when keyboard is grabbed, release any cursor grab but keep the clipping rect */ + keyboard_grabbed = event->mode == NotifyGrab || event->mode == NotifyWhileGrabbed; + if (is_virtual_desktop() || keyboard_grabbed) ungrab_clipping_window(); + /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ + if (event->mode == NotifyGrab || event->mode == NotifyUngrab) return FALSE; focus_out( event->display, hwnd ); return TRUE; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index faf0c26021d..7eb08d242eb 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -123,9 +123,6 @@ static const UINT button_up_data[NB_BUTTONS] = XContext cursor_context = 0; -static RECT last_clip_rect; -static HWND last_clip_foreground_window; -static BOOL last_clip_refused; static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); @@ -375,15 +372,8 @@ static BOOL grab_clipping_window( const RECT *clip ) if (keyboard_grabbed) { WARN( "refusing to clip to %s\n", wine_dbgstr_rect(clip) ); - last_clip_refused = TRUE; - last_clip_foreground_window = NtUserGetForegroundWindow(); - last_clip_rect = *clip; return FALSE; } - else - { - last_clip_refused = FALSE; - } /* enable XInput2 unless we are already clipping */ if (!data->clip_hwnd) enable_xinput2(); @@ -445,7 +435,7 @@ static BOOL grab_clipping_window( const RECT *clip ) * * Release the pointer grab on the clip window. */ -static void ungrab_clipping_window(void) +void ungrab_clipping_window(void) { struct x11drv_thread_data *data = x11drv_init_thread_data(); Window clip_window = init_clip_window(); @@ -464,15 +454,13 @@ static void ungrab_clipping_window(void) /*********************************************************************** * retry_grab_clipping_window * - * Restore the current clip rectangle or retry the last one if it has - * been refused because of an active keyboard grab. + * Restore the current clip rectangle. */ void retry_grab_clipping_window(void) { - if (clipping_cursor) - NtUserClipCursor( &clip_rect ); - else if (last_clip_refused && NtUserGetForegroundWindow() == last_clip_foreground_window) - NtUserClipCursor( &last_clip_rect ); + RECT rect; + NtUserGetClipCursor( &rect ); + NtUserClipCursor( &rect ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0abf30a4c58..26b4ffd9a1d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -680,6 +680,7 @@ extern BOOL is_current_process_focused(void) DECLSPEC_HIDDEN; extern void X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN; +extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN; extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ProcessEvents( DWORD mask ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : winex11: Replace the clipping message HWND with a BOOL flag.
by Alexandre Julliard June 15, 2023

June 15, 2023

Module: wine Branch: master Commit: 272f712b605174e946da1dc65f927a23ee92a572 URL: https://gitlab.winehq.org/wine/wine/-/commit/272f712b605174e946da1dc65f927a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 14 00:12:03 2023 +0200 winex11: Replace the clipping message HWND with a BOOL flag. We don't need the window anymore, it was only used to send ClipCursor notifications. This improves cursor clipping performance a lot as it avoids re-creating a window every time. --- dlls/winex11.drv/mouse.c | 28 +++++++--------------------- dlls/winex11.drv/x11drv.h | 2 +- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7eb08d242eb..f2375a807b2 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -348,11 +348,8 @@ static void disable_xinput2(void) static BOOL grab_clipping_window( const RECT *clip ) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H - static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); - UNICODE_STRING class_name = RTL_CONSTANT_STRING( messageW ); Window clip_window; - HWND msg_hwnd = 0; HCURSOR cursor; POINT pos; @@ -364,11 +361,6 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; - if (!(msg_hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, 0, 0, 0, 0, 0, - HWND_MESSAGE, 0, NtCurrentTeb()->Peb->ImageBaseAddress, - NULL, 0, NULL, 0, FALSE ))) - return TRUE; - if (keyboard_grabbed) { WARN( "refusing to clip to %s\n", wine_dbgstr_rect(clip) ); @@ -376,26 +368,25 @@ static BOOL grab_clipping_window( const RECT *clip ) } /* enable XInput2 unless we are already clipping */ - if (!data->clip_hwnd) enable_xinput2(); + if (!data->clipping_cursor) enable_xinput2(); if (data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); - NtUserDestroyWindow( msg_hwnd ); NtUserClipCursor( NULL ); return TRUE; } TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window ); - if (!data->clip_hwnd) XUnmapWindow( data->display, clip_window ); + if (!data->clipping_cursor) XUnmapWindow( data->display, clip_window ); pos = virtual_screen_to_root( clip->left, clip->top ); XMoveResizeWindow( data->display, clip_window, pos.x, pos.y, max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) ); XMapWindow( data->display, clip_window ); /* if the rectangle is shrinking we may get a pointer warp */ - if (!data->clip_hwnd || clip->left > clip_rect.left || clip->top > clip_rect.top || + if (!data->clipping_cursor || clip->left > clip_rect.left || clip->top > clip_rect.top || clip->right < clip_rect.right || clip->bottom < clip_rect.bottom) data->warp_serial = NextRequest( data->display ); @@ -418,11 +409,10 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!clipping_cursor) { disable_xinput2(); - NtUserDestroyWindow( msg_hwnd ); return FALSE; } clip_rect = *clip; - data->clip_hwnd = msg_hwnd; + data->clipping_cursor = TRUE; return TRUE; #else WARN( "XInput2 was not available at compile time\n" ); @@ -446,8 +436,7 @@ void ungrab_clipping_window(void) XUnmapWindow( data->display, clip_window ); if (clipping_cursor) XUngrabPointer( data->display, CurrentTime ); clipping_cursor = FALSE; - NtUserDestroyWindow( data->clip_hwnd ); - data->clip_hwnd = 0; + data->clipping_cursor = FALSE; disable_xinput2(); } @@ -495,7 +484,7 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x if (!hwnd) { thread_data = x11drv_thread_data(); - if (!thread_data->clip_hwnd) return; + if (!thread_data->clipping_cursor) return; if (thread_data->clip_window != window) return; pt.x += clip_rect.left; pt.y += clip_rect.top; @@ -539,10 +528,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU if (!hwnd) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - HWND clip_hwnd = thread_data->clip_hwnd; - - if (!clip_hwnd) return; - if (thread_data->clip_window != window) return; + if (!thread_data->clipping_cursor || thread_data->clip_window != window) return; __wine_send_input( hwnd, input, NULL ); return; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 26b4ffd9a1d..ef3f620dc52 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -388,7 +388,7 @@ struct x11drv_thread_data Window selection_wnd; /* window used for selection interactions */ unsigned long warp_serial; /* serial number of last pointer warp request */ Window clip_window; /* window used for cursor clipping */ - HWND clip_hwnd; /* message window stored in desktop while clipping is active */ + BOOL clipping_cursor; /* whether thread is currently clipping the cursor */ #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */

1 0

Rémi Bernon : server: Update the DF_WINE_CREATE_DESKTOP desktop flag on opening.
by Alexandre Julliard June 15, 2023

June 15, 2023

Module: wine Branch: master Commit: f4cb3230d84042075961b95178d3e1ac4bc49271 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4cb3230d84042075961b95178d3e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 14 19:25:40 2023 +0200 server: Update the DF_WINE_CREATE_DESKTOP desktop flag on opening. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55047 --- server/winstation.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/winstation.c b/server/winstation.c index 1408e1a9e65..5903497d61e 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "winuser.h" #include "winternl.h" +#include "ntuser.h" #include "object.h" #include "handle.h" @@ -240,7 +241,11 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned list_add_tail( &winstation->desktops, &desktop->entry ); list_init( &desktop->hotkeys ); } - else clear_error(); + else + { + desktop->flags |= (flags & DF_WINE_CREATE_DESKTOP); + clear_error(); + } } return desktop; }

1 0

Rémi Bernon : win32u: NtUserGetObjectInformation returns a BOOL, not NTSTATUS.
by Alexandre Julliard June 15, 2023

June 15, 2023

Module: wine Branch: master Commit: b3c1bd33e0c913def8f214baf7875f2ef8a46e6e URL: https://gitlab.winehq.org/wine/wine/-/commit/b3c1bd33e0c913def8f214baf7875f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 14 19:27:59 2023 +0200 win32u: NtUserGetObjectInformation returns a BOOL, not NTSTATUS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55047 --- dlls/win32u/winstation.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 049ed111954..6877136e144 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -44,12 +44,9 @@ BOOL is_virtual_desktop(void) { HANDLE desktop = NtUserGetThreadDesktop( GetCurrentThreadId() ); USEROBJECTFLAGS flags = {0}; - NTSTATUS status; DWORD len; - status = NtUserGetObjectInformation( desktop, UOI_FLAGS, &flags, sizeof(flags), &len ); - if (status) return FALSE; - + if (!NtUserGetObjectInformation( desktop, UOI_FLAGS, &flags, sizeof(flags), &len )) return FALSE; return !!(flags.dwFlags & DF_WINE_CREATE_DESKTOP); }

1 0

Alexandre Julliard : makefiles: Pass the dll extension from configure.
by Alexandre Julliard June 15, 2023

June 15, 2023

Module: wine Branch: master Commit: 80fc252f18c6282b8a974b9bd2e981d82692700e URL: https://gitlab.winehq.org/wine/wine/-/commit/80fc252f18c6282b8a974b9bd2e981… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 10:21:16 2023 +0200 makefiles: Pass the dll extension from configure. --- configure | 5 +++++ configure.ac | 2 ++ tools/makedep.c | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9f06d6193eb..3e8b30eb567 100755 --- a/configure +++ b/configure @@ -766,6 +766,7 @@ SUBDIRS READELF OTOOL LDD +DLLEXT WINEPRELOADER_LDFLAGS WINELOADER_LDFLAGS TOP_INSTALL_DEV @@ -9146,6 +9147,8 @@ WINELOADER_LDFLAGS="" WINEPRELOADER_LDFLAGS="" +DLLEXT=".so" + LIBEXT="so" # Extract the first word of "ldd", so it can be a program name with args. set dummy ldd; ac_word=$2 @@ -9437,6 +9440,7 @@ $ac_links: case $host_os in cygwin*|mingw32*) LIBEXT="dll" + DLLEXT="" EXTRACFLAGS="-D__WINE_PE_BUILD" case $host_cpu in *i[3456]86*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--disable-stdcall-fixup" >&5 @@ -23204,6 +23208,7 @@ TOP_INSTALL_LIB = $TOP_INSTALL_LIB TOP_INSTALL_DEV = $TOP_INSTALL_DEV WINELOADER_LDFLAGS = $WINELOADER_LDFLAGS WINEPRELOADER_LDFLAGS = $WINEPRELOADER_LDFLAGS +DLLEXT = $DLLEXT LDD = $LDD OTOOL = $OTOOL READELF = $READELF diff --git a/configure.ac b/configure.ac index 7a4af2d454e..1c17475ce80 100644 --- a/configure.ac +++ b/configure.ac @@ -643,6 +643,7 @@ AC_SUBST(TOP_INSTALL_LIB,"") AC_SUBST(TOP_INSTALL_DEV,"") AC_SUBST(WINELOADER_LDFLAGS,"") AC_SUBST(WINEPRELOADER_LDFLAGS,"") +AC_SUBST(DLLEXT,".so") LIBEXT="so" WINE_PATH_SONAME_TOOLS WINE_CONFIG_HELPERS @@ -650,6 +651,7 @@ WINE_CONFIG_HELPERS case $host_os in cygwin*|mingw32*) LIBEXT="dll" + DLLEXT="" EXTRACFLAGS="-D__WINE_PE_BUILD" dnl Disable stdcall fixups to catch prototype mismatches case $host_cpu in diff --git a/tools/makedep.c b/tools/makedep.c index 3322e825617..7f6772e5203 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4407,7 +4407,7 @@ int main( int argc, char *argv[] ) tools_dir = get_expanded_make_variable( top_makefile, "toolsdir" ); tools_ext = get_expanded_make_variable( top_makefile, "toolsext" ); exe_ext = get_expanded_make_variable( top_makefile, "EXEEXT" ); - dll_ext = (exe_ext && !strcmp( exe_ext, ".exe" )) ? "" : ".so"; + dll_ext = get_expanded_make_variable( top_makefile, "DLLEXT" ); fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" ); convert = get_expanded_make_variable( top_makefile, "CONVERT" ); flex = get_expanded_make_variable( top_makefile, "FLEX" ); @@ -4424,6 +4424,7 @@ int main( int argc, char *argv[] ) if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL; if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL; if (!exe_ext) exe_ext = ""; + if (!dll_ext) dll_ext = ""; if (!tools_ext) tools_ext = ""; strarray_add( &archs, get_expanded_make_variable( top_makefile, "HOST_ARCH" ));

1 0

Alexandre Julliard : makefiles: Don't build native import libraries for PE-only build.
by Alexandre Julliard June 15, 2023

June 15, 2023

Module: wine Branch: master Commit: 56fe04085dc8c0b04a77aa0a42dacd99336bba10 URL: https://gitlab.winehq.org/wine/wine/-/commit/56fe04085dc8c0b04a77aa0a42dacd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 10:46:36 2023 +0200 makefiles: Don't build native import libraries for PE-only build. --- tools/makedep.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 32a435f22f5..d3064ea4ff1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -157,6 +157,7 @@ static const char *msgfmt; static const char *ln_s; static const char *sed_cmd; static const char *wayland_scanner; +static int so_dll_supported; static int unix_lib_supported; /* per-architecture global variables */ static const char *dll_ext[MAX_ARCHS]; @@ -578,6 +579,9 @@ static int is_native_arch_disabled( struct makefile *make ) { unsigned int arch; + if (archs.count == 1) return 0; + if (!so_dll_supported) return 1; + for (arch = 1; arch < archs.count; arch++) if (make->disabled[arch] && !strcmp( archs.str[0], archs.str[arch] )) return 1; @@ -3154,9 +3158,11 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou { if (!unix_lib_supported) return; } - else if (archs.count > 1 && is_using_msvcrt( make ) && - !(source->file->flags & FLAG_C_IMPLIB) && - (!make->staticlib || make->extlib)) return; + else if (archs.count > 1 && is_using_msvcrt( make )) + { + if (!so_dll_supported) return; + if (!(source->file->flags & FLAG_C_IMPLIB) && (!make->staticlib || make->extlib)) return; + } obj_name = strmake( "%s%s.o", source->arch ? "" : arch_dirs[arch], obj ); strarray_add( targets, obj_name ); @@ -3419,8 +3425,6 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) output_filenames_obj_dir( make, make->implib_files[arch] ); output( "\n" ); - if (!arch && is_native_arch_disabled( make )) return; - add_install_rule( make, make->importlib, arch, name, strmake( "d%slib%s.a", arch_install_dirs[arch], make->importlib )); } @@ -3783,13 +3787,18 @@ static void output_sources( struct makefile *make ) if (make->staticlib) { for (arch = 0; arch < archs.count; arch++) - if (is_multiarch( arch ) || !make->extlib) output_static_lib( make, arch ); + if (is_multiarch( arch ) || (so_dll_supported && !make->extlib)) + output_static_lib( make, arch ); } else if (make->module) { - for (arch = 0; arch < archs.count; arch++) if (is_multiarch( arch )) output_module( make, arch ); + for (arch = 0; arch < archs.count; arch++) + { + if (is_multiarch( arch )) output_module( make, arch ); + if (make->importlib && (is_multiarch( arch ) || !is_native_arch_disabled( make ))) + output_import_lib( make, arch ); + } if (make->unixlib) output_unix_lib( make ); - if (make->importlib) for (arch = 0; arch < archs.count; arch++) output_import_lib( make, arch ); if (make->is_exe && !make->is_win16 && unix_lib_supported && strendswith( make->module, ".exe" )) { char *binary = replace_extension( make->module, ".exe", "" ); @@ -4429,6 +4438,7 @@ int main( int argc, char *argv[] ) if (!tools_ext) tools_ext = ""; unix_lib_supported = !!strcmp( exe_ext, ".exe" ); + so_dll_supported = !!dll_ext[0][0]; /* non-empty dll ext means supported */ strarray_add( &archs, get_expanded_make_variable( top_makefile, "HOST_ARCH" )); strarray_addall( &archs, get_expanded_make_var_array( top_makefile, "PE_ARCHS" ));

1 0

Alexandre Julliard : makefiles: Make the dll extension a per-architecture variable.
by Alexandre Julliard June 15, 2023

June 15, 2023

Module: wine Branch: master Commit: fa732145b8c039fc12aaef6f44fe0a12c760c3d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa732145b8c039fc12aaef6f44fe0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 10:27:06 2023 +0200 makefiles: Make the dll extension a per-architecture variable. --- tools/makedep.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7f6772e5203..32a435f22f5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -145,7 +145,6 @@ static const char *root_src_dir; static const char *tools_dir; static const char *tools_ext; static const char *exe_ext; -static const char *dll_ext; static const char *fontforge; static const char *convert; static const char *flex; @@ -158,7 +157,9 @@ static const char *msgfmt; static const char *ln_s; static const char *sed_cmd; static const char *wayland_scanner; +static int unix_lib_supported; /* per-architecture global variables */ +static const char *dll_ext[MAX_ARCHS]; static const char *arch_dirs[MAX_ARCHS]; static const char *arch_pe_dirs[MAX_ARCHS]; static const char *arch_install_dirs[MAX_ARCHS]; @@ -612,7 +613,7 @@ static int is_using_msvcrt( struct makefile *make ) */ static char *arch_module_name( const char *module, unsigned int arch ) { - return strmake( "%s%s%s", arch_dirs[arch], module, arch ? "" : dll_ext ); + return strmake( "%s%s%s", arch_dirs[arch], module, dll_ext[arch] ); } @@ -3151,7 +3152,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou } else if (source->file->flags & FLAG_C_UNIX) { - if (!*dll_ext) return; + if (!unix_lib_supported) return; } else if (archs.count > 1 && is_using_msvcrt( make ) && !(source->file->flags & FLAG_C_IMPLIB) && @@ -3184,7 +3185,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou { output_filenames( dll_flags ); if (source->use_msvcrt) output_filenames( msvcrt_flags ); - if (!*dll_ext && make->module && is_crt_module( make->module )) + if (!unix_lib_supported && make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); } } @@ -3360,7 +3361,7 @@ static void output_module( struct makefile *make, unsigned int arch ) else add_install_rule( make, make->module, arch, module_name, strmake( "%c%s%s%s", '0' + arch, arch_install_dirs[arch], make->module, - arch ? "" : dll_ext )); + dll_ext[arch] )); output( "%s:", obj_dir_path( make, module_name )); if (spec_file) output_filename( spec_file ); @@ -3387,7 +3388,7 @@ static void output_module( struct makefile *make, unsigned int arch ) output_filename( arch_make_variable( "LDFLAGS", arch )); output( "\n" ); - if (!make->data_only && !arch && *dll_ext) output_fake_module( make ); + if (!make->data_only && !arch && unix_lib_supported) output_fake_module( make ); } @@ -3789,7 +3790,7 @@ static void output_sources( struct makefile *make ) for (arch = 0; arch < archs.count; arch++) if (is_multiarch( arch )) output_module( make, arch ); if (make->unixlib) output_unix_lib( make ); if (make->importlib) for (arch = 0; arch < archs.count; arch++) output_import_lib( make, arch ); - if (make->is_exe && !make->is_win16 && *dll_ext && strendswith( make->module, ".exe" )) + if (make->is_exe && !make->is_win16 && unix_lib_supported && strendswith( make->module, ".exe" )) { char *binary = replace_extension( make->module, ".exe", "" ); add_install_rule( make, binary, 0, "wineapploader", strmake( "t$(bindir)/%s", binary )); @@ -4204,7 +4205,7 @@ static void load_sources( struct makefile *make ) make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); make->extlib = get_expanded_make_variable( make, "EXTLIB" ); - if (*dll_ext) make->unixlib = get_expanded_make_variable( make, "UNIXLIB" ); + if (unix_lib_supported) make->unixlib = get_expanded_make_variable( make, "UNIXLIB" ); make->programs = get_expanded_make_var_array( make, "PROGRAMS" ); make->scripts = get_expanded_make_var_array( make, "SCRIPTS" ); @@ -4407,7 +4408,7 @@ int main( int argc, char *argv[] ) tools_dir = get_expanded_make_variable( top_makefile, "toolsdir" ); tools_ext = get_expanded_make_variable( top_makefile, "toolsext" ); exe_ext = get_expanded_make_variable( top_makefile, "EXEEXT" ); - dll_ext = get_expanded_make_variable( top_makefile, "DLLEXT" ); + dll_ext[0] = get_expanded_make_variable( top_makefile, "DLLEXT" ); fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" ); convert = get_expanded_make_variable( top_makefile, "CONVERT" ); flex = get_expanded_make_variable( top_makefile, "FLEX" ); @@ -4424,15 +4425,17 @@ int main( int argc, char *argv[] ) if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL; if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL; if (!exe_ext) exe_ext = ""; - if (!dll_ext) dll_ext = ""; + if (!dll_ext[0]) dll_ext[0] = ""; if (!tools_ext) tools_ext = ""; + unix_lib_supported = !!strcmp( exe_ext, ".exe" ); + strarray_add( &archs, get_expanded_make_variable( top_makefile, "HOST_ARCH" )); strarray_addall( &archs, get_expanded_make_var_array( top_makefile, "PE_ARCHS" )); arch_dirs[0] = ""; arch_pe_dirs[0] = strmake( "%s-windows/", archs.str[0] ); - arch_install_dirs[0] = *dll_ext ? strmake( "$(dlldir)/%s-unix/", archs.str[0] ) : "$(dlldir)/"; + arch_install_dirs[0] = unix_lib_supported ? strmake( "$(dlldir)/%s-unix/", archs.str[0] ) : "$(dlldir)/"; strip_progs[0] = "\"$(STRIP)\""; for (arch = 1; arch < archs.count; arch++) @@ -4444,6 +4447,7 @@ int main( int argc, char *argv[] ) arch_pe_dirs[arch] = arch_dirs[arch]; arch_install_dirs[arch] = strmake( "$(dlldir)/%s", arch_dirs[arch] ); strip_progs[arch] = strmake( "%s-strip", target ); + dll_ext[arch] = ""; } for (arch = 0; arch < archs.count; arch++) @@ -4456,7 +4460,7 @@ int main( int argc, char *argv[] ) debug_flags[arch] = get_expanded_arch_var( top_makefile, "DEBUG", arch ); } - if (*dll_ext) + if (unix_lib_supported) { delay_load_flags[0] = "-Wl,-delayload,"; debug_flags[0] = NULL;

1 0

Alexandre Julliard : makefiles: Disable native import libraries on ARM64.
by Alexandre Julliard June 15, 2023

June 15, 2023

Module: wine Branch: master Commit: 045d211308e7304a39d8ee4ee1f0ec52c2d783b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/045d211308e7304a39d8ee4ee1f0ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 10:57:41 2023 +0200 makefiles: Disable native import libraries on ARM64. --- configure | 11 ++++++----- configure.ac | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 3e8b30eb567..93cdaa0a365 100755 --- a/configure +++ b/configure @@ -11712,12 +11712,12 @@ fi } LDFLAGS=$saved_LDFLAGS done -if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x +if test $HOST_ARCH = aarch64 then - as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 -fi - -if test "x$PE_ARCHS" = "x" + test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 + DLLEXT="" +else + if test "x$PE_ARCHS" = "x" then : case "x$with_mingw" in x) as_fn_append wine_notices "|MinGW compiler not found, cross-compiling PE files won't be supported." ;; @@ -11727,6 +11727,7 @@ This is an error since --with-mingw was requested." "$LINENO" 5 ;; esac fi +fi if test "x$with_system_dllpath" != "x" -a -n "$PE_ARCHS" diff --git a/configure.ac b/configure.ac index 1c17475ce80..dd8520f6f48 100644 --- a/configure.ac +++ b/configure.ac @@ -994,13 +994,14 @@ do LDFLAGS=$saved_LDFLAGS done -if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x +if test $HOST_ARCH = aarch64 then - AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) -fi - -WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], + test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) + DLLEXT="" +else + WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], [MinGW compiler not found, cross-compiling PE files won't be supported.]) +fi dnl **** External libraries ****

1 0