October 2021 - Wine-Commits

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

Oct. 20, 2021

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 Oct. 20, 2021

Oct. 20, 2021

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

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

Oct. 20, 2021

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 : winegstreamer: Move the IWMHeaderInfo3 implementation to the wm_reader object.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 3dd8eeeebdeec619570c764285bdcae82dee5868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd8eeeebdeec619570c7642… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 11:09:48 2021 -0500 winegstreamer: Move the IWMHeaderInfo3 implementation to the wm_reader object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 227 ------------------------------------ dlls/winegstreamer/wm_reader.c | 215 +++++++++++++++++++++++++++++++++- dlls/wmvcore/tests/wmvcore.c | 6 +- 4 files changed, 218 insertions(+), 231 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd8eeeebdeec619570c…

1 0

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

Oct. 20, 2021

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

Alexandre Julliard : ntdll: Avoid including wine/port.h.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 832724282bc1bc4f59e06d4978ff807e433a1ac5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832724282bc1bc4f59e06d49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 18:39:13 2021 +0200 ntdll: Avoid including wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/cdrom.c | 10 +++------- dlls/ntdll/unix/debug.c | 8 ++++---- dlls/ntdll/unix/file.c | 8 ++------ dlls/ntdll/unix/loader.c | 11 +++++++---- dlls/ntdll/unix/process.c | 5 +---- dlls/ntdll/unix/serial.c | 9 ++------- dlls/ntdll/unix/server.c | 10 +++------- dlls/ntdll/unix/signal_arm.c | 6 ++---- dlls/ntdll/unix/signal_arm64.c | 6 ++---- dlls/ntdll/unix/signal_i386.c | 5 +---- dlls/ntdll/unix/signal_x86_64.c | 5 +---- dlls/ntdll/unix/sync.c | 7 +++---- dlls/ntdll/unix/system.c | 5 ++++- dlls/ntdll/unix/tape.c | 5 ++++- dlls/ntdll/unix/thread.c | 3 ++- dlls/ntdll/unix/virtual.c | 13 ++++++------- 16 files changed, 47 insertions(+), 69 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index 479d4058068..db3b9cd25c2 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -26,19 +26,15 @@ #endif #include "config.h" -#include "wine/port.h" #include <errno.h> #include <string.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <stdlib.h> +#include <unistd.h> #include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> #elif defined(MAJOR_IN_SYSMACROS) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index a2a63b5a9f4..26e7decc059 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -23,16 +23,16 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 7e47e32bab9..1acd999a3c5 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -25,7 +25,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <sys/types.h> @@ -37,15 +36,12 @@ #include <stdlib.h> #include <stdio.h> #include <limits.h> +#include <unistd.h> #ifdef HAVE_MNTENT_H #include <mntent.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef HAVE_SYS_STATVFS_H # include <sys/statvfs.h> #endif diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index df309814c0c..4e807744862 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -23,17 +23,20 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <signal.h> #include <math.h> -#ifdef HAVE_LINK_H -# include <link.h> -#endif +#include <string.h> +#include <stdlib.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_PWD_H # include <pwd.h> #endif diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index b35765ba2fe..10a88db9291 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -24,7 +24,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <errno.h> #include <fcntl.h> @@ -47,9 +46,7 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_MACH_MACH_H # include <mach/mach.h> #endif diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ab2ef9330a5..ece9966f12b 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -25,7 +25,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <errno.h> #include <string.h> @@ -35,13 +34,9 @@ #ifdef HAVE_TERMIOS_H #include <termios.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #include <sys/types.h> #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 53d34e1858a..46d403df326 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -23,7 +23,6 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -41,6 +40,7 @@ #include <signal.h> #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -58,9 +58,7 @@ #ifdef HAVE_SYS_PRCTL_H # include <sys/prctl.h> #endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif @@ -70,9 +68,7 @@ #ifdef HAVE_SYS_THR_H #include <sys/thr.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef __APPLE__ #include <crt_externs.h> #include <spawn.h> diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 88f0f4ff76d..798d7b9cc87 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -26,7 +26,6 @@ #ifdef __arm__ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <pthread.h> @@ -34,9 +33,8 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ce7e1689434..0f72bf3c89d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -25,7 +25,6 @@ #ifdef __aarch64__ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <pthread.h> @@ -33,9 +32,8 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c38c4d046d7..bf3abc1a587 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -25,7 +25,6 @@ #ifdef __i386__ #include "config.h" -#include "wine/port.h" #include <errno.h> #include <signal.h> @@ -34,9 +33,7 @@ #include <stdio.h> #include <sys/types.h> #include <assert.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index a99cf2ae9c1..0085bd42410 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -25,7 +25,6 @@ #ifdef __x86_64__ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <pthread.h> @@ -35,9 +34,7 @@ #include <stdio.h> #include <sys/types.h> #include <sys/mman.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_MACHINE_SYSARCH_H # include <machine/sysarch.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 86a836a908f..a246fc19618 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -26,12 +26,13 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <limits.h> #include <signal.h> +#include <sys/types.h> #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif @@ -44,9 +45,7 @@ #ifdef HAVE_SYS_POLL_H # include <sys/poll.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_SCHED_H # include <sched.h> #endif diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 82c9f0da492..c4853568599 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -23,12 +23,15 @@ #endif #include "config.h" -#include "wine/port.h" +#include <fcntl.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <unistd.h> #include <errno.h> #ifdef HAVE_SYS_TIME_H # include <sys/time.h> diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 6824d42a745..741de2f6d95 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -23,11 +23,14 @@ #endif #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 384ac1d4119..38a03bd4b60 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -23,17 +23,18 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> #include <limits.h> #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <pthread.h> #include <signal.h> #include <sys/types.h> +#include <unistd.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6db08de6473..facecffcf37 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -23,29 +23,28 @@ #endif #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> +#include <string.h> +#include <stdlib.h> #include <signal.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif #ifdef HAVE_SYS_SYSINFO_H # include <sys/sysinfo.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_VALGRIND_VALGRIND_H # include <valgrind/valgrind.h> #endif

