- Wine-Devel - list.winehq.org

[PATCH 2/6] include: Add D2D1_SUBPROPERTY enumeration in d2d1_1.idl.
by Biswapriyo Nath Nov. 12, 2020

Nov. 12, 2020

2 1

[PATCH 1/6] include: Add D2D1_PROPERTY enumeration in d2d1_1.idl.
by Biswapriyo Nath Nov. 12, 2020

Nov. 12, 2020

2 1

[PATCH 3/5] server: Support unbound console output device.
by Jacek Caban Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 1 - dlls/kernelbase/console.c | 3 +- server/console.c | 69 +++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-)

2 1

[PATCH 1/5] conhost/tests: Silence debug output in child process if std output is a console.
by Jacek Caban Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH 5/5] kernelbase: Remove no longer needed console handle handling from create_process_params.
by Jacek Caban Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/process.c | 14 -------------- 1 file changed, 14 deletions(-)

1 0

[PATCH 2/5] server: Support unbound console input device.
by Jacek Caban Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 3 +- server/console.c | 68 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-)

1 0

[PATCH] include: Add more D3D12_RESOURCE_STATES enum elements.
by Vinson Lee Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Vinson Lee <vlee(a)freedesktop.org> --- include/vkd3d_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 88ecba5..2db413d 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -504,6 +504,12 @@ typedef enum D3D12_RESOURCE_STATES D3D12_RESOURCE_STATE_GENERIC_READ = 0x1 | 0x2 | 0x40 | 0x80 | 0x200 | 0x800, D3D12_RESOURCE_STATE_PRESENT = 0x0, D3D12_RESOURCE_STATE_PREDICATION = 0x200, + D3D12_RESOURCE_STATE_VIDEO_DECODE_READ = 0x10000, + D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE = 0x20000, + D3D12_RESOURCE_STATE_VIDEO_PROCESS_READ = 0x40000, + D3D12_RESOURCE_STATE_VIDEO_PROCESS_WRITE = 0x80000, + D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ = 0x200000, + D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE = 0x800000, } D3D12_RESOURCE_STATES; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RESOURCE_STATES);") -- 2.25.1

2 1

[PATCH vkd3d] include: Add DEFINE_ENUM_FLAG_OPERATORS macro for enumerations.
by Biswapriyo Nath Nov. 12, 2020

Nov. 12, 2020

2 1

[PATCH v2 1/2] sapi: Add stub SpStream object.
by Gijs Vermeulen Nov. 12, 2020

Nov. 12, 2020

Needed by Assassin's Creed Valhalla. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/sapi/Makefile.in | 1 + dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 14 ++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/stream.c | 249 ++++++++++++++++++++++++++++++++++++ dlls/sapi/tests/Makefile.in | 1 + dlls/sapi/tests/stream.c | 69 ++++++++++ include/sapi.idl | 14 ++ 8 files changed, 352 insertions(+) create mode 100644 dlls/sapi/stream.c create mode 100644 dlls/sapi/tests/stream.c diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index 464a174caa0..f695bd47b12 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -6,6 +6,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ automation.c \ main.c \ + stream.c \ token.c \ tts.c diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index 9c644001faa..cbe097f22ad 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -107,6 +107,7 @@ static const struct IClassFactoryVtbl class_factory_vtbl = static struct class_factory data_key_cf = { { &class_factory_vtbl }, data_key_create }; static struct class_factory file_stream_cf = { { &class_factory_vtbl }, file_stream_create }; +static struct class_factory speech_stream_cf = { { &class_factory_vtbl }, speech_stream_create }; static struct class_factory speech_voice_cf = { { &class_factory_vtbl }, speech_voice_create }; static struct class_factory token_category_cf = { { &class_factory_vtbl }, token_category_create }; static struct class_factory token_enum_cf = { { &class_factory_vtbl }, token_enum_create }; @@ -131,6 +132,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) cf = &token_enum_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpObjectToken )) cf = &token_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_SpStream )) + cf = &speech_stream_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpVoice )) cf = &speech_voice_cf.IClassFactory_iface; diff --git a/dlls/sapi/sapi_classes.idl b/dlls/sapi/sapi_classes.idl index 082244e0812..bb580dde18e 100644 --- a/dlls/sapi/sapi_classes.idl +++ b/dlls/sapi/sapi_classes.idl @@ -64,6 +64,20 @@ coclass SpObjectToken [default] interface ISpDataKey; } +[ + uuid(715d9c59-4442-11d2-9605-00c04f8ee628), + helpstring("Speech Stream"), + progid("SAPI.SpStream.1"), + vi_progid("SAPI.SpStream"), + threading(both), + restricted, + hidden +] +coclass SpStream +{ + interface ISpStream; +} + [ uuid(96749377-3391-11d2-9ee3-00c04f797396), helpstring("Speech Voice"), diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 414dea2755a..509bcb0715b 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -22,6 +22,7 @@ HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; +HRESULT speech_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; diff --git a/dlls/sapi/stream.c b/dlls/sapi/stream.c new file mode 100644 index 00000000000..06ba4367b48 --- /dev/null +++ b/dlls/sapi/stream.c @@ -0,0 +1,249 @@ +/* + * Speech API (SAPI) stream implementation. + * + * Copyright 2020 Gijs Vermeulen + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "sapiddk.h" + +#include "wine/debug.h" + +#include "sapi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sapi); + +struct spstream +{ + ISpStream ISpStream_iface; + LONG ref; +}; + +static inline struct spstream *impl_from_ISpStream(ISpStream *iface) +{ + return CONTAINING_RECORD(iface, struct spstream, ISpStream_iface); +} + +static HRESULT WINAPI spstream_QueryInterface(ISpStream *iface, REFIID iid, void **obj) +{ + struct spstream *This = impl_from_ISpStream(iface); + + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(iid), obj); + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_ISpStream)) + *obj = &This->ISpStream_iface; + else + { + *obj = NULL; + FIXME("interface %s not implemented.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG WINAPI spstream_AddRef(ISpStream *iface) +{ + struct spstream *This = impl_from_ISpStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p): ref=%u.\n", iface, ref); + + return ref; +} + +static ULONG WINAPI spstream_Release(ISpStream *iface) +{ + struct spstream *This = impl_from_ISpStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p): ref=%u.\n", iface, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI spstream_Read(ISpStream *iface, void *pv, ULONG cb, ULONG *read) +{ + FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Write(ISpStream *iface, const void *pv, ULONG cb, ULONG *written) +{ + FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Seek(ISpStream *iface, LARGE_INTEGER mode, DWORD origin, ULARGE_INTEGER *position) +{ + FIXME("(%p, %s, %d, %p): stub.\n", iface, wine_dbgstr_longlong(mode.QuadPart), origin, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_SetSize(ISpStream *iface, ULARGE_INTEGER size) +{ + FIXME("(%p, %s): stub.\n", iface, wine_dbgstr_longlong(size.QuadPart)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_CopyTo(ISpStream *iface, IStream *stream, ULARGE_INTEGER cb, + ULARGE_INTEGER *read, ULARGE_INTEGER *written) +{ + FIXME("(%p, %p, %s, %p, %p): stub.\n", iface, stream, wine_dbgstr_longlong(cb.QuadPart), + read, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Commit(ISpStream *iface, DWORD flag) +{ + FIXME("(%p, %d): stub.\n", iface, flag); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Revert(ISpStream *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_LockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) +{ + FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_UnlockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) +{ + FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Stat(ISpStream *iface, STATSTG *statstg, DWORD flag) +{ + FIXME("(%p, %p, %d): stub.\n", iface, statstg, flag); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Clone(ISpStream *iface, IStream **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_GetFormat(ISpStream *iface, GUID *format, WAVEFORMATEX **wave) +{ + FIXME("(%p, %p, %p): stub.\n", iface, format, wave); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_SetBaseStream(ISpStream *iface, IStream *stream, REFGUID format, + const WAVEFORMATEX *wave) +{ + FIXME("(%p, %p, %s, %p): stub.\n", iface, stream, debugstr_guid(format), wave); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_GetBaseStream(ISpStream *iface, IStream **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_BindToFile(ISpStream *iface, LPCWSTR filename, SPFILEMODE mode, + const GUID *format, const WAVEFORMATEX* wave, + ULONGLONG interest) +{ + FIXME("(%p, %s, %d, %s, %p, %s): stub.\n", iface, debugstr_w(filename), mode, debugstr_guid(format), + wave, wine_dbgstr_longlong(interest)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Close(ISpStream *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +const static ISpStreamVtbl spstream_vtbl = +{ + spstream_QueryInterface, + spstream_AddRef, + spstream_Release, + spstream_Read, + spstream_Write, + spstream_Seek, + spstream_SetSize, + spstream_CopyTo, + spstream_Commit, + spstream_Revert, + spstream_LockRegion, + spstream_UnlockRegion, + spstream_Stat, + spstream_Clone, + spstream_GetFormat, + spstream_SetBaseStream, + spstream_GetBaseStream, + spstream_BindToFile, + spstream_Close +}; + +HRESULT speech_stream_create(IUnknown *outer, REFIID iid, void **obj) +{ + struct spstream *This = heap_alloc(sizeof(*This)); + HRESULT hr; + + if (!This) return E_OUTOFMEMORY; + This->ISpStream_iface.lpVtbl = &spstream_vtbl; + This->ref = 1; + + hr = ISpStream_QueryInterface(&This->ISpStream_iface, iid, obj); + + ISpStream_Release(&This->ISpStream_iface); + return hr; +} diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in index d5d97550970..f1de67418dc 100644 --- a/dlls/sapi/tests/Makefile.in +++ b/dlls/sapi/tests/Makefile.in @@ -3,5 +3,6 @@ IMPORTS = ole32 user32 advapi32 C_SRCS = \ automation.c \ + stream.c \ token.c \ tts.c diff --git a/dlls/sapi/tests/stream.c b/dlls/sapi/tests/stream.c new file mode 100644 index 00000000000..f5248ff756d --- /dev/null +++ b/dlls/sapi/tests/stream.c @@ -0,0 +1,69 @@ +/* + * Speech API (SAPI) stream tests. + * + * Copyright 2020 Gijs Vermeulen + * + * 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 "sapiddk.h" +#include "sperror.h" + +#include "wine/test.h" + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); +} + +static void test_interfaces(void) +{ + ISpStream *speech_stream; + IDispatch *dispatch; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SpStream, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpStream, (void **)&speech_stream); + ok(hr == S_OK, "Failed to create ISpStream interface: %#x.\n", hr); + EXPECT_REF(speech_stream, 1); + + hr = CoCreateInstance(&CLSID_SpStream, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to create IUnknown interface: %#x.\n", hr); + EXPECT_REF(unk, 1); + EXPECT_REF(speech_stream, 1); + IUnknown_Release(unk); + + hr = CoCreateInstance(&CLSID_SpStream, NULL, CLSCTX_INPROC_SERVER, + &IID_IDispatch, (void **)&dispatch); + ok(hr == E_NOINTERFACE, "Succeeded to create IDispatch interface: %#x.\n", hr); + ok(!dispatch, "Expected NULL dispatch, got %p.", dispatch); + + ISpStream_Release(speech_stream); +} + +START_TEST(stream) +{ + CoInitialize(NULL); + test_interfaces(); + CoUninitialize(); +} diff --git a/include/sapi.idl b/include/sapi.idl index 0a7a034cace..e71d009428c 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -1086,6 +1086,20 @@ library SpeechLib interface ISpRecognizer; }; + [ + uuid(715d9c59-4442-11d2-9605-00c04f8ee628), + helpstring("Speech Stream"), + progid("SAPI.SpStream.1"), + vi_progid("SAPI.SpStream"), + threading(both), + restricted, + hidden + ] + coclass SpStream + { + interface ISpStream; + }; + [ uuid(96749377-3391-11d2-9ee3-00c04f797396) ] -- 2.29.2

2 3

[PATCH 1/2] dxdiagn: Enumerate DirectSound devices and add some basic properties.
by Gijs Vermeulen Nov. 12, 2020

Nov. 12, 2020

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32613 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/dxdiagn/Makefile.in | 2 +- dlls/dxdiagn/provider.c | 79 ++++++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 106 +++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 1 deletion(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index fa4b611f245..88c99803b06 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxdiagn.dll -IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 +IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 dsound EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 6b6f4e640cc..7515f72002d 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -36,6 +36,7 @@ #include "wine/fil_data.h" #include "psapi.h" #include "wbemcli.h" +#include "dsound.h" #include "wine/debug.h" @@ -1364,11 +1365,73 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) return fill_display_information_fallback(node); } +struct enum_context +{ + IDxDiagContainerImpl_Container *cont; + HRESULT hr; + int index; +}; + +static LPWSTR guid_to_string(LPWSTR lpwstr, REFGUID lpcguid) +{ + wsprintfW(lpwstr, L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", lpcguid->Data1, lpcguid->Data2, + lpcguid->Data3, lpcguid->Data4[0], lpcguid->Data4[1], lpcguid->Data4[2], lpcguid->Data4[3], lpcguid->Data4[4], + lpcguid->Data4[5], lpcguid->Data4[6], lpcguid->Data4[7]); + + return lpwstr; +} + +BOOL CALLBACK dsound_enum(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID context) +{ + struct enum_context *enum_ctx = context; + IDxDiagContainerImpl_Container *device; + WCHAR buffer[256]; + const WCHAR *p, *name; + + /* the default device is enumerated twice, one time without GUID */ + if (!guid) return TRUE; + + swprintf(buffer, ARRAY_SIZE(buffer), L"%u", enum_ctx->index); + device = allocate_information_node(buffer); + if (!device) + { + enum_ctx->hr = E_OUTOFMEMORY; + return FALSE; + } + + add_subcontainer(enum_ctx->cont, device); + + guid_to_string(buffer, guid); + enum_ctx->hr = add_bstr_property(device, L"szGuidDeviceID", buffer); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, szDescription, desc); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, L"szDriverPath", module); + if (FAILED(enum_ctx->hr)) + return FALSE; + + name = module; + if ((p = wcsrchr(name, '\\'))) name = p + 1; + if ((p = wcsrchr(name, '/'))) name = p + 1; + + enum_ctx->hr = add_bstr_property(device, szDriverName, name); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->index++; + return TRUE; +} + static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e','D','e','v','i','c','e','s',0}; + struct enum_context enum_ctx; IDxDiagContainerImpl_Container *cont; cont = allocate_information_node(DxDiag_SoundDevices); @@ -1377,12 +1440,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) add_subcontainer(node, cont); + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; + cont = allocate_information_node(DxDiag_SoundCaptureDevices); if (!cont) return E_OUTOFMEMORY; add_subcontainer(node, cont); + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundCaptureEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; + return S_OK; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index c011ff9cc07..e335cf5b42e 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -922,6 +922,110 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_DxDiag_SoundDevices(void) +{ + static const struct property_test property_tests[] = + { + {L"szDescription", VT_BSTR}, + {L"szGuidDeviceID", VT_BSTR}, + {L"szDriverName", VT_BSTR}, + {L"szDriverPath", VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_DirectSound.DxDiag_SoundDevices", &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, ARRAY_SIZE(child_container)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, ARRAY_SIZE(property_tests)); + + IDxDiagContainer_Release(child); + } + + IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + +static void test_DxDiag_SoundCaptureDevices(void) +{ + static const struct property_test property_tests[] = + { + {L"szDescription", VT_BSTR}, + {L"szGuidDeviceID", VT_BSTR}, + {L"szDriverName", VT_BSTR}, + {L"szDriverPath", VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_DirectSound.DxDiag_SoundCaptureDevices", &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, ARRAY_SIZE(child_container)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, ARRAY_SIZE(property_tests)); + + IDxDiagContainer_Release(child); + } + + IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -936,5 +1040,7 @@ START_TEST(container) test_root_children(); test_DxDiag_SystemInfo(); test_DxDiag_DisplayDevices(); + test_DxDiag_SoundDevices(); + test_DxDiag_SoundCaptureDevices(); CoUninitialize(); } -- 2.29.2

1 1