October 2019 - Wine-commits

Jeff Smith : crypt32/tests: Tidy up unexpected length failure messages in base64.
by Alexandre Julliard 09 Oct '19

09 Oct '19

Module: wine Branch: master Commit: 6cbedfa65bef2206a6c27c67f53019a3bf175f7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cbedfa65bef2206a6c27c67… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Oct 9 12:53:53 2019 -0500 crypt32/tests: Tidy up unexpected length failure messages in base64. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 4ff76272e3..3668543048 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -121,12 +121,12 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Unexpected required length.\n"); + ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen); strLen2 = strLen - 1; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Unexpected required length.\n"); + ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen); str = heap_alloc(strLen); @@ -137,7 +137,7 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, todo_wine ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n", ret, GetLastError()); - ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen - 1, strLen); + ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2); todo_wine { if (header) ok(str[0] == header[0], "Unexpected buffer contents %#x.\n", str[0]); @@ -147,7 +147,7 @@ todo_wine { strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen); + ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen2); ptr = str; if (header)

1 0

Jeff Smith : crypt32: Fix CryptBinaryToString return value on short base64 buffer.
by Alexandre Julliard 09 Oct '19

09 Oct '19

Module: wine Branch: master Commit: e0708d06019584572cbd7c2fa7871ed8a112b57b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0708d06019584572cbd7c2f… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Oct 9 12:53:54 2019 -0500 crypt32: Fix CryptBinaryToString return value on short base64 buffer. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 4 ++-- dlls/crypt32/tests/base64.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index d158c1aceb..acd05ec1a5 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -240,7 +240,7 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, else { *pcchString = charsNeeded; - SetLastError(ERROR_INSUFFICIENT_BUFFER); + SetLastError(ERROR_MORE_DATA); ret = FALSE; } } @@ -460,7 +460,7 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, else { *pcchString = charsNeeded; - SetLastError(ERROR_INSUFFICIENT_BUFFER); + SetLastError(ERROR_MORE_DATA); ret = FALSE; } } diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 3668543048..f2d16735ab 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -134,7 +134,6 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, strLen2 = strLen - 1; str[0] = 0x12; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2); -todo_wine ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n", ret, GetLastError()); ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2); @@ -207,7 +206,6 @@ static void encode_compare_base64_W(const BYTE *toEncode, DWORD toEncodeLen, DWO strLen2 = strLen - 1; strW[0] = 0x1234; ret = CryptBinaryToStringW(toEncode, toEncodeLen, format, strW, &strLen2); -todo_wine ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringW failed, %d, error %d\n", ret, GetLastError()); if (headerW)

1 0

Jeff Smith : crypt32: Make CryptBinaryToStringA fill short base64 buffer correctly.
by Alexandre Julliard 09 Oct '19

09 Oct '19

Module: wine Branch: master Commit: a9e6f9aa71074f96fda9a2475ef1b9009ceeb652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9e6f9aa71074f96fda9a247… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Oct 9 12:53:55 2019 -0500 crypt32: Make CryptBinaryToStringA fill short base64 buffer correctly. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 105 +++++++++++++++++++++++--------------------- dlls/crypt32/tests/base64.c | 2 - 2 files changed, 56 insertions(+), 51 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index acd05ec1a5..ac60c6efbd 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -93,50 +93,53 @@ static BOOL EncodeBinaryToBinaryA(const BYTE *pbBinary, return ret; } -static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, +static DWORD stradd(LPSTR ptr, LPCSTR end, LPCSTR s, DWORD slen) +{ + if (ptr + slen > end) + slen = end - ptr; + memcpy(ptr, s, slen); + return slen; +} + +static DWORD encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, char* out_buf, DWORD *out_len) { int div, i; const BYTE *d = in_buf; int bytes = (in_len*8 + 5)/6, pad_bytes = (bytes % 4) ? 4 - (bytes % 4) : 0; - DWORD needed; LPSTR ptr; + LPCSTR end; + char chunk[4]; - TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); - needed = bytes + pad_bytes; - needed += (needed / 64 + (needed % 64 ? 1 : 0)) * strlen(sep); - needed++; - - if (needed > *out_len) + if (!out_buf) { - *out_len = needed; - return ERROR_INSUFFICIENT_BUFFER; + TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); + *out_len = bytes + pad_bytes; + *out_len += (*out_len / 64 + (*out_len % 64 ? 1 : 0)) * strlen(sep) + 1; + return 0; } - else - *out_len = needed; /* Three bytes of input give 4 chars of output */ div = in_len / 3; ptr = out_buf; + end = ptr + *out_len; i = 0; - while (div > 0) + while (div > 0 && ptr < end) { if (i && i % 64 == 0) - { - strcpy(ptr, sep); - ptr += strlen(sep); - } + ptr += stradd(ptr, end, sep, strlen(sep)); /* first char is the first 6 bits of the first byte*/ - *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + chunk[0] = b64[ ( d[0] >> 2) & 0x3f ]; /* second char is the last 2 bits of the first byte and the first 4 * bits of the second byte */ - *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + chunk[1] = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; /* third char is the last 4 bits of the second byte and the first 2 * bits of the third byte */ - *ptr++ = b64[ ((d[1] << 2) & 0x3c) | (d[2] >> 6 & 0x03)]; + chunk[2] = b64[ ((d[1] << 2) & 0x3c) | (d[2] >> 6 & 0x03)]; /* fourth char is the remaining 6 bits of the third byte */ - *ptr++ = b64[ d[2] & 0x3f]; + chunk[3] = b64[ d[2] & 0x3f]; + ptr += stradd(ptr, end, chunk, 4); i += 4; d += 3; div--; @@ -146,31 +149,33 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, { case 1: /* first char is the first 6 bits of the first byte*/ - *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + chunk[0] = b64[ ( d[0] >> 2) & 0x3f ]; /* second char is the last 2 bits of the first byte and the first 4 * bits of the second byte */ - *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + chunk[1] = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; /* third char is the last 4 bits of the second byte padded with * two zeroes */ - *ptr++ = b64[ ((d[1] << 2) & 0x3c) ]; + chunk[2] = b64[ ((d[1] << 2) & 0x3c) ]; /* fourth char is a = to indicate one byte of padding */ - *ptr++ = '='; + chunk[3] = '='; + ptr += stradd(ptr, end, chunk, 4); break; case 2: /* first char is the first 6 bits of the first byte*/ - *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + chunk[0] = b64[ ( d[0] >> 2) & 0x3f ]; /* second char is the last 2 bits of the first byte padded with * four zeroes*/ - *ptr++ = b64[ ((d[0] << 4) & 0x30)]; + chunk[1] = b64[ ((d[0] << 4) & 0x30)]; /* third char is = to indicate padding */ - *ptr++ = '='; + chunk[2] = '='; /* fourth char is = to indicate padding */ - *ptr++ = '='; + chunk[3] = '='; + ptr += stradd(ptr, end, chunk, 4); break; } - strcpy(ptr, sep); + ptr += stradd(ptr, end, sep, strlen(sep)); - return ERROR_SUCCESS; + return ptr - out_buf; } static BOOL BinaryToBase64A(const BYTE *pbBinary, @@ -215,26 +220,28 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, if (pszString) { - if (charsNeeded <= *pcchString) + LPSTR ptr = pszString; + DWORD size = *pcchString; + LPSTR end = ptr + size; + + if (header) { - LPSTR ptr = pszString; - DWORD size = charsNeeded; + ptr += stradd(ptr, end, header, strlen(header)); + ptr += stradd(ptr, end, sep, strlen(sep)); + size = end - ptr; + } + ptr += encodeBase64A(pbBinary, cbBinary, sep, ptr, &size); + if (trailer) + { + ptr += stradd(ptr, end, trailer, strlen(trailer)); + ptr += stradd(ptr, end, sep, strlen(sep)); + } - if (header) - { - strcpy(ptr, header); - ptr += strlen(ptr); - strcpy(ptr, sep); - ptr += strlen(sep); - } - encodeBase64A(pbBinary, cbBinary, sep, ptr, &size); - ptr += size - 1; - if (trailer) - { - strcpy(ptr, trailer); - ptr += strlen(ptr); - strcpy(ptr, sep); - } + if (ptr < end) + *ptr = '\0'; + + if (charsNeeded <= *pcchString) + { *pcchString = charsNeeded - 1; } else diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index f2d16735ab..31605fe6b9 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -137,12 +137,10 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n", ret, GetLastError()); ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2); -todo_wine { if (header) ok(str[0] == header[0], "Unexpected buffer contents %#x.\n", str[0]); else ok(str[0] == expected[0], "Unexpected buffer contents %#x.\n", str[0]); -} strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError());

1 0

Sven Baars : kernel32/tests: Skip some tests when NtSetInformationProcess is denied access.
by Alexandre Julliard 09 Oct '19

09 Oct '19

Module: wine Branch: master Commit: 71e96bd3b757a2b058b6a769c341d81f82329d79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71e96bd3b757a2b058b6a769… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Oct 6 14:52:32 2019 +0200 kernel32/tests: Skip some tests when NtSetInformationProcess is denied access. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 9a35bfe290..952c1054c8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2601,7 +2601,8 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) if (old_flags != dep_flags) { ret = NtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &dep_flags, sizeof(dep_flags) ); - if (ret == STATUS_INVALID_INFO_CLASS) /* Windows 2000 */ + if (ret == STATUS_INVALID_INFO_CLASS /* Windows 2000 */ || + ret == STATUS_ACCESS_DENIED) { win_skip( "Skipping DEP tests with ProcessExecuteFlags = %d\n", dep_flags ); return;

1 0

Nikolay Sivov : dwrite: Add a stub for IDWriteTextFormat3.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: 3afa0d6346358f303406179f835c940fff37e4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3afa0d6346358f303406179f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 13:04:33 2019 +0300 dwrite: Add a stub for IDWriteTextFormat3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 228 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 137 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3afa0d6346358f303406…

1 0

Nikolay Sivov : dwrite: Update to IDWriteFontCollection3.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: 3360dfec40815779bc8a6500c80da3d9fe35782d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3360dfec40815779bc8a6500… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 13:04:34 2019 +0300 dwrite: Update to IDWriteFontCollection3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 7 ++- dlls/dwrite/font.c | 147 +++++++++++++++++++++++++++++-------------- dlls/dwrite/main.c | 8 +-- dlls/dwrite/tests/font.c | 15 +++++ include/dwrite_3.idl | 2 +- 5 files changed, 125 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3360dfec40815779bc8a…

1 0

Nikolay Sivov : dwrite: Update to IDWriteFontFamily2.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: 30cf1bef0f5873043fa19e356da12676a6850acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=30cf1bef0f5873043fa19e35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 13:04:35 2019 +0300 dwrite: Update to IDWriteFontFamily2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 206 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 117 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=30cf1bef0f5873043fa1…

1 0

Nikolay Sivov : mf/tests: Use separate session instance for events tests.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: 34c52b946ad7526d20ca0fa79c17740fea1f8869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34c52b946ad7526d20ca0fa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 15:58:54 2019 +0300 mf/tests: Use separate session instance for events tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2a5efc99e8..038bfeacd1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1041,8 +1041,6 @@ todo_wine IMFGetService_Release(gs); - test_session_events(session); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session); @@ -1077,6 +1075,14 @@ todo_wine IMFAttributes_Release(attributes); + /* Basic events behavior. */ + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + + test_session_events(session); + + IMFMediaSession_Release(session); + hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); }

1 0

Nikolay Sivov : mf: Copy preferred types when cloning nodes.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: c1c77f22bc3ccde601134ac1f9375ac3c504bef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c77f22bc3ccde601134ac1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 15:58:55 2019 +0300 mf: Copy preferred types when cloning nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/topology.c | 26 ++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 038bfeacd1..7f9edfe241 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -656,6 +656,71 @@ static void test_topology(void) IMFTopologyNode_Release(node); IMFTopologyNode_Release(node2); + /* Cloning nodes of different types. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_CloneFrom(node, node2); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + IMFTopologyNode_Release(node2); + + /* Cloning preferred types. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetOutputPrefType(node2, 0, mediatype); + ok(hr == S_OK, "Failed to set preferred type, hr %#x.\n", hr); + + /* Vista checks for additional attributes. */ + hr = IMFTopologyNode_CloneFrom(node, node2); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Vista */, "Failed to clone a node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutputPrefType(node, 0, &mediatype2); + ok(hr == S_OK, "Failed to get preferred type, hr %#x.\n", hr); + ok(mediatype == mediatype2, "Unexpected media type.\n"); + + IMFMediaType_Release(mediatype2); + IMFMediaType_Release(mediatype); + + IMFTopologyNode_Release(node2); + + /* Existing preferred types are not cleared. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutputCount(node, &count); + ok(hr == S_OK, "Failed to get output count, hr %#x.\n", hr); + ok(count == 1, "Unexpected output count.\n"); + + hr = IMFTopologyNode_CloneFrom(node, node2); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Vista */, "Failed to clone a node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutputCount(node, &count); + ok(hr == S_OK, "Failed to get output count, hr %#x.\n", hr); + ok(count == 1, "Unexpected output count.\n"); + + hr = IMFTopologyNode_GetOutputPrefType(node, 0, &mediatype2); + ok(hr == S_OK, "Failed to get preferred type, hr %#x.\n", hr); + ok(!!mediatype2, "Unexpected media type.\n"); + IMFMediaType_Release(mediatype2); + + hr = IMFTopologyNode_CloneFrom(node2, node); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Vista */, "Failed to clone a node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutputCount(node2, &count); + ok(hr == S_OK, "Failed to get output count, hr %#x.\n", hr); + ok(count == 1, "Unexpected output count.\n"); + + IMFTopologyNode_Release(node2); + IMFTopologyNode_Release(node); + IMFTopology_Release(topology); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index ad89739d4a..db82816328 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1628,7 +1628,9 @@ static HRESULT WINAPI topology_node_CloneFrom(IMFTopologyNode *iface, IMFTopolog { struct topology_node *node = impl_from_IMFTopologyNode(iface); MF_TOPOLOGY_TYPE node_type; + IMFMediaType *mediatype; IUnknown *object; + DWORD count, i; TOPOID topoid; HRESULT hr; @@ -1656,6 +1658,30 @@ static HRESULT WINAPI topology_node_CloneFrom(IMFTopologyNode *iface, IMFTopolog if (SUCCEEDED(hr)) node->id = topoid; + if (SUCCEEDED(IMFTopologyNode_GetInputCount(src_node, &count))) + { + for (i = 0; i < count; ++i) + { + if (SUCCEEDED(IMFTopologyNode_GetInputPrefType(src_node, i, &mediatype))) + { + IMFTopologyNode_SetInputPrefType(iface, i, mediatype); + IMFMediaType_Release(mediatype); + } + } + } + + if (SUCCEEDED(IMFTopologyNode_GetOutputCount(src_node, &count))) + { + for (i = 0; i < count; ++i) + { + if (SUCCEEDED(IMFTopologyNode_GetOutputPrefType(src_node, i, &mediatype))) + { + IMFTopologyNode_SetOutputPrefType(iface, i, mediatype); + IMFMediaType_Release(mediatype); + } + } + } + LeaveCriticalSection(&node->cs); if (object)

