Skip to content

W
wine-winehq
Commit 210abcd8 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

mshtml: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d1ee1d68
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 571 additions and 572 deletions
dlls/mshtml/Makefile.in
View file @ 210abcd8
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = mshtml.dll MODULE = mshtml.dll
IMPORTLIB = mshtml IMPORTLIB = mshtml
IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32
......
dlls/mshtml/conpoint.c
View file @ 210abcd8
...@@ -70,7 +70,7 @@ static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) ...@@ -70,7 +70,7 @@ static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface)
EnumConnections *This = impl_from_IEnumConnections(iface); EnumConnections *This = impl_from_IEnumConnections(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -80,7 +80,7 @@ static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) ...@@ -80,7 +80,7 @@ static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface)
EnumConnections *This = impl_from_IEnumConnections(iface); EnumConnections *This = impl_from_IEnumConnections(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); IConnectionPoint_Release(&This->cp->IConnectionPoint_iface);
...@@ -95,7 +95,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne ...@@ -95,7 +95,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne
EnumConnections *This = impl_from_IEnumConnections(iface); EnumConnections *This = impl_from_IEnumConnections(iface);
ULONG fetched = 0; ULONG fetched = 0;
TRACE("(%p)->(%d %p %p)\n", This, cConnections, rgcd, pcFetched); TRACE("(%p)->(%ld %p %p)\n", This, cConnections, rgcd, pcFetched);
while(fetched < cConnections && This->iter < This->cp->sinks_size) { while(fetched < cConnections && This->iter < This->cp->sinks_size) {
if(!This->cp->sinks[This->iter].unk) { if(!This->cp->sinks[This->iter].unk) {
...@@ -117,7 +117,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne ...@@ -117,7 +117,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne
static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG cConnections) static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG cConnections)
{ {
EnumConnections *This = impl_from_IEnumConnections(iface); EnumConnections *This = impl_from_IEnumConnections(iface);
FIXME("(%p)->(%d)\n", This, cConnections); FIXME("(%p)->(%ld)\n", This, cConnections);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -254,7 +254,7 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * ...@@ -254,7 +254,7 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *
static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie)
{ {
ConnectionPoint *This = impl_from_IConnectionPoint(iface); ConnectionPoint *This = impl_from_IConnectionPoint(iface);
TRACE("(%p)->(%d)\n", This, dwCookie); TRACE("(%p)->(%ld)\n", This, dwCookie);
if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1].unk) if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1].unk)
return CONNECT_E_NOCONNECTION; return CONNECT_E_NOCONNECTION;
......
dlls/mshtml/editor.c
View file @ 210abcd8
...@@ -102,11 +102,11 @@ void set_dirty(GeckoBrowser *browser, VARIANT_BOOL dirty) ...@@ -102,11 +102,11 @@ void set_dirty(GeckoBrowser *browser, VARIANT_BOOL dirty)
if(dirty) { if(dirty) {
nsres = nsIEditor_IncrementModificationCount(browser->editor, 1); nsres = nsIEditor_IncrementModificationCount(browser->editor, 1);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("IncrementModificationCount failed: %08x\n", nsres); ERR("IncrementModificationCount failed: %08lx\n", nsres);
}else { }else {
nsres = nsIEditor_ResetModificationCount(browser->editor); nsres = nsIEditor_ResetModificationCount(browser->editor);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("ResetModificationCount failed: %08x\n", nsres); ERR("ResetModificationCount failed: %08lx\n", nsres);
} }
} }
...@@ -119,7 +119,7 @@ static void do_ns_editor_command(GeckoBrowser *This, const char *cmd) ...@@ -119,7 +119,7 @@ static void do_ns_editor_command(GeckoBrowser *This, const char *cmd)
nsres = nsIController_DoCommand(This->editor_controller, cmd); nsres = nsIController_DoCommand(This->editor_controller, cmd);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres); ERR("DoCommand(%s) failed: %08lx\n", debugstr_a(cmd), nsres);
} }
static nsresult get_ns_command_state(GeckoBrowser *This, const char *cmd, nsICommandParams *nsparam) static nsresult get_ns_command_state(GeckoBrowser *This, const char *cmd, nsICommandParams *nsparam)
...@@ -129,13 +129,13 @@ static nsresult get_ns_command_state(GeckoBrowser *This, const char *cmd, nsICom ...@@ -129,13 +129,13 @@ static nsresult get_ns_command_state(GeckoBrowser *This, const char *cmd, nsICom
nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsICommandManager, (void**)&cmdmgr); nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsICommandManager, (void**)&cmdmgr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsICommandManager: %08x\n", nsres); ERR("Could not get nsICommandManager: %08lx\n", nsres);
return nsres; return nsres;
} }
nsres = nsICommandManager_GetCommandState(cmdmgr, cmd, This->doc->basedoc.window->window_proxy, nsparam); nsres = nsICommandManager_GetCommandState(cmdmgr, cmd, This->doc->basedoc.window->window_proxy, nsparam);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("GetCommandState(%s) failed: %08x\n", debugstr_a(cmd), nsres); ERR("GetCommandState(%s) failed: %08lx\n", debugstr_a(cmd), nsres);
nsICommandManager_Release(cmdmgr); nsICommandManager_Release(cmdmgr);
return nsres; return nsres;
...@@ -200,7 +200,7 @@ static nsISelection *get_ns_selection(HTMLDocumentNode *doc) ...@@ -200,7 +200,7 @@ static nsISelection *get_ns_selection(HTMLDocumentNode *doc)
nsres = nsIDOMWindow_GetSelection(doc->basedoc.window->nswindow, &nsselection); nsres = nsIDOMWindow_GetSelection(doc->basedoc.window->nswindow, &nsselection);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("GetSelection failed %08x\n", nsres); ERR("GetSelection failed %08lx\n", nsres);
return nsselection; return nsselection;
...@@ -330,7 +330,7 @@ static void set_font_size(HTMLDocumentNode *doc, LPCWSTR size) ...@@ -330,7 +330,7 @@ static void set_font_size(HTMLDocumentNode *doc, LPCWSTR size)
nsISelection_GetRangeCount(nsselection, &range_cnt); nsISelection_GetRangeCount(nsselection, &range_cnt);
if(range_cnt != 1) { if(range_cnt != 1) {
FIXME("range_cnt %d not supprted\n", range_cnt); FIXME("range_cnt %ld not supprted\n", range_cnt);
if(!range_cnt) { if(!range_cnt) {
nsISelection_Release(nsselection); nsISelection_Release(nsselection);
return; return;
...@@ -565,7 +565,7 @@ static HRESULT exec_forecolor(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT * ...@@ -565,7 +565,7 @@ static HRESULT exec_forecolor(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT *
nsICommandParams *nsparam = create_nscommand_params(); nsICommandParams *nsparam = create_nscommand_params();
char color_str[10]; char color_str[10];
sprintf(color_str, "#%02x%02x%02x", sprintf(color_str, "#%02lx%02lx%02lx",
V_I4(in)&0xff, (V_I4(in)>>8)&0xff, (V_I4(in)>>16)&0xff); V_I4(in)&0xff, (V_I4(in)>>8)&0xff, (V_I4(in)>>16)&0xff);
nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, color_str); nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, color_str);
...@@ -792,7 +792,7 @@ static HRESULT exec_composesettings(HTMLDocumentNode *doc, DWORD cmdexecopt, VAR ...@@ -792,7 +792,7 @@ static HRESULT exec_composesettings(HTMLDocumentNode *doc, DWORD cmdexecopt, VAR
return E_INVALIDARG; return E_INVALIDARG;
} }
TRACE("(%p)->(%x %s)\n", doc, cmdexecopt, debugstr_w(V_BSTR(in))); TRACE("(%p)->(%lx %s)\n", doc, cmdexecopt, debugstr_w(V_BSTR(in)));
update_doc(doc->browser->doc, UPDATE_UI); update_doc(doc->browser->doc, UPDATE_UI);
...@@ -877,7 +877,7 @@ HRESULT editor_exec_paste(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT *in, ...@@ -877,7 +877,7 @@ HRESULT editor_exec_paste(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT *in,
static HRESULT exec_setdirty(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT *in, VARIANT *out) static HRESULT exec_setdirty(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT *in, VARIANT *out)
{ {
TRACE("(%p)->(%08x %p %p)\n", doc, cmdexecopt, in, out); TRACE("(%p)->(%08lx %p %p)\n", doc, cmdexecopt, in, out);
if(!in) if(!in)
return S_OK; return S_OK;
...@@ -1063,7 +1063,7 @@ static HRESULT exec_hyperlink(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT * ...@@ -1063,7 +1063,7 @@ static HRESULT exec_hyperlink(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT *
INT ret; INT ret;
HRESULT hres = E_FAIL; HRESULT hres = E_FAIL;
TRACE("%p, 0x%x, %p, %p\n", doc, cmdexecopt, in, out); TRACE("%p, 0x%lx, %p, %p\n", doc, cmdexecopt, in, out);
if (cmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER) if (cmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER)
{ {
...@@ -1136,7 +1136,7 @@ static HRESULT exec_hyperlink(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT * ...@@ -1136,7 +1136,7 @@ static HRESULT exec_hyperlink(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT *
if (cmdexecopt != OLECMDEXECOPT_DONTPROMPTUSER) if (cmdexecopt != OLECMDEXECOPT_DONTPROMPTUSER)
SysFreeString(url); SysFreeString(url);
TRACE("-- 0x%08x\n", hres); TRACE("-- 0x%08lx\n", hres);
return hres; return hres;
} }
...@@ -1228,7 +1228,7 @@ HRESULT setup_edit_mode(HTMLDocumentObj *doc) ...@@ -1228,7 +1228,7 @@ HRESULT setup_edit_mode(HTMLDocumentObj *doc)
hres = IDocHostUIHandler_GetHostInfo(doc->hostui, &hostinfo); hres = IDocHostUIHandler_GetHostInfo(doc->hostui, &hostinfo);
if(SUCCEEDED(hres)) if(SUCCEEDED(hres))
/* FIXME: use hostinfo */ /* FIXME: use hostinfo */
TRACE("hostinfo = {%u %08x %08x %s %s}\n", TRACE("hostinfo = {%lu %08lx %08lx %s %s}\n",
hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick,
debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS));
} }
...@@ -1244,7 +1244,7 @@ HRESULT setup_edit_mode(HTMLDocumentObj *doc) ...@@ -1244,7 +1244,7 @@ HRESULT setup_edit_mode(HTMLDocumentObj *doc)
}else { }else {
hres = CreateURLMoniker(NULL, L"about:blank", &mon); hres = CreateURLMoniker(NULL, L"about:blank", &mon);
if(FAILED(hres)) { if(FAILED(hres)) {
FIXME("CreateURLMoniker failed: %08x\n", hres); FIXME("CreateURLMoniker failed: %08lx\n", hres);
return hres; return hres;
} }
} }
......
dlls/mshtml/htmlanchor.c
View file @ 210abcd8
...@@ -183,7 +183,7 @@ static IUri *get_anchor_uri(HTMLAnchorElement *anchor) ...@@ -183,7 +183,7 @@ static IUri *get_anchor_uri(HTMLAnchorElement *anchor)
nsAString_GetData(&href_str, &href); nsAString_GetData(&href_str, &href);
create_uri(href, 0, &uri); create_uri(href, 0, &uri);
}else { }else {
ERR("GetHref failed: %08x\n", nsres); ERR("GetHref failed: %08lx\n", nsres);
} }
nsAString_Finish(&href_str); nsAString_Finish(&href_str);
...@@ -283,7 +283,7 @@ static HRESULT WINAPI HTMLAnchorElement_get_href(IHTMLAnchorElement *iface, BSTR ...@@ -283,7 +283,7 @@ static HRESULT WINAPI HTMLAnchorElement_get_href(IHTMLAnchorElement *iface, BSTR
nsAString_GetData(&href_str, &href); nsAString_GetData(&href_str, &href);
hres = nsuri_to_url(href, TRUE, p); hres = nsuri_to_url(href, TRUE, p);
}else { }else {
ERR("GetHref failed: %08x\n", nsres); ERR("GetHref failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
...@@ -823,14 +823,14 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsI ...@@ -823,14 +823,14 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsI
nsAString_Init(&href_str, NULL); nsAString_Init(&href_str, NULL);
nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str);
if (NS_FAILED(nsres)) { if (NS_FAILED(nsres)) {
ERR("Could not get anchor href: %08x\n", nsres); ERR("Could not get anchor href: %08lx\n", nsres);
goto fallback; goto fallback;
} }
nsAString_Init(&target_str, NULL); nsAString_Init(&target_str, NULL);
nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str); nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str);
if (NS_FAILED(nsres)) { if (NS_FAILED(nsres)) {
ERR("Could not get anchor target: %08x\n", nsres); ERR("Could not get anchor target: %08lx\n", nsres);
goto fallback; goto fallback;
} }
......
dlls/mshtml/htmlarea.c
View file @ 210abcd8
...@@ -160,7 +160,7 @@ static HRESULT WINAPI HTMLAreaElement_get_href(IHTMLAreaElement *iface, BSTR *p) ...@@ -160,7 +160,7 @@ static HRESULT WINAPI HTMLAreaElement_get_href(IHTMLAreaElement *iface, BSTR *p)
nsAString_GetData(&href_str, &href); nsAString_GetData(&href_str, &href);
hres = nsuri_to_url(href, TRUE, p); hres = nsuri_to_url(href, TRUE, p);
}else { }else {
ERR("GetHref failed: %08x\n", nsres); ERR("GetHref failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
...@@ -440,14 +440,14 @@ static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDO ...@@ -440,14 +440,14 @@ static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDO
nsAString_Init(&href_str, NULL); nsAString_Init(&href_str, NULL);
nsres = nsIDOMHTMLAreaElement_GetHref(This->nsarea, &href_str); nsres = nsIDOMHTMLAreaElement_GetHref(This->nsarea, &href_str);
if (NS_FAILED(nsres)) { if (NS_FAILED(nsres)) {
ERR("Could not get area href: %08x\n", nsres); ERR("Could not get area href: %08lx\n", nsres);
goto fallback; goto fallback;
} }
nsAString_Init(&target_str, NULL); nsAString_Init(&target_str, NULL);
nsres = nsIDOMHTMLAreaElement_GetTarget(This->nsarea, &target_str); nsres = nsIDOMHTMLAreaElement_GetTarget(This->nsarea, &target_str);
if (NS_FAILED(nsres)) { if (NS_FAILED(nsres)) {
ERR("Could not get area target: %08x\n", nsres); ERR("Could not get area target: %08lx\n", nsres);
goto fallback; goto fallback;
} }
......
dlls/mshtml/htmlattr.c
View file @ 210abcd8
...@@ -67,7 +67,7 @@ static ULONG WINAPI HTMLDOMAttribute_AddRef(IHTMLDOMAttribute *iface) ...@@ -67,7 +67,7 @@ static ULONG WINAPI HTMLDOMAttribute_AddRef(IHTMLDOMAttribute *iface)
HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -77,7 +77,7 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) ...@@ -77,7 +77,7 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface)
HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
assert(!This->elem); assert(!This->elem);
......
dlls/mshtml/htmlbody.c
View file @ 210abcd8
...@@ -166,7 +166,7 @@ static HRESULT return_nscolor(nsresult nsres, nsAString *nsstr, VARIANT *p) ...@@ -166,7 +166,7 @@ static HRESULT return_nscolor(nsresult nsres, nsAString *nsstr, VARIANT *p)
const PRUnichar *color; const PRUnichar *color;
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("failed: %08x\n", nsres); ERR("failed: %08lx\n", nsres);
nsAString_Finish(nsstr); nsAString_Finish(nsstr);
return E_FAIL; return E_FAIL;
} }
...@@ -378,7 +378,7 @@ static HRESULT WINAPI HTMLBodyElement_put_bgColor(IHTMLBodyElement *iface, VARIA ...@@ -378,7 +378,7 @@ static HRESULT WINAPI HTMLBodyElement_put_bgColor(IHTMLBodyElement *iface, VARIA
nsres = nsIDOMHTMLBodyElement_SetBgColor(This->nsbody, &strColor); nsres = nsIDOMHTMLBodyElement_SetBgColor(This->nsbody, &strColor);
nsAString_Finish(&strColor); nsAString_Finish(&strColor);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("SetBgColor failed: %08x\n", nsres); ERR("SetBgColor failed: %08lx\n", nsres);
return S_OK; return S_OK;
} }
...@@ -410,7 +410,7 @@ static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT ...@@ -410,7 +410,7 @@ static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT
nsres = nsIDOMHTMLBodyElement_SetText(This->nsbody, &text); nsres = nsIDOMHTMLBodyElement_SetText(This->nsbody, &text);
nsAString_Finish(&text); nsAString_Finish(&text);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetText failed: %08x\n", nsres); ERR("SetText failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -435,7 +435,7 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT ...@@ -435,7 +435,7 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT
V_VT(p) = VT_BSTR; V_VT(p) = VT_BSTR;
hres = nscolor_to_str(color, &V_BSTR(p)); hres = nscolor_to_str(color, &V_BSTR(p));
}else { }else {
ERR("GetText failed: %08x\n", nsres); ERR("GetText failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
...@@ -458,7 +458,7 @@ static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT ...@@ -458,7 +458,7 @@ static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT
nsres = nsIDOMHTMLBodyElement_SetLink(This->nsbody, &link_str); nsres = nsIDOMHTMLBodyElement_SetLink(This->nsbody, &link_str);
nsAString_Finish(&link_str); nsAString_Finish(&link_str);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("SetLink failed: %08x\n", nsres); ERR("SetLink failed: %08lx\n", nsres);
return S_OK; return S_OK;
} }
...@@ -490,7 +490,7 @@ static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT ...@@ -490,7 +490,7 @@ static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT
nsres = nsIDOMHTMLBodyElement_SetVLink(This->nsbody, &vlink_str); nsres = nsIDOMHTMLBodyElement_SetVLink(This->nsbody, &vlink_str);
nsAString_Finish(&vlink_str); nsAString_Finish(&vlink_str);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("SetLink failed: %08x\n", nsres); ERR("SetLink failed: %08lx\n", nsres);
return S_OK; return S_OK;
} }
...@@ -522,7 +522,7 @@ static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT ...@@ -522,7 +522,7 @@ static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT
nsres = nsIDOMHTMLBodyElement_SetALink(This->nsbody, &alink_str); nsres = nsIDOMHTMLBodyElement_SetALink(This->nsbody, &alink_str);
nsAString_Finish(&alink_str); nsAString_Finish(&alink_str);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("SetALink failed: %08x\n", nsres); ERR("SetALink failed: %08lx\n", nsres);
return S_OK; return S_OK;
} }
...@@ -678,9 +678,9 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I ...@@ -678,9 +678,9 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I
if(NS_SUCCEEDED(nsres)) { if(NS_SUCCEEDED(nsres)) {
nsres = nsIDOMRange_SelectNodeContents(nsrange, This->element.node.nsnode); nsres = nsIDOMRange_SelectNodeContents(nsrange, This->element.node.nsnode);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("SelectNodeContents failed: %08x\n", nsres); ERR("SelectNodeContents failed: %08lx\n", nsres);
}else { }else {
ERR("CreateRange failed: %08x\n", nsres); ERR("CreateRange failed: %08lx\n", nsres);
} }
hres = HTMLTxtRange_Create(This->element.node.doc->basedoc.doc_node, nsrange, range); hres = HTMLTxtRange_Create(This->element.node.doc->basedoc.doc_node, nsrange, range);
...@@ -820,7 +820,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, ...@@ -820,7 +820,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface,
{ {
HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface);
TRACE("(%p)->(%d)\n", This, v); TRACE("(%p)->(%ld)\n", This, v);
return IHTMLElement2_put_scrollTop(&This->element.IHTMLElement2_iface, v); return IHTMLElement2_put_scrollTop(&This->element.IHTMLElement2_iface, v);
} }
...@@ -838,7 +838,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface ...@@ -838,7 +838,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface
{ {
HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface);
TRACE("(%p)->(%d)\n", This, v); TRACE("(%p)->(%ld)\n", This, v);
return IHTMLElement2_put_scrollLeft(&This->element.IHTMLElement2_iface, v); return IHTMLElement2_put_scrollLeft(&This->element.IHTMLElement2_iface, v);
} }
......
dlls/mshtml/htmlcomment.c
View file @ 210abcd8
...@@ -115,7 +115,7 @@ static HRESULT WINAPI HTMLCommentElement_get_text(IHTMLCommentElement *iface, BS ...@@ -115,7 +115,7 @@ static HRESULT WINAPI HTMLCommentElement_get_text(IHTMLCommentElement *iface, BS
static HRESULT WINAPI HTMLCommentElement_put_atomic(IHTMLCommentElement *iface, LONG v) static HRESULT WINAPI HTMLCommentElement_put_atomic(IHTMLCommentElement *iface, LONG v)
{ {
HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/mshtml/htmlcurstyle.c
View file @ 210abcd8
...@@ -592,7 +592,7 @@ static HRESULT WINAPI HTMLCurrentStyle_getAttribute(IHTMLCurrentStyle *iface, BS ...@@ -592,7 +592,7 @@ static HRESULT WINAPI HTMLCurrentStyle_getAttribute(IHTMLCurrentStyle *iface, BS
LONG lFlags, VARIANT *AttributeValue) LONG lFlags, VARIANT *AttributeValue)
{ {
HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface);
FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); FIXME("(%p)->(%s %lx %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1323,7 +1323,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) ...@@ -1323,7 +1323,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p)
nsres = nsIDOMHTMLDocument_GetDefaultView(elem->node.doc->nsdoc, &nsview); nsres = nsIDOMHTMLDocument_GetDefaultView(elem->node.doc->nsdoc, &nsview);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetDefaultView failed: %08x\n", nsres); ERR("GetDefaultView failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -1336,7 +1336,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) ...@@ -1336,7 +1336,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p)
nsAString_Finish(&nsempty_str); nsAString_Finish(&nsempty_str);
nsIDOMWindow_Release(nswindow); nsIDOMWindow_Release(nswindow);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetComputedStyle failed: %08x\n", nsres); ERR("GetComputedStyle failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
......
dlls/mshtml/htmlelemcol.c
View file @ 210abcd8
...@@ -125,7 +125,7 @@ static ULONG WINAPI HTMLElementCollectionEnum_AddRef(IEnumVARIANT *iface) ...@@ -125,7 +125,7 @@ static ULONG WINAPI HTMLElementCollectionEnum_AddRef(IEnumVARIANT *iface)
HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -135,7 +135,7 @@ static ULONG WINAPI HTMLElementCollectionEnum_Release(IEnumVARIANT *iface) ...@@ -135,7 +135,7 @@ static ULONG WINAPI HTMLElementCollectionEnum_Release(IEnumVARIANT *iface)
HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
IHTMLElementCollection_Release(&This->col->IHTMLElementCollection_iface); IHTMLElementCollection_Release(&This->col->IHTMLElementCollection_iface);
...@@ -150,7 +150,7 @@ static HRESULT WINAPI HTMLElementCollectionEnum_Next(IEnumVARIANT *iface, ULONG ...@@ -150,7 +150,7 @@ static HRESULT WINAPI HTMLElementCollectionEnum_Next(IEnumVARIANT *iface, ULONG
HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface);
ULONG fetched = 0; ULONG fetched = 0;
TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, pCeltFetched); TRACE("(%p)->(%ld %p %p)\n", This, celt, rgVar, pCeltFetched);
while(This->iter+fetched < This->col->len && fetched < celt) { while(This->iter+fetched < This->col->len && fetched < celt) {
V_VT(rgVar+fetched) = VT_DISPATCH; V_VT(rgVar+fetched) = VT_DISPATCH;
...@@ -169,7 +169,7 @@ static HRESULT WINAPI HTMLElementCollectionEnum_Skip(IEnumVARIANT *iface, ULONG ...@@ -169,7 +169,7 @@ static HRESULT WINAPI HTMLElementCollectionEnum_Skip(IEnumVARIANT *iface, ULONG
{ {
HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface);
TRACE("(%p)->(%d)\n", This, celt); TRACE("(%p)->(%ld)\n", This, celt);
if(This->iter + celt > This->col->len) { if(This->iter + celt > This->col->len) {
This->iter = This->col->len; This->iter = This->col->len;
...@@ -240,7 +240,7 @@ static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) ...@@ -240,7 +240,7 @@ static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface)
HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -250,7 +250,7 @@ static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) ...@@ -250,7 +250,7 @@ static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface)
HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
unsigned i; unsigned i;
...@@ -311,7 +311,7 @@ static HRESULT WINAPI HTMLElementCollection_put_length(IHTMLElementCollection *i ...@@ -311,7 +311,7 @@ static HRESULT WINAPI HTMLElementCollection_put_length(IHTMLElementCollection *i
LONG v) LONG v)
{ {
HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -356,7 +356,7 @@ static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name) ...@@ -356,7 +356,7 @@ static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name)
hres = IHTMLElement_get_id(&elem->IHTMLElement_iface, &elem_id); hres = IHTMLElement_get_id(&elem->IHTMLElement_iface, &elem_id);
if(FAILED(hres)){ if(FAILED(hres)){
WARN("IHTMLElement_get_id failed: 0x%08x\n", hres); WARN("IHTMLElement_get_id failed: 0x%08lx\n", hres);
return FALSE; return FALSE;
} }
...@@ -522,7 +522,7 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, ...@@ -522,7 +522,7 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface,
nsAString_Finish(&tag_str); nsAString_Finish(&tag_str);
elem_vector_normalize(&buf); elem_vector_normalize(&buf);
TRACE("found %d tags\n", buf.len); TRACE("found %ld tags\n", buf.len);
*pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len,
dispex_compat_mode(&This->dispex)); dispex_compat_mode(&This->dispex));
...@@ -577,7 +577,7 @@ static HRESULT HTMLElementCollection_get_dispid(DispatchEx *dispex, BSTR name, D ...@@ -577,7 +577,7 @@ static HRESULT HTMLElementCollection_get_dispid(DispatchEx *dispex, BSTR name, D
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
*dispid = DISPID_ELEMCOL_0 + idx; *dispid = DISPID_ELEMCOL_0 + idx;
TRACE("ret %x\n", *dispid); TRACE("ret %lx\n", *dispid);
return S_OK; return S_OK;
} }
...@@ -587,7 +587,7 @@ static HRESULT HTMLElementCollection_invoke(DispatchEx *dispex, DISPID id, LCID ...@@ -587,7 +587,7 @@ static HRESULT HTMLElementCollection_invoke(DispatchEx *dispex, DISPID id, LCID
HTMLElementCollection *This = impl_from_DispatchEx(dispex); HTMLElementCollection *This = impl_from_DispatchEx(dispex);
DWORD idx; DWORD idx;
TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller);
idx = id - DISPID_ELEMCOL_0; idx = id - DISPID_ELEMCOL_0;
if(idx >= This->len) if(idx >= This->len)
...@@ -636,7 +636,7 @@ static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf) ...@@ -636,7 +636,7 @@ static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf)
nsres = nsIDOMNode_GetChildNodes(elem->nsnode, &nsnode_list); nsres = nsIDOMNode_GetChildNodes(elem->nsnode, &nsnode_list);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetChildNodes failed: %08x\n", nsres); ERR("GetChildNodes failed: %08lx\n", nsres);
return; return;
} }
...@@ -647,7 +647,7 @@ static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf) ...@@ -647,7 +647,7 @@ static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf)
for(i=0; i<list_len; i++) { for(i=0; i<list_len; i++) {
nsres = nsIDOMNodeList_Item(nsnode_list, i, &iter); nsres = nsIDOMNodeList_Item(nsnode_list, i, &iter);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Item failed: %08x\n", nsres); ERR("Item failed: %08lx\n", nsres);
continue; continue;
} }
...@@ -656,7 +656,7 @@ static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf) ...@@ -656,7 +656,7 @@ static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf)
hres = get_node(iter, TRUE, &node); hres = get_node(iter, TRUE, &node);
if(FAILED(hres)) { if(FAILED(hres)) {
FIXME("get_node failed: %08x\n", hres); FIXME("get_node failed: %08lx\n", hres);
continue; continue;
} }
...@@ -838,7 +838,7 @@ static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, ...@@ -838,7 +838,7 @@ static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems,
init_dispatch(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, init_dispatch(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface,
&HTMLElementCollection_dispex, compat_mode); &HTMLElementCollection_dispex, compat_mode);
TRACE("ret=%p len=%d\n", ret, len); TRACE("ret=%p len=%ld\n", ret, len);
return &ret->IHTMLElementCollection_iface; return &ret->IHTMLElementCollection_iface;
} }
dlls/mshtml/htmlevent.c
View file @ 210abcd8
...@@ -314,7 +314,7 @@ static ULONG WINAPI HTMLEventObj_AddRef(IHTMLEventObj *iface) ...@@ -314,7 +314,7 @@ static ULONG WINAPI HTMLEventObj_AddRef(IHTMLEventObj *iface)
HTMLEventObj *This = impl_from_IHTMLEventObj(iface); HTMLEventObj *This = impl_from_IHTMLEventObj(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -324,7 +324,7 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) ...@@ -324,7 +324,7 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface)
HTMLEventObj *This = impl_from_IHTMLEventObj(iface); HTMLEventObj *This = impl_from_IHTMLEventObj(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
if(This->event) if(This->event)
...@@ -509,7 +509,7 @@ static HRESULT WINAPI HTMLEventObj_get_toElement(IHTMLEventObj *iface, IHTMLElem ...@@ -509,7 +509,7 @@ static HRESULT WINAPI HTMLEventObj_get_toElement(IHTMLEventObj *iface, IHTMLElem
static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v) static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v)
{ {
HTMLEventObj *This = impl_from_IHTMLEventObj(iface); HTMLEventObj *This = impl_from_IHTMLEventObj(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -831,7 +831,7 @@ static ULONG WINAPI DOMEvent_AddRef(IDOMEvent *iface) ...@@ -831,7 +831,7 @@ static ULONG WINAPI DOMEvent_AddRef(IDOMEvent *iface)
DOMEvent *This = impl_from_IDOMEvent(iface); DOMEvent *This = impl_from_IDOMEvent(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref); TRACE("(%p) ref=%lu\n", This, ref);
return ref; return ref;
} }
...@@ -841,7 +841,7 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) ...@@ -841,7 +841,7 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface)
DOMEvent *This = impl_from_IDOMEvent(iface); DOMEvent *This = impl_from_IDOMEvent(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref); TRACE("(%p) ref=%lu\n", This, ref);
if(!ref) { if(!ref) {
if(This->destroy) if(This->destroy)
...@@ -1219,7 +1219,7 @@ static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARI ...@@ -1219,7 +1219,7 @@ static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARI
nsresult nsres; nsresult nsres;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%s %x %x %p %x)\n", This, debugstr_w(type), can_bubble, cancelable, view, detail); TRACE("(%p)->(%s %x %x %p %lx)\n", This, debugstr_w(type), can_bubble, cancelable, view, detail);
if(This->target) { if(This->target) {
TRACE("called on already dispatched event\n"); TRACE("called on already dispatched event\n");
...@@ -1238,7 +1238,7 @@ static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARI ...@@ -1238,7 +1238,7 @@ static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARI
NULL /* FIXME */, detail); NULL /* FIXME */, detail);
nsAString_Finish(&type_str); nsAString_Finish(&type_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("InitUIEvent failed: %08x\n", nsres); FIXME("InitUIEvent failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -1503,7 +1503,7 @@ static HRESULT WINAPI DOMMouseEvent_initMouseEvent(IDOMMouseEvent *iface, BSTR t ...@@ -1503,7 +1503,7 @@ static HRESULT WINAPI DOMMouseEvent_initMouseEvent(IDOMMouseEvent *iface, BSTR t
nsresult nsres; nsresult nsres;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%s %x %x %p %d %d %d %d %d %x %x %x %x %u %p)\n", This, debugstr_w(type), TRACE("(%p)->(%s %x %x %p %ld %ld %ld %ld %ld %x %x %x %x %u %p)\n", This, debugstr_w(type),
can_bubble, cancelable, view, detail, screen_x, screen_y, client_x, client_y, can_bubble, cancelable, view, detail, screen_x, screen_y, client_x, client_y,
ctrl_key, alt_key, shift_key, meta_key, button, related_target); ctrl_key, alt_key, shift_key, meta_key, button, related_target);
...@@ -1530,7 +1530,7 @@ static HRESULT WINAPI DOMMouseEvent_initMouseEvent(IDOMMouseEvent *iface, BSTR t ...@@ -1530,7 +1530,7 @@ static HRESULT WINAPI DOMMouseEvent_initMouseEvent(IDOMMouseEvent *iface, BSTR t
!!meta_key, button, nstarget); !!meta_key, button, nstarget);
nsAString_Finish(&type_str); nsAString_Finish(&type_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("InitMouseEvent failed: %08x\n", nsres); FIXME("InitMouseEvent failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
} }
...@@ -1940,7 +1940,7 @@ static HRESULT WINAPI DOMKeyboardEvent_initKeyboardEvent(IDOMKeyboardEvent *ifac ...@@ -1940,7 +1940,7 @@ static HRESULT WINAPI DOMKeyboardEvent_initKeyboardEvent(IDOMKeyboardEvent *ifac
ULONG location, BSTR modifiers_list, VARIANT_BOOL repeat, BSTR locale) ULONG location, BSTR modifiers_list, VARIANT_BOOL repeat, BSTR locale)
{ {
DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); DOMEvent *This = impl_from_IDOMKeyboardEvent(iface);
FIXME("(%p)->(%s %x %x %p %s %u %s %x %s)\n", This, debugstr_w(type), can_bubble, FIXME("(%p)->(%s %x %x %p %s %lu %s %x %s)\n", This, debugstr_w(type), can_bubble,
cancelable, view, debugstr_w(key), location, debugstr_w(modifiers_list), cancelable, view, debugstr_w(key), location, debugstr_w(modifiers_list),
repeat, debugstr_w(locale)); repeat, debugstr_w(locale));
return E_NOTIMPL; return E_NOTIMPL;
...@@ -2306,7 +2306,7 @@ HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, compat_mode_t compat_mod ...@@ -2306,7 +2306,7 @@ HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, compat_mode_t compat_mod
if(event_id == EVENTID_LAST) if(event_id == EVENTID_LAST)
FIXME("unknown event type %s\n", debugstr_w(type)); FIXME("unknown event type %s\n", debugstr_w(type));
}else { }else {
ERR("GetType failed: %08x\n", nsres); ERR("GetType failed: %08lx\n", nsres);
} }
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
...@@ -2330,7 +2330,7 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM ...@@ -2330,7 +2330,7 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM
nsres = nsIDOMHTMLDocument_CreateEvent(doc->nsdoc, &nsstr, &nsevent); nsres = nsIDOMHTMLDocument_CreateEvent(doc->nsdoc, &nsstr, &nsevent);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("CreateEvent(%s) failed: %08x\n", debugstr_w(type), nsres); FIXME("CreateEvent(%s) failed: %08lx\n", debugstr_w(type), nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -2354,7 +2354,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven ...@@ -2354,7 +2354,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven
nsres = nsIDOMHTMLDocument_CreateEvent(doc->nsdoc, &nsstr, &nsevent); nsres = nsIDOMHTMLDocument_CreateEvent(doc->nsdoc, &nsstr, &nsevent);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("CreateEvent(%s) failed: %08x\n", debugstr_w(event_types[event_info[event_id].type]), nsres); FIXME("CreateEvent(%s) failed: %08lx\n", debugstr_w(event_types[event_info[event_id].type]), nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -2381,7 +2381,7 @@ static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) ...@@ -2381,7 +2381,7 @@ static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv)
hres = IDispatchEx_InvokeEx(dispex, 0, GetUserDefaultLCID(), DISPATCH_METHOD, dp, retv, &ei, NULL); hres = IDispatchEx_InvokeEx(dispex, 0, GetUserDefaultLCID(), DISPATCH_METHOD, dp, retv, &ei, NULL);
IDispatchEx_Release(dispex); IDispatchEx_Release(dispex);
}else { }else {
TRACE("Could not get IDispatchEx interface: %08x\n", hres); TRACE("Could not get IDispatchEx interface: %08lx\n", hres);
hres = IDispatch_Invoke(disp, 0, &IID_NULL, GetUserDefaultLCID(), DISPATCH_METHOD, hres = IDispatch_Invoke(disp, 0, &IID_NULL, GetUserDefaultLCID(), DISPATCH_METHOD,
dp, retv, &ei, NULL); dp, retv, &ei, NULL);
} }
...@@ -2396,7 +2396,7 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event ...@@ -2396,7 +2396,7 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event
UINT argerr; UINT argerr;
EXCEPINFO ei; EXCEPINFO ei;
TRACE("%p,%d,%p,%p\n", disp, dispid, event_obj, retv); TRACE("%p,%ld,%p,%p\n", disp, dispid, event_obj, retv);
if(event_obj) { if(event_obj) {
V_VT(&event_arg) = VT_DISPATCH; V_VT(&event_arg) = VT_DISPATCH;
...@@ -2487,7 +2487,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp ...@@ -2487,7 +2487,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp
} }
VariantClear(&v); VariantClear(&v);
}else { }else {
WARN("%p %s <<< %08x\n", event_target, debugstr_w(event->type), hres); WARN("%p %s <<< %08lx\n", event_target, debugstr_w(event->type), hres);
} }
} }
} }
...@@ -2568,7 +2568,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp ...@@ -2568,7 +2568,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp
} }
VariantClear(&v); VariantClear(&v);
}else { }else {
WARN("%p %s <<< %08x\n", event_target, debugstr_w(event->type), hres); WARN("%p %s <<< %08lx\n", event_target, debugstr_w(event->type), hres);
} }
}else { }else {
VARIANTARG arg; VARIANTARG arg;
...@@ -2593,7 +2593,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp ...@@ -2593,7 +2593,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp
} }
VariantClear(&v); VariantClear(&v);
}else { }else {
WARN("%p %s attached <<< %08x\n", event_target, debugstr_w(event->type), hres); WARN("%p %s attached <<< %08lx\n", event_target, debugstr_w(event->type), hres);
} }
} }
} }
...@@ -2639,7 +2639,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp ...@@ -2639,7 +2639,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp
} }
VariantClear(&v); VariantClear(&v);
}else { }else {
WARN("%p cp %s [%u] <<< %08x\n", event_target, debugstr_w(event->type), i, hres); WARN("%p cp %s [%u] <<< %08lx\n", event_target, debugstr_w(event->type), i, hres);
} }
} }
} }
......
dlls/mshtml/htmlform.c
View file @ 210abcd8
...@@ -48,7 +48,7 @@ HRESULT return_nsform(nsresult nsres, nsIDOMHTMLFormElement *form, IHTMLFormElem ...@@ -48,7 +48,7 @@ HRESULT return_nsform(nsresult nsres, nsIDOMHTMLFormElement *form, IHTMLFormElem
HRESULT hres; HRESULT hres;
if (NS_FAILED(nsres)) { if (NS_FAILED(nsres)) {
ERR("GetForm failed: %08x\n", nsres); ERR("GetForm failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -83,14 +83,14 @@ static HRESULT htmlform_item(HTMLFormElement *This, int i, IDispatch **ret) ...@@ -83,14 +83,14 @@ static HRESULT htmlform_item(HTMLFormElement *This, int i, IDispatch **ret)
nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("GetElements failed: 0x%08x\n", nsres); FIXME("GetElements failed: 0x%08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
nsres = nsIDOMHTMLCollection_Item(elements, i, &item); nsres = nsIDOMHTMLCollection_Item(elements, i, &item);
nsIDOMHTMLCollection_Release(elements); nsIDOMHTMLCollection_Release(elements);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("Item failed: 0x%08x\n", nsres); FIXME("Item failed: 0x%08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -179,7 +179,7 @@ static HRESULT WINAPI HTMLFormElement_put_action(IHTMLFormElement *iface, BSTR v ...@@ -179,7 +179,7 @@ static HRESULT WINAPI HTMLFormElement_put_action(IHTMLFormElement *iface, BSTR v
nsres = nsIDOMHTMLFormElement_SetAction(This->nsform, &action_str); nsres = nsIDOMHTMLFormElement_SetAction(This->nsform, &action_str);
nsAString_Finish(&action_str); nsAString_Finish(&action_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetAction failed: %08x\n", nsres); ERR("SetAction failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -202,7 +202,7 @@ static HRESULT WINAPI HTMLFormElement_get_action(IHTMLFormElement *iface, BSTR * ...@@ -202,7 +202,7 @@ static HRESULT WINAPI HTMLFormElement_get_action(IHTMLFormElement *iface, BSTR *
nsAString_GetData(&action_str, &action); nsAString_GetData(&action_str, &action);
hres = nsuri_to_url(action, FALSE, p); hres = nsuri_to_url(action, FALSE, p);
}else { }else {
ERR("GetAction failed: %08x\n", nsres); ERR("GetAction failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
...@@ -310,7 +310,7 @@ static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDis ...@@ -310,7 +310,7 @@ static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDis
nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetElements failed: %08x\n", nsres); ERR("GetElements failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -333,7 +333,7 @@ static HRESULT WINAPI HTMLFormElement_put_target(IHTMLFormElement *iface, BSTR v ...@@ -333,7 +333,7 @@ static HRESULT WINAPI HTMLFormElement_put_target(IHTMLFormElement *iface, BSTR v
nsAString_Finish(&str); nsAString_Finish(&str);
if (NS_FAILED(nsres)) { if (NS_FAILED(nsres)) {
ERR("Set Target(%s) failed: %08x\n", wine_dbgstr_w(v), nsres); ERR("Set Target(%s) failed: %08lx\n", wine_dbgstr_w(v), nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -469,7 +469,7 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) ...@@ -469,7 +469,7 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface)
nsAString_Finish(&target_str); nsAString_Finish(&target_str);
IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Submit failed: %08x\n", nsres); ERR("Submit failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -484,7 +484,7 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) ...@@ -484,7 +484,7 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface)
nsAString_GetData(&action_uri_str, &action_uri); nsAString_GetData(&action_uri_str, &action_uri);
hres = create_uri(action_uri, 0, &uri); hres = create_uri(action_uri, 0, &uri);
}else { }else {
ERR("GetFormData failed: %08x\n", nsres); ERR("GetFormData failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
nsAString_Finish(&action_uri_str); nsAString_Finish(&action_uri_str);
...@@ -512,7 +512,7 @@ static HRESULT WINAPI HTMLFormElement_reset(IHTMLFormElement *iface) ...@@ -512,7 +512,7 @@ static HRESULT WINAPI HTMLFormElement_reset(IHTMLFormElement *iface)
TRACE("(%p)->()\n", This); TRACE("(%p)->()\n", This);
nsres = nsIDOMHTMLFormElement_Reset(This->nsform); nsres = nsIDOMHTMLFormElement_Reset(This->nsform);
if (NS_FAILED(nsres)) { if (NS_FAILED(nsres)) {
ERR("Reset failed: %08x\n", nsres); ERR("Reset failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -522,7 +522,7 @@ static HRESULT WINAPI HTMLFormElement_reset(IHTMLFormElement *iface) ...@@ -522,7 +522,7 @@ static HRESULT WINAPI HTMLFormElement_reset(IHTMLFormElement *iface)
static HRESULT WINAPI HTMLFormElement_put_length(IHTMLFormElement *iface, LONG v) static HRESULT WINAPI HTMLFormElement_put_length(IHTMLFormElement *iface, LONG v)
{ {
HTMLFormElement *This = impl_from_IHTMLFormElement(iface); HTMLFormElement *This = impl_from_IHTMLFormElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -535,7 +535,7 @@ static HRESULT WINAPI HTMLFormElement_get_length(IHTMLFormElement *iface, LONG * ...@@ -535,7 +535,7 @@ static HRESULT WINAPI HTMLFormElement_get_length(IHTMLFormElement *iface, LONG *
nsres = nsIDOMHTMLFormElement_GetLength(This->nsform, p); nsres = nsIDOMHTMLFormElement_GetLength(This->nsform, p);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetLength failed: %08x\n", nsres); ERR("GetLength failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -658,17 +658,17 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, ...@@ -658,17 +658,17 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
nsresult nsres; nsresult nsres;
HRESULT hres = DISP_E_UNKNOWNNAME; HRESULT hres = DISP_E_UNKNOWNNAME;
TRACE("(%p)->(%s %x %p)\n", This, wine_dbgstr_w(name), grfdex, pid); TRACE("(%p)->(%s %lx %p)\n", This, wine_dbgstr_w(name), grfdex, pid);
nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("GetElements failed: 0x%08x\n", nsres); FIXME("GetElements failed: 0x%08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
nsres = nsIDOMHTMLCollection_GetLength(elements, &len); nsres = nsIDOMHTMLCollection_GetLength(elements, &len);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("GetLength failed: 0x%08x\n", nsres); FIXME("GetLength failed: 0x%08lx\n", nsres);
nsIDOMHTMLCollection_Release(elements); nsIDOMHTMLCollection_Release(elements);
return E_FAIL; return E_FAIL;
} }
...@@ -695,7 +695,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, ...@@ -695,7 +695,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
nsres = nsIDOMHTMLCollection_Item(elements, i, &nsitem); nsres = nsIDOMHTMLCollection_Item(elements, i, &nsitem);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("Item failed: 0x%08x\n", nsres); FIXME("Item failed: 0x%08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
break; break;
} }
...@@ -703,7 +703,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, ...@@ -703,7 +703,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
nsres = nsIDOMNode_QueryInterface(nsitem, &IID_nsIDOMElement, (void**)&elem); nsres = nsIDOMNode_QueryInterface(nsitem, &IID_nsIDOMElement, (void**)&elem);
nsIDOMNode_Release(nsitem); nsIDOMNode_Release(nsitem);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("Failed to get nsIDOMHTMLNode interface: 0x%08x\n", nsres); FIXME("Failed to get nsIDOMHTMLNode interface: 0x%08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
break; break;
} }
...@@ -711,7 +711,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, ...@@ -711,7 +711,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
/* compare by id attr */ /* compare by id attr */
nsres = nsIDOMElement_GetId(elem, &nsstr); nsres = nsIDOMElement_GetId(elem, &nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("GetId failed: 0x%08x\n", nsres); FIXME("GetId failed: 0x%08lx\n", nsres);
nsIDOMElement_Release(elem); nsIDOMElement_Release(elem);
hres = E_FAIL; hres = E_FAIL;
break; break;
...@@ -753,7 +753,7 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, ...@@ -753,7 +753,7 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface,
IDispatch *ret; IDispatch *ret;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller);
hres = htmlform_item(This, id - MSHTML_DISPID_CUSTOM_MIN, &ret); hres = htmlform_item(This, id - MSHTML_DISPID_CUSTOM_MIN, &ret);
if(FAILED(hres)) if(FAILED(hres))
......
dlls/mshtml/htmlframe.c
View file @ 210abcd8
...@@ -138,7 +138,7 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) ...@@ -138,7 +138,7 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v)
nsres = nsIDOMHTMLIFrameElement_SetSrc(This->nsiframe, &nsstr); nsres = nsIDOMHTMLIFrameElement_SetSrc(This->nsiframe, &nsstr);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetSrc failed: %08x\n", nsres); ERR("SetSrc failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -189,7 +189,7 @@ static HRESULT WINAPI HTMLFrameBase_put_name(IHTMLFrameBase *iface, BSTR v) ...@@ -189,7 +189,7 @@ static HRESULT WINAPI HTMLFrameBase_put_name(IHTMLFrameBase *iface, BSTR v)
nsres = nsIDOMHTMLIFrameElement_SetName(This->nsiframe, &name_str); nsres = nsIDOMHTMLIFrameElement_SetName(This->nsiframe, &name_str);
nsAString_Finish(&name_str); nsAString_Finish(&name_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetName failed: %08x\n", nsres); ERR("SetName failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -251,7 +251,7 @@ static HRESULT WINAPI HTMLFrameBase_put_frameBorder(IHTMLFrameBase *iface, BSTR ...@@ -251,7 +251,7 @@ static HRESULT WINAPI HTMLFrameBase_put_frameBorder(IHTMLFrameBase *iface, BSTR
nsres = nsIDOMHTMLIFrameElement_SetFrameBorder(This->nsiframe, &nsstr); nsres = nsIDOMHTMLIFrameElement_SetFrameBorder(This->nsiframe, &nsstr);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetFrameBorder failed: %08x\n", nsres); ERR("SetFrameBorder failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -352,7 +352,7 @@ static HRESULT WINAPI HTMLFrameBase_get_marginWidth(IHTMLFrameBase *iface, VARIA ...@@ -352,7 +352,7 @@ static HRESULT WINAPI HTMLFrameBase_get_marginWidth(IHTMLFrameBase *iface, VARIA
V_BSTR(p) = NULL; V_BSTR(p) = NULL;
} }
}else { }else {
ERR("GetMarginWidth failed: %08x\n", nsres); ERR("GetMarginWidth failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
...@@ -419,7 +419,7 @@ static HRESULT WINAPI HTMLFrameBase_get_marginHeight(IHTMLFrameBase *iface, VARI ...@@ -419,7 +419,7 @@ static HRESULT WINAPI HTMLFrameBase_get_marginHeight(IHTMLFrameBase *iface, VARI
V_BSTR(p) = NULL; V_BSTR(p) = NULL;
} }
}else { }else {
ERR("SetMarginHeight failed: %08x\n", nsres); ERR("SetMarginHeight failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
...@@ -465,7 +465,7 @@ static HRESULT WINAPI HTMLFrameBase_put_scrolling(IHTMLFrameBase *iface, BSTR v) ...@@ -465,7 +465,7 @@ static HRESULT WINAPI HTMLFrameBase_put_scrolling(IHTMLFrameBase *iface, BSTR v)
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetScrolling failed: 0x%08x\n", nsres); ERR("SetScrolling failed: 0x%08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -493,7 +493,7 @@ static HRESULT WINAPI HTMLFrameBase_get_scrolling(IHTMLFrameBase *iface, BSTR *p ...@@ -493,7 +493,7 @@ static HRESULT WINAPI HTMLFrameBase_get_scrolling(IHTMLFrameBase *iface, BSTR *p
} }
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetScrolling failed: 0x%08x\n", nsres); ERR("GetScrolling failed: 0x%08lx\n", nsres);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
return E_FAIL; return E_FAIL;
} }
...@@ -965,7 +965,7 @@ static HRESULT HTMLFrameElement_bind_to_tree(HTMLDOMNode *iface) ...@@ -965,7 +965,7 @@ static HRESULT HTMLFrameElement_bind_to_tree(HTMLDOMNode *iface)
nsres = nsIDOMHTMLFrameElement_GetContentDocument(This->framebase.nsframe, &nsdoc); nsres = nsIDOMHTMLFrameElement_GetContentDocument(This->framebase.nsframe, &nsdoc);
if(NS_FAILED(nsres) || !nsdoc) { if(NS_FAILED(nsres) || !nsdoc) {
ERR("GetContentDocument failed: %08x\n", nsres); ERR("GetContentDocument failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -1116,7 +1116,7 @@ static HRESULT WINAPI HTMLIFrameElement_Invoke(IHTMLIFrameElement *iface, DISPID ...@@ -1116,7 +1116,7 @@ static HRESULT WINAPI HTMLIFrameElement_Invoke(IHTMLIFrameElement *iface, DISPID
static HRESULT WINAPI HTMLIFrameElement_put_vspace(IHTMLIFrameElement *iface, LONG v) static HRESULT WINAPI HTMLIFrameElement_put_vspace(IHTMLIFrameElement *iface, LONG v)
{ {
HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1130,7 +1130,7 @@ static HRESULT WINAPI HTMLIFrameElement_get_vspace(IHTMLIFrameElement *iface, LO ...@@ -1130,7 +1130,7 @@ static HRESULT WINAPI HTMLIFrameElement_get_vspace(IHTMLIFrameElement *iface, LO
static HRESULT WINAPI HTMLIFrameElement_put_hspace(IHTMLIFrameElement *iface, LONG v) static HRESULT WINAPI HTMLIFrameElement_put_hspace(IHTMLIFrameElement *iface, LONG v)
{ {
HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1246,7 +1246,7 @@ static HRESULT WINAPI HTMLIFrameElement2_put_height(IHTMLIFrameElement2 *iface, ...@@ -1246,7 +1246,7 @@ static HRESULT WINAPI HTMLIFrameElement2_put_height(IHTMLIFrameElement2 *iface,
nsres = nsIDOMHTMLIFrameElement_SetHeight(This->framebase.nsiframe, &nsstr); nsres = nsIDOMHTMLIFrameElement_SetHeight(This->framebase.nsiframe, &nsstr);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetHeight failed: %08x\n", nsres); ERR("SetHeight failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -1284,7 +1284,7 @@ static HRESULT WINAPI HTMLIFrameElement2_put_width(IHTMLIFrameElement2 *iface, V ...@@ -1284,7 +1284,7 @@ static HRESULT WINAPI HTMLIFrameElement2_put_width(IHTMLIFrameElement2 *iface, V
nsres = nsIDOMHTMLIFrameElement_SetWidth(This->framebase.nsiframe, &nsstr); nsres = nsIDOMHTMLIFrameElement_SetWidth(This->framebase.nsiframe, &nsstr);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetWidth failed: %08x\n", nsres); ERR("SetWidth failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -1544,7 +1544,7 @@ static HRESULT HTMLIFrame_bind_to_tree(HTMLDOMNode *iface) ...@@ -1544,7 +1544,7 @@ static HRESULT HTMLIFrame_bind_to_tree(HTMLDOMNode *iface)
nsres = nsIDOMHTMLIFrameElement_GetContentDocument(This->framebase.nsiframe, &nsdoc); nsres = nsIDOMHTMLIFrameElement_GetContentDocument(This->framebase.nsiframe, &nsdoc);
if(NS_FAILED(nsres) || !nsdoc) { if(NS_FAILED(nsres) || !nsdoc) {
ERR("GetContentDocument failed: %08x\n", nsres); ERR("GetContentDocument failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
......
dlls/mshtml/htmlimg.c
View file @ 210abcd8
...@@ -107,7 +107,7 @@ static HRESULT WINAPI HTMLImgElement_put_isMap(IHTMLImgElement *iface, VARIANT_B ...@@ -107,7 +107,7 @@ static HRESULT WINAPI HTMLImgElement_put_isMap(IHTMLImgElement *iface, VARIANT_B
nsres = nsIDOMHTMLImageElement_SetIsMap(This->nsimg, v != VARIANT_FALSE); nsres = nsIDOMHTMLImageElement_SetIsMap(This->nsimg, v != VARIANT_FALSE);
if (NS_FAILED(nsres)) { if (NS_FAILED(nsres)) {
ERR("Set IsMap failed: %08x\n", nsres); ERR("Set IsMap failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -127,7 +127,7 @@ static HRESULT WINAPI HTMLImgElement_get_isMap(IHTMLImgElement *iface, VARIANT_B ...@@ -127,7 +127,7 @@ static HRESULT WINAPI HTMLImgElement_get_isMap(IHTMLImgElement *iface, VARIANT_B
nsres = nsIDOMHTMLImageElement_GetIsMap(This->nsimg, &b); nsres = nsIDOMHTMLImageElement_GetIsMap(This->nsimg, &b);
if (NS_FAILED(nsres)) { if (NS_FAILED(nsres)) {
ERR("Get IsMap failed: %08x\n", nsres); ERR("Get IsMap failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -222,7 +222,7 @@ static HRESULT WINAPI HTMLImgElement_get_border(IHTMLImgElement *iface, VARIANT ...@@ -222,7 +222,7 @@ static HRESULT WINAPI HTMLImgElement_get_border(IHTMLImgElement *iface, VARIANT
static HRESULT WINAPI HTMLImgElement_put_vspace(IHTMLImgElement *iface, LONG v) static HRESULT WINAPI HTMLImgElement_put_vspace(IHTMLImgElement *iface, LONG v)
{ {
HTMLImg *This = impl_from_IHTMLImgElement(iface); HTMLImg *This = impl_from_IHTMLImgElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -236,7 +236,7 @@ static HRESULT WINAPI HTMLImgElement_get_vspace(IHTMLImgElement *iface, LONG *p) ...@@ -236,7 +236,7 @@ static HRESULT WINAPI HTMLImgElement_get_vspace(IHTMLImgElement *iface, LONG *p)
static HRESULT WINAPI HTMLImgElement_put_hspace(IHTMLImgElement *iface, LONG v) static HRESULT WINAPI HTMLImgElement_put_hspace(IHTMLImgElement *iface, LONG v)
{ {
HTMLImg *This = impl_from_IHTMLImgElement(iface); HTMLImg *This = impl_from_IHTMLImgElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -259,7 +259,7 @@ static HRESULT WINAPI HTMLImgElement_put_alt(IHTMLImgElement *iface, BSTR v) ...@@ -259,7 +259,7 @@ static HRESULT WINAPI HTMLImgElement_put_alt(IHTMLImgElement *iface, BSTR v)
nsres = nsIDOMHTMLImageElement_SetAlt(This->nsimg, &alt_str); nsres = nsIDOMHTMLImageElement_SetAlt(This->nsimg, &alt_str);
nsAString_Finish(&alt_str); nsAString_Finish(&alt_str);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("SetAlt failed: %08x\n", nsres); ERR("SetAlt failed: %08lx\n", nsres);
return S_OK; return S_OK;
} }
...@@ -289,7 +289,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) ...@@ -289,7 +289,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v)
nsres = nsIDOMHTMLImageElement_SetSrc(This->nsimg, &src_str); nsres = nsIDOMHTMLImageElement_SetSrc(This->nsimg, &src_str);
nsAString_Finish(&src_str); nsAString_Finish(&src_str);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("SetSrc failed: %08x\n", nsres); ERR("SetSrc failed: %08lx\n", nsres);
return S_OK; return S_OK;
} }
...@@ -318,7 +318,7 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) ...@@ -318,7 +318,7 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p)
hres = nsuri_to_url(src, TRUE, p); hres = nsuri_to_url(src, TRUE, p);
} }
}else { }else {
ERR("GetSrc failed: %08x\n", nsres); ERR("GetSrc failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
...@@ -385,7 +385,7 @@ static HRESULT WINAPI HTMLImgElement_get_complete(IHTMLImgElement *iface, VARIAN ...@@ -385,7 +385,7 @@ static HRESULT WINAPI HTMLImgElement_get_complete(IHTMLImgElement *iface, VARIAN
nsres = nsIDOMHTMLImageElement_GetComplete(This->nsimg, &complete); nsres = nsIDOMHTMLImageElement_GetComplete(This->nsimg, &complete);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetComplete failed: %08x\n", nsres); ERR("GetComplete failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -420,7 +420,7 @@ static HRESULT WINAPI HTMLImgElement_put_align(IHTMLImgElement *iface, BSTR v) ...@@ -420,7 +420,7 @@ static HRESULT WINAPI HTMLImgElement_put_align(IHTMLImgElement *iface, BSTR v)
nsres = nsIDOMHTMLImageElement_SetAlign(This->nsimg, &str); nsres = nsIDOMHTMLImageElement_SetAlign(This->nsimg, &str);
nsAString_Finish(&str); nsAString_Finish(&str);
if (NS_FAILED(nsres)){ if (NS_FAILED(nsres)){
ERR("Set Align(%s) failed: %08x\n", debugstr_w(v), nsres); ERR("Set Align(%s) failed: %08lx\n", debugstr_w(v), nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -520,11 +520,11 @@ static HRESULT WINAPI HTMLImgElement_put_width(IHTMLImgElement *iface, LONG v) ...@@ -520,11 +520,11 @@ static HRESULT WINAPI HTMLImgElement_put_width(IHTMLImgElement *iface, LONG v)
HTMLImg *This = impl_from_IHTMLImgElement(iface); HTMLImg *This = impl_from_IHTMLImgElement(iface);
nsresult nsres; nsresult nsres;
TRACE("(%p)->(%d)\n", This, v); TRACE("(%p)->(%ld)\n", This, v);
nsres = nsIDOMHTMLImageElement_SetWidth(This->nsimg, v); nsres = nsIDOMHTMLImageElement_SetWidth(This->nsimg, v);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetWidth failed: %08x\n", nsres); ERR("SetWidth failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -541,7 +541,7 @@ static HRESULT WINAPI HTMLImgElement_get_width(IHTMLImgElement *iface, LONG *p) ...@@ -541,7 +541,7 @@ static HRESULT WINAPI HTMLImgElement_get_width(IHTMLImgElement *iface, LONG *p)
nsres = nsIDOMHTMLImageElement_GetWidth(This->nsimg, &width); nsres = nsIDOMHTMLImageElement_GetWidth(This->nsimg, &width);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetWidth failed: %08x\n", nsres); ERR("GetWidth failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -554,11 +554,11 @@ static HRESULT WINAPI HTMLImgElement_put_height(IHTMLImgElement *iface, LONG v) ...@@ -554,11 +554,11 @@ static HRESULT WINAPI HTMLImgElement_put_height(IHTMLImgElement *iface, LONG v)
HTMLImg *This = impl_from_IHTMLImgElement(iface); HTMLImg *This = impl_from_IHTMLImgElement(iface);
nsresult nsres; nsresult nsres;
TRACE("(%p)->(%d)\n", This, v); TRACE("(%p)->(%ld)\n", This, v);
nsres = nsIDOMHTMLImageElement_SetHeight(This->nsimg, v); nsres = nsIDOMHTMLImageElement_SetHeight(This->nsimg, v);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetHeight failed: %08x\n", nsres); ERR("SetHeight failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -575,7 +575,7 @@ static HRESULT WINAPI HTMLImgElement_get_height(IHTMLImgElement *iface, LONG *p) ...@@ -575,7 +575,7 @@ static HRESULT WINAPI HTMLImgElement_get_height(IHTMLImgElement *iface, LONG *p)
nsres = nsIDOMHTMLImageElement_GetHeight(This->nsimg, &height); nsres = nsIDOMHTMLImageElement_GetHeight(This->nsimg, &height);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetHeight failed: %08x\n", nsres); ERR("GetHeight failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -791,7 +791,7 @@ static ULONG WINAPI HTMLImageElementFactory_AddRef(IHTMLImageElementFactory *ifa ...@@ -791,7 +791,7 @@ static ULONG WINAPI HTMLImageElementFactory_AddRef(IHTMLImageElementFactory *ifa
HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -801,7 +801,7 @@ static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *if ...@@ -801,7 +801,7 @@ static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *if
HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) if(!ref)
heap_free(This); heap_free(This);
...@@ -854,7 +854,7 @@ static LONG var_to_size(const VARIANT *v) ...@@ -854,7 +854,7 @@ static LONG var_to_size(const VARIANT *v)
hres = VarI4FromStr(V_BSTR(v), 0, 0, &ret); hres = VarI4FromStr(V_BSTR(v), 0, 0, &ret);
if(FAILED(hres)) { if(FAILED(hres)) {
FIXME("VarI4FromStr failed: %08x\n", hres); FIXME("VarI4FromStr failed: %08lx\n", hres);
return 0; return 0;
} }
return ret; return ret;
...@@ -903,7 +903,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i ...@@ -903,7 +903,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i
(void**)&img); (void**)&img);
IHTMLElement_Release(&elem->IHTMLElement_iface); IHTMLElement_Release(&elem->IHTMLElement_iface);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("IHTMLElement_QueryInterface failed: 0x%08x\n", hres); ERR("IHTMLElement_QueryInterface failed: 0x%08lx\n", hres);
return hres; return hres;
} }
......
dlls/mshtml/htmllink.c
View file @ 210abcd8
...@@ -170,7 +170,7 @@ static HRESULT WINAPI HTMLLinkElement_put_rev(IHTMLLinkElement *iface, BSTR v) ...@@ -170,7 +170,7 @@ static HRESULT WINAPI HTMLLinkElement_put_rev(IHTMLLinkElement *iface, BSTR v)
nsres = nsIDOMHTMLLinkElement_SetRev(This->nslink, &nsstr); nsres = nsIDOMHTMLLinkElement_SetRev(This->nslink, &nsstr);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetRev failed: %08x\n", nsres); ERR("SetRev failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -319,7 +319,7 @@ static HRESULT WINAPI HTMLLinkElement_put_media(IHTMLLinkElement *iface, BSTR v) ...@@ -319,7 +319,7 @@ static HRESULT WINAPI HTMLLinkElement_put_media(IHTMLLinkElement *iface, BSTR v)
nsAString_Finish(&str); nsAString_Finish(&str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Set Media(%s) failed: %08x\n", debugstr_w(v), nsres); ERR("Set Media(%s) failed: %08lx\n", debugstr_w(v), nsres);
return E_FAIL; return E_FAIL;
} }
return S_OK; return S_OK;
......
dlls/mshtml/htmllocation.c
View file @ 210abcd8
...@@ -64,7 +64,7 @@ static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url) ...@@ -64,7 +64,7 @@ static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url)
return hres; return hres;
if(!InternetCrackUrlW(doc_url, 0, 0, url)) { if(!InternetCrackUrlW(doc_url, 0, 0, url)) {
FIXME("InternetCrackUrlW failed: 0x%08x\n", GetLastError()); FIXME("InternetCrackUrlW failed: 0x%08lx\n", GetLastError());
SetLastError(0); SetLastError(0);
return E_FAIL; return E_FAIL;
} }
...@@ -108,7 +108,7 @@ static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface) ...@@ -108,7 +108,7 @@ static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface)
HTMLLocation *This = impl_from_IHTMLLocation(iface); HTMLLocation *This = impl_from_IHTMLLocation(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -118,7 +118,7 @@ static ULONG WINAPI HTMLLocation_Release(IHTMLLocation *iface) ...@@ -118,7 +118,7 @@ static ULONG WINAPI HTMLLocation_Release(IHTMLLocation *iface)
HTMLLocation *This = impl_from_IHTMLLocation(iface); HTMLLocation *This = impl_from_IHTMLLocation(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
if(This->window) if(This->window)
...@@ -240,7 +240,7 @@ static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) ...@@ -240,7 +240,7 @@ static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p)
} }
if(GetLastError() != ERROR_INSUFFICIENT_BUFFER) { if(GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
FIXME("InternetCreateUrl failed with error: %08x\n", GetLastError()); FIXME("InternetCreateUrl failed with error: %08lx\n", GetLastError());
SetLastError(0); SetLastError(0);
ret = E_FAIL; ret = E_FAIL;
goto cleanup; goto cleanup;
...@@ -254,7 +254,7 @@ static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) ...@@ -254,7 +254,7 @@ static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p)
} }
if(!InternetCreateUrlW(&url, ICU_ESCAPE, buf, &len)) { if(!InternetCreateUrlW(&url, ICU_ESCAPE, buf, &len)) {
FIXME("InternetCreateUrl failed with error: %08x\n", GetLastError()); FIXME("InternetCreateUrl failed with error: %08lx\n", GetLastError());
SetLastError(0); SetLastError(0);
ret = E_FAIL; ret = E_FAIL;
goto cleanup; goto cleanup;
......
dlls/mshtml/htmlnode.c
View file @ 210abcd8
...@@ -85,7 +85,7 @@ static ULONG WINAPI HTMLDOMChildrenCollectionEnum_AddRef(IEnumVARIANT *iface) ...@@ -85,7 +85,7 @@ static ULONG WINAPI HTMLDOMChildrenCollectionEnum_AddRef(IEnumVARIANT *iface)
HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -95,7 +95,7 @@ static ULONG WINAPI HTMLDOMChildrenCollectionEnum_Release(IEnumVARIANT *iface) ...@@ -95,7 +95,7 @@ static ULONG WINAPI HTMLDOMChildrenCollectionEnum_Release(IEnumVARIANT *iface)
HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
IHTMLDOMChildrenCollection_Release(&This->col->IHTMLDOMChildrenCollection_iface); IHTMLDOMChildrenCollection_Release(&This->col->IHTMLDOMChildrenCollection_iface);
...@@ -124,7 +124,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Next(IEnumVARIANT *iface, UL ...@@ -124,7 +124,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Next(IEnumVARIANT *iface, UL
nsresult nsres; nsresult nsres;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, pCeltFetched); TRACE("(%p)->(%ld %p %p)\n", This, celt, rgVar, pCeltFetched);
len = get_enum_len(This); len = get_enum_len(This);
...@@ -135,7 +135,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Next(IEnumVARIANT *iface, UL ...@@ -135,7 +135,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Next(IEnumVARIANT *iface, UL
hres = get_node(nsnode, TRUE, &node); hres = get_node(nsnode, TRUE, &node);
nsIDOMNode_Release(nsnode); nsIDOMNode_Release(nsnode);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("get_node failed: %08x\n", hres); ERR("get_node failed: %08lx\n", hres);
break; break;
} }
...@@ -156,7 +156,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Skip(IEnumVARIANT *iface, UL ...@@ -156,7 +156,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Skip(IEnumVARIANT *iface, UL
HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface);
ULONG len; ULONG len;
TRACE("(%p)->(%d)\n", This, celt); TRACE("(%p)->(%ld)\n", This, celt);
len = get_enum_len(This); len = get_enum_len(This);
if(This->iter + celt > len) { if(This->iter + celt > len) {
...@@ -227,7 +227,7 @@ static ULONG WINAPI HTMLDOMChildrenCollection_AddRef(IHTMLDOMChildrenCollection ...@@ -227,7 +227,7 @@ static ULONG WINAPI HTMLDOMChildrenCollection_AddRef(IHTMLDOMChildrenCollection
HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -237,7 +237,7 @@ static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection ...@@ -237,7 +237,7 @@ static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection
HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
nsIDOMNodeList_Release(This->nslist); nsIDOMNodeList_Release(This->nslist);
...@@ -320,7 +320,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection ...@@ -320,7 +320,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection
nsresult nsres; nsresult nsres;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%d %p)\n", This, index, ppItem); TRACE("(%p)->(%ld %p)\n", This, index, ppItem);
if (ppItem) if (ppItem)
*ppItem = NULL; *ppItem = NULL;
...@@ -333,7 +333,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection ...@@ -333,7 +333,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection
nsres = nsIDOMNodeList_Item(This->nslist, index, &nsnode); nsres = nsIDOMNodeList_Item(This->nslist, index, &nsnode);
if(NS_FAILED(nsres) || !nsnode) { if(NS_FAILED(nsres) || !nsnode) {
ERR("Item failed: %08x\n", nsres); ERR("Item failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -382,7 +382,7 @@ static HRESULT HTMLDOMChildrenCollection_get_dispid(DispatchEx *dispex, BSTR nam ...@@ -382,7 +382,7 @@ static HRESULT HTMLDOMChildrenCollection_get_dispid(DispatchEx *dispex, BSTR nam
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
*dispid = DISPID_CHILDCOL_0 + idx; *dispid = DISPID_CHILDCOL_0 + idx;
TRACE("ret %x\n", *dispid); TRACE("ret %lx\n", *dispid);
return S_OK; return S_OK;
} }
...@@ -391,7 +391,7 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L ...@@ -391,7 +391,7 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L
{ {
HTMLDOMChildrenCollection *This = impl_from_DispatchEx(dispex); HTMLDOMChildrenCollection *This = impl_from_DispatchEx(dispex);
TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller);
switch(flags) { switch(flags) {
case DISPATCH_PROPERTYGET: { case DISPATCH_PROPERTYGET: {
...@@ -476,7 +476,7 @@ static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface) ...@@ -476,7 +476,7 @@ static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface)
ref = ccref_incr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface); ref = ccref_incr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -486,7 +486,7 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) ...@@ -486,7 +486,7 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface)
HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface);
LONG ref = ccref_decr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface, /*&node_ccp*/ NULL); LONG ref = ccref_decr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface, /*&node_ccp*/ NULL);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -573,7 +573,7 @@ static HRESULT WINAPI HTMLDOMNode_get_parentNode(IHTMLDOMNode *iface, IHTMLDOMNo ...@@ -573,7 +573,7 @@ static HRESULT WINAPI HTMLDOMNode_get_parentNode(IHTMLDOMNode *iface, IHTMLDOMNo
nsres = nsIDOMNode_GetParentNode(This->nsnode, &nsnode); nsres = nsIDOMNode_GetParentNode(This->nsnode, &nsnode);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetParentNode failed: %08x\n", nsres); ERR("GetParentNode failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -601,7 +601,7 @@ static HRESULT WINAPI HTMLDOMNode_hasChildNodes(IHTMLDOMNode *iface, VARIANT_BOO ...@@ -601,7 +601,7 @@ static HRESULT WINAPI HTMLDOMNode_hasChildNodes(IHTMLDOMNode *iface, VARIANT_BOO
nsres = nsIDOMNode_HasChildNodes(This->nsnode, &has_child); nsres = nsIDOMNode_HasChildNodes(This->nsnode, &has_child);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("HasChildNodes failed: %08x\n", nsres); ERR("HasChildNodes failed: %08lx\n", nsres);
*fChildren = variant_bool(has_child); *fChildren = variant_bool(has_child);
return S_OK; return S_OK;
...@@ -617,7 +617,7 @@ static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch ...@@ -617,7 +617,7 @@ static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch
hres = map_nsresult(nsIDOMNode_GetChildNodes(This->nsnode, &nslist)); hres = map_nsresult(nsIDOMNode_GetChildNodes(This->nsnode, &nslist));
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("GetChildNodes failed: %08x\n", hres); ERR("GetChildNodes failed: %08lx\n", hres);
return hres; return hres;
} }
...@@ -695,7 +695,7 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode ...@@ -695,7 +695,7 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
nsres = nsIDOMNode_InsertBefore(This->nsnode, new_child->nsnode, ref_node ? ref_node->nsnode : NULL, &nsnode); nsres = nsIDOMNode_InsertBefore(This->nsnode, new_child->nsnode, ref_node ? ref_node->nsnode : NULL, &nsnode);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("InsertBefore failed: %08x\n", nsres); ERR("InsertBefore failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
} }
...@@ -732,7 +732,7 @@ static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode ...@@ -732,7 +732,7 @@ static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode
nsres = nsIDOMNode_RemoveChild(This->nsnode, node_obj->nsnode, &nsnode); nsres = nsIDOMNode_RemoveChild(This->nsnode, node_obj->nsnode, &nsnode);
node_release(node_obj); node_release(node_obj);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("RemoveChild failed: %08x\n", nsres); ERR("RemoveChild failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -795,7 +795,7 @@ static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fD ...@@ -795,7 +795,7 @@ static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fD
nsres = nsIDOMNode_CloneNode(This->nsnode, fDeep != VARIANT_FALSE, 1, &nsnode); nsres = nsIDOMNode_CloneNode(This->nsnode, fDeep != VARIANT_FALSE, 1, &nsnode);
if(NS_FAILED(nsres) || !nsnode) { if(NS_FAILED(nsres) || !nsnode) {
ERR("CloneNode failed: %08x\n", nsres); ERR("CloneNode failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -850,7 +850,7 @@ static HRESULT WINAPI HTMLDOMNode_appendChild(IHTMLDOMNode *iface, IHTMLDOMNode ...@@ -850,7 +850,7 @@ static HRESULT WINAPI HTMLDOMNode_appendChild(IHTMLDOMNode *iface, IHTMLDOMNode
nsres = nsIDOMNode_AppendChild(This->nsnode, node_obj->nsnode, &nsnode); nsres = nsIDOMNode_AppendChild(This->nsnode, node_obj->nsnode, &nsnode);
node_release(node_obj); node_release(node_obj);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("AppendChild failed: %08x\n", nsres); ERR("AppendChild failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -1250,7 +1250,7 @@ static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT ...@@ -1250,7 +1250,7 @@ static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT
nsres = nsIDOMNode_SetTextContent(This->nsnode, &nsstr); nsres = nsIDOMNode_SetTextContent(This->nsnode, &nsstr);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetTextContent failed: %08x\n", nsres); ERR("SetTextContent failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -1349,7 +1349,7 @@ static HRESULT WINAPI HTMLDOMNode3_compareDocumentPosition(IHTMLDOMNode3 *iface, ...@@ -1349,7 +1349,7 @@ static HRESULT WINAPI HTMLDOMNode3_compareDocumentPosition(IHTMLDOMNode3 *iface,
nsres = nsIDOMNode_CompareDocumentPosition(This->nsnode, other->nsnode, &position); nsres = nsIDOMNode_CompareDocumentPosition(This->nsnode, other->nsnode, &position);
IHTMLDOMNode_Release(&other->IHTMLDOMNode_iface); IHTMLDOMNode_Release(&other->IHTMLDOMNode_iface);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("failed: %08x\n", nsres); ERR("failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -1634,7 +1634,7 @@ HRESULT get_node(nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret) ...@@ -1634,7 +1634,7 @@ HRESULT get_node(nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret)
nsres = nsIDOMNode_GetOwnerDocument(nsnode, &dom_document); nsres = nsIDOMNode_GetOwnerDocument(nsnode, &dom_document);
if(NS_FAILED(nsres) || !dom_document) { if(NS_FAILED(nsres) || !dom_document) {
ERR("GetOwnerDocument failed: %08x\n", nsres); ERR("GetOwnerDocument failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
......
dlls/mshtml/htmlobject.c
View file @ 210abcd8
...@@ -278,7 +278,7 @@ static HRESULT WINAPI HTMLObjectElement_put_width(IHTMLObjectElement *iface, VAR ...@@ -278,7 +278,7 @@ static HRESULT WINAPI HTMLObjectElement_put_width(IHTMLObjectElement *iface, VAR
nsres = nsIDOMHTMLObjectElement_SetWidth(This->nsobject, &width_str); nsres = nsIDOMHTMLObjectElement_SetWidth(This->nsobject, &width_str);
nsAString_Finish(&width_str); nsAString_Finish(&width_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("SetWidth failed: %08x\n", nsres); FIXME("SetWidth failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -305,7 +305,7 @@ static HRESULT WINAPI HTMLObjectElement_get_width(IHTMLObjectElement *iface, VAR ...@@ -305,7 +305,7 @@ static HRESULT WINAPI HTMLObjectElement_get_width(IHTMLObjectElement *iface, VAR
V_BSTR(p) = SysAllocString(width); V_BSTR(p) = SysAllocString(width);
hres = V_BSTR(p) ? S_OK : E_OUTOFMEMORY; hres = V_BSTR(p) ? S_OK : E_OUTOFMEMORY;
}else { }else {
ERR("GetWidth failed: %08x\n", nsres); ERR("GetWidth failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
...@@ -336,7 +336,7 @@ static HRESULT WINAPI HTMLObjectElement_put_height(IHTMLObjectElement *iface, VA ...@@ -336,7 +336,7 @@ static HRESULT WINAPI HTMLObjectElement_put_height(IHTMLObjectElement *iface, VA
nsres = nsIDOMHTMLObjectElement_SetHeight(This->nsobject, &height_str); nsres = nsIDOMHTMLObjectElement_SetHeight(This->nsobject, &height_str);
nsAString_Finish(&height_str); nsAString_Finish(&height_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
FIXME("SetHeight failed: %08x\n", nsres); FIXME("SetHeight failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -363,7 +363,7 @@ static HRESULT WINAPI HTMLObjectElement_get_height(IHTMLObjectElement *iface, VA ...@@ -363,7 +363,7 @@ static HRESULT WINAPI HTMLObjectElement_get_height(IHTMLObjectElement *iface, VA
V_BSTR(p) = SysAllocString(height); V_BSTR(p) = SysAllocString(height);
hres = V_BSTR(p) ? S_OK : E_OUTOFMEMORY; hres = V_BSTR(p) ? S_OK : E_OUTOFMEMORY;
}else { }else {
ERR("GetHeight failed: %08x\n", nsres); ERR("GetHeight failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
...@@ -423,7 +423,7 @@ static HRESULT WINAPI HTMLObjectElement_get_altHtml(IHTMLObjectElement *iface, B ...@@ -423,7 +423,7 @@ static HRESULT WINAPI HTMLObjectElement_get_altHtml(IHTMLObjectElement *iface, B
static HRESULT WINAPI HTMLObjectElement_put_vspace(IHTMLObjectElement *iface, LONG v) static HRESULT WINAPI HTMLObjectElement_put_vspace(IHTMLObjectElement *iface, LONG v)
{ {
HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -436,7 +436,7 @@ static HRESULT WINAPI HTMLObjectElement_get_vspace(IHTMLObjectElement *iface, LO ...@@ -436,7 +436,7 @@ static HRESULT WINAPI HTMLObjectElement_get_vspace(IHTMLObjectElement *iface, LO
nsres = nsIDOMHTMLObjectElement_GetVspace(This->nsobject, p); nsres = nsIDOMHTMLObjectElement_GetVspace(This->nsobject, p);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetVspace failed: %08x\n", nsres); ERR("GetVspace failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -446,7 +446,7 @@ static HRESULT WINAPI HTMLObjectElement_get_vspace(IHTMLObjectElement *iface, LO ...@@ -446,7 +446,7 @@ static HRESULT WINAPI HTMLObjectElement_get_vspace(IHTMLObjectElement *iface, LO
static HRESULT WINAPI HTMLObjectElement_put_hspace(IHTMLObjectElement *iface, LONG v) static HRESULT WINAPI HTMLObjectElement_put_hspace(IHTMLObjectElement *iface, LONG v)
{ {
HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -704,7 +704,7 @@ static HRESULT HTMLObjectElement_get_dispid(HTMLDOMNode *iface, BSTR name, ...@@ -704,7 +704,7 @@ static HRESULT HTMLObjectElement_get_dispid(HTMLDOMNode *iface, BSTR name,
{ {
HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(name), grfdex, pid); TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(name), grfdex, pid);
return get_plugin_dispid(&This->plugin_container, name, pid); return get_plugin_dispid(&This->plugin_container, name, pid);
} }
...@@ -714,7 +714,7 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid ...@@ -714,7 +714,7 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid
{ {
HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
TRACE("(%p)->(%d)\n", This, id); TRACE("(%p)->(%ld)\n", This, id);
return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei); return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei);
} }
......
dlls/mshtml/htmlscript.c
View file @ 210abcd8
...@@ -105,7 +105,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR ...@@ -105,7 +105,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR
nsres = nsIDOMHTMLScriptElement_SetSrc(This->nsscript, &src_str); nsres = nsIDOMHTMLScriptElement_SetSrc(This->nsscript, &src_str);
nsAString_Finish(&src_str); nsAString_Finish(&src_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetSrc failed: %08x\n", nsres); ERR("SetSrc failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -126,7 +126,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR ...@@ -126,7 +126,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR
nsAString_GetData(&src_str, &src); nsAString_GetData(&src_str, &src);
hres = load_script(This, src, TRUE); hres = load_script(This, src, TRUE);
}else { }else {
ERR("SetSrc failed: %08x\n", nsres); ERR("SetSrc failed: %08lx\n", nsres);
hres = E_FAIL; hres = E_FAIL;
} }
nsAString_Finish(&src_str); nsAString_Finish(&src_str);
...@@ -201,7 +201,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR ...@@ -201,7 +201,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR
nsres = nsIDOMHTMLScriptElement_SetText(This->nsscript, &text_str); nsres = nsIDOMHTMLScriptElement_SetText(This->nsscript, &text_str);
nsAString_Finish(&text_str); nsAString_Finish(&text_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetSrc failed: %08x\n", nsres); ERR("SetSrc failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -260,7 +260,7 @@ static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VAR ...@@ -260,7 +260,7 @@ static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VAR
nsres = nsIDOMHTMLScriptElement_GetDefer(This->nsscript, &defer); nsres = nsIDOMHTMLScriptElement_GetDefer(This->nsscript, &defer);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetSrc failed: %08x\n", nsres); ERR("GetSrc failed: %08lx\n", nsres);
} }
*p = variant_bool(defer); *p = variant_bool(defer);
...@@ -305,7 +305,7 @@ static HRESULT WINAPI HTMLScriptElement_put_type(IHTMLScriptElement *iface, BSTR ...@@ -305,7 +305,7 @@ static HRESULT WINAPI HTMLScriptElement_put_type(IHTMLScriptElement *iface, BSTR
nsAString_Init(&nstype_str, v); nsAString_Init(&nstype_str, v);
nsres = nsIDOMHTMLScriptElement_SetType(This->nsscript, &nstype_str); nsres = nsIDOMHTMLScriptElement_SetType(This->nsscript, &nstype_str);
if (NS_FAILED(nsres)) if (NS_FAILED(nsres))
ERR("SetType failed: %08x\n", nsres); ERR("SetType failed: %08lx\n", nsres);
nsAString_Finish (&nstype_str); nsAString_Finish (&nstype_str);
return S_OK; return S_OK;
......
dlls/mshtml/htmlstorage.c
View file @ 210abcd8
...@@ -69,7 +69,7 @@ static ULONG WINAPI HTMLStorage_AddRef(IHTMLStorage *iface) ...@@ -69,7 +69,7 @@ static ULONG WINAPI HTMLStorage_AddRef(IHTMLStorage *iface)
HTMLStorage *This = impl_from_IHTMLStorage(iface); HTMLStorage *This = impl_from_IHTMLStorage(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -79,7 +79,7 @@ static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) ...@@ -79,7 +79,7 @@ static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface)
HTMLStorage *This = impl_from_IHTMLStorage(iface); HTMLStorage *This = impl_from_IHTMLStorage(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
release_dispex(&This->dispex); release_dispex(&This->dispex);
...@@ -138,7 +138,7 @@ static HRESULT WINAPI HTMLStorage_get_remainingSpace(IHTMLStorage *iface, LONG * ...@@ -138,7 +138,7 @@ static HRESULT WINAPI HTMLStorage_get_remainingSpace(IHTMLStorage *iface, LONG *
static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p)
{ {
HTMLStorage *This = impl_from_IHTMLStorage(iface); HTMLStorage *This = impl_from_IHTMLStorage(iface);
FIXME("(%p)->(%d %p)\n", This, lIndex, p); FIXME("(%p)->(%ld %p)\n", This, lIndex, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/mshtml/htmlstyleelem.c
View file @ 210abcd8
...@@ -113,7 +113,7 @@ static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v ...@@ -113,7 +113,7 @@ static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v
nsres = nsIDOMHTMLStyleElement_SetType(This->nsstyle, &type_str); nsres = nsIDOMHTMLStyleElement_SetType(This->nsstyle, &type_str);
nsAString_Finish(&type_str); nsAString_Finish(&type_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetType failed: %08x\n", nsres); ERR("SetType failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -239,7 +239,7 @@ static HRESULT WINAPI HTMLStyleElement_put_media(IHTMLStyleElement *iface, BSTR ...@@ -239,7 +239,7 @@ static HRESULT WINAPI HTMLStyleElement_put_media(IHTMLStyleElement *iface, BSTR
nsres = nsIDOMHTMLStyleElement_SetMedia(This->nsstyle, &media_str); nsres = nsIDOMHTMLStyleElement_SetMedia(This->nsstyle, &media_str);
nsAString_Finish(&media_str); nsAString_Finish(&media_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetMedia failed: %08x\n", nsres); ERR("SetMedia failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
......
dlls/mshtml/htmltextarea.c
View file @ 210abcd8
...@@ -122,7 +122,7 @@ static HRESULT WINAPI HTMLTextAreaElement_put_value(IHTMLTextAreaElement *iface, ...@@ -122,7 +122,7 @@ static HRESULT WINAPI HTMLTextAreaElement_put_value(IHTMLTextAreaElement *iface,
nsres = nsIDOMHTMLTextAreaElement_SetValue(This->nstextarea, &value_str); nsres = nsIDOMHTMLTextAreaElement_SetValue(This->nstextarea, &value_str);
nsAString_Finish(&value_str); nsAString_Finish(&value_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetValue failed: %08x\n", nsres); ERR("SetValue failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -273,7 +273,7 @@ static HRESULT WINAPI HTMLTextAreaElement_put_readOnly(IHTMLTextAreaElement *ifa ...@@ -273,7 +273,7 @@ static HRESULT WINAPI HTMLTextAreaElement_put_readOnly(IHTMLTextAreaElement *ifa
nsres = nsIDOMHTMLTextAreaElement_SetReadOnly(This->nstextarea, v != VARIANT_FALSE); nsres = nsIDOMHTMLTextAreaElement_SetReadOnly(This->nstextarea, v != VARIANT_FALSE);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SetReadOnly failed: %08x\n", nsres); ERR("SetReadOnly failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -290,7 +290,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_readOnly(IHTMLTextAreaElement *ifa ...@@ -290,7 +290,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_readOnly(IHTMLTextAreaElement *ifa
nsres = nsIDOMHTMLTextAreaElement_GetReadOnly(This->nstextarea, &b); nsres = nsIDOMHTMLTextAreaElement_GetReadOnly(This->nstextarea, &b);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetReadOnly failed: %08x\n", nsres); ERR("GetReadOnly failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -301,7 +301,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_readOnly(IHTMLTextAreaElement *ifa ...@@ -301,7 +301,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_readOnly(IHTMLTextAreaElement *ifa
static HRESULT WINAPI HTMLTextAreaElement_put_rows(IHTMLTextAreaElement *iface, LONG v) static HRESULT WINAPI HTMLTextAreaElement_put_rows(IHTMLTextAreaElement *iface, LONG v)
{ {
HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -315,7 +315,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_rows(IHTMLTextAreaElement *iface, ...@@ -315,7 +315,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_rows(IHTMLTextAreaElement *iface,
static HRESULT WINAPI HTMLTextAreaElement_put_cols(IHTMLTextAreaElement *iface, LONG v) static HRESULT WINAPI HTMLTextAreaElement_put_cols(IHTMLTextAreaElement *iface, LONG v)
{ {
HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/mshtml/htmltextnode.c
View file @ 210abcd8
...@@ -150,7 +150,7 @@ static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG * ...@@ -150,7 +150,7 @@ static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG *
nsres = nsIDOMText_GetLength(This->nstext, &length); nsres = nsIDOMText_GetLength(This->nstext, &length);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("GetLength failed: %08x\n", nsres); ERR("GetLength failed: %08lx\n", nsres);
*p = length; *p = length;
return S_OK; return S_OK;
...@@ -164,11 +164,11 @@ static HRESULT WINAPI HTMLDOMTextNode_splitText(IHTMLDOMTextNode *iface, LONG of ...@@ -164,11 +164,11 @@ static HRESULT WINAPI HTMLDOMTextNode_splitText(IHTMLDOMTextNode *iface, LONG of
nsresult nsres; nsresult nsres;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%d %p)\n", This, offset, pRetNode); TRACE("(%p)->(%ld %p)\n", This, offset, pRetNode);
nsres = nsIDOMText_SplitText(This->nstext, offset, &text); nsres = nsIDOMText_SplitText(This->nstext, offset, &text);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("SplitText failed: %x08x\n", nsres); ERR("SplitText failed: %lx08x\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -260,7 +260,7 @@ static HRESULT WINAPI HTMLDOMTextNode2_Invoke(IHTMLDOMTextNode2 *iface, DISPID d ...@@ -260,7 +260,7 @@ static HRESULT WINAPI HTMLDOMTextNode2_Invoke(IHTMLDOMTextNode2 *iface, DISPID d
static HRESULT WINAPI HTMLDOMTextNode2_substringData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR *string) static HRESULT WINAPI HTMLDOMTextNode2_substringData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR *string)
{ {
HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface);
FIXME("(%p)->(%d %d %p)\n", This, offset, count, string); FIXME("(%p)->(%ld %ld %p)\n", This, offset, count, string);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -276,7 +276,7 @@ static HRESULT WINAPI HTMLDOMTextNode2_appendData(IHTMLDOMTextNode2 *iface, BSTR ...@@ -276,7 +276,7 @@ static HRESULT WINAPI HTMLDOMTextNode2_appendData(IHTMLDOMTextNode2 *iface, BSTR
nsres = nsIDOMText_AppendData(This->nstext, &nsstr); nsres = nsIDOMText_AppendData(This->nstext, &nsstr);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("AppendData failed: %08x\n", nsres); ERR("AppendData failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -286,21 +286,21 @@ static HRESULT WINAPI HTMLDOMTextNode2_appendData(IHTMLDOMTextNode2 *iface, BSTR ...@@ -286,21 +286,21 @@ static HRESULT WINAPI HTMLDOMTextNode2_appendData(IHTMLDOMTextNode2 *iface, BSTR
static HRESULT WINAPI HTMLDOMTextNode2_insertData(IHTMLDOMTextNode2 *iface, LONG offset, BSTR string) static HRESULT WINAPI HTMLDOMTextNode2_insertData(IHTMLDOMTextNode2 *iface, LONG offset, BSTR string)
{ {
HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface);
FIXME("(%p)->(%d %s)\n", This, offset, debugstr_w(string)); FIXME("(%p)->(%ld %s)\n", This, offset, debugstr_w(string));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDOMTextNode2_deleteData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count) static HRESULT WINAPI HTMLDOMTextNode2_deleteData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count)
{ {
HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface);
FIXME("(%p)->(%d %d)\n", This, offset, count); FIXME("(%p)->(%ld %ld)\n", This, offset, count);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLDOMTextNode2_replaceData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR string) static HRESULT WINAPI HTMLDOMTextNode2_replaceData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR string)
{ {
HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface);
FIXME("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(string)); FIXME("(%p)->(%ld %ld %s)\n", This, offset, count, debugstr_w(string));
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/mshtml/ifacewrap.c
View file @ 210abcd8
...@@ -63,7 +63,7 @@ static ULONG WINAPI wrapper_AddRef(IUnknown *iface) ...@@ -63,7 +63,7 @@ static ULONG WINAPI wrapper_AddRef(IUnknown *iface)
iface_wrapper_t *This = impl_from_IUnknown(iface); iface_wrapper_t *This = impl_from_IUnknown(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -73,7 +73,7 @@ static ULONG WINAPI wrapper_Release(IUnknown *iface) ...@@ -73,7 +73,7 @@ static ULONG WINAPI wrapper_Release(IUnknown *iface)
iface_wrapper_t *This = impl_from_IUnknown(iface); iface_wrapper_t *This = impl_from_IUnknown(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
IUnknown_Release(This->iface); IUnknown_Release(This->iface);
......
dlls/mshtml/loadopts.c
View file @ 210abcd8
...@@ -82,7 +82,7 @@ static ULONG WINAPI HtmlLoadOptions_AddRef(IHtmlLoadOptions *iface) ...@@ -82,7 +82,7 @@ static ULONG WINAPI HtmlLoadOptions_AddRef(IHtmlLoadOptions *iface)
HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface); HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -92,7 +92,7 @@ static ULONG WINAPI HtmlLoadOptions_Release(IHtmlLoadOptions *iface) ...@@ -92,7 +92,7 @@ static ULONG WINAPI HtmlLoadOptions_Release(IHtmlLoadOptions *iface)
HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface); HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
load_opt *iter = This->opts, *last; load_opt *iter = This->opts, *last;
...@@ -117,7 +117,7 @@ static HRESULT WINAPI HtmlLoadOptions_QueryOption(IHtmlLoadOptions *iface, DWORD ...@@ -117,7 +117,7 @@ static HRESULT WINAPI HtmlLoadOptions_QueryOption(IHtmlLoadOptions *iface, DWORD
HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface); HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface);
load_opt *iter; load_opt *iter;
TRACE("(%p)->(%d %p %p)\n", This, dwOption, pBuffer, pcbBuf); TRACE("(%p)->(%ld %p %p)\n", This, dwOption, pBuffer, pcbBuf);
for(iter = This->opts; iter; iter = iter->next) { for(iter = This->opts; iter; iter = iter->next) {
if(iter->option == dwOption) if(iter->option == dwOption)
...@@ -146,7 +146,7 @@ static HRESULT WINAPI HtmlLoadOptions_SetOption(IHtmlLoadOptions *iface, DWORD d ...@@ -146,7 +146,7 @@ static HRESULT WINAPI HtmlLoadOptions_SetOption(IHtmlLoadOptions *iface, DWORD d
HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface); HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface);
load_opt *iter = NULL; load_opt *iter = NULL;
TRACE("(%p)->(%d %p %d)\n", This, dwOption, pBuffer, cbBuf); TRACE("(%p)->(%ld %p %ld)\n", This, dwOption, pBuffer, cbBuf);
for(iter = This->opts; iter; iter = iter->next) { for(iter = This->opts; iter; iter = iter->next) {
if(iter->option == dwOption) if(iter->option == dwOption)
......
dlls/mshtml/main.c
View file @ 210abcd8
...@@ -102,7 +102,7 @@ UINT cp_from_charset_string(BSTR charset) ...@@ -102,7 +102,7 @@ UINT cp_from_charset_string(BSTR charset)
hres = IMultiLanguage2_GetCharsetInfo(mlang, charset, &info); hres = IMultiLanguage2_GetCharsetInfo(mlang, charset, &info);
if(FAILED(hres)) { if(FAILED(hres)) {
FIXME("GetCharsetInfo failed: %08x\n", hres); FIXME("GetCharsetInfo failed: %08lx\n", hres);
return CP_UTF8; return CP_UTF8;
} }
...@@ -119,7 +119,7 @@ BSTR charset_string_from_cp(UINT cp) ...@@ -119,7 +119,7 @@ BSTR charset_string_from_cp(UINT cp)
hres = IMultiLanguage2_GetCodePageInfo(mlang, cp, GetUserDefaultUILanguage(), &info); hres = IMultiLanguage2_GetCodePageInfo(mlang, cp, GetUserDefaultUILanguage(), &info);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("GetCodePageInfo failed: %08x\n", hres); ERR("GetCodePageInfo failed: %08lx\n", hres);
return SysAllocString(NULL); return SysAllocString(NULL);
} }
...@@ -182,7 +182,7 @@ static BOOL WINAPI load_compat_settings(INIT_ONCE *once, void *param, void **con ...@@ -182,7 +182,7 @@ static BOOL WINAPI load_compat_settings(INIT_ONCE *once, void *param, void **con
break; break;
index++; index++;
if(res != ERROR_SUCCESS) { if(res != ERROR_SUCCESS) {
WARN("RegEnumKey failed: %u\n", GetLastError()); WARN("RegEnumKey failed: %lu\n", GetLastError());
continue; continue;
} }
...@@ -397,7 +397,7 @@ static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) ...@@ -397,7 +397,7 @@ static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
{ {
ClassFactory *This = impl_from_IClassFactory(iface); ClassFactory *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref = %u\n", This, ref); TRACE("(%p) ref = %lu\n", This, ref);
return ref; return ref;
} }
...@@ -406,7 +406,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) ...@@ -406,7 +406,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
ClassFactory *This = impl_from_IClassFactory(iface); ClassFactory *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref = %u\n", This, ref); TRACE("(%p) ref = %lu\n", This, ref);
if(!ref) { if(!ref) {
heap_free(This); heap_free(This);
...@@ -647,7 +647,7 @@ static HRESULT register_server(BOOL do_register) ...@@ -647,7 +647,7 @@ static HRESULT register_server(BOOL do_register)
heap_free(pse[i].pszValue); heap_free(pse[i].pszValue);
if(FAILED(hres)) if(FAILED(hres))
ERR("RegInstall failed: %08x\n", hres); ERR("RegInstall failed: %08lx\n", hres);
return hres; return hres;
} }
......
dlls/mshtml/mutation.c
View file @ 210abcd8
...@@ -180,7 +180,7 @@ static nsresult run_insert_comment(HTMLDocumentNode *doc, nsISupports *comment_i ...@@ -180,7 +180,7 @@ static nsresult run_insert_comment(HTMLDocumentNode *doc, nsISupports *comment_i
nsres = nsISupports_QueryInterface(comment_iface, &IID_nsIDOMComment, (void**)&nscomment); nsres = nsISupports_QueryInterface(comment_iface, &IID_nsIDOMComment, (void**)&nscomment);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsIDOMComment iface:%08x\n", nsres); ERR("Could not get nsIDOMComment iface:%08lx\n", nsres);
return nsres; return nsres;
} }
...@@ -312,14 +312,14 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa ...@@ -312,14 +312,14 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa
nsres = nsISupports_QueryInterface(script_iface, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript); nsres = nsISupports_QueryInterface(script_iface, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsIDOMHTMLScriptElement: %08x\n", nsres); ERR("Could not get nsIDOMHTMLScriptElement: %08lx\n", nsres);
return nsres; return nsres;
} }
if(parser_iface) { if(parser_iface) {
nsres = nsISupports_QueryInterface(parser_iface, &IID_nsIParser, (void**)&nsparser); nsres = nsISupports_QueryInterface(parser_iface, &IID_nsIParser, (void**)&nsparser);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsIParser iface: %08x\n", nsres); ERR("Could not get nsIParser iface: %08lx\n", nsres);
nsparser = NULL; nsparser = NULL;
} }
} }
...@@ -472,7 +472,7 @@ void process_document_response_headers(HTMLDocumentNode *doc, IBinding *binding) ...@@ -472,7 +472,7 @@ void process_document_response_headers(HTMLDocumentNode *doc, IBinding *binding)
compat_mode_t document_mode; compat_mode_t document_mode;
WCHAR *header; WCHAR *header;
TRACE("size %u\n", size); TRACE("size %lu\n", size);
header = heap_strdupAtoW(buf); header = heap_strdupAtoW(buf);
if(header && parse_ua_compatible(header, &document_mode)) { if(header && parse_ua_compatible(header, &document_mode)) {
...@@ -564,7 +564,7 @@ static nsrefcnt NSAPI nsRunnable_AddRef(nsIRunnable *iface) ...@@ -564,7 +564,7 @@ static nsrefcnt NSAPI nsRunnable_AddRef(nsIRunnable *iface)
nsRunnable *This = impl_from_nsIRunnable(iface); nsRunnable *This = impl_from_nsIRunnable(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -574,7 +574,7 @@ static nsrefcnt NSAPI nsRunnable_Release(nsIRunnable *iface) ...@@ -574,7 +574,7 @@ static nsrefcnt NSAPI nsRunnable_Release(nsIRunnable *iface)
nsRunnable *This = impl_from_nsIRunnable(iface); nsRunnable *This = impl_from_nsIRunnable(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
htmldoc_release(&This->doc->basedoc); htmldoc_release(&This->doc->basedoc);
...@@ -939,7 +939,7 @@ void init_document_mutation(HTMLDocumentNode *doc) ...@@ -939,7 +939,7 @@ void init_document_mutation(HTMLDocumentNode *doc)
nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDocument, (void**)&nsdoc); nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDocument, (void**)&nsdoc);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsIDocument: %08x\n", nsres); ERR("Could not get nsIDocument: %08lx\n", nsres);
return; return;
} }
...@@ -954,7 +954,7 @@ void release_document_mutation(HTMLDocumentNode *doc) ...@@ -954,7 +954,7 @@ void release_document_mutation(HTMLDocumentNode *doc)
nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDocument, (void**)&nsdoc); nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDocument, (void**)&nsdoc);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsIDocument: %08x\n", nsres); ERR("Could not get nsIDocument: %08lx\n", nsres);
return; return;
} }
...@@ -994,12 +994,12 @@ void init_mutation(nsIComponentManager *component_manager) ...@@ -994,12 +994,12 @@ void init_mutation(nsIComponentManager *component_manager)
nsres = nsIComponentManager_GetClassObject(component_manager, &NS_ICONTENTUTILS_CID, nsres = nsIComponentManager_GetClassObject(component_manager, &NS_ICONTENTUTILS_CID,
&IID_nsIFactory, (void**)&factory); &IID_nsIFactory, (void**)&factory);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not create nsIContentUtils service: %08x\n", nsres); ERR("Could not create nsIContentUtils service: %08lx\n", nsres);
return; return;
} }
nsres = nsIFactory_CreateInstance(factory, NULL, &IID_nsIContentUtils, (void**)&content_utils); nsres = nsIFactory_CreateInstance(factory, NULL, &IID_nsIContentUtils, (void**)&content_utils);
nsIFactory_Release(factory); nsIFactory_Release(factory);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("Could not create nsIContentUtils instance: %08x\n", nsres); ERR("Could not create nsIContentUtils instance: %08lx\n", nsres);
} }
dlls/mshtml/npplugin.c
View file @ 210abcd8
...@@ -218,14 +218,14 @@ static nsIDOMElement *get_dom_element(NPP instance) ...@@ -218,14 +218,14 @@ static nsIDOMElement *get_dom_element(NPP instance)
nsres = nsISupports_QueryInterface(instance_unk, &IID_nsIPluginInstance, (void**)&plugin_instance); nsres = nsISupports_QueryInterface(instance_unk, &IID_nsIPluginInstance, (void**)&plugin_instance);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsIPluginInstance interface: %08x\n", nsres); ERR("Could not get nsIPluginInstance interface: %08lx\n", nsres);
return NULL; return NULL;
} }
nsres = nsIPluginInstance_GetDOMElement(plugin_instance, &elem); nsres = nsIPluginInstance_GetDOMElement(plugin_instance, &elem);
nsIPluginInstance_Release(plugin_instance); nsIPluginInstance_Release(plugin_instance);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetDOMElement failed: %08x\n", nsres); ERR("GetDOMElement failed: %08lx\n", nsres);
return NULL; return NULL;
} }
......
dlls/mshtml/nsevents.c
View file @ 210abcd8
...@@ -58,7 +58,7 @@ static LONG release_listener(nsDocumentEventListener *This) ...@@ -58,7 +58,7 @@ static LONG release_listener(nsDocumentEventListener *This)
{ {
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) if(!ref)
heap_free(This); heap_free(This);
...@@ -100,7 +100,7 @@ static nsrefcnt NSAPI nsDOMEventListener_AddRef(nsIDOMEventListener *iface) ...@@ -100,7 +100,7 @@ static nsrefcnt NSAPI nsDOMEventListener_AddRef(nsIDOMEventListener *iface)
nsEventListener *This = impl_from_nsIDOMEventListener(iface); nsEventListener *This = impl_from_nsIDOMEventListener(iface);
LONG ref = InterlockedIncrement(&This->This->ref); LONG ref = InterlockedIncrement(&This->This->ref);
TRACE("(%p) ref=%d\n", This->This, ref); TRACE("(%p) ref=%ld\n", This->This, ref);
return ref; return ref;
} }
...@@ -302,14 +302,14 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * ...@@ -302,14 +302,14 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *
nsres = nsIDOMEvent_GetTarget(nsevent, &event_target); nsres = nsIDOMEvent_GetTarget(nsevent, &event_target);
if(NS_FAILED(nsres) || !event_target) { if(NS_FAILED(nsres) || !event_target) {
ERR("GetEventTarget failed: %08x\n", nsres); ERR("GetEventTarget failed: %08lx\n", nsres);
return NS_OK; return NS_OK;
} }
nsres = nsIDOMEventTarget_QueryInterface(event_target, &IID_nsIDOMNode, (void**)&nsnode); nsres = nsIDOMEventTarget_QueryInterface(event_target, &IID_nsIDOMNode, (void**)&nsnode);
nsIDOMEventTarget_Release(event_target); nsIDOMEventTarget_Release(event_target);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsIDOMNode: %08x\n", nsres); ERR("Could not get nsIDOMNode: %08lx\n", nsres);
return NS_OK; return NS_OK;
} }
...@@ -366,7 +366,7 @@ static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, ...@@ -366,7 +366,7 @@ static void init_event(nsIDOMEventTarget *target, const PRUnichar *type,
nsres = nsIDOMEventTarget_AddEventListener(target, &type_str, listener, capture, FALSE, 1); nsres = nsIDOMEventTarget_AddEventListener(target, &type_str, listener, capture, FALSE, 1);
nsAString_Finish(&type_str); nsAString_Finish(&type_str);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("AddEventTarget failed: %08x\n", nsres); ERR("AddEventTarget failed: %08lx\n", nsres);
} }
...@@ -423,7 +423,7 @@ static void detach_nslistener(HTMLDocumentNode *doc, const WCHAR *type, nsEventL ...@@ -423,7 +423,7 @@ static void detach_nslistener(HTMLDocumentNode *doc, const WCHAR *type, nsEventL
nsAString_Finish(&type_str); nsAString_Finish(&type_str);
nsIDOMEventTarget_Release(target); nsIDOMEventTarget_Release(target);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("RemoveEventTarget failed: %08x\n", nsres); ERR("RemoveEventTarget failed: %08lx\n", nsres);
} }
void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type)
......
dlls/mshtml/nsservice.c
View file @ 210abcd8
...@@ -388,11 +388,11 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser ...@@ -388,11 +388,11 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser
nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_PROMPTSERVICE_CID, nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_PROMPTSERVICE_CID,
"Prompt Service", NS_PROMPTSERVICE_CONTRACTID, &nsPromptServiceFactory.nsIFactory_iface); "Prompt Service", NS_PROMPTSERVICE_CONTRACTID, &nsPromptServiceFactory.nsIFactory_iface);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("RegisterFactory failed: %08x\n", nsres); ERR("RegisterFactory failed: %08lx\n", nsres);
nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_TOOLTIPTEXTPROVIDER_CID, nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_TOOLTIPTEXTPROVIDER_CID,
NS_TOOLTIPTEXTPROVIDER_CLASSNAME, NS_TOOLTIPTEXTPROVIDER_CONTRACTID, NS_TOOLTIPTEXTPROVIDER_CLASSNAME, NS_TOOLTIPTEXTPROVIDER_CONTRACTID,
&nsTooltipTextFactory.nsIFactory_iface); &nsTooltipTextFactory.nsIFactory_iface);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("RegisterFactory failed: %08x\n", nsres); ERR("RegisterFactory failed: %08lx\n", nsres);
} }
dlls/mshtml/oleobj.c
View file @ 210abcd8
...@@ -73,7 +73,7 @@ static ULONG WINAPI EnumUnknown_AddRef(IEnumUnknown *iface) ...@@ -73,7 +73,7 @@ static ULONG WINAPI EnumUnknown_AddRef(IEnumUnknown *iface)
EnumUnknown *This = impl_from_IEnumUnknown(iface); EnumUnknown *This = impl_from_IEnumUnknown(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -83,7 +83,7 @@ static ULONG WINAPI EnumUnknown_Release(IEnumUnknown *iface) ...@@ -83,7 +83,7 @@ static ULONG WINAPI EnumUnknown_Release(IEnumUnknown *iface)
EnumUnknown *This = impl_from_IEnumUnknown(iface); EnumUnknown *This = impl_from_IEnumUnknown(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) if(!ref)
heap_free(This); heap_free(This);
...@@ -95,7 +95,7 @@ static HRESULT WINAPI EnumUnknown_Next(IEnumUnknown *iface, ULONG celt, IUnknown ...@@ -95,7 +95,7 @@ static HRESULT WINAPI EnumUnknown_Next(IEnumUnknown *iface, ULONG celt, IUnknown
{ {
EnumUnknown *This = impl_from_IEnumUnknown(iface); EnumUnknown *This = impl_from_IEnumUnknown(iface);
TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); TRACE("(%p)->(%lu %p %p)\n", This, celt, rgelt, pceltFetched);
/* FIXME: It's not clear if we should ever return something here */ /* FIXME: It's not clear if we should ever return something here */
if(pceltFetched) if(pceltFetched)
...@@ -106,7 +106,7 @@ static HRESULT WINAPI EnumUnknown_Next(IEnumUnknown *iface, ULONG celt, IUnknown ...@@ -106,7 +106,7 @@ static HRESULT WINAPI EnumUnknown_Next(IEnumUnknown *iface, ULONG celt, IUnknown
static HRESULT WINAPI EnumUnknown_Skip(IEnumUnknown *iface, ULONG celt) static HRESULT WINAPI EnumUnknown_Skip(IEnumUnknown *iface, ULONG celt)
{ {
EnumUnknown *This = impl_from_IEnumUnknown(iface); EnumUnknown *This = impl_from_IEnumUnknown(iface);
FIXME("(%p)->(%u)\n", This, celt); FIXME("(%p)->(%lu)\n", This, celt);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -174,16 +174,16 @@ static void update_hostinfo(HTMLDocumentObj *This, DOCHOSTUIINFO *hostinfo) ...@@ -174,16 +174,16 @@ static void update_hostinfo(HTMLDocumentObj *This, DOCHOSTUIINFO *hostinfo)
nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, ScrollOrientation_Y, nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, ScrollOrientation_Y,
(hostinfo->dwFlags & DOCHOSTUIFLAG_SCROLL_NO) ? Scrollbar_Never : Scrollbar_Always); (hostinfo->dwFlags & DOCHOSTUIFLAG_SCROLL_NO) ? Scrollbar_Never : Scrollbar_Always);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("Could not set default Y scrollbar prefs: %08x\n", nsres); ERR("Could not set default Y scrollbar prefs: %08lx\n", nsres);
nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, ScrollOrientation_X, nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, ScrollOrientation_X,
hostinfo->dwFlags & DOCHOSTUIFLAG_SCROLL_NO ? Scrollbar_Never : Scrollbar_Auto); hostinfo->dwFlags & DOCHOSTUIFLAG_SCROLL_NO ? Scrollbar_Never : Scrollbar_Auto);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("Could not set default X scrollbar prefs: %08x\n", nsres); ERR("Could not set default X scrollbar prefs: %08lx\n", nsres);
nsIScrollable_Release(scrollable); nsIScrollable_Release(scrollable);
}else { }else {
ERR("Could not get nsIScrollable: %08x\n", nsres); ERR("Could not get nsIScrollable: %08lx\n", nsres);
} }
} }
...@@ -322,7 +322,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite ...@@ -322,7 +322,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
hostinfo.cbSize = sizeof(DOCHOSTUIINFO); hostinfo.cbSize = sizeof(DOCHOSTUIINFO);
hres = IDocHostUIHandler_GetHostInfo(This->doc_obj->hostui, &hostinfo); hres = IDocHostUIHandler_GetHostInfo(This->doc_obj->hostui, &hostinfo);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
TRACE("hostinfo = {%u %08x %08x %s %s}\n", TRACE("hostinfo = {%lu %08lx %08lx %s %s}\n",
hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick,
debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS));
update_hostinfo(This->doc_obj, &hostinfo); update_hostinfo(This->doc_obj, &hostinfo);
...@@ -470,7 +470,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) ...@@ -470,7 +470,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
TRACE("(%p)->(%08x)\n", This, dwSaveOption); TRACE("(%p)->(%08lx)\n", This, dwSaveOption);
if(dwSaveOption == OLECLOSE_PROMPTSAVE) if(dwSaveOption == OLECLOSE_PROMPTSAVE)
FIXME("OLECLOSE_PROMPTSAVE not implemented\n"); FIXME("OLECLOSE_PROMPTSAVE not implemented\n");
...@@ -489,14 +489,14 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) ...@@ -489,14 +489,14 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk) static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk)
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
FIXME("(%p %d %p)->()\n", This, dwWhichMoniker, pmk); FIXME("(%p %ld %p)->()\n", This, dwWhichMoniker, pmk);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk)
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
FIXME("(%p)->(%d %d %p)\n", This, dwAssign, dwWhichMoniker, ppmk); FIXME("(%p)->(%ld %ld %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -504,14 +504,14 @@ static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, IDataObject *pDa ...@@ -504,14 +504,14 @@ static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, IDataObject *pDa
DWORD dwReserved) DWORD dwReserved)
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
FIXME("(%p)->(%p %x %d)\n", This, pDataObject, fCreation, dwReserved); FIXME("(%p)->(%p %x %ld)\n", This, pDataObject, fCreation, dwReserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwReserved, IDataObject **ppDataObject) static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwReserved, IDataObject **ppDataObject)
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
FIXME("(%p)->(%d %p)\n", This, dwReserved, ppDataObject); FIXME("(%p)->(%ld %p)\n", This, dwReserved, ppDataObject);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -522,10 +522,10 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms ...@@ -522,10 +522,10 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms
IOleDocumentSite *pDocSite; IOleDocumentSite *pDocSite;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%d %p %p %d %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect);
if(iVerb != OLEIVERB_SHOW && iVerb != OLEIVERB_UIACTIVATE && iVerb != OLEIVERB_INPLACEACTIVATE) { if(iVerb != OLEIVERB_SHOW && iVerb != OLEIVERB_UIACTIVATE && iVerb != OLEIVERB_INPLACEACTIVATE) {
FIXME("iVerb = %d not supported\n", iVerb); FIXME("iVerb = %ld not supported\n", iVerb);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -591,7 +591,7 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) ...@@ -591,7 +591,7 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid)
static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, LPOLESTR *pszUserType) static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, LPOLESTR *pszUserType)
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
FIXME("(%p)->(%d %p)\n", This, dwFormOfType, pszUserType); FIXME("(%p)->(%ld %p)\n", This, dwFormOfType, pszUserType);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -599,7 +599,7 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, ...@@ -599,7 +599,7 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect,
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); TRACE("(%p)->(%ld %p)\n", This, dwDrawAspect, psizel);
if (dwDrawAspect != DVASPECT_CONTENT) if (dwDrawAspect != DVASPECT_CONTENT)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -612,7 +612,7 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, ...@@ -612,7 +612,7 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect,
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); TRACE("(%p)->(%ld %p)\n", This, dwDrawAspect, psizel);
if (dwDrawAspect != DVASPECT_CONTENT) if (dwDrawAspect != DVASPECT_CONTENT)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -646,7 +646,7 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, ...@@ -646,7 +646,7 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink,
static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection)
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
TRACE("(%p)->(%d)\n", This, dwConnection); TRACE("(%p)->(%ld)\n", This, dwConnection);
if(!This->doc_obj->advise_holder) if(!This->doc_obj->advise_holder)
return OLE_E_NOCONNECTION; return OLE_E_NOCONNECTION;
...@@ -669,7 +669,7 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp ...@@ -669,7 +669,7 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp
static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
FIXME("(%p)->(%d %p)\n", This, dwAspect, pdwStatus); FIXME("(%p)->(%ld %p)\n", This, dwAspect, pdwStatus);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -740,7 +740,7 @@ static HRESULT WINAPI OleDocument_CreateView(IOleDocument *iface, IOleInPlaceSit ...@@ -740,7 +740,7 @@ static HRESULT WINAPI OleDocument_CreateView(IOleDocument *iface, IOleInPlaceSit
HTMLDocument *This = impl_from_IOleDocument(iface); HTMLDocument *This = impl_from_IOleDocument(iface);
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%p %p %d %p)\n", This, pIPSite, pstm, dwReserved, ppView); TRACE("(%p)->(%p %p %ld %p)\n", This, pIPSite, pstm, dwReserved, ppView);
if(!ppView) if(!ppView)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -861,7 +861,7 @@ static HRESULT on_change_dlcontrol(HTMLDocument *This) ...@@ -861,7 +861,7 @@ static HRESULT on_change_dlcontrol(HTMLDocument *This)
hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_DLCONTROL, &res); hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_DLCONTROL, &res);
if(SUCCEEDED(hres)) if(SUCCEEDED(hres))
FIXME("unsupported dlcontrol %08x\n", V_I4(&res)); FIXME("unsupported dlcontrol %08lx\n", V_I4(&res));
return S_OK; return S_OK;
} }
...@@ -949,7 +949,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS ...@@ -949,7 +949,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS
return S_OK; return S_OK;
} }
FIXME("(%p) unsupported dispID=%d\n", This, dispID); FIXME("(%p) unsupported dispID=%ld\n", This, dispID);
return E_FAIL; return E_FAIL;
} }
...@@ -1195,7 +1195,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObje ...@@ -1195,7 +1195,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObje
UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lpResult) UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lpResult)
{ {
HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface);
FIXME("(%p)->(%u %lu %lu %p)\n", This, msg, wParam, lParam, lpResult); FIXME("(%p)->(%u %Iu %Iu %p)\n", This, msg, wParam, lParam, lpResult);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1310,7 +1310,7 @@ static HRESULT WINAPI OleContainer_EnumObjects(IOleContainer *iface, DWORD grfFl ...@@ -1310,7 +1310,7 @@ static HRESULT WINAPI OleContainer_EnumObjects(IOleContainer *iface, DWORD grfFl
HTMLDocument *This = impl_from_IOleContainer(iface); HTMLDocument *This = impl_from_IOleContainer(iface);
EnumUnknown *ret; EnumUnknown *ret;
TRACE("(%p)->(%x %p)\n", This, grfFlags, ppenum); TRACE("(%p)->(%lx %p)\n", This, grfFlags, ppenum);
ret = heap_alloc(sizeof(*ret)); ret = heap_alloc(sizeof(*ret));
if(!ret) if(!ret)
...@@ -1433,7 +1433,7 @@ static HRESULT WINAPI ObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *ifac ...@@ -1433,7 +1433,7 @@ static HRESULT WINAPI ObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *ifac
REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions) REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions)
{ {
HTMLDocument *This = impl_from_IObjectSafety(iface); HTMLDocument *This = impl_from_IObjectSafety(iface);
FIXME("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); FIXME("(%p)->(%s %lx %lx)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions);
if(IsEqualGUID(&IID_IPersistMoniker, riid) && if(IsEqualGUID(&IID_IPersistMoniker, riid) &&
dwOptionSetMask==INTERFACESAFE_FOR_UNTRUSTED_DATA && dwOptionSetMask==INTERFACESAFE_FOR_UNTRUSTED_DATA &&
......
dlls/mshtml/omnavigator.c
View file @ 210abcd8
...@@ -87,7 +87,7 @@ static ULONG WINAPI HTMLDOMImplementation_AddRef(IHTMLDOMImplementation *iface) ...@@ -87,7 +87,7 @@ static ULONG WINAPI HTMLDOMImplementation_AddRef(IHTMLDOMImplementation *iface)
HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -97,7 +97,7 @@ static ULONG WINAPI HTMLDOMImplementation_Release(IHTMLDOMImplementation *iface) ...@@ -97,7 +97,7 @@ static ULONG WINAPI HTMLDOMImplementation_Release(IHTMLDOMImplementation *iface)
HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
assert(!This->browser); assert(!This->browser);
...@@ -257,7 +257,7 @@ static HRESULT WINAPI HTMLDOMImplementation2_createHTMLDocument(IHTMLDOMImplemen ...@@ -257,7 +257,7 @@ static HRESULT WINAPI HTMLDOMImplementation2_createHTMLDocument(IHTMLDOMImplemen
nsres = nsIDOMDOMImplementation_CreateHTMLDocument(This->implementation, &title_str, &doc); nsres = nsIDOMDOMImplementation_CreateHTMLDocument(This->implementation, &title_str, &doc);
nsAString_Finish(&title_str); nsAString_Finish(&title_str);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("CreateHTMLDocument failed: %08x\n", nsres); ERR("CreateHTMLDocument failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -332,7 +332,7 @@ HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementa ...@@ -332,7 +332,7 @@ HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementa
nsres = nsIDOMHTMLDocument_GetImplementation(doc_node->nsdoc, &dom_implementation->implementation); nsres = nsIDOMHTMLDocument_GetImplementation(doc_node->nsdoc, &dom_implementation->implementation);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("GetDOMImplementation failed: %08x\n", nsres); ERR("GetDOMImplementation failed: %08lx\n", nsres);
IHTMLDOMImplementation_Release(&dom_implementation->IHTMLDOMImplementation_iface); IHTMLDOMImplementation_Release(&dom_implementation->IHTMLDOMImplementation_iface);
return E_FAIL; return E_FAIL;
} }
...@@ -386,7 +386,7 @@ static ULONG WINAPI HTMLScreen_AddRef(IHTMLScreen *iface) ...@@ -386,7 +386,7 @@ static ULONG WINAPI HTMLScreen_AddRef(IHTMLScreen *iface)
HTMLScreen *This = impl_from_IHTMLScreen(iface); HTMLScreen *This = impl_from_IHTMLScreen(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -396,7 +396,7 @@ static ULONG WINAPI HTMLScreen_Release(IHTMLScreen *iface) ...@@ -396,7 +396,7 @@ static ULONG WINAPI HTMLScreen_Release(IHTMLScreen *iface)
HTMLScreen *This = impl_from_IHTMLScreen(iface); HTMLScreen *This = impl_from_IHTMLScreen(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
release_dispex(&This->dispex); release_dispex(&This->dispex);
...@@ -451,7 +451,7 @@ static HRESULT WINAPI HTMLScreen_get_colorDepth(IHTMLScreen *iface, LONG *p) ...@@ -451,7 +451,7 @@ static HRESULT WINAPI HTMLScreen_get_colorDepth(IHTMLScreen *iface, LONG *p)
static HRESULT WINAPI HTMLScreen_put_bufferDepth(IHTMLScreen *iface, LONG v) static HRESULT WINAPI HTMLScreen_put_bufferDepth(IHTMLScreen *iface, LONG v)
{ {
HTMLScreen *This = impl_from_IHTMLScreen(iface); HTMLScreen *This = impl_from_IHTMLScreen(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -485,7 +485,7 @@ static HRESULT WINAPI HTMLScreen_get_height(IHTMLScreen *iface, LONG *p) ...@@ -485,7 +485,7 @@ static HRESULT WINAPI HTMLScreen_get_height(IHTMLScreen *iface, LONG *p)
static HRESULT WINAPI HTMLScreen_put_updateInterval(IHTMLScreen *iface, LONG v) static HRESULT WINAPI HTMLScreen_put_updateInterval(IHTMLScreen *iface, LONG v)
{ {
HTMLScreen *This = impl_from_IHTMLScreen(iface); HTMLScreen *This = impl_from_IHTMLScreen(iface);
FIXME("(%p)->(%d)\n", This, v); FIXME("(%p)->(%ld)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -611,7 +611,7 @@ static ULONG WINAPI OmHistory_AddRef(IOmHistory *iface) ...@@ -611,7 +611,7 @@ static ULONG WINAPI OmHistory_AddRef(IOmHistory *iface)
OmHistory *This = impl_from_IOmHistory(iface); OmHistory *This = impl_from_IOmHistory(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -621,7 +621,7 @@ static ULONG WINAPI OmHistory_Release(IOmHistory *iface) ...@@ -621,7 +621,7 @@ static ULONG WINAPI OmHistory_Release(IOmHistory *iface)
OmHistory *This = impl_from_IOmHistory(iface); OmHistory *This = impl_from_IOmHistory(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
release_dispex(&This->dispex); release_dispex(&This->dispex);
...@@ -787,7 +787,7 @@ static ULONG WINAPI HTMLPluginsCollection_AddRef(IHTMLPluginsCollection *iface) ...@@ -787,7 +787,7 @@ static ULONG WINAPI HTMLPluginsCollection_AddRef(IHTMLPluginsCollection *iface)
HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -797,7 +797,7 @@ static ULONG WINAPI HTMLPluginsCollection_Release(IHTMLPluginsCollection *iface) ...@@ -797,7 +797,7 @@ static ULONG WINAPI HTMLPluginsCollection_Release(IHTMLPluginsCollection *iface)
HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
if(This->navigator) if(This->navigator)
...@@ -943,7 +943,7 @@ static ULONG WINAPI HTMLMimeTypesCollection_AddRef(IHTMLMimeTypesCollection *ifa ...@@ -943,7 +943,7 @@ static ULONG WINAPI HTMLMimeTypesCollection_AddRef(IHTMLMimeTypesCollection *ifa
HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -953,7 +953,7 @@ static ULONG WINAPI HTMLMimeTypesCollection_Release(IHTMLMimeTypesCollection *if ...@@ -953,7 +953,7 @@ static ULONG WINAPI HTMLMimeTypesCollection_Release(IHTMLMimeTypesCollection *if
HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
if(This->navigator) if(This->navigator)
...@@ -1079,7 +1079,7 @@ static ULONG WINAPI OmNavigator_AddRef(IOmNavigator *iface) ...@@ -1079,7 +1079,7 @@ static ULONG WINAPI OmNavigator_AddRef(IOmNavigator *iface)
OmNavigator *This = impl_from_IOmNavigator(iface); OmNavigator *This = impl_from_IOmNavigator(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -1089,7 +1089,7 @@ static ULONG WINAPI OmNavigator_Release(IOmNavigator *iface) ...@@ -1089,7 +1089,7 @@ static ULONG WINAPI OmNavigator_Release(IOmNavigator *iface)
OmNavigator *This = impl_from_IOmNavigator(iface); OmNavigator *This = impl_from_IOmNavigator(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
if(This->plugins) if(This->plugins)
...@@ -1339,7 +1339,7 @@ static HRESULT get_language_string(LCID lcid, BSTR *p) ...@@ -1339,7 +1339,7 @@ static HRESULT get_language_string(LCID lcid, BSTR *p)
len = LCIDToLocaleName(lcid, NULL, 0, 0); len = LCIDToLocaleName(lcid, NULL, 0, 0);
if(!len) { if(!len) {
WARN("LCIDToLocaleName failed: %u\n", GetLastError()); WARN("LCIDToLocaleName failed: %lu\n", GetLastError());
return E_FAIL; return E_FAIL;
} }
...@@ -1349,7 +1349,7 @@ static HRESULT get_language_string(LCID lcid, BSTR *p) ...@@ -1349,7 +1349,7 @@ static HRESULT get_language_string(LCID lcid, BSTR *p)
len = LCIDToLocaleName(lcid, ret, len, 0); len = LCIDToLocaleName(lcid, ret, len, 0);
if(!len) { if(!len) {
WARN("LCIDToLocaleName failed: %u\n", GetLastError()); WARN("LCIDToLocaleName failed: %lu\n", GetLastError());
SysFreeString(ret); SysFreeString(ret);
return E_FAIL; return E_FAIL;
} }
...@@ -1531,7 +1531,7 @@ static ULONG WINAPI HTMLPerformanceTiming_AddRef(IHTMLPerformanceTiming *iface) ...@@ -1531,7 +1531,7 @@ static ULONG WINAPI HTMLPerformanceTiming_AddRef(IHTMLPerformanceTiming *iface)
HTMLPerformanceTiming *This = impl_from_IHTMLPerformanceTiming(iface); HTMLPerformanceTiming *This = impl_from_IHTMLPerformanceTiming(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -1541,7 +1541,7 @@ static ULONG WINAPI HTMLPerformanceTiming_Release(IHTMLPerformanceTiming *iface) ...@@ -1541,7 +1541,7 @@ static ULONG WINAPI HTMLPerformanceTiming_Release(IHTMLPerformanceTiming *iface)
HTMLPerformanceTiming *This = impl_from_IHTMLPerformanceTiming(iface); HTMLPerformanceTiming *This = impl_from_IHTMLPerformanceTiming(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
release_dispex(&This->dispex); release_dispex(&This->dispex);
...@@ -1897,7 +1897,7 @@ static ULONG WINAPI HTMLPerformanceNavigation_AddRef(IHTMLPerformanceNavigation ...@@ -1897,7 +1897,7 @@ static ULONG WINAPI HTMLPerformanceNavigation_AddRef(IHTMLPerformanceNavigation
HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -1907,7 +1907,7 @@ static ULONG WINAPI HTMLPerformanceNavigation_Release(IHTMLPerformanceNavigation ...@@ -1907,7 +1907,7 @@ static ULONG WINAPI HTMLPerformanceNavigation_Release(IHTMLPerformanceNavigation
HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
release_dispex(&This->dispex); release_dispex(&This->dispex);
...@@ -2052,7 +2052,7 @@ static ULONG WINAPI HTMLPerformance_AddRef(IHTMLPerformance *iface) ...@@ -2052,7 +2052,7 @@ static ULONG WINAPI HTMLPerformance_AddRef(IHTMLPerformance *iface)
HTMLPerformance *This = impl_from_IHTMLPerformance(iface); HTMLPerformance *This = impl_from_IHTMLPerformance(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -2062,7 +2062,7 @@ static ULONG WINAPI HTMLPerformance_Release(IHTMLPerformance *iface) ...@@ -2062,7 +2062,7 @@ static ULONG WINAPI HTMLPerformance_Release(IHTMLPerformance *iface)
HTMLPerformance *This = impl_from_IHTMLPerformance(iface); HTMLPerformance *This = impl_from_IHTMLPerformance(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
if(This->timing) if(This->timing)
...@@ -2260,7 +2260,7 @@ static ULONG WINAPI HTMLNamespaceCollection_AddRef(IHTMLNamespaceCollection *ifa ...@@ -2260,7 +2260,7 @@ static ULONG WINAPI HTMLNamespaceCollection_AddRef(IHTMLNamespaceCollection *ifa
HTMLNamespaceCollection *This = impl_from_IHTMLNamespaceCollection(iface); HTMLNamespaceCollection *This = impl_from_IHTMLNamespaceCollection(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -2270,7 +2270,7 @@ static ULONG WINAPI HTMLNamespaceCollection_Release(IHTMLNamespaceCollection *if ...@@ -2270,7 +2270,7 @@ static ULONG WINAPI HTMLNamespaceCollection_Release(IHTMLNamespaceCollection *if
HTMLNamespaceCollection *This = impl_from_IHTMLNamespaceCollection(iface); HTMLNamespaceCollection *This = impl_from_IHTMLNamespaceCollection(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
release_dispex(&This->dispex); release_dispex(&This->dispex);
...@@ -2415,7 +2415,7 @@ static ULONG WINAPI console_AddRef(IWineMSHTMLConsole *iface) ...@@ -2415,7 +2415,7 @@ static ULONG WINAPI console_AddRef(IWineMSHTMLConsole *iface)
struct console *console = impl_from_IWineMSHTMLConsole(iface); struct console *console = impl_from_IWineMSHTMLConsole(iface);
LONG ref = InterlockedIncrement(&console->ref); LONG ref = InterlockedIncrement(&console->ref);
TRACE("(%p) ref=%d\n", console, ref); TRACE("(%p) ref=%ld\n", console, ref);
return ref; return ref;
} }
...@@ -2425,7 +2425,7 @@ static ULONG WINAPI console_Release(IWineMSHTMLConsole *iface) ...@@ -2425,7 +2425,7 @@ static ULONG WINAPI console_Release(IWineMSHTMLConsole *iface)
struct console *console = impl_from_IWineMSHTMLConsole(iface); struct console *console = impl_from_IWineMSHTMLConsole(iface);
LONG ref = InterlockedDecrement(&console->ref); LONG ref = InterlockedDecrement(&console->ref);
TRACE("(%p) ref=%d\n", console, ref); TRACE("(%p) ref=%ld\n", console, ref);
if(!ref) { if(!ref) {
release_dispex(&console->dispex); release_dispex(&console->dispex);
......
dlls/mshtml/persist.c
View file @ 210abcd8
...@@ -133,7 +133,7 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) ...@@ -133,7 +133,7 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags)
hres = IUriContainer_GetIUri(uri_container, &uri); hres = IUriContainer_GetIUri(uri_container, &uri);
IUriContainer_Release(uri_container); IUriContainer_Release(uri_container);
if(hres != S_OK) { if(hres != S_OK) {
WARN("GetIUri failed: %08x\n", hres); WARN("GetIUri failed: %08lx\n", hres);
uri = NULL; uri = NULL;
} }
} }
...@@ -145,7 +145,7 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) ...@@ -145,7 +145,7 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags)
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
hres = create_uri(url, 0, &uri); hres = create_uri(url, 0, &uri);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("CreateUri failed: %08x\n", hres); WARN("CreateUri failed: %08lx\n", hres);
set_current_uri(This, NULL); set_current_uri(This, NULL);
This->url = SysAllocString(url); This->url = SysAllocString(url);
CoTaskMemFree(url); CoTaskMemFree(url);
...@@ -153,7 +153,7 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) ...@@ -153,7 +153,7 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags)
} }
CoTaskMemFree(url); CoTaskMemFree(url);
}else { }else {
WARN("GetDisplayName failed: %08x\n", hres); WARN("GetDisplayName failed: %08lx\n", hres);
} }
} }
...@@ -234,7 +234,7 @@ static void set_progress_proc(task_t *_task) ...@@ -234,7 +234,7 @@ static void set_progress_proc(task_t *_task)
hres = IDocHostUIHandler_GetHostInfo(doc->hostui, &hostinfo); hres = IDocHostUIHandler_GetHostInfo(doc->hostui, &hostinfo);
if(SUCCEEDED(hres)) if(SUCCEEDED(hres))
/* FIXME: use hostinfo */ /* FIXME: use hostinfo */
TRACE("hostinfo = {%u %08x %08x %s %s}\n", TRACE("hostinfo = {%lu %08lx %08lx %s %s}\n",
hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick,
debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS));
} }
...@@ -352,7 +352,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind ...@@ -352,7 +352,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind
hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("GetDisplayName failed: %08x\n", hres); WARN("GetDisplayName failed: %08lx\n", hres);
return hres; return hres;
} }
...@@ -512,7 +512,7 @@ static HRESULT get_doc_string(HTMLDocumentNode *This, char **str) ...@@ -512,7 +512,7 @@ static HRESULT get_doc_string(HTMLDocumentNode *This, char **str)
nsres = nsIDOMHTMLDocument_QueryInterface(This->nsdoc, &IID_nsIDOMNode, (void**)&nsnode); nsres = nsIDOMHTMLDocument_QueryInterface(This->nsdoc, &IID_nsIDOMNode, (void**)&nsnode);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsIDOMNode failed: %08x\n", nsres); ERR("Could not get nsIDOMNode failed: %08lx\n", nsres);
return E_FAIL; return E_FAIL;
} }
...@@ -586,7 +586,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva ...@@ -586,7 +586,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
IMoniker *mon; IMoniker *mon;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); TRACE("(%p)->(%x %p %p %08lx)\n", This, fFullyAvailable, pimkName, pibc, grfMode);
if(pibc) { if(pibc) {
IUnknown *unk = NULL; IUnknown *unk = NULL;
...@@ -789,7 +789,7 @@ static HRESULT WINAPI PersistFile_IsDirty(IPersistFile *iface) ...@@ -789,7 +789,7 @@ static HRESULT WINAPI PersistFile_IsDirty(IPersistFile *iface)
static HRESULT WINAPI PersistFile_Load(IPersistFile *iface, LPCOLESTR pszFileName, DWORD dwMode) static HRESULT WINAPI PersistFile_Load(IPersistFile *iface, LPCOLESTR pszFileName, DWORD dwMode)
{ {
HTMLDocument *This = impl_from_IPersistFile(iface); HTMLDocument *This = impl_from_IPersistFile(iface);
FIXME("(%p)->(%s %08x)\n", This, debugstr_w(pszFileName), dwMode); FIXME("(%p)->(%s %08lx)\n", This, debugstr_w(pszFileName), dwMode);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -806,7 +806,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *iface, LPCOLESTR pszFileNam ...@@ -806,7 +806,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *iface, LPCOLESTR pszFileNam
file = CreateFileW(pszFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, file = CreateFileW(pszFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, NULL); FILE_ATTRIBUTE_NORMAL, NULL);
if(file == INVALID_HANDLE_VALUE) { if(file == INVALID_HANDLE_VALUE) {
WARN("Could not create file: %u\n", GetLastError()); WARN("Could not create file: %lu\n", GetLastError());
return E_FAIL; return E_FAIL;
} }
...@@ -893,7 +893,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream ...@@ -893,7 +893,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream
hres = CreateURLMoniker(NULL, L"about:blank", &mon); hres = CreateURLMoniker(NULL, L"about:blank", &mon);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("CreateURLMoniker failed: %08x\n", hres); WARN("CreateURLMoniker failed: %08lx\n", hres);
return hres; return hres;
} }
...@@ -922,7 +922,7 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, IStream ...@@ -922,7 +922,7 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, IStream
hres = IStream_Write(pStm, str, strlen(str), &written); hres = IStream_Write(pStm, str, strlen(str), &written);
if(FAILED(hres)) if(FAILED(hres))
FIXME("Write failed: %08x\n", hres); FIXME("Write failed: %08lx\n", hres);
heap_free(str); heap_free(str);
...@@ -950,7 +950,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) ...@@ -950,7 +950,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface)
hres = CreateURLMoniker(NULL, L"about:blank", &mon); hres = CreateURLMoniker(NULL, L"about:blank", &mon);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("CreateURLMoniker failed: %08x\n", hres); WARN("CreateURLMoniker failed: %08lx\n", hres);
return hres; return hres;
} }
...@@ -1094,7 +1094,7 @@ static HRESULT WINAPI PersistHistory_SaveHistory(IPersistHistory *iface, IStream ...@@ -1094,7 +1094,7 @@ static HRESULT WINAPI PersistHistory_SaveHistory(IPersistHistory *iface, IStream
static HRESULT WINAPI PersistHistory_SetPositionCookie(IPersistHistory *iface, DWORD dwPositioncookie) static HRESULT WINAPI PersistHistory_SetPositionCookie(IPersistHistory *iface, DWORD dwPositioncookie)
{ {
HTMLDocument *This = impl_from_IPersistHistory(iface); HTMLDocument *This = impl_from_IPersistHistory(iface);
FIXME("(%p)->(%x)\n", This, dwPositioncookie); FIXME("(%p)->(%lx)\n", This, dwPositioncookie);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1161,10 +1161,10 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L ...@@ -1161,10 +1161,10 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L
{ {
HTMLDocument *This = impl_from_IHlinkTarget(iface); HTMLDocument *This = impl_from_IHlinkTarget(iface);
TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation)); TRACE("(%p)->(%08lx %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation));
if(grfHLNF) if(grfHLNF)
FIXME("Unsupported grfHLNF=%08x\n", grfHLNF); FIXME("Unsupported grfHLNF=%08lx\n", grfHLNF);
if(pwzJumpLocation) if(pwzJumpLocation)
FIXME("JumpLocation not supported\n"); FIXME("JumpLocation not supported\n");
...@@ -1188,7 +1188,7 @@ static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLoc ...@@ -1188,7 +1188,7 @@ static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLoc
IMoniker **ppimkLocation) IMoniker **ppimkLocation)
{ {
HTMLDocument *This = impl_from_IHlinkTarget(iface); HTMLDocument *This = impl_from_IHlinkTarget(iface);
FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation); FIXME("(%p)->(%s %08lx %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/mshtml/protocol.c
View file @ 210abcd8
...@@ -100,7 +100,7 @@ static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa ...@@ -100,7 +100,7 @@ static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa
LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult, LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult,
DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) DWORD cchResult, DWORD* pcchResult, DWORD dwReserved)
{ {
TRACE("%p)->(%s %s %08x %p %d %p %d)\n", iface, debugstr_w(pwzBaseUrl), TRACE("%p)->(%s %s %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzBaseUrl),
debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult,
pcchResult, dwReserved); pcchResult, dwReserved);
...@@ -110,7 +110,7 @@ static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa ...@@ -110,7 +110,7 @@ static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa
static HRESULT WINAPI InternetProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, static HRESULT WINAPI InternetProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1,
LPCWSTR pwzUrl2, DWORD dwCompareFlags) LPCWSTR pwzUrl2, DWORD dwCompareFlags)
{ {
TRACE("%p)->(%s %s %08x)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); TRACE("%p)->(%s %s %08lx)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -180,7 +180,7 @@ static ULONG WINAPI Protocol_AddRef(IUnknown *iface) ...@@ -180,7 +180,7 @@ static ULONG WINAPI Protocol_AddRef(IUnknown *iface)
{ {
InternetProtocol *This = impl_from_IUnknown(iface); InternetProtocol *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", iface, ref); TRACE("(%p) ref=%ld\n", iface, ref);
return ref; return ref;
} }
...@@ -189,7 +189,7 @@ static ULONG WINAPI Protocol_Release(IUnknown *iface) ...@@ -189,7 +189,7 @@ static ULONG WINAPI Protocol_Release(IUnknown *iface)
InternetProtocol *This = impl_from_IUnknown(iface); InternetProtocol *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%x\n", iface, ref); TRACE("(%p) ref=%lx\n", iface, ref);
if(!ref) { if(!ref) {
heap_free(This->data); heap_free(This->data);
...@@ -234,14 +234,14 @@ static HRESULT WINAPI InternetProtocol_Abort(IInternetProtocol *iface, HRESULT h ...@@ -234,14 +234,14 @@ static HRESULT WINAPI InternetProtocol_Abort(IInternetProtocol *iface, HRESULT h
DWORD dwOptions) DWORD dwOptions)
{ {
InternetProtocol *This = impl_from_IInternetProtocol(iface); InternetProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI InternetProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) static HRESULT WINAPI InternetProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions)
{ {
InternetProtocol *This = impl_from_IInternetProtocol(iface); InternetProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions); TRACE("(%p)->(%08lx)\n", This, dwOptions);
return S_OK; return S_OK;
} }
...@@ -263,7 +263,7 @@ static HRESULT WINAPI InternetProtocol_Read(IInternetProtocol *iface, void* pv, ...@@ -263,7 +263,7 @@ static HRESULT WINAPI InternetProtocol_Read(IInternetProtocol *iface, void* pv,
{ {
InternetProtocol *This = impl_from_IInternetProtocol(iface); InternetProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
if(!This->data) if(!This->data)
return E_FAIL; return E_FAIL;
...@@ -283,7 +283,7 @@ static HRESULT WINAPI InternetProtocol_Seek(IInternetProtocol *iface, LARGE_INTE ...@@ -283,7 +283,7 @@ static HRESULT WINAPI InternetProtocol_Seek(IInternetProtocol *iface, LARGE_INTE
DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition)
{ {
InternetProtocol *This = impl_from_IInternetProtocol(iface); InternetProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -291,7 +291,7 @@ static HRESULT WINAPI InternetProtocol_LockRequest(IInternetProtocol *iface, DWO ...@@ -291,7 +291,7 @@ static HRESULT WINAPI InternetProtocol_LockRequest(IInternetProtocol *iface, DWO
{ {
InternetProtocol *This = impl_from_IInternetProtocol(iface); InternetProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%d)\n", This, dwOptions); TRACE("(%p)->(%ld)\n", This, dwOptions);
return S_OK; return S_OK;
} }
...@@ -351,7 +351,7 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr ...@@ -351,7 +351,7 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr
* when the url does not have "about:" in the beginning. * when the url does not have "about:" in the beginning.
*/ */
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved); pOIBindInfo, grfPI, dwReserved);
memset(&bindinfo, 0, sizeof(bindinfo)); memset(&bindinfo, 0, sizeof(bindinfo));
...@@ -361,7 +361,7 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr ...@@ -361,7 +361,7 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr
return hres; return hres;
ReleaseBindInfo(&bindinfo); ReleaseBindInfo(&bindinfo);
TRACE("bindf %x\n", grfBINDF); TRACE("bindf %lx\n", grfBINDF);
if(lstrlenW(szUrl) >= ARRAY_SIZE(wszAbout) && !memcmp(wszAbout, szUrl, sizeof(wszAbout))) { if(lstrlenW(szUrl) >= ARRAY_SIZE(wszAbout) && !memcmp(wszAbout, szUrl, sizeof(wszAbout))) {
text = szUrl + ARRAY_SIZE(wszAbout); text = szUrl + ARRAY_SIZE(wszAbout);
...@@ -425,7 +425,7 @@ static HRESULT WINAPI AboutProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, L ...@@ -425,7 +425,7 @@ static HRESULT WINAPI AboutProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, L
PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult,
DWORD* pcchResult, DWORD dwReserved) DWORD* pcchResult, DWORD dwReserved)
{ {
TRACE("%p)->(%s %d %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, TRACE("%p)->(%s %d %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), ParseAction,
dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
if(ParseAction == PARSE_SECURITY_URL) { if(ParseAction == PARSE_SECURITY_URL) {
...@@ -457,7 +457,7 @@ static HRESULT WINAPI AboutProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, ...@@ -457,7 +457,7 @@ static HRESULT WINAPI AboutProtocolInfo_QueryInfo(IInternetProtocolInfo *iface,
QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf,
DWORD dwReserved) DWORD dwReserved)
{ {
TRACE("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, TRACE("%p)->(%s %08x %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
cbBuffer, pcbBuf, dwReserved); cbBuffer, pcbBuf, dwReserved);
switch(QueryOption) { switch(QueryOption) {
...@@ -543,7 +543,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ...@@ -543,7 +543,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
static const WCHAR wszRes[] = {'r','e','s',':','/','/'}; static const WCHAR wszRes[] = {'r','e','s',':','/','/'};
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved); pOIBindInfo, grfPI, dwReserved);
memset(&bindinfo, 0, sizeof(bindinfo)); memset(&bindinfo, 0, sizeof(bindinfo));
...@@ -557,7 +557,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ...@@ -557,7 +557,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
url = heap_alloc(len*sizeof(WCHAR)); url = heap_alloc(len*sizeof(WCHAR));
hres = CoInternetParseUrl(szUrl, PARSE_ENCODE, 0, url, len, &len, 0); hres = CoInternetParseUrl(szUrl, PARSE_ENCODE, 0, url, len, &len, 0);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("CoInternetParseUrl failed: %08x\n", hres); WARN("CoInternetParseUrl failed: %08lx\n", hres);
heap_free(url); heap_free(url);
IInternetProtocolSink_ReportResult(pOIProtSink, hres, 0, NULL); IInternetProtocolSink_ReportResult(pOIProtSink, hres, 0, NULL);
return hres; return hres;
...@@ -684,7 +684,7 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC ...@@ -684,7 +684,7 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC
PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult,
DWORD* pcchResult, DWORD dwReserved) DWORD* pcchResult, DWORD dwReserved)
{ {
TRACE("%p)->(%s %d %x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, TRACE("%p)->(%s %d %lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), ParseAction,
dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
if(ParseAction == PARSE_SECURITY_URL) { if(ParseAction == PARSE_SECURITY_URL) {
...@@ -758,7 +758,7 @@ static HRESULT WINAPI ResProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LP ...@@ -758,7 +758,7 @@ static HRESULT WINAPI ResProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LP
QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf,
DWORD dwReserved) DWORD dwReserved)
{ {
TRACE("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, TRACE("%p)->(%s %08x %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
cbBuffer, pcbBuf, dwReserved); cbBuffer, pcbBuf, dwReserved);
switch(QueryOption) { switch(QueryOption) {
...@@ -822,7 +822,7 @@ static HRESULT WINAPI JSProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCW ...@@ -822,7 +822,7 @@ static HRESULT WINAPI JSProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCW
PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult,
DWORD* pcchResult, DWORD dwReserved) DWORD* pcchResult, DWORD dwReserved)
{ {
TRACE("%p)->(%s %d %x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, TRACE("%p)->(%s %d %lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), ParseAction,
dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
switch(ParseAction) { switch(ParseAction) {
...@@ -843,7 +843,7 @@ static HRESULT WINAPI JSProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPC ...@@ -843,7 +843,7 @@ static HRESULT WINAPI JSProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPC
QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf,
DWORD dwReserved) DWORD dwReserved)
{ {
TRACE("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, TRACE("%p)->(%s %08x %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
cbBuffer, pcbBuf, dwReserved); cbBuffer, pcbBuf, dwReserved);
switch(QueryOption) { switch(QueryOption) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment