[akhaldi] 62937: [WINDOWSCODECS_WINETEST] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Thu Apr 24 12:13:18 2014
New Revision: 62937

URL: http://svn.reactos.org/svn/reactos?rev=62937&view=rev
Log:
[WINDOWSCODECS_WINETEST]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/rostests/winetests/windowscodecs/CMakeLists.txt
    trunk/rostests/winetests/windowscodecs/bitmap.c
    trunk/rostests/winetests/windowscodecs/converter.c
    trunk/rostests/winetests/windowscodecs/gifformat.c
    trunk/rostests/winetests/windowscodecs/info.c
    trunk/rostests/winetests/windowscodecs/metadata.c
    trunk/rostests/winetests/windowscodecs/pngformat.c
    trunk/rostests/winetests/windowscodecs/testlist.c
    trunk/rostests/winetests/windowscodecs/tiffformat.c

Modified: trunk/rostests/winetests/windowscodecs/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/C…
==============================================================================
--- trunk/rostests/winetests/windowscodecs/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/windowscodecs/CMakeLists.txt	[iso-8859-1] Thu Apr 24 12:13:18
2014
@@ -18,5 +18,8 @@
 
 add_executable(windowscodecs_winetest ${SOURCE})
 set_module_type(windowscodecs_winetest win32cui)
-add_importlibs(windowscodecs_winetest windowscodecs oleaut32 ole32 user32 gdi32 msvcrt
kernel32 ntdll)
+add_importlibs(windowscodecs_winetest windowscodecs oleaut32 ole32 user32 gdi32 msvcrt
kernel32)
+if(MSVC)
+    add_importlibs(windowscodecs_winetest ntdll)
+endif()
 add_cd_file(TARGET windowscodecs_winetest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/winetests/windowscodecs/bitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/b…
==============================================================================
--- trunk/rostests/winetests/windowscodecs/bitmap.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/windowscodecs/bitmap.c	[iso-8859-1] Thu Apr 24 12:13:18 2014
@@ -38,18 +38,6 @@
 
 static IWICImagingFactory *factory;
 
-static const char *debugstr_guid(const GUID *guid)
-{
-    static char buf[50];
-
-    if (!guid) return "(null)";
-    sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-            guid->Data1, guid->Data2, guid->Data3, guid->Data4[0],
-            guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4],
-            guid->Data4[5], guid->Data4[6], guid->Data4[7]);
-    return buf;
-}
-
 static HRESULT WINAPI bitmapsource_QueryInterface(IWICBitmapSource *iface, REFIID iid,
void **ppv)
 {
     if (IsEqualIID(&IID_IUnknown, iid) ||
@@ -158,7 +146,7 @@
     hdib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, &bits, NULL, 0);
     ok(hdib != 0, "CreateDIBSection(%dx%d,%d bpp) failed\n", width, height,
bpp);
 
-    GetObject(hdib, sizeof(bm), &bm);
+    GetObjectW(hdib, sizeof(bm), &bm);
     ok(bm.bmWidth == width, "expected %d, got %d\n", width, bm.bmWidth);
     ok(bm.bmHeight == height, "expected %d, got %d\n", height, bm.bmHeight);
     ok(bm.bmPlanes == 1, "expected 1, got %d\n", bm.bmPlanes);
@@ -671,7 +659,7 @@
 
     IWICBitmap_GetPixelFormat(bitmap, &format);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA),
-       "unexpected pixel format %s\n", debugstr_guid(&format));
+       "unexpected pixel format %s\n", wine_dbgstr_guid(&format));
 
     IWICBitmap_GetSize(bitmap, &width, &height);
     ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr);
@@ -699,7 +687,7 @@
 
     IWICBitmap_GetPixelFormat(bitmap, &format);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA),
-       "unexpected pixel format %s\n", debugstr_guid(&format));
+       "unexpected pixel format %s\n", wine_dbgstr_guid(&format));
 
     IWICBitmap_GetSize(bitmap, &width, &height);
     ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr);
@@ -733,21 +721,17 @@
     ok(hbmp != 0, "failed to create bitmap\n");
 
     hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, 0, 0, WICBitmapIgnoreAlpha,
&bitmap);
-todo_wine
     ok(hr == WINCODEC_ERR_WIN32ERROR || hr == 0x88980003 /*XP*/, "expected
WINCODEC_ERR_WIN32ERROR, got %#x\n", hr);
 
     hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0,
WICBitmapIgnoreAlpha, NULL);
-todo_wine
     ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr);
 
     hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0,
WICBitmapIgnoreAlpha, &bitmap);
-todo_wine
     ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr);
-    if (hr != S_OK) return;
 
     IWICBitmap_GetPixelFormat(bitmap, &format);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed),
-       "unexpected pixel format %s\n", debugstr_guid(&format));
+       "unexpected pixel format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICBitmap_GetSize(bitmap, &width, &height);
     ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr);
@@ -776,8 +760,9 @@
     ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr);
 
     IWICBitmap_GetPixelFormat(bitmap, &format);
+todo_wine
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed),
-       "unexpected pixel format %s\n", debugstr_guid(&format));
+       "unexpected pixel format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICBitmap_GetSize(bitmap, &width, &height);
     ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr);
@@ -795,6 +780,7 @@
 
     hr = IWICPalette_GetColorCount(palette, &count);
     ok(hr == S_OK, "GetColorCount error %#x\n", hr);
+todo_wine
     ok(count == 16, "expected 16, got %u\n", count);
 
     IWICPalette_Release(palette);
@@ -817,7 +803,7 @@
 
     IWICBitmap_GetPixelFormat(bitmap, &format);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed),
-       "unexpected pixel format %s\n", debugstr_guid(&format));
+            "unexpected pixel format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICBitmap_GetSize(bitmap, &width, &height);
     ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr);
@@ -843,11 +829,52 @@
     hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data);
     ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr);
     for (i = 0; i < sizeof(data); i++)
-        ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i,
data_8bpp_pal_wic[i], data[i]);
+    {
+        if (data[i] != data_8bpp_pal_wic[i])
+todo_wine
+            ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n",
i, data_8bpp_pal_wic[i], data[i]);
+        else
+            ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n",
i, data_8bpp_pal_wic[i], data[i]);
+    }
 
     IWICBitmap_Release(bitmap);
     DeleteObject(hbmp);
     DeleteObject(hpal);
+
+    /* 32bpp alpha */
+    hbmp = create_dib(2, 2, 32, NULL, NULL);
+    hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, NULL,
WICBitmapUseAlpha, &bitmap);
+    ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr);
+
+    hr = IWICBitmap_GetPixelFormat(bitmap, &format);
+    ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
+    ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA),
+       "unexpected pixel format %s\n", wine_dbgstr_guid(&format));
+
+    IWICBitmap_Release(bitmap);
+
+    /* 32bpp pre-multiplied alpha */
+    hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, NULL,
WICBitmapUsePremultipliedAlpha, &bitmap);
+    ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr);
+
+    hr = IWICBitmap_GetPixelFormat(bitmap, &format);
+    ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
+    ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppPBGRA),
+       "unexpected pixel format %s\n", wine_dbgstr_guid(&format));
+
+    IWICBitmap_Release(bitmap);
+
+    /* 32bpp no alpha */
+    hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, NULL,
WICBitmapIgnoreAlpha, &bitmap);
+    ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr);
+
+    hr = IWICBitmap_GetPixelFormat(bitmap, &format);
+    ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
+    ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGR),
+       "unexpected pixel format %s\n", wine_dbgstr_guid(&format));
+
+    IWICBitmap_Release(bitmap);
+    DeleteObject(hbmp);
 }
 
 static void test_clipper(void)

Modified: trunk/rostests/winetests/windowscodecs/converter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/c…
==============================================================================
--- trunk/rostests/winetests/windowscodecs/converter.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/windowscodecs/converter.c	[iso-8859-1] Thu Apr 24 12:13:18
2014
@@ -343,7 +343,7 @@
 {
     BitmapTestSrc *src_obj;
     IWICFormatConverter *converter;
-    BOOL can_convert=1;
+    BOOL can_convert = TRUE;
     HRESULT hr;
 
     CreateTestBitmap(&testdata_32bppBGRA, &src_obj);
@@ -652,18 +652,18 @@
 {
     CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
 
-    test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA ->
BGR", 0);
-    test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR ->
BGRA", 0);
-    test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA ->
BGRA", 0);
-
-    test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR ->
24bppBGR", 0);
-    test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR ->
24bppRGB", 0);
-
-    test_conversion(&testdata_24bppRGB, &testdata_24bppRGB, "24bppRGB ->
24bppRGB", 0);
-    test_conversion(&testdata_24bppRGB, &testdata_24bppBGR, "24bppRGB ->
24bppBGR", 0);
-
-    test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR ->
24bppRGB", 0);
-    test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB ->
32bppBGR", 0);
+    test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA ->
BGR", FALSE);
+    test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR ->
BGRA", FALSE);
+    test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA ->
BGRA", FALSE);
+
+    test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR ->
24bppBGR", FALSE);
+    test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR ->
24bppRGB", FALSE);
+
+    test_conversion(&testdata_24bppRGB, &testdata_24bppRGB, "24bppRGB ->
24bppRGB", FALSE);
+    test_conversion(&testdata_24bppRGB, &testdata_24bppBGR, "24bppRGB ->
24bppBGR", FALSE);
+
+    test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR ->
24bppRGB", FALSE);
+    test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB ->
32bppBGR", FALSE);
 
     test_invalid_conversion();
     test_default_converter();

Modified: trunk/rostests/winetests/windowscodecs/gifformat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/g…
==============================================================================
--- trunk/rostests/winetests/windowscodecs/gifformat.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/windowscodecs/gifformat.c	[iso-8859-1] Thu Apr 24 12:13:18
2014
@@ -63,18 +63,6 @@
 
 static IWICImagingFactory *factory;
 
-static const char *debugstr_guid(const GUID *guid)
-{
-    static char buf[50];
-
-    if (!guid) return "(null)";
-    sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-            guid->Data1, guid->Data2, guid->Data3, guid->Data4[0],
-            guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4],
-            guid->Data4[5], guid->Data4[6], guid->Data4[7]);
-    return buf;
-}
-
 static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size)
 {
     HGLOBAL hmem;
@@ -98,7 +86,7 @@
     hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format);
     ok(hr == S_OK, "GetContainerFormat error %#x\n", hr);
     ok(IsEqualGUID(&format, &GUID_ContainerFormatGif),
-       "wrong container format %s\n", debugstr_guid(&format));
+       "wrong container format %s\n", wine_dbgstr_guid(&format));
 
     IStream_Release(stream);
 
@@ -144,7 +132,7 @@
     hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
     ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed),
-       "wrong pixel format %s\n", debugstr_guid(&format));
+       "wrong pixel format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICBitmapFrameDecode_CopyPalette(frame, palette);
     ok(hr == S_OK, "CopyPalette error %#x\n", hr);
@@ -206,7 +194,7 @@
     hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
     ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed),
-       "wrong pixel format %s\n", debugstr_guid(&format));
+       "wrong pixel format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICBitmapFrameDecode_CopyPalette(frame, palette);
     ok(hr == S_OK, "CopyPalette error %#x\n", hr);
@@ -249,7 +237,7 @@
     hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
     ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed),
-       "wrong pixel format %s\n", debugstr_guid(&format));
+       "wrong pixel format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICBitmapFrameDecode_CopyPalette(frame, palette);
     ok(hr == S_OK, "CopyPalette error %#x\n", hr);
@@ -319,7 +307,7 @@
     hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
     ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed),
-       "wrong pixel format %s\n", debugstr_guid(&format));
+       "wrong pixel format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICBitmapFrameDecode_CopyPalette(frame, palette);
     ok(hr == S_OK, "CopyPalette error %#x\n", hr);

Modified: trunk/rostests/winetests/windowscodecs/info.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/i…
==============================================================================
--- trunk/rostests/winetests/windowscodecs/info.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/windowscodecs/info.c	[iso-8859-1] Thu Apr 24 12:13:18 2014
@@ -36,21 +36,6 @@
 #include <initguid.h>
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
-static const char *debugstr_guid(GUID *guid)
-{
-    static char buf[50];
-
-    if(!guid)
-        return "(null)";
-
-    sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-            guid->Data1, guid->Data2, guid->Data3, guid->Data4[0],
-            guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4],
-            guid->Data4[5], guid->Data4[6], guid->Data4[7]);
-
-    return buf;
-}
-
 static HRESULT get_component_info(const GUID *clsid, IWICComponentInfo **result)
 {
     IWICImagingFactory *factory;
@@ -68,7 +53,7 @@
     return hr;
 }
 
-static int is_pixelformat(GUID *format)
+static BOOL is_pixelformat(GUID *format)
 {
     IWICComponentInfo *info;
     HRESULT hr;
@@ -275,7 +260,7 @@
     memset(&guid, 0xaa, sizeof(guid));
     hr = IWICComponentInfo_GetCLSID(info, &guid);
     ok(hr == S_OK, "GetCLSID failed, hr=%x\n", hr);
-    ok(IsEqualGUID(&guid, &GUID_WICPixelFormat32bppBGRA), "unexpected CLSID
%s\n", debugstr_guid(&guid));
+    ok(IsEqualGUID(&guid, &GUID_WICPixelFormat32bppBGRA), "unexpected CLSID
%s\n", wine_dbgstr_guid(&guid));
 
     hr = IWICComponentInfo_GetComponentType(info, NULL);
     ok(hr == E_INVALIDARG, "GetComponentType failed, hr=%x\n", hr);
@@ -305,7 +290,7 @@
     hr = IWICComponentInfo_GetVendorGUID(info, &guid);
     ok(hr == S_OK, "GetVendorGUID failed, hr=%x\n", hr);
     ok(IsEqualGUID(&guid, &GUID_VendorMicrosoft) ||
-       broken(IsEqualGUID(&guid, &GUID_NULL)) /* XP */, "unexpected GUID
%s\n", debugstr_guid(&guid));
+       broken(IsEqualGUID(&guid, &GUID_NULL)) /* XP */, "unexpected GUID
%s\n", wine_dbgstr_guid(&guid));
 
     len = 0xdeadbeef;
     hr = IWICComponentInfo_GetVersion(info, 0, NULL, &len);
@@ -364,7 +349,7 @@
         memset(&guid, 0xaa, sizeof(guid));
         hr = IWICPixelFormatInfo_GetFormatGUID(pixelformat_info, &guid);
         ok(hr == S_OK, "GetFormatGUID failed, hr=%x\n", hr);
-        ok(IsEqualGUID(&guid, &GUID_WICPixelFormat32bppBGRA), "unexpected
GUID %s\n", debugstr_guid(&guid));
+        ok(IsEqualGUID(&guid, &GUID_WICPixelFormat32bppBGRA), "unexpected
GUID %s\n", wine_dbgstr_guid(&guid));
 
         IWICPixelFormatInfo_Release(pixelformat_info);
     }

Modified: trunk/rostests/winetests/windowscodecs/metadata.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/m…
==============================================================================
--- trunk/rostests/winetests/windowscodecs/metadata.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/windowscodecs/metadata.c	[iso-8859-1] Thu Apr 24 12:13:18
2014
@@ -182,21 +182,6 @@

0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t','
','#','2',0x00,0x3B
 };
 
-static const char *debugstr_guid(REFIID riid)
-{
-    static char buf[50];
-
-    if(!riid)
-        return "(null)";
-
-    sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-            riid->Data1, riid->Data2, riid->Data3, riid->Data4[0],
-            riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4],
-            riid->Data4[5], riid->Data4[6], riid->Data4[7]);
-
-    return buf;
-}
-
 static IStream *create_stream(const char *data, int data_size)
 {
     HRESULT hr;
@@ -372,7 +357,7 @@
 
     hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
     ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr);
-    ok(IsEqualGUID(&format, &GUID_MetadataFormatChunktEXt), "unexpected
format %s\n", debugstr_guid(&format));
+    ok(IsEqualGUID(&format, &GUID_MetadataFormatChunktEXt), "unexpected
format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICMetadataReader_GetMetadataFormat(reader, NULL);
     ok(hr == E_INVALIDARG, "GetMetadataFormat failed, hr=%x\n", hr);
@@ -731,7 +716,7 @@
 
     hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
     ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr);
-    ok(IsEqualGUID(&format, &GUID_MetadataFormatIfd), "unexpected format
%s\n", debugstr_guid(&format));
+    ok(IsEqualGUID(&format, &GUID_MetadataFormatIfd), "unexpected format
%s\n", wine_dbgstr_guid(&format));
 
     hr = IWICMetadataReader_GetMetadataFormat(reader, NULL);
     ok(hr == E_INVALIDARG, "GetMetadataFormat should fail\n");
@@ -875,7 +860,7 @@
 
         hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
         ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr);
-        ok(IsEqualGUID(&format, &GUID_MetadataFormatChunktEXt), "unexpected
format %s\n", debugstr_guid(&format));
+        ok(IsEqualGUID(&format, &GUID_MetadataFormatChunktEXt), "unexpected
format %s\n", wine_dbgstr_guid(&format));
 
         IWICMetadataReader_Release(reader);
     }
@@ -893,7 +878,7 @@
 
         hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
         ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr);
-        ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), "unexpected
format %s\n", debugstr_guid(&format));
+        ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), "unexpected
format %s\n", wine_dbgstr_guid(&format));
 
         IWICMetadataReader_Release(reader);
     }
@@ -1104,7 +1089,7 @@
         hr = IWICMetadataBlockReader_GetContainerFormat(blockreader, &format);
         ok(hr == S_OK, "GetContainerFormat error %#x\n", hr);
         ok(IsEqualGUID(&format, &GUID_ContainerFormatGif),
-           "wrong container format %s\n", debugstr_guid(&format));
+           "wrong container format %s\n", wine_dbgstr_guid(&format));
 
         hr = IWICMetadataBlockReader_GetCount(blockreader, &count);
         ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1117,7 +1102,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatLSD), /* Logical Screen
Descriptor */
-               "wrong metadata format %s\n", debugstr_guid(&format));
+               "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1149,7 +1134,7 @@
         hr = IWICMetadataBlockReader_GetContainerFormat(blockreader, &format);
         ok(hr == S_OK, "GetContainerFormat error %#x\n", hr);
         ok(IsEqualGUID(&format, &GUID_ContainerFormatGif),
-           "wrong container format %s\n", debugstr_guid(&format));
+           "wrong container format %s\n", wine_dbgstr_guid(&format));
 
         hr = IWICMetadataBlockReader_GetCount(blockreader, NULL);
         ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr);
