urlmon/tests: Fix some test failures on IE8.
This commit is contained in:
parent
82b4b6423c
commit
8a3d9ccb44
|
@ -527,7 +527,7 @@ static BYTE data85[] = {'.','S','N','D',0};
|
|||
static const struct {
|
||||
BYTE *data;
|
||||
DWORD size;
|
||||
LPCWSTR mime;
|
||||
LPCWSTR mime, mime_alt;
|
||||
} mime_tests2[] = {
|
||||
{data1, sizeof(data1), mimeTextPlain},
|
||||
{data2, sizeof(data2), mimeAppOctetStream},
|
||||
|
@ -535,12 +535,12 @@ static const struct {
|
|||
{data4, sizeof(data4), mimeAppOctetStream},
|
||||
{data5, sizeof(data5), mimeTextPlain},
|
||||
{data6, sizeof(data6), mimeTextPlain},
|
||||
{data7, sizeof(data7), mimeTextHtml},
|
||||
{data8, sizeof(data8), mimeTextHtml},
|
||||
{data9, sizeof(data9), mimeTextHtml},
|
||||
{data10, sizeof(data10), mimeTextHtml},
|
||||
{data11, sizeof(data11), mimeTextHtml},
|
||||
{data12, sizeof(data12), mimeTextHtml},
|
||||
{data7, sizeof(data7), mimeTextHtml, mimeTextPlain /* IE8 */},
|
||||
{data8, sizeof(data8), mimeTextHtml, mimeTextPlain /* IE8 */},
|
||||
{data9, sizeof(data9), mimeTextHtml, mimeImagePjpeg /* IE8 */},
|
||||
{data10, sizeof(data10), mimeTextHtml, mimeTextPlain /* IE8 */},
|
||||
{data11, sizeof(data11), mimeTextHtml, mimeTextPlain /* IE8 */},
|
||||
{data12, sizeof(data12), mimeTextHtml, mimeTextPlain /* IE8 */},
|
||||
{data13, sizeof(data13), mimeTextPlain},
|
||||
{data14, sizeof(data14), mimeTextPlain},
|
||||
{data15, sizeof(data15), mimeTextPlain},
|
||||
|
@ -554,21 +554,21 @@ static const struct {
|
|||
{data23, sizeof(data23), mimeTextPlain},
|
||||
{data24, sizeof(data24), mimeImageGif},
|
||||
{data25, sizeof(data25), mimeImageGif},
|
||||
{data26, sizeof(data26), mimeTextHtml},
|
||||
{data26, sizeof(data26), mimeTextHtml, mimeImageGif /* IE8 */},
|
||||
{data27, sizeof(data27), mimeTextPlain},
|
||||
{data28, sizeof(data28), mimeImageBmp},
|
||||
{data29, sizeof(data29), mimeImageBmp},
|
||||
{data30, sizeof(data30), mimeAppOctetStream},
|
||||
{data31, sizeof(data31), mimeTextHtml},
|
||||
{data31, sizeof(data31), mimeTextHtml, mimeImageBmp /* IE8 */},
|
||||
{data32, sizeof(data32), mimeAppOctetStream},
|
||||
{data33, sizeof(data33), mimeAppOctetStream},
|
||||
{data34, sizeof(data34), mimeImageXPng},
|
||||
{data35, sizeof(data35), mimeImageXPng},
|
||||
{data36, sizeof(data36), mimeAppOctetStream},
|
||||
{data37, sizeof(data37), mimeTextHtml},
|
||||
{data37, sizeof(data37), mimeTextHtml, mimeImageXPng /* IE8 */},
|
||||
{data38, sizeof(data38), mimeAppOctetStream},
|
||||
{data39, sizeof(data39), mimeImageTiff},
|
||||
{data40, sizeof(data40), mimeTextHtml},
|
||||
{data40, sizeof(data40), mimeTextHtml, mimeImageTiff /* IE8 */},
|
||||
{data41, sizeof(data41), mimeImageTiff},
|
||||
{data42, sizeof(data42), mimeTextPlain},
|
||||
{data43, sizeof(data43), mimeAppOctetStream},
|
||||
|
@ -576,43 +576,43 @@ static const struct {
|
|||
{data45, sizeof(data45), mimeTextPlain},
|
||||
{data46, sizeof(data46), mimeTextPlain},
|
||||
{data47, sizeof(data47), mimeTextPlain},
|
||||
{data48, sizeof(data48), mimeTextHtml},
|
||||
{data48, sizeof(data48), mimeTextHtml, mimeVideoAvi /* IE8 */},
|
||||
{data49, sizeof(data49), mimeVideoAvi},
|
||||
{data50, sizeof(data50), mimeVideoMpeg},
|
||||
{data51, sizeof(data51), mimeVideoMpeg},
|
||||
{data52, sizeof(data52), mimeAppOctetStream},
|
||||
{data53, sizeof(data53), mimeAppOctetStream},
|
||||
{data54, sizeof(data54), mimeTextHtml},
|
||||
{data54, sizeof(data54), mimeTextHtml, mimeVideoMpeg /* IE8 */},
|
||||
{data55, sizeof(data55), mimeAppXGzip},
|
||||
{data56, sizeof(data56), mimeTextPlain},
|
||||
{data57, sizeof(data57), mimeTextHtml},
|
||||
{data57, sizeof(data57), mimeTextHtml, mimeAppXGzip /* IE8 */},
|
||||
{data58, sizeof(data58), mimeAppOctetStream},
|
||||
{data59, sizeof(data59), mimeAppXZip},
|
||||
{data60, sizeof(data60), mimeTextPlain},
|
||||
{data61, sizeof(data61), mimeTextHtml},
|
||||
{data61, sizeof(data61), mimeTextHtml, mimeAppXZip /* IE8 */},
|
||||
{data62, sizeof(data62), mimeAppJava},
|
||||
{data63, sizeof(data63), mimeTextPlain},
|
||||
{data64, sizeof(data64), mimeTextHtml},
|
||||
{data64, sizeof(data64), mimeTextHtml, mimeAppJava /* IE8 */},
|
||||
{data65, sizeof(data65), mimeAppPdf},
|
||||
{data66, sizeof(data66), mimeTextPlain},
|
||||
{data67, sizeof(data67), mimeTextHtml},
|
||||
{data67, sizeof(data67), mimeTextHtml, mimeAppPdf /* IE8 */},
|
||||
{data68, sizeof(data68), mimeAppXMSDownload},
|
||||
{data69, sizeof(data69), mimeTextPlain},
|
||||
{data70, sizeof(data70), mimeTextHtml},
|
||||
{data70, sizeof(data70), mimeTextHtml, mimeAppXMSDownload /* IE8 */},
|
||||
{data71, sizeof(data71), mimeTextRichtext},
|
||||
{data72, sizeof(data72), mimeTextPlain},
|
||||
{data73, sizeof(data73), mimeTextPlain},
|
||||
{data74, sizeof(data74), mimeTextHtml},
|
||||
{data74, sizeof(data74), mimeTextHtml, mimeTextRichtext /* IE8 */},
|
||||
{data75, sizeof(data75), mimeAudioWav},
|
||||
{data76, sizeof(data76), mimeTextPlain},
|
||||
{data77, sizeof(data77), mimeTextPlain},
|
||||
{data78, sizeof(data78), mimeTextHtml},
|
||||
{data78, sizeof(data78), mimeTextHtml, mimeTextPlain /* IE8 */},
|
||||
{data79, sizeof(data79), mimeAppPostscript},
|
||||
{data80, sizeof(data80), mimeTextPlain},
|
||||
{data81, sizeof(data81), mimeTextHtml},
|
||||
{data81, sizeof(data81), mimeTextHtml, mimeAppPostscript /* IE8 */},
|
||||
{data82, sizeof(data82), mimeAudioBasic},
|
||||
{data83, sizeof(data83), mimeTextPlain},
|
||||
{data84, sizeof(data84), mimeTextHtml},
|
||||
{data84, sizeof(data84), mimeTextHtml, mimeAudioBasic /* IE8 */},
|
||||
{data85, sizeof(data85), mimeTextPlain}
|
||||
};
|
||||
|
||||
|
@ -672,7 +672,9 @@ static void test_FindMimeFromData(void)
|
|||
if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || i == 17)
|
||||
ok(!lstrcmpW(mime, mimeImagePjpeg), "[%d] wrong mime\n", i);
|
||||
else
|
||||
ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime\n", i);
|
||||
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, debugstr_w(mime));
|
||||
|
||||
CoTaskMemFree(mime);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue