Skip to content

W
wine-cw
Commit 718e2f25 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

oleaut32: Cleanup some relay traces.

parent 2915e479
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 15 deletions
dlls/oleaut32/tmarshal.c
View file @ 718e2f25
...@@ -1336,7 +1336,7 @@ static DWORD WINAPI xCall(int method, void **args) ...@@ -1336,7 +1336,7 @@ static DWORD WINAPI xCall(int method, void **args)
DWORD *xargs; DWORD *xargs;
const FUNCDESC *fdesc; const FUNCDESC *fdesc;
HRESULT hres; HRESULT hres;
int i, relaydeb = TRACE_ON(olerelay); int i;
marshal_state buf; marshal_state buf;
RPCOLEMESSAGE msg; RPCOLEMESSAGE msg;
ULONG status; ULONG status;
...@@ -1368,7 +1368,7 @@ static DWORD WINAPI xCall(int method, void **args) ...@@ -1368,7 +1368,7 @@ static DWORD WINAPI xCall(int method, void **args)
LeaveCriticalSection(&tpinfo->crit); LeaveCriticalSection(&tpinfo->crit);
if (relaydeb) { if (TRACE_ON(olerelay)) {
TRACE_(olerelay)("->"); TRACE_(olerelay)("->");
if (iname) if (iname)
TRACE_(olerelay)("%s:",relaystr(iname)); TRACE_(olerelay)("%s:",relaystr(iname));
...@@ -1396,7 +1396,7 @@ static DWORD WINAPI xCall(int method, void **args) ...@@ -1396,7 +1396,7 @@ static DWORD WINAPI xCall(int method, void **args)
xargs = (DWORD *)(args + 1); xargs = (DWORD *)(args + 1);
for (i=0;i<fdesc->cParams;i++) { for (i=0;i<fdesc->cParams;i++) {
ELEMDESC *elem = fdesc->lprgelemdescParam+i; ELEMDESC *elem = fdesc->lprgelemdescParam+i;
if (relaydeb) { if (TRACE_ON(olerelay)) {
if (i) TRACE_(olerelay)(","); if (i) TRACE_(olerelay)(",");
if (i+1<nrofnames && names[i+1]) if (i+1<nrofnames && names[i+1])
TRACE_(olerelay)("%s=",relaystr(names[i+1])); TRACE_(olerelay)("%s=",relaystr(names[i+1]));
...@@ -1407,7 +1407,7 @@ static DWORD WINAPI xCall(int method, void **args) ...@@ -1407,7 +1407,7 @@ static DWORD WINAPI xCall(int method, void **args)
if (elem->tdesc.vt != VT_PTR) if (elem->tdesc.vt != VT_PTR)
{ {
xargs+=_argsize(&elem->tdesc, tinfo); xargs+=_argsize(&elem->tdesc, tinfo);
if (relaydeb) TRACE_(olerelay)("[out]"); TRACE_(olerelay)("[out]");
continue; continue;
} }
else else
...@@ -1419,7 +1419,7 @@ static DWORD WINAPI xCall(int method, void **args) ...@@ -1419,7 +1419,7 @@ static DWORD WINAPI xCall(int method, void **args)
hres = serialize_param( hres = serialize_param(
tinfo, tinfo,
is_in_elem(elem), is_in_elem(elem),
relaydeb, TRACE_ON(olerelay),
FALSE, FALSE,
&elem->tdesc, &elem->tdesc,
xargs, xargs,
...@@ -1432,7 +1432,7 @@ static DWORD WINAPI xCall(int method, void **args) ...@@ -1432,7 +1432,7 @@ static DWORD WINAPI xCall(int method, void **args)
} }
xargs+=_argsize(&elem->tdesc, tinfo); xargs+=_argsize(&elem->tdesc, tinfo);
} }
if (relaydeb) TRACE_(olerelay)(")"); TRACE_(olerelay)(")");
memset(&msg,0,sizeof(msg)); memset(&msg,0,sizeof(msg));
msg.cbBuffer = buf.curoff; msg.cbBuffer = buf.curoff;
...@@ -1443,14 +1443,14 @@ static DWORD WINAPI xCall(int method, void **args) ...@@ -1443,14 +1443,14 @@ static DWORD WINAPI xCall(int method, void **args)
goto exit; goto exit;
} }
memcpy(msg.Buffer,buf.base,buf.curoff); memcpy(msg.Buffer,buf.base,buf.curoff);
if (relaydeb) TRACE_(olerelay)("\n"); TRACE_(olerelay)("\n");
hres = IRpcChannelBuffer_SendReceive(chanbuf,&msg,&status); hres = IRpcChannelBuffer_SendReceive(chanbuf,&msg,&status);
if (hres) { if (hres) {
ERR("RpcChannelBuffer SendReceive failed, %x\n",hres); ERR("RpcChannelBuffer SendReceive failed, %x\n",hres);
goto exit; goto exit;
} }
if (relaydeb) TRACE_(olerelay)(" status = %08x (",status); TRACE_(olerelay)(" status = %08x (",status);
if (buf.base) if (buf.base)
buf.base = HeapReAlloc(GetProcessHeap(),0,buf.base,msg.cbBuffer); buf.base = HeapReAlloc(GetProcessHeap(),0,buf.base,msg.cbBuffer);
else else
...@@ -1465,20 +1465,19 @@ static DWORD WINAPI xCall(int method, void **args) ...@@ -1465,20 +1465,19 @@ static DWORD WINAPI xCall(int method, void **args)
for (i=0;i<fdesc->cParams;i++) { for (i=0;i<fdesc->cParams;i++) {
ELEMDESC *elem = fdesc->lprgelemdescParam+i; ELEMDESC *elem = fdesc->lprgelemdescParam+i;
if (relaydeb) { if (i) TRACE_(olerelay)(",");
if (i) TRACE_(olerelay)(","); if (i+1<nrofnames && names[i+1]) TRACE_(olerelay)("%s=",relaystr(names[i+1]));
if (i+1<nrofnames && names[i+1]) TRACE_(olerelay)("%s=",relaystr(names[i+1]));
}
/* No need to marshal other data than FOUT and any VT_PTR */ /* No need to marshal other data than FOUT and any VT_PTR */
if (!is_out_elem(elem) && (elem->tdesc.vt != VT_PTR)) { if (!is_out_elem(elem) && (elem->tdesc.vt != VT_PTR)) {
xargs += _argsize(&elem->tdesc, tinfo); xargs += _argsize(&elem->tdesc, tinfo);
if (relaydeb) TRACE_(olerelay)("[in]"); TRACE_(olerelay)("[in]");
continue; continue;
} }
hres = deserialize_param( hres = deserialize_param(
tinfo, tinfo,
is_out_elem(elem), is_out_elem(elem),
relaydeb, TRACE_ON(olerelay),
FALSE, FALSE,
&(elem->tdesc), &(elem->tdesc),
xargs, xargs,
...@@ -1495,7 +1494,7 @@ static DWORD WINAPI xCall(int method, void **args) ...@@ -1495,7 +1494,7 @@ static DWORD WINAPI xCall(int method, void **args)
hres = xbuf_get(&buf, (LPBYTE)&remoteresult, sizeof(DWORD)); hres = xbuf_get(&buf, (LPBYTE)&remoteresult, sizeof(DWORD));
if (hres != S_OK) if (hres != S_OK)
goto exit; goto exit;
if (relaydeb) TRACE_(olerelay)(") = %08x\n", remoteresult); TRACE_(olerelay)(") = %08x\n", remoteresult);
hres = remoteresult; hres = remoteresult;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment