[PATCH 01/22] propsys/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 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))
     {
--
2.35.0

[PATCH 02/22] psapi/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 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);
--
2.35.0

[PATCH 02/22] psapi/tests: Avoid "misleading indentation" warnings.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106390

Your paranoid android.


=== w10pro64_ja (64 bit report) ===

psapi:
psapi_main.c:778: Test failed: exe expected Valid=1 but got 0
psapi_main.c:782: Test failed: exe expected Win32Protection=2 but got 0

[PATCH 03/22] quartz/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/quartz/tests/acmwrapper.c    |  4 ++--
 dlls/quartz/tests/filtergraph.c   | 24 ++++++++++++------------
 dlls/quartz/tests/videorenderer.c |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c
index 31b32b53ac9..17cdab175bd 100644
--- a/dlls/quartz/tests/acmwrapper.c
+++ b/dlls/quartz/tests/acmwrapper.c
@@ -380,7 +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
+    todo_wine
     ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName));
     ref = get_refcount(filter);
     ok(ref == 3, "Got unexpected refcount %d.\n", ref);
@@ -412,7 +412,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
+    todo_wine
     ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName));
     IBaseFilter_Release(info.pFilter);

diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index a83bfde0806..9ebec1f29b5 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -2474,7 +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
+    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);
@@ -3105,31 +3105,31 @@ 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
+    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
+    todo_wine
     ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);

     hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface);
-todo_wine
+    todo_wine
     ok(hr == S_OK, "Got hr %#x.\n", hr);
-todo_wine
+    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
+    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
+    todo_wine
     ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);

     hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface);
-todo_wine
+    todo_wine
     ok(hr == S_OK, "Got hr %#x.\n", hr);
-todo_wine
+    todo_wine
     ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
     ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer);

@@ -3304,7 +3304,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
+    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,7 +3350,7 @@ static void test_sync_source(void)
     ok(!filter2.clock, "Got clock %p.\n", filter2.clock);

     hr = IMediaFilter_GetSyncSource(filter, &clock);
-todo_wine
+    todo_wine
     ok(hr == S_FALSE, "Got hr %#x.\n", hr);
     ok(!clock, "Got clock %p.\n", clock);

@@ -3647,7 +3647,7 @@ 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
+    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",
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 5625971426b..379e515400d 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -347,7 +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
+    todo_wine
     ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName));
     ref = get_refcount(filter);
     ok(ref == 3, "Got unexpected refcount %d.\n", ref);
--
2.35.0

[PATCH 04/22] riched20/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 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 );
--
2.35.0

[PATCH 04/22] riched20/tests: Avoid "misleading indentation" warnings.

[Huw Davies]

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

[PATCH 05/22] rpcrt4/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 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();
--
2.35.0

[PATCH 05/22] rpcrt4/tests: Avoid "misleading indentation" warnings.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106393

Your paranoid android.


=== w1064 (32 bit report) ===

rpcrt4:
server.c:2178: Test failed: RpcBindingFree

=== w10pro64 (32 bit report) ===

rpcrt4:
server.c:2178: Test failed: RpcBindingFree

=== w1064 (64 bit report) ===

rpcrt4:
server.c:2178: Test failed: RpcBindingFree

=== w1064_2qxl (64 bit report) ===

rpcrt4:
server.c:2178: Test failed: RpcBindingFree

=== w1064_tsign (64 bit report) ===

rpcrt4:
0b48:server: unhandled exception 000006be at 00007FFEF7FBD759

=== w10pro64 (64 bit report) ===

rpcrt4:
server.c:2178: Test failed: RpcBindingFree

=== w10pro64_ja (64 bit report) ===

rpcrt4:
server.c:2178: Test failed: RpcBindingFree

[PATCH 05/22] rpcrt4/tests: Avoid "misleading indentation" warnings.

[Huw Davies]

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

[PATCH 06/22] schedsvc/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 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);
--
2.35.0

[PATCH 06/22] schedsvc/tests: Avoid "misleading indentation" warnings.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106394

Your paranoid android.


=== w7u_adm (32 bit report) ===

schedsvc:
rpcapi.c:245: Test failed: expected NULL, got 0059AC78
rpcapi.c:257: Test failed: expected NULL, got 0059AC98
rpcapi.c:357: Test failed: expected NULL, got 0059ACB8

[PATCH 07/22] scrrun/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 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;
--
2.35.0

