Jacek Caban : urlmon: Fixed tests on IEs that report BINDSTATUS_DECODING.

Alexandre Julliard julliard at winehq.org
Tue Feb 12 13:58:13 CST 2013


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Feb 12 17:22:15 2013 +0100

urlmon: Fixed tests on IEs that report BINDSTATUS_DECODING.

This seems to happen on some IE versions that decode gzip streams in
urlmon (as opposed to wininet).

---

 dlls/urlmon/tests/url.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index d00ebfe..a31a8a0 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -1468,10 +1468,10 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress)
     ok(hres == expect || ((progress == BINDSTATUS_COOKIE_SENT || progress == BINDSTATUS_PROXYDETECTING) && hres == S_FALSE),
        "progress %u: hres = %x, expected %x\n", progress, hres, expect);
     if(hres == S_OK) {
-        if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE)
-            ok(status == 0, "status = %d\n", status);
+        if(download_state == BEFORE_DOWNLOAD && progress != BINDSTATUS_MIMETYPEAVAILABLE && progress != BINDSTATUS_DECODING)
+            ok(status == 0, "progress %u: status = %d\n", progress, status);
         else
-            ok(status == HTTP_STATUS_OK, "status = %d\n", status);
+            ok(status == HTTP_STATUS_OK, "progress %u: status = %d\n", progress, status);
         ok(size == sizeof(DWORD), "size = %d\n", size);
     }
 
@@ -1816,6 +1816,9 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u
     case BINDSTATUS_COOKIE_SENT:
         trace("BINDSTATUS_COOKIE_SENT\n");
         break;
+    case BINDSTATUS_DECODING:
+        trace("BINDSTATUS_DECODING\n");
+        break;
     default:
         ok(0, "unexpected code %d\n", ulStatusCode);
     };




More information about the wine-cvs mailing list