urlmon/tests: Mark results returned by older urlmon broken in FindMimeFromData tests.

oldstable
Piotr Caban 2012-03-09 12:38:51 +01:00 committed by Alexandre Julliard
parent e69001ed67
commit 04847ada41
1 changed files with 100 additions and 105 deletions

View File

@ -568,7 +568,7 @@ static BYTE data86[] = {0x49,0x49,0x2a,0xff};
static BYTE data87[] = {' ','<','h','e','a','d'}; static BYTE data87[] = {' ','<','h','e','a','d'};
static BYTE data88[] = {' ','<','h','e','a','d','>'}; static BYTE data88[] = {' ','<','h','e','a','d','>'};
static BYTE data89[] = {'\t','\r','<','h','e','a','d','>'}; static BYTE data89[] = {'\t','\r','<','h','e','a','d','>'};
static BYTE data90[] = {'<','H','e','A','d','>'}; static BYTE data90[] = {'<','H','e','A','d',' '};
static BYTE data91[] = {'<','?','x','m','l',' ',0}; static BYTE data91[] = {'<','?','x','m','l',' ',0};
static BYTE data92[] = {'a','b','c','<','?','x','m','l',' ',' '}; static BYTE data92[] = {'a','b','c','<','?','x','m','l',' ',' '};
static BYTE data93[] = {'<','?','x','m','l',' ',' ','<','h','t','m','l','>'}; static BYTE data93[] = {'<','?','x','m','l',' ',' ','<','h','t','m','l','>'};
@ -579,104 +579,104 @@ static BYTE data96[] = {'<','?','x','m','l',' '};
static const struct { static const struct {
BYTE *data; BYTE *data;
DWORD size; DWORD size;
LPCWSTR mime, mime_alt, broken_mime; LPCWSTR mime, mime_pjpeg, broken_mime;
} mime_tests2[] = { } mime_tests2[] = {
{data1, sizeof(data1), mimeTextPlain}, {data1, sizeof(data1), mimeTextPlain, mimeTextPlain},
{data2, sizeof(data2), mimeAppOctetStream}, {data2, sizeof(data2), mimeAppOctetStream, mimeImagePjpeg},
{data3, sizeof(data3), mimeAppOctetStream}, {data3, sizeof(data3), mimeAppOctetStream, mimeImagePjpeg},
{data4, sizeof(data4), mimeAppOctetStream}, {data4, sizeof(data4), mimeAppOctetStream, mimeImagePjpeg},
{data5, sizeof(data5), mimeTextPlain}, {data5, sizeof(data5), mimeTextPlain, mimeTextPlain},
{data6, sizeof(data6), mimeTextPlain}, {data6, sizeof(data6), mimeTextPlain, mimeTextPlain},
{data7, sizeof(data7), mimeTextHtml, mimeTextPlain /* IE8 */}, {data7, sizeof(data7), mimeTextHtml, mimeTextPlain},
{data8, sizeof(data8), mimeTextHtml, mimeTextPlain /* IE8 */}, {data8, sizeof(data8), mimeTextHtml, mimeTextPlain},
{data9, sizeof(data9), mimeTextHtml, mimeImagePjpeg /* IE8 */}, {data9, sizeof(data9), mimeTextHtml, mimeImagePjpeg},
{data10, sizeof(data10), mimeTextHtml, mimeTextPlain /* IE8 */}, {data10, sizeof(data10), mimeTextHtml, mimeTextPlain},
{data11, sizeof(data11), mimeTextHtml, mimeTextPlain /* IE8 */}, {data11, sizeof(data11), mimeTextHtml, mimeTextPlain},
{data12, sizeof(data12), mimeTextHtml, mimeTextPlain /* IE8 */}, {data12, sizeof(data12), mimeTextHtml, mimeTextPlain},
{data13, sizeof(data13), mimeTextPlain}, {data13, sizeof(data13), mimeTextPlain, mimeTextPlain},
{data14, sizeof(data14), mimeTextPlain}, {data14, sizeof(data14), mimeTextPlain, mimeTextPlain},
{data15, sizeof(data15), mimeTextPlain}, {data15, sizeof(data15), mimeTextPlain, mimeTextPlain},
{data16, sizeof(data16), mimeImagePjpeg}, {data16, sizeof(data16), mimeImagePjpeg, mimeImagePjpeg},
{data17, sizeof(data17), mimeAppOctetStream}, {data17, sizeof(data17), mimeAppOctetStream, mimeImagePjpeg},
{data18, sizeof(data18), mimeTextHtml}, {data18, sizeof(data18), mimeTextHtml, mimeImagePjpeg},
{data19, sizeof(data19), mimeImageGif}, {data19, sizeof(data19), mimeImageGif, mimeImageGif},
{data20, sizeof(data20), mimeImageGif}, {data20, sizeof(data20), mimeImageGif, mimeImageGif},
{data21, sizeof(data21), mimeTextPlain}, {data21, sizeof(data21), mimeTextPlain, mimeTextPlain},
{data22, sizeof(data22), mimeImageGif}, {data22, sizeof(data22), mimeImageGif, mimeImageGif},
{data23, sizeof(data23), mimeTextPlain}, {data23, sizeof(data23), mimeTextPlain, mimeTextPlain},
{data24, sizeof(data24), mimeImageGif}, {data24, sizeof(data24), mimeImageGif, mimeImageGif},
{data25, sizeof(data25), mimeImageGif}, {data25, sizeof(data25), mimeImageGif, mimeImageGif},
{data26, sizeof(data26), mimeTextHtml, mimeImageGif /* IE8 */}, {data26, sizeof(data26), mimeTextHtml, mimeImageGif},
{data27, sizeof(data27), mimeTextPlain}, {data27, sizeof(data27), mimeTextPlain, mimeTextPlain},
{data28, sizeof(data28), mimeImageBmp}, {data28, sizeof(data28), mimeImageBmp, mimeImageBmp},
{data29, sizeof(data29), mimeImageBmp}, {data29, sizeof(data29), mimeImageBmp, mimeImageBmp},
{data30, sizeof(data30), mimeAppOctetStream}, {data30, sizeof(data30), mimeAppOctetStream, mimeImagePjpeg},
{data31, sizeof(data31), mimeTextHtml, mimeImageBmp /* IE8 */}, {data31, sizeof(data31), mimeTextHtml, mimeImageBmp},
{data32, sizeof(data32), mimeAppOctetStream}, {data32, sizeof(data32), mimeAppOctetStream, mimeImagePjpeg},
{data33, sizeof(data33), mimeAppOctetStream}, {data33, sizeof(data33), mimeAppOctetStream, mimeImagePjpeg},
{data34, sizeof(data34), mimeImageXPng}, {data34, sizeof(data34), mimeImageXPng, mimeImageXPng},
{data35, sizeof(data35), mimeImageXPng}, {data35, sizeof(data35), mimeImageXPng, mimeImageXPng},
{data36, sizeof(data36), mimeAppOctetStream}, {data36, sizeof(data36), mimeAppOctetStream, mimeImagePjpeg},
{data37, sizeof(data37), mimeTextHtml, mimeImageXPng /* IE8 */}, {data37, sizeof(data37), mimeTextHtml, mimeImageXPng},
{data38, sizeof(data38), mimeAppOctetStream}, {data38, sizeof(data38), mimeAppOctetStream, mimeImagePjpeg},
{data39, sizeof(data39), mimeImageTiff}, {data39, sizeof(data39), mimeImageTiff, mimeImageTiff},
{data40, sizeof(data40), mimeTextHtml, mimeImageTiff /* IE8 */}, {data40, sizeof(data40), mimeTextHtml, mimeImageTiff},
{data41, sizeof(data41), mimeTextPlain, NULL, mimeImageTiff}, {data41, sizeof(data41), mimeTextPlain, mimeTextPlain, mimeImageTiff},
{data42, sizeof(data42), mimeTextPlain}, {data42, sizeof(data42), mimeTextPlain, mimeTextPlain},
{data43, sizeof(data43), mimeAppOctetStream}, {data43, sizeof(data43), mimeAppOctetStream, mimeImagePjpeg},
{data44, sizeof(data44), mimeVideoAvi}, {data44, sizeof(data44), mimeVideoAvi, mimeVideoAvi},
{data45, sizeof(data45), mimeTextPlain}, {data45, sizeof(data45), mimeTextPlain, mimeTextPlain},
{data46, sizeof(data46), mimeTextPlain}, {data46, sizeof(data46), mimeTextPlain, mimeTextPlain},
{data47, sizeof(data47), mimeTextPlain}, {data47, sizeof(data47), mimeTextPlain, mimeTextPlain},
{data48, sizeof(data48), mimeTextHtml, mimeVideoAvi /* IE8 */}, {data48, sizeof(data48), mimeTextHtml, mimeVideoAvi},
{data49, sizeof(data49), mimeVideoAvi}, {data49, sizeof(data49), mimeVideoAvi, mimeVideoAvi},
{data50, sizeof(data50), mimeVideoMpeg}, {data50, sizeof(data50), mimeVideoMpeg, mimeVideoMpeg},
{data51, sizeof(data51), mimeVideoMpeg}, {data51, sizeof(data51), mimeVideoMpeg, mimeVideoMpeg},
{data52, sizeof(data52), mimeAppOctetStream}, {data52, sizeof(data52), mimeAppOctetStream, mimeImagePjpeg},
{data53, sizeof(data53), mimeAppOctetStream}, {data53, sizeof(data53), mimeAppOctetStream, mimeImagePjpeg},
{data54, sizeof(data54), mimeTextHtml, mimeVideoMpeg /* IE8 */}, {data54, sizeof(data54), mimeTextHtml, mimeVideoMpeg},
{data55, sizeof(data55), mimeAppXGzip}, {data55, sizeof(data55), mimeAppXGzip, mimeAppXGzip},
{data56, sizeof(data56), mimeTextPlain}, {data56, sizeof(data56), mimeTextPlain, mimeTextPlain},
{data57, sizeof(data57), mimeTextHtml, mimeAppXGzip /* IE8 */}, {data57, sizeof(data57), mimeTextHtml, mimeAppXGzip},
{data58, sizeof(data58), mimeAppOctetStream}, {data58, sizeof(data58), mimeAppOctetStream, mimeImagePjpeg},
{data59, sizeof(data59), mimeAppXZip}, {data59, sizeof(data59), mimeAppXZip, mimeAppXZip},
{data60, sizeof(data60), mimeTextPlain}, {data60, sizeof(data60), mimeTextPlain, mimeTextPlain},
{data61, sizeof(data61), mimeTextHtml, mimeAppXZip /* IE8 */}, {data61, sizeof(data61), mimeTextHtml, mimeAppXZip},
{data62, sizeof(data62), mimeAppJava}, {data62, sizeof(data62), mimeAppJava, mimeAppJava},
{data63, sizeof(data63), mimeTextPlain}, {data63, sizeof(data63), mimeTextPlain, mimeTextPlain},
{data64, sizeof(data64), mimeTextHtml, mimeAppJava /* IE8 */}, {data64, sizeof(data64), mimeTextHtml, mimeAppJava},
{data65, sizeof(data65), mimeAppPdf}, {data65, sizeof(data65), mimeAppPdf, mimeAppPdf},
{data66, sizeof(data66), mimeTextPlain}, {data66, sizeof(data66), mimeTextPlain, mimeTextPlain},
{data67, sizeof(data67), mimeTextHtml, mimeAppPdf /* IE8 */}, {data67, sizeof(data67), mimeTextHtml, mimeAppPdf},
{data68, sizeof(data68), mimeAppXMSDownload}, {data68, sizeof(data68), mimeAppXMSDownload, mimeAppXMSDownload},
{data69, sizeof(data69), mimeTextPlain}, {data69, sizeof(data69), mimeTextPlain, mimeTextPlain},
{data70, sizeof(data70), mimeTextHtml, mimeAppXMSDownload /* IE8 */}, {data70, sizeof(data70), mimeTextHtml, mimeAppXMSDownload},
{data71, sizeof(data71), mimeTextRichtext}, {data71, sizeof(data71), mimeTextRichtext, mimeTextRichtext},
{data72, sizeof(data72), mimeTextPlain}, {data72, sizeof(data72), mimeTextPlain, mimeTextPlain},
{data73, sizeof(data73), mimeTextPlain}, {data73, sizeof(data73), mimeTextPlain, mimeTextPlain},
{data74, sizeof(data74), mimeTextHtml, mimeTextRichtext /* IE8 */}, {data74, sizeof(data74), mimeTextHtml, mimeTextRichtext},
{data75, sizeof(data75), mimeAudioWav}, {data75, sizeof(data75), mimeAudioWav, mimeAudioWav},
{data76, sizeof(data76), mimeTextPlain}, {data76, sizeof(data76), mimeTextPlain, mimeTextPlain},
{data77, sizeof(data77), mimeTextPlain}, {data77, sizeof(data77), mimeTextPlain, mimeTextPlain},
{data78, sizeof(data78), mimeTextHtml, mimeTextPlain /* IE8 */}, {data78, sizeof(data78), mimeTextHtml, mimeTextPlain},
{data79, sizeof(data79), mimeAppPostscript}, {data79, sizeof(data79), mimeAppPostscript, mimeAppPostscript},
{data80, sizeof(data80), mimeTextPlain}, {data80, sizeof(data80), mimeTextPlain, mimeTextPlain},
{data81, sizeof(data81), mimeTextHtml, mimeAppPostscript /* IE8 */}, {data81, sizeof(data81), mimeTextHtml, mimeAppPostscript},
{data82, sizeof(data82), mimeAudioBasic}, {data82, sizeof(data82), mimeAudioBasic, mimeAudioBasic},
{data83, sizeof(data83), mimeTextPlain}, {data83, sizeof(data83), mimeTextPlain, mimeTextPlain},
{data84, sizeof(data84), mimeTextHtml, mimeAudioBasic /* IE8 */}, {data84, sizeof(data84), mimeTextHtml, mimeAudioBasic},
{data85, sizeof(data85), mimeTextPlain}, {data85, sizeof(data85), mimeTextPlain, mimeTextPlain},
{data86, sizeof(data86), mimeImageTiff, NULL, mimeTextPlain}, {data86, sizeof(data86), mimeImageTiff, mimeImageTiff, mimeTextPlain},
{data87, sizeof(data87), mimeTextPlain}, {data87, sizeof(data87), mimeTextPlain, mimeTextPlain},
{data88, sizeof(data88), mimeTextHtml, mimeTextPlain /* IE8 */}, {data88, sizeof(data88), mimeTextHtml, mimeTextPlain},
{data89, sizeof(data89), mimeTextHtml, mimeTextPlain /* IE8 */}, {data89, sizeof(data89), mimeTextHtml, mimeTextPlain},
{data90, sizeof(data90), mimeTextHtml, mimeTextPlain /* IE8 */}, {data90, sizeof(data90), mimeTextHtml, mimeTextPlain},
{data91, sizeof(data91), mimeTextXml, mimeTextPlain /* IE9 */}, {data91, sizeof(data91), mimeTextXml, mimeTextPlain},
{data92, sizeof(data92), mimeTextXml, mimeTextPlain /* IE9 */}, {data92, sizeof(data92), mimeTextXml, mimeTextPlain},
{data93, sizeof(data93), mimeTextXml, mimeTextPlain /* IE9 */}, {data93, sizeof(data93), mimeTextXml, mimeTextPlain},
{data94, sizeof(data94), mimeTextHtml, mimeTextPlain /* IE9 */}, {data94, sizeof(data94), mimeTextHtml, mimeTextPlain},
{data95, sizeof(data95), mimeTextXml, mimeTextRichtext /* IE9 */}, {data95, sizeof(data95), mimeTextXml, mimeTextRichtext},
{data96, sizeof(data96), mimeTextPlain} {data96, sizeof(data96), mimeTextPlain, mimeTextPlain}
}; };
static void test_FindMimeFromData(void) static void test_FindMimeFromData(void)
@ -737,13 +737,8 @@ static void test_FindMimeFromData(void)
hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size,
mimeImagePjpeg, 0, &mime, 0); mimeImagePjpeg, 0, &mime, 0);
ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres);
if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || i == 17) ok(!lstrcmpW(mime, mime_tests2[i].mime_pjpeg) || broken(!lstrcmpW(mime, mime_tests2[i].mime)),
ok(!lstrcmpW(mime, mimeImagePjpeg), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); "[%d] wrong mime, got %s\n", i, wine_dbgstr_w(mime));
else
ok(!lstrcmpW(mime, mime_tests2[i].mime) ||
(mime_tests2[i].mime_alt && !lstrcmpW(mime, mime_tests2[i].mime_alt)),
"[%d] wrong mime, got %s\n", i, wine_dbgstr_w(mime));
CoTaskMemFree(mime); CoTaskMemFree(mime);
} }