April 2022 - Wine-commits - list.winehq.org

Rémi Bernon : include: Add Windows.Foundation.Numerics.Vector3 struct declaration.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: a99d46b5e3b5c13053d586d50c985ab1f126b17a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a99d46b5e3b5c13053d586d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 08:26:30 2022 +0200 include: Add Windows.Foundation.Numerics.Vector3 struct declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.foundation.numerics.idl | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 571f91d6ced..f3e62c4bb5a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -789,6 +789,7 @@ SOURCES = \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.foundation.metadata.idl \ + windows.foundation.numerics.idl \ windows.gaming.input.custom.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ diff --git a/include/windows.foundation.numerics.idl b/include/windows.foundation.numerics.idl new file mode 100644 index 00000000000..eca99ca29bc --- /dev/null +++ b/include/windows.foundation.numerics.idl @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.Foundation.Numerics { + typedef struct Vector3 Vector3; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct Vector3 + { + FLOAT X; + FLOAT Y; + FLOAT Z; + }; +}

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect runtimeclass declaration.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: cc6358b37a15f71ca6a6a7ccc1af0b356a460883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc6358b37a15f71ca6a6a7cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 08:26:31 2022 +0200 include: Add Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect runtimeclass declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.forcefeedback.idl | 56 ++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl index 639e0c5cd57..e02c136e562 100644 --- a/include/windows.gaming.input.forcefeedback.idl +++ b/include/windows.gaming.input.forcefeedback.idl @@ -25,13 +25,18 @@ import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; +import "windows.foundation.numerics.idl"; namespace Windows.Gaming.Input.ForceFeedback { typedef enum ForceFeedbackEffectAxes ForceFeedbackEffectAxes; typedef enum ForceFeedbackEffectState ForceFeedbackEffectState; typedef enum ForceFeedbackLoadEffectResult ForceFeedbackLoadEffectResult; + typedef enum PeriodicForceEffectKind PeriodicForceEffectKind; interface IForceFeedbackEffect; + interface IPeriodicForceEffect; + interface IPeriodicForceEffectFactory; runtimeclass ForceFeedbackMotor; + runtimeclass PeriodicForceEffect; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; @@ -71,6 +76,16 @@ namespace Windows.Gaming.Input.ForceFeedback { EffectNotSupported = 2 }; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + enum PeriodicForceEffectKind + { + SquareWave = 0, + SineWave = 1, + TriangleWave = 2, + SawtoothWaveUp = 3, + SawtoothWaveDown = 4, + }; + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(a17fba0c-2ae4-48c2-8063-eabd0777cb89) @@ -108,6 +123,35 @@ namespace Windows.Gaming.Input.ForceFeedback { [out, retval] Windows.Foundation.IAsyncOperation<boolean> **async_op); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect), + uuid(5c5138d7-fc75-4d52-9a0a-efe4cab5fe64) + ] + interface IPeriodicForceEffect : IInspectable + requires Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect + { + [propget] HRESULT Kind([out, retval] Windows.Gaming.Input.ForceFeedback.PeriodicForceEffectKind *value); + HRESULT SetParameters([in] Windows.Foundation.Numerics.Vector3 vector, [in] FLOAT frequency, [in] FLOAT phase, + [in] FLOAT bias, [in] Windows.Foundation.TimeSpan duration); + HRESULT SetParametersWithEnvelope([in] Windows.Foundation.Numerics.Vector3 vector, [in] FLOAT frequency, [in] FLOAT phase, + [in] FLOAT bias, [in] FLOAT attack_gain, [in] FLOAT sustain_gain, [in] FLOAT release_gain, + [in] Windows.Foundation.TimeSpan start_delay, [in] Windows.Foundation.TimeSpan attack_duration, + [in] Windows.Foundation.TimeSpan sustain_duration, [in] Windows.Foundation.TimeSpan release_duration, + [in] UINT32 repeat_count); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect), + uuid(6f62eb1a-9851-477b-b318-35ecaa15070f) + ] + interface IPeriodicForceEffectFactory : IInspectable + { + HRESULT CreateInstance([in] Windows.Gaming.Input.ForceFeedback.PeriodicForceEffectKind kind, + [out, retval] Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), marshaling_behavior(agile), @@ -117,4 +161,16 @@ namespace Windows.Gaming.Input.ForceFeedback { { [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackMotor; } + + [ + activatable(Windows.Gaming.Input.ForceFeedback.IPeriodicForceEffectFactory, Windows.Foundation.UniversalApiContract, 3.0), + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass PeriodicForceEffect + { + [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect; + interface Windows.Gaming.Input.ForceFeedback.IPeriodicForceEffect; + } }

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.ForceFeedback.ConditionForceEffect runtimeclass declaration.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 4793ce744c3f49e2500691909deb699308b2854e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4793ce744c3f49e250069190… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 08:26:32 2022 +0200 include: Add Windows.Gaming.Input.ForceFeedback.ConditionForceEffect runtimeclass declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.forcefeedback.idl | 50 ++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl index e02c136e562..ad3290f1a5c 100644 --- a/include/windows.gaming.input.forcefeedback.idl +++ b/include/windows.gaming.input.forcefeedback.idl @@ -32,11 +32,15 @@ namespace Windows.Gaming.Input.ForceFeedback { typedef enum ForceFeedbackEffectState ForceFeedbackEffectState; typedef enum ForceFeedbackLoadEffectResult ForceFeedbackLoadEffectResult; typedef enum PeriodicForceEffectKind PeriodicForceEffectKind; + typedef enum ConditionForceEffectKind ConditionForceEffectKind; interface IForceFeedbackEffect; interface IPeriodicForceEffect; interface IPeriodicForceEffectFactory; + interface IConditionForceEffect; + interface IConditionForceEffectFactory; runtimeclass ForceFeedbackMotor; runtimeclass PeriodicForceEffect; + runtimeclass ConditionForceEffect; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; @@ -86,6 +90,15 @@ namespace Windows.Gaming.Input.ForceFeedback { SawtoothWaveDown = 4, }; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + enum ConditionForceEffectKind + { + Spring = 0, + Damper = 1, + Inertia = 2, + Friction = 3, + }; + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(a17fba0c-2ae4-48c2-8063-eabd0777cb89) @@ -152,6 +165,31 @@ namespace Windows.Gaming.Input.ForceFeedback { [out, retval] Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ForceFeedback.ConditionForceEffect), + uuid(32d1ea68-3695-4e69-85c0-cd1944189140) + ] + interface IConditionForceEffect : IInspectable + requires Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect + { + [propget] HRESULT Kind([out, retval] Windows.Gaming.Input.ForceFeedback.ConditionForceEffectKind *value); + HRESULT SetParameters([in] Windows.Foundation.Numerics.Vector3 direction, [in] FLOAT positive_coeff, + [in] FLOAT negative_coeff, [in] FLOAT max_positive_magnitude, [in] FLOAT max_negative_magnitude, + [in] FLOAT deadzone, [in] FLOAT bias); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ForceFeedback.ConditionForceEffect), + uuid(91a99264-1810-4eb6-a773-bfd3b8cddbab) + ] + interface IConditionForceEffectFactory : IInspectable + { + HRESULT CreateInstance([in] Windows.Gaming.Input.ForceFeedback.ConditionForceEffectKind kind, + [out, retval] Windows.Gaming.Input.ForceFeedback.ConditionForceEffect **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), marshaling_behavior(agile), @@ -173,4 +211,16 @@ namespace Windows.Gaming.Input.ForceFeedback { [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect; interface Windows.Gaming.Input.ForceFeedback.IPeriodicForceEffect; } + + [ + activatable(Windows.Gaming.Input.ForceFeedback.IConditionForceEffectFactory, Windows.Foundation.UniversalApiContract, 3.0), + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass ConditionForceEffect + { + [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect; + interface Windows.Gaming.Input.ForceFeedback.IConditionForceEffect; + } }

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.ForceFeedback.ConstantForce runtimeclass declaration.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 7c99bdfe3c89032a13e13153dffdd448b296cf5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c99bdfe3c89032a13e13153… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 08:26:33 2022 +0200 include: Add Windows.Gaming.Input.ForceFeedback.ConstantForce runtimeclass declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.forcefeedback.idl | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl index ad3290f1a5c..033cf09cc1f 100644 --- a/include/windows.gaming.input.forcefeedback.idl +++ b/include/windows.gaming.input.forcefeedback.idl @@ -38,9 +38,11 @@ namespace Windows.Gaming.Input.ForceFeedback { interface IPeriodicForceEffectFactory; interface IConditionForceEffect; interface IConditionForceEffectFactory; + interface IConstantForceEffect; runtimeclass ForceFeedbackMotor; runtimeclass PeriodicForceEffect; runtimeclass ConditionForceEffect; + runtimeclass ConstantForceEffect; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; @@ -190,6 +192,21 @@ namespace Windows.Gaming.Input.ForceFeedback { [out, retval] Windows.Gaming.Input.ForceFeedback.ConditionForceEffect **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ForceFeedback.ConstantForceEffect), + uuid(9bfa0140-f3c7-415c-b068-0f068734bce0) + ] + interface IConstantForceEffect : IInspectable + requires Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect + { + HRESULT SetParameters([in] Windows.Foundation.Numerics.Vector3 vector, [in] Windows.Foundation.TimeSpan duration); + HRESULT SetParametersWithEnvelope([in] Windows.Foundation.Numerics.Vector3 vector, [in] FLOAT attack_gain, + [in] FLOAT sustain_gain, [in] FLOAT release_gain, [in] Windows.Foundation.TimeSpan start_delay, + [in] Windows.Foundation.TimeSpan attack_duration, [in] Windows.Foundation.TimeSpan sustain_duration, + [in] Windows.Foundation.TimeSpan release_duration, [in] UINT32 repeat_count); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), marshaling_behavior(agile), @@ -223,4 +240,16 @@ namespace Windows.Gaming.Input.ForceFeedback { [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect; interface Windows.Gaming.Input.ForceFeedback.IConditionForceEffect; } + + [ + activatable(Windows.Foundation.UniversalApiContract, 3.0), + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass ConstantForceEffect + { + [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect; + interface Windows.Gaming.Input.ForceFeedback.IConstantForceEffect; + } }

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.ForceFeedback.RampForce runtimeclass declaration.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 2e9a72759cc8508d1ddb7be5d813fdd7bc64e6a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e9a72759cc8508d1ddb7be5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 08:26:34 2022 +0200 include: Add Windows.Gaming.Input.ForceFeedback.RampForce runtimeclass declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.forcefeedback.idl | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl index 033cf09cc1f..290d1f62971 100644 --- a/include/windows.gaming.input.forcefeedback.idl +++ b/include/windows.gaming.input.forcefeedback.idl @@ -39,10 +39,12 @@ namespace Windows.Gaming.Input.ForceFeedback { interface IConditionForceEffect; interface IConditionForceEffectFactory; interface IConstantForceEffect; + interface IRampForceEffect; runtimeclass ForceFeedbackMotor; runtimeclass PeriodicForceEffect; runtimeclass ConditionForceEffect; runtimeclass ConstantForceEffect; + runtimeclass RampForceEffect; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; @@ -207,6 +209,22 @@ namespace Windows.Gaming.Input.ForceFeedback { [in] Windows.Foundation.TimeSpan release_duration, [in] UINT32 repeat_count); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ForceFeedback.RampForceEffect), + uuid(f1f81259-1ca6-4080-b56d-b43f3354d052) + ] + interface IRampForceEffect : IInspectable + requires Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect + { + HRESULT SetParameters([in] Windows.Foundation.Numerics.Vector3 start_vector, [in] Windows.Foundation.Numerics.Vector3 end_vector, + [in] Windows.Foundation.TimeSpan duration); + HRESULT SetParametersWithEnvelope([in] Windows.Foundation.Numerics.Vector3 start_vector, [in] Windows.Foundation.Numerics.Vector3 end_vector, + [in] FLOAT attack_gain, [in] FLOAT sustain_gain, [in] FLOAT release_gain, [in] Windows.Foundation.TimeSpan start_delay, + [in] Windows.Foundation.TimeSpan attack_duration, [in] Windows.Foundation.TimeSpan sustain_duration, + [in] Windows.Foundation.TimeSpan release_duration, [in] UINT32 repeat_count); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), marshaling_behavior(agile), @@ -252,4 +270,16 @@ namespace Windows.Gaming.Input.ForceFeedback { [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect; interface Windows.Gaming.Input.ForceFeedback.IConstantForceEffect; } + + [ + activatable(Windows.Foundation.UniversalApiContract, 3.0), + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass RampForceEffect + { + [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect; + interface Windows.Gaming.Input.ForceFeedback.IRampForceEffect; + } }

1 0

Rémi Bernon : windows.media.speech: Simplify error handling in async_operation_create.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 515899483eedac936cbcff88099243dd3d2f5c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=515899483eedac936cbcff88… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 17:26:19 2022 +0200 windows.media.speech: Simplify error handling in async_operation_create. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 3b532502ea2..418e903476e 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -370,16 +370,9 @@ static void CALLBACK async_run_cb(TP_CALLBACK_INSTANCE *instance, void *data, TP HRESULT async_operation_create( const GUID *iid, IInspectable *invoker, async_operation_callback callback, IAsyncOperation_IInspectable **out ) { struct async_operation *impl; - HRESULT hr; *out = NULL; - - if (!(impl = calloc(1, sizeof(*impl)))) - { - hr = E_OUTOFMEMORY; - goto error; - } - + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; impl->IAsyncOperation_IInspectable_iface.lpVtbl = &async_operation_vtbl; impl->IAsyncInfo_iface.lpVtbl = &async_operation_info_vtbl; impl->iid = iid; @@ -389,11 +382,10 @@ HRESULT async_operation_create( const GUID *iid, IInspectable *invoker, async_op impl->callback = callback; impl->status = Started; - IAsyncOperation_IInspectable_AddRef(&impl->IAsyncOperation_IInspectable_iface); /* AddRef to keep the obj alive in the callback. */ if (!(impl->async_run_work = CreateThreadpoolWork(async_run_cb, &impl->IAsyncOperation_IInspectable_iface, NULL))) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto error; + free(impl); + return HRESULT_FROM_WIN32(GetLastError()); } if (invoker) IInspectable_AddRef((impl->invoker = invoker)); @@ -401,13 +393,11 @@ HRESULT async_operation_create( const GUID *iid, IInspectable *invoker, async_op InitializeCriticalSection(&impl->cs); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_operation.cs"); + /* AddRef to keep the obj alive in the callback. */ + IAsyncOperation_IInspectable_AddRef(&impl->IAsyncOperation_IInspectable_iface); SubmitThreadpoolWork(impl->async_run_work); *out = &impl->IAsyncOperation_IInspectable_iface; TRACE("created %p\n", *out); return S_OK; - -error: - free(impl); - return hr; }

1 0

Rémi Bernon : windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 3276ab4aebb30c97af4e52bbf25299d86564c3d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3276ab4aebb30c97af4e52bb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 17:26:57 2022 +0200 windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close. Unless it's closed already. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 418e903476e..64a095a0134 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -296,26 +296,22 @@ static HRESULT WINAPI async_operation_info_Cancel( IAsyncInfo *iface ) static HRESULT WINAPI async_operation_info_Close( IAsyncInfo *iface ) { struct async_operation *impl = impl_from_IAsyncInfo(iface); + HRESULT hr = S_OK; TRACE("iface %p.\n", iface); EnterCriticalSection(&impl->cs); if (impl->status == Started) - { - LeaveCriticalSection(&impl->cs); - return E_ILLEGAL_STATE_CHANGE; - } - - if (impl->async_run_work) + hr = E_ILLEGAL_STATE_CHANGE; + else if (impl->status != Closed) { CloseThreadpoolWork(impl->async_run_work); impl->async_run_work = NULL; + impl->status = Closed; } - - impl->status = Closed; LeaveCriticalSection(&impl->cs); - return S_OK; + return hr; } static const struct IAsyncInfoVtbl async_operation_info_vtbl =

1 0

Rémi Bernon : mf/tests: Simplify handling of broken Win7 results.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: b52a48b97ecbb8f7aff187a7743647dfab0670ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=b52a48b97ecbb8f7aff187a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 10:30:51 2022 +0200 mf/tests: Simplify handling of broken Win7 results. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..b2dd807dd33 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6631,6 +6631,7 @@ static void test_h264_decoder(void) IMFMediaType *media_type; IMFTransform *transform; DWORD status, length; + BOOL is_win7 = FALSE; ULONG i, ret, flags; HANDLE output_file; IMFSample *sample; @@ -6741,10 +6742,9 @@ static void test_h264_decoder(void) winetest_push_context("out %lu", i); ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr); check_media_type(media_type, default_outputs[i], -1); - if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL))) - check_media_type(media_type, default_outputs_win7[i], -1); - else - check_media_type(media_type, default_outputs_extra[i], -1); + hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL); + is_win7 = broken(FAILED(hr)); + check_media_type(media_type, is_win7 ? default_outputs_win7[i] : default_outputs_extra[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -6772,11 +6772,9 @@ static void test_h264_decoder(void) init_media_type(media_type, output_type_desc, i + 1); } hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - if (broken(hr == MF_E_INVALIDMEDIATYPE)) - { - init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); - hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - } + ok(hr == (is_win7 ? MF_E_INVALIDMEDIATYPE : S_OK), "SetOutputType returned %#lx.\n", hr); + init_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 1, "Release returned %lu\n", ret);

1 0

Rémi Bernon : mf/tests: Add some H264 decoder GetOutputCurrentType tests.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 3f1036b61b59e3a99ea6bf1f1d6984a878df6d7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f1036b61b59e3a99ea6bf1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 10:30:52 2022 +0200 mf/tests: Add some H264 decoder GetOutputCurrentType tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b2dd807dd33..6e2c9d7b429 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6658,6 +6658,9 @@ static void test_h264_decoder(void) hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#lx\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputCurrentType returned %#lx\n", hr); /* setting output media type first doesn't work */ @@ -6779,6 +6782,15 @@ static void test_h264_decoder(void) ret = IMFMediaType_Release(media_type); ok(ret == 1, "Release returned %lu\n", ret); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + todo_wine + ok(hr == S_OK, "GetOutputCurrentType returned %#lx\n", hr); + if (hr != S_OK) MFCreateMediaType(&media_type); + todo_wine + check_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %lu\n", ret); + flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); @@ -6904,6 +6916,18 @@ static void test_h264_decoder(void) ok(hr == MF_E_NO_MORE_TYPES, "GetOutputAvailableType returned %#lx\n", hr); ok(i == 5, "%lu output media types\n", i); + /* current output type is still the one we selected */ + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + todo_wine + ok(hr == S_OK, "GetOutputCurrentType returned %#lx\n", hr); + if (hr != S_OK) MFCreateMediaType(&media_type); + todo_wine + check_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); + hr = IMFMediaType_GetItemType(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "GetItemType returned %#lx\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %lu\n", ret); + /* and generate a new one as well in a temporary directory */ GetTempPathW(ARRAY_SIZE(output_path), output_path); lstrcatW(output_path, L"nv12frame.bin");

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder GetOutputCurrentType.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: a7c60623158b048244701f104ca4daeb739637a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c60623158b048244701f10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 10:30:53 2022 +0200 winegstreamer: Implement H264 decoder GetOutputCurrentType. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 8 -------- dlls/winegstreamer/h264_decoder.c | 12 +++++++++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6e2c9d7b429..dd00207d311 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6659,7 +6659,6 @@ static void test_h264_decoder(void) hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#lx\n", hr); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputCurrentType returned %#lx\n", hr); /* setting output media type first doesn't work */ @@ -6783,14 +6782,10 @@ static void test_h264_decoder(void) ok(ret == 1, "Release returned %lu\n", ret); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); - todo_wine ok(hr == S_OK, "GetOutputCurrentType returned %#lx\n", hr); - if (hr != S_OK) MFCreateMediaType(&media_type); - todo_wine check_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); - flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); @@ -6918,10 +6913,7 @@ static void test_h264_decoder(void) /* current output type is still the one we selected */ hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); - todo_wine ok(hr == S_OK, "GetOutputCurrentType returned %#lx\n", hr); - if (hr != S_OK) MFCreateMediaType(&media_type); - todo_wine check_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); hr = IMFMediaType_GetItemType(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, NULL); ok(hr == MF_E_ATTRIBUTENOTFOUND, "GetItemType returned %#lx\n", hr); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 8bfa15529db..1c7bf391bf7 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -460,8 +460,18 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + HRESULT hr; + FIXME("iface %p, id %#lx, type %p stub!\n", iface, id, type); - return E_NOTIMPL; + + if (!decoder->output_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = MFCreateMediaType(type))) + return hr; + + return IMFMediaType_CopyAllItems(decoder->output_type, (IMFAttributes *)*type); } static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)

1 0