February 2024 - Wine-commits

Rémi Bernon : winex11: Process XInput2 events with QS_INPUT filter.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: b341688dbd9dfc05bd61d6b8f494867e6343b702 URL: https://gitlab.winehq.org/wine/wine/-/commit/b341688dbd9dfc05bd61d6b8f49486… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 28 19:32:11 2024 +0100 winex11: Process XInput2 events with QS_INPUT filter. --- dlls/winex11.drv/event.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index aafb89a4fed..8b02361aaff 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -233,9 +233,6 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) case ButtonPress: case ButtonRelease: return (mask & QS_MOUSEBUTTON) != 0; -#ifdef GenericEvent - case GenericEvent: -#endif case MotionNotify: case EnterNotify: case LeaveNotify: @@ -250,6 +247,13 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) case PropertyNotify: case ClientMessage: return (mask & QS_POSTMESSAGE) != 0; +#ifdef GenericEvent + case GenericEvent: +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + if (event->xcookie.extension == xinput2_opcode) return (mask & QS_INPUT) != 0; +#endif + /* fallthrough */ +#endif default: return (mask & QS_SENDMESSAGE) != 0; }

1 0

Rémi Bernon : winex11: Advertise XInput2 version 2.2 support.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 1a757a0146ef9cb7d7b1e6b6a4345d4c592a46b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a757a0146ef9cb7d7b1e6b6a4345d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 28 18:28:24 2024 +0100 winex11: Advertise XInput2 version 2.2 support. This is the required version for XInput2 touch events. It also allows to greatly simplify the code by listening to master device events only and get rid of device id tracking: Under XInput2 protocol version < 2.1, RawEvents are not supposed to be sent if a pointer grab is active. However slave device events are still received regardless of this specification and Wine implemented a workaround to receive RawEvents during pointer grabs by listening to these slave device events. By advertising the support of XInput2 version >= 2.1, where RawEvents are sent even during pointer grabs, we ensure to receive the RawMotion even if a mouse grab is active. --- dlls/winex11.drv/mouse.c | 50 ++++++++--------------------------------------- dlls/winex11.drv/x11drv.h | 5 +---- 2 files changed, 9 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 612fff9995c..f02ca5355c5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -268,7 +268,7 @@ static void enable_xinput2(void) if (data->xi2_state == xi_unknown) { - int major = 2, minor = 0; + int major = 2, minor = 2; if (!pXIQueryVersion( data->display, &major, &minor )) data->xi2_state = xi_disabled; else { @@ -277,11 +277,11 @@ static void enable_xinput2(void) } } if (data->xi2_state == xi_unavailable) return; - if (!pXIGetClientPointer( data->display, None, &data->xi2_core_pointer )) return; + if (!pXIGetClientPointer( data->display, None, &data->xinput2_pointer )) return; mask.mask = mask_bits; mask.mask_len = sizeof(mask_bits); - mask.deviceid = XIAllDevices; + mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_DeviceChanged ); XISetMask( mask_bits, XI_RawMotion ); @@ -289,20 +289,10 @@ static void enable_xinput2(void) pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); - pointer_info = pXIQueryDevice( data->display, data->xi2_core_pointer, &count ); + pointer_info = pXIQueryDevice( data->display, data->xinput2_pointer, &count ); update_relative_valuators( pointer_info->classes, pointer_info->num_classes ); pXIFreeDeviceInfo( pointer_info ); - /* This device info list is only used to find the initial current slave if - * no XI_DeviceChanged events happened. If any hierarchy change occurred that - * might be relevant here (eg. user switching mice after (un)plugging), a - * XI_DeviceChanged event will point us to the right slave. So this list is - * safe to be obtained statically at enable_xinput2() time. - */ - if (data->xi2_devices) pXIFreeDeviceInfo( data->xi2_devices ); - data->xi2_devices = pXIQueryDevice( data->display, XIAllDevices, &data->xi2_device_count ); - data->xi2_current_slave = 0; - data->xi2_state = xi_enabled; } @@ -324,17 +314,14 @@ static void disable_xinput2(void) mask.mask = NULL; mask.mask_len = 0; - mask.deviceid = XIAllDevices; + mask.deviceid = XIAllMasterDevices; pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); - pXIFreeDeviceInfo( data->xi2_devices ); data->x_valuator.number = -1; data->y_valuator.number = -1; data->x_valuator.value = 0; data->y_valuator.value = 0; - data->xi2_devices = NULL; - data->xi2_core_pointer = 0; - data->xi2_current_slave = 0; + data->xinput2_pointer = 0; #endif } @@ -1643,11 +1630,8 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev ) XIDeviceChangedEvent *event = xev->data; struct x11drv_thread_data *data = x11drv_thread_data(); - if (event->deviceid != data->xi2_core_pointer) return FALSE; - if (event->reason != XISlaveSwitch) return FALSE; - + if (event->deviceid != data->xinput2_pointer) return FALSE; update_relative_valuators( event->classes, event->num_classes ); - data->xi2_current_slave = event->sourceid; return TRUE; } @@ -1663,25 +1647,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) if (x->number < 0 || y->number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; if (thread_data->xi2_state != xi_enabled) return FALSE; - - /* If there is no slave currently detected, no previous motion nor device - * change events were received. Look it up now on the device list in this - * case. - */ - if (!thread_data->xi2_current_slave) - { - XIDeviceInfo *devices = thread_data->xi2_devices; - - for (i = 0; i < thread_data->xi2_device_count; i++) - { - if (devices[i].use != XISlavePointer) continue; - if (devices[i].deviceid != event->deviceid) continue; - if (devices[i].attachment != thread_data->xi2_core_pointer) continue; - thread_data->xi2_current_slave = event->deviceid; - break; - } - } - if (event->deviceid != thread_data->xi2_current_slave) return FALSE; + if (event->deviceid != thread_data->xinput2_pointer) return FALSE; virtual_rect = NtUserGetVirtualScreenRect(); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d5edb9ba377..dbf7d07e3d4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -394,12 +394,9 @@ struct x11drv_thread_data 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) */ - int xi2_device_count; XIValuatorClassInfo x_valuator; XIValuatorClassInfo y_valuator; - int xi2_core_pointer; /* XInput2 core pointer id */ - int xi2_current_slave; /* Current slave driving the Core pointer */ + int xinput2_pointer; /* XInput2 master pointer device id */ #endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */ };

1 0

Rémi Bernon : winex11: Initialize XInput2 extension on every thread.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: b7867059ceea7e4448fd294e4b5ac9d1bf8e03e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7867059ceea7e4448fd294e4b5ac9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 28 18:22:51 2024 +0100 winex11: Initialize XInput2 extension on every thread. --- dlls/winex11.drv/mouse.c | 53 ++++++++++++++++++++++-------------------- dlls/winex11.drv/x11drv.h | 5 ++-- dlls/winex11.drv/x11drv_main.c | 3 ++- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f02ca5355c5..3036f3db9e3 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -266,17 +266,6 @@ static void enable_xinput2(void) if (!xinput2_available) return; - if (data->xi2_state == xi_unknown) - { - int major = 2, minor = 2; - if (!pXIQueryVersion( data->display, &major, &minor )) data->xi2_state = xi_disabled; - else - { - data->xi2_state = xi_unavailable; - WARN( "X Input 2 not available\n" ); - } - } - if (data->xi2_state == xi_unavailable) return; if (!pXIGetClientPointer( data->display, None, &data->xinput2_pointer )) return; mask.mask = mask_bits; @@ -292,8 +281,6 @@ static void enable_xinput2(void) pointer_info = pXIQueryDevice( data->display, data->xinput2_pointer, &count ); update_relative_valuators( pointer_info->classes, pointer_info->num_classes ); pXIFreeDeviceInfo( pointer_info ); - - data->xi2_state = xi_enabled; } #endif @@ -307,10 +294,7 @@ static void disable_xinput2(void) struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask; - if (data->xi2_state != xi_enabled) return; - - TRACE( "disabling\n" ); - data->xi2_state = xi_disabled; + if (!xinput2_available) return; mask.mask = NULL; mask.mask_len = 0; @@ -326,6 +310,26 @@ static void disable_xinput2(void) } +/*********************************************************************** + * x11drv_xinput_init + */ +void x11drv_xinput2_init( struct x11drv_thread_data *data ) +{ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + int major = 2, minor = 2; + + if (!xinput2_available || pXIQueryVersion( data->display, &major, &minor )) + { + WARN( "XInput 2.0 not available\n" ); + xinput2_available = FALSE; + return; + } + + TRACE( "XInput2 %d.%d available\n", major, minor ); +#endif +} + + /*********************************************************************** * grab_clipping_window * @@ -352,17 +356,16 @@ static BOOL grab_clipping_window( const RECT *clip ) WARN( "refusing to clip to %s\n", wine_dbgstr_rect(clip) ); return FALSE; } - - /* enable XInput2 unless we are already clipping */ - if (!data->clipping_cursor) enable_xinput2(); - - if (data->xi2_state != xi_enabled) + if (!xinput2_available) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); NtUserClipCursor( NULL ); return TRUE; } + /* enable XInput2 unless we are already clipping */ + if (!data->clipping_cursor) enable_xinput2(); + TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window ); if (!data->clipping_cursor) XUnmapWindow( data->display, clip_window ); @@ -1646,7 +1649,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) if (x->number < 0 || y->number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; + if (!xinput2_available) return FALSE; if (event->deviceid != thread_data->xinput2_pointer) return FALSE; virtual_rect = NtUserGetVirtualScreenRect(); @@ -1721,9 +1724,9 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) /*********************************************************************** - * X11DRV_XInput2_Init + * x11drv_xinput2_load */ -void X11DRV_XInput2_Init(void) +void x11drv_xinput2_load(void) { #if defined(SONAME_LIBXI) && defined(HAVE_X11_EXTENSIONS_XINPUT2_H) int event, error; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index dbf7d07e3d4..e8a87283fe2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -263,7 +263,6 @@ extern void X11DRV_ThreadDetach(void); /* X11 driver internal functions */ extern void X11DRV_Xcursor_Init(void); -extern void X11DRV_XInput2_Init(void); extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, @@ -393,7 +392,6 @@ struct x11drv_thread_data Window clip_window; /* window used for cursor clipping */ 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 */ XIValuatorClassInfo x_valuator; XIValuatorClassInfo y_valuator; int xinput2_pointer; /* XInput2 master pointer device id */ @@ -575,6 +573,9 @@ extern BOOL X11DRV_MappingNotify( HWND hWnd, XEvent *event ); extern BOOL X11DRV_GenericEvent( HWND hwnd, XEvent *event ); extern int xinput2_opcode; +extern void x11drv_xinput2_load(void); +extern void x11drv_xinput2_init( struct x11drv_thread_data *data ); + extern Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ); extern void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 25a36cb8c0c..097dd9c3dc8 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -697,7 +697,7 @@ static NTSTATUS x11drv_init( void *arg ) #ifdef SONAME_LIBXCOMPOSITE X11DRV_XComposite_Init(); #endif - X11DRV_XInput2_Init(); + x11drv_xinput2_load(); XkbUseExtension( gdi_display, NULL, NULL ); X11DRV_InitKeyboard( gdi_display ); @@ -786,6 +786,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) NtUserGetThreadInfo()->driver_data = (UINT_PTR)data; if (use_xim) xim_thread_attach( data ); + x11drv_xinput2_init( data ); return data; }

1 0

Rémi Bernon : winex11: Always listen to XInput2 device changes events.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 51e99345de4d2e2a7c5db939e9add141bd8c30f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/51e99345de4d2e2a7c5db939e9add1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 12 10:00:55 2024 +0100 winex11: Always listen to XInput2 device changes events. --- dlls/winex11.drv/mouse.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 3036f3db9e3..143837adede 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -260,14 +260,10 @@ static void enable_xinput2(void) { struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask; - XIDeviceInfo *pointer_info; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; - int count; if (!xinput2_available) return; - if (!pXIGetClientPointer( data->display, None, &data->xinput2_pointer )) return; - mask.mask = mask_bits; mask.mask_len = sizeof(mask_bits); mask.deviceid = XIAllMasterDevices; @@ -275,12 +271,7 @@ static void enable_xinput2(void) XISetMask( mask_bits, XI_DeviceChanged ); XISetMask( mask_bits, XI_RawMotion ); XISetMask( mask_bits, XI_ButtonPress ); - pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); - - pointer_info = pXIQueryDevice( data->display, data->xinput2_pointer, &count ); - update_relative_valuators( pointer_info->classes, pointer_info->num_classes ); - pXIFreeDeviceInfo( pointer_info ); } #endif @@ -292,20 +283,17 @@ static void disable_xinput2(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); + unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; XIEventMask mask; if (!xinput2_available) return; - mask.mask = NULL; - mask.mask_len = 0; + mask.mask = mask_bits; + mask.mask_len = sizeof(mask_bits); mask.deviceid = XIAllMasterDevices; - + memset( mask_bits, 0, sizeof(mask_bits) ); + XISetMask( mask_bits, XI_DeviceChanged ); pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); - data->x_valuator.number = -1; - data->y_valuator.number = -1; - data->x_valuator.value = 0; - data->y_valuator.value = 0; - data->xinput2_pointer = 0; #endif } @@ -316,7 +304,10 @@ static void disable_xinput2(void) void x11drv_xinput2_init( struct x11drv_thread_data *data ) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; int major = 2, minor = 2; + XIEventMask mask; + int count; if (!xinput2_available || pXIQueryVersion( data->display, &major, &minor )) { @@ -325,6 +316,22 @@ void x11drv_xinput2_init( struct x11drv_thread_data *data ) return; } + mask.mask = mask_bits; + mask.mask_len = sizeof(mask_bits); + mask.deviceid = XIAllMasterDevices; + memset( mask_bits, 0, sizeof(mask_bits) ); + XISetMask( mask_bits, XI_DeviceChanged ); + pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); + + if (!pXIGetClientPointer( data->display, None, &data->xinput2_pointer )) + WARN( "Failed to get xinput2 master pointer device\n" ); + else + { + XIDeviceInfo *pointer_info = pXIQueryDevice( data->display, data->xinput2_pointer, &count ); + update_relative_valuators( pointer_info->classes, pointer_info->num_classes ); + pXIFreeDeviceInfo( pointer_info ); + } + TRACE( "XInput2 %d.%d available\n", major, minor ); #endif }

