wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Rémi Bernon : dinput: Canonicalize DirectInput(8) instance creation.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: be6d33824a1905fba02d2343ab3e8f57ede5ccc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6d33824a1905fba02d2343… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:38 2022 +0100 dinput: Canonicalize DirectInput(8) instance creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 95 +++++++++++++++++----------------------------- dlls/dinput/tests/dinput.c | 8 ---- 2 files changed, 35 insertions(+), 68 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e840d218ed0..53179f10194 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -137,27 +137,23 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface ) LeaveCriticalSection( &impl->crit ); } -static HRESULT dinput_create( REFIID iid, void **out, struct dinput **out_impl ) +static HRESULT dinput_create( IUnknown **out ) { - struct dinput *impl = calloc( 1, sizeof(struct dinput) ); - HRESULT hr; - - if (!impl) return E_OUTOFMEMORY; + struct dinput *impl; + if (!(impl = calloc( 1, sizeof(struct dinput) ))) return E_OUTOFMEMORY; impl->IDirectInput7A_iface.lpVtbl = &dinput7_a_vtbl; impl->IDirectInput7W_iface.lpVtbl = &dinput7_vtbl; impl->IDirectInput8A_iface.lpVtbl = &dinput8_a_vtbl; impl->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; + impl->ref = 1; - hr = IDirectInput_QueryInterface( &impl->IDirectInput7A_iface, iid, out ); - if (FAILED(hr)) - { - free( impl ); - return hr; - } - - if (out_impl) *out_impl = impl; +#if DIRECTINPUT_VERSION == 0x0700 + *out = (IUnknown *)&impl->IDirectInput7W_iface; +#else + *out = (IUnknown *)&impl->IDirectInput8W_iface; +#endif return DI_OK; } @@ -166,29 +162,27 @@ static HRESULT dinput_create( REFIID iid, void **out, struct dinput **out_impl ) */ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { - struct dinput *impl; + IUnknown *unknown; HRESULT hr; TRACE( "hinst %p, version %#x, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); - if (IsEqualGUID( &IID_IDirectInputA, iid ) || - IsEqualGUID( &IID_IDirectInput2A, iid ) || - IsEqualGUID( &IID_IDirectInput7A, iid ) || - IsEqualGUID( &IID_IDirectInputW, iid ) || - IsEqualGUID( &IID_IDirectInput2W, iid ) || - IsEqualGUID( &IID_IDirectInput7W, iid )) - { - hr = dinput_create( iid, out, &impl ); - if (FAILED(hr)) - return hr; - } - else + if (!IsEqualGUID( &IID_IDirectInputA, iid ) && + !IsEqualGUID( &IID_IDirectInputW, iid ) && + !IsEqualGUID( &IID_IDirectInput2A, iid ) && + !IsEqualGUID( &IID_IDirectInput2W, iid ) && + !IsEqualGUID( &IID_IDirectInput7A, iid ) && + !IsEqualGUID( &IID_IDirectInput7W, iid )) return DIERR_NOINTERFACE; - hr = IDirectInput_Initialize( &impl->IDirectInput7A_iface, hinst, version ); - if (FAILED(hr)) + if (FAILED(hr = dinput_create( &unknown ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + if (FAILED(hr)) return hr; + + if (outer || FAILED(hr = IDirectInput7_Initialize( (IDirectInput7W *)unknown, hinst, version ))) { - IDirectInput_Release( &impl->IDirectInput7A_iface ); + IUnknown_Release( unknown ); *out = NULL; return hr; } @@ -201,52 +195,33 @@ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, */ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { - struct dinput *impl; + IUnknown *unknown; HRESULT hr; TRACE( "hinst %p, version %#x, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); if (!out) return E_POINTER; - if (!IsEqualGUID(&IID_IDirectInput8A, iid) && - !IsEqualGUID(&IID_IDirectInput8W, iid) && - !IsEqualGUID(&IID_IUnknown, iid)) + if (!IsEqualGUID( &IID_IDirectInput8A, iid ) && + !IsEqualGUID( &IID_IDirectInput8W, iid ) && + !IsEqualGUID( &IID_IUnknown, iid )) { *out = NULL; return DIERR_NOINTERFACE; } - hr = dinput_create( iid, out, &impl ); + if (FAILED(hr = dinput_create( &unknown ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + if (FAILED(hr)) return hr; - if (FAILED(hr)) + if (outer || FAILED(hr = IDirectInput8_Initialize( (IDirectInput8W *)unknown, hinst, version ))) { - ERR("Failed to create DirectInput, hr %#x.\n", hr); + IUnknown_Release( (IUnknown *)unknown ); + *out = NULL; return hr; } - /* When aggregation is used, the application needs to manually call Initialize(). */ - if (!outer && IsEqualGUID(&IID_IDirectInput8A, iid)) - { - hr = IDirectInput8_Initialize( &impl->IDirectInput8A_iface, hinst, version ); - if (FAILED(hr)) - { - IDirectInput8_Release( &impl->IDirectInput8A_iface ); - *out = NULL; - return hr; - } - } - - if (!outer && IsEqualGUID(&IID_IDirectInput8W, iid)) - { - hr = IDirectInput8_Initialize( &impl->IDirectInput8W_iface, hinst, version ); - if (FAILED(hr)) - { - IDirectInput8_Release( &impl->IDirectInput8W_iface ); - *out = NULL; - return hr; - } - } - return S_OK; } @@ -1118,7 +1093,7 @@ static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface, IUnkno if (outer) return CLASS_E_NOAGGREGATION; - if (FAILED(hr = dinput_create( &IID_IUnknown, (void **)&unknown, NULL ))) return hr; + if (FAILED(hr = dinput_create( &unknown ))) return hr; hr = IUnknown_QueryInterface( unknown, iid, out ); IUnknown_Release( unknown ); diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 0b3ce276e52..ae5e43945eb 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -249,11 +249,8 @@ static void test_DirectInputCreate( DWORD version ) unknown = (void *)0xdeadbeef; hr = DirectInputCreateW( hInstance, version, (IDirectInputW **)&unknown, &outer ); - todo_wine_if(version == 0x800) ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); - todo_wine_if(version <= 0x700) ok( unknown == NULL, "got IUnknown %p\n", unknown ); - if (unknown) IUnknown_Release( unknown ); for (i = 0; i < ARRAY_SIZE(create_tests); i++) { @@ -324,11 +321,8 @@ static void test_DirectInputCreateEx( DWORD version ) unknown = (void *)0xdeadbeef; hr = pDirectInputCreateEx( hInstance, version, &IID_IDirectInputW, (void **)&unknown, &outer ); - todo_wine_if(version == 0x800) ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); - todo_wine_if(version <= 0x700) ok( unknown == NULL, "got IUnknown %p\n", unknown ); - if (unknown) IUnknown_Release( unknown ); for (i = 0; i < ARRAY_SIZE(create_tests); i++) { @@ -418,9 +412,7 @@ static void test_DirectInput8Create( DWORD version ) unknown = (void *)0xdeadbeef; hr = DirectInput8Create( hInstance, version, &IID_IDirectInput8W, (void **)&unknown, &outer ); ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); - todo_wine ok( unknown == NULL, "got IUnknown %p\n", unknown ); - if (unknown) IUnknown_Release( unknown ); for (i = 0; i < ARRAY_SIZE(create_tests); i++) {

1 0

Rémi Bernon : dinput: Use consistent parameter names and types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 1591021f538e19c01615c242eacf30b8ccc6eea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1591021f538e19c01615c242… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:37 2022 +0100 dinput: Use consistent parameter names and types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 57 ++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b9d44f140c8..e840d218ed0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -137,7 +137,7 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface ) LeaveCriticalSection( &impl->crit ); } -static HRESULT dinput_create( REFIID riid, LPVOID *ppDI, struct dinput **out ) +static HRESULT dinput_create( REFIID iid, void **out, struct dinput **out_impl ) { struct dinput *impl = calloc( 1, sizeof(struct dinput) ); HRESULT hr; @@ -150,48 +150,46 @@ static HRESULT dinput_create( REFIID riid, LPVOID *ppDI, struct dinput **out ) impl->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; - hr = IDirectInput_QueryInterface( &impl->IDirectInput7A_iface, riid, ppDI ); + hr = IDirectInput_QueryInterface( &impl->IDirectInput7A_iface, iid, out ); if (FAILED(hr)) { free( impl ); return hr; } - if (out) *out = impl; + if (out_impl) *out_impl = impl; return DI_OK; } /****************************************************************************** * DirectInputCreateEx (DINPUT.@) */ -HRESULT WINAPI DirectInputCreateEx( - HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, - LPUNKNOWN punkOuter) +HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { struct dinput *impl; HRESULT hr; - TRACE("(%p,%04x,%s,%p,%p)\n", hinst, dwVersion, debugstr_guid(riid), ppDI, punkOuter); + TRACE( "hinst %p, version %#x, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); - if (IsEqualGUID( &IID_IDirectInputA, riid ) || - IsEqualGUID( &IID_IDirectInput2A, riid ) || - IsEqualGUID( &IID_IDirectInput7A, riid ) || - IsEqualGUID( &IID_IDirectInputW, riid ) || - IsEqualGUID( &IID_IDirectInput2W, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid )) + if (IsEqualGUID( &IID_IDirectInputA, iid ) || + IsEqualGUID( &IID_IDirectInput2A, iid ) || + IsEqualGUID( &IID_IDirectInput7A, iid ) || + IsEqualGUID( &IID_IDirectInputW, iid ) || + IsEqualGUID( &IID_IDirectInput2W, iid ) || + IsEqualGUID( &IID_IDirectInput7W, iid )) { - hr = dinput_create( riid, ppDI, &impl ); + hr = dinput_create( iid, out, &impl ); if (FAILED(hr)) return hr; } else return DIERR_NOINTERFACE; - hr = IDirectInput_Initialize( &impl->IDirectInput7A_iface, hinst, dwVersion ); + hr = IDirectInput_Initialize( &impl->IDirectInput7A_iface, hinst, version ); if (FAILED(hr)) { IDirectInput_Release( &impl->IDirectInput7A_iface ); - *ppDI = NULL; + *out = NULL; return hr; } @@ -201,17 +199,14 @@ HRESULT WINAPI DirectInputCreateEx( /****************************************************************************** * DirectInput8Create (DINPUT8.@) */ -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, - DWORD version, REFIID iid, void **out, IUnknown *outer) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { struct dinput *impl; HRESULT hr; - TRACE("hinst %p, version %#x, iid %s, out %p, outer %p.\n", - hinst, version, debugstr_guid(iid), out, outer); + TRACE( "hinst %p, version %#x, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); - if (!out) - return E_POINTER; + if (!out) return E_POINTER; if (!IsEqualGUID(&IID_IDirectInput8A, iid) && !IsEqualGUID(&IID_IDirectInput8W, iid) && @@ -258,27 +253,27 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, /****************************************************************************** * DirectInputCreateA (DINPUT.@) */ -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA( HINSTANCE hinst, DWORD version, IDirectInputA **out, IUnknown *outer ) { - return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7A, (LPVOID *)ppDI, punkOuter); + return DirectInputCreateEx( hinst, version, &IID_IDirectInput7A, (void **)out, outer ); } /****************************************************************************** * DirectInputCreateW (DINPUT.@) */ -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW( HINSTANCE hinst, DWORD version, IDirectInputW **out, IUnknown *outer ) { - return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); + return DirectInputCreateEx( hinst, version, &IID_IDirectInput7W, (void **)out, outer ); } -static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) +static DWORD diactionformat_priorityW( DIACTIONFORMATW *action_format, DWORD genre ) { int i; DWORD priorityFlags = 0; /* If there's at least one action for the device it's priority 1 */ - for(i=0; i < lpdiaf->dwNumActions; i++) - if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre) + for (i = 0; i < action_format->dwNumActions; i++) + if ((action_format->rgoAction[i].dwSemantic & genre) == genre) priorityFlags |= DIEDBS_MAPPEDPRI1; return priorityFlags; @@ -1454,8 +1449,10 @@ void check_dinput_events(void) MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); } -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { + TRACE( "inst %p, reason %u, reserved %p.\n", inst, reason, reserved ); + switch(reason) { case DLL_PROCESS_ATTACH:

1 0

Rémi Bernon : dinput: Rename IDirectInputImpl to struct dinput.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: f0935f850c34b1f9d8b4bf84903365c2874bc4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0935f850c34b1f9d8b4bf84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:36 2022 +0100 dinput: Rename IDirectInputImpl to struct dinput. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 54 ++++++++++----------- dlls/dinput/device.c | 4 +- dlls/dinput/device_private.h | 4 +- dlls/dinput/dinput_main.c | 111 +++++++++++++++++++++---------------------- dlls/dinput/dinput_private.h | 31 ++++++------ dlls/dinput/joystick_hid.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 8 files changed, 104 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0935f850c34b1f9d8b4…

1 0

Zebediah Figura : strmbase: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 46f7d4c1314b1674943e86f1e2bda2860ecda94b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46f7d4c1314b1674943e86f1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:48 2022 -0600 strmbase: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/strmbase/Makefile.in | 1 - libs/strmbase/dispatch.c | 4 ++-- libs/strmbase/filter.c | 14 +++++++------- libs/strmbase/mediatype.c | 38 +++++++++++++++++++------------------- libs/strmbase/pin.c | 10 +++++----- libs/strmbase/pospass.c | 17 ++++++++++++----- libs/strmbase/renderer.c | 2 +- libs/strmbase/seeking.c | 7 +++++-- 8 files changed, 51 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46f7d4c1314b1674943e…

1 0

Zebediah Figura : maintainers: Remove wineqtdecoder.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 0107ab35dd8a5f2d9204ef9c235574e46ba820e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0107ab35dd8a5f2d9204ef9c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:47 2022 -0600 maintainers: Remove wineqtdecoder. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6cc4e5813df..a90c91b60b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -111,7 +111,6 @@ F: dlls/qedit/ F: dlls/quartz/ F: dlls/strmbase/ F: dlls/winegstreamer/quartz_parser.c -F: dlls/wineqtdecoder/ DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com>

1 0

Zebediah Figura : strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 98a2689f76ecbe097a0219d7ee332b4f6382bc59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98a2689f76ecbe097a0219d7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:46 2022 -0600 strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/strmbase.h | 1 - libs/strmbase/pin.c | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 868ea4c580a..3e92136b7f7 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -105,7 +105,6 @@ struct strmbase_sink_ops }; /* Base Pin */ -HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt); diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index f6e4ef1c139..36784f60a23 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -677,11 +677,6 @@ static const IPinVtbl source_vtbl = source_NewSegment, }; -HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc) -{ - return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc); -} - HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This, IMemInputPin *pPin, IMemAllocator **pAlloc) { @@ -690,8 +685,8 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This, hr = IMemInputPin_GetAllocator(pPin, pAlloc); if (hr == VFW_E_NO_ALLOCATOR) - /* Input pin provides no allocator, use standard memory allocator */ - hr = BaseOutputPinImpl_InitAllocator(This, pAlloc); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc); if (SUCCEEDED(hr)) {

1 0

Zebediah Figura : amstream/tests: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator().
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 4e610a078a00d962b3a313ba1dc5c861f3888790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e610a078a00d962b3a313ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:45 2022 -0600 amstream/tests: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5b3e78e0583..6b17ba6d430 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1140,7 +1140,8 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, * when it is able to do so it's behavior changes slightly * (e.g. it uses dynamic format change instead of reconnecting in SetFormat). * We don't yet implement the custom allocator so force the standard one for now. */ - hr = BaseOutputPinImpl_InitAllocator(iface, alloc); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)alloc); ok(hr == S_OK, "Got hr %#x.\n", hr); IMemInputPin_GetAllocatorRequirements(pin, &props);

1 0

Zebediah Figura : qcap: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator().
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 72ede0ec6b18508e36197c8525d4861a7434751f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ede0ec6b18508e36197c85… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:44 2022 -0600 qcap: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index fe4add83b7c..45b995cc2ff 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1177,9 +1177,12 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base, TRACE("(%p)->(%p %p)\n", base, pPin, pAlloc); - hr = BaseOutputPinImpl_InitAllocator(base, pAlloc); - if(FAILED(hr)) + if (FAILED(hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc))) + { + ERR("Failed to create allocator, hr %#x.\n", hr); return hr; + } hr = IMemInputPin_GetAllocatorRequirements(pPin, &req); if(FAILED(hr))

1 0

Michael Stefaniuc : dmsynth/tests: Add some synth Open/Close tests.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 38f125a5b51ef220bd60d754a94d49f2eef3fd22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38f125a5b51ef220bd60d754… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 00:52:00 2022 +0100 dmsynth/tests: Add some synth Open/Close tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/tests/dmsynth.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 5f2e9e95364..93212c0ae9f 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -65,6 +65,9 @@ static void test_dmsynth(void) ULONG value; ULONG bytes; DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; + const DWORD all_params = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| + DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS|DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %#lx\n", hr); @@ -121,6 +124,72 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_Activate(dmsynth, TRUE); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %#lx\n", hr); + /* Open / Close */ + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == DMUS_E_ALREADYOPEN, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_Close(dmsynth); + ok(hr == S_OK, "Close failed: %#lx\n", hr); + hr = IDirectMusicSynth_Close(dmsynth); + ok(hr == DMUS_E_ALREADYCLOSED, "Close failed: %#lx\n", hr); + memset(&params, 0, sizeof(params)); + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == E_INVALIDARG, "Open failed: %#lx\n", hr); + params.dwSize = sizeof(DMUS_PORTPARAMS7); + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + IDirectMusicSynth_Close(dmsynth); + /* All params supported and set to 0 */ + params.dwSize = sizeof(params); + params.dwValidParams = all_params; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + ok(params.dwSize == sizeof(params), "dwSize: %ld\n", params.dwSize); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwVoices == 32, "dwVoices: %ld\n", params.dwVoices); + ok(params.dwChannelGroups == 2, "dwChannelGroups: %ld\n", params.dwChannelGroups); + ok(params.dwAudioChannels == 2, "dwAudioChannels: %ld\n", params.dwAudioChannels); + ok(params.dwSampleRate == 22050, "dwSampleRate: %ld\n", params.dwSampleRate); + ok(params.dwEffectFlags == DMUS_EFFECT_REVERB, "params.dwEffectFlags: %#lx\n", params.dwEffectFlags); + ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); + ok(params.dwFeatures == 0, "dwFeatures: %#lx\n", params.dwFeatures); + IDirectMusicSynth_Close(dmsynth); + /* Requesting more than supported */ + params.dwValidParams = DMUS_PORTPARAMS_SAMPLERATE; + params.dwSampleRate = 100003; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwSampleRate == 96000, "dwSampleRate: %ld\n", params.dwSampleRate); + IDirectMusicSynth_Close(dmsynth); + /* Minimums */ + params.dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| + DMUS_PORTPARAMS_SAMPLERATE; + params.dwVoices = 1; + params.dwChannelGroups = 1; + params.dwAudioChannels = 1; + params.dwSampleRate = 1; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwVoices == 1, "dwVoices: %ld\n", params.dwVoices); + ok(params.dwChannelGroups == 1, "dwChannelGroups: %ld\n", params.dwChannelGroups); + ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels); + ok(params.dwSampleRate == 11025, "dwSampleRate: %ld\n", params.dwSampleRate); + IDirectMusicSynth_Close(dmsynth); + /* Test share and features */ + params.dwValidParams = DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; + params.fShare = TRUE; + params.dwFeatures = DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); + ok(params.dwFeatures == (DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING), + "dwFeatures: %#lx\n", params.dwFeatures); + IDirectMusicSynth_Close(dmsynth); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %#lx\n", hr);

1 0

Michael Stefaniuc : dmsynth: Implement the synth's Open and Close methods.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 1383b841c5f699c6b75511aedd84c952b39f692e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1383b841c5f699c6b75511ae… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 00:51:59 2022 +0100 dmsynth: Implement the synth's Open and Close methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 +- dlls/dmsynth/dmsynth_private.h | 5 +-- dlls/dmsynth/synth.c | 91 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 90 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index cec89ca80aa..d09d0120023 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -286,7 +286,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; @@ -312,7 +312,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index aabf1f56904..0058ce04d3a 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -56,14 +56,13 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void ** * IDirectMusicSynth8Impl implementation structure */ struct IDirectMusicSynth8Impl { - /* IUnknown fields */ IDirectMusicSynth8 IDirectMusicSynth8_iface; IKsControl IKsControl_iface; LONG ref; - - /* IDirectMusicSynth8 fields */ DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; BOOL active; + BOOL open; IReferenceClock *latency_clock; IDirectMusicSynthSink *sink; }; diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index c69d7a340b1..2db80726408 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -94,21 +94,102 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) } /* IDirectMusicSynth8Impl IDirectMusicSynth part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, - DMUS_PORTPARAMS *pPortParams) +static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *params) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + BOOL modified = FALSE; + const DMUS_PORTPARAMS def = { + .dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS| + DMUS_PORTPARAMS_AUDIOCHANNELS|DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS| + DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES, + .dwSize = sizeof(def), .dwVoices = 32, .dwChannelGroups = 2, .dwAudioChannels = 2, + .dwSampleRate = 22050, .dwEffectFlags = DMUS_EFFECT_REVERB + }; + + TRACE("(%p, %p)\n", This, params); + + if (This->open) + return DMUS_E_ALREADYOPEN; + if (params && params->dwSize < sizeof(DMUS_PORTPARAMS7)) + return E_INVALIDARG; - FIXME("(%p)->(%p): stub\n", This, pPortParams); + This->open = TRUE; - return S_OK; + if (!params) { + memcpy(&This->params, &def, sizeof(This->params)); + return S_OK; + } + + if (params->dwValidParams & DMUS_PORTPARAMS_VOICES && params->dwVoices) { + if (params->dwVoices > This->caps.dwMaxVoices) { + modified = TRUE; + params->dwVoices = This->caps.dwMaxVoices; + } + } else + params->dwVoices = def.dwVoices; + + if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS && params->dwChannelGroups) { + if (params->dwChannelGroups > This->caps.dwMaxChannelGroups) { + modified = TRUE; + params->dwChannelGroups = This->caps.dwMaxChannelGroups; + } + } else + params->dwChannelGroups = def.dwChannelGroups; + + if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS && params->dwAudioChannels) { + if (params->dwAudioChannels > This->caps.dwMaxAudioChannels) { + modified = TRUE; + params->dwAudioChannels = This->caps.dwMaxAudioChannels; + } + } else + params->dwAudioChannels = def.dwAudioChannels; + + if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE && params->dwSampleRate) { + if (params->dwSampleRate > 96000) { + modified = TRUE; + params->dwSampleRate = 96000; + } else if (params->dwSampleRate < 11025) { + modified = TRUE; + params->dwSampleRate = 11025; + } + } else + params->dwSampleRate = def.dwSampleRate; + + if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS && params->dwEffectFlags != def.dwEffectFlags) + modified = TRUE; + params->dwEffectFlags = def.dwEffectFlags; + + if (params->dwValidParams & DMUS_PORTPARAMS_SHARE && params->fShare) + modified = TRUE; + params->fShare = FALSE; + + if (params->dwSize >= sizeof(params)) { + if (params->dwValidParams & DMUS_PORTPARAMS_FEATURES && params->dwFeatures) { + if (params->dwFeatures & ~(DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING)) { + modified = TRUE; + params->dwFeatures &= DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; + } + } else + params->dwFeatures = def.dwFeatures; + params->dwValidParams = def.dwValidParams; + } else + params->dwValidParams = def.dwValidParams & ~DMUS_PORTPARAMS_FEATURES; + + memcpy(&This->params, params, min(params->dwSize, sizeof(This->params))); + + return modified ? S_FALSE : S_OK; } static HRESULT WINAPI IDirectMusicSynth8Impl_Close(IDirectMusicSynth8 *iface) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)\n", This); + + if (!This->open) + return DMUS_E_ALREADYCLOSED; + + This->open = FALSE; return S_OK; }

1 0

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 February 2022