[PATCH 0/3] MR7943: windowscodecs: Fix information strings for the Ico decoder.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov

[PATCH 1/3] windowscodecs: Fix information strings for the Ico decoder.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/windowscodecs/regsvr.c     | 18 +++++++++---------
 dlls/windowscodecs/tests/info.c |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c
index eddb6e13024..867f1842eff 100644
--- a/dlls/windowscodecs/regsvr.c
+++ b/dlls/windowscodecs/regsvr.c
@@ -1501,15 +1501,15 @@ static struct regsvr_decoder const decoder_list[] = {
    gif_patterns
     },
     {   &CLSID_WICIcoDecoder,
-	"The Wine Project",
-	"ICO Decoder",
-	"1.0.0.0",
-	&GUID_VendorMicrosoft,
-	&GUID_ContainerFormatIco,
-	"image/vnd.microsoft.icon",
-	".ico",
-	ico_formats,
-	ico_patterns
+        "The Wine Project",
+        "ICO Decoder",
+        "1.0.0.0",
+        &GUID_VendorMicrosoft,
+        &GUID_ContainerFormatIco,
+        "image/ico,image/x-icon",
+        ".ico,.icon",
+        ico_formats,
+        ico_patterns
     },
     {   &CLSID_WICJpegDecoder,
    "The Wine Project",
diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c
index be179de4813..7bf5c2aae40 100644
--- a/dlls/windowscodecs/tests/info.c
+++ b/dlls/windowscodecs/tests/info.c
@@ -129,7 +129,6 @@ static void test_decoder_info(void)
             &CLSID_WICIcoDecoder,
             L"image/ico,image/x-icon",
             L".ico,.icon",
-            1
         },
         {
             &CLSID_WICJpegDecoder,

[PATCH 2/3] windowscodecs: Fix information strings for the Jpeg decoder.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/windowscodecs/regsvr.c     | 18 +++++++++---------
 dlls/windowscodecs/tests/info.c |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c
index 867f1842eff..22a9417b37e 100644
--- a/dlls/windowscodecs/regsvr.c
+++ b/dlls/windowscodecs/regsvr.c
@@ -1512,15 +1512,15 @@ static struct regsvr_decoder const decoder_list[] = {
         ico_patterns
     },
     {   &CLSID_WICJpegDecoder,
-	"The Wine Project",
-	"JPEG Decoder",
-	"1.0.0.0",
-	&GUID_VendorMicrosoft,
-	&GUID_ContainerFormatJpeg,
-	"image/jpeg",
-	".jpg;.jpeg;.jfif",
-	jpeg_formats,
-	jpeg_patterns
+        "The Wine Project",
+        "JPEG Decoder",
+        "1.0.0.0",
+        &GUID_VendorMicrosoft,
+        &GUID_ContainerFormatJpeg,
+        "image/jpeg,image/jpe,image/jpg",
+        ".jpeg,.jpe,.jpg,.jfif,.exif",
+        jpeg_formats,
+        jpeg_patterns
     },
     {   &CLSID_WICWmpDecoder,
    "The Wine Project",
diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c
index 7bf5c2aae40..a9ef2719fce 100644
--- a/dlls/windowscodecs/tests/info.c
+++ b/dlls/windowscodecs/tests/info.c
@@ -134,7 +134,6 @@ static void test_decoder_info(void)
             &CLSID_WICJpegDecoder,
             L"image/jpeg,image/jpe,image/jpg",
             L".jpeg,.jpe,.jpg,.jfif,.exif",
-            1
         },
         {
             &CLSID_WICPngDecoder,

[PATCH 3/3] windowscodecs: Fix information strings for the Tiff decoder.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/windowscodecs/regsvr.c     | 18 +++++++++---------
 dlls/windowscodecs/tests/info.c | 18 ++----------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c
index 22a9417b37e..e39ceac5a71 100644
--- a/dlls/windowscodecs/regsvr.c
+++ b/dlls/windowscodecs/regsvr.c
@@ -1545,15 +1545,15 @@ static struct regsvr_decoder const decoder_list[] = {
    png_patterns
     },
     {   &CLSID_WICTiffDecoder,
-	"The Wine Project",
-	"TIFF Decoder",
-	"1.0.0.0",
-	&GUID_VendorMicrosoft,
-	&GUID_ContainerFormatTiff,
-	"image/tiff",
-	".tif;.tiff",
-	tiff_decode_formats,
-	tiff_patterns
+        "The Wine Project",
+        "TIFF Decoder",
+        "1.0.0.0",
+        &GUID_VendorMicrosoft,
+        &GUID_ContainerFormatTiff,
+        "image/tiff,image/tif",
+        ".tiff,.tif",
+        tiff_decode_formats,
+        tiff_patterns
     },
     { NULL }			/* list terminator */
 };
diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c
index a9ef2719fce..15dcde5fd9d 100644
--- a/dlls/windowscodecs/tests/info.c
+++ b/dlls/windowscodecs/tests/info.c
@@ -112,7 +112,6 @@ static void test_decoder_info(void)
         const CLSID *clsid;
         const WCHAR *mimetype;
         const WCHAR *extensions;
-        unsigned int todo;
     } decoder_info_tests[] =
     {
         {
@@ -144,7 +143,6 @@ static void test_decoder_info(void)
             &CLSID_WICTiffDecoder,
             L"image/tiff,image/tif",
             L".tiff,.tif",
-            1
         },
         {
             &CLSID_WICDdsDecoder,
@@ -213,7 +211,6 @@ static void test_decoder_info(void)
         len = 0;
         hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, NULL, &len);
         ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%lx\n", hr);
-        todo_wine_if(test->todo)
         ok(len == lstrlenW(test->mimetype) + 1, "GetMimeType returned wrong len %i\n", len);

hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, NULL);
@@ -222,27 +219,23 @@ static void test_decoder_info(void)
         len = 0;
         hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, &len);
         ok(hr == S_OK, "GetMimeType failed, hr=%lx\n", hr);
-        todo_wine_if(test->todo)
         ok(len == lstrlenW(test->mimetype) + 1, "GetMimeType returned wrong len %i\n", len);

value[0] = 0;
         hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, &len);
         ok(hr == S_OK, "GetMimeType failed, hr=%lx\n", hr);
-    todo_wine_if(test->todo) {
         ok(!lstrcmpW(value, test->mimetype), "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value));
         ok(len == lstrlenW(test->mimetype) + 1, "GetMimeType returned wrong len %i\n", len);
-    }
+
         hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, value, &len);
         ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetMimeType failed, hr=%lx\n", hr);
-        todo_wine_if(test->todo)
         ok(len == lstrlenW(test->mimetype) + 1, "GetMimeType returned wrong len %i\n", len);

hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len);
         ok(hr == S_OK, "GetMimeType failed, hr=%lx\n", hr);
-    todo_wine_if(test->todo) {
         ok(!lstrcmpW(value, test->mimetype), "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value));
         ok(len == lstrlenW(test->mimetype) + 1, "GetMimeType returned wrong len %i\n", len);
-    }
+
         num_formats = 0xdeadbeef;
         hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, &num_formats);
         ok(hr == S_OK, "GetPixelFormats failed, hr=%lx\n", hr);
@@ -286,7 +279,6 @@ static void test_decoder_info(void)

hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, NULL, &len);
         ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%lx\n", hr);
-        todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
         ok(len == lstrlenW(test->extensions) + 1, "%u: GetFileExtensions returned wrong len %i\n", i, len);

hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, NULL);
@@ -294,27 +286,21 @@ static void test_decoder_info(void)

hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, &len);
         ok(hr == S_OK, "GetFileExtensions failed, hr=%lx\n", hr);
-        todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
         ok(len == lstrlenW(test->extensions) + 1, "GetFileExtensions returned wrong len %i\n", len);

value[0] = 0;
         hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, &len);
         ok(hr == S_OK, "GetFileExtensions failed, hr=%lx\n", hr);
-        todo_wine_if(test->todo)
         ok(lstrcmpW(value, test->extensions) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value));
-        todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
         ok(len == lstrlenW(test->extensions) + 1, "GetFileExtensions returned wrong len %i\n", len);

hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, value, &len);
         ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetFileExtensions failed, hr=%lx\n", hr);
-        todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
         ok(len == lstrlenW(test->extensions) + 1, "GetFileExtensions returned wrong len %i\n", len);

hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 256, value, &len);
         ok(hr == S_OK, "GetFileExtensions failed, hr=%lx\n", hr);
-        todo_wine_if(test->todo)
         ok(!lstrcmpW(value, test->extensions), "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value));
-        todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
         ok(len == lstrlenW(test->extensions) + 1, "GetFileExtensions returned wrong len %i\n", len);

IWICBitmapDecoderInfo_Release(decoder_info);

[PATCH 0/3] MR7943: windowscodecs: Fix information strings for the Ico decoder. - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.