August 2022 - Wine-commits - list.winehq.org

Zhiyi Zhang : comctl32: Check reference data pointer before using it.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 9b9fef2e112ff2ce0e1ce2da3aaacd2ffefa6d87 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b9fef2e112ff2ce0e1ce2da3aaacd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 16 11:25:46 2022 +0800 comctl32: Check reference data pointer before using it. Fix the crash when opening notepad++ v8.4.4 preference dialog before e52e42b. --- dlls/comctl32/commctrl.c | 3 ++- dlls/comctl32/tests/subclass.c | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 57863928fc7..14b148d591d 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1179,7 +1179,8 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, while (proc) { if ((proc->id == uID) && (proc->subproc == pfnSubclass)) { - *pdwRef = proc->ref; + if (pdwRef) + *pdwRef = proc->ref; return TRUE; } proc = proc->next; diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index b7b4dd0508d..9f1955c4258 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -371,12 +371,8 @@ static void test_GetWindowSubclass(void) todo_wine ok(data == 0, "Got unexpected data %#Ix.\n", data); - /* Crash on Wine */ - if (strcmp(winetest_platform, "wine")) - { ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, NULL); ok(ret, "GetWindowSubclass failed.\n"); - } data = 0xdeadbeef; ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, &data);

1 0

Zhiyi Zhang : comctl32: Set reference data to zero on failure for GetWindowSubclass().
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 3aefc3a4225c6a5c9419f9f8405d91758aefd694 URL: https://gitlab.winehq.org/wine/wine/-/commit/3aefc3a4225c6a5c9419f9f8405d91… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 16 11:42:31 2022 +0800 comctl32: Set reference data to zero on failure for GetWindowSubclass(). --- dlls/comctl32/commctrl.c | 5 ++++- dlls/comctl32/tests/subclass.c | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 14b148d591d..c5910b40869 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1173,7 +1173,7 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, /* See if we have been called for this window */ stack = GetPropW (hWnd, COMCTL32_wSubclass); if (!stack) - return FALSE; + goto done; proc = stack->SubclassProcs; while (proc) { @@ -1186,6 +1186,9 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, proc = proc->next; } +done: + if (pdwRef) + *pdwRef = 0; return FALSE; } diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 9f1955c4258..e2e8573f4c0 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -356,19 +356,16 @@ static void test_GetWindowSubclass(void) data = 0xdeadbeef; ret = pGetWindowSubclass(NULL, wnd_proc_sub, 2, &data); ok(!ret, "GetWindowSubclass succeeded.\n"); - todo_wine ok(data == 0, "Got unexpected data %#Ix.\n", data); data = 0xdeadbeef; ret = pGetWindowSubclass(hwnd, NULL, 2, &data); ok(!ret, "GetWindowSubclass succeeded.\n"); - todo_wine ok(data == 0, "Got unexpected data %#Ix.\n", data); data = 0xdeadbeef; ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 0, &data); ok(!ret, "GetWindowSubclass succeeded.\n"); - todo_wine ok(data == 0, "Got unexpected data %#Ix.\n", data); ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, NULL);

1 0

Rémi Bernon : mf/tests: Add some topology loader tests with missing output type.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 27c3069f4a354c695ebf38e62c86573648225063 URL: https://gitlab.winehq.org/wine/wine/-/commit/27c3069f4a354c695ebf38e62c8657… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 11 10:51:12 2022 +0200 mf/tests: Add some topology loader tests with missing output type. --- dlls/mf/tests/mf.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 159 insertions(+), 24 deletions(-)

1 0

Rémi Bernon : mf/tests: Add some MP3 decoder transform tests.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 5b7a3aaf6d50b210b7405babfff4e0267343607f URL: https://gitlab.winehq.org/wine/wine/-/commit/5b7a3aaf6d50b210b7405babfff4e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 17:14:29 2022 +0200 mf/tests: Add some MP3 decoder transform tests. There's some differences in the decoded data between Windows versions, the results have been taken from a Windows 10 VM. --- dlls/mf/tests/mf.c | 435 +++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mp3decdata.bin | Bin 0 -> 94656 bytes dlls/mf/tests/mp3encdata.bin | Bin 0 -> 6295 bytes dlls/mf/tests/resource.rc | 13 ++ 4 files changed, 448 insertions(+)

1 0

Rémi Bernon : mf/tests: Add more topology loader converter and enumeration tests.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 245ac9b46e960ee1189a426a88acc574c588a3a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/245ac9b46e960ee1189a426a88acc5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 11 09:38:40 2022 +0200 mf/tests: Add more topology loader converter and enumeration tests. --- dlls/mf/tests/mf.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f6024f95768..5d95b092002 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2210,6 +2210,16 @@ static void test_topology_loader(void) ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 1), ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 8), }; + static const media_type_desc audio_float_48000 = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 8 * 48000), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + }; static const media_type_desc audio_mp3_44100 = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), @@ -2332,6 +2342,13 @@ static void test_topology_loader(void) .expected_result = S_OK, .flags = LOADER_EXPECTED_CONVERTER, }, + { + /* PCM -> PCM, different enumerated bps, same current type, sink allow converter, force enumerate */ + .input_type = &audio_pcm_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_ALLOW_CONVERTER, .source_method = -1, + .current_input = &audio_pcm_48000, + .expected_result = S_OK, + .flags = LOADER_EXPECTED_CONVERTER | LOADER_SET_ENUMERATE_SOURCE_TYPES | LOADER_TODO, + }, { /* PCM -> PCM, different enumerated bps, no current type, sink allow decoder */ .input_type = &audio_pcm_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_ALLOW_DECODER, .source_method = MF_CONNECT_DIRECT, @@ -2377,6 +2394,13 @@ static void test_topology_loader(void) .expected_result = S_OK, .flags = LOADER_EXPECTED_DECODER | LOADER_TODO, }, + { + /* MP3 -> PCM, need both decoder and converter */ + .input_type = &audio_mp3_44100, .output_type = &audio_float_48000, .sink_method = MF_CONNECT_ALLOW_DECODER, .source_method = -1, + .current_input = &audio_mp3_44100, + .expected_result = S_OK, + .flags = LOADER_EXPECTED_DECODER | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + }, { /* I420 -> RGB32, Color Convert media type */

1 0

Rémi Bernon : mf: Allow resolving topology with missing downstream current type.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 346c2d8d7cfb4cd8e5d510b232c0938ad0fee574 URL: https://gitlab.winehq.org/wine/wine/-/commit/346c2d8d7cfb4cd8e5d510b232c093… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 11 13:49:44 2022 +0200 mf: Allow resolving topology with missing downstream current type. And without enumerating the downstream types either. --- dlls/mf/tests/mf.c | 6 ++++-- dlls/mf/topology_loader.c | 53 +++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5d95b092002..dd61a10fc77 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1374,8 +1374,10 @@ static HRESULT WINAPI test_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *ifac static HRESULT WINAPI test_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *media_type) { + /* FIXME: Wine sets downstream media type when resolving topology, native doesn't */ + todo_wine ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI test_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **media_type) @@ -2424,7 +2426,7 @@ static void test_topology_loader(void) /* RGB32 -> Any Video, no current output type */ .input_type = &video_i420_1280, .output_type = &video_dummy, .sink_method = -1, .source_method = -1, .expected_result = S_OK, - .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_TODO, + .flags = LOADER_NO_CURRENT_OUTPUT, }, { /* RGB32 -> Any Video, no current output type, refuse input type */ diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 08ee7922094..09fb9322261 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -253,7 +253,6 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC IMFTopologyNode *node; unsigned int i, count; GUID category, guid; - DWORD flags; HRESULT hr; TRACE("topology %p, method_mask %#x, branch %s, up_type %p, down_type %p.\n", @@ -263,13 +262,15 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC return hr; if (FAILED(hr = IMFMediaType_GetGUID(up_type, &MF_MT_SUBTYPE, &input_info.guidSubtype))) return hr; - if (FAILED(hr = IMFMediaType_GetMajorType(down_type, &output_info.guidMajorType))) - return hr; - if (FAILED(hr = IMFMediaType_GetGUID(down_type, &MF_MT_SUBTYPE, &output_info.guidSubtype))) - return hr; - if (FAILED(hr = IMFMediaType_IsEqual(up_type, down_type, &flags)) - || !(flags & MF_MEDIATYPE_EQUAL_MAJOR_TYPES)) - return MF_E_INVALIDMEDIATYPE; + if (!down_type) + output_info = input_info; + else + { + if (FAILED(hr = IMFMediaType_GetMajorType(down_type, &output_info.guidMajorType))) + return hr; + if (FAILED(hr = IMFMediaType_GetGUID(down_type, &MF_MT_SUBTYPE, &output_info.guidSubtype))) + return hr; + } if (IsEqualGUID(&input_info.guidMajorType, &MFMediaType_Audio)) category = decoder ? MFT_CATEGORY_AUDIO_DECODER : MFT_CATEGORY_AUDIO_EFFECT; @@ -300,10 +301,13 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC IMFTopologyNode_SetGUID(node, &MF_TOPONODE_TRANSFORM_OBJECTID, &guid); hr = topology_branch_connect_down(topology, MF_CONNECT_DIRECT, &up_branch, up_type); - if (SUCCEEDED(hr)) - hr = topology_branch_fill_media_type(up_type, down_type); - if (SUCCEEDED(hr)) - hr = IMFTransform_SetOutputType(transform, 0, down_type, 0); + if (down_type) + { + if (SUCCEEDED(hr)) + hr = topology_branch_fill_media_type(up_type, down_type); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(transform, 0, down_type, 0); + } IMFTransform_Release(transform); if (SUCCEEDED(hr)) @@ -328,8 +332,8 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME struct topology_branch *branch, IMFMediaType *up_type) { IMFMediaTypeHandler *down_handler; + IMFMediaType *down_type = NULL; MF_CONNECT_METHOD method; - IMFMediaType *down_type; DWORD flags; HRESULT hr; @@ -346,27 +350,18 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME && IMFMediaType_IsEqual(up_type, down_type, &flags) == S_OK) { TRACE("Connecting branch %s with current type %p.\n", debugstr_topology_branch(branch), up_type); - IMFMediaTypeHandler_Release(down_handler); - IMFMediaType_Release(down_type); - - return IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); + hr = IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); + goto done; } - if (FAILED(hr) && FAILED(hr = IMFMediaTypeHandler_GetMediaTypeByIndex(down_handler, 0, &down_type))) - return hr; - if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(down_handler, up_type, NULL)) && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(down_handler, up_type))) { TRACE("Connected branch %s with upstream type %p.\n", debugstr_topology_branch(branch), up_type); - IMFMediaTypeHandler_Release(down_handler); - IMFMediaType_Release(down_type); - - return IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); + hr = IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); + goto done; } - IMFMediaTypeHandler_Release(down_handler); - if (FAILED(hr) && (method & method_mask & MF_CONNECT_ALLOW_CONVERTER) == MF_CONNECT_ALLOW_CONVERTER) hr = topology_branch_connect_indirect(topology, MF_CONNECT_ALLOW_CONVERTER, branch, up_type, down_type); @@ -375,7 +370,11 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME hr = topology_branch_connect_indirect(topology, MF_CONNECT_ALLOW_DECODER, branch, up_type, down_type); - IMFMediaType_Release(down_type); +done: + if (down_type) + IMFMediaType_Release(down_type); + IMFMediaTypeHandler_Release(down_handler); + return hr; }

1 0

Rémi Bernon : mf: Only allow converter connection if decoder didn't accept down type.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 826a9ce1ab55879b905e915101f05c1f2a51d219 URL: https://gitlab.winehq.org/wine/wine/-/commit/826a9ce1ab55879b905e915101f05c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 11 13:53:15 2022 +0200 mf: Only allow converter connection if decoder didn't accept down type. --- dlls/mf/topology_loader.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 09fb9322261..4560e3a578d 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -281,8 +281,13 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) return hr; - if (decoder) + if (!decoder) + method_mask = MF_CONNECT_DIRECT; + else + { IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_DECODER, 1); + method_mask = MF_CONNECT_ALLOW_CONVERTER; + } if (FAILED(hr = MFTEnumEx(category, MFT_ENUM_FLAG_ALL, &input_info, decoder ? NULL : &output_info, &activates, &count))) return hr; @@ -307,11 +312,13 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC hr = topology_branch_fill_media_type(up_type, down_type); if (SUCCEEDED(hr)) hr = IMFTransform_SetOutputType(transform, 0, down_type, 0); + if (SUCCEEDED(hr)) + method_mask = MF_CONNECT_DIRECT; } IMFTransform_Release(transform); if (SUCCEEDED(hr)) - hr = topology_branch_connect(topology, decoder ? MF_CONNECT_ALLOW_CONVERTER : MF_CONNECT_DIRECT, &down_branch); + hr = topology_branch_connect(topology, method_mask, &down_branch); if (SUCCEEDED(hr)) hr = IMFTopology_AddNode(topology, node); if (SUCCEEDED(hr))

1 0

Rémi Bernon : mf: Only enumerate types for decoders / converter if down type is missing.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 935e3d12de01b2821c992363135cec9d57a098bf URL: https://gitlab.winehq.org/wine/wine/-/commit/935e3d12de01b2821c992363135cec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 11 14:12:27 2022 +0200 mf: Only enumerate types for decoders / converter if down type is missing. --- dlls/mf/tests/mf.c | 4 ++-- dlls/mf/topology_loader.c | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dd61a10fc77..eccf4f51e4c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2349,7 +2349,7 @@ static void test_topology_loader(void) .input_type = &audio_pcm_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_ALLOW_CONVERTER, .source_method = -1, .current_input = &audio_pcm_48000, .expected_result = S_OK, - .flags = LOADER_EXPECTED_CONVERTER | LOADER_SET_ENUMERATE_SOURCE_TYPES | LOADER_TODO, + .flags = LOADER_EXPECTED_CONVERTER | LOADER_SET_ENUMERATE_SOURCE_TYPES, }, { /* PCM -> PCM, different enumerated bps, no current type, sink allow decoder */ @@ -2432,7 +2432,7 @@ static void test_topology_loader(void) /* RGB32 -> Any Video, no current output type, refuse input type */ .input_type = &video_i420_1280, .output_type = &video_dummy, .sink_method = -1, .source_method = -1, .expected_result = S_OK, - .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_SET_INVALID_INPUT | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_SET_INVALID_INPUT | LOADER_EXPECTED_CONVERTER, }, }; diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 4560e3a578d..eb652f526dd 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -240,7 +240,7 @@ static HRESULT topology_branch_fill_media_type(IMFMediaType *up_type, IMFMediaTy } static HRESULT topology_branch_connect(IMFTopology *topology, MF_CONNECT_METHOD method_mask, - struct topology_branch *branch); + struct topology_branch *branch, BOOL enumerate_source_types); static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_METHOD method_mask, struct topology_branch *branch, IMFMediaType *up_type); static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNECT_METHOD method_mask, @@ -318,7 +318,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC IMFTransform_Release(transform); if (SUCCEEDED(hr)) - hr = topology_branch_connect(topology, method_mask, &down_branch); + hr = topology_branch_connect(topology, method_mask, &down_branch, !down_type); if (SUCCEEDED(hr)) hr = IMFTopology_AddNode(topology, node); if (SUCCEEDED(hr)) @@ -411,9 +411,8 @@ static HRESULT topology_branch_foreach_up_types(IMFTopology *topology, MF_CONNEC } static HRESULT topology_branch_connect(IMFTopology *topology, MF_CONNECT_METHOD method_mask, - struct topology_branch *branch) + struct topology_branch *branch, BOOL enumerate_source_types) { - UINT32 enumerate_source_types; MF_CONNECT_METHOD method; HRESULT hr; @@ -422,8 +421,7 @@ static HRESULT topology_branch_connect(IMFTopology *topology, MF_CONNECT_METHOD if (FAILED(IMFTopologyNode_GetUINT32(branch->up.node, &MF_TOPONODE_CONNECT_METHOD, &method))) method = MF_CONNECT_DIRECT; - if (SUCCEEDED(IMFTopology_GetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, &enumerate_source_types)) - && enumerate_source_types) + if (enumerate_source_types) { if (method & MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES) hr = topology_branch_foreach_up_types(topology, method_mask & MF_CONNECT_ALLOW_DECODER, branch); @@ -456,7 +454,8 @@ static HRESULT topology_branch_connect(IMFTopology *topology, MF_CONNECT_METHOD return hr; } -static HRESULT topology_loader_resolve_branches(struct topoloader_context *context, struct list *branches) +static HRESULT topology_loader_resolve_branches(struct topoloader_context *context, struct list *branches, + BOOL enumerate_source_types) { struct list new_branches = LIST_INIT(new_branches); struct topology_branch *branch, *next; @@ -474,7 +473,8 @@ static HRESULT topology_loader_resolve_branches(struct topoloader_context *conte else if (FAILED(hr = topology_branch_clone_nodes(context, branch))) WARN("Failed to clone nodes for branch %s\n", debugstr_topology_branch(branch)); else - hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, branch); + hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, + branch, enumerate_source_types); topology_branch_destroy(branch); if (FAILED(hr)) @@ -639,6 +639,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in struct list branches = LIST_INIT(branches); struct topoloader_context context = { 0 }; struct topology_branch *branch, *next; + UINT32 enumerate_source_types; IMFTopology *output_topology; MF_TOPOLOGY_TYPE node_type; IMFTopologyNode *node; @@ -705,8 +706,12 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (SUCCEEDED(hr) && list_empty(&branches)) hr = MF_E_TOPO_UNSUPPORTED; + if (FAILED(IMFTopology_GetUINT32(input_topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, + &enumerate_source_types))) + enumerate_source_types = 0; + while (SUCCEEDED(hr) && !list_empty(&branches)) - hr = topology_loader_resolve_branches(&context, &branches); + hr = topology_loader_resolve_branches(&context, &branches, enumerate_source_types); LIST_FOR_EACH_ENTRY_SAFE(branch, next, &branches, struct topology_branch, entry) {

1 0

Zebediah Figura : d3d11/tests: Use winetest_push_context() to print explicit feature levels.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 2208ec0851d0efd10fe27671409580e42ca7d960 URL: https://gitlab.winehq.org/wine/wine/-/commit/2208ec0851d0efd10fe27671409580… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 10 11:47:44 2022 -0500 d3d11/tests: Use winetest_push_context() to print explicit feature levels. --- dlls/d3d11/tests/d3d11.c | 114 +++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 57 deletions(-)

1 0

Alexandre Julliard : winetest: Use CRT allocation functions.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 22aceb44e738c51e169fffc669223da5952d8072 URL: https://gitlab.winehq.org/wine/wine/-/commit/22aceb44e738c51e169fffc669223d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 16 11:57:39 2022 +0200 winetest: Use CRT allocation functions. --- programs/winetest/gui.c | 32 +++++++-------- programs/winetest/main.c | 93 ++++++++++++++++++-------------------------- programs/winetest/send.c | 45 +++++++++++---------- programs/winetest/util.c | 34 +++++----------- programs/winetest/winetest.h | 7 ++-- 5 files changed, 88 insertions(+), 123 deletions(-)

1 0