[PATCH v2 2/2] gdiplus: Use correct format guid for .ico files.

[Fabian Maurer]

From: Fabian Maurer

Adapted from https://github.com/reactos/reactos/pull/7714
---
 dlls/gdiplus/image.c       | 16 ++++++++--------
 dlls/gdiplus/tests/image.c |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 6e55113dbce..89d1ab99c4f 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -5069,7 +5069,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
     {
         { /* BMP */
             /* Clsid */              { 0x557cf400, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } },
-            /* FormatID */           { 0xb96b3cabU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} },
+            /* FormatID */           ImageFormatBMP,
             /* CodecName */          bmp_codecname,
             /* DllName */            NULL,
             /* FormatDescription */  bmp_format,
@@ -5089,7 +5089,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
     {
         { /* JPEG */
             /* Clsid */              { 0x557cf401, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } },
-            /* FormatID */           { 0xb96b3caeU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} },
+            /* FormatID */           ImageFormatJPEG,
             /* CodecName */          jpeg_codecname,
             /* DllName */            NULL,
             /* FormatDescription */  jpeg_format,
@@ -5109,7 +5109,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
     {
         { /* GIF */
             /* Clsid */              { 0x557cf402, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } },
-            /* FormatID */           { 0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} },
+            /* FormatID */           ImageFormatGIF,
             /* CodecName */          gif_codecname,
             /* DllName */            NULL,
             /* FormatDescription */  gif_format,
@@ -5129,7 +5129,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
     {
         { /* TIFF */
             /* Clsid */              { 0x557cf405, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } },
-            /* FormatID */           { 0xb96b3cb1U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} },
+            /* FormatID */           ImageFormatTIFF,
             /* CodecName */          tiff_codecname,
             /* DllName */            NULL,
             /* FormatDescription */  tiff_format,
@@ -5149,7 +5149,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
     {
         { /* EMF */
             /* Clsid */              { 0x557cf403, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } },
-            /* FormatID */           { 0xb96b3cacU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} },
+            /* FormatID */           ImageFormatEMF,
             /* CodecName */          emf_codecname,
             /* DllName */            NULL,
             /* FormatDescription */  emf_format,
@@ -5169,7 +5169,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
     {
         { /* WMF */
             /* Clsid */              { 0x557cf404, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } },
-            /* FormatID */           { 0xb96b3cadU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} },
+            /* FormatID */           ImageFormatWMF,
             /* CodecName */          wmf_codecname,
             /* DllName */            NULL,
             /* FormatDescription */  wmf_format,
@@ -5189,7 +5189,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
     {
         { /* PNG */
             /* Clsid */              { 0x557cf406, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } },
-            /* FormatID */           { 0xb96b3cafU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} },
+            /* FormatID */           ImageFormatPNG,
             /* CodecName */          png_codecname,
             /* DllName */            NULL,
             /* FormatDescription */  png_format,
@@ -5209,7 +5209,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
     {
         { /* ICO */
             /* Clsid */              { 0x557cf407, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } },
-            /* FormatID */           { 0xb96b3cabU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} },
+            /* FormatID */           ImageFormatIcon,
             /* CodecName */          ico_codecname,
             /* DllName */            NULL,
             /* FormatDescription */  ico_format,
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 256aa360d47..63b559b5cee 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -568,7 +568,7 @@ static void test_LoadingImages(void)

stat = GdipGetImageRawFormat((GpImage*)bm, &format);
     expect(Ok, stat);
-    expect_guid(&format_ico, &format, __LINE__, TRUE);
+    expect_guid(&format_ico, &format, __LINE__, FALSE);

cleanup:
     if (bm)