diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index 6d7296289b0..b3009b103eb 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -6,7 +6,7 @@ MODULE = mshtml.dll
IMPORTLIB = libmshtml.$(IMPLIBEXT)
IMPORTS = urlmon ole32 oleaut32 user32 gdi32 advapi32 kernel32 ntdll
EXTRALIBS = -lstrmiids -luuid
-EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
conpoint.c \
diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c
index 9b820519bf0..9077baf8361 100644
--- a/dlls/mshtml/conpoint.c
+++ b/dlls/mshtml/conpoint.c
@@ -166,7 +166,7 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *
static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie)
{
ConnectionPoint *This = CONPOINT_THIS(iface);
- TRACE("(%p)->(%ld)\n", This, dwCookie);
+ TRACE("(%p)->(%d)\n", This, dwCookie);
if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1].unk)
return CONNECT_E_NOCONNECTION;
diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c
index db8c81e0da6..0e6e35a1e4a 100644
--- a/dlls/mshtml/hlink.c
+++ b/dlls/mshtml/hlink.c
@@ -76,10 +76,10 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L
{
HTMLDocument *This = HLINKTRG_THIS(iface);
- TRACE("(%p)->(%08lx %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation));
+ TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation));
if(grfHLNF)
- FIXME("Unsupported grfHLNF=%08lx\n", grfHLNF);
+ FIXME("Unsupported grfHLNF=%08x\n", grfHLNF);
if(pwzJumpLocation)
FIXME("JumpLocation not supported\n");
@@ -90,7 +90,7 @@ static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLoc
IMoniker **ppimkLocation)
{
HTMLDocument *This = HLINKTRG_THIS(iface);
- FIXME("(%p)->(%s %08lx %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation);
+ FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation);
return E_NOTIMPL;
}
@@ -159,7 +159,7 @@ static ULONG WINAPI Hlink_AddRef(IHlink *iface)
Hlink *This = HLINK_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
@@ -169,7 +169,7 @@ static ULONG WINAPI Hlink_Release(IHlink *iface)
Hlink *This = HLINK_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
if(This->mon)
@@ -184,7 +184,7 @@ static ULONG WINAPI Hlink_Release(IHlink *iface)
static HRESULT WINAPI Hlink_SetHlinkSite(IHlink *iface, IHlinkSite *pihlSite, DWORD dwSiteData)
{
Hlink *This = HLINK_THIS(iface);
- FIXME("(%p)->(%p %ld)\n", This, pihlSite, dwSiteData);
+ FIXME("(%p)->(%p %d)\n", This, pihlSite, dwSiteData);
return E_NOTIMPL;
}
@@ -204,10 +204,10 @@ static HRESULT WINAPI Hlink_SetMonikerReference(IHlink *iface, DWORD grfHLSETF,
{
Hlink *This = HLINK_THIS(iface);
- TRACE("(%p)->(%08lx %p %s)\n", This, grfHLSETF, pimkTarget, debugstr_w(pwzLocation));
+ TRACE("(%p)->(%08x %p %s)\n", This, grfHLSETF, pimkTarget, debugstr_w(pwzLocation));
if(grfHLSETF)
- FIXME("unsupported grfHLSETF=%08lx\n", grfHLSETF);
+ FIXME("unsupported grfHLSETF=%08x\n", grfHLSETF);
if(This->mon)
IMoniker_Release(This->mon);
@@ -234,10 +234,10 @@ static HRESULT WINAPI Hlink_GetMonikerReference(IHlink *iface, DWORD dwWhichRef,
{
Hlink *This = HLINK_THIS(iface);
- TRACE("(%p)->(%ld %p %p)\n", This, dwWhichRef, ppimkTarget, ppwzLocation);
+ TRACE("(%p)->(%d %p %p)\n", This, dwWhichRef, ppimkTarget, ppwzLocation);
if(dwWhichRef != 1)
- FIXME("upsupported dwWhichRef = %ld\n", dwWhichRef);
+ FIXME("upsupported dwWhichRef = %d\n", dwWhichRef);
if(This->mon)
IMoniker_AddRef(This->mon);
@@ -259,7 +259,7 @@ static HRESULT WINAPI Hlink_SetStringReference(IHlink *iface, DWORD grfHLSETF,
LPCWSTR pwzTarget, LPCWSTR pwzLocation)
{
Hlink *This = HLINK_THIS(iface);
- FIXME("(%p)->(%08lx %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget),
+ FIXME("(%p)->(%08x %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget),
debugstr_w(pwzLocation));
return E_NOTIMPL;
}
@@ -268,7 +268,7 @@ static HRESULT WINAPI Hlink_GetStringReference(IHlink *iface, DWORD dwWhichRef,
LPWSTR *ppwzTarget, LPWSTR *ppwzLocation)
{
Hlink *This = HLINK_THIS(iface);
- FIXME("(%p)->(%ld %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation);
+ FIXME("(%p)->(%d %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation);
return E_NOTIMPL;
}
@@ -284,7 +284,7 @@ static HRESULT WINAPI Hlink_GetFriendlyName(IHlink *iface, DWORD grfHLNAMEF,
{
Hlink *This = HLINK_THIS(iface);
- TRACE("(%p)->(%08lx %p)\n", This, grfHLNAMEF, ppwzFriendlyName);
+ TRACE("(%p)->(%08x %p)\n", This, grfHLNAMEF, ppwzFriendlyName);
*ppwzFriendlyName = NULL;
return S_FALSE;
@@ -318,7 +318,7 @@ static HRESULT WINAPI Hlink_Navigate(IHlink *iface, DWORD grfHLNF, LPBC pibc,
IBindStatusCallback *pibsc, IHlinkBrowseContext *pihlbc)
{
Hlink *This = HLINK_THIS(iface);
- FIXME("(%p)->(%08lx %p %p %p)\n", This, grfHLNF, pibc, pibsc, pihlbc);
+ FIXME("(%p)->(%08x %p %p %p)\n", This, grfHLNF, pibc, pibsc, pihlbc);
return E_NOTIMPL;
}
diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c
index ceff7edd2cc..f8be55051e7 100644
--- a/dlls/mshtml/htmlbody.c
+++ b/dlls/mshtml/htmlbody.c
@@ -111,7 +111,7 @@ static HRESULT WINAPI HTMLBodyElement_GetTypeInfo(IHTMLBodyElement *iface, UINT
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLBodyElement *This = HTMLBODY_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -120,7 +120,7 @@ static HRESULT WINAPI HTMLBodyElement_GetIDsOfNames(IHTMLBodyElement *iface, REF
LCID lcid, DISPID *rgDispId)
{
HTMLBodyElement *This = HTMLBODY_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -130,7 +130,7 @@ static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dis
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLBodyElement *This = HTMLBODY_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -446,7 +446,7 @@ void HTMLBodyElement_Create(HTMLElement *element)
nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLBodyElement,
(void**)&ret->nsbody);
if(NS_FAILED(nsres))
- ERR("Could not get nsDOMHTMLBodyElement: %08lx\n", nsres);
+ ERR("Could not get nsDOMHTMLBodyElement: %08x\n", nsres);
element->impl = (IUnknown*)HTMLBODY(ret);
element->destructor = HTMLBodyElement_destructor;
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index c8d68c48b0d..716ec5826ab 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -134,7 +134,7 @@ static ULONG WINAPI HTMLDocument_AddRef(IHTMLDocument2 *iface)
{
HTMLDocument *This = HTMLDOC_THIS(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref = %lu\n", This, ref);
+ TRACE("(%p) ref = %u\n", This, ref);
return ref;
}
@@ -143,7 +143,7 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface)
HTMLDocument *This = HTMLDOC_THIS(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref = %lu\n", This, ref);
+ TRACE("(%p) ref = %u\n", This, ref);
if(!ref) {
remove_doc_tasks(This);
@@ -186,7 +186,7 @@ static HRESULT WINAPI HTMLDocument_GetTypeInfoCount(IHTMLDocument2 *iface, UINT
static HRESULT WINAPI HTMLDocument_GetTypeInfo(IHTMLDocument2 *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo)
{
- FIXME("(%p)->(%u %lu %p)\n", iface, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", iface, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -194,7 +194,7 @@ static HRESULT WINAPI HTMLDocument_GetIDsOfNames(IHTMLDocument2 *iface, REFIID r
LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId)
{
- FIXME("(%p)->(%s %p %u %lu %p)\n", iface, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -203,7 +203,7 @@ static HRESULT WINAPI HTMLDocument_Invoke(IHTMLDocument2 *iface, DISPID dispIdMe
REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams,
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", iface, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -256,7 +256,7 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement
nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc);
if(NS_FAILED(nsres)) {
- ERR("GetDocument failed: %08lx\n", nsres);
+ ERR("GetDocument failed: %08x\n", nsres);
return S_OK;
}
@@ -270,7 +270,7 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement
nsIDOMHTMLDocument_Release(nshtmldoc);
if(NS_FAILED(nsres) || !nsbody) {
- TRACE("Could not get body: %08lx\n", nsres);
+ TRACE("Could not get body: %08x\n", nsres);
return S_OK;
}
diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c
index 73cc24f449d..21ee25761fd 100644
--- a/dlls/mshtml/htmldoc3.c
+++ b/dlls/mshtml/htmldoc3.c
@@ -66,7 +66,7 @@ static HRESULT WINAPI HTMLDocument3_GetTypeInfo(IHTMLDocument3 *iface, UINT iTIn
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLDocument *This = HTMLDOC3_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -75,7 +75,7 @@ static HRESULT WINAPI HTMLDocument3_GetIDsOfNames(IHTMLDocument3 *iface, REFIID
LCID lcid, DISPID *rgDispId)
{
HTMLDocument *This = HTMLDOC3_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -85,7 +85,7 @@ static HRESULT WINAPI HTMLDocument3_Invoke(IHTMLDocument3 *iface, DISPID dispIdM
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLDocument *This = HTMLDOC3_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -128,7 +128,7 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I
nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc);
if(NS_FAILED(nsres))
- ERR("GetDocument failed: %08lx\n", nsres);
+ ERR("GetDocument failed: %08x\n", nsres);
if(nsdoc) {
node = get_node(This, (nsIDOMNode*)nsdoc);
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 48a073a544d..db968e8d8ba 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -105,7 +105,7 @@ static HRESULT WINAPI HTMLElement_GetTypeInfo(IHTMLElement *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLElement *This = HTMLELEM_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -114,7 +114,7 @@ static HRESULT WINAPI HTMLElement_GetIDsOfNames(IHTMLElement *iface, REFIID riid
LCID lcid, DISPID *rgDispId)
{
HTMLElement *This = HTMLELEM_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -124,7 +124,7 @@ static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMembe
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLElement *This = HTMLELEM_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -133,7 +133,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr
VARIANT AttributeValue, LONG lFlags)
{
HTMLElement *This = HTMLELEM_THIS(iface);
- FIXME("(%p)->(%s . %08lx)\n", This, debugstr_w(strAttributeName), lFlags);
+ FIXME("(%p)->(%s . %08x)\n", This, debugstr_w(strAttributeName), lFlags);
return E_NOTIMPL;
}
@@ -147,7 +147,7 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr
nsresult nsres;
HRESULT hres = S_OK;
- WARN("(%p)->(%s %08lx %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue);
+ WARN("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue);
nsAString_Init(&attr_str, strAttributeName);
nsAString_Init(&value_str, NULL);
@@ -161,7 +161,7 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr
V_BSTR(AttributeValue) = SysAllocString(value);
TRACE("attr_value=%s\n", debugstr_w(V_BSTR(AttributeValue)));
}else {
- ERR("GetAttribute failed: %08lx\n", nsres);
+ ERR("GetAttribute failed: %08x\n", nsres);
hres = E_FAIL;
}
@@ -773,7 +773,7 @@ static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *b
nsres = nsIDOMNode_GetChildNodes(elem->node->nsnode, &nsnode_list);
if(NS_FAILED(nsres)) {
- ERR("GetChildNodes failed: %08lx\n", nsres);
+ ERR("GetChildNodes failed: %08x\n", nsres);
return;
}
@@ -784,7 +784,7 @@ static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *b
for(i=0; iref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
@@ -1057,7 +1057,7 @@ static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface)
HTMLElementCollection *This = ELEMCOL_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
IUnknown_Release(This->ref_unk);
@@ -1080,7 +1080,7 @@ static HRESULT WINAPI HTMLElementCollection_GetTypeInfo(IHTMLElementCollection *
UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
{
HTMLElementCollection *This = ELEMCOL_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -1088,7 +1088,7 @@ static HRESULT WINAPI HTMLElementCollection_GetIDsOfNames(IHTMLElementCollection
REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{
HTMLElementCollection *This = ELEMCOL_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -1098,7 +1098,7 @@ static HRESULT WINAPI HTMLElementCollection_Invoke(IHTMLElementCollection *iface
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLElementCollection *This = ELEMCOL_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -1151,7 +1151,7 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface,
if(V_VT(&name) != VT_I4 || V_I4(&name) != V_I4(&index))
FIXME("Unsupproted name vt=%d\n", V_VT(&name));
- TRACE("(%p)->(%ld %ld %p)\n", This, V_I4(&name), V_I4(&index), pdisp);
+ TRACE("(%p)->(%d %d %p)\n", This, V_I4(&name), V_I4(&index), pdisp);
if(V_I4(&index) < 0 || V_I4(&index) >= This->len)
return E_INVALIDARG;
@@ -1195,7 +1195,7 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface,
nsAString_Finish(&tag_str);
- TRACE("fount %ld tags\n", buf.len);
+ TRACE("fount %d tags\n", buf.len);
if(!buf.len) {
mshtml_free(buf.buf);
@@ -1238,7 +1238,7 @@ static HRESULT HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **ele
IUnknown_AddRef(ref_unk);
ret->ref_unk = ref_unk;
- TRACE("ret=%p len=%ld\n", ret, len);
+ TRACE("ret=%p len=%d\n", ret, len);
*p = (IDispatch*)ret;
return S_OK;
diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c
index b830e8dfaca..5b25086f46a 100644
--- a/dlls/mshtml/htmlelem2.c
+++ b/dlls/mshtml/htmlelem2.c
@@ -68,7 +68,7 @@ static HRESULT WINAPI HTMLElement2_GetTypeInfo(IHTMLElement2 *iface, UINT iTInfo
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLElement *This = HTMLELEM2_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -77,7 +77,7 @@ static HRESULT WINAPI HTMLElement2_GetIDsOfNames(IHTMLElement2 *iface, REFIID ri
LCID lcid, DISPID *rgDispId)
{
HTMLElement *This = HTMLELEM2_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -87,7 +87,7 @@ static HRESULT WINAPI HTMLElement2_Invoke(IHTMLElement2 *iface, DISPID dispIdMem
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLElement *This = HTMLELEM2_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index 531288ac606..6970ef5d6ee 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -106,7 +106,7 @@ static HRESULT WINAPI HTMLInputElement_GetTypeInfo(IHTMLInputElement *iface, UIN
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLInputElement *This = HTMLINPUT_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -115,7 +115,7 @@ static HRESULT WINAPI HTMLInputElement_GetIDsOfNames(IHTMLInputElement *iface, R
LCID lcid, DISPID *rgDispId)
{
HTMLInputElement *This = HTMLINPUT_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -125,7 +125,7 @@ static HRESULT WINAPI HTMLInputElement_Invoke(IHTMLInputElement *iface, DISPID d
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLInputElement *This = HTMLINPUT_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -153,7 +153,7 @@ static HRESULT WINAPI HTMLInputElement_get_type(IHTMLInputElement *iface, BSTR *
nsAString_GetData(&type_str, &type, NULL);
*p = SysAllocString(type);
}else {
- ERR("GetType failed: %08lx\n", nsres);
+ ERR("GetType failed: %08x\n", nsres);
}
nsAString_Finish(&type_str);
@@ -185,7 +185,7 @@ static HRESULT WINAPI HTMLInputElement_get_value(IHTMLInputElement *iface, BSTR
nsAString_GetData(&value_str, &value, NULL);
*p = SysAllocString(value);
}else {
- ERR("GetValue failed: %08lx\n", nsres);
+ ERR("GetValue failed: %08x\n", nsres);
}
nsAString_Finish(&value_str);
@@ -217,7 +217,7 @@ static HRESULT WINAPI HTMLInputElement_get_name(IHTMLInputElement *iface, BSTR *
nsAString_GetData(&name_str, &name, NULL);
*p = SysAllocString(name);
}else {
- ERR("GetName failed: %08lx\n", nsres);
+ ERR("GetName failed: %08x\n", nsres);
return E_FAIL;
}
@@ -405,7 +405,7 @@ static HRESULT WINAPI HTMLInputElement_get_checked(IHTMLInputElement *iface, VAR
nsres = nsIDOMHTMLInputElement_GetChecked(This->nsinput, &checked);
if(NS_FAILED(nsres)) {
- ERR("GetChecked failed: %08lx\n", nsres);
+ ERR("GetChecked failed: %08x\n", nsres);
return E_FAIL;
}
@@ -748,7 +748,7 @@ void HTMLInputElement_Create(HTMLElement *element)
nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLInputElement,
(void**)&ret->nsinput);
if(NS_FAILED(nsres))
- ERR("Could not get nsIDOMHTMLInputElement interface: %08lx\n", nsres);
+ ERR("Could not get nsIDOMHTMLInputElement interface: %08x\n", nsres);
element->impl = (IUnknown*)HTMLINPUT(ret);
element->destructor = HTMLInputElement_destructor;
diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c
index 513d99b326e..d552e1c9462 100644
--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@@ -88,7 +88,7 @@ static HRESULT WINAPI HTMLDOMNode_GetTypeInfo(IHTMLDOMNode *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLDOMNode *This = HTMLDOMNODE_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -97,7 +97,7 @@ static HRESULT WINAPI HTMLDOMNode_GetIDsOfNames(IHTMLDOMNode *iface, REFIID riid
LCID lcid, DISPID *rgDispId)
{
HTMLDOMNode *This = HTMLDOMNODE_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -107,7 +107,7 @@ static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMembe
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLDOMNode *This = HTMLDOMNODE_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c
index 607cc4141d6..6a23c4fec2f 100644
--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@@ -106,7 +106,7 @@ static HRESULT WINAPI HTMLSelectElement_GetTypeInfo(IHTMLSelectElement *iface, U
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLSelectElement *This = HTMLSELECT_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -115,7 +115,7 @@ static HRESULT WINAPI HTMLSelectElement_GetIDsOfNames(IHTMLSelectElement *iface,
LCID lcid, DISPID *rgDispId)
{
HTMLSelectElement *This = HTMLSELECT_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -125,7 +125,7 @@ static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLSelectElement *This = HTMLSELECT_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -181,7 +181,7 @@ static HRESULT WINAPI HTMLSelectElement_get_name(IHTMLSelectElement *iface, BSTR
nsAString_GetData(&name_str, &name, NULL);
*p = SysAllocString(name);
}else {
- ERR("GetName failed: %08lx\n", nsres);
+ ERR("GetName failed: %08x\n", nsres);
}
nsAString_Finish(&name_str);
@@ -255,7 +255,7 @@ static HRESULT WINAPI HTMLSelectElement_get_value(IHTMLSelectElement *iface, BST
nsAString_GetData(&value_str, &value, NULL);
*p = SysAllocString(value);
}else {
- ERR("GetValue failed: %08lx\n", nsres);
+ ERR("GetValue failed: %08x\n", nsres);
}
nsAString_Finish(&value_str);
@@ -390,7 +390,7 @@ void HTMLSelectElement_Create(HTMLElement *element)
nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLSelectElement,
(void**)&ret->nsselect);
if(NS_FAILED(nsres))
- ERR("Could not get nsIDOMHTMLSelectElement interfce: %08lx\n", nsres);
+ ERR("Could not get nsIDOMHTMLSelectElement interfce: %08x\n", nsres);
element->impl = (IUnknown*)HTMLSELECT(ret);
element->destructor = HTMLSelectElement_destructor;
diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c
index 26d1061c237..16e9ddfffed 100644
--- a/dlls/mshtml/htmltextarea.c
+++ b/dlls/mshtml/htmltextarea.c
@@ -106,7 +106,7 @@ static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfo(IHTMLTextAreaElement *ifac
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -115,7 +115,7 @@ static HRESULT WINAPI HTMLTextAreaElement_GetIDsOfNames(IHTMLTextAreaElement *if
LCID lcid, DISPID *rgDispId)
{
HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -125,7 +125,7 @@ static HRESULT WINAPI HTMLTextAreaElement_Invoke(IHTMLTextAreaElement *iface, DI
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -160,7 +160,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_value(IHTMLTextAreaElement *iface,
nsAString_GetData(&value_str, &value, NULL);
*p = SysAllocString(value);
}else {
- ERR("GetValue failed: %08lx\n", nsres);
+ ERR("GetValue failed: %08x\n", nsres);
}
nsAString_Finish(&value_str);
@@ -192,7 +192,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_name(IHTMLTextAreaElement *iface,
nsAString_GetData(&name_str, &name, NULL);
*p = SysAllocString(name);
}else {
- ERR("GetName failed: %08lx\n", nsres);
+ ERR("GetName failed: %08x\n", nsres);
}
nsAString_Finish(&name_str);
@@ -406,7 +406,7 @@ void HTMLTextAreaElement_Create(HTMLElement *element)
nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLTextAreaElement,
(void**)&ret->nstextarea);
if(NS_FAILED(nsres))
- ERR("Could not get nsDOMHTMLInputElement: %08lx\n", nsres);
+ ERR("Could not get nsDOMHTMLInputElement: %08x\n", nsres);
element->impl = (IUnknown*)HTMLTXTAREA(ret);
element->destructor = HTMLTextAreaElement_destructor;
diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c
index 2634ac8e4a6..42f0805063e 100644
--- a/dlls/mshtml/htmltextcont.c
+++ b/dlls/mshtml/htmltextcont.c
@@ -66,7 +66,7 @@ static HRESULT WINAPI HTMLTextContainer_GetTypeInfo(IHTMLTextContainer *iface, U
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -75,7 +75,7 @@ static HRESULT WINAPI HTMLTextContainer_GetIDsOfNames(IHTMLTextContainer *iface,
LCID lcid, DISPID *rgDispId)
{
HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -85,7 +85,7 @@ static HRESULT WINAPI HTMLTextContainer_Invoke(IHTMLTextContainer *iface, DISPID
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -126,7 +126,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface,
nsIDOMNSHTMLElement_SetScrollTop(nselem, v);
nsIDOMNSHTMLElement_Release(nselem);
}else {
- ERR("Could not get nsIDOMNSHTMLElement interface: %08lx\n", nsres);
+ ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres);
}
return S_OK;
@@ -153,7 +153,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface
nsIDOMNSHTMLElement_SetScrollLeft(nselem, v);
nsIDOMNSHTMLElement_Release(nselem);
}else {
- ERR("Could not get nsIDOMNSHTMLElement interface: %08lx\n", nsres);
+ ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres);
}
return S_OK;
diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c
index 0874565455f..5e2b557ae38 100644
--- a/dlls/mshtml/install.c
+++ b/dlls/mshtml/install.c
@@ -89,7 +89,7 @@ static void set_registry(LPCSTR install_dir)
/* @@ Wine registry key: HKCU\Software\Wine\MSHTML */
res = RegOpenKeyW(HKEY_CURRENT_USER, wszMshtmlKey, &hkey);
if(res != ERROR_SUCCESS) {
- ERR("Faild to open MSHTML key: %ld\n", res);
+ ERR("Faild to open MSHTML key: %d\n", res);
return;
}
@@ -108,7 +108,7 @@ static void set_registry(LPCSTR install_dir)
mshtml_free(gecko_path);
RegCloseKey(hkey);
if(res != ERROR_SUCCESS)
- ERR("Failed to set GeckoPath value: %08lx\n", res);
+ ERR("Failed to set GeckoPath value: %08x\n", res);
}
static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface,
@@ -150,7 +150,7 @@ static HRESULT WINAPI InstallCallback_OnStartBinding(IBindStatusCallback *iface,
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if(tmp_file == INVALID_HANDLE_VALUE) {
- ERR("Could not create file: %ld\n", GetLastError());
+ ERR("Could not create file: %d\n", GetLastError());
clean_up();
return E_FAIL;
}
@@ -196,7 +196,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface,
static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
if(FAILED(hresult)) {
- ERR("Binding failed %08lx\n", hresult);
+ ERR("Binding failed %08x\n", hresult);
clean_up();
return S_OK;
}
@@ -220,7 +220,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface,
FreeLibrary(advpack);
mshtml_free(file_name);
if(FAILED(hres)) {
- ERR("Could not extract package: %08lx\n", hres);
+ ERR("Could not extract package: %08x\n", hres);
clean_up();
}
@@ -324,7 +324,7 @@ static DWORD WINAPI download_proc(PVOID arg)
hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&str);
IBindCtx_Release(bctx);
if(FAILED(hres)) {
- ERR("BindToStorage failed: %08lx\n", hres);
+ ERR("BindToStorage failed: %08x\n", hres);
return 0;
}
diff --git a/dlls/mshtml/loadopts.c b/dlls/mshtml/loadopts.c
index 54c294e6505..646394ef981 100644
--- a/dlls/mshtml/loadopts.c
+++ b/dlls/mshtml/loadopts.c
@@ -87,7 +87,7 @@ static ULONG WINAPI HtmlLoadOptions_AddRef(IHtmlLoadOptions *iface)
HTMLLoadOptions *This = LOADOPTS_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
@@ -97,7 +97,7 @@ static ULONG WINAPI HtmlLoadOptions_Release(IHtmlLoadOptions *iface)
HTMLLoadOptions *This = LOADOPTS_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
load_opt *iter = This->opts, *last;
@@ -122,7 +122,7 @@ static HRESULT WINAPI HtmlLoadOptions_QueryOption(IHtmlLoadOptions *iface, DWORD
HTMLLoadOptions *This = LOADOPTS_THIS(iface);
load_opt *iter;
- TRACE("(%p)->(%ld %p %p)\n", This, dwOption, pBuffer, pcbBuf);
+ TRACE("(%p)->(%d %p %p)\n", This, dwOption, pBuffer, pcbBuf);
for(iter = This->opts; iter; iter = iter->next) {
if(iter->option == dwOption)
@@ -151,7 +151,7 @@ static HRESULT WINAPI HtmlLoadOptions_SetOption(IHtmlLoadOptions *iface, DWORD d
HTMLLoadOptions *This = LOADOPTS_THIS(iface);
load_opt *iter = NULL;
- TRACE("(%p)->(%ld %p %ld)\n", This, dwOption, pBuffer, cbBuf);
+ TRACE("(%p)->(%d %p %d)\n", This, dwOption, pBuffer, cbBuf);
for(iter = This->opts; iter; iter = iter->next) {
if(iter->option == dwOption)
diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index d49a8d25762..e7018732a66 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -107,7 +107,7 @@ static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
{
ClassFactory *This = (ClassFactory*)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref = %lu\n", This, ref);
+ TRACE("(%p) ref = %u\n", This, ref);
return ref;
}
@@ -116,7 +116,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
ClassFactory *This = (ClassFactory*)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref = %lu\n", This, ref);
+ TRACE("(%p) ref = %u\n", This, ref);
if(!ref) {
mshtml_free(This);
@@ -209,7 +209,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllCanUnloadNow(void)
{
- TRACE("() ref=%ld\n", module_ref);
+ TRACE("() ref=%d\n", module_ref);
return module_ref ? S_FALSE : S_OK;
}
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 1f7c560899e..3706f2f582f 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -71,7 +71,7 @@ static nsrefcnt NSAPI nsInputStream_AddRef(nsIInputStream *iface)
nsProtocolStream *This = NSINSTREAM_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
@@ -82,7 +82,7 @@ static nsrefcnt NSAPI nsInputStream_Release(nsIInputStream *iface)
nsProtocolStream *This = NSINSTREAM_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
if(!ref)
mshtml_free(This);
@@ -109,7 +109,7 @@ static nsresult NSAPI nsInputStream_Read(nsIInputStream *iface, char *aBuf, PRUi
{
nsProtocolStream *This = NSINSTREAM_THIS(iface);
- TRACE("(%p)->(%p %ld %p)\n", This, aBuf, aCount, _retval);
+ TRACE("(%p)->(%p %d %p)\n", This, aBuf, aCount, _retval);
/* Gecko always calls Read with big enough buffer */
if(aCount < This->buf_size)
@@ -131,7 +131,7 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface,
PRUint32 written = 0;
nsresult nsres;
- TRACE("(%p)->(%p %p %ld %p)\n", This, aWriter, aClousure, aCount, _retval);
+ TRACE("(%p)->(%p %p %d %p)\n", This, aWriter, aClousure, aCount, _retval);
if(!This->buf_size)
return S_OK;
@@ -141,7 +141,7 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface,
nsres = aWriter(NSINSTREAM(This), aClousure, This->buf, 0, This->buf_size, &written);
if(NS_FAILED(nsres))
- FIXME("aWritter failed: %08lx\n", nsres);
+ FIXME("aWritter failed: %08x\n", nsres);
if(written != This->buf_size)
FIXME("written != buf_size\n");
@@ -223,7 +223,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
BSCallback *This = STATUSCLB_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref = %ld\n", This, ref);
+ TRACE("(%p) ref = %d\n", This, ref);
return ref;
}
@@ -233,7 +233,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
BSCallback *This = STATUSCLB_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref = %ld\n", This, ref);
+ TRACE("(%p) ref = %d\n", This, ref);
if(!ref) {
if(This->post_data)
@@ -262,7 +262,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
{
BSCallback *This = STATUSCLB_THIS(iface);
- TRACE("(%p)->(%ld %p)\n", This, dwReserved, pbind);
+ TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind);
IBinding_AddRef(pbind);
This->binding = pbind;
@@ -280,7 +280,7 @@ static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface,
static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved)
{
BSCallback *This = STATUSCLB_THIS(iface);
- FIXME("(%p)->(%ld)\n", This, reserved);
+ FIXME("(%p)->(%d)\n", This, reserved);
return E_NOTIMPL;
}
@@ -289,7 +289,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface,
{
BSCallback *This = STATUSCLB_THIS(iface);
- TRACE("%p)->(%lu %lu %lu %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
+ TRACE("%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
debugstr_w(szStatusText));
switch(ulStatusCode) {
@@ -314,7 +314,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
{
BSCallback *This = STATUSCLB_THIS(iface);
- TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError));
+ TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));
IBinding_Release(This->binding);
This->binding = NULL;
@@ -329,7 +329,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group,
(nsIRequest*)NSCHANNEL(This->nschannel), NULL, NS_OK);
if(NS_FAILED(nsres))
- ERR("RemoveRequest failed: %08lx\n", nsres);
+ ERR("RemoveRequest failed: %08x\n", nsres);
}
}
@@ -387,7 +387,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
nsresult nsres;
HRESULT hres;
- TRACE("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
+ TRACE("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
if(This->nslistener) {
if(!This->nsstream) {
@@ -396,7 +396,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
nsres = nsIStreamListener_OnStartRequest(This->nslistener,
(nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext);
if(NS_FAILED(nsres))
- FIXME("OnStartRequest failed: %08lx\n", nsres);
+ FIXME("OnStartRequest failed: %08x\n", nsres);
}
do {
@@ -409,7 +409,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
(nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext,
NSINSTREAM(This->nsstream), This->readed, This->nsstream->buf_size);
if(NS_FAILED(nsres))
- FIXME("OnDataAvailable failed: %08lx\n", nsres);
+ FIXME("OnDataAvailable failed: %08x\n", nsres);
if(This->nsstream->buf_size)
FIXME("buffer is not empty!\n");
@@ -472,7 +472,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface,
BSCallback *This = HTTPNEG_THIS(iface);
DWORD size;
- TRACE("(%p)->(%s %s %ld %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders),
+ TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders),
dwReserved, pszAdditionalHeaders);
if(!This->headers) {
@@ -491,7 +491,7 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwR
LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPWSTR *pszAdditionalRequestHeaders)
{
BSCallback *This = HTTPNEG_THIS(iface);
- FIXME("(%p)->(%ld %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders),
+ FIXME("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders),
debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders);
return E_NOTIMPL;
}
@@ -548,7 +548,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface,
ULONG ulStringType, LPOLESTR *ppwzStr, ULONG cEl, ULONG *pcElFetched)
{
BSCallback *This = BINDINFO_THIS(iface);
- FIXME("(%p)->(%lu %p %lu %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched);
+ FIXME("(%p)->(%u %p %u %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched);
return E_NOTIMPL;
}
@@ -742,14 +742,14 @@ HRESULT start_binding(BSCallback *bscallback)
hres = CreateAsyncBindCtx(0, STATUSCLB(bscallback), NULL, &bctx);
if(FAILED(hres)) {
- WARN("CreateAsyncBindCtx failed: %08lx\n", hres);
+ WARN("CreateAsyncBindCtx failed: %08x\n", hres);
return hres;
}
hres = IMoniker_BindToStorage(bscallback->mon, bctx, NULL, &IID_IStream, (void**)&str);
IBindCtx_Release(bctx);
if(FAILED(hres)) {
- WARN("BindToStorage failed: %08lx\n", hres);
+ WARN("BindToStorage failed: %08x\n", hres);
return hres;
}
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 393e1d91378..5654148c592 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -98,7 +98,7 @@ static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
nsres = nsIBaseWindow_SetSize(This->window,
LOWORD(lParam), HIWORD(lParam), TRUE);
if(NS_FAILED(nsres))
- WARN("SetSize failed: %08lx\n", nsres);
+ WARN("SetSize failed: %08x\n", nsres);
}
return DefWindowProcW(hwnd, msg, wParam, lParam);
@@ -138,7 +138,7 @@ static BOOL load_xpcom(PRUnichar *gre_path)
hXPCOM = LoadLibraryW(strXPCOM);
if(!hXPCOM) {
- WARN("Could not load XPCOM: %ld\n", GetLastError());
+ WARN("Could not load XPCOM: %d\n", GetLastError());
return FALSE;
}
@@ -273,7 +273,7 @@ static void set_profile(void)
nsres = nsIServiceManager_GetServiceByContactID(pServMgr, NS_PROFILE_CONTRACTID,
&IID_nsIProfile, (void**)&profile);
if(NS_FAILED(nsres)) {
- ERR("Could not get profile service: %08lx\n", nsres);
+ ERR("Could not get profile service: %08x\n", nsres);
return;
}
@@ -281,12 +281,12 @@ static void set_profile(void)
if(!exists) {
nsres = nsIProfile_CreateNewProfile(profile, wszMSHTML, NULL, NULL, FALSE);
if(NS_FAILED(nsres))
- ERR("CreateNewProfile failed: %08lx\n", nsres);
+ ERR("CreateNewProfile failed: %08x\n", nsres);
}
nsres = nsIProfile_SetCurrentProfile(profile, wszMSHTML);
if(NS_FAILED(nsres))
- ERR("SetCurrentProfile failed: %08lx\n", nsres);
+ ERR("SetCurrentProfile failed: %08x\n", nsres);
nsIProfile_Release(profile);
}
@@ -320,35 +320,35 @@ static BOOL load_gecko(void)
nsres = NS_NewLocalFile(&path, FALSE, &gre_dir);
nsAString_Finish(&path);
if(NS_FAILED(nsres)) {
- ERR("NS_NewLocalFile failed: %08lx\n", nsres);
+ ERR("NS_NewLocalFile failed: %08x\n", nsres);
FreeLibrary(hXPCOM);
return FALSE;
}
nsres = NS_InitXPCOM2(&pServMgr, gre_dir, NULL);
if(NS_FAILED(nsres)) {
- ERR("NS_InitXPCOM2 failed: %08lx\n", nsres);
+ ERR("NS_InitXPCOM2 failed: %08x\n", nsres);
FreeLibrary(hXPCOM);
return FALSE;
}
nsres = nsIServiceManager_QueryInterface(pServMgr, &IID_nsIComponentManager, (void**)&pCompMgr);
if(NS_FAILED(nsres))
- ERR("Could not get nsIComponentManager: %08lx\n", nsres);
+ ERR("Could not get nsIComponentManager: %08x\n", nsres);
nsres = NS_GetComponentRegistrar(®istrar);
if(NS_SUCCEEDED(nsres)) {
nsres = nsIComponentRegistrar_AutoRegister(registrar, NULL);
if(NS_FAILED(nsres))
- ERR("AutoRegister(NULL) failed: %08lx\n", nsres);
+ ERR("AutoRegister(NULL) failed: %08x\n", nsres);
nsres = nsIComponentRegistrar_AutoRegister(registrar, gre_dir);
if(NS_FAILED(nsres))
- ERR("AutoRegister(gre_dir) failed: %08lx\n", nsres);
+ ERR("AutoRegister(gre_dir) failed: %08x\n", nsres);
init_nsio(pCompMgr, registrar);
}else {
- ERR("NS_GetComponentRegistrar failed: %08lx\n", nsres);
+ ERR("NS_GetComponentRegistrar failed: %08x\n", nsres);
}
nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_APPSTARTUPNOTIFIER_CONTRACTID,
@@ -356,11 +356,11 @@ static BOOL load_gecko(void)
if(NS_SUCCEEDED(nsres)) {
nsres = nsIObserver_Observe(pStartNotif, NULL, APPSTARTUP_TOPIC, NULL);
if(NS_FAILED(nsres))
- ERR("Observe failed: %08lx\n", nsres);
+ ERR("Observe failed: %08x\n", nsres);
nsIObserver_Release(pStartNotif);
}else {
- ERR("could not get appstartup-notifier: %08lx\n", nsres);
+ ERR("could not get appstartup-notifier: %08x\n", nsres);
}
set_profile();
@@ -368,7 +368,7 @@ static BOOL load_gecko(void)
nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_MEMORY_CONTRACTID,
NULL, &IID_nsIMemory, (void**)&nsmem);
if(NS_FAILED(nsres))
- ERR("Could not get nsIMemory: %08lx\n", nsres);
+ ERR("Could not get nsIMemory: %08x\n", nsres);
if(registrar) {
register_nsservice(registrar, pServMgr);
@@ -440,7 +440,7 @@ nsIInputStream *create_nsstream(const char *data, PRInt32 data_len)
nsres = nsIStringInputStream_SetData(ret, data, data_len);
if(NS_FAILED(nsres)) {
- ERR("AdoptData failed: %08lx\n", nsres);
+ ERR("AdoptData failed: %08x\n", nsres);
nsIStringInputStream_Release(ret);
return NULL;
}
@@ -476,7 +476,7 @@ static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode
nsres = nsIDOMNode_GetNodeType(nsnode, &type);
if(NS_FAILED(nsres)) {
- ERR("GetType failed: %08lx\n", nsres);
+ ERR("GetType failed: %08x\n", nsres);
return;
}
@@ -518,7 +518,7 @@ static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode
nsnode_to_nsstring_rec(serializer, child_node, str);
nsIDOMNode_Release(child_node);
}else {
- ERR("Item failed: %08lx\n", nsres);
+ ERR("Item failed: %08x\n", nsres);
}
}
@@ -543,13 +543,13 @@ void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str)
NS_HTMLSERIALIZER_CONTRACTID, NULL, &IID_nsIContentSerializer,
(void**)&serializer);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsIContentSerializer: %08lx\n", nsres);
+ ERR("Could not get nsIContentSerializer: %08x\n", nsres);
return;
}
nsres = nsIContentSerializer_Init(serializer, 0, 100, NULL, FALSE);
if(NS_FAILED(nsres))
- ERR("Init failed: %08lx\n", nsres);
+ ERR("Init failed: %08x\n", nsres);
nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode);
nsnode_to_nsstring_rec(serializer, nsnode, str);
@@ -557,7 +557,7 @@ void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str)
nsres = nsIContentSerializer_Flush(serializer, str);
if(NS_FAILED(nsres))
- ERR("Flush failed: %08lx\n", nsres);
+ ERR("Flush failed: %08x\n", nsres);
nsIContentSerializer_Release(serializer);
}
@@ -634,7 +634,7 @@ static nsrefcnt NSAPI nsWebBrowserChrome_AddRef(nsIWebBrowserChrome *iface)
NSContainer *This = NSWBCHROME_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
@@ -644,7 +644,7 @@ static nsrefcnt NSAPI nsWebBrowserChrome_Release(nsIWebBrowserChrome *iface)
NSContainer *This = NSWBCHROME_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
if(This->parent)
@@ -659,7 +659,7 @@ static nsresult NSAPI nsWebBrowserChrome_SetStatus(nsIWebBrowserChrome *iface,
PRUint32 statusType, const PRUnichar *status)
{
NSContainer *This = NSWBCHROME_THIS(iface);
- TRACE("(%p)->(%ld %s)\n", This, statusType, debugstr_w(status));
+ TRACE("(%p)->(%d %s)\n", This, statusType, debugstr_w(status));
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -704,7 +704,7 @@ static nsresult NSAPI nsWebBrowserChrome_SetChromeFlags(nsIWebBrowserChrome *ifa
PRUint32 aChromeFlags)
{
NSContainer *This = NSWBCHROME_THIS(iface);
- WARN("(%p)->(%08lx)\n", This, aChromeFlags);
+ WARN("(%p)->(%08x)\n", This, aChromeFlags);
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -719,7 +719,7 @@ static nsresult NSAPI nsWebBrowserChrome_SizeBrowserTo(nsIWebBrowserChrome *ifac
PRInt32 aCX, PRInt32 aCY)
{
NSContainer *This = NSWBCHROME_THIS(iface);
- WARN("(%p)->(%ld %ld)\n", This, aCX, aCY);
+ WARN("(%p)->(%d %d)\n", This, aCX, aCY);
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -741,7 +741,7 @@ static nsresult NSAPI nsWebBrowserChrome_ExitModalEventLoop(nsIWebBrowserChrome
nsresult aStatus)
{
NSContainer *This = NSWBCHROME_THIS(iface);
- WARN("(%p)->(%08lx)\n", This, aStatus);
+ WARN("(%p)->(%08x)\n", This, aStatus);
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -797,11 +797,11 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList
DWORD dwID = CONTEXT_MENU_DEFAULT;
nsresult nsres;
- TRACE("(%p)->(%08lx %p %p)\n", This, aContextFlags, aEvent, aNode);
+ TRACE("(%p)->(%08x %p %p)\n", This, aContextFlags, aEvent, aNode);
nsres = nsIDOMEvent_QueryInterface(aEvent, &IID_nsIDOMMouseEvent, (void**)&event);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsIDOMMouseEvent interface: %08lx\n", nsres);
+ ERR("Could not get nsIDOMMouseEvent interface: %08x\n", nsres);
return nsres;
}
@@ -826,7 +826,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList
dwID = CONTEXT_MENU_CONTROL;
break;
default:
- FIXME("aContextFlags=%08lx\n", aContextFlags);
+ FIXME("aContextFlags=%08x\n", aContextFlags);
};
HTMLDocument_ShowContextMenu(This->doc, dwID, &pt);
@@ -887,7 +887,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri);
if(NS_FAILED(nsres)) {
- WARN("Could not get nsIWineURI interface: %08lx\n", nsres);
+ WARN("Could not get nsIWineURI interface: %08x\n", nsres);
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -906,10 +906,10 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
nsIWineURI_SetMoniker(wine_uri, mon);
IMoniker_Release(mon);
}else {
- WARN("CreateURLMoniker failed: %08lx\n", hres);
+ WARN("CreateURLMoniker failed: %08x\n", hres);
}
}else {
- WARN("GetDisplayName failed: %08lx\n", hres);
+ WARN("GetDisplayName failed: %08x\n", hres);
}
}
@@ -1070,7 +1070,7 @@ static nsresult NSAPI nsEmbeddingSiteWindow_SetDimensions(nsIEmbeddingSiteWindow
PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy)
{
NSContainer *This = NSEMBWNDS_THIS(iface);
- WARN("(%p)->(%08lx %ld %ld %ld %ld)\n", This, flags, x, y, cx, cy);
+ WARN("(%p)->(%08x %d %d %d %d)\n", This, flags, x, y, cx, cy);
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -1078,7 +1078,7 @@ static nsresult NSAPI nsEmbeddingSiteWindow_GetDimensions(nsIEmbeddingSiteWindow
PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy)
{
NSContainer *This = NSEMBWNDS_THIS(iface);
- WARN("(%p)->(%08lx %p %p %p %p)\n", This, flags, x, y, cx, cy);
+ WARN("(%p)->(%08x %p %p %p %p)\n", This, flags, x, y, cx, cy);
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -1352,16 +1352,16 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent)
nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_WEBBROWSER_CONTRACTID,
NULL, &IID_nsIWebBrowser, (void**)&ret->webbrowser);
if(NS_FAILED(nsres))
- ERR("Creating WebBrowser failed: %08lx\n", nsres);
+ ERR("Creating WebBrowser failed: %08x\n", nsres);
nsres = nsIWebBrowser_SetContainerWindow(ret->webbrowser, NSWBCHROME(ret));
if(NS_FAILED(nsres))
- ERR("SetContainerWindow failed: %08lx\n", nsres);
+ ERR("SetContainerWindow failed: %08x\n", nsres);
nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIBaseWindow,
(void**)&ret->window);
if(NS_FAILED(nsres))
- ERR("Could not get nsIBaseWindow interface: %08lx\n", nsres);
+ ERR("Could not get nsIBaseWindow interface: %08x\n", nsres);
nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIWebBrowserSetup,
(void**)&wbsetup);
@@ -1369,7 +1369,7 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent)
nsres = nsIWebBrowserSetup_SetProperty(wbsetup, SETUP_IS_CHROME_WRAPPER, TRUE);
nsIWebBrowserSetup_Release(wbsetup);
if(NS_FAILED(nsres))
- ERR("SetProperty(SETUP_IS_CHROME_WRAPPER) failed: %08lx\n", nsres);
+ ERR("SetProperty(SETUP_IS_CHROME_WRAPPER) failed: %08x\n", nsres);
}else {
ERR("Could not get nsIWebBrowserSetup interface\n");
}
@@ -1377,12 +1377,12 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent)
nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIWebNavigation,
(void**)&ret->navigation);
if(NS_FAILED(nsres))
- ERR("Could not get nsIWebNavigation interface: %08lx\n", nsres);
+ ERR("Could not get nsIWebNavigation interface: %08x\n", nsres);
nsres = nsIWebBrowserFocus_QueryInterface(ret->webbrowser, &IID_nsIWebBrowserFocus,
(void**)&ret->focus);
if(NS_FAILED(nsres))
- ERR("Could not get nsIWebBrowserFocus interface: %08lx\n", nsres);
+ ERR("Could not get nsIWebBrowserFocus interface: %08x\n", nsres);
if(!nscontainer_class)
register_nscontainer_class();
@@ -1395,17 +1395,17 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent)
if(NS_SUCCEEDED(nsres)) {
nsres = nsIBaseWindow_Create(ret->window);
if(NS_FAILED(nsres))
- WARN("Creating window failed: %08lx\n", nsres);
+ WARN("Creating window failed: %08x\n", nsres);
nsIBaseWindow_SetVisibility(ret->window, FALSE);
nsIBaseWindow_SetEnabled(ret->window, FALSE);
}else {
- ERR("InitWindow failed: %08lx\n", nsres);
+ ERR("InitWindow failed: %08x\n", nsres);
}
nsres = nsIWebBrowser_SetParentURIContentListener(ret->webbrowser, NSURICL(ret));
if(NS_FAILED(nsres))
- ERR("SetParentURIContentListener failed: %08lx\n", nsres);
+ ERR("SetParentURIContentListener failed: %08x\n", nsres);
return ret;
}
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 24a70b5ad3c..2b710e40fbe 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -191,7 +191,7 @@ static nsrefcnt NSAPI nsChannel_AddRef(nsIHttpChannel *iface)
nsChannel *This = NSCHANNEL_THIS(iface);
nsrefcnt ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
@@ -265,7 +265,7 @@ static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus)
{
nsChannel *This = NSCHANNEL_THIS(iface);
- TRACE("(%p)->(%08lx)\n", This, aStatus);
+ TRACE("(%p)->(%08x)\n", This, aStatus);
if(This->channel)
return nsIChannel_Cancel(This->channel, aStatus);
@@ -345,7 +345,7 @@ static nsresult NSAPI nsChannel_SetLoadFlags(nsIHttpChannel *iface, nsLoadFlags
{
nsChannel *This = NSCHANNEL_THIS(iface);
- TRACE("(%p)->(%08lx)\n", This, aLoadFlags);
+ TRACE("(%p)->(%08x)\n", This, aLoadFlags);
This->load_flags = aLoadFlags;
@@ -546,7 +546,7 @@ static nsresult NSAPI nsChannel_SetContentLength(nsIHttpChannel *iface, PRInt32
{
nsChannel *This = NSCHANNEL_THIS(iface);
- TRACE("(%p)->(%ld)\n", This, aContentLength);
+ TRACE("(%p)->(%d)\n", This, aContentLength);
if(This->channel)
return nsIChannel_SetContentLength(This->channel, aContentLength);
@@ -608,7 +608,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
(nsIRequest*)NSCHANNEL(This), NULL);
if(NS_FAILED(nsres))
- ERR("AddRequest failed:%08lx\n", nsres);
+ ERR("AddRequest failed:%08x\n", nsres);
}
return WINE_NS_LOAD_FROM_MONIKER;
@@ -638,7 +638,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
&empty_string, -1);
nsIUploadChannel_Release(upload_channel);
if(NS_FAILED(nsres))
- WARN("SetUploadStream failed: %08lx\n", nsres);
+ WARN("SetUploadStream failed: %08x\n", nsres);
nsACString_Finish(&empty_string);
}
@@ -656,7 +656,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
nsres = nsIURI_QueryInterface(This->original_uri, &IID_nsIWineURI, (void**)&wine_uri);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsIWineURI: %08lx\n", nsres);
+ ERR("Could not get nsIWineURI: %08x\n", nsres);
return NS_ERROR_UNEXPECTED;
}
@@ -687,7 +687,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
(nsIRequest*)NSCHANNEL(This), NULL);
if(NS_FAILED(nsres))
- ERR("AddRequest failed:%08lx\n", nsres);
+ ERR("AddRequest failed:%08x\n", nsres);
}
start_binding(bscallback);
@@ -824,7 +824,7 @@ static nsresult NSAPI nsChannel_SetRedirectionLimit(nsIHttpChannel *iface, PRUin
{
nsChannel *This = NSCHANNEL_THIS(iface);
- TRACE("(%p)->(%lu)\n", This, aRedirectionLimit);
+ TRACE("(%p)->(%u)\n", This, aRedirectionLimit);
if(This->http_channel)
return nsIHttpChannel_SetRedirectionLimit(This->http_channel, aRedirectionLimit);
@@ -1013,7 +1013,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface,
nsChannel *This = NSUPCHANNEL_THIS(iface);
const char *content_type;
- TRACE("(%p)->(%p %p %ld)\n", This, aStream, aContentType, aContentLength);
+ TRACE("(%p)->(%p %p %d)\n", This, aStream, aContentType, aContentLength);
if(This->post_data_stream)
nsIInputStream_Release(This->post_data_stream);
@@ -1025,7 +1025,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface,
}
if(aContentLength != -1)
- FIXME("Unsupported acontentLength = %ld\n", aContentLength);
+ FIXME("Unsupported acontentLength = %d\n", aContentLength);
if(aStream)
nsIInputStream_AddRef(aStream);
@@ -1091,7 +1091,7 @@ static nsrefcnt NSAPI nsURI_AddRef(nsIWineURI *iface)
nsURI *This = NSURI_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
@@ -1101,7 +1101,7 @@ static nsrefcnt NSAPI nsURI_Release(nsIWineURI *iface)
nsURI *This = NSURI_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
if(This->container)
@@ -1335,7 +1335,7 @@ static nsresult NSAPI nsURI_SetPort(nsIWineURI *iface, PRInt32 aPort)
{
nsURI *This = NSURI_THIS(iface);
- TRACE("(%p)->(%ld)\n", This, aPort);
+ TRACE("(%p)->(%d)\n", This, aPort);
if(This->uri)
return nsIURI_SetPort(This->uri, aPort);
@@ -1408,7 +1408,7 @@ static nsresult NSAPI nsURI_Clone(nsIWineURI *iface, nsIURI **_retval)
nsres = nsIURI_Clone(This->uri, &uri);
if(NS_FAILED(nsres)) {
- WARN("Clone failed: %08lx\n", nsres);
+ WARN("Clone failed: %08x\n", nsres);
return nsres;
}
@@ -1545,7 +1545,7 @@ static nsresult NSAPI nsURI_SetMoniker(nsIWineURI *iface, IMoniker *aMoniker)
TRACE("spec %s\n", debugstr_a(This->spec));
}else {
- ERR("GetDisplayName failed: %08lx\n", hres);
+ ERR("GetDisplayName failed: %08x\n", hres);
}
IMoniker_AddRef(aMoniker);
@@ -1684,7 +1684,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
nsACString_GetData(&base_uri_str, &base_uri, NULL);
TRACE("uri=%s\n", debugstr_a(base_uri));
}else {
- ERR("GetSpec failed: %08lx\n", nsres);
+ ERR("GetSpec failed: %08x\n", nsres);
}
nsACString_Finish(&base_uri_str);
@@ -1692,7 +1692,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri);
if(NS_FAILED(nsres))
- TRACE("NewURI failed: %08lx\n", nsres);
+ TRACE("NewURI failed: %08x\n", nsres);
if(uri) {
nsIURI_SchemeIs(uri, "javascript", &is_javascript);
@@ -1712,7 +1712,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
nsIWineURI_GetMoniker(wine_uri, &base_mon);
nsIWineURI_Release(wine_uri);
}else {
- ERR("Could not get nsIWineURI: %08lx\n", nsres);
+ ERR("Could not get nsIWineURI: %08x\n", nsres);
}
}
@@ -1737,7 +1737,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
nsIWineURI_SetMoniker((nsIWineURI*)*_retval, mon);
IMoniker_Release(mon);
}else {
- WARN("CreateURLMoniker failed: %08lx\n", hres);
+ WARN("CreateURLMoniker failed: %08x\n", hres);
}
}
@@ -1763,14 +1763,14 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI
nsres = nsIIOService_NewChannelFromURI(nsio, aURI, &channel);
if(NS_FAILED(nsres) && nsres != NS_ERROR_UNKNOWN_PROTOCOL) {
- WARN("NewChannelFromURI failed: %08lx\n", nsres);
+ WARN("NewChannelFromURI failed: %08x\n", nsres);
*_retval = channel;
return nsres;
}
nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri);
if(NS_FAILED(nsres)) {
- WARN("Could not get nsIWineURI: %08lx\n", nsres);
+ WARN("Could not get nsIWineURI: %08x\n", nsres);
*_retval = channel;
return channel ? NS_OK : NS_ERROR_UNEXPECTED;
}
@@ -1821,7 +1821,7 @@ static nsresult NSAPI nsIOService_SetOffline(nsIIOService *iface, PRBool aOfflin
static nsresult NSAPI nsIOService_AllowPort(nsIIOService *iface, PRInt32 aPort,
const char *aScheme, PRBool *_retval)
{
- TRACE("(%ld %s %p)\n", aPort, debugstr_a(aScheme), _retval);
+ TRACE("(%d %s %p)\n", aPort, debugstr_a(aScheme), _retval);
return nsIIOService_AllowPort(nsio, aPort, debugstr_a(aScheme), _retval);
}
@@ -1912,14 +1912,14 @@ void init_nsio(nsIComponentManager *component_manager, nsIComponentRegistrar *re
nsres = nsIComponentManager_GetClassObject(component_manager, &NS_IOSERVICE_CID,
&IID_nsIFactory, (void**)&old_factory);
if(NS_FAILED(nsres)) {
- ERR("Could not get factory: %08lx\n", nsres);
+ ERR("Could not get factory: %08x\n", nsres);
nsIFactory_Release(old_factory);
return;
}
nsres = nsIFactory_CreateInstance(old_factory, NULL, &IID_nsIIOService, (void**)&nsio);
if(NS_FAILED(nsres)) {
- ERR("Couldn not create nsIOService instance %08lx\n", nsres);
+ ERR("Couldn not create nsIOService instance %08x\n", nsres);
nsIFactory_Release(old_factory);
return;
}
@@ -1927,10 +1927,10 @@ void init_nsio(nsIComponentManager *component_manager, nsIComponentRegistrar *re
nsres = nsIComponentRegistrar_UnregisterFactory(registrar, &NS_IOSERVICE_CID, old_factory);
nsIFactory_Release(old_factory);
if(NS_FAILED(nsres))
- ERR("UnregisterFactory failed: %08lx\n", nsres);
+ ERR("UnregisterFactory failed: %08x\n", nsres);
nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_IOSERVICE_CID,
NS_IOSERVICE_CLASSNAME, NS_IOSERVICE_CONTRACTID, &nsIOServiceFactory);
if(NS_FAILED(nsres))
- ERR("RegisterFactory failed: %08lx\n", nsres);
+ ERR("RegisterFactory failed: %08x\n", nsres);
}
diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c
index 009832b6601..76887b2c238 100644
--- a/dlls/mshtml/nsservice.c
+++ b/dlls/mshtml/nsservice.c
@@ -84,7 +84,7 @@ static nsrefcnt NSAPI nsWindowCreator_Release(nsIWindowCreator2 *iface)
static nsresult NSAPI nsWindowCreator_CreateChromeWindow(nsIWindowCreator2 *iface,
nsIWebBrowserChrome *parent, PRUint32 chromeFlags, nsIWebBrowserChrome **_retval)
{
- TRACE("(%p %08lx %p)\n", parent, chromeFlags, _retval);
+ TRACE("(%p %08x %p)\n", parent, chromeFlags, _retval);
return nsIWindowCreator2_CreateChromeWindow2(iface, parent, chromeFlags, 0, NULL,
NULL, _retval);
}
@@ -93,7 +93,7 @@ static nsresult NSAPI nsWindowCreator_CreateChromeWindow2(nsIWindowCreator2 *ifa
nsIWebBrowserChrome *parent, PRUint32 chromeFlags, PRUint32 contextFlags,
nsIURI *uri, PRBool *cancel, nsIWebBrowserChrome **_retval)
{
- TRACE("(%p %08lx %08lx %p %p %p)\n", parent, chromeFlags, contextFlags, uri,
+ TRACE("(%p %08x %08x %p %p %p)\n", parent, chromeFlags, contextFlags, uri,
cancel, _retval);
if(cancel)
@@ -185,7 +185,7 @@ static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface,
{
static const PRUnichar wszContinue[] = {'C','o','n','t','i','n','u','e',0};
- FIXME("(%p %s %s %08lx %s %s %s %s %p %p) hack!\n", aParent, debugstr_w(aDialogTitle),
+ FIXME("(%p %s %s %08x %s %s %s %s %p %p) hack!\n", aParent, debugstr_w(aDialogTitle),
debugstr_w(aText), aButtonFlags, debugstr_w(aButton0Title),
debugstr_w(aButton1Title), debugstr_w(aButton2Title), debugstr_w(aCheckMsg),
aCheckState, _retval);
@@ -243,7 +243,7 @@ static nsresult NSAPI nsPromptService_Select(nsIPromptService *iface,
const PRUnichar *aText, PRUint32 aCount, const PRUnichar **aSelectList,
PRInt32 *aOutSelection, PRBool *_retval)
{
- FIXME("(%p %s %s %ld %p %p %p)\n", aParent, debugstr_w(aDialogTitle),
+ FIXME("(%p %s %s %d %p %p %p)\n", aParent, debugstr_w(aDialogTitle),
debugstr_w(aText), aCount, aSelectList, aOutSelection, _retval);
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -449,7 +449,7 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser
nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_PROMPTSERVICE_CID,
"Prompt Service", NS_PROMPTSERVICE_CONTRACTID, NSFACTORY(&nsPromptServiceFactory));
if(NS_FAILED(nsres))
- ERR("RegisterFactory failed: %08lx\n", nsres);
+ ERR("RegisterFactory failed: %08x\n", nsres);
nsres = nsIServiceManager_GetServiceByContactID(service_manager, NS_WINDOWWATCHER_CONTRACTID,
&IID_nsIWindowWatcher, (void**)&window_watcher);
@@ -457,15 +457,15 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser
nsres = nsIWindowWatcher_SetWindowCreator(window_watcher,
(nsIWindowCreator*)&nsWindowCreator);
if(NS_FAILED(nsres))
- ERR("SetWindowCreator failed: %08lx\n", nsres);
+ ERR("SetWindowCreator failed: %08x\n", nsres);
nsIWindowWatcher_Release(window_watcher);
}else {
- ERR("Could not get WindowWatcher object: %08lx\n", nsres);
+ ERR("Could not get WindowWatcher object: %08x\n", nsres);
}
nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_TOOLTIPTEXTPROVIDER_CID,
NS_TOOLTIPTEXTPROVIDER_CLASSNAME, NS_TOOLTIPTEXTPROVIDER_CONTRACTID,
NSFACTORY(&nsTooltipTextFactory));
if(NS_FAILED(nsres))
- ERR("RegisterFactory failed: %08lx\n", nsres);
+ ERR("RegisterFactory failed: %08x\n", nsres);
}
diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index c517630427c..fa4afb4409b 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -47,157 +47,157 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static HRESULT exec_open(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_new(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_save(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_save_as(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_save_copy_as(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_print_preview(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_page_setup(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_spell(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_properties(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_cut(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_copy(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_paste(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_paste_special(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_undo(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_rendo(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_select_all(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_clear_selection(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_zoom(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_get_zoom_range(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_refresh(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_stop(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_stop_download(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_delete(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_enable_interaction(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_on_unload(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- TRACE("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ TRACE("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
/* Tests show that we have nothing more to do here */
@@ -211,31 +211,31 @@ static HRESULT exec_on_unload(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pv
static HRESULT exec_show_page_setup(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_show_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_close(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_set_print_template(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
static HRESULT exec_get_print_template(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- FIXME("(%p)->(%ld %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
+ FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
@@ -250,7 +250,7 @@ static void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *
nsres = nsIWebBrowser_QueryInterface(This->webbrowser,
&IID_nsIInterfaceRequestor, (void**)&iface_req);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsIInterfaceRequestor: %08lx\n", nsres);
+ ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres);
return;
}
@@ -258,13 +258,13 @@ static void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *
(void**)&cmdmgr);
nsIInterfaceRequestor_Release(iface_req);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsICommandManager: %08lx\n", nsres);
+ ERR("Could not get nsICommandManager: %08x\n", nsres);
return;
}
nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, NULL);
if(NS_FAILED(nsres))
- ERR("DoCommand(%s) failed: %08lx\n", debugstr_a(cmd), nsres);
+ ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres);
nsICommandManager_Release(cmdmgr);
}
@@ -278,7 +278,7 @@ static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsIComm
nsres = nsIWebBrowser_QueryInterface(This->webbrowser,
&IID_nsIInterfaceRequestor, (void**)&iface_req);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsIInterfaceRequestor: %08lx\n", nsres);
+ ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres);
return nsres;
}
@@ -286,13 +286,13 @@ static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsIComm
(void**)&cmdmgr);
nsIInterfaceRequestor_Release(iface_req);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsICommandManager: %08lx\n", nsres);
+ ERR("Could not get nsICommandManager: %08x\n", nsres);
return nsres;
}
nsres = nsICommandManager_GetCommandState(cmdmgr, cmd, NULL, nsparam);
if(NS_FAILED(nsres))
- ERR("GetCommandState(%s) failed: %08lx\n", debugstr_a(cmd), nsres);
+ ERR("GetCommandState(%s) failed: %08x\n", debugstr_a(cmd), nsres);
nsICommandManager_Release(cmdmgr);
return nsres;
@@ -409,7 +409,7 @@ static void setup_ns_editing(NSContainer *This)
nsres = nsIWebBrowser_QueryInterface(This->webbrowser,
&IID_nsIInterfaceRequestor, (void**)&iface_req);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsIInterfaceRequestor: %08lx\n", nsres);
+ ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres);
return;
}
@@ -417,14 +417,14 @@ static void setup_ns_editing(NSContainer *This)
(void**)&editing_session);
nsIInterfaceRequestor_Release(iface_req);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsIEditingSession: %08lx\n", nsres);
+ ERR("Could not get nsIEditingSession: %08x\n", nsres);
return;
}
nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window);
nsIDOMWindow_Release(dom_window);
if(NS_FAILED(nsres)) {
- ERR("Could not get content DOM window: %08lx\n", nsres);
+ ERR("Could not get content DOM window: %08x\n", nsres);
nsIEditingSession_Release(editing_session);
return;
}
@@ -432,7 +432,7 @@ static void setup_ns_editing(NSContainer *This)
nsres = nsIEditingSession_MakeWindowEditable(editing_session, dom_window, NULL, FALSE);
nsIEditingSession_Release(editing_session);
if(NS_FAILED(nsres)) {
- ERR("MakeWindowEditable failed: %08lx\n", nsres);
+ ERR("MakeWindowEditable failed: %08x\n", nsres);
return;
}
@@ -479,7 +479,7 @@ static HRESULT exec_editmode(HTMLDocument *This)
hres = IDocHostUIHandler_GetHostInfo(This->hostui, &hostinfo);
if(SUCCEEDED(hres))
/* FIXME: use hostinfo */
- TRACE("hostinfo = {%lu %08lx %08lx %s %s}\n",
+ TRACE("hostinfo = {%u %08x %08x %s %s}\n",
hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick,
debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS));
}
@@ -592,14 +592,14 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con
HTMLDocument *This = CMDTARGET_THIS(iface);
HRESULT hres = S_OK, hr;
- TRACE("(%p)->(%s %ld %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText);
+ TRACE("(%p)->(%s %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText);
if(!pguidCmdGroup) {
ULONG i;
for(i=0; iOLECMDID_GETPRINTTEMPLATE) {
- WARN("Unsupported cmdID = %ld\n", prgCmds[i].cmdID);
+ WARN("Unsupported cmdID = %d\n", prgCmds[i].cmdID);
prgCmds[i].cmdf = 0;
hres = OLECMDERR_E_NOTSUPPORTED;
}else {
@@ -624,7 +624,7 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con
}
}else {
prgCmds[i].cmdf = exec_table[prgCmds[i].cmdID].cmdf;
- TRACE("cmdID = %ld returning %lx\n", prgCmds[i].cmdID, prgCmds[i].cmdf);
+ TRACE("cmdID = %d returning %x\n", prgCmds[i].cmdID, prgCmds[i].cmdf);
}
hres = S_OK;
}
@@ -714,7 +714,7 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con
prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED;
break;
default:
- FIXME("CGID_MSHTML: unsupported cmdID %ld\n", prgCmds[i].cmdID);
+ FIXME("CGID_MSHTML: unsupported cmdID %d\n", prgCmds[i].cmdID);
prgCmds[i].cmdf = 0;
}
}
@@ -738,17 +738,17 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
if(!pguidCmdGroup) {
if(nCmdIDOLECMDID_GETPRINTTEMPLATE || !exec_table[nCmdID].func) {
- WARN("Unsupported cmdID = %ld\n", nCmdID);
+ WARN("Unsupported cmdID = %d\n", nCmdID);
return OLECMDERR_E_NOTSUPPORTED;
}
return exec_table[nCmdID].func(This, nCmdexecopt, pvaIn, pvaOut);
}else if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) {
- FIXME("unsupported nCmdID %ld of CGID_Explorer group\n", nCmdID);
+ FIXME("unsupported nCmdID %d of CGID_Explorer group\n", nCmdID);
TRACE("%p %p\n", pvaIn, pvaOut);
return OLECMDERR_E_NOTSUPPORTED;
}else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) {
- FIXME("unsupported nCmdID %ld of CGID_ShellDocView group\n", nCmdID);
+ FIXME("unsupported nCmdID %d of CGID_ShellDocView group\n", nCmdID);
return OLECMDERR_E_NOTSUPPORTED;
}else if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) {
switch(nCmdID) {
@@ -777,7 +777,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
case IDM_BASELINEFONT3:
return exec_baselinefont3(This);
default:
- FIXME("unsupported nCmdID %ld of CGID_MSHTML group\n", nCmdID);
+ FIXME("unsupported nCmdID %d of CGID_MSHTML group\n", nCmdID);
return OLECMDERR_E_NOTSUPPORTED;
}
}
diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c
index aa1eee357c5..9ed62f736e5 100644
--- a/dlls/mshtml/oleobj.c
+++ b/dlls/mshtml/oleobj.c
@@ -98,7 +98,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
hres = IDocHostUIHandler_GetHostInfo(pDocHostUIHandler, &hostinfo);
if(SUCCEEDED(hres))
/* FIXME: use hostinfo */
- TRACE("hostinfo = {%lu %08lx %08lx %s %s}\n",
+ TRACE("hostinfo = {%u %08x %08x %s %s}\n",
hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick,
debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS));
@@ -202,7 +202,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- TRACE("(%p)->(%08lx)\n", This, dwSaveOption);
+ TRACE("(%p)->(%08x)\n", This, dwSaveOption);
if(dwSaveOption == OLECLOSE_PROMPTSAVE)
FIXME("OLECLOSE_PROMPTSAVE not implemented\n");
@@ -218,14 +218,14 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- FIXME("(%p %ld %p)->()\n", This, dwWhichMoniker, pmk);
+ FIXME("(%p %d %p)->()\n", This, dwWhichMoniker, pmk);
return E_NOTIMPL;
}
static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- FIXME("(%p)->(%ld %ld %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
+ FIXME("(%p)->(%d %d %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
return E_NOTIMPL;
}
@@ -233,14 +233,14 @@ static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, IDataObject *pDa
DWORD dwReserved)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- FIXME("(%p)->(%p %x %ld)\n", This, pDataObject, fCreation, dwReserved);
+ FIXME("(%p)->(%p %x %d)\n", This, pDataObject, fCreation, dwReserved);
return E_NOTIMPL;
}
static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwReserved, IDataObject **ppDataObject)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- FIXME("(%p)->(%ld %p)\n", This, dwReserved, ppDataObject);
+ FIXME("(%p)->(%d %p)\n", This, dwReserved, ppDataObject);
return E_NOTIMPL;
}
@@ -251,10 +251,10 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms
IOleDocumentSite *pDocSite;
HRESULT hres;
- TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect);
+ TRACE("(%p)->(%d %p %p %d %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect);
if(iVerb != OLEIVERB_SHOW && iVerb != OLEIVERB_UIACTIVATE && iVerb != OLEIVERB_INPLACEACTIVATE) {
- FIXME("iVerb = %ld not supported\n", iVerb);
+ FIXME("iVerb = %d not supported\n", iVerb);
return E_NOTIMPL;
}
@@ -320,21 +320,21 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid)
static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, LPOLESTR *pszUserType)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- FIXME("(%p)->(%ld %p)\n", This, dwFormOfType, pszUserType);
+ FIXME("(%p)->(%d %p)\n", This, dwFormOfType, pszUserType);
return E_NOTIMPL;
}
static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- FIXME("(%p)->(%ld %p)\n", This, dwDrawAspect, psizel);
+ FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel);
return E_NOTIMPL;
}
static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- FIXME("(%p)->(%ld %p)\n", This, dwDrawAspect, psizel);
+ FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel);
return E_NOTIMPL;
}
@@ -348,7 +348,7 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink,
static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- FIXME("(%p)->(%ld)\n", This, dwConnection);
+ FIXME("(%p)->(%d)\n", This, dwConnection);
return E_NOTIMPL;
}
@@ -362,7 +362,7 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp
static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)
{
HTMLDocument *This = OLEOBJ_THIS(iface);
- FIXME("(%p)->(%ld %p)\n", This, dwAspect, pdwStatus);
+ FIXME("(%p)->(%d %p)\n", This, dwAspect, pdwStatus);
return E_NOTIMPL;
}
@@ -432,7 +432,7 @@ static HRESULT WINAPI OleDocument_CreateView(IOleDocument *iface, IOleInPlaceSit
HTMLDocument *This = OLEDOC_THIS(iface);
HRESULT hres;
- TRACE("(%p)->(%p %p %ld %p)\n", This, pIPSite, pstm, dwReserved, ppView);
+ TRACE("(%p)->(%p %p %d %p)\n", This, pIPSite, pstm, dwReserved, ppView);
if(!ppView)
return E_INVALIDARG;
@@ -552,7 +552,7 @@ static HRESULT on_change_dlcontrol(HTMLDocument *This)
hres = get_client_disp_property(This->client, DISPID_AMBIENT_DLCONTROL, &res);
if(SUCCEEDED(hres))
- FIXME("unsupported dlcontrol %08lx\n", V_I4(&res));
+ FIXME("unsupported dlcontrol %08x\n", V_I4(&res));
return S_OK;
}
@@ -641,7 +641,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS
return S_OK;
}
- FIXME("(%p) unsupported dispID=%ld\n", This, dispID);
+ FIXME("(%p) unsupported dispID=%d\n", This, dispID);
return E_FAIL;
}
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 407d7c52eee..aba2d51392d 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -123,7 +123,7 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx)
if(headers_len || post_len) {
int len = headers_len ? headers_len-1 : 0;
- static const char content_length[] = "Content-Length: %lu\r\n\r\n";
+ static const char content_length[] = "Content-Length: %u\r\n\r\n";
data = mshtml_alloc(headers_len+post_len+sizeof(content_length)+8);
@@ -160,7 +160,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
HRESULT hres;
nsresult nsres;
- TRACE("(%p)->(%x %p %p %08lx)\n", This, fFullyAvailable, pimkName, pibc, grfMode);
+ TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode);
if(pibc) {
IUnknown *unk = NULL;
@@ -199,7 +199,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
hres = IMoniker_GetDisplayName(pimkName, pibc, NULL, &url);
if(FAILED(hres)) {
- WARN("GetDiaplayName failed: %08lx\n", hres);
+ WARN("GetDiaplayName failed: %08x\n", hres);
return hres;
}
@@ -250,7 +250,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
CoTaskMemFree(url);
return S_OK;
}else if(nsres != WINE_NS_LOAD_FROM_MONIKER) {
- WARN("LoadURI failed: %08lx\n", nsres);
+ WARN("LoadURI failed: %08x\n", nsres);
}
}
@@ -382,7 +382,7 @@ static HRESULT WINAPI PersistFile_IsDirty(IPersistFile *iface)
static HRESULT WINAPI PersistFile_Load(IPersistFile *iface, LPCOLESTR pszFileName, DWORD dwMode)
{
HTMLDocument *This = PERSISTFILE_THIS(iface);
- FIXME("(%p)->(%s %08lx)\n", This, debugstr_w(pszFileName), dwMode);
+ FIXME("(%p)->(%s %08x)\n", This, debugstr_w(pszFileName), dwMode);
return E_NOTIMPL;
}
@@ -480,14 +480,14 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM
nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc);
if(NS_FAILED(nsres)) {
- ERR("GetDocument failed: %08lx\n", nsres);
+ ERR("GetDocument failed: %08x\n", nsres);
return E_FAIL;
}
nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode);
nsIDOMDocument_Release(nsdoc);
if(NS_FAILED(nsres)) {
- ERR("Could not get nsIDOMNode failed: %08lx\n", nsres);
+ ERR("Could not get nsIDOMNode failed: %08x\n", nsres);
return E_FAIL;
}
@@ -507,7 +507,7 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM
hres = IStream_Write(pStm, str, len, &written);
if(FAILED(hres))
- FIXME("Write failed: %08lx\n", hres);
+ FIXME("Write failed: %08x\n", hres);
mshtml_free(str);
diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c
index 04ecda02b40..a560ae74f24 100644
--- a/dlls/mshtml/protocol.c
+++ b/dlls/mshtml/protocol.c
@@ -95,7 +95,7 @@ static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa
LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult,
DWORD cchResult, DWORD* pcchResult, DWORD dwReserved)
{
- TRACE("%p)->(%s %s %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzBaseUrl),
+ TRACE("%p)->(%s %s %08x %p %d %p %d)\n", iface, debugstr_w(pwzBaseUrl),
debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult,
pcchResult, dwReserved);
@@ -193,7 +193,7 @@ static ULONG WINAPI AboutProtocol_AddRef(IInternetProtocol *iface)
{
AboutProtocol *This = PROTOCOL_THIS(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", iface, ref);
+ TRACE("(%p) ref=%d\n", iface, ref);
return This->pUnkOuter ? IUnknown_AddRef(This->pUnkOuter) : ref;
}
@@ -203,7 +203,7 @@ static ULONG WINAPI AboutProtocol_Release(IInternetProtocol *iface)
IUnknown *pUnkOuter = This->pUnkOuter;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%lx\n", iface, ref);
+ TRACE("(%p) ref=%x\n", iface, ref);
if(!ref) {
mshtml_free(This->data);
@@ -236,7 +236,7 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr
* when the url does not have "about:" in the beginning.
*/
- TRACE("(%p)->(%s %p %p %08lx %ld)\n", This, debugstr_w(szUrl), pOIProtSink,
+ TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
memset(&bindinfo, 0, sizeof(bindinfo));
@@ -283,14 +283,14 @@ static HRESULT WINAPI AboutProtocol_Abort(IInternetProtocol *iface, HRESULT hrRe
DWORD dwOptions)
{
AboutProtocol *This = PROTOCOL_THIS(iface);
- FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
+ FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
return E_NOTIMPL;
}
static HRESULT WINAPI AboutProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions)
{
AboutProtocol *This = PROTOCOL_THIS(iface);
- TRACE("(%p)->(%08lx)\n", This, dwOptions);
+ TRACE("(%p)->(%08x)\n", This, dwOptions);
return S_OK;
}
@@ -312,7 +312,7 @@ static HRESULT WINAPI AboutProtocol_Read(IInternetProtocol *iface, void* pv, ULO
{
AboutProtocol *This = PROTOCOL_THIS(iface);
- TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
+ TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
if(!This->data)
return E_FAIL;
@@ -332,7 +332,7 @@ static HRESULT WINAPI AboutProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER
DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition)
{
AboutProtocol *This = PROTOCOL_THIS(iface);
- FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
+ FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
@@ -340,7 +340,7 @@ static HRESULT WINAPI AboutProtocol_LockRequest(IInternetProtocol *iface, DWORD
{
AboutProtocol *This = PROTOCOL_THIS(iface);
- TRACE("(%p)->(%ld)\n", This, dwOptions);
+ TRACE("(%p)->(%d)\n", This, dwOptions);
return S_OK;
}
@@ -411,7 +411,7 @@ static HRESULT WINAPI AboutProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, L
PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult,
DWORD* pcchResult, DWORD dwReserved)
{
- TRACE("%p)->(%s %08x %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), ParseAction,
+ TRACE("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction,
dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
if(ParseAction == PARSE_SECURITY_URL) {
@@ -441,7 +441,7 @@ static HRESULT WINAPI AboutProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, L
static HRESULT WINAPI AboutProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1,
LPCWSTR pwzUrl2, DWORD dwCompareFlags)
{
- FIXME("%p)->(%s %s %08lx)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
+ FIXME("%p)->(%s %s %08x)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
return E_NOTIMPL;
}
@@ -449,7 +449,7 @@ static HRESULT WINAPI AboutProtocolInfo_QueryInfo(IInternetProtocolInfo *iface,
QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf,
DWORD dwReserved)
{
- FIXME("%p)->(%s %08x %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
+ FIXME("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
cbBuffer, pcbBuf, dwReserved);
return E_NOTIMPL;
}
@@ -529,7 +529,7 @@ static ULONG WINAPI ResProtocol_AddRef(IInternetProtocol *iface)
{
ResProtocol *This = PROTOCOL_THIS(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", iface, ref);
+ TRACE("(%p) ref=%d\n", iface, ref);
return This->pUnkOuter ? IUnknown_AddRef(This->pUnkOuter) : ref;
}
@@ -539,7 +539,7 @@ static ULONG WINAPI ResProtocol_Release(IInternetProtocol *iface)
IUnknown *pUnkOuter = This->pUnkOuter;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%lx\n", iface, ref);
+ TRACE("(%p) ref=%x\n", iface, ref);
if(!ref) {
mshtml_free(This->data);
@@ -564,7 +564,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
static const WCHAR wszRes[] = {'r','e','s',':','/','/'};
- TRACE("(%p)->(%s %p %p %08lx %ld)\n", This, debugstr_w(szUrl), pOIProtSink,
+ TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
memset(&bindinfo, 0, sizeof(bindinfo));
@@ -576,7 +576,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
url = mshtml_alloc(len*sizeof(WCHAR));
hres = CoInternetParseUrl(szUrl, PARSE_ENCODE, 0, url, len, &len, 0);
if(FAILED(hres)) {
- WARN("CoInternetParseUrl failed: %08lx\n", hres);
+ WARN("CoInternetParseUrl failed: %08x\n", hres);
mshtml_free(url);
IInternetProtocolSink_ReportResult(pOIProtSink, hres, 0, NULL);
return hres;
@@ -660,7 +660,7 @@ static HRESULT WINAPI ResProtocol_Abort(IInternetProtocol *iface, HRESULT hrReas
DWORD dwOptions)
{
ResProtocol *This = PROTOCOL_THIS(iface);
- FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
+ FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
return E_NOTIMPL;
}
@@ -668,7 +668,7 @@ static HRESULT WINAPI ResProtocol_Terminate(IInternetProtocol *iface, DWORD dwOp
{
ResProtocol *This = PROTOCOL_THIS(iface);
- TRACE("(%p)->(%08lx)\n", This, dwOptions);
+ TRACE("(%p)->(%08x)\n", This, dwOptions);
/* test show that we don't have to do anything here */
return S_OK;
@@ -692,7 +692,7 @@ static HRESULT WINAPI ResProtocol_Read(IInternetProtocol *iface, void* pv, ULONG
{
ResProtocol *This = PROTOCOL_THIS(iface);
- TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
+ TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
if(!This->data)
return E_FAIL;
@@ -712,7 +712,7 @@ static HRESULT WINAPI ResProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER d
DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition)
{
ResProtocol *This = PROTOCOL_THIS(iface);
- FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
+ FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
@@ -720,7 +720,7 @@ static HRESULT WINAPI ResProtocol_LockRequest(IInternetProtocol *iface, DWORD dw
{
ResProtocol *This = PROTOCOL_THIS(iface);
- TRACE("(%p)->(%ld)\n", This, dwOptions);
+ TRACE("(%p)->(%d)\n", This, dwOptions);
/* test show that we don't have to do anything here */
return S_OK;
@@ -792,7 +792,7 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC
PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult,
DWORD* pcchResult, DWORD dwReserved)
{
- TRACE("%p)->(%s %d %lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), ParseAction,
+ TRACE("%p)->(%s %d %x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction,
dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
if(ParseAction == PARSE_SECURITY_URL) {
@@ -842,7 +842,7 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC
static HRESULT WINAPI ResProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1,
LPCWSTR pwzUrl2, DWORD dwCompareFlags)
{
- FIXME("%p)->(%s %s %08lx)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
+ FIXME("%p)->(%s %s %08x)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
return E_NOTIMPL;
}
@@ -850,7 +850,7 @@ static HRESULT WINAPI ResProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LP
QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf,
DWORD dwReserved)
{
- FIXME("%p)->(%s %08x %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
+ FIXME("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
cbBuffer, pcbBuf, dwReserved);
return E_NOTIMPL;
}
diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c
index d2cdd6dc423..f5cc5aa381f 100644
--- a/dlls/mshtml/selection.c
+++ b/dlls/mshtml/selection.c
@@ -80,7 +80,7 @@ static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface)
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
@@ -90,7 +90,7 @@ static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface)
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
if(This->nsselection)
@@ -112,7 +112,7 @@ static HRESULT WINAPI HTMLSelectionObject_GetTypeInfo(IHTMLSelectionObject *ifac
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -121,7 +121,7 @@ static HRESULT WINAPI HTMLSelectionObject_GetIDsOfNames(IHTMLSelectionObject *if
LCID lcid, DISPID *rgDispId)
{
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -131,7 +131,7 @@ static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DI
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c
index 594651b6d3d..eb83fd07ed1 100644
--- a/dlls/mshtml/txtrange.c
+++ b/dlls/mshtml/txtrange.c
@@ -79,7 +79,7 @@ static ULONG WINAPI HTMLTxtRange_AddRef(IHTMLTxtRange *iface)
HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
@@ -89,7 +89,7 @@ static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface)
HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%ld\n", This, ref);
+ TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
if(This->nsselection)
@@ -111,7 +111,7 @@ static HRESULT WINAPI HTMLTxtRange_GetTypeInfo(IHTMLTxtRange *iface, UINT iTInfo
LCID lcid, ITypeInfo **ppTInfo)
{
HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
- FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
+ FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
@@ -120,7 +120,7 @@ static HRESULT WINAPI HTMLTxtRange_GetIDsOfNames(IHTMLTxtRange *iface, REFIID ri
LCID lcid, DISPID *rgDispId)
{
HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
- FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
@@ -130,7 +130,7 @@ static HRESULT WINAPI HTMLTxtRange_Invoke(IHTMLTxtRange *iface, DISPID dispIdMem
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface);
- FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
@@ -165,7 +165,7 @@ static HRESULT WINAPI HTMLTxtRange_get_text(IHTMLTxtRange *iface, BSTR *p)
nsres = nsISelection_ToString(This->nsselection, &nstext);
if(NS_FAILED(nsres) || !nstext) {
- ERR("toString failed: %08lx\n", nsres);
+ ERR("toString failed: %08x\n", nsres);
return E_FAIL;
}
diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c
index e233d7ac916..632d6bdbde1 100644
--- a/dlls/mshtml/view.c
+++ b/dlls/mshtml/view.c
@@ -148,26 +148,26 @@ static HRESULT activate_window(HTMLDocument *This)
hres = IOleInPlaceSite_CanInPlaceActivate(This->ipsite);
if(hres != S_OK) {
- WARN("CanInPlaceActivate returned: %08lx\n", hres);
+ WARN("CanInPlaceActivate returned: %08x\n", hres);
return FAILED(hres) ? hres : E_FAIL;
}
hres = IOleInPlaceSite_GetWindowContext(This->ipsite, &pIPFrame, &pIPWnd, &posrect, &cliprect, &frameinfo);
if(FAILED(hres)) {
- WARN("GetWindowContext failed: %08lx\n", hres);
+ WARN("GetWindowContext failed: %08x\n", hres);
return hres;
}
if(pIPWnd)
IOleInPlaceUIWindow_Release(pIPWnd);
- TRACE("got window context: %p %p {%ld %ld %ld %ld} {%ld %ld %ld %ld} {%d %x %p %p %d}\n",
+ TRACE("got window context: %p %p {%d %d %d %d} {%d %d %d %d} {%d %x %p %p %d}\n",
pIPFrame, pIPWnd, posrect.left, posrect.top, posrect.right, posrect.bottom,
cliprect.left, cliprect.top, cliprect.right, cliprect.bottom,
frameinfo.cb, frameinfo.fMDIApp, frameinfo.hwndFrame, frameinfo.haccel, frameinfo.cAccelEntries);
hres = IOleInPlaceSite_GetWindow(This->ipsite, &parent_hwnd);
if(FAILED(hres)) {
- WARN("GetWindow failed: %08lx\n", hres);
+ WARN("GetWindow failed: %08x\n", hres);
return hres;
}
@@ -202,7 +202,7 @@ static HRESULT activate_window(HTMLDocument *This)
This->in_place_active = TRUE;
hres = IOleInPlaceSite_OnInPlaceActivate(This->ipsite);
if(FAILED(hres)) {
- WARN("OnInPlaceActivate failed: %08lx\n", hres);
+ WARN("OnInPlaceActivate failed: %08x\n", hres);
This->in_place_active = FALSE;
return hres;
}
@@ -242,7 +242,7 @@ static LRESULT tooltips_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
RECT rect;
POINT *pt = (POINT*)lParam;
- TRACE("TTM_WINDOWFROMPOINT (%ld,%ld)\n", pt->x, pt->y);
+ TRACE("TTM_WINDOWFROMPOINT (%d,%d)\n", pt->x, pt->y);
GetWindowRect(data->doc->hwnd, &rect);
@@ -281,7 +281,7 @@ void show_tooltip(HTMLDocument *This, DWORD x, DWORD y, LPCWSTR text)
NULL, (LPWSTR)text, 0};
MSG msg = {This->hwnd, WM_MOUSEMOVE, 0, MAKELPARAM(x,y), 0, {x,y}};
- TRACE("(%p)->(%ld %ld %s)\n", This, x, y, debugstr_w(text));
+ TRACE("(%p)->(%d %d %s)\n", This, x, y, debugstr_w(text));
if(!This->tooltips_hwnd)
create_tooltips_window(This);
@@ -463,7 +463,7 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f
sizeof(wszHTMLDocument)/sizeof(WCHAR));
IOleInPlaceFrame_SetActiveObject(This->frame, ACTOBJ(This), wszHTMLDocument);
}else {
- FIXME("OnUIActivate failed: %08lx\n", hres);
+ FIXME("OnUIActivate failed: %08x\n", hres);
IOleInPlaceFrame_Release(This->frame);
This->frame = NULL;
This->ui_active = FALSE;
@@ -501,10 +501,10 @@ static HRESULT WINAPI OleDocumentView_Open(IOleDocumentView *iface)
static HRESULT WINAPI OleDocumentView_CloseView(IOleDocumentView *iface, DWORD dwReserved)
{
HTMLDocument *This = DOCVIEW_THIS(iface);
- TRACE("(%p)->(%lx)\n", This, dwReserved);
+ TRACE("(%p)->(%x)\n", This, dwReserved);
if(dwReserved)
- WARN("dwReserved = %ld\n", dwReserved);
+ WARN("dwReserved = %d\n", dwReserved);
/* NOTE:
* Windows implementation calls QueryInterface(IID_IOleCommandTarget),
@@ -588,7 +588,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, L
LPCRECTL lprcWBounds, BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue), ULONG_PTR dwContinue)
{
HTMLDocument *This = VIEWOBJ_THIS(iface);
- FIXME("(%p)->(%ld %ld %p %p %p %p %p %p %p %ld)\n", This, dwDrawAspect, lindex, pvAspect,
+ FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %ld)\n", This, dwDrawAspect, lindex, pvAspect,
ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue, dwContinue);
return E_NOTIMPL;
}
@@ -597,7 +597,7 @@ static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwDrawAs
DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet)
{
HTMLDocument *This = VIEWOBJ_THIS(iface);
- FIXME("(%p)->(%ld %ld %p %p %p %p)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hicTargetDev, ppColorSet);
+ FIXME("(%p)->(%d %d %p %p %p %p)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hicTargetDev, ppColorSet);
return E_NOTIMPL;
}
@@ -605,21 +605,21 @@ static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect,
void *pvAspect, DWORD *pdwFreeze)
{
HTMLDocument *This = VIEWOBJ_THIS(iface);
- FIXME("(%p)->(%ld %ld %p %p)\n", This, dwDrawAspect, lindex, pvAspect, pdwFreeze);
+ FIXME("(%p)->(%d %d %p %p)\n", This, dwDrawAspect, lindex, pvAspect, pdwFreeze);
return E_NOTIMPL;
}
static HRESULT WINAPI ViewObject_Unfreeze(IViewObject2 *iface, DWORD dwFreeze)
{
HTMLDocument *This = VIEWOBJ_THIS(iface);
- FIXME("(%p)->(%ld)\n", This, dwFreeze);
+ FIXME("(%p)->(%d)\n", This, dwFreeze);
return E_NOTIMPL;
}
static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink)
{
HTMLDocument *This = VIEWOBJ_THIS(iface);
- FIXME("(%p)->(%ld %ld %p)\n", This, aspects, advf, pAdvSink);
+ FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, pAdvSink);
return E_NOTIMPL;
}
@@ -634,7 +634,7 @@ static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwDrawAspe
DVTARGETDEVICE* ptd, LPSIZEL lpsizel)
{
HTMLDocument *This = VIEWOBJ_THIS(iface);
- FIXME("(%p)->(%ld %ld %p %p)\n", This, dwDrawAspect, lindex, ptd, lpsizel);
+ FIXME("(%p)->(%d %d %p %p)\n", This, dwDrawAspect, lindex, ptd, lpsizel);
return E_NOTIMPL;
}