January 2022 - Wine-Commits

Nikolay Sivov : mfmediaengine: Handle shutdown state in GetCurrentSource().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 86c0afc79701be10a56b99718f3441db2ae4082c URL: https://source.winehq.org/git/wine.git/?a=commit;h=86c0afc79701be10a56b9971… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 10:17:09 2022 +0300 mfmediaengine: Handle shutdown state in GetCurrentSource(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 4 ++++ dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5c00c10f718..99beb17e429 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1464,11 +1464,15 @@ static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngineEx *iface, BST *url = NULL; EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; if (engine->current_source) { if (!(*url = SysAllocString(engine->current_source))) hr = E_OUTOFMEMORY; } + LeaveCriticalSection(&engine->cs); return hr; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 8584554a2b6..6448e7f2169 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -319,7 +319,6 @@ static void test_Shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetCurrentSource(media_engine, &str); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetNetworkState(media_engine);

1 0

Fabian Maurer : mlang/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 9178825fc9c18bf828cbfbd39cbbd6c2af96cf13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9178825fc9c18bf828cbfbd3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:06 2022 +0100 mlang/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 1486a643604..fd0611c72ac 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2256,7 +2256,7 @@ static void test_IMLangConvertCharset(IMultiLanguage *ml) HRESULT hr; hr = IMultiLanguage_CreateConvertCharset(ml, CP_ACP, CP_UTF8, 0, &convert); -todo_wine + todo_wine ok(hr == S_FALSE, "expected S_FALSE got 0x%08x\n", hr); hr = IMLangConvertCharset_GetSourceCodePage(convert, NULL);

1 0

Fabian Maurer : nsi/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: b6a93c96768697bcb05eaa81dfcf17dd4e8946e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6a93c96768697bcb05eaa81… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:13 2022 +0100 nsi/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index a9f8ba3ae6e..fc85d4ba8ff 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -631,7 +631,7 @@ static void test_ip_neighbour( int family ) err = NsiAllocateAndGetTable( 1, mod, NSI_IP_NEIGHBOUR_TABLE, (void **)&key_tbl, key_size, (void **)&rw_tbl, sizeof(*rw), (void **)&dyn_tbl, sizeof(*dyn), NULL, 0, &count, 0 ); -todo_wine_if( family == AF_INET6 ) + todo_wine_if( family == AF_INET6 ) ok( !err, "got %x\n", err ); if (err) goto err;

1 0

Fabian Maurer : gdiplus/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 759a93d94d9951704969c661786c304273cbaffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=759a93d94d9951704969c661… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:15:59 2022 +0100 gdiplus/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/customlinecap.c | 4 +-- dlls/gdiplus/tests/font.c | 40 +++++++++++++------------- dlls/gdiplus/tests/graphics.c | 58 +++++++++++++++++++------------------- dlls/gdiplus/tests/image.c | 8 +++--- 4 files changed, 55 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=759a93d94d9951704969…

1 0

Fabian Maurer : mfplay/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 2bd79e8ed6059b0631d77052592dc3d24d6b5218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd79e8ed6059b0631d77052… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:05 2022 +0100 mfplay/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/tests/mfplay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 1daaa3af1d5..727ab1e3b9a 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -203,7 +203,7 @@ static void test_shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); @@ -316,7 +316,7 @@ static void test_video_control(void) ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); -todo_wine + todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); IMFPMediaPlayer_Release(player); @@ -356,7 +356,7 @@ todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); -todo_wine + todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); IMFPMediaPlayer_Release(player);

1 0

Nikolay Sivov : mfmediaengine: Handle shutdown state in Play().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 0f4f7ca9379aae020a2afcd6605a8d7595274af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f4f7ca9379aae020a2afcd6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 10:17:10 2022 +0300 mfmediaengine: Handle shutdown state in Play(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 32 +++++++++++++++++++------------- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 99beb17e429..87851cee9c4 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1784,31 +1784,37 @@ static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngineEx *iface, BOOL loop) static HRESULT WINAPI media_engine_Play(IMFMediaEngineEx *iface) { struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - - if (!(engine->flags & FLAGS_ENGINE_WAITING)) + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else { - media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - if (!(engine->flags & FLAGS_ENGINE_SOURCE_PENDING)) - media_engine_start_playback(engine); - else - media_engine_set_flag(engine, FLAGS_ENGINE_PLAY_PENDING, TRUE); + if (!(engine->flags & FLAGS_ENGINE_WAITING)) + { + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); - media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); - } + if (!(engine->flags & FLAGS_ENGINE_SOURCE_PENDING)) + media_engine_start_playback(engine); + else + media_engine_set_flag(engine, FLAGS_ENGINE_PLAY_PENDING, TRUE); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_WAITING, 0, 0); + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); + } + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_WAITING, 0, 0); + } LeaveCriticalSection(&engine->cs); - return S_OK; + return hr; } static HRESULT WINAPI media_engine_Pause(IMFMediaEngineEx *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 6448e7f2169..ac34bd7c4cd 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -414,7 +414,6 @@ todo_wine ok(!!state, "Unexpected state.\n"); hr = IMFMediaEngine_Play(media_engine); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_Pause(media_engine);

1 0

Fabian Maurer : gdi32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 86d36aefc8565120f7c3b39ddd2301b149f7a608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86d36aefc8565120f7c3b39d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:15:58 2022 +0100 gdi32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 2 +- dlls/gdi32/tests/font.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 93793ad7108..3e1ed7f7652 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2789,7 +2789,7 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); -todo_wine + todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 03ac72254cc..bc626d284ca 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1830,15 +1830,15 @@ static void test_GetKerningPairs(void) kd[i].otmMacDescent, otm.otmMacDescent); ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", kd[i].otmMacAscent, otm.otmMacAscent); -todo_wine + todo_wine ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); -todo_wine + todo_wine ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); -todo_wine + todo_wine ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); @@ -4130,7 +4130,7 @@ static void test_nonexistent_font(void) hfont = CreateFontIndirectA(&lf); hfont = SelectObject(hdc, hfont); GetTextFaceA(hdc, sizeof(buf), buf); -todo_wine /* Wine uses Arial for all substitutions */ + todo_wine /* Wine uses Arial for all substitutions */ ok(!lstrcmpiA(buf, "Nonexistent font") /* XP, Vista */ || !lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */ "Got %s\n", buf); @@ -4165,10 +4165,10 @@ todo_wine /* Wine uses Arial for all substitutions */ for (i = 0; i < ARRAY_SIZE(font_subst); i++) { ret = is_font_installed(font_subst[i].name); -todo_wine + todo_wine ok(ret, "%s should be enumerated\n", font_subst[i].name); ret = is_truetype_font_installed(font_subst[i].name); -todo_wine + todo_wine ok(ret, "%s should be enumerated\n", font_subst[i].name); memset(&lf, 0, sizeof(lf)); @@ -4511,7 +4511,7 @@ static void test_oemcharset(void) hfont = CreateFontIndirectA(&lf); old_hfont = SelectObject(hdc, hfont); charset = GetTextCharset(hdc); -todo_wine + todo_wine ok(charset == OEM_CHARSET, "expected %d charset, got %d\n", OEM_CHARSET, charset); hfont = SelectObject(hdc, old_hfont); GetObjectA(hfont, sizeof(clf), &clf); @@ -5090,7 +5090,7 @@ static void test_realization_info(const char *name, DWORD size, BOOL is_memory_r /* Zero buffer size. */ memset(data, 0xcc, size); ret = pGetFontFileData(info.instance_id, 0, 16, data, 0); -todo_wine + todo_wine ok(ret == 0 && GetLastError() == ERROR_NOACCESS, "Unexpected return value %d, error %d\n", ret, GetLastError()); ok(*(DWORD *)data == 0xcccccccc, "Unexpected buffer contents %#x.\n", *(DWORD *)data); @@ -5153,7 +5153,7 @@ static void test_AddFontMemResource(void) ok(num_fonts == 1, "Unexpected number of fonts %u.\n", num_fonts); bRet = is_truetype_font_installed("wine_test"); -todo_wine + todo_wine ok(!bRet, "Font wine_test should not be enumerated.\n"); test_realization_info("wine_test", font_size, TRUE); @@ -5758,7 +5758,7 @@ static void test_GetGlyphOutline_metric_clipping(void) /* Test tmLastChar - wine_test has code points fffb-fffe mapped to glyph 0 */ GetTextMetricsW(hdc, &tmW); -todo_wine + todo_wine ok( tmW.tmLastChar == 0xfffe, "got %04x\n", tmW.tmLastChar); SelectObject(hdc, hfont_prev);

1 0

Fabian Maurer : mf/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 11d1e967b6be4e948ad49cc893e27150c220b02d URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d1e967b6be4e948ad49cc8… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:02 2022 +0100 mf/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ede047aa187..dede008fbd9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1401,7 +1401,7 @@ static void test_media_session_rate_control(void) ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); hr = IMFRateControl_SetRate(rate_control, FALSE, 1.5f); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); hr = IMFClock_GetProperties(clock, &clock_props); @@ -1414,7 +1414,7 @@ todo_wine ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); hr = IMFRateControl_SetRate(rate_control, FALSE, 1.5f); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); rate = 0.0f; @@ -1941,7 +1941,7 @@ static void test_topology_loader(void) /* Empty topology */ hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine + todo_wine ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr); /* Add source node. */ @@ -1983,7 +1983,7 @@ todo_wine /* Source node only. */ hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine + todo_wine ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr); hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); @@ -2009,7 +2009,7 @@ todo_wine ok(hr == S_OK, "Failed to add sink node, hr %#x.\n", hr); hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine + todo_wine ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr); hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); @@ -2043,7 +2043,7 @@ todo_wine ok(!count, "Unexpected count %u.\n", count); hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine_if(test->flags & LOADER_TODO) + todo_wine_if(test->flags & LOADER_TODO) ok(hr == test->expected_result, "Unexpected hr %#x on test %u.\n", hr, i); ok(full_topology != topology, "Unexpected instance.\n"); @@ -2051,7 +2051,7 @@ todo_wine_if(test->flags & LOADER_TODO) { hr = IMFTopology_GetCount(full_topology, &count); ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); -todo_wine + todo_wine ok(count == 1, "Unexpected count %u.\n", count); value = 0xdeadbeef; @@ -2068,7 +2068,7 @@ todo_wine { hr = IMFTopology_GetNodeCount(full_topology, &node_count); ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); - todo_wine_if(test->flags & (LOADER_EXPECTED_CONVERTER | LOADER_EXPECTED_DECODER)) + todo_wine_if(test->flags & (LOADER_EXPECTED_CONVERTER | LOADER_EXPECTED_DECODER)) ok(node_count == count, "Unexpected node count %u.\n", node_count); hr = IMFTopologyNode_GetTopoNodeID(src_node, &node_id); @@ -3437,9 +3437,9 @@ static void test_video_processor(void) goto failed; } -todo_wine + todo_wine check_interface(transform, &IID_IMFVideoProcessorControl, TRUE); -todo_wine + todo_wine check_interface(transform, &IID_IMFRealTimeClientEx, TRUE); check_interface(transform, &IID_IMFMediaEventGenerator, FALSE); check_interface(transform, &IID_IMFShutdown, FALSE); @@ -3450,7 +3450,7 @@ todo_wine hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(!!count, "Unexpected attribute count %u.\n", count); value = 0; @@ -3485,14 +3485,14 @@ todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputStatus(transform, 0, &flags); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputStatus(transform, &flags); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputStreamAttributes(transform, 0, &attributes); @@ -3504,27 +3504,27 @@ todo_wine IMFAttributes_Release(attributes2); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); -todo_wine + todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 1, &media_type); -todo_wine + todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputCurrentType(transform, 1, &media_type); -todo_wine + todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputStreamInfo(transform, 1, &input_info); -todo_wine + todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); memset(&input_info, 0xcc, sizeof(input_info)); @@ -3549,7 +3549,7 @@ todo_wine { { if (FAILED(hr = IMFTransform_GetInputAvailableType(transform, 0, i, &media_type))) { - todo_wine + todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); break; } @@ -3630,22 +3630,22 @@ todo_wine { ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set input type, hr %#x.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set output type, hr %#x.\n", hr); memset(&output_info, 0, sizeof(output_info)); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); -todo_wine + todo_wine ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); ok(output_info.dwFlags == 0, "Unexpected flags %#x.\n", output_info.dwFlags); -todo_wine + todo_wine ok(output_info.cbSize > 0, "Unexpected size %u.\n", output_info.cbSize); ok(output_info.cbAlignment == 0, "Unexpected alignment %u.\n", output_info.cbAlignment); @@ -3659,24 +3659,24 @@ todo_wine output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); hr = IMFTransform_ProcessInput(transform, 0, sample2, 0); -todo_wine + todo_wine ok(hr == S_OK, "Failed to push a sample, hr %#x.\n", hr); hr = IMFTransform_ProcessInput(transform, 0, sample2, 0); -todo_wine + todo_wine ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); memset(&output_buffer, 0, sizeof(output_buffer)); output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); -todo_wine + todo_wine ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); @@ -3687,7 +3687,7 @@ todo_wine output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); @@ -3705,7 +3705,7 @@ todo_wine output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); -todo_wine + todo_wine ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Failed to get output buffer, hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); @@ -3885,7 +3885,7 @@ static void test_sar(void) ok(hr == S_OK, "Failed to create presentation clock, hr %#x.\n", hr); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&time_source); -todo_wine + todo_wine ok(hr == S_OK, "Failed to get time source interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) @@ -3968,7 +3968,7 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_SetPresentationClock(sink, present_clock); -todo_wine + todo_wine ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); hr = MFCreateSystemTimeSource(&time_source); @@ -4215,7 +4215,7 @@ todo_wine ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); -todo_wine + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaSink_Release(sink); @@ -4531,7 +4531,7 @@ todo_wine { /* Activate again. */ hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); -todo_wine + todo_wine ok(sink == sink2, "Unexpected instance.\n"); IMFMediaSink_Release(sink2);

1 0

Fabian Maurer : msi/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 164664a34ee7f01395e8b9028728a026268c1595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=164664a34ee7f01395e8b902… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:08 2022 +0100 msi/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 6 +++--- dlls/msi/tests/db.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1db132fbd2f..52ac63dc61b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2782,7 +2782,7 @@ static void test_register_product(void) } res = RegDeleteKeyA(usage, ""); -todo_wine + todo_wine ok(!res, "got %d\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); @@ -2887,7 +2887,7 @@ todo_wine } res = RegDeleteKeyA(usage, ""); -todo_wine + todo_wine ok(!res, "got %d\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); @@ -2999,7 +2999,7 @@ todo_wine } res = RegDeleteKeyA(usage, ""); - todo_wine + todo_wine ok(!res, "got %d\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 447f2cdd0ee..b75e5f7a4b5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8864,7 +8864,7 @@ static void test_viewmodify_merge(void) MsiRecordSetInteger(rec, 1, 1); MsiRecordSetInteger(rec, 2, 3); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiRecordSetInteger(rec, 1, 2); @@ -8913,7 +8913,7 @@ todo_wine MsiRecordSetInteger(rec, 3, 4); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiRecordSetInteger(rec, 2, 4); @@ -8958,7 +8958,7 @@ todo_wine MsiRecordSetInteger(rec, 2, 3); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiCloseHandle(rec); @@ -8998,7 +8998,7 @@ todo_wine MsiRecordSetInteger(rec, 2, 2); MsiRecordSetInteger(rec, 3, 3); r = MsiViewModify(view, MSIMODIFY_MERGE, rec); -todo_wine + todo_wine ok(r == ERROR_FUNCTION_FAILED, "got %u\n", r); MsiRecordSetInteger(rec, 1, 1);

1 0

Fabian Maurer : msvcirt/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 1ebee86f6dad81232307b66df5b7a0d24b86a198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ebee86f6dad81232307b66d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:10 2022 +0100 msvcirt/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 21d513c0fd9..43ffb277ed4 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -3586,8 +3586,8 @@ static void test_ostream(void) { ret = (int) call_func1(p_ostream_opfx, &os1); ok(ret == 1, "expected 1 got %d\n", ret); os1.base_ios.sb = NULL; -if (0) /* crashes on native */ - call_func1(p_ostream_osfx, &os1); + if (0) /* crashes on native */ + call_func1(p_ostream_osfx, &os1); os1.base_ios.sb = &fb1.base; os1.base_ios.flags = FLAGS_unitbuf; call_func1(p_ostream_osfx, &os1);

1 0