marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Use inline wrappers and fixed found warnings.

oldstable
Jacek Caban 2012-07-26 11:37:48 +02:00 committed by Alexandre Julliard
parent 6b34eea6fc
commit 6d2902f680
20 changed files with 111 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/Makefile.in
View File

@ -1,7 +1,7 @@
MODULE = mshtml.dll
IMPORTLIB = mshtml
IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32
EXTRADEFS = -DCOM_NO_WINDOWS_H
EXTRADEFS = -DCOM_NO_WINDOWS_H -DWIDL_C_INLINE_WRAPPERS
DELAYIMPORTS = wininet
C_SRCS = \

14
dlls/mshtml/editor.c
View File

@ -250,7 +250,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_
remove_child_attr(child_elem, tag, attr_str);
nsIDOMNode_Release(child_elem);
nsIDOMElement_Release(child_elem);
}
nsIDOMNode_Release(child_node);
@ -360,7 +360,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size)
nsAString_InitDepend(&size_str, sizeW);
nsAString_InitDepend(&val_str, size);
nsIDOMElement_SetAttribute(elem, &size_str, &val_str);
nsIDOMHTMLElement_SetAttribute(elem, &size_str, &val_str);
nsAString_Finish(&val_str);
nsISelection_GetRangeAt(nsselection, 0, &range);
@ -379,7 +379,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size)
nsISelection_Release(nsselection);
nsIDOMRange_Release(range);
nsIDOMElement_Release(elem);
nsIDOMHTMLElement_Release(elem);
nsAString_Finish(&size_str);
@ -1168,7 +1168,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
nsAString_InitDepend(&href_str, hrefW);
nsAString_InitDepend(&ns_url, url);
nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url);
nsIDOMHTMLElement_SetAttribute(anchor_elem, &href_str, &ns_url);
nsAString_Finish(&href_str);
nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret);
@ -1177,10 +1177,10 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
if (insert_link_at_caret) {
nsIDOMNode *text_node, *unused_node;
nsIDOMDocument_CreateTextNode(This->doc_node->nsdoc, &ns_url, (nsIDOMText **)&text_node);
nsIDOMHTMLDocument_CreateTextNode(This->doc_node->nsdoc, &ns_url, (nsIDOMText **)&text_node);
/* wrap the <a> tags around the text element */
nsIDOMElement_AppendChild(anchor_elem, text_node, &unused_node);
nsIDOMHTMLElement_AppendChild(anchor_elem, text_node, &unused_node);
nsIDOMNode_Release(text_node);
nsIDOMNode_Release(unused_node);
}
@ -1203,7 +1203,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
}
nsISelection_Release(nsselection);
nsIDOMElement_Release(anchor_elem);
nsIDOMHTMLElement_Release(anchor_elem);
if (cmdexecopt != OLECMDEXECOPT_DONTPROMPTUSER)
SysFreeString(url);

10
dlls/mshtml/htmldoc.c
View File

