- Wine-Devel - list.winehq.org

[PATCH] kernel32/tests: Relax a timing test.
by Zebediah Figura July 25, 2020

July 25, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/mailslot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index da595e97143..9da960fba81 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -324,7 +324,7 @@ todo_wine ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); dwTimeout = GetTickCount() - dwTimeout; - ok( dwTimeout >= 990, "timeout too short %u\n", dwTimeout ); + ok( dwTimeout >= 900, "timeout too short %u\n", dwTimeout ); ok( CloseHandle( hSlot ), "closing the mailslot\n"); return 0; -- 2.27.0

1 0

[PATCH 1/5] dsdmo: Add a stub waves reverb effect.
by Zebediah Figura July 25, 2020

July 25, 2020

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)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); -- 2.27.0

2 7

[PATCH 1/4] wine.inf: Move the Drivers32 section to the registry.
by Zebediah Figura July 25, 2020

July 25, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- The changes to msacm32 and msvfw32 need to be done in lockstep, to avoid reporting duplicate entries or omitting entries. dlls/msacm32/internal.c | 15 +-------------- dlls/msvfw32/msvideo_main.c | 19 ------------------- loader/wine.inf.in | 22 +++++++++------------- 3 files changed, 10 insertions(+), 46 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 9c4d1a75f3b..0ff3fea2af3 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -352,15 +352,13 @@ void MSACM_RegisterAllDrivers(void) { static const WCHAR msacm32[] = {'m','s','a','c','m','3','2','.','d','l','l','\0'}; static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; - static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'D','r','i','v','e','r','s','3','2','\0'}; DWORD i, cnt, bufLen, lRet, type; - WCHAR buf[2048], valname[64], *name, *s; + WCHAR buf[2048], valname[64], *name; FILETIME lastWrite; HKEY hKey; @@ -392,17 +390,6 @@ void MSACM_RegisterAllDrivers(void) RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) - { - for(s = buf; *s; s += lstrlenW(s) + 1) - { - if (wcsnicmp(s, msacmW, ARRAY_SIZE(msacmW))) continue; - if (!(name = wcschr(s, '='))) continue; - *name = 0; - MSACM_RegisterDriver(s, name + 1, 0); - *name = '='; - } - } MSACM_ReorderDriversByPriority(); MSACM_RegisterDriver(msacm32, msacm32, 0); } diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index e3a3300e5a1..905be6e5afb 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -308,25 +308,6 @@ BOOL VFWAPI ICInfo(DWORD type, DWORD handler, ICINFO *info) RegCloseKey(key); } - if (GetPrivateProfileSectionA("drivers32", buf, sizeof(buf), "system.ini")) - { - char *s; - for (s = buf; *s; s += strlen(s) + 1) - { - if (s[4] != '.' || s[9] != '=') continue; - ret_type = mmioStringToFOURCCA(s, 0); - ret_handler = mmioStringToFOURCCA(s + 5, 0); - if (type && compare_fourcc(type, ret_type)) continue; - if (compare_fourcc(handler, ret_handler) && handler != count++) continue; - - info->fccType = ret_type; - info->fccHandler = ret_handler; - MultiByteToWideChar(CP_ACP, 0, s + 10, -1, info->szDriver, ARRAY_SIZE(info->szDriver)); - TRACE("Returning codec %s, driver %s.\n", debugstr_an(s, 9), debugstr_a(s + 10)); - return TRUE; - } - } - LIST_FOR_EACH_ENTRY(driver, &reg_driver_list, struct reg_driver, entry) { if (type && compare_fourcc(type, driver->fccType)) continue; diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 35992a01dfd..6f66f285569 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -556,7 +556,14 @@ HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" HKLM,%CurrentVersionNT%\Console,,16 -HKLM,%CurrentVersionNT%\Drivers32,,16 +HKLM,%CurrentVersionNT%\Drivers32,"msacm.imaadpcm",,"imaadp32.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.l3acm",,"l3codeca.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.msadpcm",,"msadp32.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.msg711",,"msg711.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.msgsm610",,"msgsm32.acm" +HKLM,%CurrentVersionNT%\Drivers32,"vidc.cvid",,"iccvid.dll" +HKLM,%CurrentVersionNT%\Drivers32,"vidc.mrle",,"msrle32.dll" +HKLM,%CurrentVersionNT%\Drivers32,"vidc.msvc",,"msvidc32.dll" HKLM,%CurrentVersionNT%\FontDpi,,16 HKLM,%CurrentVersionNT%\FontLink,,16 HKLM,%CurrentVersionNT%\FontMapper,,16 @@ -565,6 +572,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\IniFileMapping\system.ini,"drivers32",,"SYS:Microsoft\Windows NT\CurrentVersion\Drivers32" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" @@ -2734,18 +2742,6 @@ system.ini, mci,,"vcr=mcivisca.drv" system.ini, mci,,"; videodisc=mcipionr.drv" system.ini, mci,,"waveaudio=mciwave.dll" -system.ini, drivers32,,"msacm.imaadpcm=imaadp32.acm" -system.ini, drivers32,,"msacm.msadpcm=msadp32.acm" -system.ini, drivers32,,"msacm.msg711=msg711.acm" -system.ini, drivers32,,"msacm.l3acm=l3codeca.acm" -system.ini, drivers32,,"msacm.msgsm610=msgsm32.acm" -system.ini, drivers32,,"vidc.mrle=msrle32.dll" -system.ini, drivers32,,"vidc.msvc=msvidc32.dll" -system.ini, drivers32,,"vidc.cvid=iccvid.dll" -system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" -system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" -system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" - [Timezones] ; The timezone information (TZI field) comes from the Olson timezone database ; http://www.twinsun.com/tz/tz-link.htm -- 2.27.0

2 7

[PATCH 03/10] xactengine3_7: Implement IXACT3SoundBank Interface.
by Vijay Kiran Kamuju July 24, 2020

July 24, 2020

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] amstream: Accept more media subtypes in AMVideoStream::ReceiveConnection().
by Gijs Vermeulen July 24, 2020

