wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

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: 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: 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

Yuxuan Shui : dmband: Implement getting/setting GUID_BandParam on band tracks.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: e9e8ab1392cc858793dc8a2e1c785dd68eb21eb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9e8ab1392cc858793dc8a2e1c785d… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Jan 31 03:06:09 2024 +0000 dmband: Implement getting/setting GUID_BandParam on band tracks. --- dlls/dmband/bandtrack.c | 46 ++++++++++++++++++++++++--- dlls/dmband/tests/dmband.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 4 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 4756ed194ef..b410cf81d3a 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -198,19 +198,35 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat } static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, - MUSIC_TIME *next, void *param) + MUSIC_TIME *out_next, void *param) { struct band_track *This = impl_from_IDirectMusicTrack8(iface); + struct band_entry *band, *next_band; + DMUS_BAND_PARAM *bandparam; - TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, out_next, param); if (!type) return E_POINTER; if (!IsEqualGUID(type, &GUID_BandParam)) return DMUS_E_GET_UNSUPPORTED; + if (list_empty(&This->bands)) + return DMUS_E_NOT_FOUND; - FIXME("GUID_BandParam not handled yet\n"); + bandparam = param; + if (out_next) *out_next = 0; + LIST_FOR_EACH_ENTRY_SAFE(band, next_band, &This->bands, struct band_entry, entry) + { + /* we want to return the first band even when there's nothing with lBandTime <= time */ + bandparam->pBand = band->band; + bandparam->mtTimePhysical = band->head.lBandTimePhysical; + if (band->entry.next == &This->bands) break; + if (out_next) *out_next = next_band->head.lBandTimeLogical; + if (next_band->head.lBandTimeLogical > time) break; + } + + IDirectMusicBand_AddRef(bandparam->pBand); return S_OK; } @@ -227,7 +243,29 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ return DMUS_E_TYPE_UNSUPPORTED; if (IsEqualGUID(type, &GUID_BandParam)) - FIXME("GUID_BandParam not handled yet\n"); + { + struct band_entry *new_entry = NULL, *entry, *next_entry; + DMUS_BAND_PARAM *band_param = param; + if (!band_param || !band_param->pBand) + return E_POINTER; + if (!(new_entry = calloc(1, sizeof(*new_entry)))) + return E_OUTOFMEMORY; + new_entry->band = band_param->pBand; + new_entry->head.lBandTimeLogical = time; + new_entry->head.lBandTimePhysical = band_param->mtTimePhysical; + IDirectMusicBand_AddRef(new_entry->band); + if (list_empty(&This->bands)) + list_add_tail(&This->bands, &new_entry->entry); + else + { + LIST_FOR_EACH_ENTRY_SAFE(entry, next_entry, &This->bands, struct band_entry, entry) + if (entry->entry.next == &This->bands || next_entry->head.lBandTimeLogical > time) + { + list_add_after(&entry->entry, &new_entry->entry); + break; + } + } + } else if (IsEqualGUID(type, &GUID_Clear_All_Bands)) FIXME("GUID_Clear_All_Bands not handled yet\n"); else if (IsEqualGUID(type, &GUID_ConnectToDLSCollection)) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index d88606976e4..82081f70047 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -176,9 +176,12 @@ static void test_dmband(void) static void test_bandtrack(void) { + DMUS_BAND_PARAM bandparam = { 0 }; IDirectMusicTrack8 *dmt8; + IDirectMusicBand *dmb[3]; IPersistStream *ps; CLSID class; + MUSIC_TIME mt; ULARGE_INTEGER size; char buf[64] = { 0 }; HRESULT hr; @@ -266,6 +269,81 @@ static void test_bandtrack(void) } } + for (i = 0; i < 3; i++) + { + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicBand, (void **)&dmb[i]); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); + } + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 0, &mt, &bandparam); + ok(hr == DMUS_E_NOT_FOUND, "hr %#lx, expected not found\n", hr); + ok(bandparam.pBand == NULL, "Got band %p, expected NULL\n", bandparam.pBand); + + bandparam.mtTimePhysical = 10; + bandparam.pBand = dmb[0]; + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_BandParam, 10, &bandparam); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 10, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 0, "Got time %lu, expected 0\n", mt); + ok(bandparam.mtTimePhysical == 10, "Got physical time %lu, expected 10\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + /* get with time before the first band. */ + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 1, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 0, "Got time %lu, expected 0\n", mt); + ok(bandparam.mtTimePhysical == 10, "Got physical time %lu, expected 10\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + bandparam.mtTimePhysical = 100; + bandparam.pBand = dmb[1]; + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_BandParam, 100, &bandparam); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 10, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 100, "Got time %lu, expected 100\n", mt); + ok(bandparam.mtTimePhysical == 10, "Got physical time %lu, expected 10\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 20, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 100, "Got time %lu, expected 100\n", mt); + ok(bandparam.mtTimePhysical == 10, "Got physical time %lu, expected 10\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + /* time return by GetParam is actually not a relative time. */ + bandparam.mtTimePhysical = 250; + bandparam.pBand = dmb[2]; + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_BandParam, 250, &bandparam); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_BandParam, 120, &mt, &bandparam); + ok(hr == S_OK, "GetParam failed: %#lx, expected S_OK\n", hr); + ok(mt == 250, "Got time %lu, expected 250\n", mt); + ok(bandparam.mtTimePhysical == 100, "Got physical time %lu, expected 0\n", bandparam.mtTimePhysical); + IDirectMusicBand_Release(bandparam.pBand); + bandparam.pBand = NULL; + bandparam.mtTimePhysical = 0; + + for (i = 0; i < 3; i++) + IDirectMusicBand_Release(dmb[i]); + + bandparam.pBand = NULL; + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_BandParam, 0, &bandparam); + ok(hr == E_POINTER, "hr %#lx, expected E_POINTER\n", hr); + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);