@ -215,7 +215,7 @@ static HRESULT WINAPI HTMLDocument_get_images(IHTMLDocument2 *iface, IHTMLElemen
if(nscoll) {
*p = create_collection_from_htmlcol(This->doc_node, nscoll);
nsIDOMElement_Release(nscoll);
nsIDOMHTMLCollection_Release(nscoll);
}
return S_OK;
@ -247,7 +247,7 @@ static HRESULT WINAPI HTMLDocument_get_applets(IHTMLDocument2 *iface, IHTMLEleme
if(nscoll) {
*p = create_collection_from_htmlcol(This->doc_node, nscoll);
nsIDOMElement_Release(nscoll);
nsIDOMHTMLCollection_Release(nscoll);
}
return S_OK;
@ -279,7 +279,7 @@ static HRESULT WINAPI HTMLDocument_get_links(IHTMLDocument2 *iface, IHTMLElement
if(nscoll) {
*p = create_collection_from_htmlcol(This->doc_node, nscoll);
nsIDOMElement_Release(nscoll);
nsIDOMHTMLCollection_Release(nscoll);
}
return S_OK;
@ -311,7 +311,7 @@ static HRESULT WINAPI HTMLDocument_get_forms(IHTMLDocument2 *iface, IHTMLElement
if(nscoll) {
*p = create_collection_from_htmlcol(This->doc_node, nscoll);
nsIDOMElement_Release(nscoll);
nsIDOMHTMLCollection_Release(nscoll);
}
return S_OK;
@ -343,7 +343,7 @@ static HRESULT WINAPI HTMLDocument_get_anchors(IHTMLDocument2 *iface, IHTMLEleme
if(nscoll) {
*p = create_collection_from_htmlcol(This->doc_node, nscoll);
nsIDOMElement_Release(nscoll);
nsIDOMHTMLCollection_Release(nscoll);
}
return S_OK;

2
dlls/mshtml/htmldoc5.c
View File

@ -150,7 +150,7 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs
}
hres = HTMLCommentElement_Create(This->doc_node, (nsIDOMNode*)nscomment, &elem);
nsIDOMElement_Release(nscomment);
nsIDOMComment_Release(nscomment);
if(FAILED(hres))
return hres;

6
dlls/mshtml/htmlelem.c
View File

@ -182,7 +182,7 @@ HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMHTMLElement
}
nsAString_InitDepend(&tag_str, tag);
nsres = nsIDOMDocument_CreateElement(doc->nsdoc, &tag_str, &nselem);
nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &tag_str, &nselem);
nsAString_Finish(&tag_str);
if(NS_FAILED(nsres)) {
ERR("CreateElement failed: %08x\n", nsres);
@ -1180,7 +1180,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentText(IHTMLElement *iface, BSTR w
nsAString_InitDepend(&ns_text, text);
nsres = nsIDOMDocument_CreateTextNode(This->node.doc->nsdoc, &ns_text, (nsIDOMText **)&nsnode);
nsres = nsIDOMHTMLDocument_CreateTextNode(This->node.doc->nsdoc, &ns_text, (nsIDOMText **)&nsnode);
nsAString_Finish(&ns_text);
if(NS_FAILED(nsres) || !nsnode)
@ -1802,7 +1802,7 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g
TRACE("%s ret %p\n", debugstr_w(class_name), elem);
nsIDOMElement_Release(nselem);
nsIDOMHTMLElement_Release(nselem);
nsAString_Finish(&class_name_str);
if(FAILED(hres))
return hres;

22
dlls/mshtml/htmlelem2.c
View File

@ -620,7 +620,7 @@ static HRESULT WINAPI HTMLElement2_getBoundingClientRect(IHTMLElement2 *iface, I
TRACE("(%p)->(%p)\n", This, pRect);
nsres = nsIDOMElement_GetBoundingClientRect(This->nselem, &nsrect);
nsres = nsIDOMHTMLElement_GetBoundingClientRect(This->nselem, &nsrect);
if(NS_FAILED(nsres) || !nsrect) {
ERR("GetBoindingClientRect failed: %08x\n", nsres);
return E_FAIL;
@ -811,7 +811,7 @@ static HRESULT WINAPI HTMLElement2_get_clientHeight(IHTMLElement2 *iface, LONG *
TRACE("(%p)->(%p)\n", This, p);
nsIDOMElement_GetClientHeight(This->nselem, &height);
nsIDOMHTMLElement_GetClientHeight(This->nselem, &height);
*p = height;
return S_OK;
@ -824,7 +824,7 @@ static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, LONG *p
TRACE("(%p)->(%p)\n", This, p);
nsIDOMElement_GetClientWidth(This->nselem, &width);
nsIDOMHTMLElement_GetClientWidth(This->nselem, &width);
*p = width;
return S_OK;
@ -838,7 +838,7 @@ static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, LONG *p)
TRACE("(%p)->(%p)\n", This, p);
nsres = nsIDOMElement_GetClientTop(This->nselem, &client_top);
nsres = nsIDOMHTMLElement_GetClientTop(This->nselem, &client_top);
if(NS_FAILED(nsres))
ERR("GetScrollHeight failed: %08x\n", nsres);
@ -855,7 +855,7 @@ static HRESULT WINAPI HTMLElement2_get_clientLeft(IHTMLElement2 *iface, LONG *p)
TRACE("(%p)->(%p)\n", This, p);
nsres = nsIDOMElement_GetClientLeft(This->nselem, &client_left);
nsres = nsIDOMHTMLElement_GetClientLeft(This->nselem, &client_left);
if(NS_FAILED(nsres))
ERR("GetScrollHeight failed: %08x\n", nsres);
@ -1008,7 +1008,7 @@ static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, LONG *
TRACE("(%p)->(%p)\n", This, p);
nsres = nsIDOMElement_GetScrollHeight(This->nselem, &height);
nsres = nsIDOMHTMLElement_GetScrollHeight(This->nselem, &height);
if(NS_FAILED(nsres))
ERR("GetScrollHeight failed: %08x\n", nsres);
@ -1025,7 +1025,7 @@ static HRESULT WINAPI HTMLElement2_get_scrollWidth(IHTMLElement2 *iface, LONG *p
TRACE("(%p)->(%p)\n", This, p);
nsres = nsIDOMElement_GetScrollWidth(This->nselem, &width);
nsres = nsIDOMHTMLElement_GetScrollWidth(This->nselem, &width);
if(NS_FAILED(nsres))
ERR("GetScrollWidth failed: %08x\n", nsres);
@ -1045,7 +1045,7 @@ static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, LONG v)
return E_NOTIMPL;
}
nsIDOMElement_SetScrollTop(This->nselem, v);
nsIDOMHTMLElement_SetScrollTop(This->nselem, v);
return S_OK;
}
@ -1057,7 +1057,7 @@ static HRESULT WINAPI HTMLElement2_get_scrollTop(IHTMLElement2 *iface, LONG *p)
TRACE("(%p)->(%p)\n", This, p);
nsres = nsIDOMElement_GetScrollTop(This->nselem, &top);
nsres = nsIDOMHTMLElement_GetScrollTop(This->nselem, &top);
if(NS_FAILED(nsres))
ERR("GetScrollTop failed: %08x\n", nsres);
@ -1077,7 +1077,7 @@ static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, LONG v)
return E_NOTIMPL;
}
nsIDOMElement_SetScrollLeft(This->nselem, v);
nsIDOMHTMLElement_SetScrollLeft(This->nselem, v);
return S_OK;
}
@ -1097,7 +1097,7 @@ static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, LONG *p)
return E_NOTIMPL;
}
nsIDOMElement_GetScrollLeft(This->nselem, &left);
nsIDOMHTMLElement_GetScrollLeft(This->nselem, &left);
*p = left;
TRACE("*p = %d\n", *p);

2
dlls/mshtml/htmlelemcol.c
View File

@ -376,7 +376,7 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface,
if(!This->elems[i]->nselem)
continue;
nsIDOMElement_GetTagName(This->elems[i]->nselem, &tag_str);
nsIDOMHTMLElement_GetTagName(This->elems[i]->nselem, &tag_str);
nsAString_GetData(&tag_str, &tag);
if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1,

4
dlls/mshtml/htmlobject.c
View File

@ -119,7 +119,7 @@ static HRESULT WINAPI HTMLObjectElement_get_classid(IHTMLObjectElement *iface, B
TRACE("(%p)->(%p)\n", This, p);
return IHTMLObjectElement2_get_classid(&This->IHTMLObjectElement_iface, p);
return IHTMLObjectElement2_get_classid(&This->IHTMLObjectElement2_iface, p);
}
static HRESULT WINAPI HTMLObjectElement_get_data(IHTMLObjectElement *iface, BSTR *p)
@ -128,7 +128,7 @@ static HRESULT WINAPI HTMLObjectElement_get_data(IHTMLObjectElement *iface, BSTR
TRACE("(%p)->(%p)\n", This, p);
return IHTMLObjectElement2_get_data(&This->IHTMLObjectElement_iface, p);
return IHTMLObjectElement2_get_data(&This->IHTMLObjectElement2_iface, p);
}
static HRESULT WINAPI HTMLObjectElement_put_recordset(IHTMLObjectElement *iface, IDispatch *v)

10
dlls/mshtml/mutation.c
View File

@ -604,13 +604,13 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface,
TRACE("(%p)\n", This);
nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem);
nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem);
if(NS_SUCCEEDED(nsres)) {
check_event_attr(This, nselem);
nsIDOMElement_Release(nselem);
}
nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment);
nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment);
if(NS_SUCCEEDED(nsres)) {
TRACE("comment node\n");
@ -618,7 +618,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface,
nsIDOMComment_Release(nscomment);
}
nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe);
nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe);
if(NS_SUCCEEDED(nsres)) {
TRACE("iframe node\n");
@ -626,7 +626,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface,
nsIDOMHTMLIFrameElement_Release(nsiframe);
}
nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMHTMLFrameElement, (void**)&nsframe);
nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLFrameElement, (void**)&nsframe);
if(NS_SUCCEEDED(nsres)) {
TRACE("frame node\n");
@ -644,7 +644,7 @@ static void NSAPI nsDocumentObserver_AttemptToExecuteScript(nsIDocumentObserver
TRACE("(%p)->(%p %p %p)\n", This, aContent, aParser, aBlock);
nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript);
nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript);
if(NS_SUCCEEDED(nsres)) {
TRACE("script node\n");

14
dlls/mshtml/navigate.c
View File

@ -1162,7 +1162,7 @@ static nsrefcnt NSAPI nsAsyncVerifyRedirectCallback_Release(nsIAsyncVerifyRedire
if(!ref) {
IBindStatusCallback_Release(&This->bsc->bsc.IBindStatusCallback_iface);
nsIChannel_Release(&This->nschannel->nsIHttpChannel_iface);
nsIHttpChannel_Release(&This->nschannel->nsIHttpChannel_iface);
heap_free(This);
}
@ -1178,7 +1178,7 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAs
TRACE("(%p)->(%08x)\n", This, result);
old_nschannel = This->bsc->nschannel;
nsIChannel_AddRef(&This->nschannel->nsIHttpChannel_iface);
nsIHttpChannel_AddRef(&This->nschannel->nsIHttpChannel_iface);
This->bsc->nschannel = This->nschannel;
if(This->nschannel->load_group) {
@ -1228,7 +1228,7 @@ static HRESULT create_redirect_callback(nsChannel *nschannel, nsChannelBSC *bsc,
callback->nsIAsyncVerifyRedirectCallback_iface.lpVtbl = &nsAsyncVerifyRedirectCallbackVtbl;
callback->ref = 1;
nsIChannel_AddRef(&nschannel->nsIHttpChannel_iface);
nsIHttpChannel_AddRef(&nschannel->nsIHttpChannel_iface);
callback->nschannel = nschannel;
IBindStatusCallback_AddRef(&bsc->bsc.IBindStatusCallback_iface);
@ -1248,7 +1248,7 @@ static void nsChannelBSC_destroy(BSCallback *bsc)
nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc);
if(This->nschannel)
nsIChannel_Release(&This->nschannel->nsIHttpChannel_iface);
nsIHttpChannel_Release(&This->nschannel->nsIHttpChannel_iface);
if(This->nslistener)
nsIStreamListener_Release(This->nslistener);
if(This->nscontext)
@ -1466,7 +1466,7 @@ static HRESULT handle_redirect(nsChannelBSC *This, const WCHAR *new_url)
TRACE("%p %p->%p\n", This, This->nschannel, new_channel);
hres = create_redirect_callback(new_channel, This, &callback);
nsIChannel_Release(&new_channel->nsIHttpChannel_iface);
nsIHttpChannel_Release(&new_channel->nsIHttpChannel_iface);
}
if(SUCCEEDED(hres)) {
@ -1745,7 +1745,7 @@ HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IStream *stream)
void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamListener *listener, nsISupports *context)
{
nsIChannel_AddRef(&channel->nsIHttpChannel_iface);
nsIHttpChannel_AddRef(&channel->nsIHttpChannel_iface);
This->nschannel = channel;
nsIStreamListener_AddRef(listener);
@ -2002,7 +2002,7 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam
if(SUCCEEDED(hres)) {
ITargetFramePriv2 *target_frame_priv;
hres = IWebBrowser_QueryInterface(web_browser, &IID_ITargetFramePriv2, (void**)&target_frame_priv);
hres = IWebBrowser2_QueryInterface(web_browser, &IID_ITargetFramePriv2, (void**)&target_frame_priv);
if(SUCCEEDED(hres)) {
hres = ITargetFramePriv2_AggregatedNavigation2(target_frame_priv,
HLNF_DISABLEWINDOWRESTRICTIONS|HLNF_OPENINNEWWINDOW, bind_ctx, &bsc->bsc.IBindStatusCallback_iface,

2
dlls/mshtml/nsembed.c
View File

@ -1803,7 +1803,7 @@ static HRESULT init_nscontainer(NSContainer *nscontainer)
return E_FAIL;
}
nsres = nsIWebBrowserFocus_QueryInterface(nscontainer->webbrowser, &IID_nsIWebBrowserFocus,
nsres = nsIWebBrowser_QueryInterface(nscontainer->webbrowser, &IID_nsIWebBrowserFocus,
(void**)&nscontainer->focus);
if(NS_FAILED(nsres)) {
ERR("Could not get nsIWebBrowserFocus interface: %08x\n", nsres);

2
dlls/mshtml/nsevents.c
View File

@ -92,7 +92,7 @@ static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener *ifa
}
if(*result) {
nsIWebBrowserChrome_AddRef(&This->nsIDOMEventListener_iface);
nsIDOMEventListener_AddRef(&This->nsIDOMEventListener_iface);
return NS_OK;
}

52
dlls/mshtml/nsio.c
View File

@ -505,7 +505,7 @@ static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef r
}
if(*result) {
nsIChannel_AddRef(&This->nsIHttpChannel_iface);
nsIHttpChannel_AddRef(&This->nsIHttpChannel_iface);
return NS_OK;
}
@ -528,7 +528,7 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface)
LONG ref = InterlockedDecrement(&This->ref);
if(!ref) {
nsIURI_Release(&This->uri->nsIFileURL_iface);
nsIFileURL_Release(&This->uri->nsIFileURL_iface);
if(This->owner)
nsISupports_Release(This->owner);
if(This->post_data_stream)
@ -559,7 +559,7 @@ static nsresult NSAPI nsChannel_GetName(nsIHttpChannel *iface, nsACString *aName
TRACE("(%p)->(%p)\n", This, aName);
return nsIURI_GetSpec(&This->uri->nsIFileURL_iface, aName);
return nsIFileURL_GetSpec(&This->uri->nsIFileURL_iface, aName);
}
static nsresult NSAPI nsChannel_IsPending(nsIHttpChannel *iface, cpp_bool *_retval)
@ -688,7 +688,7 @@ static nsresult NSAPI nsChannel_GetURI(nsIHttpChannel *iface, nsIURI **aURI)
TRACE("(%p)->(%p)\n", This, aURI);
nsIURI_AddRef(&This->uri->nsIFileURL_iface);
nsIFileURL_AddRef(&This->uri->nsIFileURL_iface);
*aURI = (nsIURI*)This->uri;
return NS_OK;
@ -902,7 +902,7 @@ static HTMLOuterWindow *get_window_from_load_group(nsChannel *This)
window = wine_uri->window_ref ? wine_uri->window_ref->window : NULL;
if(window)
IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface);
nsIURI_Release(&wine_uri->nsIFileURL_iface);
nsIFileURL_Release(&wine_uri->nsIFileURL_iface);
return window;
}
@ -1416,19 +1416,19 @@ static nsresult NSAPI nsUploadChannel_QueryInterface(nsIUploadChannel *iface, ns
void **result)
{
nsChannel *This = impl_from_nsIUploadChannel(iface);
return nsIChannel_QueryInterface(&This->nsIHttpChannel_iface, riid, result);
return nsIHttpChannel_QueryInterface(&This->nsIHttpChannel_iface, riid, result);
}
static nsrefcnt NSAPI nsUploadChannel_AddRef(nsIUploadChannel *iface)
{
nsChannel *This = impl_from_nsIUploadChannel(iface);
return nsIChannel_AddRef(&This->nsIHttpChannel_iface);
return nsIHttpChannel_AddRef(&This->nsIHttpChannel_iface);
}
static nsrefcnt NSAPI nsUploadChannel_Release(nsIUploadChannel *iface)
{
nsChannel *This = impl_from_nsIUploadChannel(iface);
return nsIChannel_Release(&This->nsIHttpChannel_iface);
return nsIHttpChannel_Release(&This->nsIHttpChannel_iface);
}
static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface,
@ -1507,19 +1507,19 @@ static nsresult NSAPI nsHttpChannelInternal_QueryInterface(nsIHttpChannelInterna
void **result)
{
nsChannel *This = impl_from_nsIHttpChannelInternal(iface);
return nsIChannel_QueryInterface(&This->nsIHttpChannel_iface, riid, result);
return nsIHttpChannel_QueryInterface(&This->nsIHttpChannel_iface, riid, result);
}
static nsrefcnt NSAPI nsHttpChannelInternal_AddRef(nsIHttpChannelInternal *iface)
{
nsChannel *This = impl_from_nsIHttpChannelInternal(iface);
return nsIChannel_AddRef(&This->nsIHttpChannel_iface);
return nsIHttpChannel_AddRef(&This->nsIHttpChannel_iface);
}
static nsrefcnt NSAPI nsHttpChannelInternal_Release(nsIHttpChannelInternal *iface)
{
nsChannel *This = impl_from_nsIHttpChannelInternal(iface);
return nsIChannel_Release(&This->nsIHttpChannel_iface);
return nsIHttpChannel_Release(&This->nsIHttpChannel_iface);
}
static nsresult NSAPI nsHttpChannelInternal_GetDocumentURI(nsIHttpChannelInternal *iface, nsIURI **aDocumentURI)
@ -1807,7 +1807,7 @@ static nsresult NSAPI nsURI_QueryInterface(nsIFileURL *iface, nsIIDRef riid, voi
}
if(*result) {
nsIURI_AddRef(&This->nsIFileURL_iface);
nsIFileURL_AddRef(&This->nsIFileURL_iface);
return NS_OK;
}
@ -2264,7 +2264,7 @@ static nsresult NSAPI nsURI_Equals(nsIFileURL *iface, nsIURI *other, cpp_bool *_
nsres = NS_ERROR_UNEXPECTED;
}
nsIURI_Release(&other_obj->nsIFileURL_iface);
nsIFileURL_Release(&other_obj->nsIFileURL_iface);
return nsres;
}
@ -2361,7 +2361,7 @@ static nsresult NSAPI nsURI_GetAsciiSpec(nsIFileURL *iface, nsACString *aAsciiSp
TRACE("(%p)->(%p)\n", This, aAsciiSpec);
return nsIURI_GetSpec(&This->nsIFileURL_iface, aAsciiSpec);
return nsIFileURL_GetSpec(&This->nsIFileURL_iface, aAsciiSpec);
}
static nsresult NSAPI nsURI_GetAsciiHost(nsIFileURL *iface, nsACString *aAsciiHost)
@ -2453,7 +2453,7 @@ static nsresult NSAPI nsURI_EqualsExceptRef(nsIFileURL *iface, nsIURI *other, cp
nsres = NS_ERROR_UNEXPECTED;
}
nsIURI_Release(&other_obj->nsIFileURL_iface);
nsIFileURL_Release(&other_obj->nsIFileURL_iface);
return nsres;
}
@ -2490,7 +2490,7 @@ static nsresult NSAPI nsURI_GetSpecIgnoringRef(nsIFileURL *iface, nsACString *aS
FIXME("(%p)->(%p)\n", This, aSpecIgnoringRef);
return nsIURL_GetSpec(&This->nsIFileURL_iface, aSpecIgnoringRef);
return nsIFileURL_GetSpec(&This->nsIFileURL_iface, aSpecIgnoringRef);
}
static nsresult NSAPI nsURI_GetHasRef(nsIFileURL *iface, cpp_bool *aHasRef)
@ -2518,7 +2518,7 @@ static nsresult NSAPI nsURL_GetFilePath(nsIFileURL *iface, nsACString *aFilePath
TRACE("(%p)->(%p)\n", This, aFilePath);
return nsIURL_GetPath(&This->nsIFileURL_iface, aFilePath);
return nsIFileURL_GetPath(&This->nsIFileURL_iface, aFilePath);
}
static nsresult NSAPI nsURL_SetFilePath(nsIFileURL *iface, const nsACString *aFilePath)
@ -2530,7 +2530,7 @@ static nsresult NSAPI nsURL_SetFilePath(nsIFileURL *iface, const nsACString *aFi
if(!This->is_mutable)
return NS_ERROR_UNEXPECTED;
return nsIURL_SetPath(&This->nsIFileURL_iface, aFilePath);
return nsIFileURL_SetPath(&This->nsIFileURL_iface, aFilePath);
}
static nsresult NSAPI nsURL_GetQuery(nsIFileURL *iface, nsACString *aQuery)
@ -2790,19 +2790,19 @@ static nsresult NSAPI nsStandardURL_QueryInterface(nsIStandardURL *iface, nsIIDR
void **result)
{
nsWineURI *This = impl_from_nsIStandardURL(iface);
return nsIURL_QueryInterface(&This->nsIFileURL_iface, riid, result);
return nsIFileURL_QueryInterface(&This->nsIFileURL_iface, riid, result);
}
static nsrefcnt NSAPI nsStandardURL_AddRef(nsIStandardURL *iface)
{
nsWineURI *This = impl_from_nsIStandardURL(iface);
return nsIURL_AddRef(&This->nsIFileURL_iface);
return nsIFileURL_AddRef(&This->nsIFileURL_iface);
}
static nsrefcnt NSAPI nsStandardURL_Release(nsIStandardURL *iface)
{
nsWineURI *This = impl_from_nsIStandardURL(iface);
return nsIURL_Release(&This->nsIFileURL_iface);
return nsIFileURL_Release(&This->nsIFileURL_iface);
}
static nsresult NSAPI nsStandardURL_GetMutable(nsIStandardURL *iface, cpp_bool *aMutable)
@ -2908,7 +2908,7 @@ static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret)
list_init(&channel->response_headers);
list_init(&channel->request_headers);
nsIURL_AddRef(&uri->nsIFileURL_iface);
nsIFileURL_AddRef(&uri->nsIFileURL_iface);
channel->uri = uri;
*ret = channel;
@ -2936,7 +2936,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC
return E_FAIL;
nsres = create_nschannel(uri, &channel);
nsIURL_Release(&uri->nsIFileURL_iface);
nsIFileURL_Release(&uri->nsIFileURL_iface);
if(NS_FAILED(nsres))
return E_FAIL;
@ -3249,7 +3249,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
nsres = create_nsuri(urlmon_uri, window, NULL, &wine_uri);
IUri_Release(urlmon_uri);
if(base_wine_uri)
nsIURI_Release(&base_wine_uri->nsIFileURL_iface);
nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);
if(NS_FAILED(nsres))
return nsres;
@ -3280,7 +3280,7 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI
}
nsres = create_nschannel(wine_uri, &ret);
nsIURL_Release(&wine_uri->nsIFileURL_iface);
nsIFileURL_Release(&wine_uri->nsIFileURL_iface);
if(NS_FAILED(nsres))
return nsres;
@ -3576,7 +3576,7 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_ret
*_retval = translate_url(nscontainer->doc, wine_uri);
}
nsIURI_Release(&wine_uri->nsIFileURL_iface);
nsIFileURL_Release(&wine_uri->nsIFileURL_iface);
return NS_OK;
}

