Jacek Caban : mshtml: Don't mix nsresult with HRESULT.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 047e5aaad562e65c8a976c3c86bc753d9e0ff359
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=047e5aaad562e65c8a976c3c86bc753d9e0ff359

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Jul  4 17:23:51 2008 +0200

mshtml: Don't mix nsresult with HRESULT.

---

 dlls/mshtml/htmlwindow.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index e3f8e75..043e4e9 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -642,15 +642,29 @@ static HRESULT WINAPI HTMLWindow2_toString(IHTMLWindow2 *iface, BSTR *String)
 static HRESULT WINAPI HTMLWindow2_scrollBy(IHTMLWindow2 *iface, long x, long y)
 {
     HTMLWindow *This = HTMLWINDOW2_THIS(iface);
+    nsresult nsres;
+
     TRACE("(%p)->(%ld %ld)\n", This, x, y);
-    return nsIDOMWindow_ScrollBy(This->nswindow, x, y);
+
+    nsres = nsIDOMWindow_ScrollBy(This->nswindow, x, y);
+    if(NS_FAILED(nsres))
+        ERR("ScrollBy failed: %08x\n", nsres);
+
+    return S_OK;
 }
 
 static HRESULT WINAPI HTMLWindow2_scrollTo(IHTMLWindow2 *iface, long x, long y)
 {
     HTMLWindow *This = HTMLWINDOW2_THIS(iface);
+    nsresult nsres;
+
     TRACE("(%p)->(%ld %ld)\n", This, x, y);
-    return nsIDOMWindow_ScrollTo(This->nswindow, x, y);
+
+    nsres = nsIDOMWindow_ScrollTo(This->nswindow, x, y);
+    if(NS_FAILED(nsres))
+        ERR("ScrollTo failed: %08x\n", nsres);
+
+    return S_OK;
 }
 
 static HRESULT WINAPI HTMLWindow2_moveTo(IHTMLWindow2 *iface, long x, long y)