November 2020 - Wine-Devel - list.winehq.org

[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

[PATCH] xaudio2_9: Add version resource
by Alistair Leslie-Hughes Nov. 12, 2020

Nov. 12, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50101 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xaudio2_9/Makefile.in | 2 ++ dlls/xaudio2_9/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 dlls/xaudio2_9/version.rc diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in index 1a1982781a1..86f7b99e5eb 100644 --- a/dlls/xaudio2_9/Makefile.in +++ b/dlls/xaudio2_9/Makefile.in @@ -14,3 +14,5 @@ C_SRCS = \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/xaudio2_9/version.rc b/dlls/xaudio2_9/version.rc new file mode 100644 index 00000000000..606abad0600 --- /dev/null +++ b/dlls/xaudio2_9/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Alsitair Leslie-Hughes + * + * 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 WINE_FILEDESCRIPTION_STR "Wine xaudio2_9" +#define WINE_FILENAME_STR "xaudio2_9.dll" +#define WINE_FILEVERSION 10,0,19041,1 +#define WINE_FILEVERSION_STR "10.0.19041.1" +#define WINE_PRODUCTVERSION 10,0,19041,1 +#define WINE_PRODUCTVERSION_STR "10.0.19041.1" + +#include "wine/wine_common_ver.rc" -- 2.28.0

2 1

[PATCH] mmdevapi/tests: Only warn about the console when it is used.
by Francois Gouget Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This way the presence of the trace is a sign that the results should maybe not be trusted. dlls/mmdevapi/tests/render.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 3ad00eaa2e2..8c82a1a81fd 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2346,6 +2346,7 @@ static void test_endpointvolume(void) START_TEST(render) { HRESULT hr; + DWORD mode; CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -2371,8 +2372,11 @@ START_TEST(render) test_formats(AUDCLNT_SHAREMODE_SHARED); test_references(); test_marshal(); - trace("Output to a MS-DOS console is particularly slow and disturbs timing.\n"); - trace("Please redirect output to a file.\n"); + if (GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode)) + { + trace("Output to a MS-DOS console is particularly slow and disturbs timing.\n"); + trace("Please redirect output to a file.\n"); + } test_event(); test_padding(); test_clock(1); -- 2.20.1

3 2

[PATCH] mmdevapi/tests: Work around Initialize() render breakage on Win 10.
by Francois Gouget Nov. 12, 2020

Nov. 12, 2020

Calling Initialize() twice causes later Start() operations to report a failure on Windows 10 >= 1607. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/mmdevapi/tests/render.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 8c82a1a81fd..a0aa1b18936 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -337,6 +337,14 @@ static void test_audioclient(void) trace("Initialize(duration=0) GetBufferSize is %u\n", num); } + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); + ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); + + hr = IAudioClient_Start(ac); + ok(hr == S_OK || + broken(hr == AUDCLNT_E_DEVICE_INVALIDATED), /* Win10 >= 1607 */ + "Start on a doubly initialized stream returns %08x\n", hr); + IAudioClient_Release(ac); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, @@ -406,9 +414,6 @@ static void test_audioclient(void) if(t2 == 0) win10 = TRUE; - hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); - hr = IAudioClient_SetEventHandle(ac, NULL); ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); -- 2.20.1

3 3

