July 2020 - Wine-commits - list.winehq.org

Zebediah Figura : dsdmo: Implement IMediaObject::SetInputType().
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: f21d13e2bc9df80f6a6021ae0d2514469ece7354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f21d13e2bc9df80f6a6021ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 24 19:20:23 2020 -0500 dsdmo: Implement IMediaObject::SetInputType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 3787415abd..d184b025ad 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 cc06dfe6f5..9d4fbc5b78 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 cb6e698b6e..d1cf2575de 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); } }

1 0

Zebediah Figura : dsdmo: Implement IMediaObject::SetOutputType().
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: ffdc68d517ccd28f0277b7bdb45f21aa1135d80b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffdc68d517ccd28f0277b7bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 24 19:20:24 2020 -0500 dsdmo: Implement IMediaObject::SetOutputType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 9d4fbc5b78..1e992fe541 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 d1cf2575de..9026728f6c 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);

1 0

Zebediah Figura : dsound/tests: Link directly to dsound.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 3f27d91629a04ff1f86acdfafa072de8b40f0264 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f27d91629a04ff1f86acdfa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 11:46:59 2020 -0500 dsound/tests: Link directly to dsound. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/Makefile.in | 2 +- dlls/dsound/tests/capture.c | 37 +++-------- dlls/dsound/tests/ds3d.c | 35 ++-------- dlls/dsound/tests/ds3d8.c | 35 ++-------- dlls/dsound/tests/dsound.c | 115 +++++++++----------------------- dlls/dsound/tests/dsound8.c | 75 ++++++++------------- dlls/dsound/tests/duplex.c | 50 ++++---------- dlls/dsound/tests/propset.c | 148 +++++++++++++++--------------------------- 8 files changed, 145 insertions(+), 352 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f27d91629a04ff1f86a…

1 0

Zebediah Figura : dsound/tests: Rewrite test_effects().
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 7893ef6b9f9216945f31a62f398a70cc646dd892 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7893ef6b9f9216945f31a62f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 11:47:00 2020 -0500 dsound/tests: Rewrite test_effects(). Use a custom DMO to show the interaction between dsound the DMO more clearly, and add more tests for IDirectSoundBuffer8::GetObjectInPath(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/Makefile.in | 2 +- dlls/dsound/tests/dsound8.c | 773 ++++++++++++++++++++++++++++++++---------- 2 files changed, 596 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7893ef6b9f9216945f31…

1 0

Zebediah Figura : dsdmo/tests: Add tests for aggregation.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: f32498439750a802f00bc4d185bde2ce5b0105a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f32498439750a802f00bc4d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 11:47:01 2020 -0500 dsdmo/tests: Add tests for aggregation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/dsdmo/tests/Makefile.in | 5 ++ dlls/dsdmo/tests/dsdmo.c | 162 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 169 insertions(+) diff --git a/configure b/configure index 677e19e26d..529b416472 100755 --- a/configure +++ b/configure @@ -20648,6 +20648,7 @@ wine_fn_config_makefile dlls/dpvoice/tests enable_tests wine_fn_config_makefile dlls/dpwsockx enable_dpwsockx wine_fn_config_makefile dlls/drmclien enable_drmclien wine_fn_config_makefile dlls/dsdmo enable_dsdmo +wine_fn_config_makefile dlls/dsdmo/tests enable_tests wine_fn_config_makefile dlls/dsound enable_dsound wine_fn_config_makefile dlls/dsound/tests enable_tests wine_fn_config_makefile dlls/dsquery enable_dsquery diff --git a/configure.ac b/configure.ac index e82ed88954..f2d0c9cd26 100644 --- a/configure.ac +++ b/configure.ac @@ -3245,6 +3245,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) WINE_CONFIG_MAKEFILE(dlls/dpwsockx) WINE_CONFIG_MAKEFILE(dlls/drmclien) WINE_CONFIG_MAKEFILE(dlls/dsdmo) +WINE_CONFIG_MAKEFILE(dlls/dsdmo/tests) WINE_CONFIG_MAKEFILE(dlls/dsound) WINE_CONFIG_MAKEFILE(dlls/dsound/tests) WINE_CONFIG_MAKEFILE(dlls/dsquery) diff --git a/dlls/dsdmo/tests/Makefile.in b/dlls/dsdmo/tests/Makefile.in new file mode 100644 index 0000000000..67378635f3 --- /dev/null +++ b/dlls/dsdmo/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dsdmo.dll +IMPORTS = dmoguids uuid msdmo ole32 + +C_SRCS = \ + dsdmo.c diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c new file mode 100644 index 0000000000..244747a689 --- /dev/null +++ b/dlls/dsdmo/tests/dsdmo.c @@ -0,0 +1,162 @@ +/* + * 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 + */ + +#define COBJMACROS +#include "windef.h" +#include "wingdi.h" +#include "mmreg.h" +#include "mmsystem.h" +#include "dmo.h" +#include "initguid.h" +#include "dsound.h" +#include "uuids.h" +#include "wine/test.h" + +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IMediaObject) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(const GUID *clsid) +{ + IMediaObject *dmo, *dmo2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + 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(!dmo, "Got interface %p.\n", dmo); + + hr = CoCreateInstance(clsid, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaObject_QueryInterface(dmo, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IMediaObject_QueryInterface(dmo, &IID_IMediaObject, (void **)&dmo2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dmo2 == (IMediaObject *)0xdeadbeef, "Got unexpected IMediaObject %p.\n", dmo2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IMediaObject_QueryInterface(dmo, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IMediaObject_Release(dmo); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + +START_TEST(dsdmo) +{ + static const struct + { + const GUID *clsid; + const GUID *iid; + } + 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}, + }; + unsigned int i; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + test_aggregation(tests[i].clsid); + } + + CoUninitialize(); +}

