May 2021 - Wine-commits - list.winehq.org

Rémi Bernon : dinput: Factor out IDirectInputDevice_GetCapabilities WtoA conversions.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 5eb5f94fc0c5d5ace256e75122f675722d0527f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb5f94fc0c5d5ace256e751… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 27 10:50:01 2021 +0200 dinput: Factor out IDirectInputDevice_GetCapabilities WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 7 +++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 6 ------ dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 1 - dlls/dinput/keyboard.c | 8 +------- dlls/dinput/mouse.c | 8 +------- 9 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 4e9a9af7a83..d61fdb07e4f 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -130,6 +130,13 @@ ULONG WINAPI IDirectInputDevice2AImpl_Release( IDirectInputDevice8A *iface_a ) return IDirectInputDevice8_Release( iface_w ); } +HRESULT WINAPI IDirectInputDevice2AImpl_GetCapabilities( IDirectInputDevice8A *iface_a, DIDEVCAPS *caps ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + return IDirectInputDevice8_GetCapabilities( iface_w, caps ); +} + struct enum_objects_wtoa_params { LPDIENUMDEVICEOBJECTSCALLBACKA callback; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 56718790040..f8cfd98f9b3 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -144,6 +144,7 @@ extern HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(LPDIRECTINPU extern HRESULT WINAPI IDirectInputDevice2WImpl_SetEventNotification(LPDIRECTINPUTDEVICE8W iface, HANDLE hnd) DECLSPEC_HIDDEN; extern ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; extern ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI IDirectInputDevice2AImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, DIDEVCAPS *caps) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A iface, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W iface, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern ULONG WINAPI IDirectInputDevice2AImpl_AddRef(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index b79935ede7c..60a61d1ea6b 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -542,12 +542,6 @@ HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } -HRESULT WINAPI JoystickAGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) -{ - JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWGenericImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); -} - /****************************************************************************** * GetObjectInfo : get object info */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 091e1f2152e..8196102f9bb 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -907,7 +907,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - JoystickAGenericImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 307b447d237..9a41e798642 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1338,7 +1338,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - JoystickAGenericImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 78e041daf92..a663c438c35 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1579,7 +1579,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - JoystickAGenericImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 2a25bf4eb23..60cea6197c6 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -64,7 +64,6 @@ HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) DECLSPEC_HIDDEN; void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index b1914d057bd..3a81b7e58fb 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -419,12 +419,6 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa return DI_OK; } -static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) -{ - SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); - return SysKeyboardWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); -} - static DWORD map_dik_to_scan(DWORD dik_code, DWORD subtype) { if (dik_code == DIK_PAUSE || dik_code == DIK_NUMLOCK) dik_code ^= 0x80; @@ -657,7 +651,7 @@ static const IDirectInputDevice8AVtbl SysKeyboardAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - SysKeyboardAImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 9267d92d6e9..68cc5059ec8 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -761,12 +761,6 @@ static HRESULT WINAPI SysMouseWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } -static HRESULT WINAPI SysMouseAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); - return SysMouseWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); -} - /****************************************************************************** * GetObjectInfo : get information about a device object such as a button * or axis @@ -911,7 +905,7 @@ static const IDirectInputDevice8AVtbl SysMouseAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - SysMouseAImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty,

1 0

Rémi Bernon : dinput: Factor out IDirectInputDevice_GetDeviceState WtoA conversions.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 7713050c7791d2916e12e04809efd5de34bb8660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7713050c7791d2916e12e048… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 27 10:50:02 2021 +0200 dinput: Factor out IDirectInputDevice_GetDeviceState WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 7 +++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 11 ----------- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 1 - dlls/dinput/keyboard.c | 12 +----------- dlls/dinput/mouse.c | 13 +------------ 9 files changed, 13 insertions(+), 38 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index d61fdb07e4f..c488353aa12 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -192,6 +192,13 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire( IDirectInputDevice8A *iface_a return IDirectInputDevice8_Unacquire( iface_w ); } +HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceState( IDirectInputDevice8A *iface_a, DWORD count, void *data ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + return IDirectInputDevice8_GetDeviceState( iface_w, count, data ); +} + HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData( IDirectInputDevice8A *iface_a, DWORD data_size, DIDEVICEOBJECTDATA *data, DWORD *entries, DWORD flags ) { diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index f8cfd98f9b3..425b0971351 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -136,6 +136,7 @@ extern HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A ifa extern HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD count, void *data) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(LPDIRECTINPUTDEVICE8A iface, LPCDIDATAFORMAT df) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W iface, LPCDIDATAFORMAT df) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8A iface, HWND hwnd, DWORD dwflags) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 60a61d1ea6b..906f47087fb 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -68,10 +68,6 @@ static inline JoystickGenericImpl *impl_from_IDirectInputDevice8W(IDirectInputDe { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base); } -static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickGenericImpl *This) -{ - return &This->base.IDirectInputDevice8W_iface; -} DWORD typeFromGUID(REFGUID guid) { @@ -773,13 +769,6 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } -HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) -{ - JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWGenericImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); -} - - HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 8196102f9bb..e81733a74dd 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -913,7 +913,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, - JoystickAGenericImpl_GetDeviceState, + IDirectInputDevice2AImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 9a41e798642..2a6c73766f4 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1344,7 +1344,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, - JoystickAGenericImpl_GetDeviceState, + IDirectInputDevice2AImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index a663c438c35..98865253570 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1585,7 +1585,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, - JoystickAGenericImpl_GetDeviceState, + IDirectInputDevice2AImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 60cea6197c6..62e453a7835 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -78,7 +78,6 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8W iface, HRESULT WINAPI JoystickWGenericImpl_Poll(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3a81b7e58fb..010722efd8c 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -59,10 +59,6 @@ static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysKeyboardImpl, base); } -static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysKeyboardImpl *This) -{ - return &This->base.IDirectInputDevice8W_iface; -} static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD version) { @@ -378,12 +374,6 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac return DI_OK; } -static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) -{ - SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); - return SysKeyboardWImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); -} - /****************************************************************************** * GetCapabilities : get the device capabilities */ @@ -657,7 +647,7 @@ static const IDirectInputDevice8AVtbl SysKeyboardAvt = IDirectInputDevice2AImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, - SysKeyboardAImpl_GetDeviceState, + IDirectInputDevice2AImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 68cc5059ec8..849712a49ca 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -87,11 +87,6 @@ static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysMouseImpl, base); } -static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl *This) -{ - return &This->base.IDirectInputDevice8W_iface; -} - static void _dump_mouse_state(const DIMOUSESTATE2 *m_state) { int i; @@ -647,12 +642,6 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } -static HRESULT WINAPI SysMouseAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); - return SysMouseWImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); -} - /****************************************************************************** * GetDeviceData : gets buffered input data. */ @@ -911,7 +900,7 @@ static const IDirectInputDevice8AVtbl SysMouseAvt = IDirectInputDevice2AImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, - SysMouseAImpl_GetDeviceState, + IDirectInputDevice2AImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification,

1 0

Rémi Bernon : dinput: Factor out IDirectInputDevice_GetDeviceInfo WtoA conversions.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 27ea33baf9fd23b3ae3690bfa08625343be625e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ea33baf9fd23b3ae3690bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 27 10:50:03 2021 +0200 dinput: Factor out IDirectInputDevice_GetDeviceInfo WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 34 +++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 48 --------------------------------------- dlls/dinput/joystick_linux.c | 26 +-------------------- dlls/dinput/joystick_linuxinput.c | 27 +--------------------- dlls/dinput/joystick_osx.c | 7 +----- dlls/dinput/joystick_private.h | 3 --- dlls/dinput/keyboard.c | 14 +----------- dlls/dinput/mouse.c | 14 +----------- 9 files changed, 40 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27ea33baf9fd23b3ae36…

1 0

Rémi Bernon : dinput: Factor out IDirectInputDevice_BuildActionMap WtoA conversions.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 8109f8398acbc51e3a3b52491c6d8d1913e23b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8109f8398acbc51e3a3b5249… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 27 10:50:04 2021 +0200 dinput: Factor out IDirectInputDevice_BuildActionMap WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 105 ++++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 2 + dlls/dinput/joystick.c | 30 ----------- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 1 - dlls/dinput/keyboard.c | 32 +----------- dlls/dinput/mouse.c | 32 +----------- 9 files changed, 112 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8109f8398acbc51e3a3b…

