Jacek Caban : urlmon: Always verify mime using FindMimeFromData.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 101c18537af2ab72b711c25403e89ad3026841cf
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=101c18537af2ab72b711c254...

Author: Jacek Caban 
Date:   Sat Jul  8 16:08:24 2006 +0200

urlmon: Always verify mime using FindMimeFromData.

---

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

diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c
index 52e7de3..4277cb2 100644
--- a/dlls/urlmon/binding.c
+++ b/dlls/urlmon/binding.c
@@ -862,12 +862,8 @@ static HRESULT WINAPI InternetProtocolSi

fill_stream_buffer(This->stream);

-        /* FIXME: Always call FindMediaFromData (its implementation is not yet ready for this). */
-        if(This->mime)
-            mime = This->mime;
-        else
-            FindMimeFromData(NULL, This->url, This->stream->buf,
-                              min(This->stream->buf_size, 255), This->mime, 0, &mime, 0);
+        FindMimeFromData(NULL, This->url, This->stream->buf,
+                         min(This->stream->buf_size, 255), This->mime, 0, &mime, 0);

on_progress(This, ulProgress, ulProgressMax, BINDSTATUS_MIMETYPEAVAILABLE, mime);
     }