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

Rémi Bernon : mmdevapi: Make MMDevEnumerator a static variable.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 4caea555afdeb13d303d8bc126df55333ec2941a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4caea555afdeb13d303d8bc1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 3 18:15:29 2021 +0200 mmdevapi: Make MMDevEnumerator a static variable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index fc33cac17ec..38ae5f8962d 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -59,7 +59,6 @@ typedef struct MMDevEnumImpl LONG ref; } 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.ref == 0) { - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - *ppv = NULL; - if (!This) - return E_OUTOFMEMORY; - This->ref = 1; - This->IMMDeviceEnumerator_iface.lpVtbl = &MMDevEnumVtbl; - MMDevEnumerator = This; - + enumerator.ref = 1; 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) @@ -920,8 +910,6 @@ 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; } @@ -1287,6 +1275,12 @@ static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl = MMDevEnum_UnregisterEndpointNotificationCallback }; +static MMDevEnumImpl enumerator = +{ + {&MMDevEnumVtbl}, + 0, +}; + static HRESULT MMDevPropStore_Create(MMDevice *parent, DWORD access, IPropertyStore **ppv) { MMDevPropStore *This;

1 0

Rémi Bernon : hidclass.sys: Factor HIDP_BUTTON_CAPS with HIDP_VALUE_CAPS.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: dc7547a84b9d9f32010d94853b47059111425bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc7547a84b9d9f32010d9485… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:30:35 2021 +0200 hidclass.sys: Factor HIDP_BUTTON_CAPS with HIDP_VALUE_CAPS. Buttons are really just values with BitSize == 1, and having a union for that makes the code more complicated than it needs. We'll simplify the code a lot using HIDP_VALUE_CAPS everywhere, as the two structure types are compatible. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 66 ++++++++-------- dlls/hidclass.sys/descriptor.c | 176 ++++++++++++++++++++--------------------- dlls/user32/rawinput.c | 2 + include/wine/hid.h | 43 +++++++++- 4 files changed, 162 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc7547a84b9d9f32010d…

1 0

Haoyang Chen : rsaenh: Fix a typo in a comment.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 0a076524201c28cc0085f5d1a611dbe567525966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a076524201c28cc0085f5d1… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Fri Jun 4 16:55:55 2021 +0800 rsaenh: Fix a typo in a comment. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 705419526fe..a4deb80b0e1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2695,7 +2695,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, pbData[*pdwDataLen-1] <= *pdwDataLen) { BOOL padOkay = TRUE; - /* check that every bad byte has the same value */ + /* check that every pad byte has the same value */ for (i = 1; padOkay && i < pbData[*pdwDataLen-1]; i++) if (pbData[*pdwDataLen - i - 1] != pbData[*pdwDataLen - 1]) padOkay = FALSE;

1 0

Rémi Bernon : hidclass.sys: Use msvcrt allocation functions.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 1c5e57fc7503fcacd4f95c89c7da774a6090eba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5e57fc7503fcacd4f95c89… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:30:31 2021 +0200 hidclass.sys: Use msvcrt allocation functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 23 ++++++++++++----------- dlls/hidclass.sys/descriptor.c | 18 +++++++++--------- dlls/hidclass.sys/device.c | 23 ++++++++++++----------- dlls/hidclass.sys/pnp.c | 13 +++++++------ 4 files changed, 40 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5e57fc7503fcacd4f9…

1 0

Rémi Bernon : hidclass.sys: Use nameless unions.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 975e33c7e756dd052a5b6948dc0ef6b1abd34d9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=975e33c7e756dd052a5b6948… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:30:32 2021 +0200 hidclass.sys: Use nameless unions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 1 - dlls/hidclass.sys/descriptor.c | 123 ++++++++++++++++++++--------------------- dlls/hidclass.sys/device.c | 80 +++++++++++++-------------- dlls/hidclass.sys/pnp.c | 25 ++++----- 4 files changed, 112 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=975e33c7e756dd052a5b…

1 0

Rémi Bernon : hid: Use nameless unions.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 9f193d5d41cf19434c9e6c4da32d1be2c73d02b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f193d5d41cf19434c9e6c4d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:30:33 2021 +0200 hid: Use nameless unions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index c4d162695a9..131a02af4eb 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -21,7 +21,6 @@ #include <stdarg.h> -#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -275,14 +274,14 @@ static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT value->UsagePage != UsagePage) continue; - if (value->IsRange && value->u.Range.UsageMin <= Usage && Usage <= value->u.Range.UsageMax) + if (value->IsRange && value->Range.UsageMin <= Usage && Usage <= value->Range.UsageMax) { *element = elems[report->elementIdx + i]; - element->valueStartBit += value->BitSize * (Usage - value->u.Range.UsageMin); + element->valueStartBit += value->BitSize * (Usage - value->Range.UsageMin); element->bitCount = elems[report->elementIdx + i].ElementType == ValueElement ? value->BitSize: 1; return HIDP_STATUS_SUCCESS; } - else if (value->u.NotRange.Usage == Usage) + else if (value->NotRange.Usage == Usage) { *element = elems[report->elementIdx + i]; element->bitCount = elems[report->elementIdx + i].ElementType == ValueElement ? value->BitSize : 1; @@ -453,7 +452,7 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH { if (uCount == *UsageLength) return HIDP_STATUS_BUFFER_TOO_SMALL; - UsageList[uCount] = element->caps.button.u.Range.UsageMin + k; + UsageList[uCount] = element->caps.button.Range.UsageMin + k; uCount++; } } @@ -612,8 +611,8 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag (UsagePage == 0 || elems[report[i].elementIdx + j].caps.button.UsagePage == UsagePage)) { if (elems[report[i].elementIdx + j].caps.button.IsRange) - count += (elems[report[i].elementIdx + j].caps.button.u.Range.UsageMax - - elems[report[i].elementIdx + j].caps.button.u.Range.UsageMin) + 1; + count += (elems[report[i].elementIdx + j].caps.button.Range.UsageMax - + elems[report[i].elementIdx + j].caps.button.Range.UsageMin) + 1; else count++; } @@ -740,10 +739,10 @@ NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, (LinkCollection == 0 || LinkCollection == elems[report[j].elementIdx + i].caps.button.LinkCollection) && (Usage == 0 || ( (!elems[report[j].elementIdx + i].caps.button.IsRange && - Usage == elems[report[j].elementIdx + i].caps.button.u.NotRange.Usage)) || + Usage == elems[report[j].elementIdx + i].caps.button.NotRange.Usage)) || (elems[report[j].elementIdx + i].caps.button.IsRange && - Usage >= elems[report[j].elementIdx + i].caps.button.u.Range.UsageMin && - Usage <= elems[report[j].elementIdx + i].caps.button.u.Range.UsageMax))) + Usage >= elems[report[j].elementIdx + i].caps.button.Range.UsageMin && + Usage <= elems[report[j].elementIdx + i].caps.button.Range.UsageMax))) { ButtonCaps[u++] = elems[report[j].elementIdx + i].caps.button; } @@ -808,7 +807,7 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, if (elems[report[j].elementIdx + i].ElementType == ValueElement && (UsagePage == 0 || UsagePage == elems[report[j].elementIdx + i].caps.value.UsagePage) && (LinkCollection == 0 || LinkCollection == elems[report[j].elementIdx + i].caps.value.LinkCollection) && - (Usage == 0 || Usage == elems[report[j].elementIdx + i].caps.value.u.NotRange.Usage)) + (Usage == 0 || Usage == elems[report[j].elementIdx + i].caps.value.NotRange.Usage)) { ValueCaps[u++] = elems[report[j].elementIdx + i].caps.value; } @@ -877,7 +876,7 @@ NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollect { if (uCount < *UsageLength) { - ButtonList[uCount].Usage = element->caps.button.u.Range.UsageMin + k; + ButtonList[uCount].Usage = element->caps.button.Range.UsageMin + k; ButtonList[uCount].UsagePage = element->caps.button.UsagePage; } uCount++; @@ -960,8 +959,8 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U { if (uCount < *DataLength) { - DataList[uCount].DataIndex = element->caps.button.u.Range.DataIndexMin + k; - DataList[uCount].u.On = v; + DataList[uCount].DataIndex = element->caps.button.Range.DataIndexMin + k; + DataList[uCount].On = v; } uCount++; } @@ -976,8 +975,8 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U element->valueStartBit, element->bitCount, &v); if (rc != HIDP_STATUS_SUCCESS) return rc; - DataList[uCount].DataIndex = element->caps.value.u.NotRange.DataIndex; - DataList[uCount].u.RawValue = v; + DataList[uCount].DataIndex = element->caps.value.NotRange.DataIndex; + DataList[uCount].RawValue = v; } uCount++; }

1 0

Damjan Jovanovic : msxml3/tests: Add some regex tests.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: b5f3b8d07f0d0796e6a4d96addd3ee817ed4c41a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f3b8d07f0d0796e6a4d96a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 3 19:03:20 2021 +0200 msxml3/tests: Add some regex tests. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 154 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index d1622ffc7da..b66be76c159 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1012,6 +1012,159 @@ static void test_collection_content(void) free_bstrs(); } +static HRESULT validate_regex_document(IXMLDOMDocument2 *doc, IXMLDOMDocument2 *schema, IXMLDOMSchemaCollection* cache, + const WCHAR *regex, const WCHAR *input) +{ + static const WCHAR regex_doc[] = +L"" +"<?xml version='1.0'?>" +"<root xmlns='urn:test'>%s</root>"; + + static const WCHAR regex_schema[] = +L"<?xml version='1.0'?>" +"<schema xmlns='http://www.w3.org/2001/XMLSchema'" +" targetNamespace='urn:test'>" +" <element name='root'>" +" <simpleType>" +" <restriction base='string'>" +" <pattern value='%s'/>" +" </restriction>" +" </simpleType>" +" </element>" +"</schema>"; + + WCHAR buffer[1024]; + IXMLDOMParseError* err; + VARIANT v; + VARIANT_BOOL b; + BSTR namespace; + BSTR bstr; + HRESULT hr; + + VariantInit(&v); + + swprintf(buffer, ARRAY_SIZE(buffer), regex_doc, input); + bstr = SysAllocString(buffer); + ole_check(IXMLDOMDocument2_loadXML(doc, bstr, &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + SysFreeString(bstr); + + swprintf(buffer, ARRAY_SIZE(buffer), regex_schema, regex); + bstr = SysAllocString(buffer); + ole_check(IXMLDOMDocument2_loadXML(schema, bstr, &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + SysFreeString(bstr); + + /* add the schema to the cache */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + ole_check(IXMLDOMDocument2_QueryInterface(schema, &IID_IDispatch, (void**)&V_DISPATCH(&v))); + ok(V_DISPATCH(&v) != NULL, "failed to get IDispatch interface\n"); + namespace = alloc_str_from_narrow("urn:test"); + hr = IXMLDOMSchemaCollection_add(cache, namespace, v); + SysFreeString(namespace); + VariantClear(&v); + if (FAILED(hr)) + return hr; + + /* associate the cache to the doc */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + ole_check(IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IDispatch, (void**)&V_DISPATCH(&v))); + ok(V_DISPATCH(&v) != NULL, "failed to get IDispatch interface\n"); + ole_check(IXMLDOMDocument2_putref_schemas(doc, v)); + VariantClear(&v); + + /* validate the doc + * only declared elements in the declared order + * this is fine */ + err = NULL; + bstr = NULL; + hr = IXMLDOMDocument2_validate(doc, &err); + ok(err != NULL, "domdoc_validate() should always set err\n"); + if (IXMLDOMParseError_get_reason(err, &bstr) != S_FALSE) + trace("got error: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + IXMLDOMParseError_Release(err); + + return hr; +} + +static void test_regex(void) +{ + struct regex_test { + const WCHAR *regex; + const WCHAR *input; + BOOL todo; + }; + + struct regex_test tests[] = { + { L"\\!", L"!", TRUE }, + { L"\\\"", L"\"", TRUE }, + { L"\\#", L"#", TRUE }, + { L"\\$", L"$", TRUE }, + { L"\\%", L"%", TRUE }, + { L"\\,", L",", TRUE }, + { L"\\/", L"/", TRUE }, + { L"\\:", L":", TRUE }, + { L"\\;", L";", TRUE }, + { L"\\=", L"=", TRUE }, + { L"\\>", L">", TRUE }, + { L"\\@", L"@", TRUE }, + { L"\\`", L"`", TRUE }, + { L"\\~", L"~", TRUE }, + { L"\\uCAFE", L"\xCAFE", TRUE }, + /* non-BMP character in surrogate pairs: */ + { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE } + }; + + int i; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + IXMLDOMDocument2 *doc40, *doc60; + IXMLDOMDocument2 *schema40, *schema60; + IXMLDOMSchemaCollection *cache40, *cache60; + + doc40 = create_document_version(40, &IID_IXMLDOMDocument2); + doc60 = create_document_version(60, &IID_IXMLDOMDocument2); + schema40 = create_document_version(40, &IID_IXMLDOMDocument2); + schema60 = create_document_version(60, &IID_IXMLDOMDocument2); + cache40 = create_cache_version(40, &IID_IXMLDOMSchemaCollection); + cache60 = create_cache_version(60, &IID_IXMLDOMSchemaCollection); + + if (doc60 && schema60 && cache60) + { + HRESULT hr = validate_regex_document(doc60, schema60, cache60, tests[i].regex, tests[i].input); + todo_wine_if(tests[i].todo) + ok(hr == S_OK, "got 0x%08x for version 60 regex %s input %s\n", + hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); + if (doc40 && schema40 && cache40) + { + hr = validate_regex_document(doc40, schema40, cache40, tests[i].regex, tests[i].input); + todo_wine_if(tests[i].todo) + ok(hr == S_OK, "got 0x%08x for version 40 regex %s input %s\n", + hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); + } + } + else + ok(0, "out of memory\n"); + + if (doc40) + IXMLDOMDocument2_Release(doc40); + if (doc60) + IXMLDOMDocument2_Release(doc60); + if (schema40) + IXMLDOMDocument2_Release(schema40); + if (schema60) + IXMLDOMDocument2_Release(schema60); + if (cache40) + IXMLDOMSchemaCollection_Release(cache40); + if (cache60) + IXMLDOMSchemaCollection_Release(cache60); + } +} + static void test_XDR_schemas(void) { IXMLDOMDocument2 *doc, *schema; @@ -1669,6 +1822,7 @@ START_TEST(schema) test_collection_refs(); test_length(); test_collection_content(); + test_regex(); test_XDR_schemas(); test_XDR_datatypes(); test_validate_on_load();

1 0

Robin Ebert : ntdll: Fix a file descriptor leak.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: b94fe5942291c93b23f2bf06ea7dc99f38cee411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b94fe5942291c93b23f2bf06… Author: Robin Ebert <ebertrobin2002(a)gmail.com> Date: Thu Jun 3 23:09:32 2021 +0200 ntdll: Fix a file descriptor leak. Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c10a48b3008..e5f4862bf3c 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1255,7 +1255,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (in_size < sizeof(*params)) { - return STATUS_BUFFER_TOO_SMALL; + status = STATUS_BUFFER_TOO_SMALL; break; }

1 0

Nikolay Sivov : winegstreamer: Fix assert condition.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 0393a0e2b58ff65274926572becadfdf49e7a817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0393a0e2b58ff65274926572… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 4 09:18:16 2021 +0300 winegstreamer: Fix assert condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e153c8e9161..d3d156fc9cb 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -832,7 +832,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) type_count = 1; } - assert(type_count < ARRAY_SIZE(stream_types)); + assert(type_count <= ARRAY_SIZE(stream_types)); if (!type_count) {

1 0

Giovanni Mascellani : winegstreamer: Improve reported supported rates values for the media source.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 8a506ea9b2c44f9043048f8756848772bc75a598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a506ea9b2c44f9043048f87… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 4 10:27:39 2021 +0300 winegstreamer: Improve reported supported rates values for the media source. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 61 +++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/media_source.c | 17 +++++------ 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ae9bd60c6df..7f049aa90bb 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -655,12 +655,15 @@ static void test_source_resolver(void) IMFStreamDescriptor *sd; IUnknown *cancel_cookie; IMFByteStream *stream; + IMFGetService *get_service; + IMFRateSupport *rate_support; WCHAR pathW[MAX_PATH]; int i, sample_count; WCHAR *filename; PROPVARIANT var; HRESULT hr; GUID guid; + float rate; if (!pMFCreateSourceResolver) { @@ -766,6 +769,62 @@ static void test_source_resolver(void) check_interface(mediasource, &IID_IMFGetService, TRUE); check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + + hr = IMFMediaSource_QueryInterface(mediasource, &IID_IMFGetService, (void**)&get_service); + ok(hr == S_OK, "Failed to get service interface, hr %#x.\n", hr); + + hr = IMFGetService_GetService(get_service, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void**)&rate_support); + ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -1.0f, "Unexpected rate %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1e6f + 1.0f, &rate); + ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr); + ok(rate == 1e6f + 1.0f || broken(rate == 1e6f) /* Win7 */, "Unexpected %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f - 1.0f, &rate); + ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr); + ok(rate == -1e6f - 1.0f || broken(rate == -1e6f) /* Win7 */, "Unexpected rate %f.\n", rate); + check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); @@ -879,6 +938,8 @@ todo_wine hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFRateSupport_Release(rate_support); + IMFGetService_Release(get_service); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index d3d156fc9cb..3c87bbb2146 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -933,7 +933,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = 0.0f; return S_OK; } @@ -942,21 +942,20 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = direction == MFRATE_FORWARD ? 1e6f : -1e6f; return S_OK; } -static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) +static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *nearest_rate) { - const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_rate); - TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); + if (nearest_rate) + *nearest_rate = rate; - if (nearest_support_rate) - *nearest_support_rate = supported_rate; - - return rate == supported_rate ? S_OK : MF_E_UNSUPPORTED_RATE; + return rate >= -1e6f && rate <= 1e6f ? S_OK : MF_E_UNSUPPORTED_RATE; } static const IMFRateSupportVtbl media_source_rate_support_vtbl =

1 0