[PATCH 08/22] secur32/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/secur32/tests/schannel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
index abddfa138ab..028e1e933dc 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -1074,9 +1074,9 @@ static void test_communication(void)
     status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
             ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
             0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL);
-todo_wine
+    todo_wine
     ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status);
-todo_wine
+    todo_wine
     ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n");

     buffers[1].cBuffers = 1;
--
2.35.0

[PATCH 08/22] secur32/tests: Avoid "misleading indentation" warnings.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106396

Your paranoid android.


=== w1064 (32 bit report) ===

secur32:
schannel.c:1442: Test failed: got 00090317
schannel.c:1452: Test failed: DecryptMessage failed: 80090317

=== w1064 (64 bit report) ===

secur32:
schannel.c:1442: Test failed: got 00090317
schannel.c:1452: Test failed: DecryptMessage failed: 80090317

[PATCH 08/22] secur32/tests: Avoid "misleading indentation" warnings.

[Hans Leidekker]

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

[PATCH 09/22] setupapi/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/setupapi/tests/devinst.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 35823788605..91eaba84a3c 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -121,7 +121,7 @@ static void test_open_class_key(void)
     SetLastError(0xdeadbeef);
     class_key = SetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, DIOCR_INSTALLER, NULL, NULL);
     ok(class_key == INVALID_HANDLE_VALUE, "Expected failure.\n");
-todo_wine
+    todo_wine
     ok(GetLastError() == ERROR_INVALID_CLASS, "Got unexpected error %#x.\n", GetLastError());

     root_key = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS);
@@ -1567,7 +1567,7 @@ static void test_registry_property_a(void)
     SetLastError(0xdeadbeef);
     ret = SetupDiSetDeviceRegistryPropertyA(set, &device, -1, NULL, 0);
     ok(!ret, "Expected failure.\n");
-todo_wine
+    todo_wine
     ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError());

     ret = SetupDiSetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, 0);
@@ -1592,7 +1592,7 @@ todo_wine
     SetLastError(0xdeadbeef);
     ret = SetupDiGetDeviceRegistryPropertyA(set, &device, -1, NULL, NULL, 0, NULL);
     ok(!ret, "Expected failure.\n");
-todo_wine
+    todo_wine
     ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError());

     ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, NULL, sizeof("Bogus"), NULL);
@@ -1727,7 +1727,7 @@ static void test_registry_property_w(void)
     SetLastError(0xdeadbeef);
     ret = SetupDiSetDeviceRegistryPropertyW(set, &device, -1, NULL, 0);
     ok(!ret, "Expected failure.\n");
-todo_wine
+    todo_wine
     ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError());

     ret = SetupDiSetDeviceRegistryPropertyW(set, &device, SPDRP_FRIENDLYNAME, NULL, 0);
@@ -1752,7 +1752,7 @@ todo_wine
     SetLastError(0xdeadbeef);
     ret = SetupDiGetDeviceRegistryPropertyW(set, &device, -1, NULL, NULL, 0, NULL);
     ok(!ret, "Expected failure.\n");
-todo_wine
+    todo_wine
     ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError());

     ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_FRIENDLYNAME, NULL, NULL, sizeof(buf), NULL);
--
2.35.0

[PATCH 10/22] shell32/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/shell32/tests/appbar.c        |  2 +-
 dlls/shell32/tests/shelldispatch.c | 12 ++++++------
 dlls/shell32/tests/shelllink.c     | 10 +++++-----
 dlls/shell32/tests/shlfolder.c     | 22 +++++++++++-----------
 dlls/shell32/tests/shlview.c       |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c
index 229d616c6f0..e1c050bbc16 100644
--- a/dlls/shell32/tests/appbar.c
+++ b/dlls/shell32/tests/appbar.c
@@ -431,7 +431,7 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void)

     appid = (void*)0xdeadbeef;
     hr = pGetCurrentProcessExplicitAppUserModelID(&appid);
-todo_wine
+    todo_wine
     ok(hr == E_FAIL, "got 0x%08x\n", hr);
     ok(appid == NULL, "got %p\n", appid);
 }
diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
index 8e69a0bfa4e..f243ba053d0 100644
--- a/dlls/shell32/tests/shelldispatch.c
+++ b/dlls/shell32/tests/shelldispatch.c
@@ -781,16 +781,16 @@ static void test_items(void)
     }

     r = FolderItems__NewEnum(items, &unk);
-todo_wine
+    todo_wine
     ok(r == S_OK, "FolderItems::_NewEnum failed: %08x\n", r);
