commit 097750cf956ce54491a059d9d57205851c389fb8
author Jacek Caban <jack@itma.pwr.wroc.pl> Wed Sep 14 10:29:56 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Sep 14 10:29:56 2005 +0000
tree 9b654cc91f24dc9c90dbbc5b18ef454dcf55fc28
parent 53a0c300788e39cbe408c124ad4090ca3acf7ce3

Added MIME type checking to FileProtocol::Start.

dlls/urlmon/file.c

diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c
index b89a8da..be54cea 100644
--- a/dlls/urlmon/file.c
+++ b/dlls/urlmon/file.c
@@ -103,7 +103,7 @@
     DWORD grfBINDF = 0;
     LARGE_INTEGER size;
     DWORD len;
-    LPWSTR url;
+    LPWSTR url, mime = NULL;
     HRESULT hres;
 
     static const WCHAR wszFile[]  = {'f','i','l','e',':'};
@@ -127,9 +127,9 @@
         return hres;
     }
 
-    /* FIXME:
-     * Implement MIME type checking
-     */
+    hres = FindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0);
+    if(SUCCEEDED(hres))
+        IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, mime);
 
     if(!This->file) {
         This->file = CreateFileW(url+sizeof(wszFile)/sizeof(WCHAR), GENERIC_READ, FILE_SHARE_READ,
@@ -140,16 +140,20 @@
             IInternetProtocolSink_ReportResult(pOIProtSink, INET_E_RESOURCE_NOT_FOUND,
                     GetLastError(), NULL);
             HeapFree(GetProcessHeap(), 0, url);
+            CoTaskMemFree(mime);
             return INET_E_RESOURCE_NOT_FOUND;
         }
 
         IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_CACHEFILENAMEAVAILABLE,
                 url+sizeof(wszFile)/sizeof(WCHAR));
+        if(mime)
+            IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime);
         IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL);
-
-        HeapFree(GetProcessHeap(), 0, url);
     }
 
+    CoTaskMemFree(mime);
+    HeapFree(GetProcessHeap(), 0, url);
+
     if(GetFileSizeEx(This->file, &size))
         IInternetProtocolSink_ReportData(pOIProtSink,
                 BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION,

dlls/urlmon/tests/protocol.c

diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c
index 4a40951..eea1284 100644
--- a/dlls/urlmon/tests/protocol.c
+++ b/dlls/urlmon/tests/protocol.c
@@ -215,10 +215,10 @@
     ok(hres == S_OK, "Start failed: %08lx\n", hres);
 
     CHECK_CALLED(GetBindInfo);
-    todo_wine { CHECK_CALLED(ReportProgress_DIRECTBIND); }
+    CHECK_CALLED(ReportProgress_DIRECTBIND);
     if(is_first) {
         CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE);
-        todo_wine { CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); }
+        CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE);
         CHECK_CALLED(ReportResult);
     }
     CHECK_CALLED(ReportData);
@@ -373,7 +373,7 @@
     ok(hres == INET_E_RESOURCE_NOT_FOUND,
             "Start failed: %08lx expected INET_E_RESOURCE_NOT_FOUND\n", hres);
     CHECK_CALLED(GetBindInfo);
-    todo_wine { CHECK_CALLED(ReportProgress_DIRECTBIND); }
+    CHECK_CALLED(ReportProgress_DIRECTBIND);
     CHECK_CALLED(ReportResult);
 
     IInternetProtocol_Release(protocol);
@@ -392,7 +392,7 @@
     ok(hres == INET_E_RESOURCE_NOT_FOUND,
             "Start failed: %08lx, expected INET_E_RESOURCE_NOT_FOUND\n", hres);
     CHECK_CALLED(GetBindInfo);
-    todo_wine { CHECK_CALLED(ReportProgress_DIRECTBIND); }
+    CHECK_CALLED(ReportProgress_DIRECTBIND);
     CHECK_CALLED(ReportResult);
 
     IInternetProtocol_Release(protocol);