@@ -1165,7 +1150,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), /* Image Descriptor
*/
-               "wrong metadata format %s\n", debugstr_guid(&format));
+               "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1205,7 +1190,7 @@
         hr = IWICMetadataBlockReader_GetContainerFormat(blockreader, &format);
         ok(hr == S_OK, "GetContainerFormat error %#x\n", hr);
         ok(IsEqualGUID(&format, &GUID_ContainerFormatGif),
-           "wrong container format %s\n", debugstr_guid(&format));
+           "wrong container format %s\n", wine_dbgstr_guid(&format));
 
         hr = IWICMetadataBlockReader_GetCount(blockreader, &count);
         ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1218,7 +1203,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatLSD), /* Logical Screen
Descriptor */
-               "wrong metadata format %s\n", debugstr_guid(&format));
+               "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1236,7 +1221,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatAPE), /* Application
Extension */
-               "wrong metadata format %s\n", debugstr_guid(&format));
+               "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1254,7 +1239,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment
Extension */
-               "wrong metadata format %s\n", debugstr_guid(&format));
+               "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1272,7 +1257,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown),
-               "wrong metadata format %s\n", debugstr_guid(&format));
+               "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1304,7 +1289,7 @@
         hr = IWICMetadataBlockReader_GetContainerFormat(blockreader, &format);
         ok(hr == S_OK, "GetContainerFormat error %#x\n", hr);
         ok(IsEqualGUID(&format, &GUID_ContainerFormatGif),
-           "wrong container format %s\n", debugstr_guid(&format));
+           "wrong container format %s\n", wine_dbgstr_guid(&format));
 
         hr = IWICMetadataBlockReader_GetCount(blockreader, NULL);
         ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr);
