From 7846f0947a1df69ee6417af0030bfcfa5620e0c9 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Tue, 13 Sep 2016 21:54:20 +0300 Subject: [PATCH] mshtml: Use proper constants as HRESULT return values. Signed-off-by: Nikolay Sivov Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/ifacewrap.c | 4 ++-- dlls/mshtml/main.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 3f37840ffb5..76d5c2e073f 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -291,7 +291,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) if(NS_FAILED(nsres)) ERR("SetSrc failed: %08x\n", nsres); - return NS_OK; + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 80964c9a1fd..1ba477e041c 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1167,10 +1167,10 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode2_iface; }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &node_ccp; - return NS_OK; + return S_OK; }else if(IsEqualGUID(&IID_nsCycleCollectionISupports, riid)) { *ppv = &This->IHTMLDOMNode_iface; - return NS_OK; + return S_OK; }else if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0ee848f276a..7a4ebe3e23d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -494,7 +494,7 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsAString_Finish(&str_name); - return NS_OK; + return S_OK; } static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 14246a65f00..da1af2cd22a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -458,7 +458,7 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H return hres; *ret = window; - return NS_OK; + return S_OK; } static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) diff --git a/dlls/mshtml/ifacewrap.c b/dlls/mshtml/ifacewrap.c index a22a008fd2b..f31bb4a5196 100644 --- a/dlls/mshtml/ifacewrap.c +++ b/dlls/mshtml/ifacewrap.c @@ -59,7 +59,7 @@ static HRESULT WINAPI wrapper_QueryInterface(IUnknown *iface, REFIID riid, void return IUnknown_QueryInterface(This->ref_unk, riid, ppv); } -static HRESULT WINAPI wrapper_AddRef(IUnknown *iface) +static ULONG WINAPI wrapper_AddRef(IUnknown *iface) { iface_wrapper_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -69,7 +69,7 @@ static HRESULT WINAPI wrapper_AddRef(IUnknown *iface) return ref; } -static HRESULT WINAPI wrapper_Release(IUnknown *iface) +static ULONG WINAPI wrapper_Release(IUnknown *iface) { iface_wrapper_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8a366bd9537..2a00aeefa91 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -382,7 +382,7 @@ HRESULT WINAPI RunHTMLApplication( HINSTANCE hinst, HINSTANCE hPrevInst, LPSTR szCmdLine, INT nCmdShow ) { FIXME("%p %p %s %d\n", hinst, hPrevInst, debugstr_a(szCmdLine), nCmdShow ); - return 0; + return S_OK; } /***********************************************************************