From 53f68ae3e663abec500a3df6e69d28495822da93 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 23 Oct 2006 23:40:58 +0200
Subject: [PATCH] urlmon: Added video/mpeg mime filter.

---
 dlls/urlmon/tests/misc.c  | 13 ++++++++++++-
 dlls/urlmon/urlmon_main.c |  9 +++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 5cfe70145f..0fa5f32a9b 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -337,6 +337,7 @@ static const WCHAR mimeImageBmp[] = {'i','m','a','g','e','/','b','m','p',0};
 static const WCHAR mimeImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0};
 static const WCHAR mimeImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0};
 static const WCHAR mimeVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0};
+static const WCHAR mimeVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0};
 
 static const struct {
     LPCWSTR url;
@@ -400,6 +401,11 @@ static BYTE data46[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'A','V','I',0x20};
 static BYTE data47[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'A','V','I',0x21,0xff};
 static BYTE data48[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'A','V','I',0x20,'<','h','t','m','l','>'};
 static BYTE data49[] = {'R','I','F','F',0x0f,0x0f,0xf0,0xf0,'A','V','I',0x20,0xf0,0x00};
+static BYTE data50[] = {0x00,0x00,0x01,0xb3,0xff};
+static BYTE data51[] = {0x00,0x00,0x01,0xba,0xff};
+static BYTE data52[] = {0x00,0x00,0x01,0xb8,0xff};
+static BYTE data53[] = {0x00,0x00,0x01,0xba};
+static BYTE data54[] = {0x00,0x00,0x01,0xba,'<','h','t','m','l','>'};
 
 static const struct {
     BYTE *data;
@@ -454,7 +460,12 @@ static const struct {
     {data46, sizeof(data46), mimeTextPlain},
     {data47, sizeof(data47), mimeTextPlain},
     {data48, sizeof(data48), mimeTextHtml},
-    {data49, sizeof(data49), mimeVideoAvi}
+    {data49, sizeof(data49), mimeVideoAvi},
+    {data50, sizeof(data50), mimeVideoMpeg},
+    {data51, sizeof(data51), mimeVideoMpeg},
+    {data52, sizeof(data52), mimeAppOctetStream},
+    {data53, sizeof(data53), mimeAppOctetStream},
+    {data54, sizeof(data54), mimeTextHtml}
 };
 
 static void test_FindMimeFromData(void)
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index ce5fd5beeb..d0d8f2c880 100644
--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -462,6 +462,13 @@ static BOOL video_avi_filter(const BYTE const *b, DWORD size)
         && b[8] == 'A' && b[9] == 'V' && b[10] == 'I' && b[11] == 0x20;
 }
 
+static BOOL video_mpeg_filter(const BYTE const *b, DWORD size)
+{
+    return size > 4
+        && !b[0] && !b[1] && b[2] == 0x01
+        && (b[3] == 0xb3 || b[3] == 0xba);
+}
+
 static BOOL text_plain_filter(const BYTE const *b, DWORD size)
 {
     const BYTE *ptr;
@@ -521,6 +528,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
         static const WCHAR wszImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0};
         static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0};
         static const WCHAR wszVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0};
+        static const WCHAR wszVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',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'};
@@ -536,6 +544,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
             {wszImageXPng,      image_xpng_filter},
             {wszImageBmp,       image_bmp_filter},
             {wszVideoAvi,       video_avi_filter},
+            {wszVideoMpeg,      video_mpeg_filter},
             {wszTextPlain,      text_plain_filter},
             {wszAppOctetStream, application_octet_stream_filter}
         };