Jacek Caban : urlmon: Ignore report_data call if binding is stopped.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Mon Mar  2 03:18:19 2009 +0100

urlmon: Ignore report_data call if binding is stopped.

---

 dlls/urlmon/binding.c   |    2 +-
 dlls/urlmon/tests/url.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c
index 41fa677..fb30367 100644
--- a/dlls/urlmon/binding.c
+++ b/dlls/urlmon/binding.c
@@ -1200,7 +1200,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres
 
     TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max);
 
-    if(This->download_state == END_DOWNLOAD)
+    if(This->download_state == END_DOWNLOAD || (This->state & BINDING_STOPPED))
         return;
 
     if(GetCurrentThreadId() != This->apartment_thread)
diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index 094d21d..e56d0ca 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -1201,8 +1201,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP
         break;
     case BINDSTATUS_DOWNLOADINGDATA:
         CHECK_EXPECT2(OnProgress_DOWNLOADINGDATA);
-        if(iface == &objbsc)
-            todo_wine ok(0, "unexpected call\n");
+        ok(iface != &objbsc, "unexpected call\n");
         ok(download_state == DOWNLOADING, "Download state was %d, expected DOWNLOADING\n",
            download_state);
         break;