Module: wine Branch: master Commit: a2fa0e76b17fb4f247e529b284841e89de99750f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2fa0e76b17fb4f247e529b28...
Author: Ziqing Hui zhui@codeweavers.com Date: Tue Jun 16 13:54:47 2020 +0800
windowscodecs: Fix MIME types of DDS decoder.
Signed-off-by: Ziqing Hui zhui@codeweavers.com Signed-off-by: Esme Povirk vincent@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/windowscodecs/regsvr.c | 2 +- dlls/windowscodecs/tests/info.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 584897689d..00be59c98f 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1298,7 +1298,7 @@ static struct regsvr_decoder const decoder_list[] = { "1.0.0.0", &GUID_VendorMicrosoft, &GUID_ContainerFormatDds, - "image/vnd-ms.dds", + "image/vnd.ms-dds", ".dds", dds_formats, dds_patterns diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 707b0715b7..bb8d3310bc 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -193,7 +193,6 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { - todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); } @@ -205,7 +204,6 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { - todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); }