1 0

Zebediah Figura : dsound/tests: Move effect parameter tests to dsdmo.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: afd6cc72973b8dec92d88552a218af752a58cf30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd6cc72973b8dec92d88552… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 11:47:02 2020 -0500 dsound/tests: Move effect parameter tests to dsdmo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/tests/dsdmo.c | 247 ++++++++++++++++++++++++++++++ dlls/dsound/tests/dsound8.c | 364 -------------------------------------------- 2 files changed, 247 insertions(+), 364 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afd6cc72973b8dec92d8…

1 0

Zebediah Figura : dsdmo/tests: Add some tests for media types.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 222b1b06739722a1df5bd86c99355e6e34241516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=222b1b06739722a1df5bd86c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 11:47:03 2020 -0500 dsdmo/tests: Add some tests for media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/tests/dsdmo.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 298ebadcf9..b8f0932790 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -162,6 +162,141 @@ static void test_interfaces(const GUID *clsid, const GUID *iid) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void build_pcm_format(WAVEFORMATEX *format, WORD tag, WORD depth, DWORD sample_rate, WORD channels) +{ + format->wFormatTag = tag; + format->wBitsPerSample = depth; + format->nChannels = channels; + format->nSamplesPerSec = sample_rate; + format->nBlockAlign = channels * depth / 8; + format->nAvgBytesPerSec = sample_rate * channels * depth / 8; + format->cbSize = 0; +} + +static void test_media_types(const GUID *clsid) +{ + WAVEFORMATEX wfx; + DMO_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = MEDIASUBTYPE_PCM, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(wfx), + .pbFormat = (BYTE *)&wfx, + }; + IMediaObject *dmo; + unsigned int i, j; + WORD channels; + HRESULT hr; + ULONG ref; + + static const DWORD sample_rates[] = {8000, 11025, 22050, 44100, 48000, 96000}; + static const struct + { + WORD format; + WORD depth; + } + depths[] = + { + {WAVE_FORMAT_PCM, 8}, + {WAVE_FORMAT_PCM, 16}, + {WAVE_FORMAT_IEEE_FLOAT, 32}, + }; + + 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; + + build_pcm_format(&wfx, WAVE_FORMAT_PCM, 16, 44100, 2); + + 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); + 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); + 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); + 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); + mt.subtype = MEDIASUBTYPE_IEEE_FLOAT; + hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); + todo_wine 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); + 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); + 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); + mt.formattype = FORMAT_WaveFormatEx; + + for (i = 0; i < ARRAY_SIZE(sample_rates); ++i) + { + for (j = 0; j < ARRAY_SIZE(depths); ++j) + { + /* Waves reverberation is documented as not supporting 8-bit PCM. */ + if (IsEqualGUID(clsid, &GUID_DSFX_WAVES_REVERB) && depths[j].depth == 8) + continue; + + for (channels = 1; channels <= 2; ++channels) + { + 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", + hr, sample_rates[i], channels, depths[j].format, depths[j].depth); + + /* The output type must match the input type. */ + + 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", + 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", + 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", + 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", + 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", + 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", + 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", + hr, sample_rates[i], channels, depths[j].format, depths[j].depth); + } + } + } + + ref = IMediaObject_Release(dmo); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_chorus_parameters(void) { IDirectSoundFXChorus *chorus; @@ -394,6 +529,7 @@ START_TEST(dsdmo) { test_aggregation(tests[i].clsid); test_interfaces(tests[i].clsid, tests[i].iid); + test_media_types(tests[i].clsid); } test_chorus_parameters();

1 0

Brendan Shanks : winevulkan: Update Vulkan XML URL to use raw.githubusercontent.com.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 6299969a60b2bda85e69a3569c5d4970d47b3cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6299969a60b2bda85e69a356… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jul 23 15:19:13 2020 -0700 winevulkan: Update Vulkan XML URL to use raw.githubusercontent.com. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index dd86016117..71b56fcf54 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3115,7 +3115,7 @@ def set_working_directory(): os.chdir(path) def download_vk_xml(filename): - url = "https://raw.github.com/KhronosGroup/Vulkan-Docs/v{0}/xml/vk.xml".format(VK_XML_VERSION) + url = "https://raw.githubusercontent.com/KhronosGroup/Vulkan-Docs/v{0}/xml/vk.xml".format(VK_XML_VERSION) if not os.path.isfile(filename): urllib.request.urlretrieve(url, filename)

1 0

Joshua Ashton : winevulkan: Implement VK_EXT_calibrated_timestamps.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 8bd62231c3ab222c07063cb340e26c3c76ff4229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd62231c3ab222c07063cb3… Author: Joshua Ashton <joshua(a)froggi.es> Date: Sun Jul 19 08:35:44 2020 +0100 winevulkan: Implement VK_EXT_calibrated_timestamps. Map performance counter to the appropriate monotonic clock used by ntdll/unix/sync.c The performance counter timestamp clock won't be available under Mac and platforms without clock_gettime. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan.c | 146 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 3 + dlls/winevulkan/vulkan_thunks.h | 6 ++ include/wine/vulkan.h | 23 +++++++ 5 files changed, 182 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bd62231c3ab222c0706…

1 0

Francois Gouget : winex11.drv: Fix the spelling of a comment.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 0d42388095e4fd5c7702a61824b01ce0f9fc4d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d42388095e4fd5c7702a618… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 24 15:53:20 2020 +0200 winex11.drv: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1c6b666227..e401589136 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -672,7 +672,7 @@ struct x11drv_settings_handler /* get_id() will be called to map a device name, e.g., \\.\DISPLAY1 to a driver specific id. * Following functions use this id to identify the device. * - * Return FALSE if the device can not be found and TRUE on success */ + * Return FALSE if the device cannot be found and TRUE on success */ BOOL (*get_id)(const WCHAR *device_name, ULONG_PTR *id); /* get_modes() will be called to get a list of supported modes of the device of id in modes

1 0