@@ -1320,7 +1305,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), /* Image Descriptor
*/
-               "wrong metadata format %s\n", debugstr_guid(&format));
+               "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1338,7 +1323,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment
Extension */
-                "wrong metadata format %s\n", debugstr_guid(&format));
+                "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1357,7 +1342,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown),
-               "wrong metadata format %s\n", debugstr_guid(&format));
+               "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1375,7 +1360,7 @@
         {
             hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
             ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), /* Graphic Control
Extension */
-               "wrong metadata format %s\n", debugstr_guid(&format));
+               "wrong metadata format %s\n", wine_dbgstr_guid(&format));
 
             hr = IWICMetadataReader_GetCount(reader, &count);
             ok(hr == S_OK, "GetCount error %#x\n", hr);
@@ -1455,14 +1440,14 @@
 
         hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
         ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr);
-        ok(IsEqualGUID(&format, &GUID_MetadataFormatLSD), "wrong format
%s\n", debugstr_guid(&format));
+        ok(IsEqualGUID(&format, &GUID_MetadataFormatLSD), "wrong format
%s\n", wine_dbgstr_guid(&format));
 
         hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info);
         ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr);
 
         hr = IWICMetadataHandlerInfo_GetCLSID(info, &id);
         ok(hr == S_OK, "GetCLSID error %#x\n", hr);
-        ok(IsEqualGUID(&id, &CLSID_WICLSDMetadataReader), "wrong CLSID
%s\n", debugstr_guid(&id));
+        ok(IsEqualGUID(&id, &CLSID_WICLSDMetadataReader), "wrong CLSID
%s\n", wine_dbgstr_guid(&id));
 
         hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy);
         ok(hr == S_OK, "GetFriendlyName error %#x\n", hr);
@@ -1533,14 +1518,14 @@
 
         hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
         ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr);
-        ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), "wrong format
%s\n", debugstr_guid(&format));
+        ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), "wrong format
%s\n", wine_dbgstr_guid(&format));
 
         hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info);
         ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr);
 
         hr = IWICMetadataHandlerInfo_GetCLSID(info, &id);
         ok(hr == S_OK, "GetCLSID error %#x\n", hr);
-        ok(IsEqualGUID(&id, &CLSID_WICIMDMetadataReader), "wrong CLSID
%s\n", debugstr_guid(&id));
+        ok(IsEqualGUID(&id, &CLSID_WICIMDMetadataReader), "wrong CLSID
%s\n", wine_dbgstr_guid(&id));
 
         hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy);
         ok(hr == S_OK, "GetFriendlyName error %#x\n", hr);
@@ -1608,14 +1593,14 @@
 
         hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
         ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr);
-        ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), "wrong format
%s\n", debugstr_guid(&format));
+        ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), "wrong format
%s\n", wine_dbgstr_guid(&format));
 
         hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info);
         ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr);
 
         hr = IWICMetadataHandlerInfo_GetCLSID(info, &id);
         ok(hr == S_OK, "GetCLSID error %#x\n", hr);
-        ok(IsEqualGUID(&id, &CLSID_WICGCEMetadataReader), "wrong CLSID
%s\n", debugstr_guid(&id));
+        ok(IsEqualGUID(&id, &CLSID_WICGCEMetadataReader), "wrong CLSID
%s\n", wine_dbgstr_guid(&id));
 
         hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy);
         ok(hr == S_OK, "GetFriendlyName error %#x\n", hr);
@@ -1681,7 +1666,7 @@
 
         hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
         ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr);
-        ok(IsEqualGUID(&format, &GUID_MetadataFormatAPE), "wrong format
%s\n", debugstr_guid(&format));
+        ok(IsEqualGUID(&format, &GUID_MetadataFormatAPE), "wrong format
%s\n", wine_dbgstr_guid(&format));
 
         PropVariantInit(&value);
         id.vt = VT_LPWSTR;
@@ -1700,7 +1685,7 @@
 
         hr = IWICMetadataHandlerInfo_GetCLSID(info, &clsid);
         ok(hr == S_OK, "GetCLSID error %#x\n", hr);
-        ok(IsEqualGUID(&clsid, &CLSID_WICAPEMetadataReader), "wrong CLSID
%s\n", debugstr_guid(&clsid));
+        ok(IsEqualGUID(&clsid, &CLSID_WICAPEMetadataReader), "wrong CLSID
%s\n", wine_dbgstr_guid(&clsid));
 
         hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy);
         ok(hr == S_OK, "GetFriendlyName error %#x\n", hr);
@@ -1765,7 +1750,7 @@
 
         hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
         ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr);
-        ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), "wrong
format %s\n", debugstr_guid(&format));
+        ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), "wrong
format %s\n", wine_dbgstr_guid(&format));
 
         PropVariantInit(&value);
         id.vt = VT_LPWSTR;
