wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Fabian Maurer : scrrun/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ea58b3dbe90c6ec280c4b469f9b2137e8a77b3f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea58b3dbe90c6ec280c4b469… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:46 2022 +0100 scrrun/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/scrrun/tests/dictionary.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 4259bc71c8e..d20456a5096 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -769,8 +769,8 @@ static void test_Exists(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) /* crashes on native */ - hr = IDictionary_Exists(dict, NULL, NULL); + if (0) /* crashes on native */ + hr = IDictionary_Exists(dict, NULL, NULL); V_VT(&key) = VT_I2; V_I2(&key) = 0; @@ -875,8 +875,8 @@ static void test_Remove(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) - hr = IDictionary_Remove(dict, NULL); + if (0) + hr = IDictionary_Remove(dict, NULL); /* nothing added yet */ V_VT(&key) = VT_R4;

1 0

Fabian Maurer : schedsvc/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 55741aead378c8ee4e6cd8f6bbbf187332533f7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=55741aead378c8ee4e6cd8f6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:45 2022 +0100 schedsvc/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/schedsvc/tests/rpcapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index a8f75ded7a5..09523df4fd6 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -493,15 +493,15 @@ START_TEST(rpcapi) ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %u\n", state); hr = SchRpcEnableTask(L"\\Wine\\Task1", 0xdeadbeef); -todo_wine + todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); enabled = state = 0xdeadbeef; hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", SCH_FLAG_STATE, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -todo_wine + todo_wine ok(enabled == 1, "expected 1, got %u\n", enabled); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %u\n", state); hr = SchRpcDelete(L"Wine\\Task1", 0);

1 0

Fabian Maurer : rpcrt4/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 0d7f7bec9d1387f916b32895fcc6dd82733245a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d7f7bec9d1387f916b32895… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:44 2022 +0100 rpcrt4/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/rpcrt4/tests/ndr_marshall.c | 6 +++--- dlls/rpcrt4/tests/server.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index b206c37b233..12240e30928 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1843,7 +1843,7 @@ static void test_server_init(void) ok(stubMsg.Buffer == buffer, "stubMsg.Buffer should have been %p instead of %p\n", buffer, stubMsg.Buffer); ok(stubMsg.BufferStart == buffer, "stubMsg.BufferStart should have been %p instead of %p\n", buffer, stubMsg.BufferStart); ok(stubMsg.BufferEnd == buffer + sizeof(buffer), "stubMsg.BufferEnd should have been %p instead of %p\n", buffer + sizeof(buffer), stubMsg.BufferEnd); -todo_wine + todo_wine ok(stubMsg.BufferLength == 0, "stubMsg.BufferLength should have been 0 instead of %u\n", stubMsg.BufferLength); ok(stubMsg.IsClient == 0, "stubMsg.IsClient should have been 0 instead of %u\n", stubMsg.IsClient); ok(stubMsg.ReuseBuffer == 0 || @@ -2649,7 +2649,7 @@ static void test_ndr_buffer(void) ok(StubMsg.Buffer != NULL, "Buffer should not have been NULL\n"); ok(!StubMsg.BufferStart, "BufferStart should have been NULL instead of %p\n", StubMsg.BufferStart); ok(!StubMsg.BufferEnd, "BufferEnd should have been NULL instead of %p\n", StubMsg.BufferEnd); -todo_wine + todo_wine ok(StubMsg.BufferLength == 0, "BufferLength should have left as 0 instead of being set to %d\n", StubMsg.BufferLength); old_buffer_valid_location = !StubMsg.fBufferValid; if (old_buffer_valid_location) @@ -2942,7 +2942,7 @@ static void test_MesEncodeFixedBufferHandleCreate(void) ok(status == RPC_S_INVALID_ARG, "got %d\n", status); status = MesEncodeFixedBufferHandleCreate(buffer, 0, &encoded_size, &handle); -todo_wine + todo_wine ok(status == RPC_S_INVALID_ARG, "got %d\n", status); if (status == RPC_S_OK) { MesHandleFree(handle); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 3f34aac681d..d11145b24d3 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1084,7 +1084,7 @@ void __cdecl s_stop_autolisten(void) { RPC_STATUS status; status = RpcServerUnregisterIf(NULL, NULL, FALSE); -todo_wine + todo_wine ok(status == RPC_S_UNKNOWN_MGR_TYPE, "got %u\n", status); } @@ -2000,7 +2000,7 @@ client(const char *test) run_tests(); authinfo_test(RPC_PROTSEQ_LRPC, 0); -todo_wine + todo_wine test_is_server_listening(IMixedServer_IfHandle, RPC_S_NOT_LISTENING); stop_autolisten();

1 0

Fabian Maurer : riched20/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 2d6fad7bda2f2e21a871f405a6b0c3e70ebf6a6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6fad7bda2f2e21a871f405… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:43 2022 +0100 riched20/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/riched20/tests/richole.c | 20 ++++++++++---------- dlls/riched20/tests/txtsrv.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 9449c6b58cc..c06be02bd89 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -431,7 +431,7 @@ todo_wine { touch_file(filename); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomShareDenyRead, CP_ACP); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); SetLastError(0xdeadbeef); hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, @@ -444,7 +444,7 @@ todo_wine touch_file(filename); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomShareDenyWrite, CP_ACP); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); SetLastError(0xdeadbeef); hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, @@ -458,7 +458,7 @@ todo_wine create_interfaces(&w, &reOle, &txtDoc, &txtSel); SetLastError(0xdeadbeef); hres = ITextDocument_Open(txtDoc, &testfile, tomShareDenyWrite|tomShareDenyRead, CP_ACP); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -474,7 +474,7 @@ todo_wine CloseHandle(hFile); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomReadOnly, CP_ACP); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); result = SendMessageA(w, WM_GETTEXT, 1024, (LPARAM)bufACP); todo_wine ok(result == 12, "ITextDocument_Open: Test ASCII returned %d, expected 12\n", result); @@ -489,7 +489,7 @@ todo_wine CloseHandle(hFile); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomReadOnly, CP_UTF8); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); result = SendMessageA(w, WM_GETTEXT, 1024, (LPARAM)bufACP); todo_wine ok(result == 15, "ITextDocument_Open: Test UTF-8 returned %d, expected 15\n", result); @@ -504,7 +504,7 @@ todo_wine CloseHandle(hFile); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomReadOnly, 1200); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); result = SendMessageW(w, WM_GETTEXT, 1024, (LPARAM)bufUnicode); todo_wine ok(result == 12, "ITextDocument_Open: Test UTF-16 returned %d, expected 12\n", result); @@ -680,13 +680,13 @@ static void test_GetText(void) bstr = (void*)0xdeadbeef; hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); -todo_wine + todo_wine ok(bstr == NULL, "got %p\n", bstr); bstr = (void*)0xdeadbeef; hres = ITextRange_GetText(range, &bstr); ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); -todo_wine + todo_wine ok(bstr == NULL, "got %p\n", bstr); } else { @@ -2679,7 +2679,7 @@ todo_wine { } hr = ITextRange_GetEnd(range, &value); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(value == 3, "got %d\n", value); hr = ITextRange_GetStart(range2, &value); @@ -2688,7 +2688,7 @@ todo_wine hr = ITextRange_GetEnd(range2, &value); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(value == 1, "got %d\n", value); ITextRange_Release(range); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1f789da8a37..22082201fbc 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -1126,7 +1126,7 @@ static void test_TxGetScroll(void) ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); ok( min_pos == 0, "got %d\n", min_pos ); -todo_wine + todo_wine ok( max_pos == 0, "got %d\n", max_pos ); ok( pos == 0, "got %d\n", pos ); ok( page == client.bottom, "got %d\n", page ); @@ -1150,7 +1150,7 @@ todo_wine ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); ok( min_pos == 0, "got %d\n", min_pos ); -todo_wine + todo_wine ok( max_pos == 0, "got %d\n", max_pos ); ok( pos == 0, "got %d\n", pos ); ok( page == client.bottom, "got %d\n", page );

1 0

Fabian Maurer : quartz/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 20ea5b8251f6294a26eae6b4950a752bfec2fc0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=20ea5b8251f6294a26eae6b4… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jan 31 11:27:06 2022 -0600 quartz/tests: Avoid "misleading indentation" warnings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 6 ++---- dlls/quartz/tests/filtergraph.c | 38 +++++++++++++------------------------- dlls/quartz/tests/videorenderer.c | 3 +-- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 31b32b53ac9..8b9a472c0f3 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -380,8 +380,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); -todo_wine - ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -412,8 +411,7 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); -todo_wine - ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", debugstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index a83bfde0806..620a1a56bad 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2474,8 +2474,7 @@ static void test_graph_builder_connect(void) IFilterGraph2_AddFilter(graph, &sink2.IBaseFilter_iface, NULL); hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine - ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr); + todo_wine ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); ok(!parser1_pins[2].peer, "Got peer %p.\n", parser1_pins[2].peer); @@ -3105,32 +3104,24 @@ static void test_connect_direct(void) /* Swap the pins when connecting. */ hr = IFilterGraph2_ConnectDirect(graph, &sink_pin.IPin_iface, &source_pin.IPin_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine - ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); + todo_wine ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); ok(!sink_pin.mt, "Got mt %p.\n", sink_pin.mt); -todo_wine - ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); -todo_wine - ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine - ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); hr = IFilterGraph2_Connect(graph, &sink_pin.IPin_iface, &source_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine - ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); + todo_wine ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); ok(!sink_pin.mt, "Got mt %p.\n", sink_pin.mt); -todo_wine - ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); -todo_wine - ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine - ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); /* Disconnect() does not disconnect the peer. */ @@ -3304,8 +3295,7 @@ todo_wine ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref); ok(sink.ref == 1, "Got outstanding refcount %d.\n", sink.ref); ok(source_pin.ref == 1, "Got outstanding refcount %d.\n", source_pin.ref); -todo_wine - ok(sink_pin.ref == 1, "Got outstanding refcount %d.\n", sink_pin.ref); + todo_wine ok(sink_pin.ref == 1, "Got outstanding refcount %d.\n", sink_pin.ref); ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); } @@ -3350,8 +3340,7 @@ static void test_sync_source(void) ok(!filter2.clock, "Got clock %p.\n", filter2.clock); hr = IMediaFilter_GetSyncSource(filter, &clock); -todo_wine - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(!clock, "Got clock %p.\n", clock); IReferenceClock_Release(systemclock); @@ -3647,9 +3636,8 @@ static void test_filter_state(void) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); -todo_wine - ok(source.start_time > 0 && source.start_time < 500 * 10000, - "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); + todo_wine ok(source.start_time > 0 && source.start_time < 500 * 10000, + "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 5625971426b..ec212f1b5d6 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -347,8 +347,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); -todo_wine - ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin);

1 0

Fabian Maurer : psapi/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: a112457c2b8b492378c040a18169ab58815086d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a112457c2b8b492378c040a1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:41 2022 +0100 psapi/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/psapi/tests/psapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index c4a740310a4..6e3831d8dad 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -184,7 +184,7 @@ static void test_EnumProcessModules(void) SetLastError(0xdeadbeef); ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); ok(!ret, "got %d\n", ret); -todo_wine + todo_wine ok(GetLastError() == ERROR_PARTIAL_COPY, "got error %u\n", GetLastError()); TerminateProcess(pi.hProcess, 0);

1 0

