system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-15 01:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

msxml3: Fix long types warnings in traces.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2022-02-03 13:48:04 +03:00 committed by Alexandre Julliard
parent 19c2ffe852
commit 624202be4b
31 changed files with 373 additions and 479 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/msxml3/Makefile.in
View file

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = msxml3.dll MODULE = msxml3.dll
IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS) EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS)

8
dlls/msxml3/attribute.c
View file

@ -95,9 +95,9 @@ static HRESULT WINAPI domattr_QueryInterface(
static ULONG WINAPI domattr_AddRef( static ULONG WINAPI domattr_AddRef(
IXMLDOMAttribute *iface ) IXMLDOMAttribute *iface )
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *attr = impl_from_IXMLDOMAttribute( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &attr->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -107,7 +107,7 @@ static ULONG WINAPI domattr_Release(
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
ULONG 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 == 0 )
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);

33
dlls/msxml3/bsc.c
View file

@ -76,10 +76,10 @@ static HRESULT WINAPI bsc_QueryInterface(
static ULONG WINAPI bsc_AddRef( static ULONG WINAPI bsc_AddRef(
IBindStatusCallback *iface ) IBindStatusCallback *iface )
{ {
bsc_t *This = impl_from_IBindStatusCallback(iface); bsc_t *bsc = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&bsc->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
@ -87,15 +87,18 @@ static ULONG WINAPI bsc_AddRef(
static ULONG WINAPI bsc_Release( static ULONG WINAPI bsc_Release(
IBindStatusCallback *iface ) IBindStatusCallback *iface )
{ {
bsc_t *This = impl_from_IBindStatusCallback(iface); bsc_t *bsc = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&bsc->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if(!ref) { if (!ref)
if (This->binding) IBinding_Release(This->binding); {
if (This->memstream) IStream_Release(This->memstream); if (bsc->binding)
heap_free(This); IBinding_Release(bsc->binding);
if (bsc->memstream)
IStream_Release(bsc->memstream);
heap_free(bsc);
} }
return ref; return ref;
@ -109,7 +112,7 @@ static HRESULT WINAPI bsc_OnStartBinding(
bsc_t *This = impl_from_IBindStatusCallback(iface); bsc_t *This = impl_from_IBindStatusCallback(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%x %p)\n", This, dwReserved, pib); TRACE("%p, %lx, %p.\n", iface, dwReserved, pib);
This->binding = pib; This->binding = pib;
IBinding_AddRef(pib); IBinding_AddRef(pib);
@ -153,7 +156,7 @@ static HRESULT WINAPI bsc_OnStopBinding(
bsc_t *This = impl_from_IBindStatusCallback(iface); bsc_t *This = impl_from_IBindStatusCallback(iface);
HRESULT hr = S_OK; 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) { if(This->binding) {
IBinding_Release(This->binding); IBinding_Release(This->binding);
@ -194,12 +197,12 @@ static HRESULT WINAPI bsc_OnDataAvailable(
FORMATETC* pformatetc, FORMATETC* pformatetc,
STGMEDIUM* pstgmed) STGMEDIUM* pstgmed)
{ {
bsc_t *This = impl_from_IBindStatusCallback(iface); bsc_t *bsc = impl_from_IBindStatusCallback(iface);
BYTE buf[4096]; BYTE buf[4096];
DWORD read, written; DWORD read, written;
HRESULT hr; 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 do
{ {
@ -207,7 +210,7 @@ static HRESULT WINAPI bsc_OnDataAvailable(
if(FAILED(hr)) if(FAILED(hr))
break; break;
hr = IStream_Write(This->memstream, buf, read, &written); hr = IStream_Write(bsc->memstream, buf, read, &written);
} while(SUCCEEDED(hr) && written != 0 && read != 0); } while(SUCCEEDED(hr) && written != 0 && read != 0);
return S_OK; return S_OK;

40
dlls/msxml3/cdata.c
View file

@ -89,26 +89,25 @@ static HRESULT WINAPI domcdata_QueryInterface(
return S_OK; return S_OK;
} }
static ULONG WINAPI domcdata_AddRef( static ULONG WINAPI domcdata_AddRef(IXMLDOMCDATASection *iface)
IXMLDOMCDATASection *iface )
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *cdata = impl_from_IXMLDOMCDATASection(iface);
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement(&cdata->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI domcdata_Release( static ULONG WINAPI domcdata_Release(IXMLDOMCDATASection *iface)
IXMLDOMCDATASection *iface )
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *cdata = impl_from_IXMLDOMCDATASection(iface);
ULONG ref = InterlockedDecrement( &This->ref ); ULONG ref = InterlockedDecrement(&cdata->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
if (!ref)
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&cdata->node);
heap_free( This ); heap_free(cdata);
} }
return ref; return ref;
@ -577,11 +576,10 @@ static HRESULT WINAPI domcdata_substringData(
IXMLDOMCDATASection *iface, IXMLDOMCDATASection *iface,
LONG offset, LONG count, BSTR *p) LONG offset, LONG count, BSTR *p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr; HRESULT hr;
BSTR data; BSTR data;
TRACE("(%p)->(%d %d %p)\n", This, offset, count, p); TRACE("%p, %ld, %ld, %p.\n", iface, offset, count, p);
if(!p) if(!p)
return E_INVALIDARG; return E_INVALIDARG;
@ -651,12 +649,11 @@ static HRESULT WINAPI domcdata_insertData(
IXMLDOMCDATASection *iface, IXMLDOMCDATASection *iface,
LONG offset, BSTR p) LONG offset, BSTR p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr; HRESULT hr;
BSTR data; BSTR data;
LONG p_len; 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 have a NULL or empty string, don't do anything. */
if((p_len = SysStringLen(p)) == 0) if((p_len = SysStringLen(p)) == 0)
@ -699,12 +696,11 @@ static HRESULT WINAPI domcdata_deleteData(
IXMLDOMCDATASection *iface, IXMLDOMCDATASection *iface,
LONG offset, LONG count) LONG offset, LONG count)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr; HRESULT hr;
LONG len = -1; LONG len = -1;
BSTR str; BSTR str;
TRACE("(%p)->(%d %d)\n", This, offset, count); TRACE("%p, %ld, %ld.\n", iface, offset, count);
hr = IXMLDOMCDATASection_get_length(iface, &len); hr = IXMLDOMCDATASection_get_length(iface, &len);
if(hr != S_OK) return hr; if(hr != S_OK) return hr;
@ -747,10 +743,9 @@ static HRESULT WINAPI domcdata_replaceData(
IXMLDOMCDATASection *iface, IXMLDOMCDATASection *iface,
LONG offset, LONG count, BSTR p) LONG offset, LONG count, BSTR p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr; 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); hr = IXMLDOMCDATASection_deleteData(iface, offset, count);
@ -764,12 +759,11 @@ static HRESULT WINAPI domcdata_splitText(
IXMLDOMCDATASection *iface, IXMLDOMCDATASection *iface,
LONG offset, IXMLDOMText **txtNode) LONG offset, IXMLDOMText **txtNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
IXMLDOMDocument *doc; IXMLDOMDocument *doc;
LONG length = 0; LONG length = 0;
HRESULT hr; 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; if (!txtNode || offset < 0) return E_INVALIDARG;

40
dlls/msxml3/comment.c
View file

@ -89,26 +89,25 @@ static HRESULT WINAPI domcomment_QueryInterface(
return S_OK; return S_OK;
} }
static ULONG WINAPI domcomment_AddRef( static ULONG WINAPI domcomment_AddRef(IXMLDOMComment *iface)
IXMLDOMComment *iface )
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *comment = impl_from_IXMLDOMComment(iface);
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement(&comment->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI domcomment_Release( static ULONG WINAPI domcomment_Release(IXMLDOMComment *iface)
IXMLDOMComment *iface )
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *comment = impl_from_IXMLDOMComment(iface);
ULONG ref = InterlockedDecrement( &This->ref ); ULONG ref = InterlockedDecrement(&comment->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
if (!ref)
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&comment->node);
heap_free( This ); heap_free(comment);
} }
return ref; return ref;
@ -575,15 +574,12 @@ static HRESULT WINAPI domcomment_get_length(
return hr; return hr;
} }
static HRESULT WINAPI domcomment_substringData( static HRESULT WINAPI domcomment_substringData(IXMLDOMComment *iface, LONG offset, LONG count, BSTR *p)
IXMLDOMComment *iface,
LONG offset, LONG count, BSTR *p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface );
HRESULT hr; HRESULT hr;
BSTR data; BSTR data;
TRACE("(%p)->(%d %d %p)\n", This, offset, count, p); TRACE("%p, %ld, %ld, %p.\n", iface, offset, count, p);
if(!p) if(!p)
return E_INVALIDARG; return E_INVALIDARG;
@ -653,12 +649,11 @@ static HRESULT WINAPI domcomment_insertData(
IXMLDOMComment *iface, IXMLDOMComment *iface,
LONG offset, BSTR p) LONG offset, BSTR p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface );
HRESULT hr; HRESULT hr;
BSTR data; BSTR data;
LONG p_len; 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 have a NULL or empty string, don't do anything. */
if((p_len = SysStringLen(p)) == 0) if((p_len = SysStringLen(p)) == 0)
@ -705,7 +700,7 @@ static HRESULT WINAPI domcomment_deleteData(
LONG len = -1; LONG len = -1;
BSTR str; BSTR str;
TRACE("(%p)->(%d %d)\n", iface, offset, count); TRACE("%p, %ld, %ld.\n", iface, offset, count);
hr = IXMLDOMComment_get_length(iface, &len); hr = IXMLDOMComment_get_length(iface, &len);
if(hr != S_OK) return hr; if(hr != S_OK) return hr;
@ -748,10 +743,9 @@ static HRESULT WINAPI domcomment_replaceData(
IXMLDOMComment *iface, IXMLDOMComment *iface,
LONG offset, LONG count, BSTR p) LONG offset, LONG count, BSTR p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface );
HRESULT hr; 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); hr = IXMLDOMComment_deleteData(iface, offset, count);

54
dlls/msxml3/dispex.c
View file

@ -142,7 +142,7 @@ static HRESULT get_typelib(unsigned lib, ITypeLib **tl)
if(!typelib[lib]) { if(!typelib[lib]) {
hres = LoadRegTypeLib(lib_ids[lib].iid, lib_ids[lib].major, 0, LOCALE_SYSTEM_DEFAULT, tl); hres = LoadRegTypeLib(lib_ids[lib].iid, lib_ids[lib].major, 0, LOCALE_SYSTEM_DEFAULT, tl);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("LoadRegTypeLib failed: %08x\n", hres); ERR("LoadRegTypeLib failed, hr %#lx.\n", hres);
return hres; return hres;
} }
@ -173,7 +173,7 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo)
return hres; return hres;
hres = ITypeLib_GetTypeInfoOfGuid(typelib, get_riid_from_tid(tid), &ti); hres = ITypeLib_GetTypeInfoOfGuid(typelib, get_riid_from_tid(tid), &ti);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("GetTypeInfoOfGuid failed: %08x\n", hres); ERR("GetTypeInfoOfGuid failed, hr %#lx.\n", hres);
return hres; return hres;
} }
} }
@ -259,7 +259,7 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This)
hres = get_typeinfo(This->data->disp_tid, &dti); hres = get_typeinfo(This->data->disp_tid, &dti);
if(FAILED(hres)) { 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; return NULL;
} }
@ -363,26 +363,25 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti
static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) 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, static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId) LCID lcid, DISPID *rgDispId)
{ {
DispatchEx *This = impl_from_IDispatchEx(iface);
UINT i; UINT i;
HRESULT hres; 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); lcid, rgDispId);
for(i=0; i < cNames; i++) { 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)) if(FAILED(hres))
return hres; return hres;
} }
@ -394,13 +393,10 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,
REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams,
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
DispatchEx *This = impl_from_IDispatchEx(iface); TRACE("%p, %ld, %s, %lx, %x, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
TRACE("(%p)->(%x %s %x %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, return IDispatchEx_InvokeEx(iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL);
pDispParams, pVarResult, pExcepInfo, NULL);
} }
static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) 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; dispex_data_t *data;
int min, max, n, c; 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)) if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit))
FIXME("Unsupported grfdex %x\n", grfdex); FIXME("Unsupported grfdex %lx.\n", grfdex);
data = get_dispex_data(This); data = get_dispex_data(This);
if(!data) if(!data)
@ -486,7 +482,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
int min, max, n; int min, max, n;
HRESULT hres; 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) { if(This->data->vtbl && This->data->vtbl->invoke) {
hres = This->data->vtbl->invoke(This->outer, id, lcid, wFlags, pdp, pvarRes, pei); 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) { if(min > max) {
WARN("invalid id %x\n", id); WARN("invalid id %lx.\n", id);
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
} }
hres = get_typeinfo(data->funcs[n].tid, &ti); hres = get_typeinfo(data->funcs[n].tid, &ti);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("Could not get type info: %08x\n", hres); ERR("Could not get type info, hr %#lx.\n", hres);
return hres; return hres;
} }
hres = IUnknown_QueryInterface(This->outer, get_riid_from_tid(data->funcs[n].tid), (void**)&unk); hres = IUnknown_QueryInterface(This->outer, get_riid_from_tid(data->funcs[n].tid), (void**)&unk);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("Could not get iface: %08x\n", hres); ERR("Could not get interface, hr %#lx.\n", hres);
ITypeInfo_Release(ti); ITypeInfo_Release(ti);
return E_FAIL; 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) static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)
{ {
DispatchEx *This = impl_from_IDispatchEx(iface); TRACE("%p, %s, %lx.\n", iface, debugstr_w(bstrName), grfdex);
TRACE("Not implemented in native msxml3 (%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id)
{ {
DispatchEx *This = impl_from_IDispatchEx(iface); TRACE("%p, %ld.\n", iface, id);
TRACE("Not implemented in native msxml3 (%p)->(%x)\n", This, id);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex)
{ {
DispatchEx *This = impl_from_IDispatchEx(iface); TRACE("%p, %ld, %lx, %p.\n", iface, id, grfdexFetch, pgrfdex);
TRACE("Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName)
{ {
DispatchEx *This = impl_from_IDispatchEx(iface); TRACE("%p, %ld, %p.\n", iface, id, pbstrName);
TRACE("Not implemented in native msxml3 (%p)->(%x %p)\n", This, id, pbstrName);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid)
{ {
DispatchEx *This = impl_from_IDispatchEx(iface); TRACE("%p, %lx, %ld, %p.\n", iface, grfdex, id, pid);
TRACE(" Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, grfdex, id, pid);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk)
{ {
DispatchEx *This = impl_from_IDispatchEx(iface); TRACE("%p, %p.\n", iface, ppunk);
TRACE("Not implemented in native msxml3 (%p)->(%p)\n", This, ppunk);
return E_NOTIMPL; return E_NOTIMPL;
} }

25
dlls/msxml3/docfrag.c
View file

@ -88,26 +88,25 @@ static HRESULT WINAPI domfrag_QueryInterface(
return S_OK; return S_OK;
} }
static ULONG WINAPI domfrag_AddRef( static ULONG WINAPI domfrag_AddRef(IXMLDOMDocumentFragment *iface)
IXMLDOMDocumentFragment *iface )
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *domfrag = impl_from_IXMLDOMDocumentFragment(iface);
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement(&domfrag->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI domfrag_Release( static ULONG WINAPI domfrag_Release(IXMLDOMDocumentFragment *iface)
IXMLDOMDocumentFragment *iface )
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *domfrag = impl_from_IXMLDOMDocumentFragment(iface);
ULONG ref = InterlockedDecrement( &This->ref ); ULONG ref = InterlockedDecrement(&domfrag->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
if (!ref)
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&domfrag->node);
heap_free( This ); heap_free(domfrag);
} }
return ref; return ref;

25
dlls/msxml3/doctype.c
View file

@ -80,26 +80,25 @@ static HRESULT WINAPI domdoctype_QueryInterface(
return S_OK; return S_OK;
} }
static ULONG WINAPI domdoctype_AddRef( static ULONG WINAPI domdoctype_AddRef(IXMLDOMDocumentType *iface)
IXMLDOMDocumentType *iface )
{ {
domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); domdoctype *doctype = impl_from_IXMLDOMDocumentType(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&doctype->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI domdoctype_Release( static ULONG WINAPI domdoctype_Release(IXMLDOMDocumentType *iface)
IXMLDOMDocumentType *iface )
{ {
domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); domdoctype *doctype = impl_from_IXMLDOMDocumentType(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&doctype->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if(!ref) { if (!ref)
destroy_xmlnode(&This->node); {
heap_free(This); destroy_xmlnode(&doctype->node);
heap_free(doctype);
} }
return ref; return ref;

42
dlls/msxml3/domdoc.c
View file

@ -349,7 +349,7 @@ static domdoc_properties * properties_add_ref(domdoc_properties *properties)
if (!properties) return NULL; if (!properties) return NULL;
ref = InterlockedIncrement(&properties->refs); ref = InterlockedIncrement(&properties->refs);
TRACE("%p, %d.\n", properties, ref); TRACE("%p, %ld.\n", properties, ref);
return properties; return properties;
} }
@ -361,7 +361,7 @@ static void properties_release(domdoc_properties *properties)
ref = InterlockedDecrement(&properties->refs); ref = InterlockedDecrement(&properties->refs);
TRACE("%p, %d.\n", properties, ref); TRACE("%p, %ld.\n", properties, ref);
if (ref < 0) if (ref < 0)
WARN("negative refcount, expect troubles\n"); 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 xmldoc_add_refs(xmlDocPtr doc, LONG refs)
{ {
LONG ref = InterlockedExchangeAdd(&priv_from_xmlDocPtr(doc)->refs, refs) + 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; return ref;
} }
@ -626,7 +626,8 @@ LONG xmldoc_release_refs(xmlDocPtr doc, LONG refs)
{ {
xmldoc_priv *priv = priv_from_xmlDocPtr(doc); xmldoc_priv *priv = priv_from_xmlDocPtr(doc);
LONG ref = InterlockedExchangeAdd(&priv->refs, -refs) - refs; LONG ref = InterlockedExchangeAdd(&priv->refs, -refs) - refs;
TRACE("(%p)->(%d)\n", doc, ref);
TRACE("%p, refcount %ld.\n", doc, ref);
if (ref < 0) if (ref < 0)
WARN("negative refcount, expect troubles\n"); WARN("negative refcount, expect troubles\n");
@ -818,7 +819,7 @@ static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream)
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("failed to copy stream 0x%08x\n", hr); ERR("failed to copy stream, hr %#lx.\n", hr);
IStream_Release(hstream); IStream_Release(hstream);
return hr; return hr;
} }
@ -878,7 +879,7 @@ static HRESULT WINAPI PersistStreamInit_Save(
SysFreeString(xmlString); SysFreeString(xmlString);
} }
TRACE("ret 0x%08x\n", hr); TRACE("hr %#lx.\n", hr);
return hr; return hr;
} }
@ -977,9 +978,9 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID rii
static ULONG WINAPI domdoc_AddRef( IXMLDOMDocument3 *iface ) static ULONG WINAPI domdoc_AddRef( IXMLDOMDocument3 *iface )
{ {
domdoc *This = impl_from_IXMLDOMDocument3( iface ); domdoc *doc = impl_from_IXMLDOMDocument3(iface);
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement(&doc->ref);
TRACE("(%p)->(%d)\n", This, ref ); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
@ -988,9 +989,9 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface )
domdoc *This = impl_from_IXMLDOMDocument3( iface ); domdoc *This = impl_from_IXMLDOMDocument3( iface );
LONG ref = InterlockedDecrement( &This->ref ); 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; int eid;
@ -2249,7 +2250,7 @@ static HRESULT WINAPI domdoc_load(
if (FAILED(hr)) if (FAILED(hr))
{ {
This->error = 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; break;
} }
SafeArrayGetUBound(psa, 1, &len); SafeArrayGetUBound(psa, 1, &len);
@ -2318,7 +2319,7 @@ static HRESULT WINAPI domdoc_load(
return hr; 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; break;
} }
default: default:
@ -2368,7 +2369,7 @@ static HRESULT WINAPI domdoc_load(
hr = S_FALSE; hr = S_FALSE;
} }
TRACE("ret (%d)\n", hr); TRACE("hr %#lx.\n", hr);
return hr; return hr;
} }
@ -2533,10 +2534,10 @@ static int XMLCALL domdoc_stream_save_writecallback(void *ctx, const char *buffe
HRESULT hr; HRESULT hr;
hr = IStream_Write((IStream*)ctx, buffer, len, &written); 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) if (hr != S_OK)
{ {
WARN("stream write error: 0x%08x\n", hr); WARN("stream write error, hr %#lx.\n", hr);
return -1; return -1;
} }
else else
@ -3532,7 +3533,7 @@ static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD co
{ {
ConnectionPoint *This = impl_from_IConnectionPoint(iface); 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) if (cookie == 0 || cookie > This->sinks_size || !This->sinks[cookie-1].unk)
return CONNECT_E_NOCONNECTION; 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, static HRESULT WINAPI domdoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,
DWORD mask, DWORD enabled) DWORD mask, DWORD enabled)
{ {
domdoc *This = impl_from_IObjectSafety(iface); domdoc *doc = impl_from_IObjectSafety(iface);
TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled);
TRACE("%p, %s, %lx, %lx.\n", iface, debugstr_guid(riid), mask, enabled);
if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0) if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0)
return E_FAIL; return E_FAIL;
This->safeopt = (This->safeopt & ~mask) | (mask & enabled); doc->safeopt = (doc->safeopt & ~mask) | (mask & enabled);
return S_OK; return S_OK;
} }