@@ -1782,7 +1767,7 @@
 
         hr = IWICMetadataHandlerInfo_GetCLSID(info, &clsid);
         ok(hr == S_OK, "GetCLSID error %#x\n", hr);
-        ok(IsEqualGUID(&clsid, &CLSID_WICGifCommentMetadataReader), "wrong
CLSID %s\n", debugstr_guid(&clsid));
+        ok(IsEqualGUID(&clsid, &CLSID_WICGifCommentMetadataReader), "wrong
CLSID %s\n", wine_dbgstr_guid(&clsid));
 
         hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy);
         ok(hr == S_OK, "GetFriendlyName error %#x\n", hr);

Modified: trunk/rostests/winetests/windowscodecs/pngformat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/p…
==============================================================================
--- trunk/rostests/winetests/windowscodecs/pngformat.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/windowscodecs/pngformat.c	[iso-8859-1] Thu Apr 24 12:13:18
2014
@@ -281,18 +281,6 @@
 
 static IWICImagingFactory *factory;
 
-static const char *debugstr_guid(const GUID *guid)
-{
-    static char buf[50];
-
-    if (!guid) return "(null)";
-    sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-            guid->Data1, guid->Data2, guid->Data3, guid->Data4[0],
-            guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4],
-            guid->Data4[5], guid->Data4[6], guid->Data4[7]);
-    return buf;
-}
-
 static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size)
 {
     HGLOBAL hmem;
@@ -316,7 +304,7 @@
     hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format);
     ok(hr == S_OK, "GetContainerFormat error %#x\n", hr);
     ok(IsEqualGUID(&format, &GUID_ContainerFormatPng),
-       "wrong container format %s\n", debugstr_guid(&format));
+       "wrong container format %s\n", wine_dbgstr_guid(&format));
 
     IStream_Release(stream);
 
@@ -569,7 +557,7 @@
     hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
     ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormat1bppIndexed),
-       "got wrong format %s\n", debugstr_guid(&format));
+       "got wrong format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICImagingFactory_CreatePalette(factory, &palette);
     ok(hr == S_OK, "CreatePalette error %#x\n", hr);

Modified: trunk/rostests/winetests/windowscodecs/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/t…
==============================================================================
--- trunk/rostests/winetests/windowscodecs/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/windowscodecs/testlist.c	[iso-8859-1] Thu Apr 24 12:13:18
2014
@@ -1,7 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_bitmap(void);
 extern void func_bmpformat(void);

Modified: trunk/rostests/winetests/windowscodecs/tiffformat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/t…
==============================================================================
--- trunk/rostests/winetests/windowscodecs/tiffformat.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/windowscodecs/tiffformat.c	[iso-8859-1] Thu Apr 24 12:13:18
2014
@@ -102,18 +102,6 @@
 
 static IWICImagingFactory *factory;
 
-static const char *debugstr_guid(const GUID *guid)
-{
-    static char buf[50];
-
-    if (!guid) return "(null)";
-    sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-            guid->Data1, guid->Data2, guid->Data3, guid->Data4[0],
-            guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4],
-            guid->Data4[5], guid->Data4[6], guid->Data4[7]);
-    return buf;
-}
-
 static IStream *create_stream(const void *data, int data_size)
 {
     HRESULT hr;
@@ -173,7 +161,7 @@
     hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
     ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
     ok(IsEqualGUID(&format, &GUID_WICPixelFormatBlackWhite),
-       "got wrong format %s\n", debugstr_guid(&format));
+       "got wrong format %s\n", wine_dbgstr_guid(&format));
 
     hr = IWICImagingFactory_CreatePalette(factory, &palette);
     ok(hr == S_OK, "CreatePalette error %#x\n", hr);