From: Zebediah Figura zfigura@codeweavers.com
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/dsdmo/Makefile.in | 4 + dlls/dsdmo/dsdmo.idl | 27 +++ dlls/dsdmo/main.c | 429 +++++++++++++++++++++++++++++++++++++-- dlls/dsdmo/tests/dsdmo.c | 42 ++-- 4 files changed, 462 insertions(+), 40 deletions(-) create mode 100644 dlls/dsdmo/dsdmo.idl
diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index 99816ae0c08..3787415abd6 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,6 +1,10 @@ MODULE = dsdmo.dll +IMPORTS = dmoguids uuid
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ main.c + +IDL_SRCS = \ + dsdmo.idl diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl new file mode 100644 index 00000000000..a967186af3f --- /dev/null +++ b/dlls/dsdmo/dsdmo.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2020 Zebediah Figura + * + * 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 + */ + +#pragma makedep register + +[ + threading(both), + progid("Microsoft.DirectSoundWavesReverbDMO.1"), + vi_progid("Microsoft.DirectSoundWavesReverbDMO"), + uuid(87fc0268-9a55-4360-95aa-004a1d9de26c) +] +coclass DirectSoundWavesReverbDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 788381b7a45..44915ca8566 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -15,9 +15,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS
-#include "ole2.h" +#define COBJMACROS +#include "dmo.h" +#include "mmreg.h" +#include "mmsystem.h" +#include "initguid.h" +#include "dsound.h" #include "rpcproxy.h"
#include "wine/debug.h" @@ -26,19 +30,318 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsdmo);
static HINSTANCE dsdmo_instance;
-/****************************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +struct effect +{ + IMediaObject IMediaObject_iface; + IUnknown IUnknown_inner; + IUnknown *outer_unk; + LONG refcount; + + const struct effect_ops *ops; +}; + +struct effect_ops +{ + void *(*query_interface)(struct effect *effect, REFIID iid); + void (*destroy)(struct effect *effect); +}; + +static struct effect *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IUnknown_inner); +} + +static HRESULT WINAPI effect_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IUnknown(iface); + + TRACE("effect %p, iid %s, out %p.\n", effect, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown)) + *out = iface; + else if (IsEqualGUID(iid, &IID_IMediaObject)) + *out = &effect->IMediaObject_iface; + else if (!(*out = effect->ops->query_interface(effect, iid))) + { + WARN("%s not implemented; returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI effect_inner_AddRef(IUnknown *iface) +{ + struct effect *effect = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&effect->refcount); + + TRACE("%p increasing refcount to %u.\n", effect, refcount); + return refcount; +} + +static ULONG WINAPI effect_inner_Release(IUnknown *iface) { - TRACE("(%p %d %p)\n", inst, reason, reserved); + struct effect *effect = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&effect->refcount); + + TRACE("%p decreasing refcount to %u.\n", effect, refcount); + + if (!refcount) + { + effect->ops->destroy(effect); + } + return refcount; +} + +static const IUnknownVtbl effect_inner_vtbl = +{ + effect_inner_QueryInterface, + effect_inner_AddRef, + effect_inner_Release, +}; + +static struct effect *impl_from_IMediaObject(IMediaObject *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IMediaObject_iface); +} + +static HRESULT WINAPI effect_QueryInterface(IMediaObject *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IMediaObject(iface); + return IUnknown_QueryInterface(effect->outer_unk, iid, out); +} + +static ULONG WINAPI effect_AddRef(IMediaObject *iface) +{ + struct effect *effect = impl_from_IMediaObject(iface); + return IUnknown_AddRef(effect->outer_unk); +} + +static ULONG WINAPI effect_Release(IMediaObject *iface) +{ + struct effect *effect = impl_from_IMediaObject(iface); + return IUnknown_Release(effect->outer_unk); +} + +static HRESULT WINAPI effect_GetStreamCount(IMediaObject *iface, DWORD *input, DWORD *output) +{ + FIXME("iface %p, input %p, output %p, stub!\n", iface, input, output); + return E_NOTIMPL; +}
+static HRESULT WINAPI effect_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) +{ + FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) +{ + FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) +{ + FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) +{ + FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputSizeInfo(IMediaObject *iface, DWORD index, + DWORD *size, DWORD *lookahead, DWORD *alignment) +{ + FIXME("iface %p, index %u, size %p, lookahead %p, alignment %p, stub!\n", iface, index, size, lookahead, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) +{ + FIXME("iface %p, index %u, size %p, alignment %p, stub!\n", iface, index, size, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) +{ + FIXME("iface %p, index %u, latency %p, stub!\n", iface, index, latency); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) +{ + FIXME("iface %p, index %u, latency %s, stub!\n", iface, index, wine_dbgstr_longlong(latency)); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_Flush(IMediaObject *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_Discontinuity(IMediaObject *iface, DWORD index) +{ + FIXME("iface %p, index %u, stub!\n", iface, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_AllocateStreamingResources(IMediaObject *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_FreeStreamingResources(IMediaObject *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) +{ + FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_ProcessInput(IMediaObject *iface, DWORD index, + IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) +{ + FIXME("iface %p, index %u, buffer %p, flags %#x, timestamp %s, timelength %s, stub!\n", + iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_ProcessOutput(IMediaObject *iface, DWORD flags, + DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) +{ + FIXME("iface %p, flags %#x, count %u, buffers %p, status %p, stub!\n", iface, flags, count, buffers, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_Lock(IMediaObject *iface, LONG lock) +{ + FIXME("iface %p, lock %d, stub!\n", iface, lock); + return E_NOTIMPL; +} + +static const IMediaObjectVtbl effect_vtbl = +{ + effect_QueryInterface, + effect_AddRef, + effect_Release, + effect_GetStreamCount, + effect_GetInputStreamInfo, + effect_GetOutputStreamInfo, + effect_GetInputType, + effect_GetOutputType, + effect_SetInputType, + effect_SetOutputType, + effect_GetInputCurrentType, + effect_GetOutputCurrentType, + effect_GetInputSizeInfo, + effect_GetOutputSizeInfo, + effect_GetInputMaxLatency, + effect_SetInputMaxLatency, + effect_Flush, + effect_Discontinuity, + effect_AllocateStreamingResources, + effect_FreeStreamingResources, + effect_GetInputStatus, + effect_ProcessInput, + effect_ProcessOutput, + effect_Lock, +}; + +static void effect_init(struct effect *effect, IUnknown *outer, const struct effect_ops *ops) +{ + effect->outer_unk = outer ? outer : &effect->IUnknown_inner; + effect->refcount = 1; + effect->IUnknown_inner.lpVtbl = &effect_inner_vtbl; + effect->IMediaObject_iface.lpVtbl = &effect_vtbl; + + effect->ops = ops; +} + +struct waves_reverb +{ + struct effect effect; +}; + +static struct waves_reverb *impl_waves_reverb_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct waves_reverb, effect); +} + +static void *waves_reverb_query_interface(struct effect *iface, REFIID iid) +{ + return NULL; +} + +static void waves_reverb_destroy(struct effect *iface) +{ + struct waves_reverb *effect = impl_waves_reverb_from_effect(iface); + + free(effect); +} + +static const struct effect_ops waves_reverb_ops = +{ + .destroy = waves_reverb_destroy, + .query_interface = waves_reverb_query_interface, +}; + +static HRESULT waves_reverb_create(IUnknown *outer, IUnknown **out) +{ + struct waves_reverb *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &waves_reverb_ops); + + TRACE("Created waves reverb effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ switch(reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - dsdmo_instance = inst; + dsdmo_instance = instance; DisableThreadLibraryCalls(dsdmo_instance); break; } @@ -46,35 +349,117 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return TRUE; }
-/*********************************************************************** - * DllGetClassObject - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +struct class_factory { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + IClassFactory IClassFactory_iface; + HRESULT (*create_instance)(IUnknown *outer, IUnknown **out); +}; + +static struct class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID iid, void **out) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + IUnknown *unk; + HRESULT hr; + + TRACE("iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid(iid), out); + + *out = NULL; + + if (outer && !IsEqualGUID(iid, &IID_IUnknown)) + return E_NOINTERFACE; + + if (SUCCEEDED(hr = factory->create_instance(outer, &unk))) + { + hr = IUnknown_QueryInterface(unk, iid, out); + IUnknown_Release(unk); + } + return hr; +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("lock %d, stub!\n", lock); + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +static struct +{ + const GUID *clsid; + struct class_factory factory; +} +class_factories[] = +{ + {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) +{ + unsigned int i; + + TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + for (i = 0; i < ARRAY_SIZE(class_factories); ++i) + { + if (IsEqualGUID(clsid, class_factories[i].clsid)) + return IClassFactory_QueryInterface(&class_factories[i].factory.IClassFactory_iface, iid, out); + } + + FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; }
-/*********************************************************************** - * DllCanUnloadNow - */ HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; }
-/*********************************************************************** - * DllRegisterServer - */ HRESULT WINAPI DllRegisterServer(void) { TRACE("()\n"); return __wine_register_resources(dsdmo_instance); }
-/*********************************************************************** - * DllUnregisterServer - */ HRESULT WINAPI DllUnregisterServer(void) { TRACE("()\n"); diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index b8f0932790b..f236c95d43c 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -80,9 +80,7 @@ static void test_aggregation(const GUID *clsid) dmo = (IMediaObject *)0xdeadbeef; hr = CoCreateInstance(clsid, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - if (hr != E_NOINTERFACE) - return; + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!dmo, "Got interface %p.\n", dmo);
hr = CoCreateInstance(clsid, &test_outer, CLSCTX_INPROC_SERVER, @@ -138,9 +136,7 @@ static void test_interfaces(const GUID *clsid, const GUID *iid) ULONG ref;
hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, iid, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - return; + ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IUnknown_QueryInterface(unk, &IID_IMediaObject, (void **)&unk2); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -204,9 +200,7 @@ static void test_media_types(const GUID *clsid) };
hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - return; + ok(hr == S_OK, "Got hr %#x.\n", hr);
build_pcm_format(&wfx, WAVE_FORMAT_PCM, 16, 44100, 2);
@@ -508,18 +502,19 @@ START_TEST(dsdmo) { const GUID *clsid; const GUID *iid; + BOOL todo; } tests[] = { - {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus}, - {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor}, - {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion}, - {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, - {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger}, - {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle}, - {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb}, - {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq}, - {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb}, + {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus, TRUE}, + {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor, TRUE}, + {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, + {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho, TRUE}, + {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE}, + {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, + {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb, TRUE}, + {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq, TRUE}, + {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb, TRUE}, }; unsigned int i;
@@ -527,6 +522,17 @@ START_TEST(dsdmo)
for (i = 0; i < ARRAY_SIZE(tests); ++i) { + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(tests[i].clsid, NULL, CLSCTX_INPROC_SERVER, tests[i].iid, (void **)&unk); + todo_wine_if(tests[i].todo) ok(hr == S_OK, "Failed to create %s, hr %#x.\n", + debugstr_guid(tests[i].clsid), hr); + if (hr == S_OK) + IUnknown_Release(unk); + else + continue; + test_aggregation(tests[i].clsid); test_interfaces(tests[i].clsid, tests[i].iid); test_media_types(tests[i].clsid);
From: Zebediah Figura zfigura@codeweavers.com
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/dsdmo/main.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 44915ca8566..f3be97177a5 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -33,6 +33,7 @@ static HINSTANCE dsdmo_instance; struct effect { IMediaObject IMediaObject_iface; + IMediaObjectInPlace IMediaObjectInPlace_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -61,6 +62,8 @@ static HRESULT WINAPI effect_inner_QueryInterface(IUnknown *iface, REFIID iid, v *out = iface; else if (IsEqualGUID(iid, &IID_IMediaObject)) *out = &effect->IMediaObject_iface; + else if (IsEqualGUID(iid, &IID_IMediaObjectInPlace)) + *out = &effect->IMediaObjectInPlace_iface; else if (!(*out = effect->ops->query_interface(effect, iid))) { WARN("%s not implemented; returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -282,12 +285,66 @@ static const IMediaObjectVtbl effect_vtbl = effect_Lock, };
+static struct effect *impl_from_IMediaObjectInPlace(IMediaObjectInPlace *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IMediaObjectInPlace_iface); +} + +static HRESULT WINAPI effect_inplace_QueryInterface(IMediaObjectInPlace *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IMediaObjectInPlace(iface); + return IUnknown_QueryInterface(effect->outer_unk, iid, out); +} + +static ULONG WINAPI effect_inplace_AddRef(IMediaObjectInPlace *iface) +{ + struct effect *effect = impl_from_IMediaObjectInPlace(iface); + return IUnknown_AddRef(effect->outer_unk); +} + +static ULONG WINAPI effect_inplace_Release(IMediaObjectInPlace *iface) +{ + struct effect *effect = impl_from_IMediaObjectInPlace(iface); + return IUnknown_Release(effect->outer_unk); +} + +static HRESULT WINAPI effect_inplace_Process(IMediaObjectInPlace *iface, ULONG size, + BYTE *data, REFERENCE_TIME start, DWORD flags) +{ + FIXME("iface %p, size %u, data %p, start %s, flags %#x, stub!\n", + iface, size, data, wine_dbgstr_longlong(start), flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_inplace_Clone(IMediaObjectInPlace *iface, IMediaObjectInPlace **out) +{ + FIXME("iface %p, out %p, stub!\n", iface, out); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_inplace_GetLatency(IMediaObjectInPlace *iface, REFERENCE_TIME *latency) +{ + FIXME("iface %p, latency %p, stub!\n", iface, latency); + return E_NOTIMPL; +} + +static const IMediaObjectInPlaceVtbl effect_inplace_vtbl = +{ + effect_inplace_QueryInterface, + effect_inplace_AddRef, + effect_inplace_Release, + effect_inplace_Process, + effect_inplace_Clone, + effect_inplace_GetLatency, +}; + static void effect_init(struct effect *effect, IUnknown *outer, const struct effect_ops *ops) { effect->outer_unk = outer ? outer : &effect->IUnknown_inner; effect->refcount = 1; effect->IUnknown_inner.lpVtbl = &effect_inner_vtbl; effect->IMediaObject_iface.lpVtbl = &effect_vtbl; + effect->IMediaObjectInPlace_iface.lpVtbl = &effect_inplace_vtbl;
effect->ops = ops; }
From: Zebediah Figura zfigura@codeweavers.com
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/dsdmo/main.c | 56 ++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 2 +- 2 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index f3be97177a5..cc06dfe6f5c 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -352,6 +352,57 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff struct waves_reverb { struct effect effect; + IDirectSoundFXWavesReverb IDirectSoundFXWavesReverb_iface; +}; + +static struct waves_reverb *impl_from_IDirectSoundFXWavesReverb(IDirectSoundFXWavesReverb *iface) +{ + return CONTAINING_RECORD(iface, struct waves_reverb, IDirectSoundFXWavesReverb_iface); +} + +static HRESULT WINAPI waves_reverb_params_QueryInterface(IDirectSoundFXWavesReverb *iface, REFIID iid, void **out) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI waves_reverb_params_AddRef(IDirectSoundFXWavesReverb *iface) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI waves_reverb_params_Release(IDirectSoundFXWavesReverb *iface) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI waves_reverb_params_SetAllParameters(IDirectSoundFXWavesReverb *iface, const DSFXWavesReverb *params) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + + FIXME("effect %p, params %p, stub!\n", effect, params); + + return E_NOTIMPL; +} + +static HRESULT WINAPI waves_reverb_params_GetAllParameters(IDirectSoundFXWavesReverb *iface, DSFXWavesReverb *params) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + + FIXME("effect %p, params %p, stub!\n", effect, params); + + return E_NOTIMPL; +} + +static const IDirectSoundFXWavesReverbVtbl waves_reverb_params_vtbl = +{ + waves_reverb_params_QueryInterface, + waves_reverb_params_AddRef, + waves_reverb_params_Release, + waves_reverb_params_SetAllParameters, + waves_reverb_params_GetAllParameters, };
static struct waves_reverb *impl_waves_reverb_from_effect(struct effect *iface) @@ -361,6 +412,10 @@ static struct waves_reverb *impl_waves_reverb_from_effect(struct effect *iface)
static void *waves_reverb_query_interface(struct effect *iface, REFIID iid) { + struct waves_reverb *effect = impl_waves_reverb_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXWavesReverb)) + return &effect->IDirectSoundFXWavesReverb_iface; return NULL; }
@@ -385,6 +440,7 @@ static HRESULT waves_reverb_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY;
effect_init(&object->effect, outer, &waves_reverb_ops); + object->IDirectSoundFXWavesReverb_iface.lpVtbl = &waves_reverb_params_vtbl;
TRACE("Created waves reverb effect %p.\n", object); *out = &object->effect.IUnknown_inner; diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index f236c95d43c..cb6e698b6ec 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -514,7 +514,7 @@ START_TEST(dsdmo) {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb, TRUE}, {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq, TRUE}, - {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb, TRUE}, + {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb}, }; unsigned int i;
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=76097
Your paranoid android.
=== debiant (32 bit report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit French report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit Japanese:Japan report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit Chinese:China report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit WoW report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (64 bit WoW report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/dsdmo/Makefile.in | 2 +- dlls/dsdmo/main.c | 68 ++++++++++++++++++++++++++++++++++++++-- dlls/dsdmo/tests/dsdmo.c | 22 ++++++------- 3 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index 3787415abd6..d184b025ad0 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,5 +1,5 @@ MODULE = dsdmo.dll -IMPORTS = dmoguids uuid +IMPORTS = dmoguids strmiids uuid
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index cc06dfe6f5c..9d4fbc5b785 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -20,6 +20,7 @@ #include "dmo.h" #include "mmreg.h" #include "mmsystem.h" +#include "uuids.h" #include "initguid.h" #include "dsound.h" #include "rpcproxy.h" @@ -38,6 +39,9 @@ struct effect IUnknown *outer_unk; LONG refcount;
+ CRITICAL_SECTION cs; + WAVEFORMATEX format; + const struct effect_ops *ops; };
@@ -92,6 +96,8 @@ static ULONG WINAPI effect_inner_Release(IUnknown *iface)
if (!refcount) { + effect->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&effect->cs); effect->ops->destroy(effect); } return refcount; @@ -159,8 +165,63 @@ static HRESULT WINAPI effect_GetOutputType(IMediaObject *iface, DWORD index, DWO
static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); - return E_NOTIMPL; + struct effect *effect = impl_from_IMediaObject(iface); + const WAVEFORMATEX *format; + + TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + + if (flags & DMO_SET_TYPEF_CLEAR) + { + EnterCriticalSection(&effect->cs); + memset(&effect->format, 0, sizeof(effect->format)); + LeaveCriticalSection(&effect->cs); + return S_OK; + } + + if (!IsEqualGUID(&type->majortype, &MEDIATYPE_Audio)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&type->subtype, &MEDIASUBTYPE_PCM) + && !IsEqualGUID(&type->subtype, &MEDIASUBTYPE_IEEE_FLOAT)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&type->formattype, &FORMAT_WaveFormatEx)) + return DMO_E_TYPE_NOT_ACCEPTED; + + format = (const WAVEFORMATEX *)type->pbFormat; + if (format->wFormatTag == WAVE_FORMAT_PCM) + { + if (format->wBitsPerSample != 8 && format->wBitsPerSample != 16) + { + WARN("Rejecting %u-bit integer PCM.\n", format->wBitsPerSample); + return DMO_E_TYPE_NOT_ACCEPTED; + } + } + else if (format->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) + { + if (format->wBitsPerSample != 32) + { + WARN("Rejecting %u-bit float PCM.\n", format->wBitsPerSample); + return DMO_E_TYPE_NOT_ACCEPTED; + } + } + else + { + WARN("Rejecting tag %#x.\n", format->wFormatTag); + return DMO_E_TYPE_NOT_ACCEPTED; + } + + if (format->nChannels != 1 && format->nChannels != 2) + { + WARN("Rejecting %u channels.\n", format->nChannels); + return DMO_E_TYPE_NOT_ACCEPTED; + } + + EnterCriticalSection(&effect->cs); + effect->format = *format; + LeaveCriticalSection(&effect->cs); + + return S_OK; }
static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) @@ -346,6 +407,9 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff effect->IMediaObject_iface.lpVtbl = &effect_vtbl; effect->IMediaObjectInPlace_iface.lpVtbl = &effect_inplace_vtbl;
+ InitializeCriticalSection(&effect->cs); + effect->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": effect.cs"); + effect->ops = ops; }
diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index cb6e698b6ec..d1cf2575de2 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -206,32 +206,32 @@ static void test_media_types(const GUID *clsid)
mt.majortype = MEDIATYPE_Video; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.majortype = GUID_NULL; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.majortype = MEDIATYPE_Audio;
mt.subtype = MEDIASUBTYPE_RGB8; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.subtype = GUID_NULL; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.subtype = MEDIASUBTYPE_IEEE_FLOAT; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); mt.subtype = MEDIASUBTYPE_PCM;
mt.formattype = FORMAT_VideoInfo; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.formattype = FORMAT_None; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.formattype = GUID_NULL; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.formattype = FORMAT_WaveFormatEx;
for (i = 0; i < ARRAY_SIZE(sample_rates); ++i) @@ -247,7 +247,7 @@ static void test_media_types(const GUID *clsid) build_pcm_format(&wfx, depths[j].format, depths[j].depth, sample_rates[i], channels);
hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
/* The output type must match the input type. */ @@ -273,7 +273,7 @@ static void test_media_types(const GUID *clsid) hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
hr = IMediaObject_SetInputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
hr = IMediaObject_SetOutputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); @@ -281,7 +281,7 @@ static void test_media_types(const GUID *clsid) hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
hr = IMediaObject_SetInputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth); } }
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=76098
Your paranoid android.
=== debiant (32 bit report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit French report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit Japanese:Japan report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit Chinese:China report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit WoW report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (64 bit WoW report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/dsdmo/main.c | 25 +++++++++++++++++++++++-- dlls/dsdmo/tests/dsdmo.c | 10 +++++----- 2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 9d4fbc5b785..1e992fe5419 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -226,8 +226,29 @@ static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, cons
static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); - return E_NOTIMPL; + struct effect *effect = impl_from_IMediaObject(iface); + HRESULT hr; + + TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + + if (flags & DMO_SET_TYPEF_CLEAR) + return S_OK; + + if (!IsEqualGUID(&type->majortype, &MEDIATYPE_Audio)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&type->subtype, &MEDIASUBTYPE_PCM) + && !IsEqualGUID(&type->subtype, &MEDIASUBTYPE_IEEE_FLOAT)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&type->formattype, &FORMAT_WaveFormatEx)) + return DMO_E_TYPE_NOT_ACCEPTED; + + EnterCriticalSection(&effect->cs); + hr = memcmp(type->pbFormat, &effect->format, sizeof(WAVEFORMATEX)) ? DMO_E_TYPE_NOT_ACCEPTED : S_OK; + LeaveCriticalSection(&effect->cs); + + return hr; }
static HRESULT WINAPI effect_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index d1cf2575de2..9026728f6c6 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -254,22 +254,22 @@ static void test_media_types(const GUID *clsid)
build_pcm_format(&wfx, depths[j].format, depths[j].depth, sample_rates[i], 3 - channels); hr = IMediaObject_SetOutputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
build_pcm_format(&wfx, depths[j].format, depths[j].depth, 2 * sample_rates[i], channels); hr = IMediaObject_SetOutputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
build_pcm_format(&wfx, depths[j].format, 24 - depths[j].depth, sample_rates[i], channels); hr = IMediaObject_SetOutputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
build_pcm_format(&wfx, depths[j].format, depths[j].depth, sample_rates[i], channels); hr = IMediaObject_SetOutputType(dmo, 0, &mt, 0); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
hr = IMediaObject_SetInputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); @@ -277,7 +277,7 @@ static void test_media_types(const GUID *clsid) hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
hr = IMediaObject_SetOutputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth);
hr = IMediaObject_SetInputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR);
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=76099
Your paranoid android.
=== debiant (32 bit report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit French report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit Japanese:Japan report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit Chinese:China report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (32 bit WoW report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
=== debiant (64 bit WoW report) ===
dsdmo: dsdmo.c:529: Test failed: Failed to create {87fc0268-9a55-4360-95aa-004a1d9de26c}, hr 0x80040154.
-
Marvin -
Zebediah Figura