1 0

Henri Verbeet : vkd3d: Cast DWORD flags to uint32_t in debug traces.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: vkd3d Branch: master Commit: 5eba031fa1c7f606ffacf3cb7310615728d150f0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5eba031fa1c7f606ffacf3cb73106… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 16:57:41 2024 +0100 vkd3d: Cast DWORD flags to uint32_t in debug traces. --- gitlab/build-mingw | 2 +- libs/vkd3d/device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 0886de2c..6d4cf189 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -13,7 +13,7 @@ mkdir build cd build mkdir vulkan-headers cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers -../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \ +../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \ make -j$(nproc) && \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \ touch ../pipeline_failed diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 90272818..1e094690 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3888,7 +3888,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateSharedHandle(ID3D12Device7 * struct d3d12_device *device = impl_from_ID3D12Device7(iface); FIXME("iface %p, object %p, attributes %p, access %#x, name %s, handle %p stub!\n", - iface, object, attributes, access, debugstr_w(name, device->wchar_size), handle); + iface, object, attributes, (uint32_t)access, debugstr_w(name, device->wchar_size), handle); return E_NOTIMPL; } @@ -3908,7 +3908,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandleByName(ID3D12Devic struct d3d12_device *device = impl_from_ID3D12Device7(iface); FIXME("iface %p, name %s, access %#x, handle %p stub!\n", - iface, debugstr_w(name, device->wchar_size), access, handle); + iface, debugstr_w(name, device->wchar_size), (uint32_t)access, handle); return E_NOTIMPL; }

1 0

Tag wine-9.2 : Alexandre Julliard : Release 9.2
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: refs/tags/wine-9.2 Tag: ed1975f21f33bfd880859a2c6d69f9eb015cdced URL: https://gitlab.winehq.org/wine/wine/-/tags/ed1975f21f33bfd880859a2c6d69f9eb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 22:46:52 2024 +0100 Release 9.2

1 0

Alexandre Julliard : Release 9.2.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 39d8b25938dd2620c6e1b6ae37e70bcc4ff5922a URL: https://gitlab.winehq.org/wine/wine/-/commit/39d8b25938dd2620c6e1b6ae37e70b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 22:46:52 2024 +0100 Release 9.2. --- ANNOUNCE.md | 700 ++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 313 insertions(+), 409 deletions(-)

1 0

