October 2021 - Wine-commits

Rémi Bernon : dinput: Factor object enumeration checks and offset mapping.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: ec3e51bb10365e8081661531a2bd84ff2f10866a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3e51bb10365e8081661531… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:29 2021 +0200 dinput: Factor object enumeration checks and offset mapping. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 39 +++++++++++++++++++++++++++++++++------ dlls/dinput/joystick_hid.c | 26 +++++++------------------- dlls/dinput/keyboard.c | 19 ++----------------- dlls/dinput/mouse.c | 20 ++------------------ 4 files changed, 44 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec3e51bb10365e808166…

1 0

Rémi Bernon : dinput: Factor all Poll implementations together.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: aebd03f07087fdff5cd83b1c4d9ecc930658b61c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aebd03f07087fdff5cd83b1c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:30 2021 +0200 dinput: Factor all Poll implementations together. With a new internal poll callback for mouse and keyboard Wine-specific message peeking behavior. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 ++++++++---- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_hid.c | 15 ++------------- dlls/dinput/keyboard.c | 7 +++++++ dlls/dinput/mouse.c | 7 +++++++ 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2b2c4646e31..c31166b8248 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1661,13 +1661,17 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDI return DI_OK; } -HRESULT WINAPI IDirectInputDevice2WImpl_Poll(LPDIRECTINPUTDEVICE8W iface) +HRESULT WINAPI IDirectInputDevice2WImpl_Poll( IDirectInputDevice8W *iface ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT hr = DI_NOEFFECT; - if (!This->acquired) return DIERR_NOTACQUIRED; + EnterCriticalSection( &impl->crit ); + if (!impl->acquired) hr = DIERR_NOTACQUIRED; + LeaveCriticalSection( &impl->crit ); + if (hr != DI_OK) return hr; - check_dinput_events(); + if (impl->vtbl->poll) return impl->vtbl->poll( iface ); return DI_OK; } diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index da1a90fda42..92b0320520b 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -57,6 +57,7 @@ typedef HRESULT dinput_device_read_state( IDirectInputDevice8W *iface ); struct dinput_device_vtbl { + HRESULT (*poll)( IDirectInputDevice8W *iface ); HRESULT (*read)( IDirectInputDevice8W *iface ); HRESULT (*acquire)( IDirectInputDevice8W *iface ); HRESULT (*unacquire)( IDirectInputDevice8W *iface ); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 5718f02bf47..59e5e4a719f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1162,18 +1162,6 @@ static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8 return DI_OK; } -static HRESULT WINAPI hid_joystick_Poll( IDirectInputDevice8W *iface ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - HRESULT hr = DI_NOEFFECT; - - EnterCriticalSection( &impl->base.crit ); - if (!impl->base.acquired) hr = DIERR_NOTACQUIRED; - LeaveCriticalSection( &impl->base.crit ); - - return hr; -} - static const IDirectInputDevice8WVtbl hid_joystick_vtbl = { /*** IUnknown methods ***/ @@ -1204,7 +1192,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = hid_joystick_SendForceFeedbackCommand, hid_joystick_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape, - hid_joystick_Poll, + IDirectInputDevice2WImpl_Poll, IDirectInputDevice2WImpl_SendDeviceData, /*** IDirectInputDevice7 methods ***/ IDirectInputDevice7WImpl_EnumEffectsInFile, @@ -1432,6 +1420,7 @@ static HRESULT hid_joystick_internal_enum_objects( IDirectInputDevice8W *iface, static const struct dinput_device_vtbl hid_joystick_internal_vtbl = { + NULL, hid_joystick_internal_read, hid_joystick_internal_acquire, hid_joystick_internal_unacquire, diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index ad91c948fbc..a8f831e7597 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -270,6 +270,12 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac return DI_OK; } +static HRESULT keyboard_internal_poll( IDirectInputDevice8W *iface ) +{ + check_dinput_events(); + return DI_OK; +} + static HRESULT keyboard_internal_acquire( IDirectInputDevice8W *iface ) { return DI_OK; @@ -353,6 +359,7 @@ static HRESULT keyboard_internal_set_property( IDirectInputDevice8W *iface, DWOR static const struct dinput_device_vtbl keyboard_internal_vtbl = { + keyboard_internal_poll, NULL, keyboard_internal_acquire, keyboard_internal_unacquire, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 5b3ec2d1f20..5933d7e5f0f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -490,6 +490,12 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, return res; } +static HRESULT mouse_internal_poll( IDirectInputDevice8W *iface ) +{ + check_dinput_events(); + return DI_OK; +} + static HRESULT mouse_internal_acquire( IDirectInputDevice8W *iface ) { SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); @@ -683,6 +689,7 @@ static HRESULT mouse_internal_set_property( IDirectInputDevice8W *iface, DWORD p static const struct dinput_device_vtbl mouse_internal_vtbl = { + mouse_internal_poll, NULL, mouse_internal_acquire, mouse_internal_unacquire,

1 0

Rémi Bernon : dinput: Check for mouse warping in the poll callback.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 59fad29102875842519ef5cbc19cd37c99460291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59fad29102875842519ef5cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:31 2021 +0200 dinput: Check for mouse warping in the poll callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 5933d7e5f0f..7b8402b2bf5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -472,27 +472,14 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, } LeaveCriticalSection(&This->base.crit); - warp_check( This, FALSE ); return DI_OK; } -/****************************************************************************** - * GetDeviceData : gets buffered input data. - */ -static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, - DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - HRESULT res; - - res = IDirectInputDevice2WImpl_GetDeviceData(iface, dodsize, dod, entries, flags); - if (SUCCEEDED(res)) warp_check( This, FALSE ); - return res; -} - static HRESULT mouse_internal_poll( IDirectInputDevice8W *iface ) { + SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); check_dinput_events(); + warp_check( impl, FALSE ); return DI_OK; } @@ -710,7 +697,7 @@ static const IDirectInputDevice8WVtbl SysMouseWvt = IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, SysMouseWImpl_GetDeviceState, - SysMouseWImpl_GetDeviceData, + IDirectInputDevice2WImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel,

1 0

Rémi Bernon : dinput: Factor all GetDeviceState implementations together.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 89c59e77c100bd4e6038a8cdcca97f2f9e13786e URL: https://source.winehq.org/git/wine.git/?a=commit;h=89c59e77c100bd4e6038a8cd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:32 2021 +0200 dinput: Factor all GetDeviceState implementations together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_hid.c | 18 +----------------- dlls/dinput/keyboard.c | 31 +------------------------------ dlls/dinput/mouse.c | 35 +---------------------------------- 5 files changed, 45 insertions(+), 81 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c31166b8248..ef77826ce25 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1522,6 +1522,47 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( IDirectInputDevice8W *ifa return DI_OK; } +static BOOL CALLBACK reset_axis_data( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + *(ULONG *)((char *)data + instance->dwOfs) = 0; + return DIENUM_CONTINUE; +} + +HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceState( IDirectInputDevice8W *iface, DWORD size, void *data ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + DIPROPHEADER filter = + { + .dwSize = sizeof(filter), + .dwHeaderSize = sizeof(filter), + .dwHow = DIPH_DEVICE, + .dwObj = 0, + }; + HRESULT hr; + + TRACE( "iface %p, size %u, data %p.\n", iface, size, data ); + + if (!data) return DIERR_INVALIDPARAM; + + IDirectInputDevice2_Poll( iface ); + + EnterCriticalSection( &impl->crit ); + if (!impl->acquired) + hr = DIERR_NOTACQUIRED; + else if (size != impl->data_format.user_df->dwDataSize) + hr = DIERR_INVALIDPARAM; + else + { + fill_DataFormat( data, size, impl->device_state, &impl->data_format ); + if (!(impl->data_format.user_df->dwFlags & DIDF_ABSAXIS)) + impl->vtbl->enum_objects( iface, &filter, DIDFT_RELAXIS, reset_axis_data, impl->device_state ); + hr = DI_OK; + } + LeaveCriticalSection( &impl->crit ); + + return hr; +} + HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) { diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 92b0320520b..d918403ef67 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -157,6 +157,7 @@ extern HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo(LPDIRECTINPUTDEVICE LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) DECLSPEC_HIDDEN; +extern HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ); extern HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_RunControlPanel(LPDIRECTINPUTDEVICE8W iface, HWND hwndOwner, DWORD dwFlags) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 59e5e4a719f..90c60209192 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -818,22 +818,6 @@ static HRESULT hid_joystick_internal_unacquire( IDirectInputDevice8W *iface ) return DI_OK; } -static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - HRESULT hr = DI_OK; - - if (!ptr) return DIERR_INVALIDPARAM; - if (len != impl->base.data_format.user_df->dwDataSize) return DIERR_INVALIDPARAM; - - EnterCriticalSection( &impl->base.crit ); - if (!impl->base.acquired) hr = DIERR_NOTACQUIRED; - else fill_DataFormat( ptr, len, impl->base.device_state, &impl->base.data_format ); - LeaveCriticalSection( &impl->base.crit ); - - return hr; -} - static HRESULT hid_joystick_effect_create( struct hid_joystick *joystick, IDirectInputEffect **out ); static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, const GUID *guid, @@ -1175,7 +1159,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, - hid_joystick_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceState, IDirectInputDevice2WImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index a8f831e7597..75a2079f5fe 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -241,35 +241,6 @@ const struct dinput_device keyboard_device = { keyboarddev_create_device }; -static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) -{ - SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); - DWORD i; - - TRACE("(%p)->(%d,%p)\n", This, len, ptr); - - if (!This->base.acquired) return DIERR_NOTACQUIRED; - - if (len != This->base.data_format.user_df->dwDataSize ) - return DIERR_INVALIDPARAM; - - check_dinput_events(); - - EnterCriticalSection(&This->base.crit); - - if (TRACE_ON(dinput)) - { - TRACE( "pressed keys:" ); - for (i = 0; i < len; i++) if (This->base.device_state[i]) TRACE( " %02x", i ); - TRACE( "\n" ); - } - - fill_DataFormat( ptr, len, This->base.device_state, &This->base.data_format ); - LeaveCriticalSection(&This->base.crit); - - return DI_OK; -} - static HRESULT keyboard_internal_poll( IDirectInputDevice8W *iface ) { check_dinput_events(); @@ -379,7 +350,7 @@ static const IDirectInputDevice8WVtbl SysKeyboardWvt = IDirectInputDevice2WImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, - SysKeyboardWImpl_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceState, IDirectInputDevice2WImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 7b8402b2bf5..69feb259d60 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -442,39 +442,6 @@ static void warp_check( SysMouseImpl* This, BOOL force ) } } -/****************************************************************************** - * GetDeviceState : returns the "state" of the mouse. - * - * For the moment, only the "standard" return structure (DIMOUSESTATE) is - * supported. - */ -static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - DIMOUSESTATE2 *state = (DIMOUSESTATE2 *)This->base.device_state; - TRACE("(%p)->(%u,%p)\n", This, len, ptr); - - if(This->base.acquired == 0) return DIERR_NOTACQUIRED; - - check_dinput_events(); - - EnterCriticalSection(&This->base.crit); - - /* Copy the current mouse state */ - fill_DataFormat( ptr, len, state, &This->base.data_format ); - - /* Initialize the buffer when in relative mode */ - if (!(This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS)) - { - state->lX = 0; - state->lY = 0; - state->lZ = 0; - } - LeaveCriticalSection(&This->base.crit); - - return DI_OK; -} - static HRESULT mouse_internal_poll( IDirectInputDevice8W *iface ) { SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); @@ -696,7 +663,7 @@ static const IDirectInputDevice8WVtbl SysMouseWvt = IDirectInputDevice2WImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, - SysMouseWImpl_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceState, IDirectInputDevice2WImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification,

1 0

Rémi Bernon : dinput: Add a release callback for internal refcount handling.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 7ccf07ae8f16d83a012673904fafcc4e9f6ecf8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ccf07ae8f16d83a01267390… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:33 2021 +0200 dinput: Add a release callback for internal refcount handling. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 30 ++++++++++++++------- dlls/dinput/device_private.h | 2 ++ dlls/dinput/joystick_hid.c | 62 +++++++++++++++++--------------------------- dlls/dinput/keyboard.c | 1 + dlls/dinput/mouse.c | 1 + 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ef77826ce25..8858bfa26bb 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1049,15 +1049,11 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetEventNotification(LPDIRECTINPUTDEVICE return DI_OK; } - -ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) +void direct_input_device_destroy( IDirectInputDevice8W *iface ) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - ULONG ref = InterlockedDecrement(&(This->ref)); - - TRACE("(%p) ref %d\n", This, ref); - if (ref) return ref; + TRACE( "iface %p.\n", iface ); IDirectInputDevice_Unacquire(iface); /* Reset the FF state, free all effects, etc */ @@ -1078,6 +1074,20 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) DeleteCriticalSection(&This->crit); free( This ); +} + +ULONG WINAPI IDirectInputDevice2WImpl_Release( IDirectInputDevice8W *iface ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p, ref %u.\n", iface, ref ); + + if (!ref) + { + if (impl->vtbl->release) impl->vtbl->release( iface ); + else direct_input_device_destroy( iface ); + } return ref; } @@ -1132,11 +1142,11 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W ifa return E_NOINTERFACE; } -ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) +ULONG WINAPI IDirectInputDevice2WImpl_AddRef( IDirectInputDevice8W *iface ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE( "(%p) ref %d\n", This, ref ); + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %u.\n", iface, ref ); return ref; } diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index d918403ef67..bdac5b4a378 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -57,6 +57,7 @@ typedef HRESULT dinput_device_read_state( IDirectInputDevice8W *iface ); struct dinput_device_vtbl { + void (*release)( IDirectInputDevice8W *iface ); HRESULT (*poll)( IDirectInputDevice8W *iface ); HRESULT (*read)( IDirectInputDevice8W *iface ); HRESULT (*acquire)( IDirectInputDevice8W *iface ); @@ -116,6 +117,7 @@ struct IDirectInputDeviceImpl extern HRESULT direct_input_device_alloc( SIZE_T size, const IDirectInputDevice8WVtbl *vtbl, const struct dinput_device_vtbl *internal_vtbl, const GUID *guid, IDirectInputImpl *dinput, void **out ) DECLSPEC_HIDDEN; extern HRESULT direct_input_device_init( IDirectInputDevice8W *iface ); +extern void direct_input_device_destroy( IDirectInputDevice8W *iface ); extern const IDirectInputDevice8AVtbl dinput_device_a_vtbl DECLSPEC_HIDDEN; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 90c60209192..766e022ebe0 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -158,7 +158,7 @@ struct pid_set_ramp_force struct hid_joystick { IDirectInputDeviceImpl base; - LONG ref; + LONG internal_ref; HANDLE device; OVERLAPPED read_ovl; @@ -608,45 +608,30 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, return DIENUM_CONTINUE; } -static ULONG hid_joystick_private_incref( struct hid_joystick *impl ) +static void hid_joystick_internal_addref( IDirectInputDevice8W *iface ) { - return IDirectInputDevice2WImpl_AddRef( &impl->base.IDirectInputDevice8W_iface ); + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + ULONG ref = InterlockedIncrement( &impl->internal_ref ); + TRACE( "iface %p, internal ref %u.\n", iface, ref ); } -static ULONG hid_joystick_private_decref( struct hid_joystick *impl ) +static void hid_joystick_internal_release( IDirectInputDevice8W *iface ) { - struct hid_joystick tmp = *impl; - ULONG ref; + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + ULONG ref = InterlockedDecrement( &impl->internal_ref ); + TRACE( "iface %p, internal ref %u.\n", iface, ref ); - if (!(ref = IDirectInputDevice2WImpl_Release( &impl->base.IDirectInputDevice8W_iface ))) + if (!ref) { - free( tmp.usages_buf ); - free( tmp.output_report_buf ); - free( tmp.input_report_buf ); - free( tmp.input_extra_caps ); - HidD_FreePreparsedData( tmp.preparsed ); - CloseHandle( tmp.base.read_event ); - CloseHandle( tmp.device ); + free( impl->usages_buf ); + free( impl->output_report_buf ); + free( impl->input_report_buf ); + free( impl->input_extra_caps ); + HidD_FreePreparsedData( impl->preparsed ); + CloseHandle( impl->base.read_event ); + CloseHandle( impl->device ); + direct_input_device_destroy( iface ); } - - return ref; -} - -static ULONG WINAPI hid_joystick_AddRef( IDirectInputDevice8W *iface ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - ULONG ref = InterlockedIncrement( &impl->ref ); - TRACE( "iface %p, ref %u.\n", iface, ref ); - return ref; -} - -static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - ULONG ref = InterlockedDecrement( &impl->ref ); - TRACE( "iface %p, ref %u.\n", iface, ref ); - if (!ref) hid_joystick_private_decref( impl ); - return ref; } static HRESULT hid_joystick_internal_get_property( IDirectInputDevice8W *iface, DWORD property, DIPROPHEADER *header, @@ -1150,8 +1135,8 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = { /*** IUnknown methods ***/ IDirectInputDevice2WImpl_QueryInterface, - hid_joystick_AddRef, - hid_joystick_Release, + IDirectInputDevice2WImpl_AddRef, + IDirectInputDevice2WImpl_Release, /*** IDirectInputDevice methods ***/ IDirectInputDevice2WImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, @@ -1404,6 +1389,7 @@ static HRESULT hid_joystick_internal_enum_objects( IDirectInputDevice8W *iface, static const struct dinput_device_vtbl hid_joystick_internal_vtbl = { + hid_joystick_internal_release, NULL, hid_joystick_internal_read, hid_joystick_internal_acquire, @@ -1979,7 +1965,7 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID &attrs, &impl->caps, dinput->dwVersion ); if (hr != DI_OK) goto failed; - impl->ref = 1; + impl->internal_ref = 1; impl->base.instance = instance; impl->base.caps.dwDevType = instance.dwDevType; impl->attrs = attrs; @@ -2097,7 +2083,7 @@ static ULONG WINAPI hid_joystick_effect_Release( IDirectInputEffect *iface ) EnterCriticalSection( &impl->joystick->base.crit ); list_remove( &impl->entry ); LeaveCriticalSection( &impl->joystick->base.crit ); - hid_joystick_private_decref( impl->joystick ); + hid_joystick_internal_release( &impl->joystick->base.IDirectInputDevice8W_iface ); free( impl->type_specific_buf[1] ); free( impl->type_specific_buf[0] ); free( impl->effect_update_buf ); @@ -2934,7 +2920,7 @@ static HRESULT hid_joystick_effect_create( struct hid_joystick *joystick, IDirec impl->IDirectInputEffect_iface.lpVtbl = &hid_joystick_effect_vtbl; impl->ref = 1; impl->joystick = joystick; - hid_joystick_private_incref( joystick ); + hid_joystick_internal_addref( &joystick->base.IDirectInputDevice8W_iface ); EnterCriticalSection( &joystick->base.crit ); list_add_tail( &joystick->effect_list, &impl->entry ); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 75a2079f5fe..f17dc89ac16 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -330,6 +330,7 @@ static HRESULT keyboard_internal_set_property( IDirectInputDevice8W *iface, DWOR static const struct dinput_device_vtbl keyboard_internal_vtbl = { + NULL, keyboard_internal_poll, NULL, keyboard_internal_acquire, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 69feb259d60..7fafa7696a7 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -643,6 +643,7 @@ static HRESULT mouse_internal_set_property( IDirectInputDevice8W *iface, DWORD p static const struct dinput_device_vtbl mouse_internal_vtbl = { + NULL, mouse_internal_poll, NULL, mouse_internal_acquire,

1 0

Francois Gouget : wrc: Add a trailing linefeed to a couple of error() messages.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: c35b41a3f2133c6f1f88ea4c2a3ccab4fac077b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c35b41a3f2133c6f1f88ea4c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 20 16:40:11 2021 +0200 wrc: Add a trailing linefeed to a couple of error() messages. Unlike most of the other wrc error functions, error() does not append a trailing linefeed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/ppl.l | 2 +- tools/wrc/wpp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index d4df76f7950..ee5a4f97a1e 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -1192,7 +1192,7 @@ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop) if(ppy_debug) printf("push_buffer(%d): %p %p %p %d\n", bufferstackidx, ppp, filename, incname, pop); if(bufferstackidx >= MAXBUFFERSTACK) - error("Buffer stack overflow"); + error("Buffer stack overflow\n"); memset(&bufferstack[bufferstackidx], 0, sizeof(bufferstack[0])); bufferstack[bufferstackidx].bufferstate = YY_CURRENT_BUFFER; diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index 9ad09f25da2..18a7b015be0 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -421,7 +421,7 @@ static const char * const pp_if_state_str[] = { void pp_push_if(pp_if_state_t s) { if(if_stack_idx >= MAXIFSTACK) - error("#if-stack overflow; #{if,ifdef,ifndef} nested too deeply (> %d)", MAXIFSTACK); + error("#if-stack overflow; #{if,ifdef,ifndef} nested too deeply (> %d)\n", MAXIFSTACK); if(pp_flex_debug) fprintf(stderr, "Push if %s:%d: %s(%d) -> %s(%d)\n", pp_status.input, pp_status.line_number, pp_if_state_str[pp_if_state()], if_stack_idx, pp_if_state_str[s], if_stack_idx+1);

1 0

Francois Gouget : winebus.sys: Add a trailing linefeed to a couple of FIXME()s.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: c4d5010fbf7be17025900b52ce432b9d507136ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d5010fbf7be17025900b52… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 20 16:37:14 2021 +0200 winebus.sys: Add a trailing linefeed to a couple of FIXME()s. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index f1c20692b29..403c4821f24 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -629,7 +629,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME("not implemented!"); + FIXME("not implemented!\n"); break; } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 62a70da94e6..c7125520c33 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1090,7 +1090,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME("not implemented!"); + FIXME("not implemented!\n"); break; }

1 0

Zebediah Figura : winegstreamer: Move the IWMProfile3 implementation to a separate object.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 2d0dc2d47ca6b2d4090dfe32efdba4f695b197ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0dc2d47ca6b2d4090dfe32… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 11:09:45 2021 -0500 winegstreamer: Move the IWMProfile3 implementation to a separate object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/gst_private.h | 17 ++ dlls/winegstreamer/main.c | 6 +- dlls/winegstreamer/mfplat.c | 3 +- dlls/winegstreamer/wm_asyncreader.c | 471 +++++++----------------------------- dlls/winegstreamer/wm_reader.c | 308 +++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 2 - 7 files changed, 418 insertions(+), 392 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d0dc2d47ca6b2d4090d…

1 0

Zebediah Figura : winegstreamer: Use the wm_reader object for the synchronous reader as well.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 831c6a88aab78db054beb42ca9562146b53963e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=831c6a88aab78db054beb42c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 11:09:46 2021 -0500 winegstreamer: Use the wm_reader object for the synchronous reader as well. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_syncreader.c | 338 +++---------------------------------- 1 file changed, 27 insertions(+), 311 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=831c6a88aab78db054be…

1 0

Zebediah Figura : wmvcore/tests: Sort interface tests.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: c40613e81c5ffb9207325134e089379373952591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c40613e81c5ffb9207325134… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 11:09:47 2021 -0500 wmvcore/tests: Sort interface tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 63509b8c93e..2b36c411262 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -86,30 +86,30 @@ static void test_wmreader_interfaces(void) check_interface(reader, &IID_IWMSyncReader, FALSE); check_interface(reader, &IID_IWMSyncReader2, FALSE); - check_interface(reader, &IID_IWMReader, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced2, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced3, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced4, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced5, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced6, TRUE); + check_interface(reader, &IID_IReferenceClock, TRUE); check_interface(reader, &IID_IWMHeaderInfo, TRUE); check_interface(reader, &IID_IWMHeaderInfo2, TRUE); check_interface(reader, &IID_IWMHeaderInfo3, TRUE); + check_interface(reader, &IID_IWMLanguageList, TRUE); + check_interface(reader, &IID_IWMPacketSize, TRUE); + check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE); check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE); - check_interface(reader, &IID_IWMPacketSize, TRUE); - check_interface(reader, &IID_IWMPacketSize2, TRUE); + check_interface(reader, &IID_IWMReader, TRUE); check_interface(reader, &IID_IWMReaderAccelerator, TRUE); - check_interface(reader, &IID_IWMReaderTimecode, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced2, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced3, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced4, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced5, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced6, TRUE); check_interface(reader, &IID_IWMReaderNetworkConfig, TRUE); check_interface(reader, &IID_IWMReaderNetworkConfig2, TRUE); + check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); check_interface(reader, &IID_IWMReaderStreamClock, TRUE); + check_interface(reader, &IID_IWMReaderTimecode, TRUE); check_interface(reader, &IID_IWMReaderTypeNegotiation, TRUE); - check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); - check_interface(reader, &IID_IWMLanguageList, TRUE); - check_interface(reader, &IID_IReferenceClock, TRUE); IWMReader_Release(reader); } @@ -127,6 +127,7 @@ static void test_wmsyncreader_interfaces(void) return; } + check_interface(reader, &IID_IReferenceClock, FALSE); check_interface(reader, &IID_IWMDRMReader, FALSE); check_interface(reader, &IID_IWMDRMReader2, FALSE); check_interface(reader, &IID_IWMDRMReader3, FALSE); @@ -142,21 +143,20 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMReaderNetworkConfig2, FALSE); check_interface(reader, &IID_IWMReaderStreamClock, FALSE); check_interface(reader, &IID_IWMReaderTypeNegotiation, FALSE); - check_interface(reader, &IID_IReferenceClock, FALSE); - check_interface(reader, &IID_IWMSyncReader, TRUE); - check_interface(reader, &IID_IWMSyncReader2, TRUE); todo_wine check_interface(reader, &IID_IWMHeaderInfo, TRUE); todo_wine check_interface(reader, &IID_IWMHeaderInfo2, TRUE); todo_wine check_interface(reader, &IID_IWMHeaderInfo3, TRUE); + todo_wine check_interface(reader, &IID_IWMLanguageList, TRUE); + todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); + todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE); check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); - todo_wine check_interface(reader, &IID_IWMReaderTimecode, TRUE); todo_wine check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); - todo_wine check_interface(reader, &IID_IWMLanguageList, TRUE); + todo_wine check_interface(reader, &IID_IWMReaderTimecode, TRUE); + check_interface(reader, &IID_IWMSyncReader, TRUE); + check_interface(reader, &IID_IWMSyncReader2, TRUE); IWMSyncReader_Release(reader); }

1 0