[WINDOWSCODECS_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

svn path=/trunk/; revision=72353

diff --git a/rostests/winetests/windowscodecs/metadata.c b/rostests/winetests/windowscodecs/metadata.c
index 2086c30..7459ef9 100644 (file)
--- a/rostests/winetests/windowscodecs/metadata.c
+++ b/rostests/winetests/windowscodecs/metadata.c
@@ -149,6 +149,16 @@ static const char metadata_gAMA[] = {
     0xff,0xff,0xff,0xff /* chunk CRC */
 };
 
     0xff,0xff,0xff,0xff /* chunk CRC */
 };
 

+static const char metadata_cHRM[] = {
+    0,0,0,32, /* chunk length */
+    'c','H','R','M', /* chunk type */
+    0,0,122,38, 0,0,128,132, /* white point */
+    0,0,250,0, 0,0,128,232, /* red */
+    0,0,117,48, 0,0,234,96, /* green */
+    0,0,58,152, 0,0,23,112, /* blue */
+    0xff,0xff,0xff,0xff /* chunk CRC */
+};
+

 static const char pngimage[285] = {
 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,
 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53,
 static const char pngimage[285] = {
 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,
 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53,


@@ -462,6 +472,67 @@ static void test_metadata_gAMA(void)
     IWICMetadataReader_Release(reader);
 }
 
     IWICMetadataReader_Release(reader);
 }
 

+static void test_metadata_cHRM(void)
+{
+    HRESULT hr;
+    IWICMetadataReader *reader;
+    PROPVARIANT schema, id, value;
+    ULONG count;
+    GUID format;
+    int i;
+    static const WCHAR expected_names[8][12] = {
+        {'W','h','i','t','e','P','o','i','n','t','X',0},
+        {'W','h','i','t','e','P','o','i','n','t','Y',0},
+        {'R','e','d','X',0},
+        {'R','e','d','Y',0},
+        {'G','r','e','e','n','X',0},
+        {'G','r','e','e','n','Y',0},
+        {'B','l','u','e','X',0},
+        {'B','l','u','e','Y',0},
+    };
+    static const ULONG expected_vals[8] = {
+        31270,32900, 64000,33000, 30000,60000, 15000,6000
+    };
+
+    PropVariantInit(&schema);
+    PropVariantInit(&id);
+    PropVariantInit(&value);
+
+    hr = CoCreateInstance(&CLSID_WICPngChrmMetadataReader, NULL, CLSCTX_INPROC_SERVER,
+        &IID_IWICMetadataReader, (void**)&reader);
+    ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr);
+    if (FAILED(hr)) return;
+
+    load_stream((IUnknown*)reader, metadata_cHRM, sizeof(metadata_cHRM), WICPersistOptionsDefault);
+
+    hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
+    ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr);
+    ok(IsEqualGUID(&format, &GUID_MetadataFormatChunkcHRM), "unexpected format %s\n", wine_dbgstr_guid(&format));
+
+    hr = IWICMetadataReader_GetCount(reader, &count);
+    ok(hr == S_OK, "GetCount failed, hr=%x\n", hr);
+    ok(count == 8, "unexpected count %i\n", count);
+
+    for (i=0; i<8; i++)
+    {
+        hr = IWICMetadataReader_GetValueByIndex(reader, i, &schema, &id, &value);
+        ok(hr == S_OK, "GetValue failed, hr=%x\n", hr);
+
+        ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt);
+        PropVariantClear(&schema);
+
+        ok(id.vt == VT_LPWSTR, "unexpected vt: %i\n", id.vt);
+        ok(!lstrcmpW(U(id).pwszVal, expected_names[i]), "got %s, expected %s\n", wine_dbgstr_w(U(id).pwszVal), wine_dbgstr_w(expected_names[i]));
+        PropVariantClear(&id);
+
+        ok(value.vt == VT_UI4, "unexpected vt: %i\n", value.vt);
+        ok(U(value).ulVal == expected_vals[i], "got %u, expected %u\n", U(value).ulVal, expected_vals[i]);
+        PropVariantClear(&value);
+    }
+
+    IWICMetadataReader_Release(reader);
+}
+

 static inline USHORT ushort_bswap(USHORT s)
 {
     return (s >> 8) | (s << 8);
 static inline USHORT ushort_bswap(USHORT s)
 {
     return (s >> 8) | (s << 8);


@@ -1901,6 +1972,7 @@ START_TEST(metadata)
     test_metadata_unknown();
     test_metadata_tEXt();
     test_metadata_gAMA();
     test_metadata_unknown();
     test_metadata_tEXt();
     test_metadata_gAMA();

+    test_metadata_cHRM();

     test_metadata_IFD();
     test_metadata_Exif();
     test_create_reader();
     test_metadata_IFD();
     test_metadata_Exif();
     test_create_reader();

diff --git a/rostests/winetests/windowscodecs/pngformat.c b/rostests/winetests/windowscodecs/pngformat.c
index 6a9427b..ebf06a5 100644 (file)
--- a/rostests/winetests/windowscodecs/pngformat.c
+++ b/rostests/winetests/windowscodecs/pngformat.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright 2012 Dmitry Timoshkov
+ * Copyright 2012,2016 Dmitry Timoshkov

  * Copyright 2012 Hans Leidekker for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * Copyright 2012 Hans Leidekker for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or


@@ -585,6 +585,61 @@ static void test_png_palette(void)
     IWICBitmapDecoder_Release(decoder);
 }
 
     IWICBitmapDecoder_Release(decoder);
 }
 