1 0

Rémi Bernon : winex11: Simplify XInput2 device valuator lookup.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 165830c317b63999ee7e32b58c73599591a65610 URL: https://gitlab.winehq.org/wine/wine/-/commit/165830c317b63999ee7e32b58c7359… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 24 16:27:40 2021 +0200 winex11: Simplify XInput2 device valuator lookup. Valuator names aren't well specified, and although they are usually named "Rel X/Y" or "Abs X/Y", there are cases where the names are different. Lets just assume that the first two valuators are the X/Y axes, as it seems to be generally the case. --- dlls/winex11.drv/mouse.c | 21 ++++++++++----------- dlls/winex11.drv/x11drv.h | 2 -- dlls/winex11.drv/x11drv_main.c | 2 -- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 143837adede..bdbd559b107 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -228,26 +228,25 @@ void set_window_cursor( Window window, HCURSOR handle ) /*********************************************************************** * update_relative_valuators */ -static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuators) +static void update_relative_valuators( XIAnyClassInfo **classes, int num_classes ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - int i; + XIValuatorClassInfo *valuator; thread_data->x_valuator.number = -1; thread_data->y_valuator.number = -1; - for (i = 0; i < n_valuators; i++) + while (num_classes--) { - XIValuatorClassInfo *class = (XIValuatorClassInfo *)valuators[i]; - if (valuators[i]->type != XIValuatorClass) continue; - if (class->label == x11drv_atom( Rel_X ) || - (!class->label && class->number == 0 && class->mode == XIModeRelative)) - thread_data->x_valuator = *class; - else if (class->label == x11drv_atom( Rel_Y ) || - (!class->label && class->number == 1 && class->mode == XIModeRelative)) - thread_data->y_valuator = *class; + valuator = (XIValuatorClassInfo *)classes[num_classes]; + if (classes[num_classes]->type != XIValuatorClass) continue; + if (valuator->number == 0 && valuator->mode == XIModeRelative) thread_data->x_valuator = *valuator; + if (valuator->number == 1 && valuator->mode == XIModeRelative) thread_data->y_valuator = *valuator; } + if (thread_data->x_valuator.number < 0 || thread_data->y_valuator.number < 0) + WARN( "X/Y axis valuators not found, ignoring RawMotion events\n" ); + thread_data->x_valuator.value = 0; thread_data->y_valuator.value = 0; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e8a87283fe2..71a3582ff76 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -471,8 +471,6 @@ enum x11drv_atoms XATOM_RAW_ASCENT, XATOM_RAW_DESCENT, XATOM_RAW_CAP_HEIGHT, - XATOM_Rel_X, - XATOM_Rel_Y, XATOM_WM_PROTOCOLS, XATOM_WM_DELETE_WINDOW, XATOM_WM_STATE, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 097dd9c3dc8..0925fe54b9c 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -142,8 +142,6 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "RAW_ASCENT", "RAW_DESCENT", "RAW_CAP_HEIGHT", - "Rel X", - "Rel Y", "WM_PROTOCOLS", "WM_DELETE_WINDOW", "WM_STATE",

1 0

