diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 22364f36e7e..d78fa479f40 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -55,7 +55,7 @@ static HRESULT WINAPI domattr_QueryInterface( void** ppvObject ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMAttribute ) || IsEqualGUID( riid, &IID_IDispatch ) || diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 57d601d8b37..3fba66cdbc7 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -55,7 +55,7 @@ static HRESULT WINAPI domcdata_QueryInterface( void** ppvObject ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) || IsEqualGUID( riid, &IID_IXMLDOMCharacterData) || @@ -502,7 +502,7 @@ static HRESULT WINAPI domcdata_put_data( domcdata *This = impl_from_IXMLDOMCDATASection( iface ); VARIANT val; - TRACE("%p %s\n", This, debugstr_w(data) ); + TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; @@ -518,7 +518,7 @@ static HRESULT WINAPI domcdata_get_length( HRESULT hr; BSTR data; - TRACE("%p %p\n", This, len); + TRACE("(%p)->(%p)\n", This, len); if(!len) return E_INVALIDARG; @@ -541,7 +541,7 @@ static HRESULT WINAPI domcdata_substringData( HRESULT hr; BSTR data; - TRACE("%p %d %d %p\n", This, offset, count, p); + TRACE("(%p)->(%d %d %p)\n", This, offset, count, p); if(!p) return E_INVALIDARG; @@ -583,7 +583,7 @@ static HRESULT WINAPI domcdata_appendData( BSTR data; LONG p_len; - TRACE("%p %p\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); /* Nothing to do if NULL or an Empty string passed in. */ if((p_len = SysStringLen(p)) == 0) return S_OK; @@ -616,7 +616,7 @@ static HRESULT WINAPI domcdata_insertData( BSTR data; LONG p_len; - TRACE("%p %d %s\n", This, offset, debugstr_w(p)); + TRACE("(%p)->(%d %s)\n", This, offset, debugstr_w(p)); /* If have a NULL or empty string, don't do anything. */ if((p_len = SysStringLen(p)) == 0) @@ -659,11 +659,12 @@ static HRESULT WINAPI domcdata_deleteData( IXMLDOMCDATASection *iface, LONG offset, LONG count) { + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); HRESULT hr; LONG len = -1; BSTR str; - TRACE("%p %d %d\n", iface, offset, count); + TRACE("(%p)->(%d %d)\n", This, offset, count); hr = IXMLDOMCDATASection_get_length(iface, &len); if(hr != S_OK) return hr; @@ -709,7 +710,7 @@ static HRESULT WINAPI domcdata_replaceData( domcdata *This = impl_from_IXMLDOMCDATASection( iface ); HRESULT hr; - TRACE("%p %d %d %s\n", This, offset, count, debugstr_w(p)); + TRACE("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(p)); hr = IXMLDOMCDATASection_deleteData(iface, offset, count); @@ -723,7 +724,8 @@ static HRESULT WINAPI domcdata_splitText( IXMLDOMCDATASection *iface, LONG offset, IXMLDOMText **txtNode) { - FIXME("\n"); + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + FIXME("(%p)->(%d %p)\n", This, offset, txtNode); return E_NOTIMPL; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index c4005c2a6ea..e74de07e876 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -55,7 +55,7 @@ static HRESULT WINAPI domcomment_QueryInterface( void** ppvObject ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMComment ) || IsEqualGUID( riid, &IID_IXMLDOMCharacterData) || @@ -477,6 +477,8 @@ static HRESULT WINAPI domcomment_get_data( HRESULT hr; VARIANT vRet; + TRACE("(%p)->(%p)\n", This, p); + if(!p) return E_INVALIDARG; @@ -496,7 +498,7 @@ static HRESULT WINAPI domcomment_put_data( domcomment *This = impl_from_IXMLDOMComment( iface ); VARIANT val; - TRACE("%p %s\n", This, debugstr_w(data) ); + TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; @@ -512,7 +514,7 @@ static HRESULT WINAPI domcomment_get_length( HRESULT hr; BSTR data; - TRACE("%p %p\n", This, len); + TRACE("(%p)->(%p)\n", This, len); if(!len) return E_INVALIDARG; @@ -535,7 +537,7 @@ static HRESULT WINAPI domcomment_substringData( HRESULT hr; BSTR data; - TRACE("%p %d %d %p\n", This, offset, count, p); + TRACE("(%p)->(%d %d %p)\n", This, offset, count, p); if(!p) return E_INVALIDARG; @@ -577,7 +579,7 @@ static HRESULT WINAPI domcomment_appendData( BSTR data; LONG p_len; - TRACE("%p %s\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); /* Nothing to do if NULL or an Empty string passed in. */ if((p_len = SysStringLen(p)) == 0) return S_OK; @@ -610,7 +612,7 @@ static HRESULT WINAPI domcomment_insertData( BSTR data; LONG p_len; - TRACE("%p %d %s\n", This, offset, debugstr_w(p)); + TRACE("(%p)->(%d %s)\n", This, offset, debugstr_w(p)); /* If have a NULL or empty string, don't do anything. */ if((p_len = SysStringLen(p)) == 0) @@ -657,7 +659,7 @@ static HRESULT WINAPI domcomment_deleteData( LONG len = -1; BSTR str; - TRACE("%p %d %d\n", iface, offset, count); + TRACE("(%p)->(%d %d)\n", iface, offset, count); hr = IXMLDOMComment_get_length(iface, &len); if(hr != S_OK) return hr; @@ -703,7 +705,7 @@ static HRESULT WINAPI domcomment_replaceData( domcomment *This = impl_from_IXMLDOMComment( iface ); HRESULT hr; - TRACE("%p %d %d %s\n", This, offset, count, debugstr_w(p)); + TRACE("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(p)); hr = IXMLDOMComment_deleteData(iface, offset, count); diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index b5f6e464799..fff3f62a419 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -55,7 +55,7 @@ static HRESULT WINAPI domfrag_QueryInterface( void** ppvObject ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMDocumentFragment ) || IsEqualGUID( riid, &IID_IDispatch ) || diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3e732426d66..e3e9651a622 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -301,7 +301,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_IsDirty( { domdoc *This = impl_from_IPersistStream(iface); - FIXME("(%p->%p): stub!\n", iface, This); + FIXME("(%p): stub!\n", This); return S_FALSE; } @@ -317,7 +317,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( char *ptr; xmlDocPtr xmldoc = NULL; - TRACE("(%p, %p)\n", iface, pStm); + TRACE("(%p)->(%p)\n", This, pStm); if (!pStm) return E_INVALIDARG; @@ -366,7 +366,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_Save( HRESULT hr; BSTR xmlString; - TRACE("(%p, %p, %d)\n", iface, pStm, fClearDirty); + TRACE("(%p)->(%p %d)\n", This, pStm, fClearDirty); hr = IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), &xmlString ); if(hr == S_OK) @@ -387,7 +387,8 @@ static HRESULT WINAPI xmldoc_IPersistStream_Save( static HRESULT WINAPI xmldoc_IPersistStream_GetSizeMax( IPersistStream *iface, ULARGE_INTEGER *pcbSize) { - TRACE("(%p, %p): stub!\n", iface, pcbSize); + domdoc *This = impl_from_IPersistStream(iface); + TRACE("(%p)->(%p): stub!\n", This, pcbSize); return E_NOTIMPL; } @@ -447,7 +448,7 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid( riid ), ppvObject ); *ppvObject = NULL; @@ -951,7 +952,8 @@ static HRESULT WINAPI domdoc_get_doctype( IXMLDOMDocument2 *iface, IXMLDOMDocumentType** documentType ) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2(iface); + FIXME("(%p)\n", This); return E_NOTIMPL; } @@ -960,6 +962,10 @@ static HRESULT WINAPI domdoc_get_implementation( IXMLDOMDocument2 *iface, IXMLDOMImplementation** impl ) { + domdoc *This = impl_from_IXMLDOMDocument2(iface); + + TRACE("(%p)->(%p)\n", This, impl); + if(!impl) return E_INVALIDARG; @@ -978,7 +984,7 @@ static HRESULT WINAPI domdoc_get_documentElement( IXMLDOMNode *element_node; HRESULT hr; - TRACE("%p\n", This); + TRACE("(%p)->(%p)\n", This, DOMElement); if(!DOMElement) return E_INVALIDARG; @@ -1043,7 +1049,7 @@ static HRESULT WINAPI domdoc_createElement( VARIANT type; HRESULT hr; - TRACE("(%p)->(%s,%p)\n", This, debugstr_w(tagname), element); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(tagname), element); if (!element || !tagname) return E_INVALIDARG; @@ -1100,7 +1106,7 @@ static HRESULT WINAPI domdoc_createTextNode( VARIANT type; HRESULT hr; - TRACE("%p->(%s %p)\n", This, debugstr_w(data), text); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(data), text); if (!text) return E_INVALIDARG; @@ -1131,7 +1137,7 @@ static HRESULT WINAPI domdoc_createComment( HRESULT hr; IXMLDOMNode *node; - TRACE("%p->(%s %p)\n", This, debugstr_w(data), comment); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(data), comment); if (!comment) return E_INVALIDARG; @@ -1162,7 +1168,7 @@ static HRESULT WINAPI domdoc_createCDATASection( VARIANT type; HRESULT hr; - TRACE("%p->(%s %p)\n", This, debugstr_w(data), cdata); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(data), cdata); if (!cdata) return E_INVALIDARG; @@ -1194,7 +1200,7 @@ static HRESULT WINAPI domdoc_createProcessingInstruction( VARIANT type; HRESULT hr; - TRACE("%p->(%s %s %p)\n", This, debugstr_w(target), debugstr_w(data), pi); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(target), debugstr_w(data), pi); if (!pi) return E_INVALIDARG; @@ -1232,7 +1238,7 @@ static HRESULT WINAPI domdoc_createAttribute( VARIANT type; HRESULT hr; - TRACE("%p->(%s %p)\n", This, debugstr_w(name), attribute); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), attribute); if (!attribute || !name) return E_INVALIDARG; @@ -1260,7 +1266,7 @@ static HRESULT WINAPI domdoc_createEntityReference( VARIANT type; HRESULT hr; - TRACE("%p->(%s %p)\n", This, debugstr_w(name), entityref); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), entityref); if (!entityref) return E_INVALIDARG; @@ -1290,7 +1296,7 @@ static HRESULT WINAPI domdoc_getElementsByTagName( domdoc *This = impl_from_IXMLDOMDocument2( iface ); LPWSTR szPattern; HRESULT hr; - TRACE("(%p)->(%s, %p)\n", This, debugstr_w(tagName), resultList); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(tagName), resultList); if (tagName[0] == '*' && tagName[1] == 0) { @@ -1339,7 +1345,7 @@ static HRESULT WINAPI domdoc_createNode( xmlChar *xml_name; HRESULT hr; - TRACE("(%p)->(%s,%s,%p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); if(!node) return E_INVALIDARG; @@ -1427,7 +1433,8 @@ static HRESULT WINAPI domdoc_nodeFromID( BSTR idString, IXMLDOMNode** node ) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(idString), node); return E_NOTIMPL; } @@ -1473,7 +1480,7 @@ static HRESULT WINAPI domdoc_load( IStream *pStream = NULL; xmlDocPtr xmldoc; - TRACE("type %d\n", V_VT(&xmlSource) ); + TRACE("(%p)->type %d\n", This, V_VT(&xmlSource) ); *isSuccessful = VARIANT_FALSE; @@ -1569,7 +1576,8 @@ static HRESULT WINAPI domdoc_get_readyState( IXMLDOMDocument2 *iface, LONG *value ) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2(iface); + FIXME("(%p)->(%p)\n", This, value); return E_NOTIMPL; } @@ -1597,7 +1605,8 @@ static HRESULT WINAPI domdoc_get_url( IXMLDOMDocument2 *iface, BSTR* urlString ) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2(iface); + FIXME("(%p)->(%p)\n", This, urlString); return E_NOTIMPL; } @@ -1608,7 +1617,7 @@ static HRESULT WINAPI domdoc_get_async( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - TRACE("%p <- %d\n", isAsync, This->async); + TRACE("(%p)->(%p: %d)\n", This, isAsync, This->async); *isAsync = This->async; return S_OK; } @@ -1620,7 +1629,7 @@ static HRESULT WINAPI domdoc_put_async( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - TRACE("%d\n", isAsync); + TRACE("(%p)->(%d)\n", This, isAsync); This->async = isAsync; return S_OK; } @@ -1629,7 +1638,8 @@ static HRESULT WINAPI domdoc_put_async( static HRESULT WINAPI domdoc_abort( IXMLDOMDocument2 *iface ) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2(iface); + FIXME("%p\n", This); return E_NOTIMPL; } @@ -1660,7 +1670,7 @@ static HRESULT WINAPI domdoc_loadXML( int len; HRESULT hr = S_FALSE, hr2; - TRACE("%p %s %p\n", This, debugstr_w( bstrXML ), isSuccessful ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w( bstrXML ), isSuccessful ); assert ( &This->node ); @@ -1786,7 +1796,7 @@ static HRESULT WINAPI domdoc_get_validateOnParse( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - TRACE("%p <- %d\n", isValidating, This->validating); + TRACE("(%p)->(%p: %d)\n", This, isValidating, This->validating); *isValidating = This->validating; return S_OK; } @@ -1798,7 +1808,7 @@ static HRESULT WINAPI domdoc_put_validateOnParse( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - TRACE("%d\n", isValidating); + TRACE("(%p)->(%d)\n", This, isValidating); This->validating = isValidating; return S_OK; } @@ -1810,7 +1820,7 @@ static HRESULT WINAPI domdoc_get_resolveExternals( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - TRACE("%p <- %d\n", isResolving, This->resolving); + TRACE("(%p)->(%p: %d)\n", This, isResolving, This->resolving); *isResolving = This->resolving; return S_OK; } @@ -1822,7 +1832,7 @@ static HRESULT WINAPI domdoc_put_resolveExternals( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - TRACE("%d\n", isResolving); + TRACE("(%p)->(%d)\n", This, isResolving); This->resolving = isResolving; return S_OK; } @@ -1834,7 +1844,7 @@ static HRESULT WINAPI domdoc_get_preserveWhiteSpace( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - TRACE("%p <- %d\n", isPreserving, This->preserving); + TRACE("(%p)->(%p: %d)\n", This, isPreserving, This->preserving); *isPreserving = This->preserving; return S_OK; } @@ -1846,7 +1856,7 @@ static HRESULT WINAPI domdoc_put_preserveWhiteSpace( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - TRACE("%d\n", isPreserving); + TRACE("(%p)->(%d)\n", This, isPreserving); This->preserving = isPreserving; return S_OK; } @@ -1856,7 +1866,8 @@ static HRESULT WINAPI domdoc_put_onReadyStateChange( IXMLDOMDocument2 *iface, VARIANT readyStateChangeSink ) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + FIXME("%p\n", This); return E_NOTIMPL; } @@ -1865,7 +1876,8 @@ static HRESULT WINAPI domdoc_put_onDataAvailable( IXMLDOMDocument2 *iface, VARIANT onDataAvailableSink ) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + FIXME("%p\n", This); return E_NOTIMPL; } @@ -1873,7 +1885,8 @@ static HRESULT WINAPI domdoc_put_onTransformNode( IXMLDOMDocument2 *iface, VARIANT onTransformNodeSink ) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + FIXME("%p\n", This); return E_NOTIMPL; } @@ -1881,7 +1894,8 @@ static HRESULT WINAPI domdoc_get_namespaces( IXMLDOMDocument2* iface, IXMLDOMSchemaCollection** schemaCollection ) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + FIXME("(%p)->(%p)\n", This, schemaCollection); return E_NOTIMPL; } @@ -1948,7 +1962,8 @@ static HRESULT WINAPI domdoc_validate( IXMLDOMDocument2* iface, IXMLDOMParseError** err) { - FIXME("\n"); + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + FIXME("(%p)->(%p)\n", This, err); return E_NOTIMPL; } @@ -1959,6 +1974,8 @@ static HRESULT WINAPI domdoc_setProperty( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + if (lstrcmpiW(p, SZ_PROPERTY_SELECTION_LANGUAGE) == 0) { VARIANT varStr; @@ -1998,6 +2015,8 @@ static HRESULT WINAPI domdoc_getProperty( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); + TRACE("(%p)->(%p)\n", This, debugstr_w(p)); + if (var == NULL) return E_INVALIDARG; if (lstrcmpiW(p, SZ_PROPERTY_SELECTION_LANGUAGE) == 0) @@ -2127,7 +2146,7 @@ xmldoc_GetSite( IObjectWithSite *iface, REFIID iid, void ** ppvSite ) { domdoc *This = impl_from_IObjectWithSite(iface); - TRACE("%p %s %p\n", This, debugstr_guid( iid ), ppvSite ); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid( iid ), ppvSite ); if ( !This->site ) return E_FAIL; @@ -2140,7 +2159,7 @@ xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk ) { domdoc *This = impl_from_IObjectWithSite(iface); - TRACE("%p %p\n", iface, punk); + TRACE("(%p)->(%p)\n", iface, punk); if(!punk) { diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 1a07676e33f..dd518a1bc3b 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -54,7 +54,7 @@ static HRESULT WINAPI dimimpl_QueryInterface( void** ppvObject ) { domimpl *This = impl_from_IXMLDOMImplementation( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMImplementation ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -181,7 +181,7 @@ static HRESULT WINAPI dimimpl_hasFeature(IXMLDOMImplementation* This, BSTR featu BOOL bValidFeature = FALSE; BOOL bValidVersion = FALSE; - TRACE("feature(%s) version (%s)\n", debugstr_w(feature), debugstr_w(version)); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(feature), debugstr_w(version), hasFeature); if(!feature || !hasFeature) return E_INVALIDARG; diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index f7bd3b03e08..01547709b7b 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -62,7 +62,7 @@ static HRESULT WINAPI domelem_QueryInterface( { domelem *This = impl_from_IXMLDOMElement( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -493,7 +493,7 @@ static HRESULT WINAPI domelem_get_tagName( DWORD offset = 0; LPWSTR str; - TRACE("%p\n", This ); + TRACE("(%p)->(%p)\n", This, p ); element = get_element( This ); if ( !element ) @@ -526,7 +526,7 @@ static HRESULT WINAPI domelem_getAttribute( xmlChar *xml_name, *xml_value = NULL; HRESULT hr = S_FALSE; - TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), value); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); if(!value || !name) return E_INVALIDARG; @@ -567,7 +567,7 @@ static HRESULT WINAPI domelem_setAttribute( HRESULT hr; VARIANT var; - TRACE("(%p)->(%s, var)\n", This, debugstr_w(name)); + TRACE("(%p)->(%s var)\n", This, debugstr_w(name)); element = get_element( This ); if ( !element ) @@ -660,7 +660,8 @@ static HRESULT WINAPI domelem_setAttributeNode( IXMLDOMAttribute* domAttribute, IXMLDOMAttribute** attributeNode) { - FIXME("\n"); + domelem *This = impl_from_IXMLDOMElement( iface ); + FIXME("(%p)->(%p %p)\n", This, domAttribute, attributeNode); return E_NOTIMPL; } @@ -669,7 +670,8 @@ static HRESULT WINAPI domelem_removeAttributeNode( IXMLDOMAttribute* domAttribute, IXMLDOMAttribute** attributeNode) { - FIXME("\n"); + domelem *This = impl_from_IXMLDOMElement( iface ); + FIXME("(%p)->(%p %p)\n", This, domAttribute, attributeNode); return E_NOTIMPL; } @@ -684,7 +686,7 @@ static HRESULT WINAPI domelem_getElementsByTagName( xmlNodePtr element; HRESULT hr; - TRACE("(%p)->(%s,%p)\n", This, debugstr_w(bstrName), resultList); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrName), resultList); if (bstrName[0] == '*' && bstrName[1] == 0) { @@ -714,7 +716,8 @@ static HRESULT WINAPI domelem_getElementsByTagName( static HRESULT WINAPI domelem_normalize( IXMLDOMElement *iface ) { - FIXME("\n"); + domelem *This = impl_from_IXMLDOMElement( iface ); + FIXME("%p\n", This); return E_NOTIMPL; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 1489dbd0c57..db461934538 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -55,7 +55,7 @@ static HRESULT WINAPI entityref_QueryInterface( void** ppvObject ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMEntityReference ) || IsEqualGUID( riid, &IID_IDispatch ) || diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index a477753a71a..458548406a0 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -50,7 +50,7 @@ static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) static HRESULT WINAPI httprequest_QueryInterface(IXMLHTTPRequest *iface, REFIID riid, void **ppvObject) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLHTTPRequest) || IsEqualGUID( riid, &IID_IDispatch) || diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 54782f95f78..b981bccb613 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -87,7 +87,7 @@ static HRESULT WINAPI xmlnode_QueryInterface( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if(This->pUnkOuter) return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); @@ -230,7 +230,7 @@ static HRESULT WINAPI xmlnode_get_nodeName( xmlnode *This = impl_from_IXMLDOMNode( iface ); const xmlChar *str; - TRACE("%p\n", This ); + TRACE("(%p)->(%p)\n", This, name ); if (!name) return E_INVALIDARG; @@ -280,7 +280,7 @@ static HRESULT WINAPI xmlnode_get_nodeValue( xmlnode *This = impl_from_IXMLDOMNode( iface ); HRESULT r = S_FALSE; - TRACE("%p %p\n", This, value); + TRACE("(%p)->(%p)\n", This, value); if(!value) return E_INVALIDARG; @@ -375,7 +375,7 @@ static HRESULT WINAPI xmlnode_get_nodeType( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p %p\n", This, type); + TRACE("(%p)->(%p)\n", This, type); assert( (int)NODE_ELEMENT == (int)XML_ELEMENT_NODE ); assert( (int)NODE_NOTATION == (int)XML_NOTATION_NODE ); @@ -391,7 +391,7 @@ static HRESULT get_node( xmlNodePtr node, IXMLDOMNode **out ) { - TRACE("%p->%s %p\n", This, name, node ); + TRACE("(%p)->(%s %p %p)\n", This, name, node, out ); if ( !out ) return E_INVALIDARG; @@ -420,7 +420,7 @@ static HRESULT WINAPI xmlnode_get_childNodes( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p %p\n", This, childList ); + TRACE("(%p)->(%p)\n", This, childList ); if ( !childList ) return E_INVALIDARG; @@ -446,7 +446,7 @@ static HRESULT WINAPI xmlnode_get_lastChild( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p\n", This ); + TRACE("(%p)->(%p)\n", This, lastChild ); if (!lastChild) return E_INVALIDARG; @@ -471,7 +471,7 @@ static HRESULT WINAPI xmlnode_get_previousSibling( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p\n", This ); + TRACE("(%p)->(%p)\n", This, previousSibling ); if (!previousSibling) return E_INVALIDARG; @@ -495,7 +495,7 @@ static HRESULT WINAPI xmlnode_get_nextSibling( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p\n", This ); + TRACE("(%p)->(%p)\n", This, nextSibling ); if (!nextSibling) return E_INVALIDARG; @@ -518,7 +518,7 @@ static HRESULT WINAPI xmlnode_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p\n", This); + TRACE("(%p)->(%p)\n", This, attributeMap); if (!attributeMap) return E_INVALIDARG; @@ -554,7 +554,7 @@ static HRESULT WINAPI xmlnode_insertBefore( IXMLDOMNode *before = NULL, *new; HRESULT hr; - TRACE("(%p)->(%p,var,%p)\n",This,newChild,outNewChild); + TRACE("(%p)->(%p var %p)\n",This,newChild,outNewChild); if (!newChild) return E_INVALIDARG; @@ -621,7 +621,7 @@ static HRESULT WINAPI xmlnode_replaceChild( IXMLDOMNode *realOldChild; HRESULT hr; - TRACE("%p->(%p,%p,%p)\n",This,newChild,oldChild,outOldChild); + TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, outOldChild); /* Do not believe any documentation telling that newChild == NULL means removal. It does certainly *not* apply to msxml3! */ @@ -685,7 +685,7 @@ static HRESULT WINAPI xmlnode_removeChild( HRESULT hr; IXMLDOMNode *child; - TRACE("%p->(%p, %p)\n", This, childNode, oldChild); + TRACE("(%p)->(%p %p)\n", This, childNode, oldChild); if(!childNode) return E_INVALIDARG; @@ -727,7 +727,7 @@ static HRESULT WINAPI xmlnode_appendChild( VARIANT var; HRESULT hr; - TRACE("(%p)->(%p,%p)\n", This, newChild, outNewChild); + TRACE("(%p)->(%p %p)\n", This, newChild, outNewChild); hr = IXMLDOMNode_get_nodeType(newChild, &type); if(FAILED(hr) || type == NODE_ATTRIBUTE) { @@ -745,7 +745,7 @@ static HRESULT WINAPI xmlnode_hasChildNodes( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p\n", This); + TRACE("(%p)->(%p)\n", This, hasChild); if (!hasChild) return E_INVALIDARG; @@ -765,7 +765,7 @@ static HRESULT WINAPI xmlnode_get_ownerDocument( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p (%p)\n", This, DOMDocument); + TRACE("(%p)->(%p)\n", This, DOMDocument); return DOMDocument_create_from_xmldoc(This->node->doc, (IXMLDOMDocument2**)DOMDocument); } @@ -779,7 +779,7 @@ static HRESULT WINAPI xmlnode_cloneNode( xmlNodePtr pClone = NULL; IXMLDOMNode *pNode = NULL; - TRACE("%p (%d)\n", This, deep); + TRACE("(%p)->(%d %p)\n", This, deep, cloneRoot); if(!cloneRoot) return E_INVALIDARG; @@ -815,7 +815,7 @@ static HRESULT WINAPI xmlnode_get_nodeTypeString( xmlnode *This = impl_from_IXMLDOMNode( iface ); const xmlChar *str; - TRACE("%p\n", This ); + TRACE("(%p)->(%p)\n", This, xmlnodeType ); if (!xmlnodeType) return E_INVALIDARG; @@ -879,7 +879,7 @@ static HRESULT WINAPI xmlnode_get_text( BSTR str = NULL; xmlChar *pContent; - TRACE("%p type %d\n", This, This->node->type); + TRACE("(%p, type %d)->(%p)\n", This, This->node->type, text); if ( !text ) return E_INVALIDARG; @@ -907,7 +907,7 @@ static HRESULT WINAPI xmlnode_put_text( xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlChar *str, *str2; - TRACE("%p\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_w(text)); switch(This->node->type) { @@ -933,7 +933,8 @@ static HRESULT WINAPI xmlnode_get_specified( IXMLDOMNode *iface, VARIANT_BOOL* isSpecified) { - FIXME("\n"); + xmlnode *This = impl_from_IXMLDOMNode( iface ); + FIXME("(%p)->(%p)\n", This, isSpecified); return E_NOTIMPL; } @@ -941,7 +942,8 @@ static HRESULT WINAPI xmlnode_get_definition( IXMLDOMNode *iface, IXMLDOMNode** definitionNode) { - FIXME("\n"); + xmlnode *This = impl_from_IXMLDOMNode( iface ); + FIXME("(%p)->(%p)\n", This, definitionNode); return E_NOTIMPL; } @@ -1137,7 +1139,7 @@ static HRESULT WINAPI xmlnode_get_nodeTypedValue( xmlChar *content; HRESULT hres = S_FALSE; - TRACE("iface %p\n", iface); + TRACE("(%p)->(%p)\n", This, typedValue); if(!typedValue) return E_INVALIDARG; @@ -1165,7 +1167,8 @@ static HRESULT WINAPI xmlnode_put_nodeTypedValue( IXMLDOMNode *iface, VARIANT typedValue) { - FIXME("\n"); + xmlnode *This = impl_from_IXMLDOMNode( iface ); + FIXME("%p\n", This); return E_NOTIMPL; } @@ -1176,7 +1179,7 @@ static HRESULT WINAPI xmlnode_get_dataType( xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlChar *pVal; - TRACE("iface %p\n", iface); + TRACE("(%p)->(%p)\n", This, dataTypeName); if(!dataTypeName) return E_INVALIDARG; @@ -1221,7 +1224,7 @@ static HRESULT WINAPI xmlnode_put_dataType( xmlnode *This = impl_from_IXMLDOMNode( iface ); HRESULT hr = E_FAIL; - TRACE("iface %p\n", iface); + TRACE("(%p)->(%s)\n", This, debugstr_w(dataTypeName)); if(dataTypeName == NULL) return E_INVALIDARG; @@ -1383,7 +1386,7 @@ static HRESULT WINAPI xmlnode_get_xml( xmlBufferPtr pXmlBuf; int nSize; - TRACE("iface %p %d\n", iface, This->node->type); + TRACE("(%p %d)->(%p)\n", This, This->node->type, xmlString); if(!xmlString) return E_INVALIDARG; @@ -1441,7 +1444,7 @@ static HRESULT WINAPI xmlnode_transformNode( xmlDocPtr result = NULL; IXMLDOMNode *ssNew; - TRACE("%p %p %p\n", This, styleSheet, xmlString); + TRACE("(%p)->(%p %p)\n", This, styleSheet, xmlString); if (!libxslt_handle) return E_NOTIMPL; @@ -1518,7 +1521,7 @@ static HRESULT WINAPI xmlnode_selectNodes( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("%p %s %p\n", This, debugstr_w(queryString), resultList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultList ); return queryresult_create( This->node, queryString, resultList ); } @@ -1532,7 +1535,7 @@ static HRESULT WINAPI xmlnode_selectSingleNode( IXMLDOMNodeList *list; HRESULT r; - TRACE("%p %s %p\n", This, debugstr_w(queryString), resultNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultNode ); *resultNode = NULL; r = IXMLDOMNode_selectNodes(iface, queryString, &list); @@ -1548,7 +1551,8 @@ static HRESULT WINAPI xmlnode_get_parsed( IXMLDOMNode *iface, VARIANT_BOOL* isParsed) { - FIXME("\n"); + xmlnode *This = impl_from_IXMLDOMNode( iface ); + FIXME("(%p)->(%p)\n", This, isParsed); return E_NOTIMPL; } @@ -1560,7 +1564,7 @@ static HRESULT WINAPI xmlnode_get_namespaceURI( HRESULT hr = S_FALSE; xmlNsPtr *pNSList; - TRACE("%p %p\n", This, namespaceURI ); + TRACE("(%p)->(%p)\n", This, namespaceURI ); if(!namespaceURI) return E_INVALIDARG; @@ -1587,7 +1591,7 @@ static HRESULT WINAPI xmlnode_get_prefix( HRESULT hr = S_FALSE; xmlNsPtr *pNSList; - TRACE("%p %p\n", This, prefixString ); + TRACE("(%p)->(%p)\n", This, prefixString ); if(!prefixString) return E_INVALIDARG; @@ -1614,7 +1618,7 @@ static HRESULT WINAPI xmlnode_get_baseName( BSTR str = NULL; HRESULT r = S_FALSE; - TRACE("%p %p\n", This, nameString ); + TRACE("(%p)->(%p)\n", This, nameString ); if ( !nameString ) return E_INVALIDARG; @@ -1646,7 +1650,8 @@ static HRESULT WINAPI xmlnode_transformNodeToObject( IXMLDOMNode* stylesheet, VARIANT outputObject) { - FIXME("\n"); + xmlnode *This = impl_from_IXMLDOMNode( iface ); + FIXME("(%p)->(%p)\n", This, stylesheet); return E_NOTIMPL; } diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 011fff0bf61..f643c5e8cbb 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -64,7 +64,7 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( REFIID riid, void** ppvObject ) { - TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); if(!ppvObject) return E_INVALIDARG; @@ -205,7 +205,7 @@ static HRESULT WINAPI xmlnodelist_get_item( xmlNodePtr curr; LONG nodeIndex = 0; - TRACE("%p %d\n", This, index); + TRACE("(%p)->(%d %p)\n", This, index, listItem); if(!listItem) return E_INVALIDARG; @@ -238,7 +238,7 @@ static HRESULT WINAPI xmlnodelist_get_length( xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - TRACE("%p\n", This); + TRACE("(%p)->(%p)\n", This, listLength); if(!listLength) return E_INVALIDARG; @@ -260,7 +260,7 @@ static HRESULT WINAPI xmlnodelist_nextNode( { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - TRACE("%p %p\n", This, nextItem ); + TRACE("(%p)->(%p)\n", This, nextItem ); if(!nextItem) return E_INVALIDARG; @@ -289,7 +289,8 @@ static HRESULT WINAPI xmlnodelist__newEnum( IXMLDOMNodeList* iface, IUnknown** ppUnk) { - FIXME("\n"); + xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); + FIXME("(%p)->(%p)\n", This, ppUnk); return E_NOTIMPL; } diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 91f7a323e5e..7d23ec80bd5 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -62,7 +62,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( REFIID riid, void** ppvObject ) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); if( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -207,7 +207,7 @@ static HRESULT WINAPI xmlnodemap_getNamedItem( xmlAttrPtr attr; xmlNodePtr node; - TRACE("%p %s %p\n", This, debugstr_w(name), namedItem ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), namedItem ); if ( !namedItem ) return E_INVALIDARG; @@ -242,7 +242,7 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( IXMLDOMNode *pAttr = NULL; xmlNodePtr node; - TRACE("%p %p %p\n", This, newItem, namedItem ); + TRACE("(%p)->(%p %p)\n", This, newItem, namedItem ); if(!newItem) return E_INVALIDARG; @@ -292,7 +292,7 @@ static HRESULT WINAPI xmlnodemap_removeNamedItem( xmlAttrPtr attr; xmlNodePtr node; - TRACE("%p %s %p\n", This, debugstr_w(name), namedItem ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), namedItem ); if ( !name) return E_INVALIDARG; @@ -337,7 +337,7 @@ static HRESULT WINAPI xmlnodemap_get_item( xmlAttrPtr curr; LONG attrIndex; - TRACE("%p %d\n", This, index); + TRACE("(%p)->(%d %p)\n", This, index, listItem); *listItem = NULL; @@ -370,7 +370,7 @@ static HRESULT WINAPI xmlnodemap_get_length( xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("%p\n", This); + TRACE("(%p)->(%p)\n", This, listLength); if( !listLength ) return E_INVALIDARG; @@ -402,7 +402,8 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( BSTR namespaceURI, IXMLDOMNode** qualifiedItem) { - FIXME("\n"); + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); return E_NOTIMPL; } @@ -412,7 +413,8 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( BSTR namespaceURI, IXMLDOMNode** qualifiedItem) { - FIXME("\n"); + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); return E_NOTIMPL; } @@ -425,7 +427,7 @@ static HRESULT WINAPI xmlnodemap_nextNode( xmlAttrPtr curr; LONG attrIndex; - TRACE("%p %d\n", This, This->iterator); + TRACE("(%p)->(%p: %d)\n", This, nextItem, This->iterator); *nextItem = NULL; @@ -451,7 +453,7 @@ static HRESULT WINAPI xmlnodemap_reset( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("%p %d\n", This, This->iterator); + TRACE("(%p: %d)\n", This, This->iterator); This->iterator = 0; @@ -462,7 +464,8 @@ static HRESULT WINAPI xmlnodemap__newEnum( IXMLDOMNamedNodeMap *iface, IUnknown** ppUnk) { - FIXME("\n"); + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + FIXME("(%p)->(%p)\n", This, ppUnk); return E_NOTIMPL; } diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 40b17a0f3d9..4b0dc57f508 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -56,7 +56,7 @@ static HRESULT WINAPI parseError_QueryInterface( REFIID riid, void** ppvObject ) { - TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -208,7 +208,8 @@ static HRESULT WINAPI parseError_get_url( IXMLDOMParseError *iface, BSTR *url ) { - FIXME("\n"); + parse_error_t *This = impl_from_IXMLDOMParseError( iface ); + FIXME("(%p)->(%p)\n", This, url); return E_NOTIMPL; } @@ -232,7 +233,8 @@ static HRESULT WINAPI parseError_get_srcText( IXMLDOMParseError *iface, BSTR *srcText ) { - FIXME("\n"); + parse_error_t *This = impl_from_IXMLDOMParseError( iface ); + FIXME("(%p)->(%p)\n", This, srcText); return E_NOTIMPL; } @@ -240,7 +242,8 @@ static HRESULT WINAPI parseError_get_line( IXMLDOMParseError *iface, LONG *line ) { - FIXME("\n"); + parse_error_t *This = impl_from_IXMLDOMParseError( iface ); + FIXME("(%p)->(%p)\n", This, line); return E_NOTIMPL; } @@ -248,7 +251,8 @@ static HRESULT WINAPI parseError_get_linepos( IXMLDOMParseError *iface, LONG *linepos ) { - FIXME("\n"); + parse_error_t *This = impl_from_IXMLDOMParseError( iface ); + FIXME("(%p)->(%p)\n", This, linepos); return E_NOTIMPL; } @@ -256,7 +260,8 @@ static HRESULT WINAPI parseError_get_filepos( IXMLDOMParseError *iface, LONG *filepos ) { - FIXME("\n"); + parse_error_t *This = impl_from_IXMLDOMParseError( iface ); + FIXME("(%p)->(%p)\n", This, filepos); return E_NOTIMPL; } diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index f32cebf8300..0baefe49031 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -55,7 +55,7 @@ static HRESULT WINAPI dom_pi_QueryInterface( void** ppvObject ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMProcessingInstruction ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -526,7 +526,7 @@ static HRESULT WINAPI dom_pi_put_data( BSTR sTarget; static const WCHAR szXML[] = {'x','m','l',0}; - TRACE("%p %s\n", This, debugstr_w(data) ); + TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); /* Cannot set data to a PI node whose target is 'xml' */ hr = dom_pi_get_nodeName(iface, &sTarget); diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index ab545968c08..eab83a904b6 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -74,7 +74,7 @@ static HRESULT WINAPI queryresult_QueryInterface( { queryresult *This = impl_from_IXMLDOMNodeList( iface ); - TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); if(!ppvObject) return E_INVALIDARG; @@ -217,7 +217,7 @@ static HRESULT WINAPI queryresult_get_item( { queryresult *This = impl_from_IXMLDOMNodeList( iface ); - TRACE("%p %d\n", This, index); + TRACE("(%p)->(%d %p)\n", This, index, listItem); if(!listItem) return E_INVALIDARG; @@ -239,7 +239,7 @@ static HRESULT WINAPI queryresult_get_length( { queryresult *This = impl_from_IXMLDOMNodeList( iface ); - TRACE("%p\n", This); + TRACE("(%p)->(%p)\n", This, listLength); if(!listLength) return E_INVALIDARG; @@ -254,7 +254,7 @@ static HRESULT WINAPI queryresult_nextNode( { queryresult *This = impl_from_IXMLDOMNodeList( iface ); - TRACE("%p %p\n", This, nextItem ); + TRACE("(%p)->(%p)\n", This, nextItem ); if(!nextItem) return E_INVALIDARG; @@ -283,7 +283,8 @@ static HRESULT WINAPI queryresult__newEnum( IXMLDOMNodeList* iface, IUnknown** ppUnk) { - FIXME("\n"); + queryresult *This = impl_from_IXMLDOMNodeList( iface ); + FIXME("(%p)->(%p)\n", This, ppUnk); return E_NOTIMPL; } diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index f0a616979a0..72d78547082 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -51,7 +51,7 @@ static HRESULT WINAPI schema_cache_QueryInterface( IXMLDOMSchemaCollection *ifac { schema_t *This = impl_from_IXMLDOMSchemaCollection( iface ); - TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid( riid ), ppvObject ); if ( IsEqualIID( riid, &IID_IUnknown ) || IsEqualIID( riid, &IID_IDispatch ) || diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index ba959d304ab..fdcb06b4cb3 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -56,7 +56,7 @@ static HRESULT WINAPI domtext_QueryInterface( void** ppvObject ) { domtext *This = impl_from_IXMLDOMText( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMText ) || IsEqualGUID( riid, &IID_IXMLDOMCharacterData) || @@ -504,7 +504,7 @@ static HRESULT WINAPI domtext_put_data( domtext *This = impl_from_IXMLDOMText( iface ); VARIANT val; - TRACE("%p %s\n", This, debugstr_w(data) ); + TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; @@ -520,7 +520,7 @@ static HRESULT WINAPI domtext_get_length( HRESULT hr; BSTR data; - TRACE("%p %p\n", This, len); + TRACE("(%p)->(%p)\n", This, len); if(!len) return E_INVALIDARG; @@ -543,7 +543,7 @@ static HRESULT WINAPI domtext_substringData( HRESULT hr; BSTR data; - TRACE("%p %d %d %p\n", This, offset, count, p); + TRACE("(%p)->(%d %d %p)\n", This, offset, count, p); if(!p) return E_INVALIDARG; @@ -585,7 +585,7 @@ static HRESULT WINAPI domtext_appendData( BSTR data; LONG p_len; - TRACE("%p %s\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); /* Nothing to do if NULL or an Empty string passed in. */ if((p_len = SysStringLen(p)) == 0) return S_OK; @@ -618,7 +618,7 @@ static HRESULT WINAPI domtext_insertData( BSTR data; LONG p_len; - TRACE("%p %d %s\n", This, offset, debugstr_w(p)); + TRACE("(%p)->(%d %s)\n", This, offset, debugstr_w(p)); /* If have a NULL or empty string, don't do anything. */ if((p_len = SysStringLen(p)) == 0) @@ -665,7 +665,7 @@ static HRESULT WINAPI domtext_deleteData( LONG len = -1; BSTR str; - TRACE("%p %d %d\n", iface, offset, count); + TRACE("(%p)->(%d %d)\n", iface, offset, count); hr = IXMLDOMText_get_length(iface, &len); if(hr != S_OK) return hr; @@ -711,7 +711,7 @@ static HRESULT WINAPI domtext_replaceData( domtext *This = impl_from_IXMLDOMText( iface ); HRESULT hr; - TRACE("%p %d %d %s\n", This, offset, count, debugstr_w(p)); + TRACE("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(p)); hr = IXMLDOMText_deleteData(iface, offset, count); @@ -725,7 +725,8 @@ static HRESULT WINAPI domtext_splitText( IXMLDOMText *iface, LONG offset, IXMLDOMText **txtNode) { - FIXME("\n"); + domtext *This = impl_from_IXMLDOMText( iface ); + FIXME("(%p)->(%d %p)\n", This, offset, txtNode); return E_NOTIMPL; }