Jacek Caban : urlmon: Added image/bmp filter.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Jul  6 20:38:27 2006 +0200

urlmon: Added image/bmp filter.

---

 dlls/urlmon/tests/misc.c  |   16 ++++++++++++++--
 dlls/urlmon/urlmon_main.c |   10 ++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 24b703a..ad1b2bd 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -332,6 +332,7 @@ static const WCHAR mimeAppOctetStream[] 
     'o','c','t','e','t','-','s','t','r','e','a','m',0};
 static const WCHAR mimeImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0};
 static const WCHAR mimeImageGif[] = {'i','m','a','g','e','/','g','i','f',0};
+static const WCHAR mimeImageBmp[] = {'i','m','a','g','e','/','b','m','p',0};
 
 static const struct {
     LPCWSTR url;
@@ -373,7 +374,12 @@ static BYTE data24[] = {'g','i','f','8',
 static BYTE data25[] = {'G','i','F','8','7','A'};
 static BYTE data26[] = {'G','i','F','8','7','a','<','h','t','m','l','>'};
 static BYTE data27[] = {0x30,'G','i','F','8','7','A'};
-
+static BYTE data28[] = {0x42,0x4d,0x6e,0x42,0x1c,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00};
+static BYTE data29[] = {0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'x','x','x','x'};
+static BYTE data30[] = {0x42,0x4d,'x','x','x','x',0x00,0x01,0x00,0x00,'x','x','x','x'};
+static BYTE data31[] = {0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'<','h','t','m','l','>'};
+static BYTE data32[] = {0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'x','x','x'};
+static BYTE data33[] = {0x00,0x42,0x4d,'x','x','x','x',0x00,0x00,0x00,0x00,'x','x','x'};
 
 static const struct {
     BYTE *data;
@@ -406,7 +412,13 @@ static const struct {
     {data24, sizeof(data24), mimeImageGif},
     {data25, sizeof(data25), mimeImageGif},
     {data26, sizeof(data26), mimeTextHtml},
-    {data27, sizeof(data27), mimeTextPlain}
+    {data27, sizeof(data27), mimeTextPlain},
+    {data28, sizeof(data28), mimeImageBmp},
+    {data29, sizeof(data29), mimeImageBmp},
+    {data30, sizeof(data30), mimeAppOctetStream},
+    {data31, sizeof(data31), mimeTextHtml},
+    {data32, sizeof(data32), mimeAppOctetStream},
+    {data33, sizeof(data32), mimeAppOctetStream}
 };
 
 static void test_FindMimeFromData(void)
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index 742eb70..9cd6daa 100644
--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -434,6 +434,14 @@ static BOOL image_pjpeg_filter(LPVOID bu
     return size > 2 && *(BYTE*)buf == 0xff && *((BYTE*)buf+1) == 0xd8;
 }
 
+static BOOL image_bmp_filter(LPVOID buf, DWORD size)
+{
+    return size >= 14
+        && *(BYTE*)buf == 0x42
+        && *((BYTE*)buf+1) == 0x4d
+        && *(DWORD*)((BYTE*)buf+6) == 0;
+}
+
 static BOOL text_plain_filter(LPVOID buf, DWORD size)
 {
     UCHAR *ptr;
@@ -488,6 +496,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC
         static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0};
         static const WCHAR wszImageGif[] = {'i','m','a','g','e','/','g','i','f',0};
         static const WCHAR wszImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0};
+        static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0};
         static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'};
         static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/',
             'o','c','t','e','t','-','s','t','r','e','a','m','\0'};
@@ -499,6 +508,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC
             {wszTextHtml,       text_html_filter},
             {wszImageGif,       image_gif_filter},
             {wszImagePjpeg,     image_pjpeg_filter},
+            {wszImageBmp,       image_bmp_filter},
             {wszTextPlain,      text_plain_filter},
             {wszAppOctetStream, application_octet_stream_filter}
         };