23
dlls/msxml3/domimpl.c
View file

@ -76,24 +76,23 @@ static HRESULT WINAPI domimpl_QueryInterface(
return S_OK; return S_OK;
} }
static ULONG WINAPI domimpl_AddRef( static ULONG WINAPI domimpl_AddRef(IXMLDOMImplementation *iface)
IXMLDOMImplementation *iface )
{ {
domimpl *This = impl_from_IXMLDOMImplementation( iface ); domimpl *domimpl = impl_from_IXMLDOMImplementation(iface);
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement(&domimpl->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI domimpl_Release( static ULONG WINAPI domimpl_Release(IXMLDOMImplementation *iface)
IXMLDOMImplementation *iface )
{ {
domimpl *This = impl_from_IXMLDOMImplementation( iface ); domimpl *domimpl = impl_from_IXMLDOMImplementation(iface);
ULONG ref = InterlockedDecrement( &This->ref ); ULONG ref = InterlockedDecrement(&domimpl->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
heap_free( This ); if (!ref)
heap_free(domimpl);
return ref; return ref;
} }

29
dlls/msxml3/element.c
View file

@ -100,28 +100,27 @@ static HRESULT WINAPI domelem_QueryInterface(
return S_OK; return S_OK;
} }
static ULONG WINAPI domelem_AddRef( static ULONG WINAPI domelem_AddRef(IXMLDOMElement *iface)
IXMLDOMElement *iface )
{ {
domelem *This = impl_from_IXMLDOMElement( iface ); domelem *element = impl_from_IXMLDOMElement(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&element->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI domelem_Release( static ULONG WINAPI domelem_Release(IXMLDOMElement *iface)
IXMLDOMElement *iface )
{ {
domelem *This = impl_from_IXMLDOMElement( iface ); domelem *element = impl_from_IXMLDOMElement(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&element->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) { if (!ref)
destroy_xmlnode(&This->node); {
heap_free(This); destroy_xmlnode(&element->node);
heap_free(element);
} }
return ref; return ref;
@ -1792,7 +1791,7 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode *
IUnknown *unk; IUnknown *unk;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %p)\n", node, index, item); TRACE("%p, %ld, %p.\n", node, index, item);
*item = NULL; *item = NULL;
@ -1879,7 +1878,7 @@ static HRESULT domelem_next_node(const xmlNodePtr node, LONG *iter, IXMLDOMNode
xmlAttrPtr curr; xmlAttrPtr curr;
LONG i; LONG i;
TRACE("(%p)->(%d: %p)\n", node, *iter, nextNode); TRACE("%p, %ld, %p.\n", node, *iter, nextNode);
*nextNode = NULL; *nextNode = NULL;

7
dlls/msxml3/entityref.c
View file

@ -93,7 +93,7 @@ static ULONG WINAPI entityref_AddRef(
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -103,8 +103,9 @@ static ULONG WINAPI entityref_Release(
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
ULONG 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)
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);
heap_free( This ); heap_free( This );

20
dlls/msxml3/factory.c
View file

@ -195,20 +195,22 @@ static inline DOMFactory *DOMFactory_from_IClassFactory(IClassFactory *iface)
static ULONG WINAPI DOMClassFactory_AddRef(IClassFactory *iface ) static ULONG WINAPI DOMClassFactory_AddRef(IClassFactory *iface )
{ {
DOMFactory *This = DOMFactory_from_IClassFactory(iface); DOMFactory *factory = DOMFactory_from_IClassFactory(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&factory->ref);
TRACE("(%p) ref = %u\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI DOMClassFactory_Release(IClassFactory *iface ) static ULONG WINAPI DOMClassFactory_Release(IClassFactory *iface )
{ {
DOMFactory *This = DOMFactory_from_IClassFactory(iface); DOMFactory *factory = DOMFactory_from_IClassFactory(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&factory->ref);
TRACE("(%p) ref = %u\n", This, ref);
if(!ref) { TRACE("%p, refcount %lu.\n", iface, ref);
heap_free(This);
} if (!ref)
heap_free(factory);
return ref; return ref;
} }

104
dlls/msxml3/httprequest.c
View file

@ -274,7 +274,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref = %d\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
@ -284,7 +284,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref = %d\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
{ {
@ -302,7 +302,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
{ {
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); 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; 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) static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved)
{ {
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); TRACE("%p, %ld.\n", iface, reserved);
TRACE("(%p)->(%d)\n", This, reserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -335,9 +333,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *ifac
static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress,
ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
{ {
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); TRACE("%p, %lu, %lu, %lu, %s.\n", iface, ulProgress, ulProgressMax, ulStatusCode,
TRACE("(%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
debugstr_w(szStatusText)); debugstr_w(szStatusText));
return S_OK; return S_OK;
@ -348,7 +344,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
{ {
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); 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) if (This->binding)
{ {
@ -403,7 +399,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
BYTE buf[4096]; BYTE buf[4096];
HRESULT hr; 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 do
{ {
@ -474,7 +470,7 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac
WCHAR *buff, *ptr; WCHAR *buff, *ptr;
int size = 0; 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; *add_headers = NULL;
@ -576,7 +572,7 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c
{ {
BindStatusCallback *This = impl_from_IHttpNegotiate(iface); 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); debugstr_w(req_headers), add_reqheaders);
This->request->status = code; This->request->status = code;
@ -931,7 +927,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url,
else else
hr = CreateUri(url, 0, 0, &uri); hr = CreateUri(url, 0, 0, &uri);
if(FAILED(hr)) { if(FAILED(hr)) {
WARN("Could not create IUri object: %08x\n", hr); WARN("Could not create IUri object, hr %#lx.\n", hr);
return hr; return hr;
} }
@ -970,11 +966,11 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url,
uri = full_uri; uri = full_uri;
} }
else else
WARN("failed to create modified uri, 0x%08x\n", hr); WARN("failed to create modified uri, hr %#lx.\n", hr);
IUriBuilder_Release(builder); IUriBuilder_Release(builder);
} }
else else
WARN("IUriBuilder creation failed, 0x%08x\n", hr); WARN("IUriBuilder creation failed, hr %#lx.\n", hr);
} }
This->uri = uri; This->uri = uri;
@ -1396,23 +1392,23 @@ static HRESULT WINAPI XMLHTTPRequest_QueryInterface(IXMLHTTPRequest *iface, REFI
static ULONG WINAPI XMLHTTPRequest_AddRef(IXMLHTTPRequest *iface) static ULONG WINAPI XMLHTTPRequest_AddRef(IXMLHTTPRequest *iface)
{ {
httprequest *This = impl_from_IXMLHTTPRequest( iface ); httprequest *request = impl_from_IXMLHTTPRequest(iface);
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement(&request->ref);
TRACE("(%p)->(%u)\n", This, ref ); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI XMLHTTPRequest_Release(IXMLHTTPRequest *iface) static ULONG WINAPI XMLHTTPRequest_Release(IXMLHTTPRequest *iface)
{ {
httprequest *This = impl_from_IXMLHTTPRequest( iface ); httprequest *request = impl_from_IXMLHTTPRequest(iface);
ULONG ref = InterlockedDecrement( &This->ref ); 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 ); httprequest_release(request);
heap_free( This ); heap_free(request);
} }
return ref; return ref;
@ -1420,9 +1416,7 @@ static ULONG WINAPI XMLHTTPRequest_Release(IXMLHTTPRequest *iface)
static HRESULT WINAPI XMLHTTPRequest_GetTypeInfoCount(IXMLHTTPRequest *iface, UINT *pctinfo) static HRESULT WINAPI XMLHTTPRequest_GetTypeInfoCount(IXMLHTTPRequest *iface, UINT *pctinfo)
{ {
httprequest *This = impl_from_IXMLHTTPRequest( iface ); TRACE("%p, %p.\n", iface, pctinfo);
TRACE("(%p)->(%p)\n", This, pctinfo);
*pctinfo = 1; *pctinfo = 1;
@ -1432,9 +1426,7 @@ static HRESULT WINAPI XMLHTTPRequest_GetTypeInfoCount(IXMLHTTPRequest *iface, UI
static HRESULT WINAPI XMLHTTPRequest_GetTypeInfo(IXMLHTTPRequest *iface, UINT iTInfo, static HRESULT WINAPI XMLHTTPRequest_GetTypeInfo(IXMLHTTPRequest *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
httprequest *This = impl_from_IXMLHTTPRequest( iface ); TRACE("%p, %u, %lx,%p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IXMLHTTPRequest_tid, 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, static HRESULT WINAPI XMLHTTPRequest_GetIDsOfNames(IXMLHTTPRequest *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{ {
httprequest *This = impl_from_IXMLHTTPRequest( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, rgDispId);
if(!rgszNames || cNames == 0 || !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, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr) EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
httprequest *This = impl_from_IXMLHTTPRequest( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLHTTPRequest_tid, &typeinfo); hr = get_typeinfo(IXMLHTTPRequest_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &This->IXMLHTTPRequest_iface, dispIdMember, wFlags, hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
} }
@ -1743,13 +1732,14 @@ static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety
static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,
DWORD mask, DWORD enabled) DWORD mask, DWORD enabled)
{ {
httprequest *This = impl_from_IObjectSafety(iface); httprequest *request = impl_from_IObjectSafety(iface);
TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled);
TRACE("%p, %s, %lx, %lx.\n", iface, debugstr_guid(riid), mask, enabled);
if ((mask & ~safety_supported_options)) if ((mask & ~safety_supported_options))
return E_FAIL; return E_FAIL;
This->safeopt = (This->safeopt & ~mask) | (mask & enabled); request->safeopt = (request->safeopt & ~mask) | (mask & enabled);
return S_OK; return S_OK;
} }
@ -1829,23 +1819,23 @@ static HRESULT WINAPI ServerXMLHTTPRequest_QueryInterface(IServerXMLHTTPRequest
static ULONG WINAPI ServerXMLHTTPRequest_AddRef(IServerXMLHTTPRequest *iface) static ULONG WINAPI ServerXMLHTTPRequest_AddRef(IServerXMLHTTPRequest *iface)
{ {
serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); serverhttp *request = impl_from_IServerXMLHTTPRequest(iface);
ULONG ref = InterlockedIncrement( &This->req.ref ); ULONG ref = InterlockedIncrement(&request->req.ref);
TRACE("(%p)->(%u)\n", This, ref ); TRACE("%p, refcount %lu.\n", iface, ref );
return ref; return ref;
} }
static ULONG WINAPI ServerXMLHTTPRequest_Release(IServerXMLHTTPRequest *iface) static ULONG WINAPI ServerXMLHTTPRequest_Release(IServerXMLHTTPRequest *iface)
{ {
serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); serverhttp *request = impl_from_IServerXMLHTTPRequest(iface);
ULONG ref = InterlockedDecrement( &This->req.ref ); 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 ); httprequest_release(&request->req);
heap_free( This ); heap_free(request);
} }
return ref; return ref;
@ -1864,9 +1854,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfoCount(IServerXMLHTTPReques
static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *iface, UINT iTInfo, static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IServerXMLHTTPRequest_tid, 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, static HRESULT WINAPI ServerXMLHTTPRequest_GetIDsOfNames(IServerXMLHTTPRequest *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{ {
serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, rgDispId);
if(!rgszNames || cNames == 0 || !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, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr) EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IServerXMLHTTPRequest_tid, &typeinfo); hr = get_typeinfo(IServerXMLHTTPRequest_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &This->IServerXMLHTTPRequest_iface, dispIdMember, wFlags, hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); 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, static HRESULT WINAPI ServerXMLHTTPRequest_setTimeouts(IServerXMLHTTPRequest *iface, LONG resolveTimeout, LONG connectTimeout,
LONG sendTimeout, LONG receiveTimeout) LONG sendTimeout, LONG receiveTimeout)
{ {
serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); FIXME("%p, %ld, %ld, %ld, %ld: stub\n", iface, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout);
FIXME("(%p)->(%d %d %d %d): stub\n", This, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout);
return S_OK; return S_OK;
} }

2
dlls/msxml3/main.c
View file

@ -142,7 +142,7 @@ static int wineXmlReadCallback(void * context, char * buffer, int len)
return -1; return -1;
} }
TRACE("Read %d\n", dwBytesRead); TRACE("Read %ld bytes.\n", dwBytesRead);
return dwBytesRead; return dwBytesRead;
} }

18
dlls/msxml3/mxnamespace.c
View file

@ -293,7 +293,7 @@ static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *if
HRESULT hr; HRESULT hr;
BSTR prfx; 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; if (!prefix_len) return E_POINTER;
@ -315,15 +315,15 @@ static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *if
static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface, static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface,
const WCHAR *uri, LONG index, WCHAR *prefix, int *prefix_len) const WCHAR *uri, LONG index, WCHAR *prefix, int *prefix_len)
{ {
namespacemanager *This = impl_from_IMXNamespaceManager( iface ); namespacemanager *manager = impl_from_IMXNamespaceManager(iface);
HRESULT hr; HRESULT hr;
BSTR prfx; 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; 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) if (hr == S_OK)
{ {
/* TODO: figure out what index argument is for */ /* 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) static ULONG WINAPI vbnamespacemanager_AddRef(IVBMXNamespaceManager *iface)
{ {
namespacemanager *This = impl_from_IVBMXNamespaceManager( iface ); namespacemanager *manager = impl_from_IVBMXNamespaceManager(iface);
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement(&manager->ref);
TRACE("(%p)->(%u)\n", This, ref ); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -440,9 +440,9 @@ static ULONG WINAPI vbnamespacemanager_Release(IVBMXNamespaceManager *iface)
namespacemanager *This = impl_from_IVBMXNamespaceManager( iface ); namespacemanager *This = impl_from_IVBMXNamespaceManager( iface );
ULONG ref = InterlockedDecrement( &This->ref ); 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; struct nscontext *ctxt, *ctxt2;

52
dlls/msxml3/mxwriter.c
View file

@ -828,10 +828,10 @@ static HRESULT WINAPI mxwriter_QueryInterface(IMXWriter *iface, REFIID riid, voi
static ULONG WINAPI mxwriter_AddRef(IMXWriter *iface) static ULONG WINAPI mxwriter_AddRef(IMXWriter *iface)
{ {
mxwriter *This = impl_from_IMXWriter( iface ); mxwriter *writer = impl_from_IMXWriter(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&writer->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -841,9 +841,9 @@ static ULONG WINAPI mxwriter_Release(IMXWriter *iface)
mxwriter *This = impl_from_IMXWriter( iface ); mxwriter *This = impl_from_IMXWriter( iface );
ULONG ref = InterlockedDecrement(&This->ref); 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. */ /* Windows flushes the buffer when the interface is destroyed. */
flush_output_buffer(This); flush_output_buffer(This);
@ -2468,9 +2468,7 @@ static ULONG WINAPI SAXErrorHandler_Release(ISAXErrorHandler *iface)
static HRESULT WINAPI SAXErrorHandler_error(ISAXErrorHandler *iface, static HRESULT WINAPI SAXErrorHandler_error(ISAXErrorHandler *iface,
ISAXLocator *locator, const WCHAR *message, HRESULT hr) ISAXLocator *locator, const WCHAR *message, HRESULT hr)
{ {
mxwriter *This = impl_from_ISAXErrorHandler( iface ); FIXME("%p, %p, %s, %#lx.\n", iface, locator, debugstr_w(message), hr);
FIXME("(%p)->(%p %s 0x%08x)\n", This, locator, debugstr_w(message), hr);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2478,9 +2476,7 @@ static HRESULT WINAPI SAXErrorHandler_error(ISAXErrorHandler *iface,
static HRESULT WINAPI SAXErrorHandler_fatalError(ISAXErrorHandler *iface, static HRESULT WINAPI SAXErrorHandler_fatalError(ISAXErrorHandler *iface,
ISAXLocator *locator, const WCHAR *message, HRESULT hr) ISAXLocator *locator, const WCHAR *message, HRESULT hr)
{ {
mxwriter *This = impl_from_ISAXErrorHandler( iface ); FIXME("%p, %p, %s, %#lx.\n", iface, locator, debugstr_w(message), hr);
FIXME("(%p)->(%p %s 0x%08x)\n", This, locator, debugstr_w(message), hr);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2488,9 +2484,7 @@ static HRESULT WINAPI SAXErrorHandler_fatalError(ISAXErrorHandler *iface,
static HRESULT WINAPI SAXErrorHandler_ignorableWarning(ISAXErrorHandler *iface, static HRESULT WINAPI SAXErrorHandler_ignorableWarning(ISAXErrorHandler *iface,
ISAXLocator *locator, const WCHAR *message, HRESULT hr) ISAXLocator *locator, const WCHAR *message, HRESULT hr)
{ {
mxwriter *This = impl_from_ISAXErrorHandler( iface ); FIXME("%p, %p, %s, %#lx.\n", iface, locator, debugstr_w(message), hr);
FIXME("(%p)->(%p %s 0x%08x)\n", This, locator, debugstr_w(message), hr);
return E_NOTIMPL; 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) static HRESULT WINAPI VBSAXErrorHandler_error(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code)
{ {
mxwriter *This = impl_from_IVBSAXErrorHandler( iface ); FIXME("%p, %p, %p, %lx: stub\n", iface, locator, message, code);
FIXME("(%p)->(%p %p %x): stub\n", This, locator, message, code);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI VBSAXErrorHandler_fatalError(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code) static HRESULT WINAPI VBSAXErrorHandler_fatalError(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code)
{ {
mxwriter *This = impl_from_IVBSAXErrorHandler( iface ); FIXME("%p, %p, %p, %lx: stub\n", iface, locator, message, code);
FIXME("(%p)->(%p %p %x): stub\n", This, locator, message, code);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI VBSAXErrorHandler_ignorableWarning(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code) static HRESULT WINAPI VBSAXErrorHandler_ignorableWarning(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code)
{ {
mxwriter *This = impl_from_IVBSAXErrorHandler( iface ); FIXME("%p, %p, %p, %lx: stub\n", iface, locator, message, code);
FIXME("(%p)->(%p %p %x): stub\n", This, locator, message, code);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2698,18 +2689,18 @@ static ULONG WINAPI MXAttributes_AddRef(IMXAttributes *iface)
{ {
mxattributes *This = impl_from_IMXAttributes( iface ); mxattributes *This = impl_from_IMXAttributes( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref ); TRACE("%p, refcount %lu.\n", iface, ref );
return ref; return ref;
} }
static ULONG WINAPI MXAttributes_Release(IMXAttributes *iface) static ULONG WINAPI MXAttributes_Release(IMXAttributes *iface)
{ {
mxattributes *This = impl_from_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; int i;
@ -3261,8 +3252,8 @@ static HRESULT WINAPI VBSAXAttributes_GetTypeInfo(
IVBSAXAttributes *iface, IVBSAXAttributes *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{ {
mxattributes *This = impl_from_IVBSAXAttributes( iface ); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IVBSAXAttributes_tid, ppTInfo); return get_typeinfo(IVBSAXAttributes_tid, ppTInfo);
} }
@ -3274,11 +3265,10 @@ static HRESULT WINAPI VBSAXAttributes_GetIDsOfNames(
LCID lcid, LCID lcid,
DISPID* rgDispId) DISPID* rgDispId)
{ {
mxattributes *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId) if(!rgszNames || cNames == 0 || !rgDispId)
@ -3305,18 +3295,16 @@ static HRESULT WINAPI VBSAXAttributes_Invoke(
EXCEPINFO* pExcepInfo, EXCEPINFO* pExcepInfo,
UINT* puArgErr) UINT* puArgErr)
{ {
mxattributes *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo); hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXAttributes_iface, dispIdMember, wFlags, hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
} }

30
dlls/msxml3/node.c
View file

@ -107,7 +107,7 @@ static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface)
{ {
SupportErrorInfo *This = impl_from_ISupportErrorInfo(iface); SupportErrorInfo *This = impl_from_ISupportErrorInfo(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref ); TRACE("%p, refcount %ld.\n", iface, ref );
return ref; return ref;
} }
@ -116,9 +116,9 @@ static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface)
SupportErrorInfo *This = impl_from_ISupportErrorInfo(iface); SupportErrorInfo *This = impl_from_ISupportErrorInfo(iface);
LONG ref = InterlockedDecrement(&This->ref); 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); heap_free(This);
return ref; return ref;
@ -1350,7 +1350,7 @@ static HRESULT xslt_doc_get_uri(const xmlChar *uri, void *_ctxt, xsltLoadType ty
SysFreeString(uriW); SysFreeString(uriW);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create href uri, %#x.\n", hr); WARN("Failed to create href uri, %#lx.\n", hr);
return hr; return hr;
} }
@ -1364,14 +1364,14 @@ static HRESULT xslt_doc_get_uri(const xmlChar *uri, void *_ctxt, xsltLoadType ty
SysFreeString(baseuriW); SysFreeString(baseuriW);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create base uri, %#x.\n", hr); WARN("Failed to create base uri, %#lx.\n", hr);
return hr; return hr;
} }
hr = CoInternetCombineIUri(base_uri, href_uri, 0, doc_uri, 0); hr = CoInternetCombineIUri(base_uri, href_uri, 0, doc_uri, 0);
IUri_Release(base_uri); IUri_Release(base_uri);
if (FAILED(hr)) if (FAILED(hr))
WARN("Failed to combine uris, %#x.\n", hr); WARN("Failed to combine uris, hr %#lx.\n", hr);
} }
else else
{ {
@ -1717,14 +1717,9 @@ static HRESULT WINAPI unknode_GetTypeInfo(
LCID lcid, LCID lcid,
ITypeInfo** ppTInfo ) ITypeInfo** ppTInfo )
{ {
unknode *This = unknode_from_IXMLDOMNode( iface ); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
HRESULT hr;
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo(IXMLDOMNode_tid, ppTInfo);
hr = get_typeinfo(IXMLDOMNode_tid, ppTInfo);
return hr;
} }
static HRESULT WINAPI unknode_GetIDsOfNames( static HRESULT WINAPI unknode_GetIDsOfNames(
@ -1735,12 +1730,10 @@ static HRESULT WINAPI unknode_GetIDsOfNames(
LCID lcid, LCID lcid,
DISPID* rgDispId ) DISPID* rgDispId )
{ {
unknode *This = unknode_from_IXMLDOMNode( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId) if(!rgszNames || cNames == 0 || !rgDispId)
@ -1767,17 +1760,16 @@ static HRESULT WINAPI unknode_Invoke(
EXCEPINFO* pExcepInfo, EXCEPINFO* pExcepInfo,
UINT* puArgErr ) UINT* puArgErr )
{ {
unknode *This = unknode_from_IXMLDOMNode( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLDOMNode_tid, &typeinfo); hr = get_typeinfo(IXMLDOMNode_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMNode_iface, dispIdMember, wFlags, pDispParams, hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams,
pVarResult, pExcepInfo, puArgErr); pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
} }

13
dlls/msxml3/nodelist.c
View file

@ -118,7 +118,7 @@ static ULONG WINAPI xmlnodelist_AddRef(
{ {
xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); xmlnodelist *This = impl_from_IXMLDOMNodeList( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -128,8 +128,9 @@ static ULONG WINAPI xmlnodelist_Release(
xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); xmlnodelist *This = impl_from_IXMLDOMNodeList( iface );
ULONG 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)
{ {
xmldoc_release( This->parent->doc ); xmldoc_release( This->parent->doc );
if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant); if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant);
@ -196,7 +197,7 @@ static HRESULT WINAPI xmlnodelist_get_item(
xmlNodePtr curr; xmlNodePtr curr;
LONG nodeIndex = 0; LONG nodeIndex = 0;
TRACE("(%p)->(%d %p)\n", This, index, listItem); TRACE("%p, %ld, %p.\n", iface, index, listItem);
if(!listItem) if(!listItem)
return E_INVALIDARG; return E_INVALIDARG;
@ -312,7 +313,7 @@ static HRESULT xmlnodelist_get_dispid(IUnknown *iface, BSTR name, DWORD flags, D
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
*dispid = DISPID_DOM_COLLECTION_BASE + idx; *dispid = DISPID_DOM_COLLECTION_BASE + idx;
TRACE("ret %x\n", *dispid); TRACE("ret %lx\n", *dispid);
return S_OK; 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 ); 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) if (id >= DISPID_DOM_COLLECTION_BASE && id <= DISPID_DOM_COLLECTION_MAX)
{ {

17
dlls/msxml3/nodemap.c
View file

@ -121,7 +121,7 @@ static ULONG WINAPI xmlnodemap_AddRef(
{ {
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -131,8 +131,9 @@ static ULONG WINAPI xmlnodemap_Release(
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
ULONG 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)
{ {
xmlnode_release( This->node ); xmlnode_release( This->node );
xmldoc_release( This->node->doc ); xmldoc_release( This->node->doc );
@ -225,7 +226,7 @@ static HRESULT WINAPI xmlnodemap_get_item(
{ {
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); 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); return This->funcs->get_item(This->node, index, item);
} }
@ -273,7 +274,7 @@ static HRESULT WINAPI xmlnodemap_nextNode(
{ {
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); 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); 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 ); xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
TRACE("(%p)->(%d)\n", This, This->iterator); TRACE("%p, %ld.\n", iface, This->iterator);
This->iterator = 0; This->iterator = 0;
@ -371,7 +372,7 @@ static HRESULT xmlnodemap_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DI
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
*dispid = DISPID_DOM_COLLECTION_BASE + idx; *dispid = DISPID_DOM_COLLECTION_BASE + idx;
TRACE("ret %x\n", *dispid); TRACE("ret %lx\n", *dispid);
return S_OK; 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 ); 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_VT(res) = VT_DISPATCH;
V_DISPATCH(res) = NULL; V_DISPATCH(res) = NULL;

7
dlls/msxml3/parseerror.c
View file

@ -83,7 +83,7 @@ static ULONG WINAPI parseError_AddRef(
{ {
parse_error_t *This = impl_from_IXMLDOMParseError2( iface ); parse_error_t *This = impl_from_IXMLDOMParseError2( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -93,8 +93,9 @@ static ULONG WINAPI parseError_Release(
parse_error_t *This = impl_from_IXMLDOMParseError2( iface ); parse_error_t *This = impl_from_IXMLDOMParseError2( iface );
ULONG 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)
{ {
SysFreeString(This->url); SysFreeString(This->url);
SysFreeString(This->reason); SysFreeString(This->reason);

8
dlls/msxml3/pi.c
View file

@ -96,7 +96,7 @@ static ULONG WINAPI dom_pi_AddRef(
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -106,7 +106,7 @@ static ULONG WINAPI dom_pi_Release(
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
ULONG 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 == 0 )
{ {
destroy_xmlnode(&This->node); 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) 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; 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) 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; return E_NOTIMPL;
} }

34
dlls/msxml3/saxreader.c
View file

@ -749,9 +749,7 @@ static HRESULT WINAPI ivbsaxattributes_GetTypeInfo(
IVBSAXAttributes *iface, IVBSAXAttributes *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{ {
saxlocator *This = impl_from_IVBSAXAttributes( iface ); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IVBSAXAttributes_tid, ppTInfo); return get_typeinfo(IVBSAXAttributes_tid, ppTInfo);
} }
@ -764,11 +762,10 @@ static HRESULT WINAPI ivbsaxattributes_GetIDsOfNames(
LCID lcid, LCID lcid,
DISPID* rgDispId) DISPID* rgDispId)
{ {
saxlocator *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId) if(!rgszNames || cNames == 0 || !rgDispId)
@ -795,18 +792,16 @@ static HRESULT WINAPI ivbsaxattributes_Invoke(
EXCEPINFO* pExcepInfo, EXCEPINFO* pExcepInfo,
UINT* puArgErr) UINT* puArgErr)
{ {
saxlocator *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo); hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXAttributes_iface, dispIdMember, wFlags, hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
} }
@ -2150,9 +2145,7 @@ static HRESULT WINAPI ivbsaxlocator_GetTypeInfo(
IVBSAXLocator *iface, IVBSAXLocator *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{ {
saxlocator *This = impl_from_IVBSAXLocator( iface ); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IVBSAXLocator_tid, ppTInfo); return get_typeinfo(IVBSAXLocator_tid, ppTInfo);
} }
@ -2165,11 +2158,10 @@ static HRESULT WINAPI ivbsaxlocator_GetIDsOfNames(
LCID lcid, LCID lcid,
DISPID* rgDispId) DISPID* rgDispId)
{ {
saxlocator *This = impl_from_IVBSAXLocator( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId) if(!rgszNames || cNames == 0 || !rgDispId)
@ -2196,18 +2188,16 @@ static HRESULT WINAPI ivbsaxlocator_Invoke(
EXCEPINFO* pExcepInfo, EXCEPINFO* pExcepInfo,
UINT* puArgErr) UINT* puArgErr)
{ {
saxlocator *This = impl_from_IVBSAXLocator( iface );
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXLocator_tid, &typeinfo); hr = get_typeinfo(IVBSAXLocator_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXLocator_iface, dispIdMember, wFlags, hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
} }
@ -2318,7 +2308,7 @@ static ULONG WINAPI isaxlocator_AddRef(ISAXLocator* iface)
{ {
saxlocator *This = impl_from_ISAXLocator( iface ); saxlocator *This = impl_from_ISAXLocator( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -2326,11 +2316,11 @@ static ULONG WINAPI isaxlocator_Release(
ISAXLocator* iface) ISAXLocator* iface)
{ {
saxlocator *This = impl_from_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; element_entry *element, *element2;
int index; int index;

14
dlls/msxml3/schema.c
View file

@ -755,14 +755,14 @@ void schemasCleanup(void)
static LONG cache_entry_add_ref(cache_entry* entry) static LONG cache_entry_add_ref(cache_entry* entry)
{ {
LONG ref = InterlockedIncrement(&entry->ref); LONG ref = InterlockedIncrement(&entry->ref);
TRACE("(%p)->(%d)\n", entry, ref); TRACE("%p, refcount %ld.\n", entry, ref);
return ref; return ref;
} }
static LONG cache_entry_release(cache_entry* entry) static LONG cache_entry_release(cache_entry* entry)
{ {
LONG ref = InterlockedDecrement(&entry->ref); LONG ref = InterlockedDecrement(&entry->ref);
TRACE("(%p)->(%d)\n", entry, ref); TRACE("%p, refcount %ld.\n", entry, ref);
if (ref == 0) 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); hr = IXMLDOMDocument3_load(domdoc, url, &b);
if (hr != S_OK) if (hr != S_OK)
{ {
ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr); ERR("load() returned %#lx.\n", hr);
if (b != VARIANT_TRUE) if (b != VARIANT_TRUE)
{ {
FIXME("Failed to load doc at %s\n", debugstr_w(V_BSTR(&url))); 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); schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
@ -1134,9 +1134,9 @@ static ULONG WINAPI schema_cache_Release(IXMLDOMSchemaCollection2* iface)
{ {
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
LONG ref = InterlockedDecrement(&This->ref); 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; int i;
@ -1367,7 +1367,7 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if
{ {
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); 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) if (!uri)
return E_POINTER; return E_POINTER;

20
dlls/msxml3/selection.c
View file

@ -155,7 +155,7 @@ static ULONG WINAPI domselection_AddRef(
{ {
domselection *This = impl_from_IXMLDOMSelection( iface ); domselection *This = impl_from_IXMLDOMSelection( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -165,7 +165,7 @@ static ULONG WINAPI domselection_Release(
domselection *This = impl_from_IXMLDOMSelection( iface ); domselection *This = impl_from_IXMLDOMSelection( iface );
ULONG 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 == 0 )
{ {
xmlXPathFreeObject(This->result); xmlXPathFreeObject(This->result);
@ -232,7 +232,7 @@ static HRESULT WINAPI domselection_get_item(
{ {
domselection *This = impl_from_IXMLDOMSelection( iface ); domselection *This = impl_from_IXMLDOMSelection( iface );
TRACE("(%p)->(%d %p)\n", This, index, listItem); TRACE("%p, %ld, %p.\n", iface, index, listItem);
if(!listItem) if(!listItem)
return E_INVALIDARG; return E_INVALIDARG;
@ -468,7 +468,7 @@ static ULONG WINAPI enumvariant_AddRef(IEnumVARIANT *iface )
{ {
enumvariant *This = impl_from_IEnumVARIANT( iface ); enumvariant *This = impl_from_IEnumVARIANT( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -477,7 +477,7 @@ static ULONG WINAPI enumvariant_Release(IEnumVARIANT *iface )
enumvariant *This = impl_from_IEnumVARIANT( iface ); enumvariant *This = impl_from_IEnumVARIANT( iface );
ULONG 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 == 0 )
{ {
if (This->own) IUnknown_Release(This->outer); if (This->own) IUnknown_Release(This->outer);
@ -496,7 +496,7 @@ static HRESULT WINAPI enumvariant_Next(
enumvariant *This = impl_from_IEnumVARIANT( iface ); enumvariant *This = impl_from_IEnumVARIANT( iface );
ULONG ret_count = 0; 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; if (fetched) *fetched = 0;
@ -529,8 +529,8 @@ static HRESULT WINAPI enumvariant_Skip(
IEnumVARIANT *iface, IEnumVARIANT *iface,
ULONG celt) ULONG celt)
{ {
enumvariant *This = impl_from_IEnumVARIANT( iface ); FIXME("%p, %lu: stub\n", iface, celt);
FIXME("(%p)->(%u): stub\n", This, celt);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -595,7 +595,7 @@ static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags,
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
*dispid = DISPID_DOM_COLLECTION_BASE + idx; *dispid = DISPID_DOM_COLLECTION_BASE + idx;
TRACE("ret %x\n", *dispid); TRACE("ret %lx\n", *dispid);
return S_OK; 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 ); 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_VT(res) = VT_DISPATCH;
V_DISPATCH(res) = NULL; V_DISPATCH(res) = NULL;

10
dlls/msxml3/stylesheet.c
View file

@ -139,7 +139,7 @@ static ULONG WINAPI xsltemplate_AddRef( IXSLTemplate *iface )
{ {
xsltemplate *This = impl_from_IXSLTemplate( iface ); xsltemplate *This = impl_from_IXSLTemplate( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -148,7 +148,7 @@ static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface )
xsltemplate *This = impl_from_IXSLTemplate( iface ); xsltemplate *This = impl_from_IXSLTemplate( iface );
ULONG 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 == 0 )
{ {
if (This->node) IXMLDOMNode_Release( This->node ); if (This->node) IXMLDOMNode_Release( This->node );
@ -317,7 +317,7 @@ static ULONG WINAPI xslprocessor_AddRef( IXSLProcessor *iface )
{ {
xslprocessor *This = impl_from_IXSLProcessor( iface ); xslprocessor *This = impl_from_IXSLProcessor( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -326,7 +326,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface )
xslprocessor *This = impl_from_IXSLProcessor( iface ); xslprocessor *This = impl_from_IXSLProcessor( iface );
ULONG 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 == 0 )
{ {
struct xslprocessor_par *par, *par2; struct xslprocessor_par *par, *par2;
@ -509,7 +509,7 @@ static HRESULT WINAPI xslprocessor_put_output(
if (FAILED(hr)) if (FAILED(hr))
{ {
output_type = PROCESSOR_OUTPUT_NOT_SET; 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; break;
default: default:

18
dlls/msxml3/text.c
View file

@ -91,7 +91,7 @@ static ULONG WINAPI domtext_AddRef(
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -101,7 +101,7 @@ static ULONG WINAPI domtext_Release(
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
ULONG 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 == 0 )
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);
@ -668,11 +668,10 @@ static HRESULT WINAPI domtext_substringData(
IXMLDOMText *iface, IXMLDOMText *iface,
LONG offset, LONG count, BSTR *p) LONG offset, LONG count, BSTR *p)
{ {
domtext *This = impl_from_IXMLDOMText( iface );
HRESULT hr; HRESULT hr;
BSTR data; BSTR data;
TRACE("(%p)->(%d %d %p)\n", This, offset, count, p); TRACE("%p, %ld, %ld, %p.\n", iface, offset, count, p);
if(!p) if(!p)
return E_INVALIDARG; return E_INVALIDARG;
@ -742,12 +741,11 @@ static HRESULT WINAPI domtext_insertData(
IXMLDOMText *iface, IXMLDOMText *iface,
LONG offset, BSTR p) LONG offset, BSTR p)
{ {
domtext *This = impl_from_IXMLDOMText( iface );
HRESULT hr; HRESULT hr;
BSTR data; BSTR data;
LONG p_len; 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 have a NULL or empty string, don't do anything. */
if((p_len = SysStringLen(p)) == 0) if((p_len = SysStringLen(p)) == 0)
@ -794,7 +792,7 @@ static HRESULT WINAPI domtext_deleteData(
LONG len = -1; LONG len = -1;
BSTR str; BSTR str;
TRACE("(%p)->(%d %d)\n", iface, offset, count); TRACE("%p, %ld, %ld.\n", iface, offset, count);
hr = IXMLDOMText_get_length(iface, &len); hr = IXMLDOMText_get_length(iface, &len);
if(hr != S_OK) return hr; if(hr != S_OK) return hr;
@ -837,10 +835,9 @@ static HRESULT WINAPI domtext_replaceData(
IXMLDOMText *iface, IXMLDOMText *iface,
LONG offset, LONG count, BSTR p) LONG offset, LONG count, BSTR p)
{ {
domtext *This = impl_from_IXMLDOMText( iface );
HRESULT hr; 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); hr = IXMLDOMText_deleteData(iface, offset, count);
@ -854,10 +851,9 @@ static HRESULT WINAPI domtext_splitText(
IXMLDOMText *iface, IXMLDOMText *iface,
LONG offset, IXMLDOMText **txtNode) LONG offset, IXMLDOMText **txtNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface );
LONG length = 0; 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; if (!txtNode || offset < 0) return E_INVALIDARG;

17
dlls/msxml3/xmldoc.c
View file

@ -102,7 +102,7 @@ static ULONG WINAPI xmldoc_AddRef(IXMLDocument *iface)
{ {
xmldoc *This = impl_from_IXMLDocument(iface); xmldoc *This = impl_from_IXMLDocument(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
@ -111,7 +111,7 @@ static ULONG WINAPI xmldoc_Release(IXMLDocument *iface)
xmldoc *This = impl_from_IXMLDocument(iface); xmldoc *This = impl_from_IXMLDocument(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if (ref == 0) 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, static HRESULT WINAPI xmldoc_GetTypeInfo(IXMLDocument *iface, UINT iTInfo,
LCID lcid, ITypeInfo** ppTInfo) LCID lcid, ITypeInfo** ppTInfo)
{ {
xmldoc *This = impl_from_IXMLDocument(iface); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IXMLDocument_tid, ppTInfo); return get_typeinfo(IXMLDocument_tid, ppTInfo);
} }
@ -148,11 +146,10 @@ static HRESULT WINAPI xmldoc_GetIDsOfNames(IXMLDocument *iface, REFIID riid,
LPOLESTR* rgszNames, UINT cNames, LPOLESTR* rgszNames, UINT cNames,
LCID lcid, DISPID* rgDispId) LCID lcid, DISPID* rgDispId)
{ {
xmldoc *This = impl_from_IXMLDocument(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId) if(!rgszNames || cNames == 0 || !rgDispId)
@ -173,18 +170,16 @@ static HRESULT WINAPI xmldoc_Invoke(IXMLDocument *iface, DISPID dispIdMember,
DISPPARAMS* pDispParams, VARIANT* pVarResult, DISPPARAMS* pDispParams, VARIANT* pVarResult,
EXCEPINFO* pExcepInfo, UINT* puArgErr) EXCEPINFO* pExcepInfo, UINT* puArgErr)
{ {
xmldoc *This = impl_from_IXMLDocument(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLDocument_tid, &typeinfo); hr = get_typeinfo(IXMLDocument_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDocument_iface, dispIdMember, wFlags, hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
} }

31
dlls/msxml3/xmlelem.c
View file

@ -117,25 +117,19 @@ static HRESULT WINAPI xmlelem_GetTypeInfoCount(IXMLElement *iface, UINT* pctinfo
static HRESULT WINAPI xmlelem_GetTypeInfo(IXMLElement *iface, UINT iTInfo, static HRESULT WINAPI xmlelem_GetTypeInfo(IXMLElement *iface, UINT iTInfo,
LCID lcid, ITypeInfo** ppTInfo) LCID lcid, ITypeInfo** ppTInfo)
{ {
xmlelem *This = impl_from_IXMLElement(iface); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
HRESULT hr;
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo(IXMLElement_tid, ppTInfo);
hr = get_typeinfo(IXMLElement_tid, ppTInfo);
return hr;
} }
static HRESULT WINAPI xmlelem_GetIDsOfNames(IXMLElement *iface, REFIID riid, static HRESULT WINAPI xmlelem_GetIDsOfNames(IXMLElement *iface, REFIID riid,
LPOLESTR* rgszNames, UINT cNames, LPOLESTR* rgszNames, UINT cNames,
LCID lcid, DISPID* rgDispId) LCID lcid, DISPID* rgDispId)
{ {
xmlelem *This = impl_from_IXMLElement(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId) if(!rgszNames || cNames == 0 || !rgDispId)
@ -156,18 +150,16 @@ static HRESULT WINAPI xmlelem_Invoke(IXMLElement *iface, DISPID dispIdMember,
DISPPARAMS* pDispParams, VARIANT* pVarResult, DISPPARAMS* pDispParams, VARIANT* pVarResult,
EXCEPINFO* pExcepInfo, UINT* puArgErr) EXCEPINFO* pExcepInfo, UINT* puArgErr)
{ {
xmlelem *This = impl_from_IXMLElement(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; 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); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLElement_tid, &typeinfo); hr = get_typeinfo(IXMLElement_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &This->IXMLElement_iface, dispIdMember, wFlags, pDispParams, hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
} }
@ -380,7 +372,7 @@ static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, LONG *p)
return E_INVALIDARG; return E_INVALIDARG;
*p = type_libxml_to_msxml(This->node->type); *p = type_libxml_to_msxml(This->node->type);
TRACE("returning %d\n", *p); TRACE("returning %ld\n", *p);
return S_OK; return S_OK;
} }
@ -428,7 +420,7 @@ static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildEl
xmlelem *childElem = impl_from_IXMLElement(pChildElem); xmlelem *childElem = impl_from_IXMLElement(pChildElem);
xmlNodePtr child; 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) if (lIndex == 0)
child = xmlAddChild(This->node, childElem->node); 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) static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, LONG v)
{ {
xmlelem_collection *This = impl_from_IXMLElementCollection(iface); TRACE("%p, %ld.\n", iface, v);
TRACE("(%p)->(%d)\n", This, v);
return E_FAIL; return E_FAIL;
} }
@ -749,7 +741,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next(
xmlelem_collection *This = impl_from_IEnumVARIANT(iface); xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, fetched); TRACE("%p, %lu, %p, %p.\n", iface, celt, rgVar, fetched);
if (!rgVar) if (!rgVar)
return E_INVALIDARG; return E_INVALIDARG;
@ -780,8 +772,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next(
static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip( static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(
IEnumVARIANT *iface, ULONG celt) IEnumVARIANT *iface, ULONG celt)
{ {
xmlelem_collection *This = impl_from_IEnumVARIANT(iface); FIXME("%p, %lu: stub\n", iface, celt);
FIXME("(%p)->(%d): stub\n", This, celt);
return E_NOTIMPL; return E_NOTIMPL;
} }

26
dlls/msxml3/xmlparser.c
View file

@ -74,7 +74,7 @@ static ULONG WINAPI xmlparser_AddRef(IXMLParser* iface)
{ {
xmlparser *This = impl_from_IXMLParser( iface ); xmlparser *This = impl_from_IXMLParser( iface );
ULONG ref = InterlockedIncrement( &This->ref ); ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -83,7 +83,7 @@ static ULONG WINAPI xmlparser_Release(IXMLParser* iface)
xmlparser *This = impl_from_IXMLParser( iface ); xmlparser *This = impl_from_IXMLParser( iface );
ULONG 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 == 0 )
{ {
if(This->input) 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, static HRESULT WINAPI xmlparser_Load(IXMLParser *iface, BOOL bFullyAvailable,
IMoniker *pMon, LPBC pBC, DWORD dwMode) IMoniker *pMon, LPBC pBC, DWORD dwMode)
{ {
xmlparser *This = impl_from_IXMLParser( iface ); FIXME("%p, %d, %p, %p, %ld.\n", iface, bFullyAvailable, pMon, pBC, dwMode);
FIXME("(%p %d %p %p %d)\n", This, bFullyAvailable, pMon, pBC, dwMode);
return E_NOTIMPL; 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, static HRESULT WINAPI xmlparser_PushData(IXMLParser *iface, const char *pData,
ULONG nChars, BOOL fLastBuffer) ULONG nChars, BOOL fLastBuffer)
{ {
xmlparser *This = impl_from_IXMLParser( iface ); FIXME("%p, %s, %lu, %d.\n", iface, debugstr_a(pData), nChars, fLastBuffer);
FIXME("(%p %s %d %d)\n", This, debugstr_a(pData), nChars, fLastBuffer);
return E_NOTIMPL; 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, static HRESULT WINAPI xmlparser_ParseEntity(IXMLParser *iface, const WCHAR *text,
ULONG len, BOOL fpe) ULONG len, BOOL fpe)
{ {
xmlparser *This = impl_from_IXMLParser( iface ); FIXME("%p, %s, %lu, %d.\n", iface, debugstr_w(text), len, fpe);
FIXME("(%p %s %d %d)\n", This, debugstr_w(text), len, fpe);
return E_NOTIMPL; 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, static HRESULT WINAPI xmlparser_ExpandEntity(IXMLParser *iface, const WCHAR *text,
ULONG len) ULONG len)
{ {
xmlparser *This = impl_from_IXMLParser( iface ); FIXME("%p, %s, %ld.\n", iface, debugstr_w(text), len);
FIXME("(%p %s %d)\n", This, debugstr_w(text), len);
return E_NOTIMPL; 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) static HRESULT WINAPI xmlparser_Run(IXMLParser *iface, LONG chars)
{ {
xmlparser *This = impl_from_IXMLParser( iface ); FIXME("%p, %ld.\n", iface, chars);
FIXME("(%p %d)\n", This, chars);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -361,7 +351,7 @@ static HRESULT WINAPI xmlparser_SetFlags(IXMLParser *iface, ULONG flags)
{ {
xmlparser *This = impl_from_IXMLParser( iface ); xmlparser *This = impl_from_IXMLParser( iface );
TRACE("(%p %d)\n", This, flags); TRACE("%p, %lx.\n", iface, flags);
This->flags = flags; This->flags = flags;

84
dlls/msxml3/xmlview.c
View file

@ -100,9 +100,9 @@ static HRESULT WINAPI XMLView_Binding_QueryInterface(
static ULONG WINAPI XMLView_Binding_AddRef(IBinding *iface) static ULONG WINAPI XMLView_Binding_AddRef(IBinding *iface)
{ {
Binding *This = impl_from_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; return ref;
} }
@ -112,7 +112,7 @@ static ULONG WINAPI XMLView_Binding_Release(IBinding *iface)
Binding *This = impl_from_IBinding(iface); Binding *This = impl_from_IBinding(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) { if(!ref) {
IBinding_Release(This->binding); IBinding_Release(This->binding);
@ -147,7 +147,7 @@ static HRESULT WINAPI XMLView_Binding_SetPriority(
IBinding *iface, LONG nPriority) IBinding *iface, LONG nPriority)
{ {
Binding *This = impl_from_IBinding(iface); Binding *This = impl_from_IBinding(iface);
TRACE("(%p)->(%d)\n", This, nPriority); TRACE("%p, %ld.\n", iface, nPriority);
return IBinding_SetPriority(This->binding, nPriority); return IBinding_SetPriority(This->binding, nPriority);
} }
@ -229,9 +229,9 @@ static ULONG WINAPI XMLView_BindStatusCallback_AddRef(
IBindStatusCallback *iface) IBindStatusCallback *iface)
{ {
BindStatusCallback *This = impl_from_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; return ref;
} }
@ -242,7 +242,7 @@ static ULONG WINAPI XMLView_BindStatusCallback_Release(
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) { if(!ref) {
if(This->stream) if(This->stream)
@ -261,7 +261,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnStartBinding(
IBinding *binding; IBinding *binding;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%x %p)\n", This, dwReserved, pib); TRACE("%p, %lx, %p.\n", iface, dwReserved, pib);
hres = XMLView_Binding_Create(pib, &binding); hres = XMLView_Binding_Create(pib, &binding);
if(FAILED(hres)) { if(FAILED(hres)) {
@ -290,8 +290,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_GetPriority(
static HRESULT WINAPI XMLView_BindStatusCallback_OnLowResource( static HRESULT WINAPI XMLView_BindStatusCallback_OnLowResource(
IBindStatusCallback *iface, DWORD reserved) IBindStatusCallback *iface, DWORD reserved)
{ {
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); FIXME("%p, %lx.\n", iface, reserved);
FIXME("(%p)->(%x)\n", This, reserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -300,7 +299,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnProgress(
ULONG ulStatusCode, LPCWSTR szStatusText) ULONG ulStatusCode, LPCWSTR szStatusText)
{ {
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); 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)); ulStatusCode, debugstr_w(szStatusText));
switch(ulStatusCode) { switch(ulStatusCode) {
@ -310,7 +309,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnProgress(
case BINDSTATUS_MIMETYPEAVAILABLE: case BINDSTATUS_MIMETYPEAVAILABLE:
return S_OK; return S_OK;
default: default:
FIXME("ulStatusCode: %d\n", ulStatusCode); FIXME("ulStatusCode: %lu\n", ulStatusCode);
return E_NOTIMPL; return E_NOTIMPL;
} }
} }
@ -319,7 +318,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnStopBinding(
IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError)
{ {
BindStatusCallback *This = impl_from_IBindStatusCallback(iface); 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); return IBindStatusCallback_OnStopBinding(This->bsc, hresult, szError);
} }
@ -513,7 +512,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnDataAvailable(
DWORD size; DWORD size;
HRESULT hres; 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) if(!This->stream)
return E_FAIL; return E_FAIL;
@ -604,7 +603,7 @@ static ULONG WINAPI XMLView_Moniker_AddRef(IMoniker *iface)
Moniker *This = impl_from_IMoniker(iface); Moniker *This = impl_from_IMoniker(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
@ -614,7 +613,7 @@ static ULONG WINAPI XMLView_Moniker_Release(IMoniker *iface)
Moniker *This = impl_from_IMoniker(iface); Moniker *This = impl_from_IMoniker(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) { if(!ref) {
IMoniker_Release(This->mon); 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, static HRESULT WINAPI XMLView_Moniker_Reduce(IMoniker *iface, IBindCtx *pbc,
DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced) DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced)
{ {
Moniker *This = impl_from_IMoniker(iface); FIXME("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
FIXME("(%p)->(%p %d %p %p)\n", This, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -870,9 +868,9 @@ static HRESULT WINAPI XMLView_PersistMoniker_QueryInterface(
static ULONG WINAPI XMLView_PersistMoniker_AddRef(IPersistMoniker *iface) static ULONG WINAPI XMLView_PersistMoniker_AddRef(IPersistMoniker *iface)
{ {
XMLView *This = impl_from_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; return ref;
} }
@ -882,7 +880,7 @@ static ULONG WINAPI XMLView_PersistMoniker_Release(IPersistMoniker *iface)
XMLView *This = impl_from_IPersistMoniker(iface); XMLView *This = impl_from_IPersistMoniker(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) { if(!ref) {
if(This->mon) if(This->mon)
@ -926,7 +924,7 @@ static HRESULT WINAPI XMLView_PersistMoniker_Load(IPersistMoniker *iface,
IUnknown *unk; IUnknown *unk;
HRESULT hres; 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); hres = IBindCtx_GetObjectParam(pibc, (LPOLESTR)XSLParametersW, &unk);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
@ -1125,8 +1123,7 @@ static HRESULT WINAPI XMLView_PersistHistory_SaveHistory(
static HRESULT WINAPI XMLView_PersistHistory_SetPositionCookie( static HRESULT WINAPI XMLView_PersistHistory_SetPositionCookie(
IPersistHistory *iface, DWORD dwPositioncookie) IPersistHistory *iface, DWORD dwPositioncookie)
{ {
XMLView *This = impl_from_IPersistHistory(iface); FIXME("%p, %ld.\n", iface, dwPositioncookie);
FIXME("(%p)->(%d)\n", This, dwPositioncookie);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1176,8 +1173,7 @@ static ULONG WINAPI XMLView_OleCommandTarget_Release(IOleCommandTarget *iface)
static HRESULT WINAPI XMLView_OleCommandTarget_QueryStatus(IOleCommandTarget *iface, static HRESULT WINAPI XMLView_OleCommandTarget_QueryStatus(IOleCommandTarget *iface,
const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText)
{ {
XMLView *This = impl_from_IOleCommandTarget(iface); FIXME("%p, %p, %lu, %p, %p.\n", iface, pguidCmdGroup, cCmds, prgCmds, pCmdText);
FIXME("(%p)->(%p %x %p %p)\n", This, pguidCmdGroup, cCmds, prgCmds, pCmdText);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1185,8 +1181,7 @@ static HRESULT WINAPI XMLView_OleCommandTarget_Exec(IOleCommandTarget *iface,
const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt,
VARIANT *pvaIn, VARIANT *pvaOut) VARIANT *pvaIn, VARIANT *pvaOut)
{ {
XMLView *This = impl_from_IOleCommandTarget(iface); FIXME("%p, %p, %ld, %lx, %p, %p.\n", iface, pguidCmdGroup,
FIXME("(%p)->(%p %d %x %p %p)\n", This, pguidCmdGroup,
nCmdID, nCmdexecopt, pvaIn, pvaOut); nCmdID, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL; 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) static HRESULT WINAPI XMLView_OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %lx.\n", iface, dwSaveOption);
FIXME("(%p)->(%x)\n", This, dwSaveOption);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI XMLView_OleObject_SetMoniker(IOleObject *iface, static HRESULT WINAPI XMLView_OleObject_SetMoniker(IOleObject *iface,
DWORD dwWhichMoniker, IMoniker *pmk) DWORD dwWhichMoniker, IMoniker *pmk)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %lx, %p.\n", iface, dwWhichMoniker, pmk);
FIXME("(%p)->(%x %p)\n", This, dwWhichMoniker, pmk);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI XMLView_OleObject_GetMoniker(IOleObject *iface, static HRESULT WINAPI XMLView_OleObject_GetMoniker(IOleObject *iface,
DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %lx, %lx, %p.\n", iface, dwAssign, dwWhichMoniker, ppmk);
FIXME("(%p)->(%x %x %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI XMLView_OleObject_InitFromData(IOleObject *iface, static HRESULT WINAPI XMLView_OleObject_InitFromData(IOleObject *iface,
IDataObject *pDataObject, BOOL fCreation, DWORD dwReserved) IDataObject *pDataObject, BOOL fCreation, DWORD dwReserved)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %p, %x, %lx.\n", iface, pDataObject, fCreation, dwReserved);
FIXME("(%p)->(%p %x %x)\n", This, pDataObject, fCreation, dwReserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI XMLView_OleObject_GetClipboardData(IOleObject *iface, static HRESULT WINAPI XMLView_OleObject_GetClipboardData(IOleObject *iface,
DWORD dwReserved, IDataObject **ppDataObject) DWORD dwReserved, IDataObject **ppDataObject)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %lx, %p.\n", iface, dwReserved, ppDataObject);
FIXME("(%p)->(%x %p)\n", This, dwReserved, ppDataObject);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1290,8 +1280,7 @@ static HRESULT WINAPI XMLView_OleObject_DoVerb(IOleObject *iface,
LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite, LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite,
LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) LONG lindex, HWND hwndParent, LPCRECT lprcPosRect)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %ld, %p, %p, %ld, %p, %p.\n", iface, iVerb, lpmsg,
FIXME("(%p)->(%d %p %p %d %p %p)\n", This, iVerb, lpmsg,
pActiveSite, lindex, hwndParent, lprcPosRect); pActiveSite, lindex, hwndParent, lprcPosRect);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1328,24 +1317,21 @@ static HRESULT WINAPI XMLView_OleObject_GetUserClassID(IOleObject *iface, CLSID
static HRESULT WINAPI XMLView_OleObject_GetUserType(IOleObject *iface, static HRESULT WINAPI XMLView_OleObject_GetUserType(IOleObject *iface,
DWORD dwFormOfType, LPOLESTR *pszUserType) DWORD dwFormOfType, LPOLESTR *pszUserType)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %lx, %p.\n", iface, dwFormOfType, pszUserType);
FIXME("(%p)->(%x %p)\n", This, dwFormOfType, pszUserType);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI XMLView_OleObject_SetExtent(IOleObject *iface, static HRESULT WINAPI XMLView_OleObject_SetExtent(IOleObject *iface,
DWORD dwDrawAspect, SIZEL *psizel) DWORD dwDrawAspect, SIZEL *psizel)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %lx, %p.\n", iface, dwDrawAspect, psizel);
FIXME("(%p)->(%x %p)\n", This, dwDrawAspect, psizel);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI XMLView_OleObject_GetExtent(IOleObject *iface, static HRESULT WINAPI XMLView_OleObject_GetExtent(IOleObject *iface,
DWORD dwDrawAspect, SIZEL *psizel) DWORD dwDrawAspect, SIZEL *psizel)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %lx, %p.\n", iface, dwDrawAspect, psizel);
FIXME("(%p)->(%x %p)\n", This, dwDrawAspect, psizel);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1360,8 +1346,7 @@ static HRESULT WINAPI XMLView_OleObject_Advise(IOleObject *iface,
static HRESULT WINAPI XMLView_OleObject_Unadvise( static HRESULT WINAPI XMLView_OleObject_Unadvise(
IOleObject *iface, DWORD dwConnection) IOleObject *iface, DWORD dwConnection)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %ld.\n", iface, dwConnection);
FIXME("(%p)->(%d)\n", This, dwConnection);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1376,8 +1361,7 @@ static HRESULT WINAPI XMLView_OleObject_EnumAdvise(
static HRESULT WINAPI XMLView_OleObject_GetMiscStatus( static HRESULT WINAPI XMLView_OleObject_GetMiscStatus(
IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)
{ {
XMLView *This = impl_from_IOleObject(iface); FIXME("%p, %ld, %p.\n", iface, dwAspect, pdwStatus);
FIXME("(%p)->(%d %p)\n", This, dwAspect, pdwStatus);
return E_NOTIMPL; return E_NOTIMPL;
} }