1 0

Nikolay Sivov : mf: Adjust sample grabber sink flags in rateless mode.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: d5b79e6a795811b4316a3df4b8fe811e583f9425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5b79e6a795811b4316a3df4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 15:58:56 2019 +0300 mf: Adjust sample grabber sink flags in rateless mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 2 ++ dlls/mf/tests/mf.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index af9666c86c..c3dc2e1b7f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -862,6 +862,8 @@ static HRESULT WINAPI sample_grabber_sink_GetCharacteristics(IMFMediaSink *iface return MF_E_SHUTDOWN; *flags = MEDIASINK_FIXED_STREAMS; + if (grabber->ignore_clock) + *flags |= MEDIASINK_RATELESS; return S_OK; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7f9edfe241..830bb38259 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2166,6 +2166,32 @@ todo_wine refcount = IMFActivate_Release(activate); ok(!refcount, "Unexpected refcount %u.\n", refcount); + /* Rateless mode with MF_SAMPLEGRABBERSINK_IGNORE_CLOCK. */ + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + + hr = IMFActivate_SetUINT32(activate, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); + ok(flags & MEDIASINK_RATELESS, "Unexpected flags %#x.\n", flags); + + IMFMediaSink_Release(sink); + IMFActivate_Release(activate); + IMFMediaType_Release(media_type); + hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); }

1 0