ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: Added image/bmp filter.

This commit is contained in:
Jacek Caban 2006-07-06 20:38:27 +02:00 committed by Alexandre Julliard
parent 32405d635f
commit 682944ad2d
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/urlmon/tests/misc.c
View File

@ -332,6 +332,7 @@ static const WCHAR mimeAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','
'o','c','t','e','t','-','s','t','r','e','a','m',0}; '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 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 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 { static const struct {
LPCWSTR url; LPCWSTR url;
@ -373,7 +374,12 @@ static BYTE data24[] = {'g','i','f','8','7','a'};
static BYTE data25[] = {'G','i','F','8','7','A'}; static BYTE data25[] = {'G','i','F','8','7','A'};
static BYTE data26[] = {'G','i','F','8','7','a','<','h','t','m','l','>'}; 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 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 { static const struct {
BYTE *data; BYTE *data;
@ -406,7 +412,13 @@ static const struct {
{data24, sizeof(data24), mimeImageGif}, {data24, sizeof(data24), mimeImageGif},
{data25, sizeof(data25), mimeImageGif}, {data25, sizeof(data25), mimeImageGif},
{data26, sizeof(data26), mimeTextHtml}, {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) static void test_FindMimeFromData(void)

10
dlls/urlmon/urlmon_main.c
View File

@ -434,6 +434,14 @@ static BOOL image_pjpeg_filter(LPVOID buf, DWORD size)
return size > 2 && *(BYTE*)buf == 0xff && *((BYTE*)buf+1) == 0xd8; 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) static BOOL text_plain_filter(LPVOID buf, DWORD size)
{ {
UCHAR *ptr; UCHAR *ptr;
@ -488,6 +496,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; 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 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 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 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','/', 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'}; 'o','c','t','e','t','-','s','t','r','e','a','m','\0'};
@ -499,6 +508,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
{wszTextHtml, text_html_filter}, {wszTextHtml, text_html_filter},
{wszImageGif, image_gif_filter}, {wszImageGif, image_gif_filter},
{wszImagePjpeg, image_pjpeg_filter}, {wszImagePjpeg, image_pjpeg_filter},
{wszImageBmp, image_bmp_filter},
{wszTextPlain, text_plain_filter}, {wszTextPlain, text_plain_filter},
{wszAppOctetStream, application_octet_stream_filter} {wszAppOctetStream, application_octet_stream_filter}
}; };