Jacek Caban : urlmon: Don' t depend on QueryService returning NULL on failure.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Sat Jun 27 00:28:30 2009 +0200

urlmon: Don't depend on QueryService returning NULL on failure.

---

 dlls/urlmon/bindctx.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c
index 7438383..fe80456 100644
--- a/dlls/urlmon/bindctx.c
+++ b/dlls/urlmon/bindctx.c
@@ -51,9 +51,9 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid)
 
     hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret);
     if(FAILED(hres) && This->serv_prov)
-        IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret);
+        hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret);
 
-    return ret;
+    return SUCCEEDED(hres) ? ret : NULL;
 }
 
 #define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface)