[PATCH 1/4] ole32/tests: Fix some failures on Windows 10.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/ole32/tests/marshal.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index 2aaa34e51b5..582b63f484a 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -61,6 +61,7 @@

static const GUID CLSID_WineTestPSFactoryBuffer = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } };
 static const GUID CLSID_DfMarshal = { 0x0000030b, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
+static const GUID CLSID_ft_unmarshaler_1809 = {0x00000359, 0x0000, 0x0000, {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}};

/* functions that are not present on all versions of Windows */
 static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit);
@@ -1392,7 +1393,7 @@ static ULONG WINAPI CustomMarshal_Release(IMarshal *iface)
 static HRESULT WINAPI CustomMarshal_GetUnmarshalClass(IMarshal *iface, REFIID riid,
         void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid)
 {
-    CHECK_EXPECT(CustomMarshal_GetUnmarshalClass);
+    CHECK_EXPECT2(CustomMarshal_GetUnmarshalClass);
     *clsid = *unmarshal_class;
     return S_OK;
 }
@@ -3329,8 +3330,8 @@ static void test_freethreadedmarshaler(void)
     hr = IMarshal_GetUnmarshalClass(pFTMarshal, &IID_IClassFactory,
             &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL, &clsid);
     ok_ole_success(hr, IMarshal_GetUnmarshalClass);
-    ok(IsEqualIID(&clsid, &CLSID_StdMarshal), "clsid = %s\n",
-            wine_dbgstr_guid(&clsid));
+    ok(IsEqualGUID(&clsid, &CLSID_StdMarshal) || IsEqualGUID(&clsid, &CLSID_ft_unmarshaler_1809) /* Win10 1809 */,
+            "clsid = %s\n", wine_dbgstr_guid(&clsid));

IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL);
     hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL);

[PATCH 2/4] ole32/tests: Only test the original SChannelHookCallInfo structure.

[Zebediah Figura]

This in some sense reverts most of edaf60d71ad1b12315f512c65b3b8c8536e70935.
Unless an application depends on the new hook structure, this seems far too
much like testing internal behaviour. That the structure seems to have
changed multiple times in Windows 8 and 10 makes this unlikely.

Signed-off-by: Zebediah Figura 
---
 dlls/ole32/tests/marshal.c | 84 ++++----------------------------------
 1 file changed, 7 insertions(+), 77 deletions(-)

diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index 582b63f484a..e31a89a0757 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -4325,19 +4325,9 @@ static ULONG WINAPI TestChannelHook_Release(IChannelHook *iface)
     return 1;
 }

-static BOOL new_hook_struct;
-static int method, server_tid;
+static int method;
 static GUID causality;

-struct new_hook_info
-{
-    IID iid;
-    GUID causality;
-    DWORD server_pid;
-    DWORD server_tid;
-    WORD method;
-};
-
 static void WINAPI TestChannelHook_ClientGetSize(
     IChannelHook *iface,
     REFGUID uExtent,
@@ -4347,12 +4337,9 @@ static void WINAPI TestChannelHook_ClientGetSize(
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
     trace("TestChannelHook_ClientGetSize\n");
     trace("\t%s\n", debugstr_iid(riid));
-    if (info->cbSize != sizeof(*info))
-        new_hook_struct = TRUE;

-    if (!new_hook_struct)
+    if (info->cbSize == sizeof(*info))
     {
-        ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info));
         ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId());
         ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method);
         ok(!info->pObject, "pObject should be NULL\n");
@@ -4361,19 +4348,6 @@ static void WINAPI TestChannelHook_ClientGetSize(
         else
             ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n");
     }
-    else
-    {
-        struct new_hook_info *new_info = (struct new_hook_info *)riid;
-        ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid,
-           GetCurrentProcessId());
-        ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid,
-           server_tid);
-        ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method);
-        if (method == 3)
-            causality = new_info->causality;
-        else
-            ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n");
-    }

ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n");

@@ -4390,24 +4364,13 @@ static void WINAPI TestChannelHook_ClientFillBuffer(
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
     trace("TestChannelHook_ClientFillBuffer\n");

-    if (!new_hook_struct)
+    if (info->cbSize == sizeof(*info))
     {
-        ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info));
         ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId());
         ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method);
         ok(!info->pObject, "pObject should be NULL\n");
         ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n");
     }
-    else
-    {
-        struct new_hook_info *new_info = (struct new_hook_info *)riid;
-        ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid,
-           GetCurrentProcessId());
-        ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid,
-           server_tid);
-        ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method);
-        ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n");
-    }

ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n");

@@ -4427,9 +4390,8 @@ static void WINAPI TestChannelHook_ClientNotify(
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
     trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault);

-    if (!new_hook_struct)
+    if (info->cbSize == sizeof(*info))
     {
-        ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info));
         ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId());
         ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method);
         todo_wine {
@@ -4437,16 +4399,6 @@ static void WINAPI TestChannelHook_ClientNotify(
         }
         ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n");
     }
-    else
-    {
-        struct new_hook_info *new_info = (struct new_hook_info *)riid;
-        ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid,
-           GetCurrentProcessId());
-        ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid,
-           server_tid);
-        ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method);
-        ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n");
-    }

ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n");
 }
@@ -4462,24 +4414,13 @@ static void WINAPI TestChannelHook_ServerNotify(
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
     trace("TestChannelHook_ServerNotify\n");

-    if (!new_hook_struct)
+    if (info->cbSize == sizeof(*info))
     {
-        ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info));
         ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId());
         ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method);
         ok(info->pObject != NULL, "pObject shouldn't be NULL\n");
         ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n");
     }
-    else
-    {
-        struct new_hook_info *new_info = (struct new_hook_info *)riid;
-        ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid,
-           GetCurrentProcessId());
-        ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid,
-           server_tid);
-        ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method);
-        ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n");
-    }

ok(cbDataSize == 1, "cbDataSize should have been 1 instead of %d\n", cbDataSize);
     ok(*(unsigned char *)pDataBuffer == 0xcc, "pDataBuffer should have contained 0xcc instead of 0x%x\n", *(unsigned char *)pDataBuffer);
@@ -4496,24 +4437,14 @@ static void WINAPI TestChannelHook_ServerGetSize(
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
     trace("TestChannelHook_ServerGetSize\n");
     trace("\t%s\n", debugstr_iid(riid));
-    if (!new_hook_struct)
+
+    if (info->cbSize == sizeof(*info))
     {
-        ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info));
         ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId());
         ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method);
         ok(info->pObject != NULL, "pObject shouldn't be NULL\n");
         ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n");
     }
-    else
-    {
-        struct new_hook_info *new_info = (struct new_hook_info *)riid;
-        ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid,
-           GetCurrentProcessId());
-        ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid,
-           server_tid);
-        ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method);
-        ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n");
-    }

ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n");
     if (hrFault != S_OK)
@@ -4571,7 +4502,6 @@ static void test_channel_hook(void)
     hr = CreateStreamOnHGlobal(NULL, TRUE, &object_data.stream);
     ok_ole_success(hr, CreateStreamOnHGlobal);
     tid = start_host_object2(&object_data, &thread);
-    server_tid = tid;

ok_more_than_one_lock();

[PATCH 3/4] ole32/tests: Get rid of some workarounds for no longer supported versions of Windows.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/ole32/tests/marshal.c | 57 ++++++--------------------------------
 1 file changed, 9 insertions(+), 48 deletions(-)

diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index e31a89a0757..3ee6732b258 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -1120,13 +1120,7 @@ static void test_proxy_marshal_and_unmarshal_strong(void)
     IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL);
     /* marshal the proxy */
     hr = CoMarshalInterface(pStream, &IID_IClassFactory, pProxy, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLESTRONG);
-    ok(hr == S_OK /* WinNT */ || hr == E_INVALIDARG /* Win9x */,
-        "CoMarshalInterface should have return S_OK or E_INVALIDARG instead of 0x%08x\n", hr);
-    if (FAILED(hr))
-    {
-        IUnknown_Release(pProxy);
-        goto end;
-    }
+    ok(hr == S_OK, "Got hr %#x.\n", hr);

ok_more_than_one_lock();
     ok_non_zero_external_conn();
@@ -1831,11 +1825,6 @@ static void test_crash_couninitialize(void)
     HANDLE thread;
     DWORD tid;

-    if(!GetProcAddress(GetModuleHandleA("kernel32.dll"), "CreateActCtxW")) {
-        win_skip("Skipping crash tests on win2k.\n");
-        return;
-    }
-
     crash_thread_success = FALSE;
     thread = CreateThread(NULL, 0, crash_couninitialize_proc, NULL, 0, &tid);
     ok(!WaitForSingleObject(thread, 10000), "wait timed out\n");
@@ -2485,20 +2474,15 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p)
     IUnknown * proxy = NULL;

hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy);
-    todo_wine
-    ok(hr == CO_E_NOTINITIALIZED,
-       "COM should have failed with CO_E_NOTINITIALIZED on using proxy without apartment, but instead returned 0x%08x\n",
-       hr);
+    todo_wine ok(hr == CO_E_NOTINITIALIZED, "Got hr %#x.\n", hr);

hr = IClassFactory_QueryInterface(cf, &IID_IMultiQI, (LPVOID *)&proxy);
-    /* Win9x returns S_OK, whilst NT returns RPC_E_WRONG_THREAD */
-    trace("call to proxy's QueryInterface for local interface without apartment returned 0x%08x\n", hr);
+    todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr);
     if (SUCCEEDED(hr))
         IUnknown_Release(proxy);

hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy);
-    /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */
-    trace("call to proxy's QueryInterface without apartment returned 0x%08x\n", hr);
+    todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr);
     if (SUCCEEDED(hr))
         IUnknown_Release(proxy);

@@ -2511,8 +2495,7 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p)
         hr);

hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy);
-    /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */
-    trace("call to proxy's QueryInterface from wrong apartment returned 0x%08x\n", hr);
+    todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr);

/* now be really bad and release the proxy from the wrong apartment */
     IClassFactory_Release(cf);
@@ -2556,10 +2539,6 @@ static void test_proxy_used_in_wrong_thread(void)
     ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" );
     CloseHandle(thread);

-    /* do release statement on Win9x that we should have done above */
-    if (!GetProcAddress(GetModuleHandleA("ole32"), "CoRegisterSurrogateEx"))
-        IUnknown_Release(pProxy);
-
     ok_no_locks();

end_host_object(tid, host_thread);
@@ -3176,9 +3155,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void *
     if (mshctx == MSHCTX_INPROC)
     {
         DWORD expected_size = round_global_size(3*sizeof(DWORD) + sizeof(GUID));
-        ok(size == expected_size ||
-           broken(size == (2*sizeof(DWORD))) /* Win9x & NT4 */,
-           "size should have been %d instead of %d\n", expected_size, size);
+        ok(size == expected_size, "expected size %u, got %u\n", expected_size, size);

ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data);
         marshal_data += sizeof(DWORD);
@@ -3846,9 +3823,7 @@ static void test_local_server(void)
      * class in the registry */
     hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER,
         NULL, &IID_IClassFactory, (LPVOID*)&cf);
-    ok(hr == REGDB_E_CLASSNOTREG || /* NT */
-       hr == S_OK /* Win9x */,
-        "CoGetClassObject should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr);
+    todo_wine ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#x.\n", hr);

/* Resume the object suspended above ... */
     hr = CoResumeClassObjects();
@@ -3883,10 +3858,7 @@ static void test_local_server(void)
     /* try to connect again after SCM has suspended registered class objects */
     hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, NULL,
         &IID_IClassFactory, (LPVOID*)&cf);
-    ok(hr == CO_E_SERVER_STOPPING || /* NT */
-       hr == REGDB_E_CLASSNOTREG || /* win2k */
-       hr == S_OK /* Win9x */,
-        "CoGetClassObject should have returned CO_E_SERVER_STOPPING or REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr);
+    todo_wine ok(hr == CO_E_SERVER_STOPPING, "Got hr %#x.\n", hr);

hr = CoRevokeClassObject(cookie);
     ok_ole_success(hr, CoRevokeClassObject);
@@ -3943,13 +3915,7 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv)
    IClassFactory *cf;

hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf);
-	ok(hr == CO_E_NOTINITIALIZED ||
-		broken(hr == E_UNEXPECTED) /* win2k */ ||
-		broken(hr == S_OK) /* NT 4 */,
-		"IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED or E_UNEXPECTED instead of 0x%08x\n",
-		hr);
-	if (hr == S_OK)
-		IClassFactory_Release(cf);
+	ok(hr == CO_E_NOTINITIALIZED, "Got hr %#x.\n", hr);

CoInitialize(NULL);

@@ -4535,11 +4501,6 @@ START_TEST(marshal)
     int argc;
     char **argv;

-    if (!GetProcAddress(hOle32, "CoRegisterSurrogateEx")) {
-        win_skip("skipping test on win9x\n");
-        return;
-    }
-
     pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx");
     pDllGetClassObject = (void*)GetProcAddress(hOle32, "DllGetClassObject");

[PATCH 3/4] ole32/tests: Get rid of some workarounds for no longer supported versions of Windows.

[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=62699

Your paranoid android.

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

ole32:
marshal.c:3861: Test failed: Got hr 0x80040154.

=== w1064v1809_2scr (32 bit report) ===

ole32:
marshal.c:3861: Test failed: Got hr 0x80040154.

=== w1064v1809_ar (32 bit report) ===

ole32:
marshal.c:3861: Test failed: Got hr 0x80040154.

=== w1064v1809_he (32 bit report) ===

ole32:
marshal.c:3861: Test failed: Got hr 0x80040154.

=== w1064v1809_ja (32 bit report) ===

ole32:
marshal.c:3861: Test failed: Got hr 0x80040154.

=== w1064v1809_zh_CN (32 bit report) ===

ole32:
marshal.c:3861: Test failed: Got hr 0x80040154.

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

ole32:
marshal.c:3861: Test failed: Got hr 0x80040154.

[PATCH 4/4] ole32/tests: Make the tests less verbose by default.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/ole32/tests/marshal.c | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index 3ee6732b258..e5db8698bc6 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -202,7 +202,7 @@ static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface)

static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved)
 {
-    trace("add connection\n");
+    if (winetest_debug > 1) trace("add connection\n");
     return ++external_connections;
 }

@@ -210,7 +210,7 @@ static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface,
 static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn,
         DWORD reserved, BOOL fLastReleaseCloses)
 {
-    trace("release connection %d\n", fLastReleaseCloses);
+    if (winetest_debug > 1) trace("release connection %d\n", fLastReleaseCloses);
     last_release_closes = fLastReleaseCloses;
     return --external_connections;
 }