-todo_wine
+    todo_wine
     ok(!!unk, "unk is null\n");
     if (unk) IUnknown_Release(unk);

     if (items3)
     {
         r = FolderItems3_Filter(items3, 0, NULL);
-todo_wine
+        todo_wine
         ok(r == S_OK, "expected S_OK, got %08x\n", r);

         if (0) /* crashes on xp */
@@ -800,7 +800,7 @@ todo_wine
         }

         r = FolderItems3_get_Verbs(items3, &verbs);
-todo_wine
+        todo_wine
         ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r);
         ok(!verbs, "verbs is not null\n");
     }
@@ -1137,7 +1137,7 @@ static void test_ShellWindows(void)
         ok(hr == S_OK, "got 0x%08x\n", hr);

         hr = IWebBrowser2_Refresh(wb);
-todo_wine
+        todo_wine
         ok(hr == S_OK, "got 0x%08x\n", hr);

         hr = IWebBrowser2_get_Application(wb, &app);
@@ -1219,7 +1219,7 @@ if (hr == S_OK) {
     V_I4(&v) = cookie;
     VariantInit(&v2);
     hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_BROWSER, &ret, SWFO_COOKIEPASSED, &disp);
-todo_wine
+    todo_wine
     ok(hr == S_FALSE, "got 0x%08x\n", hr);
     ok(disp == NULL, "got %p\n", disp);
     ok(ret == 0, "got %d\n", ret);
diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index edd536c3a01..5caebcd776c 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -1181,7 +1181,7 @@ static void test_ExtractIcon(void)

     /* specified instance handle */
     hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0);
-todo_wine
+    todo_wine
     ok(hicon == NULL, "Got icon %p\n", hicon);
     hicon2 = ExtractIconA(GetModuleHandleA("shell32.dll"), "shell32.dll", -1);
     ok(hicon2 != NULL, "Got icon %p\n", hicon2);
@@ -1207,14 +1207,14 @@ todo_wine
     CloseHandle(file);

     hicon = ExtractIconA(NULL, path, 0);
-todo_wine
+    todo_wine
     ok(hicon == NULL, "Got icon %p\n", hicon);

     hicon = ExtractIconA(NULL, path, -1);
     ok(hicon == NULL, "Got icon %p\n", hicon);

     hicon = ExtractIconA(NULL, path, 1);
-todo_wine
+    todo_wine
     ok(hicon == NULL, "Got icon %p\n", hicon);

     r = DeleteFileA(path);
@@ -1255,14 +1255,14 @@ if (0)
     CloseHandle(file);

     hicon = ExtractIconW(NULL, pathW, 0);
-todo_wine
+    todo_wine
     ok(hicon == NULL, "Got icon %p\n", hicon);

     hicon = ExtractIconW(NULL, pathW, -1);
     ok(hicon == NULL, "Got icon %p\n", hicon);

     hicon = ExtractIconW(NULL, pathW, 1);
-todo_wine
+    todo_wine
     ok(hicon == NULL, "Got icon %p\n", hicon);

     r = DeleteFileW(pathW);
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 29fcd0b7754..f593f8b821d 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -208,7 +208,7 @@ static void test_ParseDisplayName(void)
     for (i = 0; i < ARRAY_SIZE(parse_tests); i++)
     {
         hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, parse_tests[i].path, NULL, &pidl, NULL);
-todo_wine_if(parse_tests[i].todo)
+        todo_wine_if(parse_tests[i].todo)
         ok(hr == parse_tests[i].hr, "%s: expected %#x, got %#x\n",
             wine_dbgstr_w(parse_tests[i].path), parse_tests[i].hr, hr);
         if (SUCCEEDED(hr))
@@ -4334,16 +4334,16 @@ static void test_contextmenu_qi(IContextMenu *menu, BOOL todo)
     HRESULT hr;

     hr = IContextMenu_QueryInterface(menu, &IID_IShellExtInit, (void **)&unk);
-todo_wine_if(todo)
+    todo_wine_if(todo)
     ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr);
-if (hr == S_OK)
-    IUnknown_Release(unk);
+    if (hr == S_OK)
+        IUnknown_Release(unk);

     hr = IContextMenu_QueryInterface(menu, &IID_IObjectWithSite, (void **)&unk);
-todo_wine_if(todo)
+    todo_wine_if(todo)
     ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr);