[PATCH] ws2_32: Read protocol table from a file
by Alex Henrie Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I intend to extend read_protocol_table and parse_next_protocol to read and parse the services file as well, since the file formats are nearly identical. --- dlls/ws2_32/protocols.tsv | 39 +++++++++ dlls/ws2_32/socket.c | 163 ++++++++++++++++++++++++++++++-------- dlls/ws2_32/version.rc | 3 + loader/wine.inf.in | 12 ++- 4 files changed, 181 insertions(+), 36 deletions(-) create mode 100644 dlls/ws2_32/protocols.tsv diff --git a/dlls/ws2_32/protocols.tsv b/dlls/ws2_32/protocols.tsv new file mode 100644 index 00000000000..288bd739f15 --- /dev/null +++ b/dlls/ws2_32/protocols.tsv @@ -0,0 +1,39 @@ +# Table of Internet protocols +# +# Copyright (c) 2020 The Wine Project +# +# 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 + +# Format: <name> <number> [<alias>...] + +ip 0 IP +icmp 1 ICMP +ggp 3 GGP +tcp 6 TCP +egp 8 EGP +pup 12 PUP +udp 17 UDP +hmp 20 HMP +xns-idp 22 XNS-IDP +rdp 27 RDP +ipv6 41 IPv6 +ipv6-route 43 IPv6-Route +ipv6-frag 44 IPv6-Frag +esp 50 ESP +ah 51 AH +ipv6-icmp 58 IPv6-ICMP +ipv6-nonxt 59 IPv6-NoNxt +ipv6-opts 60 IPv6-Opts +rvd 66 RVD diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3efa4ebd64f..81f4a998e50 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -182,6 +182,8 @@ #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) +#define MAX_NAMES 4 + WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -6310,28 +6312,112 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) } -static const struct { int prot; const char *names[3]; } protocols[] = -{ - { 0, { "ip", "IP" }}, - { 1, { "icmp", "ICMP" }}, - { 3, { "ggp", "GGP" }}, - { 6, { "tcp", "TCP" }}, - { 8, { "egp", "EGP" }}, - { 12, { "pup", "PUP" }}, - { 17, { "udp", "UDP" }}, - { 20, { "hmp", "HMP" }}, - { 22, { "xns-idp", "XNS-IDP" }}, - { 27, { "rdp", "RDP" }}, - { 41, { "ipv6", "IPv6" }}, - { 43, { "ipv6-route", "IPv6-Route" }}, - { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 50, { "esp", "ESP" }}, - { 51, { "ah", "AH" }}, - { 58, { "ipv6-icmp", "IPv6-ICMP" }}, - { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, - { 60, { "ipv6-opts", "IPv6-Opts" }}, - { 66, { "rvd", "RVD" }}, -}; +static char * read_protocol_table(void) +{ + static const WCHAR drivers_etc_protocol[] = {'\\','d','r','i','v','e','r','s', + '\\','e','t','c', + '\\','p','r','o','t','o','c','o','l',0}; + WCHAR table_path[MAX_PATH]; + HANDLE table_file; + DWORD table_len, bytes_read; + BOOL ret; + char *table_text; + + GetSystemDirectoryW(table_path, ARRAY_SIZE(table_path)); + lstrcatW(table_path, drivers_etc_protocol); + + table_file = CreateFileW(table_path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (table_file == INVALID_HANDLE_VALUE) + return NULL; + + table_len = GetFileSize(table_file, NULL); + if (!table_len) + { + CloseHandle(table_file); + return NULL; + } + + table_text = HeapAlloc(GetProcessHeap(), 0, table_len + 1); + if (!table_text) + { + CloseHandle(table_file); + return NULL; + } + + ret = ReadFile(table_file, table_text, table_len, &bytes_read, NULL); + if (!ret || bytes_read != table_len) + { + CloseHandle(table_file); + HeapFree(GetProcessHeap(), 0, table_text); + return NULL; + } + + CloseHandle(table_file); + table_text[table_len] = 0; + return table_text; +} + +static char * get_field(char *line) +{ + char *field; + /* ignore sequences of whitespace between fields */ + while ((field = strtok(line, " \t\r"))) + { + if (field[0]) + break; + } + return field; +} + +static char * parse_next_protocol(char *current_line, int *number, char *names[MAX_NAMES]) +{ + char *next_line; + char *comment; + int i; + + while (current_line) + { + next_line = strchr(current_line, '\n'); + if (next_line) + { + next_line[0] = 0; + next_line++; + } + + comment = strchr(current_line, '#'); + if (comment) + *comment = 0; + + names[0] = get_field(current_line); + if (!names[0]) + { + /* this line is empty, all whitespace, or a comment */ + current_line = next_line; + continue; + } + + names[1] = get_field(NULL); + if (!names[1]) + { + /* lines that only have one field are ignored too */ + current_line = next_line; + continue; + } + /* if the second field is not actually a number, it is treated as 0 */ + *number = atoi(names[1]); + + for (i = 1;; i++) + { + names[i] = (i == MAX_NAMES - 1 ? NULL : get_field(NULL)); + if (!names[i]) break; + } + + return next_line; + } + + return NULL; +} /*********************************************************************** * getprotobyname (WS2_32.53) @@ -6339,21 +6425,31 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; + char *table_text = read_protocol_table(); + char *current_line = table_text; + int row_number; + char *row_names[MAX_NAMES]; unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + while ((current_line = parse_next_protocol( current_line, &row_number, row_names ))) { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; + for (i = 0; row_names[i]; i++) + { + if (!_strnicmp( row_names[i], name, -1 )) + { + retval = WS_create_pe( row_names[0], (char **)row_names + 1, row_number ); + goto found; + } + } } if (!retval) { WARN( "protocol %s not found\n", debugstr_a(name) ); SetLastError(WSANO_DATA); } +found: TRACE( "%s ret %p\n", debugstr_a(name), retval ); + if (table_text) HeapFree( GetProcessHeap(), 0, table_text ); return retval; } @@ -6364,13 +6460,15 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; - unsigned int i; + char *table_text = read_protocol_table(); + char *current_line = table_text; + int row_number; + char *row_names[MAX_NAMES]; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + while ((current_line = parse_next_protocol( current_line, &row_number, row_names ))) { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); + if (row_number != number) continue; + retval = WS_create_pe( row_names[0], (char **)row_names + 1, row_number ); break; } if (!retval) @@ -6379,6 +6477,7 @@ struct WS_protoent* WINAPI WS_getprotobynumber(int number) SetLastError(WSANO_DATA); } TRACE("%i ret %p\n", number, retval); + if (table_text) HeapFree( GetProcessHeap(), 0, table_text ); return retval; } diff --git a/dlls/ws2_32/version.rc b/dlls/ws2_32/version.rc index 52dbb1b2c48..a68f9885805 100644 --- a/dlls/ws2_32/version.rc +++ b/dlls/ws2_32/version.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: protocols.tsv */ +1 WINE_DATA_FILE protocols.tsv + #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "ws2_32.dll" #define WINE_FILEVERSION 5,1,2600,5512 diff --git a/loader/wine.inf.in b/loader/wine.inf.in index de62b90fa35..6c6c9ee14e3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -4073,6 +4073,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [ColorFiles] srgb color space profile.icm,"@mscms.dll,-1" +[EtcFiles] +protocol,"@ws2_32.dll,-1" + [InfFiles] winebus.inf,"@winebus.sys,-1" winehid.inf,"@winehid.sys,-1" @@ -4161,6 +4164,7 @@ SortFiles = nls [DestinationDirs] ColorFiles = 23 +EtcFiles = 12,etc InfFiles = 17 NlsFiles = 11 SortFiles = 10,globalization\sorting -- 2.29.2