@@ -2578,7 +2578,7 @@ static DWORD WINAPI MessageFilter_HandleInComingCall(
 {
     static int callcount = 0;
     DWORD ret;
-    trace("HandleInComingCall\n");
+    if (winetest_debug > 1) trace("HandleInComingCall()\n");
     switch (callcount)
     {
     case 0:
@@ -2601,7 +2601,7 @@ static DWORD WINAPI MessageFilter_RetryRejectedCall(
   DWORD dwTickCount,
   DWORD dwRejectType)
 {
-    trace("RetryRejectedCall\n");
+    if (winetest_debug > 1) trace("RetryRejectedCall()\n");
     return 0;
 }

@@ -2611,7 +2611,7 @@ static DWORD WINAPI MessageFilter_MessagePending(
   DWORD dwTickCount,
   DWORD dwPendingType)
 {
-    trace("MessagePending\n");
+    if (winetest_debug > 1) trace("MessagePending()\n");
     return PENDINGMSG_WAITNOPROCESS;
 }

@@ -3166,7 +3166,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void *
             ok(*(DWORD *)marshal_data == 0, "expected 0x0, but got 0x%x\n", *(DWORD *)marshal_data);
             marshal_data += sizeof(DWORD);
         }
-        if (size >= 3*sizeof(DWORD) + sizeof(GUID))
+        if (size >= 3*sizeof(DWORD) + sizeof(GUID) && winetest_debug > 1)
         {
             trace("got guid data: %s\n", wine_dbgstr_guid((GUID *)marshal_data));
         }
@@ -3756,7 +3756,6 @@ again:

if (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE))
             {
-                trace("Message 0x%x\n", msg.message);
                 TranslateMessage(&msg);
                 DispatchMessageA(&msg);
             }
@@ -3942,7 +3941,6 @@ static void test_globalinterfacetable(void)
         IClassFactory *cf;
         ULONG ref;

-        trace("test_globalinterfacetable\n");
    cLocks = 0;

hr = pDllGetClassObject(&CLSID_StdGlobalInterfaceTable, &IID_IClassFactory, (void**)&cf);
@@ -4301,8 +4299,8 @@ static void WINAPI TestChannelHook_ClientGetSize(
     ULONG  *pDataSize )
 {
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
-    trace("TestChannelHook_ClientGetSize\n");
-    trace("\t%s\n", debugstr_iid(riid));
+
+    if (winetest_debug > 1) trace("IChannelHook::ClientGetSize(iid %s)\n", debugstr_guid(riid));

if (info->cbSize == sizeof(*info))
     {
@@ -4328,7 +4326,8 @@ static void WINAPI TestChannelHook_ClientFillBuffer(
     void   *pDataBuffer )
 {
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
-    trace("TestChannelHook_ClientFillBuffer\n");
+
+    if (winetest_debug > 1) trace("IChannelHook::ClientFillBuffer()\n");

if (info->cbSize == sizeof(*info))
     {
@@ -4354,7 +4353,8 @@ static void WINAPI TestChannelHook_ClientNotify(
     HRESULT hrFault )
 {
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
-    trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault);
+
+    if (winetest_debug > 1) trace("IChannelHook::ClientNotify(hr %#x)\n", hrFault);

if (info->cbSize == sizeof(*info))
     {
@@ -4378,7 +4378,8 @@ static void WINAPI TestChannelHook_ServerNotify(
     DWORD   lDataRep )
 {
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
-    trace("TestChannelHook_ServerNotify\n");
+
+    if (winetest_debug > 1) trace("IChannelHook::ServerNotify()\n");

if (info->cbSize == sizeof(*info))
     {
@@ -4401,8 +4402,8 @@ static void WINAPI TestChannelHook_ServerGetSize(
     ULONG  *pDataSize )
 {
     SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid;
-    trace("TestChannelHook_ServerGetSize\n");
-    trace("\t%s\n", debugstr_iid(riid));
+
+    if (winetest_debug > 1) trace("IChannelHook::ServerGetSize(iid %s, hr %#x)\n", debugstr_guid(riid), hrFault);

if (info->cbSize == sizeof(*info))
     {
@@ -4413,9 +4414,6 @@ static void WINAPI TestChannelHook_ServerGetSize(
     }

ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n");
-    if (hrFault != S_OK)
-        trace("\thrFault = 0x%08x\n", hrFault);
-
     *pDataSize = 0;
 }

@@ -4427,7 +4425,6 @@ static void WINAPI TestChannelHook_ServerFillBuffer(
     void   *pDataBuffer,
     HRESULT hrFault )
 {
-    trace("TestChannelHook_ServerFillBuffer\n");
     ok(0, "TestChannelHook_ServerFillBuffer shouldn't be called\n");
 }

[PATCH 4/4] ole32/tests: Make the tests less verbose by default.

[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=62700

Your paranoid android.

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

ole32:
marshal.c:3860: Test failed: Got hr 0x80040154.

=== w1064v1809_2scr (32 bit report) ===

ole32:
marshal.c:3860: Test failed: Got hr 0x80040154.

=== w1064v1809_ar (32 bit report) ===

ole32:
marshal.c:3860: Test failed: Got hr 0x80040154.

=== w1064v1809_he (32 bit report) ===

ole32:
marshal.c:3860: Test failed: Got hr 0x80040154.

=== w1064v1809_ja (32 bit report) ===

ole32:
marshal.c:3860: Test failed: Got hr 0x80040154.

=== w1064v1809_zh_CN (32 bit report) ===

ole32:
marshal.c:3860: Test failed: Got hr 0x80040154.

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

ole32:
marshal.c:3860: Test failed: Got hr 0x80040154.

[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=62697

Your paranoid android.

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

ole32:
marshal.c:4367: Test failed: server pid was 0x0 instead of 0xf40
marshal.c:4369: Test failed: server tid was 0x5000003 instead of 0xf14
marshal.c:4404: Test failed: server pid was 0x0 instead of 0xf40
marshal.c:4406: Test failed: server tid was 0x5000003 instead of 0xf14
marshal.c:4476: Test failed: server pid was 0xf14 instead of 0xf40
marshal.c:4478: Test failed: server tid was 0x5000003 instead of 0xf14
marshal.c:4510: Test failed: server pid was 0xf14 instead of 0xf40
marshal.c:4512: Test failed: server tid was 0x5000003 instead of 0xf14
marshal.c:4443: Test failed: server pid was 0xf14 instead of 0xf40
marshal.c:4445: Test failed: server tid was 0x5000003 instead of 0xf14
marshal.c:4367: Test failed: server pid was 0x0 instead of 0xf40
marshal.c:4369: Test failed: server tid was 0x5000005 instead of 0xf14
marshal.c:4404: Test failed: server pid was 0x0 instead of 0xf40
marshal.c:4406: Test failed: server tid was 0x5000005 instead of 0xf14
marshal.c:4476: Test failed: server pid was 0xf14 instead of 0xf40
marshal.c:4478: Test failed: server tid was 0x5000005 instead of 0xf14
marshal.c:4510: Test failed: server pid was 0xf14 instead of 0xf40
marshal.c:4512: Test failed: server tid was 0x5000005 instead of 0xf14
marshal.c:4443: Test failed: server pid was 0xf14 instead of 0xf40
marshal.c:4445: Test failed: server tid was 0x5000005 instead of 0xf14
marshal.c:4367: Test failed: server pid was 0x0 instead of 0xf40
marshal.c:4369: Test failed: server tid was 0x5000005 instead of 0xf14
marshal.c:4404: Test failed: server pid was 0x0 instead of 0xf40
marshal.c:4406: Test failed: server tid was 0x5000005 instead of 0xf14
marshal.c:4476: Test failed: server pid was 0xf14 instead of 0xf40
marshal.c:4478: Test failed: server tid was 0x5000005 instead of 0xf14
marshal.c:4510: Test failed: server pid was 0xf14 instead of 0xf40
marshal.c:4512: Test failed: server tid was 0x5000005 instead of 0xf14
marshal.c:4443: Test failed: server pid was 0xf14 instead of 0xf40
marshal.c:4445: Test failed: server tid was 0x5000005 instead of 0xf14

=== w1064v1809_2scr (32 bit report) ===

ole32:
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1a54
marshal.c:4369: Test failed: server tid was 0x3 instead of 0x1288
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1a54
marshal.c:4406: Test failed: server tid was 0x3 instead of 0x1288
marshal.c:4476: Test failed: server pid was 0x1288 instead of 0x1a54
marshal.c:4478: Test failed: server tid was 0x3 instead of 0x1288
marshal.c:4510: Test failed: server pid was 0x1288 instead of 0x1a54
marshal.c:4512: Test failed: server tid was 0x3 instead of 0x1288
marshal.c:4443: Test failed: server pid was 0x1288 instead of 0x1a54
marshal.c:4445: Test failed: server tid was 0x3 instead of 0x1288
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1a54
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1288
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1a54
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1288
marshal.c:4476: Test failed: server pid was 0x1288 instead of 0x1a54
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1288
marshal.c:4510: Test failed: server pid was 0x1288 instead of 0x1a54
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1288
marshal.c:4443: Test failed: server pid was 0x1288 instead of 0x1a54
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1288
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1a54
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1288
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1a54
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1288
marshal.c:4476: Test failed: server pid was 0x1288 instead of 0x1a54
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1288
marshal.c:4510: Test failed: server pid was 0x1288 instead of 0x1a54
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1288
marshal.c:4443: Test failed: server pid was 0x1288 instead of 0x1a54
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1288

=== w1064v1809_ar (32 bit report) ===

ole32:
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1998
marshal.c:4369: Test failed: server tid was 0x3 instead of 0x1b48
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1998
marshal.c:4406: Test failed: server tid was 0x3 instead of 0x1b48
marshal.c:4476: Test failed: server pid was 0x1b48 instead of 0x1998
marshal.c:4478: Test failed: server tid was 0x3 instead of 0x1b48
marshal.c:4510: Test failed: server pid was 0x1b48 instead of 0x1998
marshal.c:4512: Test failed: server tid was 0x3 instead of 0x1b48
marshal.c:4443: Test failed: server pid was 0x1b48 instead of 0x1998
marshal.c:4445: Test failed: server tid was 0x3 instead of 0x1b48
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1998
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1b48
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1998
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1b48
marshal.c:4476: Test failed: server pid was 0x1b48 instead of 0x1998
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1b48
marshal.c:4510: Test failed: server pid was 0x1b48 instead of 0x1998
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1b48
marshal.c:4443: Test failed: server pid was 0x1b48 instead of 0x1998
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1b48
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1998
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1b48
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1998
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1b48
marshal.c:4476: Test failed: server pid was 0x1b48 instead of 0x1998
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1b48
marshal.c:4510: Test failed: server pid was 0x1b48 instead of 0x1998
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1b48
marshal.c:4443: Test failed: server pid was 0x1b48 instead of 0x1998
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1b48

=== w1064v1809_he (32 bit report) ===

ole32:
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1940
marshal.c:4369: Test failed: server tid was 0x9c0003 instead of 0x1238
marshal.c:4371: Test failed: method was 0 instead of 3
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1940
marshal.c:4406: Test failed: server tid was 0x9c0003 instead of 0x1238
marshal.c:4408: Test failed: method was 0 instead of 3
marshal.c:4476: Test failed: server pid was 0x1238 instead of 0x1940
marshal.c:4478: Test failed: server tid was 0x9c0003 instead of 0x1238
marshal.c:4480: Test failed: method was 0 instead of 3
marshal.c:4510: Test failed: server pid was 0x1238 instead of 0x1940
marshal.c:4512: Test failed: server tid was 0x9c0003 instead of 0x1238
marshal.c:4514: Test failed: method was 0 instead of 3
marshal.c:4443: Test failed: server pid was 0x1238 instead of 0x1940
marshal.c:4445: Test failed: server tid was 0x9c0003 instead of 0x1238
marshal.c:4447: Test failed: method was 0 instead of 3
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1940
marshal.c:4369: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4371: Test failed: method was 0 instead of 5
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1940
marshal.c:4406: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4408: Test failed: method was 0 instead of 5
marshal.c:4476: Test failed: server pid was 0x1238 instead of 0x1940
marshal.c:4478: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4480: Test failed: method was 0 instead of 5
marshal.c:4510: Test failed: server pid was 0x1238 instead of 0x1940
marshal.c:4512: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4514: Test failed: method was 0 instead of 5
marshal.c:4443: Test failed: server pid was 0x1238 instead of 0x1940
marshal.c:4445: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4447: Test failed: method was 0 instead of 5
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1940
marshal.c:4369: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4371: Test failed: method was 0 instead of 5
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1940
marshal.c:4406: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4408: Test failed: method was 0 instead of 5
marshal.c:4476: Test failed: server pid was 0x1238 instead of 0x1940
marshal.c:4478: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4480: Test failed: method was 0 instead of 5
marshal.c:4510: Test failed: server pid was 0x1238 instead of 0x1940
marshal.c:4512: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4514: Test failed: method was 0 instead of 5
marshal.c:4443: Test failed: server pid was 0x1238 instead of 0x1940
marshal.c:4445: Test failed: server tid was 0x9c0005 instead of 0x1238
marshal.c:4447: Test failed: method was 0 instead of 5

=== w1064v1809_ja (32 bit report) ===

ole32:
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1954
marshal.c:4369: Test failed: server tid was 0x3 instead of 0x1a8c
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1954
marshal.c:4406: Test failed: server tid was 0x3 instead of 0x1a8c
marshal.c:4476: Test failed: server pid was 0x1a8c instead of 0x1954
marshal.c:4478: Test failed: server tid was 0x3 instead of 0x1a8c
marshal.c:4510: Test failed: server pid was 0x1a8c instead of 0x1954
marshal.c:4512: Test failed: server tid was 0x3 instead of 0x1a8c
marshal.c:4443: Test failed: server pid was 0x1a8c instead of 0x1954
marshal.c:4445: Test failed: server tid was 0x3 instead of 0x1a8c
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1954
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1a8c
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1954
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1a8c
marshal.c:4476: Test failed: server pid was 0x1a8c instead of 0x1954
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1a8c
marshal.c:4510: Test failed: server pid was 0x1a8c instead of 0x1954
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1a8c
marshal.c:4443: Test failed: server pid was 0x1a8c instead of 0x1954
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1a8c
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1954
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1a8c
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1954
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1a8c
marshal.c:4476: Test failed: server pid was 0x1a8c instead of 0x1954
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1a8c
marshal.c:4510: Test failed: server pid was 0x1a8c instead of 0x1954
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1a8c
marshal.c:4443: Test failed: server pid was 0x1a8c instead of 0x1954
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1a8c

=== w1064v1809_zh_CN (32 bit report) ===

ole32:
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x19f8
marshal.c:4369: Test failed: server tid was 0x3 instead of 0x1ab4
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x19f8
marshal.c:4406: Test failed: server tid was 0x3 instead of 0x1ab4
marshal.c:4476: Test failed: server pid was 0x1ab4 instead of 0x19f8
marshal.c:4478: Test failed: server tid was 0x3 instead of 0x1ab4
marshal.c:4510: Test failed: server pid was 0x1ab4 instead of 0x19f8
marshal.c:4512: Test failed: server tid was 0x3 instead of 0x1ab4
marshal.c:4443: Test failed: server pid was 0x1ab4 instead of 0x19f8
marshal.c:4445: Test failed: server tid was 0x3 instead of 0x1ab4
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x19f8
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1ab4
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x19f8
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1ab4
marshal.c:4476: Test failed: server pid was 0x1ab4 instead of 0x19f8
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1ab4
marshal.c:4510: Test failed: server pid was 0x1ab4 instead of 0x19f8
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1ab4
marshal.c:4443: Test failed: server pid was 0x1ab4 instead of 0x19f8
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1ab4
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x19f8
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1ab4
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x19f8
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1ab4
marshal.c:4476: Test failed: server pid was 0x1ab4 instead of 0x19f8
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1ab4
marshal.c:4510: Test failed: server pid was 0x1ab4 instead of 0x19f8
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1ab4
marshal.c:4443: Test failed: server pid was 0x1ab4 instead of 0x19f8
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1ab4

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

ole32:
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1970
marshal.c:4369: Test failed: server tid was 0x3 instead of 0x1bc4
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1970
marshal.c:4406: Test failed: server tid was 0x3 instead of 0x1bc4
marshal.c:4476: Test failed: server pid was 0x1bc4 instead of 0x1970
marshal.c:4478: Test failed: server tid was 0x3 instead of 0x1bc4
marshal.c:4510: Test failed: server pid was 0x1bc4 instead of 0x1970
marshal.c:4512: Test failed: server tid was 0x3 instead of 0x1bc4
marshal.c:4443: Test failed: server pid was 0x1bc4 instead of 0x1970
marshal.c:4445: Test failed: server tid was 0x3 instead of 0x1bc4
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1970
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1bc4
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1970
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1bc4
marshal.c:4476: Test failed: server pid was 0x1bc4 instead of 0x1970
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1bc4
marshal.c:4510: Test failed: server pid was 0x1bc4 instead of 0x1970
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1bc4
marshal.c:4443: Test failed: server pid was 0x1bc4 instead of 0x1970
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1bc4
marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1970
marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1bc4
marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1970
marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1bc4
marshal.c:4476: Test failed: server pid was 0x1bc4 instead of 0x1970
marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1bc4
marshal.c:4510: Test failed: server pid was 0x1bc4 instead of 0x1970
marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1bc4
marshal.c:4443: Test failed: server pid was 0x1bc4 instead of 0x1970
marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1bc4