Fabian Maurer : propsys/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 7cd6681b3be35cf6c02f056cb5131c90c0674c16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cd6681b3be35cf6c02f056c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:40 2022 +0100 propsys/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/propsys/tests/propsys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 6370c01dc80..792ef1dd785 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -840,7 +840,7 @@ static void test_PropVariantCompareEx(void) /* VT_R4/VT_R8 */ res = PropVariantCompareEx(&r4_0, &r8_0, 0, 0); -todo_wine + todo_wine ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&r4_0, &r4_0, 0, 0); @@ -2014,7 +2014,7 @@ static void test_PSCreatePropertyStoreFromObject(void) ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = PSCreatePropertyStoreFromObject((IUnknown *)propstore, STGM_READWRITE, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == S_OK, "Failed to create wrapper, hr %#x.\n", hr); if (SUCCEEDED(hr)) {

1 0

Fabian Maurer : msacm32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 27014cfafe69252dcee61eddae8bc0ef4b22bfe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27014cfafe69252dcee61edd… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:07 2022 +0100 msacm32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 82ddb430cd7..4e31256e3cd 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -952,7 +952,7 @@ static void test_prepareheader(void) ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); -todo_wine + todo_wine ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -980,7 +980,7 @@ todo_wine ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); -todo_wine + todo_wine ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -1029,9 +1029,9 @@ todo_wine mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); -todo_wine + todo_wine ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); -todo_wine + todo_wine ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %d, got %d\n", hdr.cbDstLength, hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -1129,7 +1129,7 @@ static void test_convert(void) ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "#%d: conversion was not done: 0x%x\n", i, hdr.fdwStatus); ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "#%d: expected %d, got %d\n", i, hdr.cbSrcLength, hdr.cbSrcLengthUsed); ok(hdr.cbDstLengthUsed == expected_output[i].dst_used, "#%d: expected %d, got %d\n", i, expected_output[i].dst_used, hdr.cbDstLengthUsed); -todo_wine_if(expected_output[i].todo) + todo_wine_if(expected_output[i].todo) ok(!memcmp(expected_output[i].output, output, hdr.cbDstLengthUsed), "#%d: output does not match\n", i); mmr = acmStreamUnprepareHeader(has, &hdr, 0); @@ -1503,7 +1503,7 @@ static void test_acmDriverAdd(void) res = acmDriverAddA(&drvid, GetModuleHandleA(NULL), (LPARAM)acm_driver_func, 0, ACM_DRIVERADDF_FUNCTION); ok(res == MMSYSERR_NOERROR, "Expected 0, got %d\n", res); -todo_wine + todo_wine ok(driver_calls.driver.open == 1, "Expected 1, got %d\n", driver_calls.driver.open); ok(driver_calls.driver.details == 1, "Expected 1, got %d\n", driver_calls.driver.details); @@ -1514,10 +1514,10 @@ todo_wine acm.drv_details.cbStruct = sizeof(acm.drv_details); res = acmDriverDetailsA(drvid, &acm.drv_details, 0); ok(res == MMSYSERR_NOERROR, "Expected 0, got %d\n", res); -todo_wine + todo_wine ok(driver_calls.driver.open == 1, "Expected 1, got %d\n", driver_calls.driver.open); ok(driver_calls.driver.details == 2, "Expected 2, got %d\n", driver_calls.driver.details); -todo_wine + todo_wine ok(driver_calls.driver.close == 0, "Expected 0, got %d\n", driver_calls.driver.close); }

1 0

Fabian Maurer : mfplat/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 93eda568b9bddc3a34bb679d39c156ee245d0870 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93eda568b9bddc3a34bb679d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:04 2022 +0100 mfplat/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/mfplat/tests/mfplat.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 207bd61b8dc..f89a5202d80 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -918,7 +918,7 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); -todo_wine + todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); @@ -6920,7 +6920,7 @@ static void test_d3d12_surface_buffer(void) hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D12Resource, (IUnknown *)resource, 0, FALSE, &buffer); if (hr == E_INVALIDARG) { -todo_wine + todo_wine win_skip("D3D12 resource buffers are not supported.\n"); goto notsupported; } @@ -7088,7 +7088,7 @@ static void test_sample_allocator_sysmem(void) hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(!count, "Unexpected count %d.\n", count); check_interface(sample, &IID_IMFTrackedSample, TRUE); @@ -7112,7 +7112,7 @@ todo_wine hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine EXPECT_REF(video_type, 2); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); @@ -7455,7 +7455,7 @@ static void test_sample_allocator_d3d11(void) hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); if (sharing[i] == (D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED)) { - todo_wine + todo_wine ok(hr == E_INVALIDARG, "%u: Unexpected hr %#x.\n", i, hr); IMFVideoSampleAllocatorEx_Release(allocatorex); continue; @@ -7540,7 +7540,7 @@ static void test_sample_allocator_d3d12(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); -todo_wine + todo_wine ok(hr == S_OK || broken(hr == MF_E_UNEXPECTED) /* Some Win10 versions fail. */, "Unexpected hr %#x.\n", hr); if (FAILED(hr)) goto done;

1 0

Alexandre Julliard : vkd3d-shader: Use LONG type with InterlockedIncrement.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: vkd3d Branch: master Commit: 7710f5deaf05b2c2c76b89fa2cf61a3f767af5bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7710f5deaf05b2c2c76b89f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 11:51:58 2022 +0100 vkd3d-shader: Use LONG type with InterlockedIncrement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 47fe3d6..ae0662b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -308,7 +308,7 @@ void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const char *suffix, const void *data, size_t size) { - static int shader_id = 0; + static LONG shader_id = 0; char filename[1024]; unsigned int id; FILE *f;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2022