Module: wine Branch: master Commit: df8a1ce6097b9ecff38ad4caec8900a4f0870f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8a1ce6097b9ecff38ad4caec...
Author: Piotr Caban piotr@codeweavers.com Date: Fri Jul 11 16:23:08 2014 +0200
urlmon: Recognize <body> tag in FindMimeFromData function.
---
dlls/urlmon/mimefilter.c | 7 ++++++- dlls/urlmon/tests/misc.c | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index 4f47a04..55cd200 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -280,7 +280,12 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) && (b[1] == 'h' || b[1] == 'H') && (b[2] == 'e' || b[2] == 'E') && (b[3] == 'a' || b[3] == 'A') - && (b[4] == 'd' || b[4] == 'D'))) return TRUE; + && (b[4] == 'd' || b[4] == 'D')) + || (b[0] == '<' + && (b[1] == 'b' || b[1] == 'B') + && (b[2] == 'o' || b[2] == 'O') + && (b[3] == 'd' || b[3] == 'D') + && (b[4] == 'y' || b[4] == 'Y'))) return TRUE;
return FALSE; } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 7071aa9..4c845aa 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -575,6 +575,8 @@ static BYTE data93[] = {'<','?','x','m','l',' ',' ','<','h','t','m','l','>'}; static BYTE data94[] = {'<','h','t','m','l','>','<','?','x','m','l',' ',' '}; static BYTE data95[] = {'{','\','r','t','f','<','?','x','m','l',' ',' '}; static BYTE data96[] = {'<','?','x','m','l',' '}; +static BYTE data97[] = "<body"; +static BYTE data98[] = "blah<BoDyblahblah";
static const struct { BYTE *data; @@ -681,6 +683,8 @@ static const struct { {data94, sizeof(data94), "text/html", "text/plain"}, {data95, sizeof(data95), "text/xml", "text/richtext"}, {data96, sizeof(data96), "text/plain"}, + {data97, sizeof(data97), "text/html", "text/plain"}, + {data98, sizeof(data98), "text/html", "text/plain"}, {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, {NULL, 0, "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"},
-
Alexandre Julliard