wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Nikolay Sivov : mf/session: Get rid of some interface pointers casts.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: f2bb763c9ce866ffda6c645b73ab5d2bcca40650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2bb763c9ce866ffda6c645b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 11:41:46 2021 +0300 mf/session: Get rid of some interface pointers casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index c4dc6419b87..fe87b3e6584 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -122,7 +122,11 @@ enum media_source_flags struct media_source { struct list entry; - IMFMediaSource *source; + union + { + IMFMediaSource *source; + IUnknown *object; + }; IMFPresentationDescriptor *pd; enum object_state state; unsigned int flags; @@ -131,7 +135,11 @@ struct media_source struct media_sink { struct list entry; - IMFMediaSink *sink; + union + { + IMFMediaSink *sink; + IUnknown *object; + }; IMFMediaSinkPreroll *preroll; IMFMediaEventGenerator *event_generator; BOOL finalized; @@ -861,7 +869,7 @@ static void session_start(struct media_session *session, const GUID *time_format if (!(session->presentation.flags & SESSION_FLAG_SOURCES_SUBSCRIBED)) { if (FAILED(hr = IMFMediaSource_BeginGetEvent(source->source, &session->events_callback, - (IUnknown *)source->source))) + source->object))) { WARN("Failed to subscribe to source events, hr %#x.\n", hr); } @@ -1534,7 +1542,7 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo /* Mask unsupported rate caps. */ - caps &= session_get_object_rate_caps((IUnknown *)source->source) + caps &= session_get_object_rate_caps(source->object) | ~(MFSESSIONCAP_RATE_FORWARD | MFSESSIONCAP_RATE_REVERSE); } @@ -1547,7 +1555,7 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink->sink, &object_flags))) { if (!(object_flags & MEDIASINK_RATELESS)) - caps &= session_get_object_rate_caps((IUnknown *)sink->sink) + caps &= session_get_object_rate_caps(sink->object) | ~(MFSESSIONCAP_RATE_FORWARD | MFSESSIONCAP_RATE_REVERSE); } } @@ -2382,7 +2390,7 @@ static void session_set_presentation_clock(struct media_session *session) /* Set clock for all topology nodes. */ LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - session_set_consumed_clock((IUnknown *)source->source, session->clock); + session_set_consumed_clock(source->object, session->clock); } LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) @@ -2484,7 +2492,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn LIST_FOR_EACH_ENTRY(src, &session->presentation.sources, struct media_source, entry) { - if (object == (IUnknown *)src->source) + if (object == src->object) { changed = src->state != state; src->state = state; @@ -3403,7 +3411,7 @@ static HRESULT WINAPI session_sink_finalizer_callback_Invoke(IMFAsyncCallback *i LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { - if (state == (IUnknown *)sink->sink) + if (state == sink->object) { if (FAILED(hr = IMFMediaSink_QueryInterface(sink->sink, &IID_IMFFinalizableMediaSink, (void **)&fin_sink))) WARN("Unexpected, missing IMFFinalizableMediaSink, hr %#x.\n", hr); @@ -3515,7 +3523,7 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA { LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, &rate))) + if (FAILED(hr = session_presentation_object_get_rate(source->object, direction, thin, fastest, &rate))) break; } @@ -3523,7 +3531,7 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA { LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { - if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, &rate))) + if (FAILED(hr = session_presentation_object_get_rate(sink->object, direction, thin, fastest, &rate))) break; } } @@ -3561,7 +3569,7 @@ static HRESULT session_is_presentation_rate_supported(struct media_session *sess { LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - if (FAILED(hr = MFGetService((IUnknown *)source->source, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + if (FAILED(hr = MFGetService(source->object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) { value = 1.0f; @@ -3589,7 +3597,7 @@ static HRESULT session_is_presentation_rate_supported(struct media_session *sess if (flags & MEDIASINK_RATELESS) continue; - if (FAILED(MFGetService((IUnknown *)sink->sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + if (FAILED(MFGetService(sink->object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) continue;

1 0

Nikolay Sivov : mf/session: Implement IsRateSupported().
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: d8bbbfd589c3a766165d54e8389420f80b75c0af URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8bbbfd589c3a766165d54e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 11:41:45 2021 +0300 mf/session: Implement IsRateSupported(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e3d77864494..c4dc6419b87 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3537,6 +3537,80 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA return hr; } +static HRESULT session_is_presentation_rate_supported(struct media_session *session, BOOL thin, float rate, + float *nearest_rate) +{ + IMFRateSupport *rate_support; + struct media_source *source; + struct media_sink *sink; + float value = 0.0f, tmp; + unsigned int flags; + HRESULT hr = S_OK; + + if (!nearest_rate) nearest_rate = &tmp; + + if (rate == 0.0f) + { + *nearest_rate = 1.0f; + return S_OK; + } + + EnterCriticalSection(&session->cs); + + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + { + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (FAILED(hr = MFGetService((IUnknown *)source->source, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + { + value = 1.0f; + break; + } + + value = rate; + if (FAILED(hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, &value))) + WARN("Source does not support rate %f, hr %#x.\n", rate, hr); + IMFRateSupport_Release(rate_support); + + /* Only "first" source is considered. */ + break; + } + + if (SUCCEEDED(hr)) + { + /* For sinks only check if rate is supported, ignoring nearest values. */ + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + flags = 0; + if (FAILED(hr = IMFMediaSink_GetCharacteristics(sink->sink, &flags))) + break; + + if (flags & MEDIASINK_RATELESS) + continue; + + if (FAILED(MFGetService((IUnknown *)sink->sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + continue; + + hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, NULL); + IMFRateSupport_Release(rate_support); + if (FAILED(hr)) + { + WARN("Sink %p does not support rate %f, hr %#x.\n", sink->sink, rate, hr); + break; + } + } + } + } + + LeaveCriticalSection(&session->cs); + + *nearest_rate = value; + + return hr; +} + static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { @@ -3560,9 +3634,11 @@ static HRESULT WINAPI session_rate_support_GetFastestRate(IMFRateSupport *iface, static HRESULT WINAPI session_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_supported_rate) { - FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + struct media_session *session = impl_session_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + + return session_is_presentation_rate_supported(session, thin, rate, nearest_supported_rate); } static const IMFRateSupportVtbl session_rate_support_vtbl =

1 0

Rémi Bernon : dinput: Support both DIEFFECT_DX5 and DIEFFECT_DX6 parameters.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 67d38c699110a186ff69ecfa9a11e8c0cb3305a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d38c699110a186ff69ecfa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:35:02 2021 +0100 dinput: Support both DIEFFECT_DX5 and DIEFFECT_DX6 parameters. Star Wars Episode I Racer force-feedback doesn't work otherwise as it passes a DIEFFECT_DX5 struct to SetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 20a10bde6ae..541aa26e73b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2043,7 +2043,7 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa TRACE( "iface %p, params %p, flags %#x.\n", iface, params, flags ); if (!params) return DI_OK; - if (params->dwSize != sizeof(DIEFFECT)) return DIERR_INVALIDPARAM; + if (params->dwSize != sizeof(DIEFFECT_DX6) && params->dwSize != sizeof(DIEFFECT_DX5)) return DIERR_INVALIDPARAM; capacity = params->cAxes; object_flags = params->dwFlags & (DIEFF_OBJECTIDS | DIEFF_OBJECTOFFSETS); direction_flags = params->dwFlags & (DIEFF_CARTESIAN | DIEFF_POLAR | DIEFF_SPHERICAL); @@ -2199,7 +2199,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa TRACE( "iface %p, params %p, flags %#x.\n", iface, params, flags ); if (!params) return E_POINTER; - if (params->dwSize != sizeof(DIEFFECT)) return DIERR_INVALIDPARAM; + if (params->dwSize != sizeof(DIEFFECT_DX6) && params->dwSize != sizeof(DIEFFECT_DX5)) return DIERR_INVALIDPARAM; object_flags = params->dwFlags & (DIEFF_OBJECTIDS | DIEFF_OBJECTOFFSETS); direction_flags = params->dwFlags & (DIEFF_CARTESIAN | DIEFF_POLAR | DIEFF_SPHERICAL);

1 0

Rémi Bernon : dinput: Check for DIEFFECT_DX6 size when DIEP_STARTDELAY is set.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 869a0ddacadbf85f3849bb7ca2473e307565bdae URL: https://source.winehq.org/git/wine.git/?a=commit;h=869a0ddacadbf85f3849bb7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:35:01 2021 +0100 dinput: Check for DIEFFECT_DX6 size when DIEP_STARTDELAY is set. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 5 +++-- dlls/dinput/joystick_hid.c | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index dff1f3426d3..85392c6b30b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1357,7 +1357,7 @@ static HRESULT WINAPI dinput_device_CreateEffect( IDirectInputDevice8W *iface, c IUnknown *outer ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DWORD flags = DIEP_ALLPARAMS; + DWORD flags; HRESULT hr; TRACE( "iface %p, guid %s, params %p, out %p, outer %p\n", iface, debugstr_guid( guid ), @@ -1372,8 +1372,9 @@ static HRESULT WINAPI dinput_device_CreateEffect( IDirectInputDevice8W *iface, c hr = IDirectInputEffect_Initialize( *out, DINPUT_instance, impl->dinput->dwVersion, guid ); if (FAILED(hr)) goto failed; - if (!params) return DI_OK; + + flags = params->dwSize == sizeof(DIEFFECT_DX6) ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; if (!impl->acquired || !(impl->dwCoopLevel & DISCL_EXCLUSIVE)) flags |= DIEP_NODOWNLOAD; hr = IDirectInputEffect_SetParameters( *out, params, flags ); if (FAILED(hr)) goto failed; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 610a75871f1..20a10bde6ae 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2149,7 +2149,11 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa if (flags & DIEP_DURATION) params->dwDuration = impl->params.dwDuration; if (flags & DIEP_GAIN) params->dwGain = impl->params.dwGain; if (flags & DIEP_SAMPLEPERIOD) params->dwSamplePeriod = impl->params.dwSamplePeriod; - if (flags & DIEP_STARTDELAY) params->dwStartDelay = impl->params.dwStartDelay; + if (flags & DIEP_STARTDELAY) + { + if (params->dwSize != sizeof(DIEFFECT_DX6)) return DIERR_INVALIDPARAM; + params->dwStartDelay = impl->params.dwStartDelay; + } if (flags & DIEP_TRIGGERREPEATINTERVAL) params->dwTriggerRepeatInterval = impl->params.dwTriggerRepeatInterval; if (flags & DIEP_TRIGGERBUTTON) @@ -2336,6 +2340,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa } if (flags & DIEP_STARTDELAY) { + if (params->dwSize != sizeof(DIEFFECT_DX6)) return DIERR_INVALIDPARAM; if (impl->params.dwStartDelay != params->dwStartDelay) impl->modified = TRUE; impl->params.dwStartDelay = params->dwStartDelay; }

1 0

Rémi Bernon : dinput: Pretend that DIPROP_AUTOCENTER is supported.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: e04cfc0b0a7c33f2d882b453d0fceda9e4793bef URL: https://source.winehq.org/git/wine.git/?a=commit;h=e04cfc0b0a7c33f2d882b453… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:35:00 2021 +0100 dinput: Pretend that DIPROP_AUTOCENTER is supported. Star Wars Episode I Racer will ignore force-feedback joystick devices if we return an error here. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 3 ++- dlls/dinput8/tests/hid.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c79b182bc66..dff1f3426d3 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1082,7 +1082,8 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co EnterCriticalSection( &impl->crit ); if (impl->acquired) hr = DIERR_ACQUIRED; else if (value->dwData > DIPROPAUTOCENTER_ON) hr = DIERR_INVALIDPARAM; - else hr = DIERR_UNSUPPORTED; + else if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) hr = DIERR_UNSUPPORTED; + else hr = DI_OK; LeaveCriticalSection( &impl->crit ); return hr; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index af8d48dfc90..a0e202ba804 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -7360,7 +7360,6 @@ static void test_force_feedback_joystick( void ) prop_dword.diph.dwObj = 0; prop_dword.dwData = DIPROPAUTOCENTER_ON; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); hr = IDirectInputDevice8_Acquire( device );

1 0

Rémi Bernon : dinput8/tests: Check setting DIPROP_AUTOCENTER on force-feedback joystick.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: d5a44e98da51482d64f8e4ae34a8759e0a517ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a44e98da51482d64f8e4ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:34:59 2021 +0100 dinput8/tests: Check setting DIPROP_AUTOCENTER on force-feedback joystick. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index c6d01b8bee7..af8d48dfc90 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -7356,11 +7356,16 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); + prop_dword.diph.dwHow = DIPH_DEVICE; + prop_dword.diph.dwObj = 0; + prop_dword.dwData = DIPROPAUTOCENTER_ON; + hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); + hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); - prop_dword.diph.dwHow = DIPH_DEVICE; - prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); todo_wine

1 0

Rémi Bernon : dinput: Enumerate HID joystick with dinput <= 7 and device type 0.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 62f5bbf3ed1c42238f56e35095ab88b9bd9697aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=62f5bbf3ed1c42238f56e350… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:34:58 2021 +0100 dinput: Enumerate HID joystick with dinput <= 7 and device type 0. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51953 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index d7e64af9928..610a75871f1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1470,7 +1470,7 @@ HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *in if (instance->dwSize != sizeof(DIDEVICEINSTANCEW)) return S_FALSE; - if (version < 0x0800 && type != DIDEVTYPE_JOYSTICK) + if (version < 0x0800 && type != 0 && type != DIDEVTYPE_JOYSTICK) return S_FALSE; if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) return S_FALSE;

1 0

Rémi Bernon : dinput: Always call the device internal poll callback.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 53fcfe3834da3c43838cd26bdeb4fdb335542627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53fcfe3834da3c43838cd26b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:34:57 2021 +0100 dinput: Always call the device internal poll callback. We normally should not peek messages here, but because of current winex11.drv design, we have to call MsgWaitForMultipleObjectsEx from time to time to pull keyboard or mouse events. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51956 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 3 +-- dlls/dinput/dinput_main.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d375229e2c0..c79b182bc66 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1535,10 +1535,9 @@ static HRESULT WINAPI dinput_device_Poll( IDirectInputDevice8W *iface ) EnterCriticalSection( &impl->crit ); if (!impl->acquired) hr = DIERR_NOTACQUIRED; LeaveCriticalSection( &impl->crit ); - if (hr != DI_OK) return hr; if (impl->vtbl->poll) return impl->vtbl->poll( iface ); - return DI_OK; + return hr; } static HRESULT WINAPI dinput_device_SendDeviceData( IDirectInputDevice8W *iface, DWORD size, diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 3286e887662..835a8656bd1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1430,6 +1430,8 @@ void check_dinput_events(void) * (for example Culpa Innata) * - some games only poll the device, and neither keyboard nor mouse * (for example Civilization: Call to Power 2) + * - some games do not explicitly poll for keyboard events + * (for example Morrowind in its key binding page) */ MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); }

1 0

Alexandre Julliard : packaging: Remove Fedora 33.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: tools Branch: master Commit: 77b1f955b6b743f84358c91a86e034853ef4648d URL: https://source.winehq.org/git/tools.git/?a=commit;h=77b1f955b6b743f84358c91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 7 13:42:28 2021 +0100 packaging: Remove Fedora 33. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 - packaging/obs/yum.conf | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index b33bbd3..71844e9 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -184,7 +184,7 @@ publish_files () cd $basedir -distros="33 34 35 buster bullseye bookworm bionic focal hirsute impish" +distros="34 35 buster bullseye bookworm bionic focal hirsute impish" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 8940d8b..8541204 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,5 +1,4 @@ + /fedora -+ /fedora/33 + /fedora/34 + /fedora/35 - /fedora/* diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 15cb666..6d5a731 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -4,10 +4,6 @@ debuglevel=0 logfile=/var/log/yum.log gpgcheck=1 -[fedora-33] -name = Fedora 33 -baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_33 - [fedora-34] name = Fedora 34 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/…

1 0

Philip Rebohle : vkd3d-shader/spirv: Ignore break instructions outside active blocks.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: vkd3d Branch: master Commit: 45ccf85ae611ad0809c854580cdf77a63a01a9be URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=45ccf85ae611ad0809c8545… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 8 14:50:19 2021 +0100 vkd3d-shader/spirv: Ignore break instructions outside active blocks. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e5b9ef0..698c305 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7802,8 +7802,10 @@ static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_c } else if (breakable_cf_info->current_block == VKD3D_BLOCK_SWITCH) { - assert(breakable_cf_info->inside_block); - vkd3d_spirv_build_op_branch(builder, breakable_cf_info->u.switch_.merge_block_id); + /* The current case block may have already been ended by an + * unconditional continue instruction. */ + if (breakable_cf_info->inside_block) + vkd3d_spirv_build_op_branch(builder, breakable_cf_info->u.switch_.merge_block_id); } cf_info->inside_block = false;

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021