Gabriel Ivăncescu : explorer: Set layered style on systray icons only when it's actually layered.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: b5c57b9a62c396068d18237bd6e82b37c169fdc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5c57b9a62c396068d18237bd6e82b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Feb 6 16:51:21 2024 +0200 explorer: Set layered style on systray icons only when it's actually layered. Fixes a regression introduced by 229b4561d9a8f10cbb49342dff0b6a3472d81c68, which caused the icons to not be visible initially in the virtual desktop systray. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/explorer/systray.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 74e5c3b6b48..c76ebdd0c92 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -624,6 +624,7 @@ static BOOL show_icon(struct icon *icon) { icon->display = ICON_DISPLAY_DOCKED; icon->layered = TRUE; + SetWindowLongW( icon->window, GWL_EXSTYLE, GetWindowLongW( icon->window, GWL_EXSTYLE ) | WS_EX_LAYERED ); SendMessageW( icon->window, WM_SIZE, SIZE_RESTORED, MAKELONG( icon_cx, icon_cy ) ); } systray_add_icon( icon ); @@ -645,6 +646,7 @@ static BOOL hide_icon(struct icon *icon) { icon->display = ICON_DISPLAY_HIDDEN; icon->layered = FALSE; + SetWindowLongW( icon->window, GWL_EXSTYLE, GetWindowLongW( icon->window, GWL_EXSTYLE ) & ~WS_EX_LAYERED ); } ShowWindow( icon->window, SW_HIDE ); systray_remove_icon( icon ); @@ -732,7 +734,7 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) icon->owner = nid->hWnd; icon->display = ICON_DISPLAY_HIDDEN; - CreateWindowExW( WS_EX_LAYERED, tray_icon_class.lpszClassName, NULL, WS_CLIPSIBLINGS | WS_POPUP, + CreateWindowExW( 0, tray_icon_class.lpszClassName, NULL, WS_CLIPSIBLINGS | WS_POPUP, 0, 0, icon_cx, icon_cy, 0, NULL, NULL, icon ); if (!icon->window) ERR( "Failed to create systray icon window\n" );

1 0

Gabriel Ivăncescu : explorer: Don't activate the systray icon when showing it.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 5e7a8f4db045d456913f9bd7075191ad14053375 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e7a8f4db045d456913f9bd7075191… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Feb 6 16:51:21 2024 +0200 explorer: Don't activate the systray icon when showing it. Fixes a regression introduced by 62c6646d8f44cee55ffdef6d2bede19f681dc9b8, because SetParent will unconditionally activate the window, causing newly added icons to deactivate the foreground window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/explorer/systray.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 43187db30b5..74e5c3b6b48 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -543,6 +543,15 @@ static LRESULT WINAPI tray_icon_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPA break; } + case WM_WINDOWPOSCHANGING: + if (icon->display == ICON_DISPLAY_HIDDEN) + { + /* Changing the icon's parent via SetParent would activate it, stealing the focus. */ + WINDOWPOS *wp = (WINDOWPOS*)lparam; + wp->flags |= SWP_NOACTIVATE; + } + break; + case WM_WINDOWPOSCHANGED: update_systray_balloon_position(); break; @@ -566,9 +575,9 @@ static void systray_add_icon( struct icon *icon ) if (icon->display != ICON_DISPLAY_HIDDEN) return; /* already added */ - icon->display = nb_displayed++; SetWindowLongW( icon->window, GWL_STYLE, GetWindowLongW( icon->window, GWL_STYLE ) | WS_CHILD ); SetParent( icon->window, tray_window ); + icon->display = nb_displayed++; pos = get_icon_pos( icon ); SetWindowPos( icon->window, 0, pos.x, pos.y, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW );

1 0

Shaun Ren : sapi: Add stub implementation for ISpeechObjectTokens::get__NewEnum.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 26498d93cf9354237eef3ef5a2b3612527068923 URL: https://gitlab.winehq.org/wine/wine/-/commit/26498d93cf9354237eef3ef5a2b361… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Feb 2 14:24:34 2024 -0500 sapi: Add stub implementation for ISpeechObjectTokens::get__NewEnum. --- dlls/sapi/tests/token.c | 26 +++++++++++ dlls/sapi/token.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 9350c304e41..543b19ec69a 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -248,6 +248,8 @@ static void test_token_enum(void) HRESULT hr; IDispatch *disp; ISpeechObjectTokens *speech_tokens; + IUnknown *unk; + IEnumVARIANT *enumvar; ISpObjectToken *tokens[5]; ISpObjectToken *out_tokens[5]; WCHAR token_id[MAX_PATH]; @@ -348,6 +350,30 @@ static void test_token_enum(void) &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum ); ok( hr == S_OK, "got %08lx\n", hr ); + hr = ISpObjectTokenEnumBuilder_QueryInterface( token_enum, + &IID_ISpeechObjectTokens, + (void **)&speech_tokens ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = ISpObjectTokenEnumBuilder_SetAttribs( token_enum, NULL, NULL ); + ok( hr == S_OK, "got %08lx\n", hr ); + hr = ISpObjectTokenEnumBuilder_AddTokens( token_enum, 3, tokens ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = ISpeechObjectTokens_get__NewEnum( speech_tokens, &unk ); + ok( hr == S_OK, "got %08lx\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IEnumVARIANT, (void **)&enumvar ); + ok( hr == S_OK, "got %08lx\n", hr ); + IUnknown_Release( unk ); + IEnumVARIANT_Release( enumvar ); + + ISpeechObjectTokens_Release( speech_tokens ); + ISpObjectTokenEnumBuilder_Release( token_enum ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum ); + ok( hr == S_OK, "got %08lx\n", hr ); + /* Vendor attribute must exist */ hr = ISpObjectTokenEnumBuilder_SetAttribs( token_enum, L"Vendor", NULL ); ok( hr == S_OK, "got %08lx\n", hr ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 4688e6a07b9..53b64a4383f 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -599,6 +599,20 @@ static struct token_enum *impl_from_ISpeechObjectTokens( ISpeechObjectTokens *if return CONTAINING_RECORD( iface, struct token_enum, ISpeechObjectTokens_iface ); } +struct enum_var +{ + IEnumVARIANT IEnumVARIANT_iface; + LONG ref; + + ISpObjectTokenEnumBuilder *token_enum; + ULONG index; +}; + +static struct enum_var *impl_from_IEnumVARIANT( IEnumVARIANT *iface ) +{ + return CONTAINING_RECORD( iface, struct enum_var, IEnumVARIANT_iface ); +} + static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface, LPCWSTR req, LPCWSTR opt, IEnumSpObjectTokens **enum_tokens ) @@ -1145,6 +1159,86 @@ const struct ISpObjectTokenEnumBuilderVtbl token_enum_vtbl = token_enum_Sort }; +static HRESULT WINAPI enum_var_QueryInterface( IEnumVARIANT *iface, + REFIID iid, void **obj ) +{ + struct enum_var *This = impl_from_IEnumVARIANT( iface ); + + TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj ); + + if (IsEqualIID( iid, &IID_IUnknown ) || + IsEqualIID( iid, &IID_IEnumVARIANT )) + { + IEnumVARIANT_AddRef( iface ); + *obj = iface; + return S_OK; + } + + *obj = NULL; + FIXME( "interface %s not implemented\n", debugstr_guid( iid ) ); + return E_NOINTERFACE; +} + +static ULONG WINAPI enum_var_AddRef( IEnumVARIANT *iface ) +{ + struct enum_var *This = impl_from_IEnumVARIANT( iface ); + ULONG ref = InterlockedIncrement( &This->ref ); + + TRACE( "(%p) ref = %lu\n", This, ref ); + return ref; +} + +static ULONG WINAPI enum_var_Release( IEnumVARIANT *iface ) +{ + struct enum_var *This = impl_from_IEnumVARIANT( iface ); + ULONG ref = InterlockedDecrement( &This->ref ); + + TRACE( "(%p) ref = %lu\n", This, ref ); + + if (!ref) + { + ISpObjectTokenEnumBuilder_Release( This->token_enum ); + free( This ); + } + return ref; +} + +static HRESULT WINAPI enum_var_Next( IEnumVARIANT *iface, ULONG count, + VARIANT *vars, ULONG *fetched ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_var_Skip( IEnumVARIANT *iface, ULONG count ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_var_Reset( IEnumVARIANT *iface ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_var_Clone( IEnumVARIANT *iface, IEnumVARIANT **new_enum ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl enum_var_vtbl = +{ + enum_var_QueryInterface, + enum_var_AddRef, + enum_var_Release, + enum_var_Next, + enum_var_Skip, + enum_var_Reset, + enum_var_Clone +}; + static HRESULT WINAPI speech_tokens_QueryInterface( ISpeechObjectTokens *iface, REFIID iid, void **obj ) { @@ -1233,8 +1327,27 @@ static HRESULT WINAPI speech_tokens_Item( ISpeechObjectTokens *iface, static HRESULT WINAPI speech_tokens_get__NewEnum( ISpeechObjectTokens *iface, IUnknown **new_enum ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct enum_var *enum_var; + HRESULT hr; + + TRACE( "(%p)->(%p)\n", iface, new_enum ); + + if (!new_enum) return E_POINTER; + if (!(enum_var = malloc( sizeof(*enum_var) ))) return E_OUTOFMEMORY; + + enum_var->IEnumVARIANT_iface.lpVtbl = &enum_var_vtbl; + enum_var->ref = 1; + enum_var->index = 0; + if (FAILED(hr = ISpeechObjectTokens_QueryInterface( iface, &IID_ISpObjectTokenEnumBuilder, + (void **)&enum_var->token_enum ))) + { + free( enum_var ); + return hr; + } + + *new_enum = (IUnknown *)&enum_var->IEnumVARIANT_iface; + + return S_OK; } static const ISpeechObjectTokensVtbl speech_tokens_vtbl =

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2024