+/* RGB 24 bpp 1x1 pixel PNG image */
+static const char png_1x1_data[] = {
+  0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,
+  0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53,0xde,
+  0x00,0x00,0x00,0x0c,'I','D','A','T',0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59,0xe7,
+  0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82
+};
+
+static void test_color_formats(void)
+{
+    static const struct
+    {
+        char bit_depth, color_type;
+        const GUID *format;
+    } td[] =
+    {
+        /* 2 - PNG_COLOR_TYPE_RGB */
+        { 8, 2, &GUID_WICPixelFormat24bppBGR },
+        /* 0 - PNG_COLOR_TYPE_GRAY */
+        { 1, 0, &GUID_WICPixelFormatBlackWhite },
+        { 2, 0, &GUID_WICPixelFormat2bppGray },
+        { 4, 0, &GUID_WICPixelFormat4bppGray },
+        { 8, 0, &GUID_WICPixelFormat8bppGray },
+        { 16, 0, &GUID_WICPixelFormat16bppGray },
+    };
+    char buf[sizeof(png_1x1_data)];
+    HRESULT hr;
+    IWICBitmapDecoder *decoder;
+    IWICBitmapFrameDecode *frame;
+    GUID format;
+    int i;
+
+    for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
+    {
+        memcpy(buf, png_1x1_data, sizeof(png_1x1_data));
+        buf[24] = td[i].bit_depth;
+        buf[25] = td[i].color_type;
+
+        decoder = create_decoder(buf, sizeof(buf));
+        ok(decoder != NULL, "Failed to load PNG image data\n");
+        if (!decoder) continue;
+
+        hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame);
+        ok(hr == S_OK, "GetFrame error %#x\n", hr);
+
+        hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
+        ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
+        ok(IsEqualGUID(&format, td[i].format),
+           "expected %s, got %s\n", wine_dbgstr_guid(td[i].format), wine_dbgstr_guid(&format));
+
+        IWICBitmapFrameDecode_Release(frame);
+        IWICBitmapDecoder_Release(decoder);
+    }
+}
+

 START_TEST(pngformat)
 {
     HRESULT hr;
 START_TEST(pngformat)
 {
     HRESULT hr;


@@ -597,6 +652,7 @@ START_TEST(pngformat)
 
     test_color_contexts();
     test_png_palette();
 
     test_color_contexts();
     test_png_palette();

+    test_color_formats();

 
     IWICImagingFactory_Release(factory);
     CoUninitialize();
 
     IWICImagingFactory_Release(factory);
     CoUninitialize();