1 0

Alexandre Julliard : loader: Avoid including wine/port.h.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 28d7d5ba9348495eaccb22f934f27bc083e5f246 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d7d5ba9348495eaccb22f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 18:53:26 2021 +0200 loader: Avoid including wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/main.c | 7 ++++++- loader/preloader.c | 9 ++------- loader/preloader_mac.c | 10 +++------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/loader/main.c b/loader/main.c index 86c2b28263e..fdc77c56162 100644 --- a/loader/main.c +++ b/loader/main.c @@ -19,11 +19,16 @@ */ #include "config.h" -#include "wine/port.h" +#include <fcntl.h> #include <pthread.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <dlfcn.h> #include "main.h" diff --git a/loader/preloader.c b/loader/preloader.c index 86308484182..7bd6afaeb66 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -63,16 +63,13 @@ #ifdef __linux__ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #include <fcntl.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> @@ -80,9 +77,7 @@ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_ELF_H # include <elf.h> #endif diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index fc07b7da0ed..23eee44975f 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -25,16 +25,13 @@ #ifdef __APPLE__ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> #include <fcntl.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> @@ -42,9 +39,8 @@ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_MACH_O_LOADER_H #include <mach/thread_status.h> #include <mach-o/loader.h>

1 0

Alexandre Julliard : libs: Import code from upstream libxml2 2.9.12.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

1 0

Alexandre Julliard : libs: Import upstream code from gsm 1.0.19.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 116ea9cec442ce66df2d4b94e34f81ff466bd91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=116ea9cec442ce66df2d4b94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:45:59 2021 +0200 libs: Import upstream code from gsm 1.0.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ++ configure.ac | 2 + libs/gsm/COPYRIGHT | 35 ++ libs/gsm/Makefile.in | 19 + libs/gsm/inc/gsm.h | 79 ++++ libs/gsm/inc/private.h | 277 +++++++++++++ libs/gsm/inc/proto.h | 65 ++++ libs/gsm/inc/unproto.h | 23 ++ libs/gsm/src/add.c | 235 +++++++++++ libs/gsm/src/code.c | 89 +++++ libs/gsm/src/decode.c | 63 +++ libs/gsm/src/gsm_create.c | 28 ++ libs/gsm/src/gsm_decode.c | 361 +++++++++++++++++ libs/gsm/src/gsm_destroy.c | 16 + libs/gsm/src/gsm_encode.c | 451 +++++++++++++++++++++ libs/gsm/src/gsm_option.c | 69 ++++ libs/gsm/src/gsm_print.c | 167 ++++++++ libs/gsm/src/long_term.c | 949 +++++++++++++++++++++++++++++++++++++++++++++ libs/gsm/src/lpc.c | 341 ++++++++++++++++ libs/gsm/src/preprocess.c | 113 ++++++ libs/gsm/src/rpe.c | 488 +++++++++++++++++++++++ libs/gsm/src/short_term.c | 429 ++++++++++++++++++++ libs/gsm/src/table.c | 63 +++ 23 files changed, 4386 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=116ea9cec442ce66df2d…

1 0

Alexandre Julliard : mxsml3: Use the bundled libxml2 and libxslt and build with msvcrt.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: bca1b7f2faeb0798f4af420c15ff5a1b1f7b40af URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca1b7f2faeb0798f4af420c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:39:06 2021 +0200 mxsml3: Use the bundled libxml2 and libxslt and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 454 -------------------------------------------- configure.ac | 51 ----- dlls/msxml3/Makefile.in | 7 +- dlls/msxml3/attribute.c | 14 +- dlls/msxml3/cdata.c | 12 +- dlls/msxml3/comment.c | 12 +- dlls/msxml3/dispex.c | 6 +- dlls/msxml3/docfrag.c | 12 +- dlls/msxml3/doctype.c | 12 +- dlls/msxml3/domdoc.c | 61 +----- dlls/msxml3/element.c | 30 ++- dlls/msxml3/entityref.c | 12 +- dlls/msxml3/factory.c | 8 +- dlls/msxml3/httprequest.c | 33 ++-- dlls/msxml3/main.c | 112 ++--------- dlls/msxml3/msxml_private.h | 30 +-- dlls/msxml3/mxnamespace.c | 8 +- dlls/msxml3/mxwriter.c | 7 +- dlls/msxml3/node.c | 87 ++------- dlls/msxml3/nodelist.c | 12 +- dlls/msxml3/nodemap.c | 12 +- dlls/msxml3/pi.c | 18 +- dlls/msxml3/saxreader.c | 41 ++-- dlls/msxml3/schema.c | 56 ++---- dlls/msxml3/selection.c | 16 +- dlls/msxml3/stylesheet.c | 15 +- dlls/msxml3/text.c | 14 +- dlls/msxml3/xdr.c | 11 +- dlls/msxml3/xmldoc.c | 25 +-- dlls/msxml3/xmlelem.c | 12 +- dlls/msxml3/xmlview.c | 5 +- dlls/msxml3/xslpattern.h | 8 - dlls/msxml3/xslpattern.l | 7 - dlls/msxml3/xslpattern.y | 6 - include/config.h.in | 39 ---- 35 files changed, 150 insertions(+), 1115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bca1b7f2faeb0798f4af…

1 0