Vincent Povirk : gdiplus: Test the ability to load WMF images.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f87039103f368935454f5e91823bafac0d77cfdc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f87039103f368935454f5e9182...

Author: Vincent Povirk <vincent(a)codeweavers.com>
Date:   Sat Dec 26 19:25:34 2009 -0500

gdiplus: Test the ability to load WMF images.

---

 dlls/gdiplus/tests/image.c |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 9f70191..024c739 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -64,7 +64,7 @@ static void test_bufferrawformat(void* buff, int size, REFGUID expected, int lin
     LPBYTE   data;
     HRESULT  hres;
     GpStatus stat;
-    GpBitmap *bmp;
+    GpImage *img;
 
     hglob = GlobalAlloc (0, size);
     data = GlobalLock (hglob);
@@ -75,16 +75,16 @@ static void test_bufferrawformat(void* buff, int size, REFGUID expected, int lin
     ok_(__FILE__, line)(hres == S_OK, "Failed to create a stream\n");
     if(hres != S_OK) return;
 
-    stat = GdipCreateBitmapFromStream(stream, &bmp);
+    stat = GdipLoadImageFromStream(stream, &img);
     ok_(__FILE__, line)(stat == Ok, "Failed to create a Bitmap\n");
     if(stat != Ok){
         IStream_Release(stream);
         return;
     }
 
-    expect_rawformat(expected, (GpImage*)bmp, line, todo);
+    expect_rawformat(expected, img, line, todo);
 
-    GdipDisposeImage((GpImage*)bmp);
+    GdipDisposeImage(img);
     IStream_Release(stream);
 }
 
@@ -780,12 +780,28 @@ static const unsigned char jpgimage[285] = {
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xda,0x00,0x0c,0x03,0x01,
 0x00,0x02,0x11,0x03,0x11,0x00,0x3f,0x00,0xb2,0xc0,0x07,0xff,0xd9
 };
+/* 320x320 twip wmf */
+static const unsigned char wmfimage[180] = {
+0xd7,0xcd,0xc6,0x9a,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x01,0x40,0x01,0xa0,0x05,
+0x00,0x00,0x00,0x00,0xb1,0x52,0x01,0x00,0x09,0x00,0x00,0x03,0x4f,0x00,0x00,0x00,
+0x0f,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x0b,0x02,0x00,0x00,
+0x00,0x00,0x05,0x00,0x00,0x00,0x0c,0x02,0x40,0x01,0x40,0x01,0x04,0x00,0x00,0x00,
+0x02,0x01,0x01,0x00,0x04,0x00,0x00,0x00,0x04,0x01,0x0d,0x00,0x08,0x00,0x00,0x00,
+0xfa,0x02,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,
+0x2d,0x01,0x00,0x00,0x07,0x00,0x00,0x00,0xfc,0x02,0x01,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x04,0x00,0x00,0x00,0x2d,0x01,0x01,0x00,0x07,0x00,0x00,0x00,0xfc,0x02,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x2d,0x01,0x02,0x00,
+0x07,0x00,0x00,0x00,0x1b,0x04,0x40,0x01,0x40,0x01,0x00,0x00,0x00,0x00,0x04,0x00,
+0x00,0x00,0xf0,0x01,0x00,0x00,0x04,0x00,0x00,0x00,0xf0,0x01,0x01,0x00,0x03,0x00,
+0x00,0x00,0x00,0x00
+};
 static void test_getrawformat(void)
 {
     test_bufferrawformat((void*)pngimage, sizeof(pngimage), &ImageFormatPNG,  __LINE__, FALSE);
     test_bufferrawformat((void*)gifimage, sizeof(gifimage), &ImageFormatGIF,  __LINE__, FALSE);
     test_bufferrawformat((void*)bmpimage, sizeof(bmpimage), &ImageFormatBMP,  __LINE__, FALSE);
     test_bufferrawformat((void*)jpgimage, sizeof(jpgimage), &ImageFormatJPEG, __LINE__, FALSE);
+    test_bufferrawformat((void*)wmfimage, sizeof(wmfimage), &ImageFormatWMF, __LINE__, FALSE);
 }
 
 static void test_createhbitmap(void)