2 2

[PATCH] ntdll: Avoid overwriting parameters with context in call_user_apc_dispatcher() on x86.
by Paul Gofman Nov. 12, 2020

Nov. 12, 2020

Fixes crash in 32 bit kernel32 file test. The crash is not always reproducible as the issue depends on stack layout. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 4 ++++ dlls/ntdll/unix/signal_i386.c | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 2814ab194b2..1a47910fb52 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5759,6 +5759,7 @@ START_TEST(file) ret = DeleteFileA(filename); ok(ret != 0, "DeleteFile error %u\n", GetLastError()); +if(1){ test__hread( ); test__hwrite( ); test__lclose( ); @@ -5813,7 +5814,9 @@ START_TEST(file) test_GetFinalPathNameByHandleW(); test_SetFileInformationByHandle(); test_GetFileAttributesExW(); +} test_post_completion(); +if(0){ test_overlapped_read(); test_file_readonly_access(); test_find_file_stream(); @@ -5822,3 +5825,4 @@ START_TEST(file) test_hard_link(); test_move_file(); } +} diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 4d8eeb2072c..58b79940773 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1688,15 +1688,18 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movl %esp,%ebx\n\t" "cmpl %esp,%esi\n\t" "cmovbl %esi,%esp\n\t" + "pushl 20(%ebx)\n\t" /* func */ + "pushl 16(%ebx)\n\t" /* arg2 */ + "pushl 12(%ebx)\n\t" /* arg1 */ + "movl 8(%ebx),%ebx\n\t" /* ctx */ "movl $0x00010007,(%esi)\n\t" /* context.ContextFlags = CONTEXT_FULL */ "pushl %esi\n\t" /* context */ "pushl $0xfffffffe\n\t" "call " __ASM_STDCALL("NtGetContextThread",8) "\n\t" "movl $0xc0,0xb0(%esi)\n" /* context.Eax = STATUS_USER_APC */ - "movl 20(%ebx),%eax\n\t" /* func */ - "movl 16(%ebx),%ecx\n\t" /* arg2 */ - "movl 12(%ebx),%edx\n\t" /* arg1 */ - "movl 8(%ebx),%ebx\n\t" /* ctx */ + "popl %edx\n\t" + "popl %ecx\n\t" + "popl %eax\n\t" "leal -20(%esi),%esp\n\t" "movl %eax,16(%esp)\n" /* func */ "2:\tmovl %ecx,12(%esp)\n\t" /* arg2 */ -- 2.28.0