Alexandre Julliard : ntdll: Implement RtlLookupFunctionTable.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: de492f9a342f398087f9f635fd5d9b5ae78b45eb URL: https://gitlab.winehq.org/wine/wine/-/commit/de492f9a342f398087f9f635fd5d9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 18:55:29 2024 +0100 ntdll: Implement RtlLookupFunctionTable. --- dlls/ntdll/exception.c | 10 ++-------- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 13 ++++++++++++ dlls/ntdll/signal_arm64.c | 14 +++++++++++++ dlls/ntdll/signal_arm64ec.c | 29 +++++++++++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 14 +++++++++++++ dlls/ntdll/tests/exception.c | 47 +++++++++++++++++++++++++++++++++++++++++++- include/winnt.h | 1 + 8 files changed, 120 insertions(+), 9 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Don't use x86-64 assembly on ARM64EC.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: df8d907fb4e6c1da53e40eebb3a43a3f0081c6e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/df8d907fb4e6c1da53e40eebb3a43a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 22:52:07 2024 +0100 ntdll/tests: Don't use x86-64 assembly on ARM64EC. --- dlls/ntdll/tests/exception.c | 132 ++++++++++++++++++++++++------------------- dlls/ntdll/tests/time.c | 4 +- 2 files changed, 75 insertions(+), 61 deletions(-)

1 0

Piotr Caban : wininet: Store proxy type in proxyinfo_t.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: c17b0d6a3faa13d95322805de16dea49e173e142 URL: https://gitlab.winehq.org/wine/wine/-/commit/c17b0d6a3faa13d95322805de16dea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 13:38:45 2024 +0100 wininet: Store proxy type in proxyinfo_t. --- dlls/wininet/internet.c | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9702c3e4f05..238b540994e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -81,7 +81,7 @@ static UINT_PTR handle_table_size; typedef struct { - DWORD proxyEnabled; + DWORD flags; LPWSTR proxy; LPWSTR proxyBypass; LPWSTR proxyUsername; @@ -326,12 +326,14 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) { HKEY key; + DWORD val; LONG ret; if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) return ret; - if ((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE*)&lpwpi->proxyEnabled, sizeof(DWORD)))) + val = !!(lpwpi->flags & PROXY_TYPE_PROXY); + if ((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE*)&val, sizeof(DWORD)))) { RegCloseKey( key ); return ret; @@ -533,7 +535,7 @@ static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { HKEY key; - DWORD type, len; + DWORD type, len, val; const WCHAR *envproxy; LONG ret; @@ -542,7 +544,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) EnterCriticalSection( &WININET_cs ); if (global_proxy) { - lpwpi->proxyEnabled = global_proxy->proxyEnabled; + lpwpi->flags = global_proxy->flags; lpwpi->proxy = wcsdup( global_proxy->proxy ); lpwpi->proxyBypass = wcsdup( global_proxy->proxyBypass ); } @@ -555,18 +557,22 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } len = sizeof(DWORD); - if (RegQueryValueExW( key, L"ProxyEnable", NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD) + if (RegQueryValueExW( key, L"ProxyEnable", NULL, &type, (BYTE *)&val, &len ) || type != REG_DWORD) { - lpwpi->proxyEnabled = 0; - if((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) ))) + val = 0; + if((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE *)&val, sizeof(DWORD) ))) { FreeProxyInfo( lpwpi ); RegCloseKey( key ); return ret; } } + else + { + lpwpi->flags |= (val ? PROXY_TYPE_PROXY : PROXY_TYPE_DIRECT); + } - if (!(envproxy = _wgetenv( L"http_proxy" )) || lpwpi->proxyEnabled) + if (!(envproxy = _wgetenv( L"http_proxy" )) || (lpwpi->flags & PROXY_TYPE_PROXY)) { /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, L"ProxyServer", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) @@ -611,19 +617,19 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (parse_proxy_url( lpwpi, envproxy )) { TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); - lpwpi->proxyEnabled = 1; + lpwpi->flags |= PROXY_TYPE_PROXY; lpwpi->proxyBypass = NULL; } else { WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxy)); - lpwpi->proxyEnabled = 0; + lpwpi->flags &= ~PROXY_TYPE_PROXY; lpwpi->proxy = NULL; lpwpi->proxyBypass = NULL; } } - if (lpwpi->proxyEnabled) + if (lpwpi->flags & PROXY_TYPE_PROXY) { TRACE("Proxy is enabled.\n"); @@ -689,7 +695,7 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) if (INTERNET_LoadProxySettings( &wpi )) return FALSE; - if (wpi.proxyEnabled) + if (wpi.flags & PROXY_TYPE_PROXY) { TRACE("http proxy = %s bypass = %s\n", debugstr_w(wpi.proxy), debugstr_w(wpi.proxyBypass)); @@ -2696,10 +2702,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u switch (optionW->dwOption) { case INTERNET_PER_CONN_FLAGS: - if(pi.proxyEnabled) - optionW->Value.dwValue = PROXY_TYPE_PROXY; - else - optionW->Value.dwValue = PROXY_TYPE_DIRECT; + optionW->Value.dwValue = pi.flags; if (url) /* native includes PROXY_TYPE_DIRECT even if PROXY_TYPE_PROXY is set */ optionW->Value.dwValue |= PROXY_TYPE_DIRECT|PROXY_TYPE_AUTO_PROXY_URL; @@ -3026,13 +3029,13 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, { if (info->dwAccessType == INTERNET_OPEN_TYPE_PROXY) { - global_proxy->proxyEnabled = 1; + global_proxy->flags = PROXY_TYPE_PROXY; global_proxy->proxy = wcsdup(info->lpszProxy); global_proxy->proxyBypass = wcsdup(info->lpszProxyBypass); } else { - global_proxy->proxyEnabled = 0; + global_proxy->flags = PROXY_TYPE_DIRECT; global_proxy->proxy = global_proxy->proxyBypass = NULL; } } @@ -3188,14 +3191,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_PER_CONN_FLAGS: - if(option->Value.dwValue & PROXY_TYPE_PROXY) - pi.proxyEnabled = 1; - else - { - if(option->Value.dwValue != PROXY_TYPE_DIRECT) - FIXME("Unhandled flags: 0x%lx\n", option->Value.dwValue); - pi.proxyEnabled = 0; - } + if(option->Value.dwValue & ~(PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT)) + FIXME("Unhandled flags: 0x%lx\n", option->Value.dwValue); + pi.flags = option->Value.dwValue; break; case INTERNET_PER_CONN_PROXY_BYPASS:

