June 2021 - Wine-Devel - list.winehq.org

[PATCH v2 1/3] mmdevapi: Make MMDevEnumerator a static variable.
by Rémi Bernon June 3, 2021

June 3, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mmdevapi/devenum.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index fc33cac17ec..a5863af2705 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -56,10 +56,9 @@ typedef struct MMDevPropStoreImpl typedef struct MMDevEnumImpl { IMMDeviceEnumerator IMMDeviceEnumerator_iface; - LONG ref; + BOOL initialized; } MMDevEnumImpl; -static MMDevEnumImpl *MMDevEnumerator; static MMDevice **MMDevice_head; static MMDevice *MMDevice_def_rec, *MMDevice_def_play; static DWORD MMDevice_count; @@ -69,6 +68,7 @@ static const IMMDeviceVtbl MMDeviceVtbl; static const IPropertyStoreVtbl MMDevPropVtbl; static const IMMEndpointVtbl MMEndpointVtbl; +static MMDevEnumImpl enumerator; static IMMDevice info_device; typedef struct MMDevColImpl @@ -860,23 +860,15 @@ static const IMMDeviceCollectionVtbl MMDevColVtbl = HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { - MMDevEnumImpl *This = MMDevEnumerator; - - if (!This) + if (!enumerator.initialized) { - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - *ppv = NULL; - if (!This) - return E_OUTOFMEMORY; - This->ref = 1; - This->IMMDeviceEnumerator_iface.lpVtbl = &MMDevEnumVtbl; - MMDevEnumerator = This; - + enumerator.initialized = TRUE; load_devices_from_reg(); load_driver_devices(eRender); load_driver_devices(eCapture); } - return IMMDeviceEnumerator_QueryInterface(&This->IMMDeviceEnumerator_iface, riid, ppv); + + return IMMDeviceEnumerator_QueryInterface(&enumerator.IMMDeviceEnumerator_iface, riid, ppv); } void MMDevEnum_Free(void) @@ -886,8 +878,6 @@ void MMDevEnum_Free(void) RegCloseKey(key_render); RegCloseKey(key_capture); key_render = key_capture = NULL; - HeapFree(GetProcessHeap(), 0, MMDevEnumerator); - MMDevEnumerator = NULL; } static HRESULT WINAPI MMDevEnum_QueryInterface(IMMDeviceEnumerator *iface, REFIID riid, void **ppv) @@ -910,20 +900,12 @@ static HRESULT WINAPI MMDevEnum_QueryInterface(IMMDeviceEnumerator *iface, REFII static ULONG WINAPI MMDevEnum_AddRef(IMMDeviceEnumerator *iface) { - MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); - LONG ref = InterlockedIncrement(&This->ref); - TRACE("Refcount now %i\n", ref); - return ref; + return 2; } static ULONG WINAPI MMDevEnum_Release(IMMDeviceEnumerator *iface) { - MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); - LONG ref = InterlockedDecrement(&This->ref); - if (!ref) - MMDevEnum_Free(); - TRACE("Refcount now %i\n", ref); - return ref; + return 1; } static HRESULT WINAPI MMDevEnum_EnumAudioEndpoints(IMMDeviceEnumerator *iface, EDataFlow flow, DWORD mask, IMMDeviceCollection **devices) @@ -1287,6 +1269,12 @@ static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl = MMDevEnum_UnregisterEndpointNotificationCallback }; +static MMDevEnumImpl enumerator = +{ + {&MMDevEnumVtbl}, + FALSE, +}; + static HRESULT MMDevPropStore_Create(MMDevice *parent, DWORD access, IPropertyStore **ppv) { MMDevPropStore *This; -- 2.31.0

2 6

[PATCH 8/8] msvcrt: Import log1pf implementation from musl.
by Piotr Caban June 3, 2021

June 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 66 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 13 --------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 63 insertions(+), 18 deletions(-)

1 0

[PATCH 7/8] msvcrt: Import log1p implementation from musl.
by Piotr Caban June 3, 2021

June 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 70 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 13 -------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 67 insertions(+), 18 deletions(-)

1 0

[PATCH 6/8] msvcrt: Import logf implementation from musl.
by Piotr Caban June 3, 2021

June 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 78 ++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 ----- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 74 insertions(+), 14 deletions(-)

1 0

[PATCH 5/8] msvcrt: Import log implementation from musl.
by Piotr Caban June 3, 2021

June 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 370 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 - dlls/msvcrt/unixlib.h | 1 - 3 files changed, 366 insertions(+), 14 deletions(-)

1 0

[PATCH 4/8] msvcrt: Import _hypotf implementation from musl.
by Piotr Caban June 3, 2021

June 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 33 +++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 12 deletions(-)

1 0

[PATCH 3/8] msvcrt: Import _hypot implementation from musl.
by Piotr Caban June 3, 2021

June 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 58 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 ------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 56 insertions(+), 12 deletions(-)

1 0

[PATCH 2/8] msvcrt: Import frexpf implementation from musl.
by Piotr Caban June 3, 2021

June 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 22 ++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 20 insertions(+), 12 deletions(-)

1 0

[PATCH 1/8] msvcrt: Import frexp implementation from musl.
by Piotr Caban June 3, 2021

June 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 22 ++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 20 insertions(+), 12 deletions(-)

1 0

[PATCH] msxml3/tests: Add more tests for saving an XML with assigned encoding in the PI instruction.
by Dmitry Timoshkov June 3, 2021

June 3, 2021

As asked by Nikolay. Just committed patches make these tests pass. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 43 +++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 12482962c4b..e1c37ebaaaf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8529,6 +8529,9 @@ static void test_createProcessingInstruction(void) static const char xml2_wine[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\n<test/>\n"; static const char xml3[] = "<?xml version=\"1.0\" standalone=\"yes\"?>\r\n<test/>\r\n"; static const char xml3_wine[] = "<?xml version=\"1.0\" standalone=\"yes\"?>\n<test/>\n"; + static const WCHAR xml4[] = L"<?xml version=\"1.0\" encoding=\"UTF-16\"?>\r\n<test/>\r\n"; + static const WCHAR xml5[] = L"\xfeff<?xml version=\"1.0\" encoding=\"UTF-16\"?>\r\n<test/>\r\n"; + static const WCHAR xml5_wine[] = L"\xfeff<?xml version=\"1.0\" encoding=\"UTF-16\"?>\n<test/>\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; IXMLDOMNode *node, *item; @@ -8542,7 +8545,7 @@ static void test_createProcessingInstruction(void) LARGE_INTEGER off; VARIANT_BOOL b; HGLOBAL global; - char *p; + void *p; doc = create_document(&IID_IXMLDOMDocument); @@ -8668,6 +8671,44 @@ todo_wine IStream_Release(stream); IXMLDOMDocument_Release(doc); + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"UTF-16\""), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("test"), &element); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode *)element, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_xml(doc, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!wcscmp(xml, xml4), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &global); + ok(hr == S_OK, "got 0x%08x\n", hr); + p = GlobalLock(global); + ok(!memcmp(p, xml5, sizeof(xml5) - sizeof(WCHAR)) || !memcmp(p, xml5_wine, sizeof(xml5_wine) - sizeof(WCHAR)), "got %s\n", wine_dbgstr_w(p)); + GlobalUnlock(global); + + IStream_Release(stream); + IXMLDOMElement_Release(element); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); + IXMLDOMDocument_Release(doc); } static void test_put_nodeTypedValue(void) -- 2.31.1

3 3