1 0

[PATCH] mfplat/tests: Remove a couple of failing tests.
by Nikolay Sivov Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4f5cf268d2a..c9a01644c6b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -502,15 +502,6 @@ static void test_source_resolver(void) &obj_type, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, - &obj_type, (IUnknown **)&mediasource); - ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); - if (hr == S_OK) IMFMediaSource_Release(mediasource); - - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_BYTESTREAM, NULL, - &obj_type, (IUnknown **)&mediasource); - ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); - IMFByteStream_Release(stream); /* Create from URL. */ -- 2.28.0

1 0

[PATCH 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..aa91b782647 --- /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 ISpeechVoice 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] odbccp32: Map system DSN requests to user DSN requests in SQLConfigDataSource.
by Hans Leidekker Nov. 12, 2020

Nov. 12, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50116 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/odbccp32/odbccp32.c | 54 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index c842872fa6e..0e4a12534c8 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -338,10 +338,40 @@ fail: return FALSE; } +static WORD map_request(WORD request) +{ + switch (request) + { + case ODBC_ADD_DSN: + case ODBC_ADD_SYS_DSN: + return ODBC_ADD_DSN; + + case ODBC_CONFIG_DSN: + case ODBC_CONFIG_SYS_DSN: + return ODBC_CONFIG_DSN; + + case ODBC_REMOVE_DSN: + case ODBC_REMOVE_SYS_DSN: + return ODBC_REMOVE_DSN; + + default: + FIXME("unhandled request %u\n", request); + return 0; + } +} + +static UWORD get_config_mode(WORD request) +{ + if (request == ODBC_ADD_DSN || request == ODBC_CONFIG_DSN || request == ODBC_REMOVE_DSN) return ODBC_USER_DSN; + return ODBC_SYSTEM_DSN; +} + BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) { HMODULE mod; BOOL ret = FALSE; + UWORD config_mode_prev = config_mode; + WORD mapped_request; TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); if (TRACE_ON(odbc)) @@ -353,16 +383,24 @@ BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWST clear_errors(); + mapped_request = map_request(request); + if (!mapped_request) + return FALSE; + mod = load_config_driver(driver); if (!mod) return FALSE; + config_mode = get_config_mode(request); + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); if(pConfigDSNW) - ret = pConfigDSNW(hwnd, request, driver, attributes); + ret = pConfigDSNW(hwnd, mapped_request, driver, attributes); else ERR("Failed to find ConfigDSNW\n"); + config_mode = config_mode_prev; + if (!ret) push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); @@ -376,6 +414,8 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a HMODULE mod; BOOL ret = FALSE; WCHAR *driverW; + UWORD config_mode_prev = config_mode; + WORD mapped_request; TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); @@ -388,6 +428,10 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a clear_errors(); + mapped_request = map_request(request); + if (!mapped_request) + return FALSE; + driverW = heap_strdupAtoW(driver); if (!driverW) { @@ -402,11 +446,13 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a return FALSE; } + config_mode = get_config_mode(request); + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); if (pConfigDSN) { TRACE("Calling ConfigDSN\n"); - ret = pConfigDSN(hwnd, request, driver, attributes); + ret = pConfigDSN(hwnd, mapped_request, driver, attributes); } else { @@ -418,11 +464,13 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a attr = SQLInstall_strdup_multi(attributes); if(attr) - ret = pConfigDSNW(hwnd, request, driverW, attr); + ret = pConfigDSNW(hwnd, mapped_request, driverW, attr); heap_free(attr); } } + config_mode = config_mode_prev; + if (!ret) push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); -- 2.28.0

2 2