1 0

Piotr Caban : wininet: Don't allocate global_proxy structure dynamically.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 1a53e28cc8af7084b80b4a906ce854e3e646aa53 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a53e28cc8af7084b80b4a906ce854… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 13:42:31 2024 +0100 wininet: Don't allocate global_proxy structure dynamically. --- dlls/wininet/internet.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 238b540994e..a8ae37a52cd 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -472,16 +472,13 @@ static void FreeProxyInfo( proxyinfo_t *lpwpi ) free(lpwpi->proxyPassword); } -static proxyinfo_t *global_proxy; +static proxyinfo_t global_proxy; static void free_global_proxy( void ) { EnterCriticalSection( &WININET_cs ); - if (global_proxy) - { - FreeProxyInfo( global_proxy ); - free( global_proxy ); - } + FreeProxyInfo( &global_proxy ); + memset( &global_proxy, 0, sizeof(global_proxy) ); LeaveCriticalSection( &WININET_cs ); } @@ -542,11 +539,11 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) memset( lpwpi, 0, sizeof(*lpwpi) ); EnterCriticalSection( &WININET_cs ); - if (global_proxy) + if (global_proxy.flags) { - lpwpi->flags = global_proxy->flags; - lpwpi->proxy = wcsdup( global_proxy->proxy ); - lpwpi->proxyBypass = wcsdup( global_proxy->proxyBypass ); + lpwpi->flags = global_proxy.flags; + lpwpi->proxy = wcsdup( global_proxy.proxy ); + lpwpi->proxyBypass = wcsdup( global_proxy.proxyBypass ); } LeaveCriticalSection( &WININET_cs ); @@ -3024,20 +3021,16 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, { EnterCriticalSection( &WININET_cs ); free_global_proxy(); - global_proxy = malloc(sizeof(proxyinfo_t)); - if (global_proxy) + if (info->dwAccessType == INTERNET_OPEN_TYPE_PROXY) { - if (info->dwAccessType == INTERNET_OPEN_TYPE_PROXY) - { - global_proxy->flags = PROXY_TYPE_PROXY; - global_proxy->proxy = wcsdup(info->lpszProxy); - global_proxy->proxyBypass = wcsdup(info->lpszProxyBypass); - } - else - { - global_proxy->flags = PROXY_TYPE_DIRECT; - global_proxy->proxy = global_proxy->proxyBypass = NULL; - } + global_proxy.flags = PROXY_TYPE_PROXY; + global_proxy.proxy = wcsdup(info->lpszProxy); + global_proxy.proxyBypass = wcsdup(info->lpszProxyBypass); + } + else + { + global_proxy.flags = PROXY_TYPE_DIRECT; + global_proxy.proxy = global_proxy.proxyBypass = NULL; } LeaveCriticalSection( &WININET_cs ); }

1 0