2
dlls/mshtml/oleobj.c
View File

@ -257,7 +257,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
This->doc_obj->custom_hostui = FALSE;
hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&uihandler);
hres = IOleClientSite_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&uihandler);
if(SUCCEEDED(hres))
This->doc_obj->hostui = uihandler;
}

4
dlls/mshtml/olewnd.c
View File

@ -174,14 +174,14 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_GetWindow(IOleInPlaceObjectWind
HWND *phwnd)
{
HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface);
return IOleWindow_GetWindow(&This->IOleInPlaceActiveObject_iface, phwnd);
return IOleInPlaceActiveObject_GetWindow(&This->IOleInPlaceActiveObject_iface, phwnd);
}
static HRESULT WINAPI OleInPlaceObjectWindowless_ContextSensitiveHelp(IOleInPlaceObjectWindowless *iface,
BOOL fEnterMode)
{
HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface);
return IOleWindow_ContextSensitiveHelp(&This->IOleInPlaceActiveObject_iface, fEnterMode);
return IOleInPlaceActiveObject_ContextSensitiveHelp(&This->IOleInPlaceActiveObject_iface, fEnterMode);
}
static HRESULT WINAPI OleInPlaceObjectWindowless_InPlaceDeactivate(IOleInPlaceObjectWindowless *iface)

