[PATCH v2 4/4] ole32/tests: Make the tests less verbose by default.
Zebediah Figura
z.figura12 at gmail.com
Tue Dec 31 19:13:15 CST 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
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 a7cc506022e..a25d0475fa8 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");
}
--
2.24.0
More information about the wine-devel
mailing list