July 24, 2020

Fixes: a7c515fe01c4902a3e7c6b60608a54b77e252b47 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 26 +++++----- dlls/amstream/tests/amstream.c | 93 ++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 12 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 9f74eaf91a..4c94bacf52 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -632,16 +632,6 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA return E_UNEXPECTED; } -static BOOL check_media_type(const AM_MEDIA_TYPE *mt) -{ - if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) - && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) - && IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - return TRUE; - - return FALSE; -} - static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { struct ddraw_stream *stream = impl_from_IPin(iface); @@ -657,7 +647,13 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons return VFW_E_ALREADY_CONNECTED; } - if (!check_media_type(mt)) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) + || (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) + || !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) { LeaveCriticalSection(&stream->cs); return VFW_E_TYPE_NOT_ACCEPTED; @@ -788,7 +784,13 @@ static HRESULT WINAPI ddraw_sink_QueryId(IPin *iface, WCHAR **id) static HRESULT WINAPI ddraw_sink_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) { TRACE("iface %p, mt %p.\n", iface, mt); - return check_media_type(mt) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED; + + if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) + && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) + && IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return S_OK; + + return VFW_E_TYPE_NOT_ACCEPTED; } static HRESULT WINAPI ddraw_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8adf9db934..8a6dc26f96 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "ksmedia.h" #include "dvdmedia.h" +#include "wmcodecdsp.h" #include "wine/strmbase.h" static const WAVEFORMATEX audio_format = @@ -2330,6 +2331,14 @@ static void test_media_types(void) &MEDIASUBTYPE_ARGB32, &MEDIASUBTYPE_ARGB1555, &MEDIASUBTYPE_ARGB4444, + &MEDIASUBTYPE_Avi, + &MEDIASUBTYPE_I420, + &MEDIASUBTYPE_AYUV, + &MEDIASUBTYPE_YV12, + &MEDIASUBTYPE_YUY2, + &MEDIASUBTYPE_UYVY, + &MEDIASUBTYPE_YVYU, + &MEDIASUBTYPE_NV12, &GUID_NULL, }; @@ -3243,6 +3252,89 @@ static void test_audiostream_receive_connection(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_receive_connection(void) +{ + static const VIDEOINFOHEADER req_vih; + IDirectDrawMediaStream *ddraw_stream; + IAMMultiMediaStream *mmstream; + struct testfilter source; + IMediaStream *stream; + AM_MEDIA_TYPE mt; + HRESULT hr; + ULONG ref; + IPin *pin; + int i; + + const AM_MEDIA_TYPE video_mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_RGB8, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(VIDEOINFOHEADER), + .pbFormat = (BYTE *)&req_vih, + }; + + static const GUID *subtypes[] = + { + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + &MEDIASUBTYPE_RGB555, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB1, + &MEDIASUBTYPE_RGB4, + &MEDIASUBTYPE_ARGB32, + &MEDIASUBTYPE_ARGB1555, + &MEDIASUBTYPE_ARGB4444, + &MEDIASUBTYPE_Avi, + &MEDIASUBTYPE_I420, + &MEDIASUBTYPE_AYUV, + &MEDIASUBTYPE_YV12, + &MEDIASUBTYPE_YUY2, + &MEDIASUBTYPE_UYVY, + &MEDIASUBTYPE_YVYU, + &MEDIASUBTYPE_NV12, + &GUID_NULL, + }; + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&source); + + mt = video_mt; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(subtypes); ++i) + { + mt = video_mt; + mt.subtype = *subtypes[i]; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == (i < 4) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + } + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_audiostream_set_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5238,6 +5330,7 @@ START_TEST(amstream) test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw(); + test_ddrawstream_receive_connection(); test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); -- 2.27.0

2 1

[PATCH 2/2] wineconsole: Use ReadConsoleOutputW in WINECON_FetchCells.
by Jacek Caban July 24, 2020

July 24, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/wineconsole.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)

1 0

[PATCH 1/2] wineconsole: Ignore ERROR_IO_INCOMPLETE error in WINECON_GrabChanges.
by Jacek Caban July 24, 2020

July 24, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/wineconsole.c | 1 + 1 file changed, 1 insertion(+)

1 0

[RFC PATCH v2] gdi32: Enumerate one charset per font for EnumFontFamilies.
by Myah Caron July 24, 2020

July 24, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47726 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: - Fix the successful todo_wine errors. - Merge the patches together, as both patches are now RFC. I'm not sure how to approach either the Traditional Arabic issue (as I'm currently unable to replicate it, even after installing multiple Arabic language packs), or the font aliasing issues that this patch now exposes (the RUSSIAN_CHARSET errors).

2 1

[PATCH 3/3] amstream: Implement IMediaStreamFilter::GetStopPosition.
by Myah Caron July 24, 2020

July 24, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/filter.c | 24 ++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 15 ++++++++++++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index ef23edfae3..6d1b107df5 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -800,9 +800,29 @@ static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - FIXME("iface %p, stop %p, stub!\n", iface, stop); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, stop %p\n", iface, stop); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetStopPosition(seeking, stop); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 50b2d5a761..d9c982948d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -917,8 +917,11 @@ static HRESULT WINAPI testsource_seeking_GetDuration(IMediaSeeking *iface, LONGL static HRESULT WINAPI testsource_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IMediaSeeking(iface); + + *stop = 0x8000000000000000ULL; + + return S_OK; } static HRESULT WINAPI testsource_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) @@ -4814,7 +4817,7 @@ static void test_mediastreamfilter_set_positions(void) IAMMediaStream *stream1; IAMMediaStream *stream2; IAMMediaStream *stream3; - LONGLONG stop_position; + LONGLONG stop_position, in_stop_position; LONGLONG duration; IMediaSeeking *seeking; IGraphBuilder *graph; @@ -4912,6 +4915,12 @@ static void test_mediastreamfilter_set_positions(void) ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + in_stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &in_stop_position); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(in_stop_position == 0x8000000000000000ULL, "Got stop position %s.\n", + wine_dbgstr_longlong(in_stop_position)); + source2.set_positions_hr = E_FAIL; source1.current_position = 0xdeadbeefdeadbeefULL; source1.stop_position = 0xdeadbeefdeadbeefULL; -- 2.27.0

2 1

[PATCH 2/3] amstream: Implement IAMMultiMediaStream::GetDuration.
by Myah Caron July 24, 2020

July 24, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/multimedia.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 200bd5c4a5..e6b088e432 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -177,9 +177,9 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); + TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); - return E_NOTIMPL; + return IMediaSeeking_GetDuration(This->media_seeking, pDuration); } static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) -- 2.27.0

2 1