8
dlls/mshtml/persist.c
View File

@ -372,7 +372,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel
if(SUCCEEDED(hres))
hres = create_pending_window(This->window, bscallback);
if(bscallback != async_bsc)
IUnknown_Release(&bscallback->bsc.IBindStatusCallback_iface);
IBindStatusCallback_Release(&bscallback->bsc.IBindStatusCallback_iface);
}
if(FAILED(hres)) {
@ -483,7 +483,7 @@ static ULONG WINAPI PersistMoniker_Release(IPersistMoniker *iface)
static HRESULT WINAPI PersistMoniker_GetClassID(IPersistMoniker *iface, CLSID *pClassID)
{
HTMLDocument *This = impl_from_IPersistMoniker(iface);
return IPersist_GetClassID(&This->IPersistFile_iface, pClassID);
return IPersistFile_GetClassID(&This->IPersistFile_iface, pClassID);
}
static HRESULT WINAPI PersistMoniker_IsDirty(IPersistMoniker *iface)
@ -773,7 +773,7 @@ static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface)
static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *pClassID)
{
HTMLDocument *This = impl_from_IPersistStreamInit(iface);
return IPersist_GetClassID(&This->IPersistFile_iface, pClassID);
return IPersistFile_GetClassID(&This->IPersistFile_iface, pClassID);
}
static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface)
@ -914,7 +914,7 @@ static ULONG WINAPI PersistHistory_Release(IPersistHistory *iface)
static HRESULT WINAPI PersistHistory_GetClassID(IPersistHistory *iface, CLSID *pClassID)
{
HTMLDocument *This = impl_from_IPersistHistory(iface);
return IPersist_GetClassID(&This->IPersistFile_iface, pClassID);
return IPersistFile_GetClassID(&This->IPersistFile_iface, pClassID);
}
static HRESULT WINAPI PersistHistory_LoadHistory(IPersistHistory *iface, IStream *pStream, IBindCtx *pbc)