-if (hr == S_OK)
-    IUnknown_Release(unk);
+    if (hr == S_OK)
+        IUnknown_Release(unk);
 }

 static void test_contextmenu(IContextMenu *menu, BOOL background)
@@ -4418,7 +4418,7 @@ static void test_contextmenu(IContextMenu *menu, BOOL background)
         /* Attempt to execute a nonexistent command */
         cmi.lpVerb = MAKEINTRESOURCEA(9999);
         hr = IContextMenu_InvokeCommand(menu, &cmi);
-    todo_wine_if(background)
+        todo_wine_if(background)
         ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr);

         cmi.lpVerb = "foobar_wine_test";
@@ -5290,18 +5290,18 @@ static void test_SHLimitInputEdit(void)
     ok(hr == S_OK, "Failed to get desktop folder, hr %#x.\n", hr);

     hr = SHLimitInputEdit(NULL, desktop);
-todo_wine
+    todo_wine
     ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);

     hwnd = CreateWindowA("EDIT", NULL, WS_VISIBLE, 0, 0, 100, 30, NULL, NULL, NULL, NULL);
     ok(hwnd != NULL, "Failed to create Edit control.\n");

     hr = SHLimitInputEdit(hwnd, desktop);
-todo_wine
+    todo_wine
     ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr);

     hr = SHLimitInputEdit(hwnd, desktop);
-todo_wine
+    todo_wine
     ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr);

     DestroyWindow(hwnd);
diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c
index f5d96c8d441..48ba72a4c0e 100644
--- a/dlls/shell32/tests/shlview.c
+++ b/dlls/shell32/tests/shlview.c
@@ -1479,7 +1479,7 @@ static void test_newmenu(void)
     HRESULT hr;

     hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk);
-todo_wine
+    todo_wine
     ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr);
     if (hr != S_OK)
     {
--
2.35.0

[PATCH 10/22] shell32/tests: Avoid "misleading indentation" warnings.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106398

Your paranoid android.


=== w1064v1809 (32 bit report) ===

shell32:
shlfolder.c:4910: Test failed: MKDIR: expected notification type 8, got: 40000
shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)

=== w1064_tsign (32 bit report) ===

shell32:
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)

=== w10pro64 (32 bit report) ===

shell32:
shlfolder.c:4910: Test failed: CREATE: expected notification type 2, got: 40000
shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2)

=== w1064v1809 (64 bit report) ===

shell32:
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)

=== w1064 (64 bit report) ===

shell32:
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)

=== w1064_tsign (64 bit report) ===

shell32:
shlfolder.c:4910: Test failed: RMDIR: expected notification type 10, got: 40000
shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)

=== w10pro64 (64 bit report) ===

shell32:
shlfolder.c:4910: Test failed: CREATE: expected notification type 2, got: 40000
shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2)

=== w10pro64_ar (64 bit report) ===

shell32:
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000)
shlfolder.c:4910: Test failed: CREATE: expected notification type 2, got: 40000
shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2)

=== w10pro64_he (64 bit report) ===

shell32:
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)

=== w10pro64_ja (64 bit report) ===

shell32:
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000)
shlfolder.c:4910: Test failed: MKDIR: expected notification type 8, got: 4000000
shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057
shlfolder.c:4918: Test failed: Expected PIDL to be NULL
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
shlfolder.c:4910: Test failed: MKDIR: expected notification type 8, got: 40000
shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)

=== w10pro64_zh_CN (64 bit report) ===

shell32:
shlfolder.c:4910: Test failed: RMDIR: expected notification type 10, got: 40000
shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
shlfolder.c:4910: Test failed: MKDIR: expected notification type 8, got: 40000
shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057
shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)

[PATCH 11/22] shlwapi/tests: Avoid "misleading indentation" warnings.

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/shlwapi/tests/istream.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c
index 84957ac8cd1..4894eabdf50 100644
--- a/dlls/shlwapi/tests/istream.c
+++ b/dlls/shlwapi/tests/istream.c
@@ -810,7 +810,7 @@ static void test_SHCreateMemStream(void)
     ok(num == 0, "expected 0, got 0x%08x\n", num);

     hr = IStream_Clone(stream, &stream2);
-todo_wine
+    todo_wine
     ok(hr == S_OK || broken(hr == E_NOTIMPL) /* < Win8 */, "Failed to clone a stream, hr %#x.\n", hr);
     if (hr == S_OK)
         IStream_Release(stream2);
--
2.35.0