February 2019 - Wine-Commits

Józef Kucia : tests: Fix domain shader code in test_tessellation_dcl_index_range().
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: vkd3d Branch: master Commit: 98d89c09febf579780248d8589d6674e9a35a6f2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98d89c09febf579780248d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 26 12:28:00 2019 +0100 tests: Fix domain shader code in test_tessellation_dcl_index_range(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 24db7a8..5ae8511 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22815,9 +22815,9 @@ static void test_tessellation_dcl_index_range(void) static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; static const DWORD ds_code[] = { - 0x43425844, 0xeb6b7631, 0x07f5469e, 0xed0cbf4a, 0x7158b3a6, 0x00000001, 0x00000284, 0x00000004, + 0x43425844, 0x4f187d50, 0x6743fe93, 0x10dfbe63, 0xf8cfd202, 0x00000001, 0x00000284, 0x00000004, 0x00000030, 0x00000064, 0x00000128, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, - 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x47534350, 0x000000bc, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000001, 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000001, 0x00000098, 0x00000002, 0x0000000b, 0x00000003, 0x00000002, 0x00000001, 0x00000098,

1 0

Alistair Leslie-Hughes : oleaut32: Correctly get the Grouping separator.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: f784cabd3489b20c13afd80fddbbcf5aa1b656b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f784cabd3489b20c13afd80f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 24 07:00:35 2019 +0000 oleaut32: Correctly get the Grouping separator. LOCALE_SGROUPING allows for 10 characters including the null. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/varformat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 91b3c16..757c4f9 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2284,9 +2284,9 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT if (nGrouping == -2) { - WCHAR grouping[16]; + WCHAR grouping[10]; grouping[2] = '\0'; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, ARRAY_SIZE(grouping)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, ARRAY_SIZE(grouping)); numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0'; } else if (nGrouping == -1) @@ -2460,9 +2460,9 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, if (nGrouping == -2) { - WCHAR grouping[16]; + WCHAR grouping[10]; grouping[2] = '\0'; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, ARRAY_SIZE(grouping)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, ARRAY_SIZE(grouping)); numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0'; } else if (nGrouping == -1)

1 0

Alistair Leslie-Hughes : oleaut32: Correctly get the thousands separator in VarFormatCurrency.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 1a842d18c9980154667d2d00d2ae2153c1ee173e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a842d18c9980154667d2d00… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 24 07:00:34 2019 +0000 oleaut32: Correctly get the thousands separator in VarFormatCurrency. LOCALE_STHOUSAND allows for 4 chracters including the NULL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/varformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index d6ce4a9..91b3c16 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2443,7 +2443,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, if (SUCCEEDED(hRet)) { - WCHAR buff[256], decimal[8], thousands[8], currency[13]; + WCHAR buff[256], decimal[8], thousands[4], currency[13]; CURRENCYFMTW numfmt; if (nDigits < 0) @@ -2482,7 +2482,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, numfmt.lpDecimalSep = decimal; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, ARRAY_SIZE(decimal)); numfmt.lpThousandSep = thousands; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, ARRAY_SIZE(thousands)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousands, ARRAY_SIZE(thousands)); numfmt.lpCurrencySymbol = currency; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, currency, ARRAY_SIZE(currency));

1 0

Ethan Lee : xaudio2: Rewrite to use FAudio.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 3e390b1aafff47df63376a8ca4293c515d74f4ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e390b1aafff47df63376a8c… Author: Ethan Lee <elee(a)codeweavers.com> Date: Wed Feb 20 11:05:25 2019 -0500 xaudio2: Rewrite to use FAudio. Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 149 ++- configure.ac | 24 +- dlls/x3daudio1_0/Makefile.in | 2 + dlls/x3daudio1_1/Makefile.in | 2 + dlls/x3daudio1_2/Makefile.in | 2 + dlls/x3daudio1_3/Makefile.in | 2 + dlls/x3daudio1_4/Makefile.in | 2 + dlls/x3daudio1_5/Makefile.in | 2 + dlls/x3daudio1_6/Makefile.in | 2 + dlls/x3daudio1_7/Makefile.in | 2 + dlls/xapofx1_1/Makefile.in | 6 +- dlls/xapofx1_2/Makefile.in | 6 +- dlls/xapofx1_3/Makefile.in | 6 +- dlls/xapofx1_4/Makefile.in | 6 +- dlls/xapofx1_5/Makefile.in | 6 +- dlls/xaudio2_0/Makefile.in | 6 +- dlls/xaudio2_1/Makefile.in | 6 +- dlls/xaudio2_2/Makefile.in | 6 +- dlls/xaudio2_3/Makefile.in | 6 +- dlls/xaudio2_4/Makefile.in | 6 +- dlls/xaudio2_5/Makefile.in | 6 +- dlls/xaudio2_6/Makefile.in | 6 +- dlls/xaudio2_7/Makefile.in | 5 +- dlls/xaudio2_7/compat.c | 774 +++++------ dlls/xaudio2_7/tests/xaudio2.c | 59 +- dlls/xaudio2_7/x3daudio.c | 36 +- dlls/xaudio2_7/xapo.c | 405 ++++++ dlls/xaudio2_7/xapofx.c | 792 +---------- dlls/xaudio2_7/xaudio_allocator.c | 41 + dlls/xaudio2_7/xaudio_classes.idl | 7 - dlls/xaudio2_7/xaudio_dll.c | 2598 +++++++++++++++---------------------- dlls/xaudio2_7/xaudio_private.h | 174 ++- dlls/xaudio2_8/Makefile.in | 5 +- dlls/xaudio2_9/Makefile.in | 5 +- include/config.h.in | 6 + 35 files changed, 2198 insertions(+), 2970 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e390b1aafff47df6337…

1 0

Nikolay Sivov : mf/tests: Add a basic test creating media session.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: ce557d19624f488faff6c4677e61236910818b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce557d19624f488faff6c467… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 11:33:51 2019 +0300 mf/tests: Add a basic test creating media session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 21d8be8..1503149 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -448,9 +448,31 @@ static void test_MFCreateSequencerSource(void) ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } +static void test_media_session(void) +{ + IMFMediaSession *session; + IUnknown *unk; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); + + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + + hr = IMFMediaSession_QueryInterface(session, &IID_IMFAttributes, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + IMFMediaSession_Release(session); + + hr = MFShutdown(); + ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); +} + START_TEST(mf) { test_topology(); test_MFGetService(); test_MFCreateSequencerSource(); + test_media_session(); }

1 0

Gabriel Ivăncescu : comctl32/listbox: Use is_item_selected in GetSelCount and GetSelItems.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 170f59e57468f39b0a37c7d39374798fdca93d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=170f59e57468f39b0a37c7d3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 25 10:31:00 2019 +0000 comctl32/listbox: Use is_item_selected in GetSelCount and GetSelItems. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 180c09b..2b6702a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1024,13 +1024,12 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) { INT i, count; - const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL) || (descr->style & LBS_NOSEL)) return LB_ERR; - for (i = count = 0; i < descr->nb_items; i++, item++) - if (item->selected) count++; + for (i = count = 0; i < descr->nb_items; i++) + if (is_item_selected(descr, i)) count++; return count; } @@ -1041,11 +1040,10 @@ static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) static LRESULT LISTBOX_GetSelItems( const LB_DESCR *descr, INT max, LPINT array ) { INT i, count; - const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; - for (i = count = 0; (i < descr->nb_items) && (count < max); i++, item++) - if (item->selected) array[count++] = i; + for (i = count = 0; (i < descr->nb_items) && (count < max); i++) + if (is_item_selected(descr, i)) array[count++] = i; return count; }

1 0

Hans Leidekker : mscms: Map BM_KYMCQUADS to TYPE_KYMC_8.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: a48955a86b3b3f519dfc516a0a4b5232be125c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a48955a86b3b3f519dfc516a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 25 09:12:37 2019 +0100 mscms: Map BM_KYMCQUADS to TYPE_KYMC_8. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/transform.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index cada332..d4eb40b 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -48,6 +48,7 @@ static DWORD from_bmformat( BMFORMAT format ) case BM_GRAY: ret = TYPE_GRAY_8; break; case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; + case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; default: if (!quietfixme) {

1 0

Nikolay Sivov : usp10: Use single path for all fonts in ScriptGetCMap().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: df4aaff7a3832c040611e6152b6431ac853371a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df4aaff7a3832c040611e615… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 15:52:48 2019 +0300 usp10: Use single path for all fonts in ScriptGetCMap(). Testing tmPitchAndFamily bitmask does not tell if font has mappings defined. Besides that, GetGlyphIndices() handles bitmap system fonts exactly the same way alternate path did. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46678 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 45 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index abc2605..0a26996 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3544,42 +3544,27 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars hr = S_OK; - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) + for (i = 0; i < cChars; i++) { - for (i = 0; i < cChars; i++) + WCHAR inChar; + if (dwFlags == SGCM_RTL) + inChar = mirror_char(pwcInChars[i]); + else + inChar = pwcInChars[i]; + if (!(pwOutGlyphs[i] = get_cache_glyph(psc, inChar))) { - WCHAR inChar; - if (dwFlags == SGCM_RTL) - inChar = mirror_char(pwcInChars[i]); - else - inChar = pwcInChars[i]; - if (!(pwOutGlyphs[i] = get_cache_glyph(psc, inChar))) + WORD glyph; + if (!hdc) return E_PENDING; + if (GetGlyphIndicesW(hdc, &inChar, 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + if (glyph == 0xffff) { - WORD glyph; - if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &inChar, 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; - if (glyph == 0xffff) - { - hr = S_FALSE; - glyph = 0x0; - } - pwOutGlyphs[i] = set_cache_glyph(psc, inChar, glyph); + hr = S_FALSE; + glyph = 0x0; } + pwOutGlyphs[i] = set_cache_glyph(psc, inChar, glyph); } } - else - { - TRACE("no glyph translation\n"); - for (i = 0; i < cChars; i++) - { - WCHAR inChar; - if (dwFlags == SGCM_RTL) - inChar = mirror_char(pwcInChars[i]); - else - inChar = pwcInChars[i]; - pwOutGlyphs[i] = inChar; - } - } + return hr; }

1 0

Nikolay Sivov : mf: Add support for source and output collections.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: b474b9138c0297b9cd44dcd0675de4dbaf5d624a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b474b9138c0297b9cd44dcd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 11:33:50 2019 +0300 mf: Add support for source and output collections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/topology.c | 55 +++++++++++++++++++++++++-- 2 files changed, 161 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2b3fdcd..21d8be8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -35,8 +35,10 @@ static void test_topology(void) { + IMFCollection *collection, *collection2; IMFTopologyNode *node, *node2, *node3; IMFTopology *topology; + DWORD size; WORD count; HRESULT hr; TOPOID id; @@ -192,6 +194,114 @@ static void test_topology(void) IMFTopologyNode_Release(node); IMFTopologyNode_Release(node2); + /* Source/output collections. */ + hr = IMFTopology_Clear(topology); + ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); + + hr = IMFTopology_GetSourceNodeCollection(topology, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection2); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection2, "Unexpected object pointer.\n"); + ok(collection2 != collection, "Expected cloned collection.\n"); + + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(!size, "Unexpected item count.\n"); + + hr = IMFCollection_AddElement(collection, (IUnknown *)collection); + ok(hr == S_OK, "Failed to add element, hr %#x.\n", hr); + + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + + hr = IMFCollection_GetElementCount(collection2, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(!size, "Unexpected item count.\n"); + + IMFCollection_Release(collection2); + IMFCollection_Release(collection); + + /* Add some nodes. */ + hr = IMFTopology_GetSourceNodeCollection(topology, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_GetOutputNodeCollection(topology, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = IMFTopology_GetOutputNodeCollection(topology, &collection); + ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get source node collection, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(!size, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetOutputNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + } + IMFTopology_Release(topology); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index d801222..3b4a2e1a 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -535,18 +535,65 @@ static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTop return topology_get_node_by_id(topology, id, node); } +static HRESULT topology_add_node_of_type(const struct topology *topology, IMFTopologyNode *node, + MF_TOPOLOGY_TYPE filter, IMFCollection *collection) +{ + MF_TOPOLOGY_TYPE node_type; + HRESULT hr; + + if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) + return hr; + + if (node_type != filter) + return S_OK; + + return IMFCollection_AddElement(collection, (IUnknown *)node); +} + +static HRESULT topology_get_node_collection(const struct topology *topology, MF_TOPOLOGY_TYPE node_type, + IMFCollection **collection) +{ + IMFTopologyNode *node; + unsigned int i = 0; + HRESULT hr; + + if (!collection) + return E_POINTER; + + if (FAILED(hr = MFCreateCollection(collection))) + return hr; + + while (IMFCollection_GetElement(topology->nodes, i++, (IUnknown **)&node) == S_OK) + { + hr = topology_add_node_of_type(topology, node, node_type, *collection); + IMFTopologyNode_Release(node); + if (FAILED(hr)) + { + IMFCollection_Release(*collection); + *collection = NULL; + break; + } + } + + return hr; +} + static HRESULT WINAPI topology_GetSourceNodeCollection(IMFTopology *iface, IMFCollection **collection) { - FIXME("(%p)->(%p)\n", iface, collection); + struct topology *topology = impl_from_IMFTopology(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, collection); + + return topology_get_node_collection(topology, MF_TOPOLOGY_SOURCESTREAM_NODE, collection); } static HRESULT WINAPI topology_GetOutputNodeCollection(IMFTopology *iface, IMFCollection **collection) { - FIXME("(%p)->(%p)\n", iface, collection); + struct topology *topology = impl_from_IMFTopology(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, collection); + + return topology_get_node_collection(topology, MF_TOPOLOGY_OUTPUT_NODE, collection); } static const IMFTopologyVtbl topologyvtbl =

1 0

Nikolay Sivov : mf: Use event queue for session event handling.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 8f9db431738855068426800c3a5d78691d99411e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f9db431738855068426800c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 11:33:52 2019 +0300 mf: Use event queue for session event handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 135 ++++++++++++++++++++++++------------------------------ 1 file changed, 60 insertions(+), 75 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5913af3..fda3ec7 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -24,193 +24,175 @@ #include "windef.h" #include "winbase.h" #include "mfidl.h" +#include "mfapi.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); -typedef struct mfsession +struct media_session { IMFMediaSession IMFMediaSession_iface; - LONG ref; -} mfsession; + LONG refcount; + IMFMediaEventQueue *event_queue; +}; -static inline mfsession *impl_from_IMFMediaSession(IMFMediaSession *iface) +static inline struct media_session *impl_from_IMFMediaSession(IMFMediaSession *iface) { - return CONTAINING_RECORD(iface, mfsession, IMFMediaSession_iface); + return CONTAINING_RECORD(iface, struct media_session, IMFMediaSession_iface); } static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out) { - mfsession *This = impl_from_IMFMediaSession(iface); + struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFMediaSession) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { - *out = &This->IMFMediaSession_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; + *out = &session->IMFMediaSession_iface; + IMFMediaSession_AddRef(iface); + return S_OK; } - IUnknown_AddRef((IUnknown*)*out); - return S_OK; + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } static ULONG WINAPI mfsession_AddRef(IMFMediaSession *iface) { - mfsession *This = impl_from_IMFMediaSession(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct media_session *session = impl_from_IMFMediaSession(iface); + ULONG refcount = InterlockedIncrement(&session->refcount); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) refcount=%u\n", iface, refcount); - return ref; + return refcount; } static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) { - mfsession *This = impl_from_IMFMediaSession(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct media_session *session = impl_from_IMFMediaSession(iface); + ULONG refcount = InterlockedDecrement(&session->refcount); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) refcount=%u\n", iface, refcount); - if (!ref) + if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + if (session->event_queue) + IMFMediaEventQueue_Release(session->event_queue); + heap_free(session); } - return ref; + return refcount; } static HRESULT WINAPI mfsession_GetEvent(IMFMediaSession *iface, DWORD flags, IMFMediaEvent **event) { - mfsession *This = impl_from_IMFMediaSession(iface); + struct media_session *session = impl_from_IMFMediaSession(iface); - FIXME("(%p)->(%#x, %p)\n", This, flags, event); + TRACE("(%p)->(%#x, %p)\n", iface, flags, event); - return E_NOTIMPL; + return IMFMediaEventQueue_GetEvent(session->event_queue, flags, event); } static HRESULT WINAPI mfsession_BeginGetEvent(IMFMediaSession *iface, IMFAsyncCallback *callback, IUnknown *state) { - mfsession *This = impl_from_IMFMediaSession(iface); + struct media_session *session = impl_from_IMFMediaSession(iface); - FIXME("(%p)->(%p, %p)\n", This, callback, state); + TRACE("(%p)->(%p, %p)\n", iface, callback, state); - return E_NOTIMPL; + return IMFMediaEventQueue_BeginGetEvent(session->event_queue, callback, state); } static HRESULT WINAPI mfsession_EndGetEvent(IMFMediaSession *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - mfsession *This = impl_from_IMFMediaSession(iface); + struct media_session *session = impl_from_IMFMediaSession(iface); - FIXME("(%p)->(%p, %p)\n", This, result, event); + TRACE("(%p)->(%p, %p)\n", iface, result, event); - return E_NOTIMPL; + return IMFMediaEventQueue_EndGetEvent(session->event_queue, result, event); } static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventType event_type, REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - mfsession *This = impl_from_IMFMediaSession(iface); + struct media_session *session = impl_from_IMFMediaSession(iface); - FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); + TRACE("(%p)->(%d, %s, %#x, %p)\n", iface, event_type, debugstr_guid(ext_type), hr, value); - return E_NOTIMPL; + return IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, IMFTopology *topology) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)->(%#x, %p)\n", This, flags, topology); + FIXME("(%p)->(%#x, %p)\n", iface, flags, topology); return E_NOTIMPL; } static HRESULT WINAPI mfsession_ClearTopologies(IMFMediaSession *iface) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)\n", This); + FIXME("(%p)\n", iface); return E_NOTIMPL; } static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format, const PROPVARIANT *start) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(format), start); + FIXME("(%p)->(%s, %p)\n", iface, debugstr_guid(format), start); return E_NOTIMPL; } static HRESULT WINAPI mfsession_Pause(IMFMediaSession *iface) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)\n", This); + FIXME("(%p)\n", iface); return E_NOTIMPL; } static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)\n", This); + FIXME("(%p)\n", iface); return E_NOTIMPL; } static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)\n", This); + FIXME("(%p)\n", iface); return S_OK; } static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)\n", This); + FIXME("(%p)\n", iface); return E_NOTIMPL; } static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)->(%p)\n", This, clock); + FIXME("(%p)->(%p)\n", iface, clock); return E_NOTIMPL; } static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)->(%p)\n", This, caps); + FIXME("(%p)->(%p)\n", iface, caps); return E_NOTIMPL; } static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD flags, TOPOID id, IMFTopology **topology) { - mfsession *This = impl_from_IMFMediaSession(iface); - - FIXME("(%p)->(%#x, %s, %p)\n", This, flags, wine_dbgstr_longlong(id), topology); + FIXME("(%p)->(%#x, %s, %p)\n", iface, flags, wine_dbgstr_longlong(id), topology); return E_NOTIMPL; } @@ -237,26 +219,29 @@ static const IMFMediaSessionVtbl mfmediasessionvtbl = }; /*********************************************************************** - * MFCreateTopology (mf.@) + * MFCreateMediaSession (mf.@) */ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session) { - mfsession *object; + struct media_session *object; + HRESULT hr; TRACE("(%p, %p)\n", config, session); - if (!session) - return E_POINTER; - if (config) FIXME("session configuration ignored\n"); - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; - object->ref = 1; + object->refcount = 1; + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + { + IMFMediaSession_Release(&object->IMFMediaSession_iface); + return hr; + } *session = &object->IMFMediaSession_iface;

1 0