2
dlls/mshtml/pluginhost.c
View File

@ -481,7 +481,7 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID
return E_NOINTERFACE;
}
IOleClientSite_AddRef((IUnknown*)*ppv);
IUnknown_AddRef((IUnknown*)*ppv);
return S_OK;
}

30
dlls/mshtml/script.c
View File

@ -36,11 +36,27 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#ifdef _WIN64
#define CTXARG_T DWORDLONG
#define IActiveScriptSiteDebugVtbl IActiveScriptSiteDebug64Vtbl
#define IActiveScriptParse_Release IActiveScriptParse64_Release
#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew
#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText
#define IActiveScriptParseProcedure_Release IActiveScriptParseProcedure64_Release
#define IActiveScriptParseProcedure_ParseProcedureText IActiveScriptParseProcedure64_ParseProcedureText
#else
#define CTXARG_T DWORD
#define IActiveScriptSiteDebugVtbl IActiveScriptSiteDebug32Vtbl
#define IActiveScriptParse_Release IActiveScriptParse32_Release
#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew
#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText
#define IActiveScriptParseProcedure_Release IActiveScriptParseProcedure32_Release
#define IActiveScriptParseProcedure_ParseProcedureText IActiveScriptParseProcedure32_ParseProcedureText
#endif
static const WCHAR windowW[] = {'w','i','n','d','o','w',0};
@ -135,7 +151,7 @@ static BOOL init_script_engine(ScriptHost *script_host)
V_BOOL(&var) = VARIANT_TRUE;
set_script_prop(script_host, SCRIPTPROP_HACK_TRIDENTEVENTSINK, &var);
hres = IActiveScriptParse64_InitNew(script_host->parse);
hres = IActiveScriptParse_InitNew(script_host->parse);
if(FAILED(hres)) {
WARN("InitNew failed: %08x\n", hres);
return FALSE;
@ -196,12 +212,12 @@ static void release_script_engine(ScriptHost *This)
default:
if(This->parse_proc) {
IUnknown_Release(This->parse_proc);
IActiveScriptParseProcedure_Release(This->parse_proc);
This->parse_proc = NULL;
}
if(This->parse) {
IUnknown_Release(This->parse);
IActiveScriptParse_Release(This->parse);
This->parse = NULL;
}
}
@ -632,7 +648,7 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text)
VariantInit(&var);
memset(&excepinfo, 0, sizeof(excepinfo));
TRACE(">>>\n");
hres = IActiveScriptParse64_ParseScriptText(script_host->parse, text, windowW, NULL, script_endW,
hres = IActiveScriptParse_ParseScriptText(script_host->parse, text, windowW, NULL, script_endW,
0, 0, SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE,
&var, &excepinfo);
if(SUCCEEDED(hres))
@ -875,7 +891,7 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text)
if(!script_host || !script_host->parse_proc)
return NULL;
hres = IActiveScriptParseProcedure64_ParseProcedureText(script_host->parse_proc, ptr, NULL, emptyW,
hres = IActiveScriptParseProcedure_ParseProcedureText(script_host->parse_proc, ptr, NULL, emptyW,
NULL, NULL, delimiterW, 0 /* FIXME */, 0,
SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp);
if(FAILED(hres)) {
@ -914,7 +930,7 @@ HRESULT exec_script(HTMLInnerWindow *window, const WCHAR *code, const WCHAR *lan
memset(&ei, 0, sizeof(ei));
TRACE(">>>\n");
hres = IActiveScriptParse64_ParseScriptText(script_host->parse, code, NULL, NULL, delimW, 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei);
hres = IActiveScriptParse_ParseScriptText(script_host->parse, code, NULL, NULL, delimW, 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei);
if(SUCCEEDED(hres))
TRACE("<<<\n");
else
@ -1027,6 +1043,6 @@ void release_script_hosts(HTMLInnerWindow *window)
release_script_engine(iter);
list_remove(&iter->entry);
iter->window = NULL;
IActiveScript_Release(&iter->IActiveScriptSite_iface);
IActiveScriptSite_Release(&iter->IActiveScriptSite_iface);
}
}

14
dlls/mshtml/txtrange.c
View File

@ -342,7 +342,7 @@ static nsIDOMNode *prev_node(HTMLTxtRange *This, nsIDOMNode *iter)
nsIDOMHTMLElement *nselem;
nsIDOMHTMLDocument_GetBody(This->doc->nsdoc, &nselem);
nsIDOMElement_GetLastChild(nselem, &tmp);
nsIDOMHTMLElement_GetLastChild(nselem, &tmp);
if(!tmp)
return (nsIDOMNode*)nselem;
@ -351,7 +351,7 @@ static nsIDOMNode *prev_node(HTMLTxtRange *This, nsIDOMNode *iter)
nsIDOMNode_GetLastChild(ret, &tmp);
}
nsIDOMElement_Release(nselem);
nsIDOMHTMLElement_Release(nselem);
return ret;
}
@ -1048,7 +1048,7 @@ static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface)
if(!ref) {
if(This->nsrange)
nsISelection_Release(This->nsrange);
nsIDOMRange_Release(This->nsrange);
if(This->doc)
list_remove(&This->entry);
heap_free(This);
@ -1806,16 +1806,16 @@ static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out)
create_nselem(This->doc, pW, &p_elem);
nsIDOMRange_ExtractContents(This->nsrange, &fragment);
nsIDOMElement_AppendChild(p_elem, (nsIDOMNode*)fragment, &tmp);
nsIDOMHTMLElement_AppendChild(p_elem, (nsIDOMNode*)fragment, &tmp);
nsIDOMDocumentFragment_Release(fragment);
nsIDOMNode_Release(tmp);
nsIDOMElement_AppendChild(blockquote_elem, (nsIDOMNode*)p_elem, &tmp);
nsIDOMElement_Release(p_elem);
nsIDOMHTMLElement_AppendChild(blockquote_elem, (nsIDOMNode*)p_elem, &tmp);
nsIDOMHTMLElement_Release(p_elem);
nsIDOMNode_Release(tmp);
nsIDOMRange_InsertNode(This->nsrange, (nsIDOMNode*)blockquote_elem);
nsIDOMElement_Release(blockquote_elem);
nsIDOMHTMLElement_Release(blockquote_elem);
return S_OK;
}

4
dlls/mshtml/view.c
View File

@ -439,7 +439,7 @@ HRESULT call_set_active_object(IOleInPlaceUIWindow *window, IOleInPlaceActiveObj
sizeof(html_documentW)/sizeof(WCHAR));
}
return IOleInPlaceFrame_SetActiveObject(window, act_obj, act_obj ? html_documentW : NULL);
return IOleInPlaceUIWindow_SetActiveObject(window, act_obj, act_obj ? html_documentW : NULL);
}
/**********************************************************
@ -620,7 +620,7 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f
}
}
IOleClientSite_AddRef(This->doc_obj->ipsite);
IOleInPlaceSite_AddRef(This->doc_obj->ipsite);
This->doc_obj->request_uiactivate = FALSE;
HTMLDocument_LockContainer(This->doc_obj, TRUE);
}