Piotr Caban : wininet: Move reading proxy settings from registry to separate function.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 5fe477767a517d07ee02f347a44fea9add32b85a URL: https://gitlab.winehq.org/wine/wine/-/commit/5fe477767a517d07ee02f347a44fea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 16:20:31 2024 +0100 wininet: Move reading proxy settings from registry to separate function. --- dlls/wininet/internet.c | 186 ++++++++++++++++++++---------------------------- 1 file changed, 78 insertions(+), 108 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a8ae37a52cd..58f35605940 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -520,8 +520,7 @@ static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) /*********************************************************************** * INTERNET_LoadProxySettings * - * Loads proxy information from process-wide global settings, the registry, - * or the environment into lpwpi. + * Loads proxy information from the registry into lpwpi. * * The caller should call FreeProxyInfo when done with lpwpi. * @@ -531,27 +530,14 @@ static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) */ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { - HKEY key; DWORD type, len, val; - const WCHAR *envproxy; + HKEY key; LONG ret; memset( lpwpi, 0, sizeof(*lpwpi) ); - EnterCriticalSection( &WININET_cs ); - if (global_proxy.flags) - { - lpwpi->flags = global_proxy.flags; - lpwpi->proxy = wcsdup( global_proxy.proxy ); - lpwpi->proxyBypass = wcsdup( global_proxy.proxyBypass ); - } - LeaveCriticalSection( &WININET_cs ); - if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) - { - FreeProxyInfo( lpwpi ); return ret; - } len = sizeof(DWORD); if (RegQueryValueExW( key, L"ProxyEnable", NULL, &type, (BYTE *)&val, &len ) || type != REG_DWORD) @@ -559,7 +545,6 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) val = 0; if((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE *)&val, sizeof(DWORD) ))) { - FreeProxyInfo( lpwpi ); RegCloseKey( key ); return ret; } @@ -569,116 +554,101 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) lpwpi->flags |= (val ? PROXY_TYPE_PROXY : PROXY_TYPE_DIRECT); } - if (!(envproxy = _wgetenv( L"http_proxy" )) || (lpwpi->flags & PROXY_TYPE_PROXY)) + /* figure out how much memory the proxy setting takes */ + if (!RegQueryValueExW( key, L"ProxyServer", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) { - /* figure out how much memory the proxy setting takes */ - if (!RegQueryValueExW( key, L"ProxyServer", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) - { - LPWSTR szProxy, p; - - if (!(szProxy = malloc( len ))) - { - RegCloseKey( key ); - FreeProxyInfo( lpwpi ); - return ERROR_OUTOFMEMORY; - } - RegQueryValueExW( key, L"ProxyServer", NULL, &type, (BYTE*)szProxy, &len ); - - /* find the http proxy, and strip away everything else */ - p = wcsstr( szProxy, L"http=" ); - if (p) - { - p += lstrlenW( L"http=" ); - lstrcpyW( szProxy, p ); - } - p = wcschr( szProxy, ';' ); - if (p) *p = 0; - - FreeProxyInfo( lpwpi ); - lpwpi->proxy = szProxy; - lpwpi->proxyBypass = NULL; + LPWSTR szProxy, p; - TRACE("http proxy (from registry) = %s\n", debugstr_w(lpwpi->proxy)); + if (!(szProxy = malloc( len ))) + { + RegCloseKey( key ); + return ERROR_OUTOFMEMORY; } - else + RegQueryValueExW( key, L"ProxyServer", NULL, &type, (BYTE*)szProxy, &len ); + + /* find the http proxy, and strip away everything else */ + p = wcsstr( szProxy, L"http=" ); + if (p) { - TRACE("No proxy server settings in registry.\n"); - FreeProxyInfo( lpwpi ); - lpwpi->proxy = NULL; - lpwpi->proxyBypass = NULL; + p += lstrlenW( L"http=" ); + lstrcpyW( szProxy, p ); } + p = wcschr( szProxy, ';' ); + if (p) *p = 0; + + lpwpi->proxy = szProxy; + TRACE("http proxy (from registry%s) = %s\n", lpwpi->flags & PROXY_TYPE_PROXY ? "" : ", disabled", + debugstr_w(lpwpi->proxy)); } - else if (envproxy) + else { - FreeProxyInfo( lpwpi ); - if (parse_proxy_url( lpwpi, envproxy )) - { - TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); - lpwpi->flags |= PROXY_TYPE_PROXY; - lpwpi->proxyBypass = NULL; - } - else - { - WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxy)); - lpwpi->flags &= ~PROXY_TYPE_PROXY; - lpwpi->proxy = NULL; - lpwpi->proxyBypass = NULL; - } + TRACE("No proxy server settings in registry.\n"); } - if (lpwpi->flags & PROXY_TYPE_PROXY) + if (!RegQueryValueExW( key, L"ProxyOverride", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) { - TRACE("Proxy is enabled.\n"); + LPWSTR szProxy; - if (!(envproxy = _wgetenv( L"no_proxy" ))) + if (!(szProxy = malloc( len ))) { - /* figure out how much memory the proxy setting takes */ - if (!RegQueryValueExW( key, L"ProxyOverride", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) - { - LPWSTR szProxy; + RegCloseKey( key ); + FreeProxyInfo( lpwpi ); + return ERROR_OUTOFMEMORY; + } + RegQueryValueExW( key, L"ProxyOverride", NULL, &type, (BYTE*)szProxy, &len ); - if (!(szProxy = malloc( len ))) - { - RegCloseKey( key ); - FreeProxyInfo( lpwpi ); - return ERROR_OUTOFMEMORY; - } - RegQueryValueExW( key, L"ProxyOverride", NULL, &type, (BYTE*)szProxy, &len ); + lpwpi->proxyBypass = szProxy; + TRACE("http proxy bypass (from registry) = %s\n", debugstr_w(lpwpi->proxyBypass)); + } + else + { + TRACE("No proxy bypass server settings in registry.\n"); + } - free( lpwpi->proxyBypass ); - lpwpi->proxyBypass = szProxy; + RegCloseKey( key ); + return ERROR_SUCCESS; +} - TRACE("http proxy bypass (from registry) = %s\n", debugstr_w(lpwpi->proxyBypass)); - } - else - { - free( lpwpi->proxyBypass ); - lpwpi->proxyBypass = NULL; +/*********************************************************************** + * INTERNET_GetProxySettings + * + * Loads proxy information from registry, enironment or process-wide settings + * into lpwpi. + */ +static LONG INTERNET_GetProxySettings( proxyinfo_t *lpwpi ) +{ + const WCHAR *envproxy; + LONG ret; - TRACE("No proxy bypass server settings in registry.\n"); - } + if ((ret = INTERNET_LoadProxySettings( lpwpi )) || (lpwpi->flags & PROXY_TYPE_PROXY)) + return ret; + FreeProxyInfo( lpwpi ); + + if ((envproxy = _wgetenv( L"http_proxy" ))) + { + memset( lpwpi, 0, sizeof(*lpwpi) ); + lpwpi->flags = PROXY_TYPE_DIRECT; + if (parse_proxy_url( lpwpi, envproxy )) + { + lpwpi->flags = PROXY_TYPE_PROXY; + lpwpi->proxyBypass = wcsdup(_wgetenv( L"no_proxy" )); + TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); + TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); } else { - WCHAR *envproxyW; - - if (!(envproxyW = malloc( wcslen(envproxy) * sizeof(WCHAR) ))) - { - RegCloseKey( key ); - FreeProxyInfo( lpwpi ); - return ERROR_OUTOFMEMORY; - } - lstrcpyW( envproxyW, envproxy ); - - free( lpwpi->proxyBypass ); - lpwpi->proxyBypass = envproxyW; - - TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); + WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxy)); } + return ERROR_SUCCESS; } - else TRACE("Proxy is disabled.\n"); - RegCloseKey( key ); + EnterCriticalSection( &WININET_cs ); + lpwpi->flags = global_proxy.flags; + lpwpi->proxy = wcsdup( global_proxy.proxy ); + lpwpi->proxyBypass = wcsdup( global_proxy.proxyBypass ); + LeaveCriticalSection( &WININET_cs ); + + lpwpi->flags |= PROXY_TYPE_DIRECT; return ERROR_SUCCESS; } @@ -689,7 +659,7 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) { proxyinfo_t wpi; - if (INTERNET_LoadProxySettings( &wpi )) + if (INTERNET_GetProxySettings( &wpi )) return FALSE; if (wpi.flags & PROXY_TYPE_PROXY) @@ -2681,7 +2651,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u LONG ret; TRACE("Getting global proxy info\n"); - if((ret = INTERNET_LoadProxySettings(&pi))) + if((ret = INTERNET_GetProxySettings(&pi))) return ret; FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); @@ -3172,7 +3142,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, unsigned int i; proxyinfo_t pi; - if (INTERNET_LoadProxySettings(&pi)) return FALSE; + if (INTERNET_GetProxySettings(&pi)) return FALSE; for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i;

1 0