[PATCH] msxml3: Fix long types warnings in traces.
Nikolay Sivov
nsivov at codeweavers.com
Thu Feb 3 04:48:04 CST 2022
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/msxml3/Makefile.in | 1 -
dlls/msxml3/attribute.c | 8 +--
dlls/msxml3/bsc.c | 33 ++++++------
dlls/msxml3/cdata.c | 40 +++++++--------
dlls/msxml3/comment.c | 40 +++++++--------
dlls/msxml3/dispex.c | 54 ++++++++------------
dlls/msxml3/docfrag.c | 25 +++++----
dlls/msxml3/doctype.c | 25 +++++----
dlls/msxml3/domdoc.c | 42 +++++++--------
dlls/msxml3/domimpl.c | 23 ++++-----
dlls/msxml3/element.c | 29 +++++------
dlls/msxml3/entityref.c | 7 +--
dlls/msxml3/factory.c | 20 ++++----
dlls/msxml3/httprequest.c | 104 ++++++++++++++++----------------------
dlls/msxml3/main.c | 2 +-
dlls/msxml3/mxnamespace.c | 18 +++----
dlls/msxml3/mxwriter.c | 52 ++++++++-----------
dlls/msxml3/node.c | 30 ++++-------
dlls/msxml3/nodelist.c | 13 ++---
dlls/msxml3/nodemap.c | 17 ++++---
dlls/msxml3/parseerror.c | 7 +--
dlls/msxml3/pi.c | 8 +--
dlls/msxml3/saxreader.c | 34 +++++--------
dlls/msxml3/schema.c | 14 ++---
dlls/msxml3/selection.c | 20 ++++----
dlls/msxml3/stylesheet.c | 10 ++--
dlls/msxml3/text.c | 18 +++----
dlls/msxml3/xmldoc.c | 17 +++----
dlls/msxml3/xmlelem.c | 31 ++++--------
dlls/msxml3/xmlparser.c | 26 +++-------
dlls/msxml3/xmlview.c | 84 +++++++++++++-----------------
31 files changed, 373 insertions(+), 479 deletions(-)
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index 7e3eccc0139..2bf789732da 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = msxml3.dll
IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS)
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
index cbb70daa4a2..89a1f630021 100644
--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
@@ -95,9 +95,9 @@ static HRESULT WINAPI domattr_QueryInterface(
static ULONG WINAPI domattr_AddRef(
IXMLDOMAttribute *iface )
{
- domattr *This = impl_from_IXMLDOMAttribute( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domattr *attr = impl_from_IXMLDOMAttribute( iface );
+ ULONG ref = InterlockedIncrement( &attr->ref );
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -107,7 +107,7 @@ static ULONG WINAPI domattr_Release(
domattr *This = impl_from_IXMLDOMAttribute( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
destroy_xmlnode(&This->node);
diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
index 3455fd675aa..5e3b60d92b5 100644
--- a/dlls/msxml3/bsc.c
+++ b/dlls/msxml3/bsc.c
@@ -76,10 +76,10 @@ static HRESULT WINAPI bsc_QueryInterface(
static ULONG WINAPI bsc_AddRef(
IBindStatusCallback *iface )
{
- bsc_t *This = impl_from_IBindStatusCallback(iface);
- LONG ref = InterlockedIncrement(&This->ref);
+ bsc_t *bsc = impl_from_IBindStatusCallback(iface);
+ LONG ref = InterlockedIncrement(&bsc->ref);
- TRACE("(%p) ref=%d\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -87,15 +87,18 @@ static ULONG WINAPI bsc_AddRef(
static ULONG WINAPI bsc_Release(
IBindStatusCallback *iface )
{
- bsc_t *This = impl_from_IBindStatusCallback(iface);
- LONG ref = InterlockedDecrement(&This->ref);
+ bsc_t *bsc = impl_from_IBindStatusCallback(iface);
+ LONG ref = InterlockedDecrement(&bsc->ref);
- TRACE("(%p) ref=%d\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if(!ref) {
- if (This->binding) IBinding_Release(This->binding);
- if (This->memstream) IStream_Release(This->memstream);
- heap_free(This);
+ if (!ref)
+ {
+ if (bsc->binding)
+ IBinding_Release(bsc->binding);
+ if (bsc->memstream)
+ IStream_Release(bsc->memstream);
+ heap_free(bsc);
}
return ref;
@@ -109,7 +112,7 @@ static HRESULT WINAPI bsc_OnStartBinding(
bsc_t *This = impl_from_IBindStatusCallback(iface);
HRESULT hr;
- TRACE("(%p)->(%x %p)\n", This, dwReserved, pib);
+ TRACE("%p, %lx, %p.\n", iface, dwReserved, pib);
This->binding = pib;
IBinding_AddRef(pib);
@@ -153,7 +156,7 @@ static HRESULT WINAPI bsc_OnStopBinding(
bsc_t *This = impl_from_IBindStatusCallback(iface);
HRESULT hr = S_OK;
- TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));
+ TRACE("%p, %#lx, %s.\n", iface, hresult, debugstr_w(szError));
if(This->binding) {
IBinding_Release(This->binding);
@@ -194,12 +197,12 @@ static HRESULT WINAPI bsc_OnDataAvailable(
FORMATETC* pformatetc,
STGMEDIUM* pstgmed)
{
- bsc_t *This = impl_from_IBindStatusCallback(iface);
+ bsc_t *bsc = impl_from_IBindStatusCallback(iface);
BYTE buf[4096];
DWORD read, written;
HRESULT hr;
- TRACE("(%p)->(%x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
+ TRACE("%p, %lx, %lu, %p, %p.\n", iface, grfBSCF, dwSize, pformatetc, pstgmed);
do
{
@@ -207,7 +210,7 @@ static HRESULT WINAPI bsc_OnDataAvailable(
if(FAILED(hr))
break;
- hr = IStream_Write(This->memstream, buf, read, &written);
+ hr = IStream_Write(bsc->memstream, buf, read, &written);
} while(SUCCEEDED(hr) && written != 0 && read != 0);
return S_OK;
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index fa8856ece5f..9994a508c54 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -89,26 +89,25 @@ static HRESULT WINAPI domcdata_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domcdata_AddRef(
- IXMLDOMCDATASection *iface )
+static ULONG WINAPI domcdata_AddRef(IXMLDOMCDATASection *iface)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domcdata *cdata = impl_from_IXMLDOMCDATASection(iface);
+ ULONG ref = InterlockedIncrement(&cdata->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domcdata_Release(
- IXMLDOMCDATASection *iface )
+static ULONG WINAPI domcdata_Release(IXMLDOMCDATASection *iface)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ domcdata *cdata = impl_from_IXMLDOMCDATASection(iface);
+ ULONG ref = InterlockedDecrement(&cdata->ref);
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
- destroy_xmlnode(&This->node);
- heap_free( This );
+ destroy_xmlnode(&cdata->node);
+ heap_free(cdata);
}
return ref;
@@ -577,11 +576,10 @@ static HRESULT WINAPI domcdata_substringData(
IXMLDOMCDATASection *iface,
LONG offset, LONG count, BSTR *p)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr;
BSTR data;
- TRACE("(%p)->(%d %d %p)\n", This, offset, count, p);
+ TRACE("%p, %ld, %ld, %p.\n", iface, offset, count, p);
if(!p)
return E_INVALIDARG;
@@ -651,12 +649,11 @@ static HRESULT WINAPI domcdata_insertData(
IXMLDOMCDATASection *iface,
LONG offset, BSTR p)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr;
BSTR data;
LONG p_len;
- TRACE("(%p)->(%d %s)\n", This, offset, debugstr_w(p));
+ TRACE("%p, %ld, %s.\n", iface, offset, debugstr_w(p));
/* If have a NULL or empty string, don't do anything. */
if((p_len = SysStringLen(p)) == 0)
@@ -699,12 +696,11 @@ 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", This, offset, count);
+ TRACE("%p, %ld, %ld.\n", iface, offset, count);
hr = IXMLDOMCDATASection_get_length(iface, &len);
if(hr != S_OK) return hr;
@@ -747,10 +743,9 @@ static HRESULT WINAPI domcdata_replaceData(
IXMLDOMCDATASection *iface,
LONG offset, LONG count, BSTR p)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr;
- TRACE("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(p));
+ TRACE("%p, %ld, %ld, %s.\n", iface, offset, count, debugstr_w(p));
hr = IXMLDOMCDATASection_deleteData(iface, offset, count);
@@ -764,12 +759,11 @@ static HRESULT WINAPI domcdata_splitText(
IXMLDOMCDATASection *iface,
LONG offset, IXMLDOMText **txtNode)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
IXMLDOMDocument *doc;
LONG length = 0;
HRESULT hr;
- TRACE("(%p)->(%d %p)\n", This, offset, txtNode);
+ TRACE("%p, %ld, %p.\n", iface, offset, txtNode);
if (!txtNode || offset < 0) return E_INVALIDARG;
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index 561cc570b03..3ac7ed604ea 100644
--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
@@ -89,26 +89,25 @@ static HRESULT WINAPI domcomment_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domcomment_AddRef(
- IXMLDOMComment *iface )
+static ULONG WINAPI domcomment_AddRef(IXMLDOMComment *iface)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domcomment *comment = impl_from_IXMLDOMComment(iface);
+ ULONG ref = InterlockedIncrement(&comment->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domcomment_Release(
- IXMLDOMComment *iface )
+static ULONG WINAPI domcomment_Release(IXMLDOMComment *iface)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ domcomment *comment = impl_from_IXMLDOMComment(iface);
+ ULONG ref = InterlockedDecrement(&comment->ref);
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
- destroy_xmlnode(&This->node);
- heap_free( This );
+ destroy_xmlnode(&comment->node);
+ heap_free(comment);
}
return ref;
@@ -575,15 +574,12 @@ static HRESULT WINAPI domcomment_get_length(
return hr;
}
-static HRESULT WINAPI domcomment_substringData(
- IXMLDOMComment *iface,
- LONG offset, LONG count, BSTR *p)
+static HRESULT WINAPI domcomment_substringData(IXMLDOMComment *iface, LONG offset, LONG count, BSTR *p)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
HRESULT hr;
BSTR data;
- TRACE("(%p)->(%d %d %p)\n", This, offset, count, p);
+ TRACE("%p, %ld, %ld, %p.\n", iface, offset, count, p);
if(!p)
return E_INVALIDARG;
@@ -653,12 +649,11 @@ static HRESULT WINAPI domcomment_insertData(
IXMLDOMComment *iface,
LONG offset, BSTR p)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
HRESULT hr;
BSTR data;
LONG p_len;
- TRACE("(%p)->(%d %s)\n", This, offset, debugstr_w(p));
+ TRACE("%p, %ld, %s.\n", iface, offset, debugstr_w(p));
/* If have a NULL or empty string, don't do anything. */
if((p_len = SysStringLen(p)) == 0)
@@ -705,7 +700,7 @@ static HRESULT WINAPI domcomment_deleteData(
LONG len = -1;
BSTR str;
- TRACE("(%p)->(%d %d)\n", iface, offset, count);
+ TRACE("%p, %ld, %ld.\n", iface, offset, count);
hr = IXMLDOMComment_get_length(iface, &len);
if(hr != S_OK) return hr;
@@ -748,10 +743,9 @@ static HRESULT WINAPI domcomment_replaceData(
IXMLDOMComment *iface,
LONG offset, LONG count, BSTR p)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
HRESULT hr;
- TRACE("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(p));
+ TRACE("%p, %ld, %ld, %s.\n", iface, offset, count, debugstr_w(p));
hr = IXMLDOMComment_deleteData(iface, offset, count);
diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c
index 7f57f080516..cd7c2820133 100644
--- a/dlls/msxml3/dispex.c
+++ b/dlls/msxml3/dispex.c
@@ -142,7 +142,7 @@ static HRESULT get_typelib(unsigned lib, ITypeLib **tl)
if(!typelib[lib]) {
hres = LoadRegTypeLib(lib_ids[lib].iid, lib_ids[lib].major, 0, LOCALE_SYSTEM_DEFAULT, tl);
if(FAILED(hres)) {
- ERR("LoadRegTypeLib failed: %08x\n", hres);
+ ERR("LoadRegTypeLib failed, hr %#lx.\n", hres);
return hres;
}
@@ -173,7 +173,7 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo)
return hres;
hres = ITypeLib_GetTypeInfoOfGuid(typelib, get_riid_from_tid(tid), &ti);
if(FAILED(hres)) {
- ERR("GetTypeInfoOfGuid failed: %08x\n", hres);
+ ERR("GetTypeInfoOfGuid failed, hr %#lx.\n", hres);
return hres;
}
}
@@ -259,7 +259,7 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This)
hres = get_typeinfo(This->data->disp_tid, &dti);
if(FAILED(hres)) {
- ERR("Could not get disp type info: %08x\n", hres);
+ ERR("Could not get disp type info, hr %#lx.\n", hres);
return NULL;
}
@@ -363,26 +363,25 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti
static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
+ DispatchEx *dispex = impl_from_IDispatchEx(iface);
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
- return get_typeinfo(This->data->disp_tid, ppTInfo);
+ return get_typeinfo(dispex->data->disp_tid, ppTInfo);
}
static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
UINT i;
HRESULT hres;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
for(i=0; i < cNames; i++) {
- hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i);
+ hres = IDispatchEx_GetDispID(iface, rgszNames[i], 0, rgDispId+i);
if(FAILED(hres))
return hres;
}
@@ -394,13 +393,10 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,
REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams,
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
-
- TRACE("(%p)->(%x %s %x %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %x, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
- return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags,
- pDispParams, pVarResult, pExcepInfo, NULL);
+ return IDispatchEx_InvokeEx(iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL);
}
static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid)
@@ -409,10 +405,10 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
dispex_data_t *data;
int min, max, n, c;
- TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid);
+ TRACE("%p, %s, %lx, %p.\n", iface, debugstr_w(bstrName), grfdex, pid);
if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit))
- FIXME("Unsupported grfdex %x\n", grfdex);
+ FIXME("Unsupported grfdex %lx.\n", grfdex);
data = get_dispex_data(This);
if(!data)
@@ -486,7 +482,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
int min, max, n;
HRESULT hres;
- TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
+ TRACE("%p, %ld, %lx, %x, %p, %p, %p, %p.\n", iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
if(This->data->vtbl && This->data->vtbl->invoke) {
hres = This->data->vtbl->invoke(This->outer, id, lcid, wFlags, pdp, pvarRes, pei);
@@ -518,19 +514,19 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
}
if(min > max) {
- WARN("invalid id %x\n", id);
+ WARN("invalid id %lx.\n", id);
return DISP_E_UNKNOWNNAME;
}
hres = get_typeinfo(data->funcs[n].tid, &ti);
if(FAILED(hres)) {
- ERR("Could not get type info: %08x\n", hres);
+ ERR("Could not get type info, hr %#lx.\n", hres);
return hres;
}
hres = IUnknown_QueryInterface(This->outer, get_riid_from_tid(data->funcs[n].tid), (void**)&unk);
if(FAILED(hres)) {
- ERR("Could not get iface: %08x\n", hres);
+ ERR("Could not get interface, hr %#lx.\n", hres);
ITypeInfo_Release(ti);
return E_FAIL;
}
@@ -546,43 +542,37 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex);
+ TRACE("%p, %s, %lx.\n", iface, debugstr_w(bstrName), grfdex);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%x)\n", This, id);
+ TRACE("%p, %ld.\n", iface, id);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex);
+ TRACE("%p, %ld, %lx, %p.\n", iface, id, grfdexFetch, pgrfdex);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%x %p)\n", This, id, pbstrName);
+ TRACE("%p, %ld, %p.\n", iface, id, pbstrName);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE(" Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, grfdex, id, pid);
+ TRACE("%p, %lx, %ld, %p.\n", iface, grfdex, id, pid);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%p)\n", This, ppunk);
+ TRACE("%p, %p.\n", iface, ppunk);
return E_NOTIMPL;
}
diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
index 88456001464..595f9775272 100644
--- a/dlls/msxml3/docfrag.c
+++ b/dlls/msxml3/docfrag.c
@@ -88,26 +88,25 @@ static HRESULT WINAPI domfrag_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domfrag_AddRef(
- IXMLDOMDocumentFragment *iface )
+static ULONG WINAPI domfrag_AddRef(IXMLDOMDocumentFragment *iface)
{
- domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domfrag *domfrag = impl_from_IXMLDOMDocumentFragment(iface);
+ ULONG ref = InterlockedIncrement(&domfrag->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domfrag_Release(
- IXMLDOMDocumentFragment *iface )
+static ULONG WINAPI domfrag_Release(IXMLDOMDocumentFragment *iface)
{
- domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ domfrag *domfrag = impl_from_IXMLDOMDocumentFragment(iface);
+ ULONG ref = InterlockedDecrement(&domfrag->ref);
+
+ TRACE("%p, refcount %lu.\n", iface, ref);
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ if (!ref)
{
- destroy_xmlnode(&This->node);
- heap_free( This );
+ destroy_xmlnode(&domfrag->node);
+ heap_free(domfrag);
}
return ref;
diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c
index 9010481bb4e..50871b26a21 100644
--- a/dlls/msxml3/doctype.c
+++ b/dlls/msxml3/doctype.c
@@ -80,26 +80,25 @@ static HRESULT WINAPI domdoctype_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domdoctype_AddRef(
- IXMLDOMDocumentType *iface )
+static ULONG WINAPI domdoctype_AddRef(IXMLDOMDocumentType *iface)
{
- domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
- LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ domdoctype *doctype = impl_from_IXMLDOMDocumentType(iface);
+ LONG ref = InterlockedIncrement(&doctype->ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domdoctype_Release(
- IXMLDOMDocumentType *iface )
+static ULONG WINAPI domdoctype_Release(IXMLDOMDocumentType *iface)
{
- domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
- ULONG ref = InterlockedDecrement(&This->ref);
+ domdoctype *doctype = impl_from_IXMLDOMDocumentType(iface);
+ ULONG ref = InterlockedDecrement(&doctype->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if(!ref) {
- destroy_xmlnode(&This->node);
- heap_free(This);
+ if (!ref)
+ {
+ destroy_xmlnode(&doctype->node);
+ heap_free(doctype);
}
return ref;
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 082d7950f8d..f0420a517ea 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -349,7 +349,7 @@ static domdoc_properties * properties_add_ref(domdoc_properties *properties)
if (!properties) return NULL;
ref = InterlockedIncrement(&properties->refs);
- TRACE("%p, %d.\n", properties, ref);
+ TRACE("%p, %ld.\n", properties, ref);
return properties;
}
@@ -361,7 +361,7 @@ static void properties_release(domdoc_properties *properties)
ref = InterlockedDecrement(&properties->refs);
- TRACE("%p, %d.\n", properties, ref);
+ TRACE("%p, %ld.\n", properties, ref);
if (ref < 0)
WARN("negative refcount, expect troubles\n");
@@ -613,7 +613,7 @@ void xmldoc_init(xmlDocPtr doc, MSXML_VERSION version)
LONG xmldoc_add_refs(xmlDocPtr doc, LONG refs)
{
LONG ref = InterlockedExchangeAdd(&priv_from_xmlDocPtr(doc)->refs, refs) + refs;
- TRACE("(%p)->(%d)\n", doc, ref);
+ TRACE("%p, refcount %ld.\n", doc, ref);
return ref;
}
@@ -626,7 +626,8 @@ LONG xmldoc_release_refs(xmlDocPtr doc, LONG refs)
{
xmldoc_priv *priv = priv_from_xmlDocPtr(doc);
LONG ref = InterlockedExchangeAdd(&priv->refs, -refs) - refs;
- TRACE("(%p)->(%d)\n", doc, ref);
+
+ TRACE("%p, refcount %ld.\n", doc, ref);
if (ref < 0)
WARN("negative refcount, expect troubles\n");
@@ -818,7 +819,7 @@ static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream)
if (FAILED(hr))
{
- ERR("failed to copy stream 0x%08x\n", hr);
+ ERR("failed to copy stream, hr %#lx.\n", hr);
IStream_Release(hstream);
return hr;
}
@@ -878,7 +879,7 @@ static HRESULT WINAPI PersistStreamInit_Save(
SysFreeString(xmlString);
}
- TRACE("ret 0x%08x\n", hr);
+ TRACE("hr %#lx.\n", hr);
return hr;
}
@@ -977,9 +978,9 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID rii
static ULONG WINAPI domdoc_AddRef( IXMLDOMDocument3 *iface )
{
- domdoc *This = impl_from_IXMLDOMDocument3( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref );
+ domdoc *doc = impl_from_IXMLDOMDocument3(iface);
+ ULONG ref = InterlockedIncrement(&doc->ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -988,9 +989,9 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface )
domdoc *This = impl_from_IXMLDOMDocument3( iface );
LONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref );
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if ( ref == 0 )
+ if (!ref)
{
int eid;
@@ -2249,7 +2250,7 @@ static HRESULT WINAPI domdoc_load(
if (FAILED(hr))
{
This->error = hr;
- WARN("failed to access array data, 0x%08x\n", hr);
+ WARN("failed to access array data, hr %#lx.\n", hr);
break;
}
SafeArrayGetUBound(psa, 1, &len);
@@ -2318,7 +2319,7 @@ static HRESULT WINAPI domdoc_load(
return hr;
}
- FIXME("unsupported IUnknown type (0x%08x) (%p)\n", hr, V_UNKNOWN(&source)->lpVtbl);
+ FIXME("unsupported IUnknown type (%#lx) (%p)\n", hr, V_UNKNOWN(&source)->lpVtbl);
break;
}
default:
@@ -2368,7 +2369,7 @@ static HRESULT WINAPI domdoc_load(
hr = S_FALSE;
}
- TRACE("ret (%d)\n", hr);
+ TRACE("hr %#lx.\n", hr);
return hr;
}
@@ -2533,10 +2534,10 @@ static int XMLCALL domdoc_stream_save_writecallback(void *ctx, const char *buffe
HRESULT hr;
hr = IStream_Write((IStream*)ctx, buffer, len, &written);
- TRACE("0x%08x %p %d %u\n", hr, buffer, len, written);
+ TRACE("hr %#lx, %p, %d, %lu.\n", hr, buffer, len, written);
if (hr != S_OK)
{
- WARN("stream write error: 0x%08x\n", hr);
+ WARN("stream write error, hr %#lx.\n", hr);
return -1;
}
else
@@ -3532,7 +3533,7 @@ static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD co
{
ConnectionPoint *This = impl_from_IConnectionPoint(iface);
- TRACE("(%p)->(%d)\n", This, cookie);
+ TRACE("%p, %ld.\n", iface, cookie);
if (cookie == 0 || cookie > This->sinks_size || !This->sinks[cookie-1].unk)
return CONNECT_E_NOCONNECTION;
@@ -3690,13 +3691,14 @@ static HRESULT WINAPI domdoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *ifa
static HRESULT WINAPI domdoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,
DWORD mask, DWORD enabled)
{
- domdoc *This = impl_from_IObjectSafety(iface);
- TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled);
+ domdoc *doc = impl_from_IObjectSafety(iface);
+
+ TRACE("%p, %s, %lx, %lx.\n", iface, debugstr_guid(riid), mask, enabled);
if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0)
return E_FAIL;
- This->safeopt = (This->safeopt & ~mask) | (mask & enabled);
+ doc->safeopt = (doc->safeopt & ~mask) | (mask & enabled);
return S_OK;
}
diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
index 3e5b912efd2..77a30e775ff 100644
--- a/dlls/msxml3/domimpl.c
+++ b/dlls/msxml3/domimpl.c
@@ -76,24 +76,23 @@ static HRESULT WINAPI domimpl_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domimpl_AddRef(
- IXMLDOMImplementation *iface )
+static ULONG WINAPI domimpl_AddRef(IXMLDOMImplementation *iface)
{
- domimpl *This = impl_from_IXMLDOMImplementation( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domimpl *domimpl = impl_from_IXMLDOMImplementation(iface);
+ ULONG ref = InterlockedIncrement(&domimpl->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domimpl_Release(
- IXMLDOMImplementation *iface )
+static ULONG WINAPI domimpl_Release(IXMLDOMImplementation *iface)
{
- domimpl *This = impl_from_IXMLDOMImplementation( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ domimpl *domimpl = impl_from_IXMLDOMImplementation(iface);
+ ULONG ref = InterlockedDecrement(&domimpl->ref);
+
+ TRACE("%p, refcount %lu.\n", iface, ref);
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
- heap_free( This );
+ if (!ref)
+ heap_free(domimpl);
return ref;
}
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
index e1462c47d88..7f5b91b0f39 100644
--- a/dlls/msxml3/element.c
+++ b/dlls/msxml3/element.c
@@ -100,28 +100,27 @@ static HRESULT WINAPI domelem_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domelem_AddRef(
- IXMLDOMElement *iface )
+static ULONG WINAPI domelem_AddRef(IXMLDOMElement *iface)
{
- domelem *This = impl_from_IXMLDOMElement( iface );
- LONG ref = InterlockedIncrement(&This->ref);
+ domelem *element = impl_from_IXMLDOMElement(iface);
+ LONG ref = InterlockedIncrement(&element->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domelem_Release(
- IXMLDOMElement *iface )
+static ULONG WINAPI domelem_Release(IXMLDOMElement *iface)
{
- domelem *This = impl_from_IXMLDOMElement( iface );
- ULONG ref = InterlockedDecrement(&This->ref);
+ domelem *element = impl_from_IXMLDOMElement(iface);
+ ULONG ref = InterlockedDecrement(&element->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if(!ref) {
- destroy_xmlnode(&This->node);
- heap_free(This);
+ if (!ref)
+ {
+ destroy_xmlnode(&element->node);
+ heap_free(element);
}
return ref;
@@ -1792,7 +1791,7 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode *
IUnknown *unk;
HRESULT hr;
- TRACE("(%p)->(%d %p)\n", node, index, item);
+ TRACE("%p, %ld, %p.\n", node, index, item);
*item = NULL;
@@ -1879,7 +1878,7 @@ static HRESULT domelem_next_node(const xmlNodePtr node, LONG *iter, IXMLDOMNode
xmlAttrPtr curr;
LONG i;
- TRACE("(%p)->(%d: %p)\n", node, *iter, nextNode);
+ TRACE("%p, %ld, %p.\n", node, *iter, nextNode);
*nextNode = NULL;
diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
index a9e8d085c34..5a446b3271d 100644
--- a/dlls/msxml3/entityref.c
+++ b/dlls/msxml3/entityref.c
@@ -93,7 +93,7 @@ static ULONG WINAPI entityref_AddRef(
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -103,8 +103,9 @@ static ULONG WINAPI entityref_Release(
entityref *This = impl_from_IXMLDOMEntityReference( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
destroy_xmlnode(&This->node);
heap_free( This );
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index b8c8281063a..c2d3cd30c60 100644
--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
@@ -195,20 +195,22 @@ static inline DOMFactory *DOMFactory_from_IClassFactory(IClassFactory *iface)
static ULONG WINAPI DOMClassFactory_AddRef(IClassFactory *iface )
{
- DOMFactory *This = DOMFactory_from_IClassFactory(iface);
- ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref = %u\n", This, ref);
+ DOMFactory *factory = DOMFactory_from_IClassFactory(iface);
+ ULONG ref = InterlockedIncrement(&factory->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
static ULONG WINAPI DOMClassFactory_Release(IClassFactory *iface )
{
- DOMFactory *This = DOMFactory_from_IClassFactory(iface);
- ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref = %u\n", This, ref);
- if(!ref) {
- heap_free(This);
- }
+ DOMFactory *factory = DOMFactory_from_IClassFactory(iface);
+ ULONG ref = InterlockedDecrement(&factory->ref);
+
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
+ heap_free(factory);
+
return ref;
}
diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index 86e569f5dd8..cc384a380e5 100644
--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
@@ -274,7 +274,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref = %d\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -284,7 +284,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref = %d\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref)
{
@@ -302,7 +302,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- TRACE("(%p)->(%d %p)\n", This, reserved, pbind);
+ TRACE("%p, %ld, %p.\n", iface, reserved, pbind);
if (!pbind) return E_INVALIDARG;
@@ -325,9 +325,7 @@ static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface,
static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved)
{
- BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
-
- TRACE("(%p)->(%d)\n", This, reserved);
+ TRACE("%p, %ld.\n", iface, reserved);
return E_NOTIMPL;
}
@@ -335,9 +333,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *ifac
static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress,
ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
{
- BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
-
- TRACE("(%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
+ TRACE("%p, %lu, %lu, %lu, %s.\n", iface, ulProgress, ulProgressMax, ulStatusCode,
debugstr_w(szStatusText));
return S_OK;
@@ -348,7 +344,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- TRACE("(%p)->(0x%08x %s)\n", This, hr, debugstr_w(error));
+ TRACE("%p, %#lx, %s.\n", iface, hr, debugstr_w(error));
if (This->binding)
{
@@ -403,7 +399,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
BYTE buf[4096];
HRESULT hr;
- TRACE("(%p)->(%08x %d %p %p)\n", This, flags, size, format, stgmed);
+ TRACE("%p, %#lx, %lu, %p, %p.\n", iface, flags, size, format, stgmed);
do
{
@@ -474,7 +470,7 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac
WCHAR *buff, *ptr;
int size = 0;
- TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(url), debugstr_w(headers), reserved, add_headers);
+ TRACE("%p, %s, %s, %ld, %p.\n", iface, debugstr_w(url), debugstr_w(headers), reserved, add_headers);
*add_headers = NULL;
@@ -576,7 +572,7 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c
{
BindStatusCallback *This = impl_from_IHttpNegotiate(iface);
- TRACE("(%p)->(%d %s %s %p)\n", This, code, debugstr_w(resp_headers),
+ TRACE("%p, %ld, %s, %s, %p.\n", iface, code, debugstr_w(resp_headers),
debugstr_w(req_headers), add_reqheaders);
This->request->status = code;
@@ -931,7 +927,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url,
else
hr = CreateUri(url, 0, 0, &uri);
if(FAILED(hr)) {
- WARN("Could not create IUri object: %08x\n", hr);
+ WARN("Could not create IUri object, hr %#lx.\n", hr);
return hr;
}
@@ -970,11 +966,11 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url,
uri = full_uri;
}
else
- WARN("failed to create modified uri, 0x%08x\n", hr);
+ WARN("failed to create modified uri, hr %#lx.\n", hr);
IUriBuilder_Release(builder);
}
else
- WARN("IUriBuilder creation failed, 0x%08x\n", hr);
+ WARN("IUriBuilder creation failed, hr %#lx.\n", hr);
}
This->uri = uri;
@@ -1396,23 +1392,23 @@ static HRESULT WINAPI XMLHTTPRequest_QueryInterface(IXMLHTTPRequest *iface, REFI
static ULONG WINAPI XMLHTTPRequest_AddRef(IXMLHTTPRequest *iface)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%u)\n", This, ref );
+ httprequest *request = impl_from_IXMLHTTPRequest(iface);
+ ULONG ref = InterlockedIncrement(&request->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
static ULONG WINAPI XMLHTTPRequest_Release(IXMLHTTPRequest *iface)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ httprequest *request = impl_from_IXMLHTTPRequest(iface);
+ ULONG ref = InterlockedDecrement(&request->ref);
- TRACE("(%p)->(%u)\n", This, ref );
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if ( ref == 0 )
+ if (!ref)
{
- httprequest_release( This );
- heap_free( This );
+ httprequest_release(request);
+ heap_free(request);
}
return ref;
@@ -1420,9 +1416,7 @@ static ULONG WINAPI XMLHTTPRequest_Release(IXMLHTTPRequest *iface)
static HRESULT WINAPI XMLHTTPRequest_GetTypeInfoCount(IXMLHTTPRequest *iface, UINT *pctinfo)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
-
- TRACE("(%p)->(%p)\n", This, pctinfo);
+ TRACE("%p, %p.\n", iface, pctinfo);
*pctinfo = 1;
@@ -1432,9 +1426,7 @@ static HRESULT WINAPI XMLHTTPRequest_GetTypeInfoCount(IXMLHTTPRequest *iface, UI
static HRESULT WINAPI XMLHTTPRequest_GetTypeInfo(IXMLHTTPRequest *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx,%p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IXMLHTTPRequest_tid, ppTInfo);
}
@@ -1442,11 +1434,10 @@ static HRESULT WINAPI XMLHTTPRequest_GetTypeInfo(IXMLHTTPRequest *iface, UINT iT
static HRESULT WINAPI XMLHTTPRequest_GetIDsOfNames(IXMLHTTPRequest *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -1466,18 +1457,16 @@ static HRESULT WINAPI XMLHTTPRequest_Invoke(IXMLHTTPRequest *iface, DISPID dispI
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLHTTPRequest_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IXMLHTTPRequest_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -1743,13 +1732,14 @@ static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety
static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,
DWORD mask, DWORD enabled)
{
- httprequest *This = impl_from_IObjectSafety(iface);
- TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled);
+ httprequest *request = impl_from_IObjectSafety(iface);
+
+ TRACE("%p, %s, %lx, %lx.\n", iface, debugstr_guid(riid), mask, enabled);
if ((mask & ~safety_supported_options))
return E_FAIL;
- This->safeopt = (This->safeopt & ~mask) | (mask & enabled);
+ request->safeopt = (request->safeopt & ~mask) | (mask & enabled);
return S_OK;
}
@@ -1829,23 +1819,23 @@ static HRESULT WINAPI ServerXMLHTTPRequest_QueryInterface(IServerXMLHTTPRequest
static ULONG WINAPI ServerXMLHTTPRequest_AddRef(IServerXMLHTTPRequest *iface)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
- ULONG ref = InterlockedIncrement( &This->req.ref );
- TRACE("(%p)->(%u)\n", This, ref );
+ serverhttp *request = impl_from_IServerXMLHTTPRequest(iface);
+ ULONG ref = InterlockedIncrement(&request->req.ref);
+ TRACE("%p, refcount %lu.\n", iface, ref );
return ref;
}
static ULONG WINAPI ServerXMLHTTPRequest_Release(IServerXMLHTTPRequest *iface)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
- ULONG ref = InterlockedDecrement( &This->req.ref );
+ serverhttp *request = impl_from_IServerXMLHTTPRequest(iface);
+ ULONG ref = InterlockedDecrement(&request->req.ref);
- TRACE("(%p)->(%u)\n", This, ref );
+ TRACE("%p, refcount %lu.\n", iface, ref );
- if ( ref == 0 )
+ if (!ref)
{
- httprequest_release( &This->req );
- heap_free( This );
+ httprequest_release(&request->req);
+ heap_free(request);
}
return ref;
@@ -1864,9 +1854,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfoCount(IServerXMLHTTPReques
static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IServerXMLHTTPRequest_tid, ppTInfo);
}
@@ -1874,11 +1862,10 @@ static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *if
static HRESULT WINAPI ServerXMLHTTPRequest_GetIDsOfNames(IServerXMLHTTPRequest *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -1898,18 +1885,16 @@ static HRESULT WINAPI ServerXMLHTTPRequest_Invoke(IServerXMLHTTPRequest *iface,
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IServerXMLHTTPRequest_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IServerXMLHTTPRequest_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -2019,8 +2004,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_put_onreadystatechange(IServerXMLHTTP
static HRESULT WINAPI ServerXMLHTTPRequest_setTimeouts(IServerXMLHTTPRequest *iface, LONG resolveTimeout, LONG connectTimeout,
LONG sendTimeout, LONG receiveTimeout)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
- FIXME("(%p)->(%d %d %d %d): stub\n", This, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout);
+ FIXME("%p, %ld, %ld, %ld, %ld: stub\n", iface, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout);
return S_OK;
}
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index 2a97f2637f1..552c6943e24 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -142,7 +142,7 @@ static int wineXmlReadCallback(void * context, char * buffer, int len)
return -1;
}
- TRACE("Read %d\n", dwBytesRead);
+ TRACE("Read %ld bytes.\n", dwBytesRead);
return dwBytesRead;
}
diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c
index fa9194743b6..518897af8e9 100644
--- a/dlls/msxml3/mxnamespace.c
+++ b/dlls/msxml3/mxnamespace.c
@@ -293,7 +293,7 @@ static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *if
HRESULT hr;
BSTR prfx;
- TRACE("(%p)->(%d %p %p)\n", This, index, prefix, prefix_len);
+ TRACE("%p, %ld, %p, %p.\n", This, index, prefix, prefix_len);
if (!prefix_len) return E_POINTER;
@@ -315,15 +315,15 @@ static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *if
static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface,
const WCHAR *uri, LONG index, WCHAR *prefix, int *prefix_len)
{
- namespacemanager *This = impl_from_IMXNamespaceManager( iface );
+ namespacemanager *manager = impl_from_IMXNamespaceManager(iface);
HRESULT hr;
BSTR prfx;
- TRACE("(%p)->(%s %d %p %p)\n", This, debugstr_w(uri), index, prefix, prefix_len);
+ TRACE("%p, %s, %ld, %p, %p.\n", iface, debugstr_w(uri), index, prefix, prefix_len);
if (!uri || !*uri || !prefix_len) return E_INVALIDARG;
- hr = get_declared_prefix_uri(&This->ctxts, uri, &prfx);
+ hr = get_declared_prefix_uri(&manager->ctxts, uri, &prfx);
if (hr == S_OK)
{
/* TODO: figure out what index argument is for */
@@ -429,9 +429,9 @@ static HRESULT WINAPI vbnamespacemanager_QueryInterface(IVBMXNamespaceManager *i
static ULONG WINAPI vbnamespacemanager_AddRef(IVBMXNamespaceManager *iface)
{
- namespacemanager *This = impl_from_IVBMXNamespaceManager( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%u)\n", This, ref );
+ namespacemanager *manager = impl_from_IVBMXNamespaceManager(iface);
+ ULONG ref = InterlockedIncrement(&manager->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -440,9 +440,9 @@ static ULONG WINAPI vbnamespacemanager_Release(IVBMXNamespaceManager *iface)
namespacemanager *This = impl_from_IVBMXNamespaceManager( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%u)\n", This, ref );
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if ( ref == 0 )
+ if (!ref)
{
struct nscontext *ctxt, *ctxt2;
diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c
index 084324797c7..4a2844bcf08 100644
--- a/dlls/msxml3/mxwriter.c
+++ b/dlls/msxml3/mxwriter.c
@@ -828,10 +828,10 @@ static HRESULT WINAPI mxwriter_QueryInterface(IMXWriter *iface, REFIID riid, voi
static ULONG WINAPI mxwriter_AddRef(IMXWriter *iface)
{
- mxwriter *This = impl_from_IMXWriter( iface );
- LONG ref = InterlockedIncrement(&This->ref);
+ mxwriter *writer = impl_from_IMXWriter(iface);
+ LONG ref = InterlockedIncrement(&writer->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -841,9 +841,9 @@ static ULONG WINAPI mxwriter_Release(IMXWriter *iface)
mxwriter *This = impl_from_IMXWriter( iface );
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if(!ref)
+ if (!ref)
{
/* Windows flushes the buffer when the interface is destroyed. */
flush_output_buffer(This);
@@ -2468,9 +2468,7 @@ static ULONG WINAPI SAXErrorHandler_Release(ISAXErrorHandler *iface)
static HRESULT WINAPI SAXErrorHandler_error(ISAXErrorHandler *iface,
ISAXLocator *locator, const WCHAR *message, HRESULT hr)
{
- mxwriter *This = impl_from_ISAXErrorHandler( iface );
-
- FIXME("(%p)->(%p %s 0x%08x)\n", This, locator, debugstr_w(message), hr);
+ FIXME("%p, %p, %s, %#lx.\n", iface, locator, debugstr_w(message), hr);
return E_NOTIMPL;
}
@@ -2478,9 +2476,7 @@ static HRESULT WINAPI SAXErrorHandler_error(ISAXErrorHandler *iface,
static HRESULT WINAPI SAXErrorHandler_fatalError(ISAXErrorHandler *iface,
ISAXLocator *locator, const WCHAR *message, HRESULT hr)
{
- mxwriter *This = impl_from_ISAXErrorHandler( iface );
-
- FIXME("(%p)->(%p %s 0x%08x)\n", This, locator, debugstr_w(message), hr);
+ FIXME("%p, %p, %s, %#lx.\n", iface, locator, debugstr_w(message), hr);
return E_NOTIMPL;
}
@@ -2488,9 +2484,7 @@ static HRESULT WINAPI SAXErrorHandler_fatalError(ISAXErrorHandler *iface,
static HRESULT WINAPI SAXErrorHandler_ignorableWarning(ISAXErrorHandler *iface,
ISAXLocator *locator, const WCHAR *message, HRESULT hr)
{
- mxwriter *This = impl_from_ISAXErrorHandler( iface );
-
- FIXME("(%p)->(%p %s 0x%08x)\n", This, locator, debugstr_w(message), hr);
+ FIXME("%p, %p, %s, %#lx.\n", iface, locator, debugstr_w(message), hr);
return E_NOTIMPL;
}
@@ -2552,22 +2546,19 @@ static HRESULT WINAPI VBSAXErrorHandler_Invoke(IVBSAXErrorHandler *iface, DISPID
static HRESULT WINAPI VBSAXErrorHandler_error(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code)
{
- mxwriter *This = impl_from_IVBSAXErrorHandler( iface );
- FIXME("(%p)->(%p %p %x): stub\n", This, locator, message, code);
+ FIXME("%p, %p, %p, %lx: stub\n", iface, locator, message, code);
return E_NOTIMPL;
}
static HRESULT WINAPI VBSAXErrorHandler_fatalError(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code)
{
- mxwriter *This = impl_from_IVBSAXErrorHandler( iface );
- FIXME("(%p)->(%p %p %x): stub\n", This, locator, message, code);
+ FIXME("%p, %p, %p, %lx: stub\n", iface, locator, message, code);
return E_NOTIMPL;
}
static HRESULT WINAPI VBSAXErrorHandler_ignorableWarning(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code)
{
- mxwriter *This = impl_from_IVBSAXErrorHandler( iface );
- FIXME("(%p)->(%p %p %x): stub\n", This, locator, message, code);
+ FIXME("%p, %p, %p, %lx: stub\n", iface, locator, message, code);
return E_NOTIMPL;
}
@@ -2698,18 +2689,18 @@ static ULONG WINAPI MXAttributes_AddRef(IMXAttributes *iface)
{
mxattributes *This = impl_from_IMXAttributes( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref );
+ TRACE("%p, refcount %lu.\n", iface, ref );
return ref;
}
static ULONG WINAPI MXAttributes_Release(IMXAttributes *iface)
{
mxattributes *This = impl_from_IMXAttributes( iface );
- LONG ref = InterlockedDecrement( &This->ref );
+ ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if (ref == 0)
+ if (!ref)
{
int i;
@@ -3261,8 +3252,8 @@ static HRESULT WINAPI VBSAXAttributes_GetTypeInfo(
IVBSAXAttributes *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{
- mxattributes *This = impl_from_IVBSAXAttributes( iface );
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
+
return get_typeinfo(IVBSAXAttributes_tid, ppTInfo);
}
@@ -3274,11 +3265,10 @@ static HRESULT WINAPI VBSAXAttributes_GetIDsOfNames(
LCID lcid,
DISPID* rgDispId)
{
- mxattributes *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -3305,18 +3295,16 @@ static HRESULT WINAPI VBSAXAttributes_Invoke(
EXCEPINFO* pExcepInfo,
UINT* puArgErr)
{
- mxattributes *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXAttributes_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 272e438e773..339504477ac 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -107,7 +107,7 @@ static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface)
{
SupportErrorInfo *This = impl_from_ISupportErrorInfo(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref );
+ TRACE("%p, refcount %ld.\n", iface, ref );
return ref;
}
@@ -116,9 +116,9 @@ static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface)
SupportErrorInfo *This = impl_from_ISupportErrorInfo(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if (ref == 0)
+ if (!ref)
heap_free(This);
return ref;
@@ -1350,7 +1350,7 @@ static HRESULT xslt_doc_get_uri(const xmlChar *uri, void *_ctxt, xsltLoadType ty
SysFreeString(uriW);
if (FAILED(hr))
{
- WARN("Failed to create href uri, %#x.\n", hr);
+ WARN("Failed to create href uri, %#lx.\n", hr);
return hr;
}
@@ -1364,14 +1364,14 @@ static HRESULT xslt_doc_get_uri(const xmlChar *uri, void *_ctxt, xsltLoadType ty
SysFreeString(baseuriW);
if (FAILED(hr))
{
- WARN("Failed to create base uri, %#x.\n", hr);
+ WARN("Failed to create base uri, %#lx.\n", hr);
return hr;
}
hr = CoInternetCombineIUri(base_uri, href_uri, 0, doc_uri, 0);
IUri_Release(base_uri);
if (FAILED(hr))
- WARN("Failed to combine uris, %#x.\n", hr);
+ WARN("Failed to combine uris, hr %#lx.\n", hr);
}
else
{
@@ -1717,14 +1717,9 @@ static HRESULT WINAPI unknode_GetTypeInfo(
LCID lcid,
ITypeInfo** ppTInfo )
{
- unknode *This = unknode_from_IXMLDOMNode( iface );
- HRESULT hr;
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
-
- hr = get_typeinfo(IXMLDOMNode_tid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
- return hr;
+ return get_typeinfo(IXMLDOMNode_tid, ppTInfo);
}
static HRESULT WINAPI unknode_GetIDsOfNames(
@@ -1735,12 +1730,10 @@ static HRESULT WINAPI unknode_GetIDsOfNames(
LCID lcid,
DISPID* rgDispId )
{
- unknode *This = unknode_from_IXMLDOMNode( iface );
-
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -1767,17 +1760,16 @@ static HRESULT WINAPI unknode_Invoke(
EXCEPINFO* pExcepInfo,
UINT* puArgErr )
{
- unknode *This = unknode_from_IXMLDOMNode( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLDOMNode_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMNode_iface, dispIdMember, wFlags, pDispParams,
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams,
pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
index 8ffd2dbd316..fd3d30a2e02 100644
--- a/dlls/msxml3/nodelist.c
+++ b/dlls/msxml3/nodelist.c
@@ -118,7 +118,7 @@ static ULONG WINAPI xmlnodelist_AddRef(
{
xmlnodelist *This = impl_from_IXMLDOMNodeList( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -128,8 +128,9 @@ static ULONG WINAPI xmlnodelist_Release(
xmlnodelist *This = impl_from_IXMLDOMNodeList( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
xmldoc_release( This->parent->doc );
if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant);
@@ -196,7 +197,7 @@ static HRESULT WINAPI xmlnodelist_get_item(
xmlNodePtr curr;
LONG nodeIndex = 0;
- TRACE("(%p)->(%d %p)\n", This, index, listItem);
+ TRACE("%p, %ld, %p.\n", iface, index, listItem);
if(!listItem)
return E_INVALIDARG;
@@ -312,7 +313,7 @@ static HRESULT xmlnodelist_get_dispid(IUnknown *iface, BSTR name, DWORD flags, D
return DISP_E_UNKNOWNNAME;
*dispid = DISPID_DOM_COLLECTION_BASE + idx;
- TRACE("ret %x\n", *dispid);
+ TRACE("ret %lx\n", *dispid);
return S_OK;
}
@@ -321,7 +322,7 @@ static HRESULT xmlnodelist_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fl
{
xmlnodelist *This = impl_from_IXMLDOMNodeList( (IXMLDOMNodeList*)iface );
- TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei);
+ TRACE("%p, %ld, %lx, %x, %p, %p, %p.\n", iface, id, lcid, flags, params, res, ei);
if (id >= DISPID_DOM_COLLECTION_BASE && id <= DISPID_DOM_COLLECTION_MAX)
{
diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
index afe7065dfd9..c90d46136a8 100644
--- a/dlls/msxml3/nodemap.c
+++ b/dlls/msxml3/nodemap.c
@@ -121,7 +121,7 @@ static ULONG WINAPI xmlnodemap_AddRef(
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -131,8 +131,9 @@ static ULONG WINAPI xmlnodemap_Release(
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
xmlnode_release( This->node );
xmldoc_release( This->node->doc );
@@ -225,7 +226,7 @@ static HRESULT WINAPI xmlnodemap_get_item(
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
- TRACE("(%p)->(%d %p)\n", This, index, item);
+ TRACE("%p, %ld, %p.\n", iface, index, item);
return This->funcs->get_item(This->node, index, item);
}
@@ -273,7 +274,7 @@ static HRESULT WINAPI xmlnodemap_nextNode(
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
- TRACE("(%p)->(%p: %d)\n", This, nextItem, This->iterator);
+ TRACE("%p, %p, %ld.\n", iface, nextItem, This->iterator);
return This->funcs->next_node(This->node, &This->iterator, nextItem);
}
@@ -283,7 +284,7 @@ static HRESULT WINAPI xmlnodemap_reset(
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
- TRACE("(%p)->(%d)\n", This, This->iterator);
+ TRACE("%p, %ld.\n", iface, This->iterator);
This->iterator = 0;
@@ -371,7 +372,7 @@ static HRESULT xmlnodemap_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DI
return DISP_E_UNKNOWNNAME;
*dispid = DISPID_DOM_COLLECTION_BASE + idx;
- TRACE("ret %x\n", *dispid);
+ TRACE("ret %lx\n", *dispid);
return S_OK;
}
@@ -380,7 +381,7 @@ static HRESULT xmlnodemap_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fla
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( (IXMLDOMNamedNodeMap*)iface );
- TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei);
+ TRACE("%p, %ld, %lx, %x, %p, %p, %p.\n", iface, id, lcid, flags, params, res, ei);
V_VT(res) = VT_DISPATCH;
V_DISPATCH(res) = NULL;
diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
index 9fb3ceca9c3..4f32eb0596b 100644
--- a/dlls/msxml3/parseerror.c
+++ b/dlls/msxml3/parseerror.c
@@ -83,7 +83,7 @@ static ULONG WINAPI parseError_AddRef(
{
parse_error_t *This = impl_from_IXMLDOMParseError2( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -93,8 +93,9 @@ static ULONG WINAPI parseError_Release(
parse_error_t *This = impl_from_IXMLDOMParseError2( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
SysFreeString(This->url);
SysFreeString(This->reason);
diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
index 4c5c6b12c68..719222bd9ad 100644
--- a/dlls/msxml3/pi.c
+++ b/dlls/msxml3/pi.c
@@ -96,7 +96,7 @@ static ULONG WINAPI dom_pi_AddRef(
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -106,7 +106,7 @@ static ULONG WINAPI dom_pi_Release(
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
destroy_xmlnode(&This->node);
@@ -900,7 +900,7 @@ static HRESULT dom_pi_remove_named_item(xmlNodePtr node, BSTR name, IXMLDOMNode
static HRESULT dom_pi_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode **item)
{
- FIXME("(%p)->(%d %p): stub\n", node, index, item);
+ FIXME("%p, %ld, %p: stub\n", node, index, item);
return E_NOTIMPL;
}
@@ -914,7 +914,7 @@ static HRESULT dom_pi_get_length(const xmlNodePtr node, LONG *length)
static HRESULT dom_pi_next_node(const xmlNodePtr node, LONG *iter, IXMLDOMNode **nextNode)
{
- FIXME("(%p)->(%d %p): stub\n", node, *iter, nextNode);
+ FIXME("%p, %ld, %p: stub\n", node, *iter, nextNode);
return E_NOTIMPL;
}
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index 8c202bddccd..8d58ed1d94b 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -749,9 +749,7 @@ static HRESULT WINAPI ivbsaxattributes_GetTypeInfo(
IVBSAXAttributes *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{
- saxlocator *This = impl_from_IVBSAXAttributes( iface );
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IVBSAXAttributes_tid, ppTInfo);
}
@@ -764,11 +762,10 @@ static HRESULT WINAPI ivbsaxattributes_GetIDsOfNames(
LCID lcid,
DISPID* rgDispId)
{
- saxlocator *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -795,18 +792,16 @@ static HRESULT WINAPI ivbsaxattributes_Invoke(
EXCEPINFO* pExcepInfo,
UINT* puArgErr)
{
- saxlocator *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXAttributes_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -2150,9 +2145,7 @@ static HRESULT WINAPI ivbsaxlocator_GetTypeInfo(
IVBSAXLocator *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{
- saxlocator *This = impl_from_IVBSAXLocator( iface );
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IVBSAXLocator_tid, ppTInfo);
}
@@ -2165,11 +2158,10 @@ static HRESULT WINAPI ivbsaxlocator_GetIDsOfNames(
LCID lcid,
DISPID* rgDispId)
{
- saxlocator *This = impl_from_IVBSAXLocator( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -2196,18 +2188,16 @@ static HRESULT WINAPI ivbsaxlocator_Invoke(
EXCEPINFO* pExcepInfo,
UINT* puArgErr)
{
- saxlocator *This = impl_from_IVBSAXLocator( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXLocator_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXLocator_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -2318,7 +2308,7 @@ static ULONG WINAPI isaxlocator_AddRef(ISAXLocator* iface)
{
saxlocator *This = impl_from_ISAXLocator( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -2326,11 +2316,11 @@ static ULONG WINAPI isaxlocator_Release(
ISAXLocator* iface)
{
saxlocator *This = impl_from_ISAXLocator( iface );
- LONG ref = InterlockedDecrement( &This->ref );
+ ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref );
+ TRACE("%p, refcount %ld.\n", iface, ref );
- if (ref == 0)
+ if (!ref)
{
element_entry *element, *element2;
int index;
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index b74399542ba..3760019ce2e 100644
--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
@@ -755,14 +755,14 @@ void schemasCleanup(void)
static LONG cache_entry_add_ref(cache_entry* entry)
{
LONG ref = InterlockedIncrement(&entry->ref);
- TRACE("(%p)->(%d)\n", entry, ref);
+ TRACE("%p, refcount %ld.\n", entry, ref);
return ref;
}
static LONG cache_entry_release(cache_entry* entry)
{
LONG ref = InterlockedDecrement(&entry->ref);
- TRACE("(%p)->(%d)\n", entry, ref);
+ TRACE("%p, refcount %ld.\n", entry, ref);
if (ref == 0)
{
@@ -936,7 +936,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI, MSXM
hr = IXMLDOMDocument3_load(domdoc, url, &b);
if (hr != S_OK)
{
- ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr);
+ ERR("load() returned %#lx.\n", hr);
if (b != VARIANT_TRUE)
{
FIXME("Failed to load doc at %s\n", debugstr_w(V_BSTR(&url)));
@@ -1126,7 +1126,7 @@ static ULONG WINAPI schema_cache_AddRef(IXMLDOMSchemaCollection2* iface)
{
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -1134,9 +1134,9 @@ static ULONG WINAPI schema_cache_Release(IXMLDOMSchemaCollection2* iface)
{
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if (ref == 0)
+ if (!ref)
{
int i;
@@ -1367,7 +1367,7 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if
{
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
- TRACE("(%p)->(%i %p)\n", This, index, uri);
+ TRACE("%p, %ld, %p.\n", iface, index, uri);
if (!uri)
return E_POINTER;
diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c
index 82be1c6604b..e7c63c7a2b2 100644
--- a/dlls/msxml3/selection.c
+++ b/dlls/msxml3/selection.c
@@ -155,7 +155,7 @@ static ULONG WINAPI domselection_AddRef(
{
domselection *This = impl_from_IXMLDOMSelection( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -165,7 +165,7 @@ static ULONG WINAPI domselection_Release(
domselection *This = impl_from_IXMLDOMSelection( iface );
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
xmlXPathFreeObject(This->result);
@@ -232,7 +232,7 @@ static HRESULT WINAPI domselection_get_item(
{
domselection *This = impl_from_IXMLDOMSelection( iface );
- TRACE("(%p)->(%d %p)\n", This, index, listItem);
+ TRACE("%p, %ld, %p.\n", iface, index, listItem);
if(!listItem)
return E_INVALIDARG;
@@ -468,7 +468,7 @@ static ULONG WINAPI enumvariant_AddRef(IEnumVARIANT *iface )
{
enumvariant *This = impl_from_IEnumVARIANT( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -477,7 +477,7 @@ static ULONG WINAPI enumvariant_Release(IEnumVARIANT *iface )
enumvariant *This = impl_from_IEnumVARIANT( iface );
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
if (This->own) IUnknown_Release(This->outer);
@@ -496,7 +496,7 @@ static HRESULT WINAPI enumvariant_Next(
enumvariant *This = impl_from_IEnumVARIANT( iface );
ULONG ret_count = 0;
- TRACE("(%p)->(%u %p %p)\n", This, celt, var, fetched);
+ TRACE("%p, %lu, %p, %p.\n", iface, celt, var, fetched);
if (fetched) *fetched = 0;
@@ -529,8 +529,8 @@ static HRESULT WINAPI enumvariant_Skip(
IEnumVARIANT *iface,
ULONG celt)
{
- enumvariant *This = impl_from_IEnumVARIANT( iface );
- FIXME("(%p)->(%u): stub\n", This, celt);
+ FIXME("%p, %lu: stub\n", iface, celt);
+
return E_NOTIMPL;
}
@@ -595,7 +595,7 @@ static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags,
return DISP_E_UNKNOWNNAME;
*dispid = DISPID_DOM_COLLECTION_BASE + idx;
- TRACE("ret %x\n", *dispid);
+ TRACE("ret %lx\n", *dispid);
return S_OK;
}
@@ -604,7 +604,7 @@ static HRESULT domselection_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD f
{
domselection *This = impl_from_IXMLDOMSelection( (IXMLDOMSelection*)iface );
- TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei);
+ TRACE("%p, %ld, %lx, %x, %p, %p, %p.\n", iface, id, lcid, flags, params, res, ei);
V_VT(res) = VT_DISPATCH;
V_DISPATCH(res) = NULL;
diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c
index eab2c96d667..6dfa2a77f9c 100644
--- a/dlls/msxml3/stylesheet.c
+++ b/dlls/msxml3/stylesheet.c
@@ -139,7 +139,7 @@ static ULONG WINAPI xsltemplate_AddRef( IXSLTemplate *iface )
{
xsltemplate *This = impl_from_IXSLTemplate( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -148,7 +148,7 @@ static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface )
xsltemplate *This = impl_from_IXSLTemplate( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
if (This->node) IXMLDOMNode_Release( This->node );
@@ -317,7 +317,7 @@ static ULONG WINAPI xslprocessor_AddRef( IXSLProcessor *iface )
{
xslprocessor *This = impl_from_IXSLProcessor( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -326,7 +326,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface )
xslprocessor *This = impl_from_IXSLProcessor( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
struct xslprocessor_par *par, *par2;
@@ -509,7 +509,7 @@ static HRESULT WINAPI xslprocessor_put_output(
if (FAILED(hr))
{
output_type = PROCESSOR_OUTPUT_NOT_SET;
- WARN("failed to get output interface, 0x%08x\n", hr);
+ WARN("failed to get output interface, hr %#lx.\n", hr);
}
break;
default:
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index eb0f130ed03..7631c8595aa 100644
--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
@@ -91,7 +91,7 @@ static ULONG WINAPI domtext_AddRef(
{
domtext *This = impl_from_IXMLDOMText( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -101,7 +101,7 @@ static ULONG WINAPI domtext_Release(
domtext *This = impl_from_IXMLDOMText( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
destroy_xmlnode(&This->node);
@@ -668,11 +668,10 @@ static HRESULT WINAPI domtext_substringData(
IXMLDOMText *iface,
LONG offset, LONG count, BSTR *p)
{
- domtext *This = impl_from_IXMLDOMText( iface );
HRESULT hr;
BSTR data;
- TRACE("(%p)->(%d %d %p)\n", This, offset, count, p);
+ TRACE("%p, %ld, %ld, %p.\n", iface, offset, count, p);
if(!p)
return E_INVALIDARG;
@@ -742,12 +741,11 @@ static HRESULT WINAPI domtext_insertData(
IXMLDOMText *iface,
LONG offset, BSTR p)
{
- domtext *This = impl_from_IXMLDOMText( iface );
HRESULT hr;
BSTR data;
LONG p_len;
- TRACE("(%p)->(%d %s)\n", This, offset, debugstr_w(p));
+ TRACE("%p, %ld, %s.\n", iface, offset, debugstr_w(p));
/* If have a NULL or empty string, don't do anything. */
if((p_len = SysStringLen(p)) == 0)
@@ -794,7 +792,7 @@ static HRESULT WINAPI domtext_deleteData(
LONG len = -1;
BSTR str;
- TRACE("(%p)->(%d %d)\n", iface, offset, count);
+ TRACE("%p, %ld, %ld.\n", iface, offset, count);
hr = IXMLDOMText_get_length(iface, &len);
if(hr != S_OK) return hr;
@@ -837,10 +835,9 @@ static HRESULT WINAPI domtext_replaceData(
IXMLDOMText *iface,
LONG offset, LONG count, BSTR p)
{
- domtext *This = impl_from_IXMLDOMText( iface );
HRESULT hr;
- TRACE("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(p));
+ TRACE("%p, %ld, %ld, %s.\n", iface, offset, count, debugstr_w(p));
hr = IXMLDOMText_deleteData(iface, offset, count);
@@ -854,10 +851,9 @@ static HRESULT WINAPI domtext_splitText(
IXMLDOMText *iface,
LONG offset, IXMLDOMText **txtNode)
{
- domtext *This = impl_from_IXMLDOMText( iface );
LONG length = 0;
- TRACE("(%p)->(%d %p)\n", This, offset, txtNode);
+ TRACE("%p, %ld, %p.\n", iface, offset, txtNode);
if (!txtNode || offset < 0) return E_INVALIDARG;
diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
index 8e07b0516f7..f588f17496c 100644
--- a/dlls/msxml3/xmldoc.c
+++ b/dlls/msxml3/xmldoc.c
@@ -102,7 +102,7 @@ static ULONG WINAPI xmldoc_AddRef(IXMLDocument *iface)
{
xmldoc *This = impl_from_IXMLDocument(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -111,7 +111,7 @@ static ULONG WINAPI xmldoc_Release(IXMLDocument *iface)
xmldoc *This = impl_from_IXMLDocument(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
if (ref == 0)
{
@@ -137,9 +137,7 @@ static HRESULT WINAPI xmldoc_GetTypeInfoCount(IXMLDocument *iface, UINT* pctinfo
static HRESULT WINAPI xmldoc_GetTypeInfo(IXMLDocument *iface, UINT iTInfo,
LCID lcid, ITypeInfo** ppTInfo)
{
- xmldoc *This = impl_from_IXMLDocument(iface);
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IXMLDocument_tid, ppTInfo);
}
@@ -148,11 +146,10 @@ static HRESULT WINAPI xmldoc_GetIDsOfNames(IXMLDocument *iface, REFIID riid,
LPOLESTR* rgszNames, UINT cNames,
LCID lcid, DISPID* rgDispId)
{
- xmldoc *This = impl_from_IXMLDocument(iface);
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -173,18 +170,16 @@ static HRESULT WINAPI xmldoc_Invoke(IXMLDocument *iface, DISPID dispIdMember,
DISPPARAMS* pDispParams, VARIANT* pVarResult,
EXCEPINFO* pExcepInfo, UINT* puArgErr)
{
- xmldoc *This = impl_from_IXMLDocument(iface);
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLDocument_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDocument_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index ec9094dae7d..f50bfa6e4ff 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -117,25 +117,19 @@ static HRESULT WINAPI xmlelem_GetTypeInfoCount(IXMLElement *iface, UINT* pctinfo
static HRESULT WINAPI xmlelem_GetTypeInfo(IXMLElement *iface, UINT iTInfo,
LCID lcid, ITypeInfo** ppTInfo)
{
- xmlelem *This = impl_from_IXMLElement(iface);
- HRESULT hr;
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
- hr = get_typeinfo(IXMLElement_tid, ppTInfo);
-
- return hr;
+ return get_typeinfo(IXMLElement_tid, ppTInfo);
}
static HRESULT WINAPI xmlelem_GetIDsOfNames(IXMLElement *iface, REFIID riid,
LPOLESTR* rgszNames, UINT cNames,
LCID lcid, DISPID* rgDispId)
{
- xmlelem *This = impl_from_IXMLElement(iface);
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -156,18 +150,16 @@ static HRESULT WINAPI xmlelem_Invoke(IXMLElement *iface, DISPID dispIdMember,
DISPPARAMS* pDispParams, VARIANT* pVarResult,
EXCEPINFO* pExcepInfo, UINT* puArgErr)
{
- xmlelem *This = impl_from_IXMLElement(iface);
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLElement_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IXMLElement_iface, dispIdMember, wFlags, pDispParams,
- pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -380,7 +372,7 @@ static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, LONG *p)
return E_INVALIDARG;
*p = type_libxml_to_msxml(This->node->type);
- TRACE("returning %d\n", *p);
+ TRACE("returning %ld\n", *p);
return S_OK;
}
@@ -428,7 +420,7 @@ static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildEl
xmlelem *childElem = impl_from_IXMLElement(pChildElem);
xmlNodePtr child;
- TRACE("(%p)->(%p %d %d)\n", This, pChildElem, lIndex, lreserved);
+ TRACE("%p, %p, %ld, %ld.\n", iface, pChildElem, lIndex, lreserved);
if (lIndex == 0)
child = xmlAddChild(This->node, childElem->node);
@@ -631,8 +623,8 @@ static HRESULT WINAPI xmlelem_collection_Invoke(IXMLElementCollection *iface, DI
static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, LONG v)
{
- xmlelem_collection *This = impl_from_IXMLElementCollection(iface);
- TRACE("(%p)->(%d)\n", This, v);
+ TRACE("%p, %ld.\n", iface, v);
+
return E_FAIL;
}
@@ -749,7 +741,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next(
xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
HRESULT hr;
- TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, fetched);
+ TRACE("%p, %lu, %p, %p.\n", iface, celt, rgVar, fetched);
if (!rgVar)
return E_INVALIDARG;
@@ -780,8 +772,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next(
static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(
IEnumVARIANT *iface, ULONG celt)
{
- xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
- FIXME("(%p)->(%d): stub\n", This, celt);
+ FIXME("%p, %lu: stub\n", iface, celt);
return E_NOTIMPL;
}
diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c
index 0fcb9e34340..59263d043da 100644
--- a/dlls/msxml3/xmlparser.c
+++ b/dlls/msxml3/xmlparser.c
@@ -74,7 +74,7 @@ static ULONG WINAPI xmlparser_AddRef(IXMLParser* iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -83,7 +83,7 @@ static ULONG WINAPI xmlparser_Release(IXMLParser* iface)
xmlparser *This = impl_from_IXMLParser( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
if(This->input)
@@ -228,9 +228,7 @@ static HRESULT WINAPI xmlparser_SetURL(IXMLParser *iface,const WCHAR *pszBaseUrl
static HRESULT WINAPI xmlparser_Load(IXMLParser *iface, BOOL bFullyAvailable,
IMoniker *pMon, LPBC pBC, DWORD dwMode)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %d %p %p %d)\n", This, bFullyAvailable, pMon, pBC, dwMode);
+ FIXME("%p, %d, %p, %p, %ld.\n", iface, bFullyAvailable, pMon, pBC, dwMode);
return E_NOTIMPL;
}
@@ -256,9 +254,7 @@ static HRESULT WINAPI xmlparser_SetInput(IXMLParser *iface, IUnknown *pStm)
static HRESULT WINAPI xmlparser_PushData(IXMLParser *iface, const char *pData,
ULONG nChars, BOOL fLastBuffer)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %s %d %d)\n", This, debugstr_a(pData), nChars, fLastBuffer);
+ FIXME("%p, %s, %lu, %d.\n", iface, debugstr_a(pData), nChars, fLastBuffer);
return E_NOTIMPL;
}
@@ -286,9 +282,7 @@ static HRESULT WINAPI xmlparser_LoadEntity(IXMLParser *iface, const WCHAR *baseU
static HRESULT WINAPI xmlparser_ParseEntity(IXMLParser *iface, const WCHAR *text,
ULONG len, BOOL fpe)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %s %d %d)\n", This, debugstr_w(text), len, fpe);
+ FIXME("%p, %s, %lu, %d.\n", iface, debugstr_w(text), len, fpe);
return E_NOTIMPL;
}
@@ -296,9 +290,7 @@ static HRESULT WINAPI xmlparser_ParseEntity(IXMLParser *iface, const WCHAR *text
static HRESULT WINAPI xmlparser_ExpandEntity(IXMLParser *iface, const WCHAR *text,
ULONG len)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %s %d)\n", This, debugstr_w(text), len);
+ FIXME("%p, %s, %ld.\n", iface, debugstr_w(text), len);
return E_NOTIMPL;
}
@@ -323,9 +315,7 @@ static HRESULT WINAPI xmlparser_GetRoot( IXMLParser *iface, PVOID *ppRoot)
static HRESULT WINAPI xmlparser_Run(IXMLParser *iface, LONG chars)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %d)\n", This, chars);
+ FIXME("%p, %ld.\n", iface, chars);
return E_NOTIMPL;
}
@@ -361,7 +351,7 @@ static HRESULT WINAPI xmlparser_SetFlags(IXMLParser *iface, ULONG flags)
{
xmlparser *This = impl_from_IXMLParser( iface );
- TRACE("(%p %d)\n", This, flags);
+ TRACE("%p, %lx.\n", iface, flags);
This->flags = flags;
diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c
index ff561503673..91f3ecf4805 100644
--- a/dlls/msxml3/xmlview.c
+++ b/dlls/msxml3/xmlview.c
@@ -100,9 +100,9 @@ static HRESULT WINAPI XMLView_Binding_QueryInterface(
static ULONG WINAPI XMLView_Binding_AddRef(IBinding *iface)
{
Binding *This = impl_from_IBinding(iface);
- LONG ref = InterlockedIncrement(&This->ref);
+ ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -112,7 +112,7 @@ static ULONG WINAPI XMLView_Binding_Release(IBinding *iface)
Binding *This = impl_from_IBinding(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) {
IBinding_Release(This->binding);
@@ -147,7 +147,7 @@ static HRESULT WINAPI XMLView_Binding_SetPriority(
IBinding *iface, LONG nPriority)
{
Binding *This = impl_from_IBinding(iface);
- TRACE("(%p)->(%d)\n", This, nPriority);
+ TRACE("%p, %ld.\n", iface, nPriority);
return IBinding_SetPriority(This->binding, nPriority);
}
@@ -229,9 +229,9 @@ static ULONG WINAPI XMLView_BindStatusCallback_AddRef(
IBindStatusCallback *iface)
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- LONG ref = InterlockedIncrement(&This->ref);
+ ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -242,7 +242,7 @@ static ULONG WINAPI XMLView_BindStatusCallback_Release(
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) {
if(This->stream)
@@ -261,7 +261,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnStartBinding(
IBinding *binding;
HRESULT hres;
- TRACE("(%p)->(%x %p)\n", This, dwReserved, pib);
+ TRACE("%p, %lx, %p.\n", iface, dwReserved, pib);
hres = XMLView_Binding_Create(pib, &binding);
if(FAILED(hres)) {
@@ -290,8 +290,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_GetPriority(
static HRESULT WINAPI XMLView_BindStatusCallback_OnLowResource(
IBindStatusCallback *iface, DWORD reserved)
{
- BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- FIXME("(%p)->(%x)\n", This, reserved);
+ FIXME("%p, %lx.\n", iface, reserved);
return E_NOTIMPL;
}
@@ -300,7 +299,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnProgress(
ULONG ulStatusCode, LPCWSTR szStatusText)
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- TRACE("(%p)->(%d %d %x %s)\n", This, ulProgress, ulProgressMax,
+ TRACE("%p, %lu, %lu, %lu, %s.\n", iface, ulProgress, ulProgressMax,
ulStatusCode, debugstr_w(szStatusText));
switch(ulStatusCode) {
@@ -310,7 +309,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnProgress(
case BINDSTATUS_MIMETYPEAVAILABLE:
return S_OK;
default:
- FIXME("ulStatusCode: %d\n", ulStatusCode);
+ FIXME("ulStatusCode: %lu\n", ulStatusCode);
return E_NOTIMPL;
}
}
@@ -319,7 +318,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnStopBinding(
IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError)
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- TRACE("(%p)->(%x %s)\n", This, hresult, debugstr_w(szError));
+ TRACE("%p, %#lx, %s.\n", iface, hresult, debugstr_w(szError));
return IBindStatusCallback_OnStopBinding(This->bsc, hresult, szError);
}
@@ -513,7 +512,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnDataAvailable(
DWORD size;
HRESULT hres;
- TRACE("(%p)->(%x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
+ TRACE("%p, %lx, %ld, %p, %p.\n", iface, grfBSCF, dwSize, pformatetc, pstgmed);
if(!This->stream)
return E_FAIL;
@@ -604,7 +603,7 @@ static ULONG WINAPI XMLView_Moniker_AddRef(IMoniker *iface)
Moniker *This = impl_from_IMoniker(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -614,7 +613,7 @@ static ULONG WINAPI XMLView_Moniker_Release(IMoniker *iface)
Moniker *This = impl_from_IMoniker(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) {
IMoniker_Release(This->mon);
@@ -691,8 +690,7 @@ static HRESULT WINAPI XMLView_Moniker_BindToStorage(IMoniker *iface, IBindCtx *p
static HRESULT WINAPI XMLView_Moniker_Reduce(IMoniker *iface, IBindCtx *pbc,
DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced)
{
- Moniker *This = impl_from_IMoniker(iface);
- FIXME("(%p)->(%p %d %p %p)\n", This, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
+ FIXME("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
return E_NOTIMPL;
}
@@ -870,9 +868,9 @@ static HRESULT WINAPI XMLView_PersistMoniker_QueryInterface(
static ULONG WINAPI XMLView_PersistMoniker_AddRef(IPersistMoniker *iface)
{
XMLView *This = impl_from_IPersistMoniker(iface);
- LONG ref = InterlockedIncrement(&This->ref);
+ ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -882,7 +880,7 @@ static ULONG WINAPI XMLView_PersistMoniker_Release(IPersistMoniker *iface)
XMLView *This = impl_from_IPersistMoniker(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) {
if(This->mon)
@@ -926,7 +924,7 @@ static HRESULT WINAPI XMLView_PersistMoniker_Load(IPersistMoniker *iface,
IUnknown *unk;
HRESULT hres;
- TRACE("(%p)->(%x %p %p %x)\n", This, fFullyAvailable, pimkName, pibc, grfMode);
+ TRACE("%p, %x, %p, %p, %lx.\n", iface, fFullyAvailable, pimkName, pibc, grfMode);
hres = IBindCtx_GetObjectParam(pibc, (LPOLESTR)XSLParametersW, &unk);
if(SUCCEEDED(hres)) {
@@ -1125,8 +1123,7 @@ static HRESULT WINAPI XMLView_PersistHistory_SaveHistory(
static HRESULT WINAPI XMLView_PersistHistory_SetPositionCookie(
IPersistHistory *iface, DWORD dwPositioncookie)
{
- XMLView *This = impl_from_IPersistHistory(iface);
- FIXME("(%p)->(%d)\n", This, dwPositioncookie);
+ FIXME("%p, %ld.\n", iface, dwPositioncookie);
return E_NOTIMPL;
}
@@ -1176,8 +1173,7 @@ static ULONG WINAPI XMLView_OleCommandTarget_Release(IOleCommandTarget *iface)
static HRESULT WINAPI XMLView_OleCommandTarget_QueryStatus(IOleCommandTarget *iface,
const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText)
{
- XMLView *This = impl_from_IOleCommandTarget(iface);
- FIXME("(%p)->(%p %x %p %p)\n", This, pguidCmdGroup, cCmds, prgCmds, pCmdText);
+ FIXME("%p, %p, %lu, %p, %p.\n", iface, pguidCmdGroup, cCmds, prgCmds, pCmdText);
return E_NOTIMPL;
}
@@ -1185,8 +1181,7 @@ static HRESULT WINAPI XMLView_OleCommandTarget_Exec(IOleCommandTarget *iface,
const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt,
VARIANT *pvaIn, VARIANT *pvaOut)
{
- XMLView *This = impl_from_IOleCommandTarget(iface);
- FIXME("(%p)->(%p %d %x %p %p)\n", This, pguidCmdGroup,
+ FIXME("%p, %p, %ld, %lx, %p, %p.\n", iface, pguidCmdGroup,
nCmdID, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
@@ -1249,40 +1244,35 @@ static HRESULT WINAPI XMLView_OleObject_SetHostNames(IOleObject *iface,
static HRESULT WINAPI XMLView_OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x)\n", This, dwSaveOption);
+ FIXME("%p, %lx.\n", iface, dwSaveOption);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_SetMoniker(IOleObject *iface,
DWORD dwWhichMoniker, IMoniker *pmk)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwWhichMoniker, pmk);
+ FIXME("%p, %lx, %p.\n", iface, dwWhichMoniker, pmk);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_GetMoniker(IOleObject *iface,
DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %x %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
+ FIXME("%p, %lx, %lx, %p.\n", iface, dwAssign, dwWhichMoniker, ppmk);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_InitFromData(IOleObject *iface,
IDataObject *pDataObject, BOOL fCreation, DWORD dwReserved)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%p %x %x)\n", This, pDataObject, fCreation, dwReserved);
+ FIXME("%p, %p, %x, %lx.\n", iface, pDataObject, fCreation, dwReserved);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_GetClipboardData(IOleObject *iface,
DWORD dwReserved, IDataObject **ppDataObject)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwReserved, ppDataObject);
+ FIXME("%p, %lx, %p.\n", iface, dwReserved, ppDataObject);
return E_NOTIMPL;
}
@@ -1290,8 +1280,7 @@ static HRESULT WINAPI XMLView_OleObject_DoVerb(IOleObject *iface,
LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite,
LONG lindex, HWND hwndParent, LPCRECT lprcPosRect)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%d %p %p %d %p %p)\n", This, iVerb, lpmsg,
+ FIXME("%p, %ld, %p, %p, %ld, %p, %p.\n", iface, iVerb, lpmsg,
pActiveSite, lindex, hwndParent, lprcPosRect);
return E_NOTIMPL;
}
@@ -1328,24 +1317,21 @@ static HRESULT WINAPI XMLView_OleObject_GetUserClassID(IOleObject *iface, CLSID
static HRESULT WINAPI XMLView_OleObject_GetUserType(IOleObject *iface,
DWORD dwFormOfType, LPOLESTR *pszUserType)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwFormOfType, pszUserType);
+ FIXME("%p, %lx, %p.\n", iface, dwFormOfType, pszUserType);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_SetExtent(IOleObject *iface,
DWORD dwDrawAspect, SIZEL *psizel)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwDrawAspect, psizel);
+ FIXME("%p, %lx, %p.\n", iface, dwDrawAspect, psizel);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_GetExtent(IOleObject *iface,
DWORD dwDrawAspect, SIZEL *psizel)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwDrawAspect, psizel);
+ FIXME("%p, %lx, %p.\n", iface, dwDrawAspect, psizel);
return E_NOTIMPL;
}
@@ -1360,8 +1346,7 @@ static HRESULT WINAPI XMLView_OleObject_Advise(IOleObject *iface,
static HRESULT WINAPI XMLView_OleObject_Unadvise(
IOleObject *iface, DWORD dwConnection)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%d)\n", This, dwConnection);
+ FIXME("%p, %ld.\n", iface, dwConnection);
return E_NOTIMPL;
}
@@ -1376,8 +1361,7 @@ static HRESULT WINAPI XMLView_OleObject_EnumAdvise(
static HRESULT WINAPI XMLView_OleObject_GetMiscStatus(
IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%d %p)\n", This, dwAspect, pdwStatus);
+ FIXME("%p, %ld, %p.\n", iface, dwAspect, pdwStatus);
return E_NOTIMPL;
}
--
2.34.1
More information about the wine-devel
mailing list