1 0

Rémi Bernon : dinput: Factor out IDirectInputDevice_SetActionMap WtoA conversions.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 5f4ee791497183e756655d9402caa18de6bea62b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f4ee791497183e756655d94… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 27 10:50:05 2021 +0200 dinput: Factor out IDirectInputDevice_SetActionMap WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 29 +++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 2 ++ dlls/dinput/joystick.c | 33 --------------------------------- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 1 - dlls/dinput/keyboard.c | 35 +---------------------------------- dlls/dinput/mouse.c | 35 +---------------------------------- 9 files changed, 36 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f4ee791497183e75665…

1 0

Paul Gofman : ntdll/tests: Don't consider zero 'AllFeatures' value in USD broken.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: eefce9dcb9aa270c3ee6933205d20f53de59bdcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=eefce9dcb9aa270c3ee69332… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 27 13:31:57 2021 +0300 ntdll/tests: Don't consider zero 'AllFeatures' value in USD broken. Both variants are observed on different computers with Win10. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 22ee7f06ac7..e657a424fcd 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -957,8 +957,7 @@ static void test_user_shared_data(void) for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { - ok(xstate.AllFeatures[i] == feature_sizes[i] - || broken(!xstate.AllFeatures[i]) /* win10 on Testbot VMs */, + ok(xstate.AllFeatures[i] == feature_sizes[i] || !xstate.AllFeatures[i], "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, xstate.AllFeatures[i], feature_sizes[i]); ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i,

1 0

Nikolay Sivov : evr/mixer: Preserve output stream types order.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: e7ef9fe25bd4308d75f041d6f873433814e2e754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ef9fe25bd4308d75f041d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 27 15:47:02 2021 +0300 evr/mixer: Preserve output stream types order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 0d4bf8bc500..ba4624e0f51 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -642,13 +642,19 @@ done: return hr; } -static int __cdecl rt_formats_sort_compare(const void *left, const void *right) +static void video_mixer_append_rt_format(struct rt_format *rt_formats, unsigned int *count, + const GUID *device, D3DFORMAT format) { - const struct rt_format *format1 = left, *format2 = right; + unsigned int i; - if (format1->format < format2->format) return -1; - if (format1->format > format2->format) return 1; - return 0; + for (i = 0; i < *count; ++i) + { + if (rt_formats[i].format == format) return; + } + + rt_formats[*count].format = format; + rt_formats[*count].device = *device; + *count += 1; } static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, @@ -677,11 +683,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const rt_formats = ptr; for (j = 0; j < format_count; ++j) - { - rt_formats[count + j].format = formats[j]; - rt_formats[count + j].device = devices[i]; - } - count += format_count; + video_mixer_append_rt_format(rt_formats, &count, &devices[i], formats[j]); CoTaskMemFree(formats); } @@ -689,18 +691,6 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - qsort(rt_formats, count, sizeof(*rt_formats), rt_formats_sort_compare); - - j = 0; - for (i = j + 1; i < count; ++i) - { - if (rt_formats[i].format != rt_formats[j].format) - { - rt_formats[++j] = rt_formats[i]; - } - } - count = j + 1; - memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); if ((mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) {

1 0

Nikolay Sivov : evr/mixer: Return cloned instances for output type candidates.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: d2714459770d6884b3278decef1ae4bcae9d74a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2714459770d6884b3278dec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 27 15:47:03 2021 +0300 evr/mixer: Return cloned instances for output type candidates. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 ++-- dlls/evr/tests/evr.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index ba4624e0f51..554fb0725e8 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -603,8 +603,8 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform hr = MF_E_NO_MORE_TYPES; else { - *type = mixer->output.rt_formats[index].media_type; - IMFMediaType_AddRef(*type); + if (SUCCEEDED(hr = MFCreateMediaType(type))) + hr = IMFMediaType_CopyAllItems(mixer->output.rt_formats[index].media_type, (IMFAttributes *)*type); } LeaveCriticalSection(&mixer->cs); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 2643f6ee92a..dd38a75ca2b 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1045,9 +1045,11 @@ static void test_default_mixer_type_negotiation(void) while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) { UINT64 frame_size; - GUID subtype; + GUID subtype, major; UINT32 value; + hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &major); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); @@ -1059,6 +1061,15 @@ static void test_default_mixer_type_negotiation(void) } ok(index > 1, "Unexpected number of available types.\n"); + /* Cloned type is returned. */ + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type != media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type2); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Anton Baskanov : strmbase: Don't reset EOS on renderer paused->running state transition.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: e017e33aec255e4efa74f8e598616437a2e1d816 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e017e33aec255e4efa74f8e5… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed May 26 23:46:42 2021 +0700 strmbase: Don't reset EOS on renderer paused->running state transition. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ee8ff4c623f..daa407ba42e 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -246,8 +246,6 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI filter->stream_start = start; SetEvent(filter->state_event); SetEvent(filter->run_event); - if (filter->sink.pin.peer) - filter->eos = FALSE; reset_qos(filter); if (filter->sink.pin.peer && filter->ops->renderer_start_stream) filter->ops->renderer_start_stream(filter);

1 0

Anton Baskanov : strmbase: Defer EC_COMPLETE until the renderer is running.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 82b86d470488ae266d3ccd46ae4a6750ff3e79eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=82b86d470488ae266d3ccd46… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed May 26 23:46:43 2021 +0700 strmbase: Defer EC_COMPLETE until the renderer is running. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 14 +++++++++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 470652543ad..4ff84e77012 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1143,7 +1143,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = join_thread(send_frame(input)); todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); @@ -1151,7 +1151,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + ok(ret == 1, "Expected EC_COMPLETE.\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index c7a84d65b7b..5bca91faecd 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1295,7 +1295,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = join_thread(send_frame(input)); todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); @@ -1303,7 +1303,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + ok(ret == 1, "Expected EC_COMPLETE.\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index daa407ba42e..01fabfc98de 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -242,6 +242,8 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface) static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start) { struct strmbase_renderer *filter = impl_from_strmbase_filter(iface); + IFilterGraph *graph = filter->filter.graph; + IMediaEventSink *event_sink; filter->stream_start = start; SetEvent(filter->state_event); @@ -250,6 +252,15 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI if (filter->sink.pin.peer && filter->ops->renderer_start_stream) filter->ops->renderer_start_stream(filter); + if (filter->eos && graph + && SUCCEEDED(IFilterGraph_QueryInterface(graph, + &IID_IMediaEventSink, (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->filter.IBaseFilter_iface); + IMediaEventSink_Release(event_sink); + } + return S_OK; } @@ -437,7 +448,8 @@ static HRESULT sink_eos(struct strmbase_sink *iface) filter->eos = TRUE; - if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, + if (filter->filter.state == State_Running && graph + && SUCCEEDED(IFilterGraph_QueryInterface(graph, &IID_IMediaEventSink, (void **)&event_sink))) { IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK,

1 0