Jacek Caban : urlmon: Return better error results.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Thu Jan 31 18:10:18 2008 +0100

urlmon: Return better error results.

---

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

diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c
index 66b5bdf..1cc8a61 100644
--- a/dlls/urlmon/binding.c
+++ b/dlls/urlmon/binding.c
@@ -1283,7 +1283,7 @@ static HRESULT get_callback(IBindCtx *pbc, IBindStatusCallback **callback)
         IUnknown_Release(unk);
     }

-    return SUCCEEDED(hres) ? S_OK : MK_E_SYNTAX;
+    return SUCCEEDED(hres) ? S_OK : INET_E_DATA_NOT_AVAILABLE;
 }

static BOOL is_urlmon_protocol(LPCWSTR url)
@@ -1484,9 +1484,7 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv)
     if(FAILED(hres))
         return hres;

-    if(binding->hres != S_OK) {
-        hres = SUCCEEDED(binding->hres) ? S_OK : binding->hres;
-    }else if(binding->stream->init_buf) {
+    if(binding->hres == S_OK && binding->stream->init_buf) {
         if((binding->state & BINDING_STOPPED) && (binding->state & BINDING_LOCKED))
             IInternetProtocol_UnlockRequest(binding->protocol);