Module: wine Branch: master Commit: c98ce23fd292a7bd3ed9b0ef0f562fe126b9f75d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98ce23fd292a7bd3ed9b0ef0f...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jun 9 13:00:30 2009 +0200
ole32: Get rid of line feeds and tabs in traces.
---
dlls/ole32/clipboard.c | 3 +-- dlls/ole32/comcat.c | 26 +++++++++++++------------- dlls/ole32/compobj.c | 6 +++--- dlls/ole32/errorinfo.c | 2 +- dlls/ole32/ftmarshal.c | 2 +- dlls/ole32/marshal.c | 4 ++-- 6 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 1e72ec2..81231aa 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -997,8 +997,7 @@ static HRESULT get_priv_data(ole_priv_data **data) { char buf[100]; GetClipboardFormatNameA(cf, buf, sizeof(buf)); - TRACE("\tcf %04x %s\n", cf, buf); - ; + TRACE("cf %04x %s\n", cf, buf); } TRACE("count %d\n", count); size += count * sizeof(ret->entries[0]); diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index cee1ebb..b8060bd 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -278,7 +278,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_QueryInterface( LPVOID *ppvObj) { ComCatMgrImpl *This = (ComCatMgrImpl *)iface; - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid));
if (ppvObj == NULL) return E_POINTER;
@@ -515,7 +515,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_GetCategoryDesc( HKEY key; HRESULT res;
- TRACE("\n\tCATID:\t%s\n\tLCID:\t%X\n",debugstr_guid(rcatid), lcid); + TRACE("CATID: %s LCID: %x\n",debugstr_guid(rcatid), lcid);
if (rcatid == NULL || ppszDesc == NULL) return E_INVALIDARG;
@@ -596,12 +596,12 @@ static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories(
if (WINE_TRACE_ON(ole)) { ULONG count; - TRACE("\n\tCLSID:\t%s\n\tImplemented %u\n",debugstr_guid(rclsid),cImplemented); + TRACE("CLSID: %s Implemented %u\n",debugstr_guid(rclsid),cImplemented); for (count = 0; count < cImplemented; ++count) - TRACE("\t\t%s\n",debugstr_guid(&rgcatidImpl[count])); - TRACE("\tRequired %u\n",cRequired); + TRACE(" %s\n",debugstr_guid(&rgcatidImpl[count])); + TRACE("Required %u\n",cRequired); for (count = 0; count < cRequired; ++count) - TRACE("\t\t%s\n",debugstr_guid(&rgcatidReq[count])); + TRACE(" %s\n",debugstr_guid(&rgcatidReq[count])); }
if ((cImplemented && rgcatidImpl == NULL) || @@ -637,7 +637,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumImplCategoriesOfClass( 'n', 't', 'e', 'd', ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 };
- TRACE("\n\tCLSID:\t%s\n",debugstr_guid(rclsid)); + TRACE("%s\n",debugstr_guid(rclsid));
if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; @@ -659,7 +659,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass( 'd', ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 };
- TRACE("\n\tCLSID:\t%s\n",debugstr_guid(rclsid)); + TRACE("%s\n",debugstr_guid(rclsid));
if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; @@ -719,7 +719,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface( REFIID riid, LPVOID *ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid));
if (ppvObj == NULL) return E_POINTER;
@@ -760,7 +760,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_CreateInstance( LPVOID *ppvObj) { HRESULT res; - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid));
if (ppvObj == NULL) return E_POINTER;
@@ -834,7 +834,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_QueryInterface( REFIID riid, LPVOID *ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid));
if (ppvObj == NULL) return E_POINTER;
@@ -1017,7 +1017,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_QueryInterface( REFIID riid, LPVOID *ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid));
if (ppvObj == NULL) return E_POINTER;
@@ -1203,7 +1203,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_QueryInterface( REFIID riid, LPVOID *ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid));
if (ppvObj == NULL) return E_POINTER;
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 154c18d..586a930 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2265,7 +2265,7 @@ HRESULT WINAPI CoGetClassObject( APARTMENT *apt; BOOL release_apt = FALSE;
- TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + TRACE("CLSID: %s,IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid));
if (!ppv) return E_INVALIDARG; @@ -2283,8 +2283,8 @@ HRESULT WINAPI CoGetClassObject( }
if (pServerInfo) { - FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName)); - FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo); + FIXME("pServerInfo->name=%s pAuthInfo=%p\n", + debugstr_w(pServerInfo->pwszName), pServerInfo->pAuthInfo); }
/* diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 64b81ff..f69635b 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -191,7 +191,7 @@ static HRESULT WINAPI IErrorInfoImpl_QueryInterface( VOID** ppvoid) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvoid); + TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvoid);
*ppvoid = NULL;
diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index f82410e..1380285 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -110,7 +110,7 @@ FTMarshalImpl_QueryInterface (LPMARSHAL iface, REFIID riid, LPVOID * ppv)
FTMarshalImpl *This = impl_from_IMarshal(iface);
- TRACE ("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid (riid), ppv); + TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppv); return IUnknown_QueryInterface (This->pUnkOuter, riid, ppv); }
diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 0066153..3703de9 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -431,7 +431,7 @@ static HRESULT WINAPI Proxy_MarshalInterface(
if (SUCCEEDED(hr)) { - TRACE("writing stdobjref:\n\tflags = %04x\n\tcPublicRefs = %d\n\toxid = %s\n\toid = %s\n\tipid = %s\n", + TRACE("writing stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", stdobjref.flags, stdobjref.cPublicRefs, wine_dbgstr_longlong(stdobjref.oxid), wine_dbgstr_longlong(stdobjref.oid), @@ -1239,7 +1239,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt,
assert(apt);
- TRACE("stdobjref:\n\tflags = %04x\n\tcPublicRefs = %d\n\toxid = %s\n\toid = %s\n\tipid = %s\n", + TRACE("stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", stdobjref->flags, stdobjref->cPublicRefs, wine_dbgstr_longlong(stdobjref->oxid), wine_dbgstr_longlong(stdobjref->oid),