[GDIPLUS_WINETEST]

[reactos.git] / rostests / winetests / gdiplus / graphics.c

diff --git a/rostests/winetests/gdiplus/graphics.c b/rostests/winetests/gdiplus/graphics.c
index 20cc699..fca7720 100644 (file)
--- a/rostests/winetests/gdiplus/graphics.c
+++ b/rostests/winetests/gdiplus/graphics.c
@@ -98,7 +98,7 @@ static REAL units_scale(GpUnit from, GpUnit to, REAL dpi)
     return pixels_to_units(pixels, to, dpi);
 }
 
     return pixels_to_units(pixels, to, dpi);
 }
 

-static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL scale)
+static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL scale, GpImage **image)

 {
     GpStatus status;
     union
 {
     GpStatus status;
     union


@@ -123,11 +123,8 @@ static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL sca
 
     status = GdipGetImageGraphicsContext(u.image, &graphics);
     expect(Ok, status);
 
     status = GdipGetImageGraphicsContext(u.image, &graphics);
     expect(Ok, status);

-    /* image is intentionally leaked to make sure that there is no
-       side effects after its destruction.
-    status = GdipDisposeImage(u.image);
-    expect(Ok, status);
-    */
+
+    *image = u.image;

 
     status = GdipGetDpiX(graphics, &res);
     expect(Ok, status);
 
     status = GdipGetDpiX(graphics, &res);
     expect(Ok, status);


@@ -3527,7 +3524,9 @@ static void test_GdipMeasureString(void)
 
     for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
     {
 
     for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
     {

-        graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale);
+        GpImage *image;
+
+        graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image);

 
         lf.lfHeight = 0xdeadbeef;
         status = GdipGetLogFontW(font, graphics, &lf);
 
         lf.lfHeight = 0xdeadbeef;
         status = GdipGetLogFontW(font, graphics, &lf);


@@ -3578,6 +3577,9 @@ todo_wine
 
         status = GdipDeleteGraphics(graphics);
         expect(Ok, status);
 
         status = GdipDeleteGraphics(graphics);
         expect(Ok, status);

+
+        status = GdipDisposeImage(image);
+        expect(Ok, status);

     }
 
     GdipDeleteFont(font);
     }
 
     GdipDeleteFont(font);


@@ -3601,8 +3603,9 @@ todo_wine
         for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
         {
             REAL unit_scale;
         for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
         {
             REAL unit_scale;

+            GpImage *image;

 
 

-            graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale);
+            graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image);

 
             lf.lfHeight = 0xdeadbeef;
             status = GdipGetLogFontW(font, graphics, &lf);
 
             lf.lfHeight = 0xdeadbeef;
             status = GdipGetLogFontW(font, graphics, &lf);


@@ -3672,6 +3675,9 @@ todo_wine
 
             status = GdipDeleteGraphics(graphics);
             expect(Ok, status);
 
             status = GdipDeleteGraphics(graphics);
             expect(Ok, status);

+
+            status = GdipDisposeImage(image);
+            expect(Ok, status);

         }
 
         GdipDeleteFont(font);
         }
 
         GdipDeleteFont(font);


@@ -3709,12 +3715,13 @@ static void test_transform(void)
     };
     GpStatus status;
     GpGraphics *graphics;
     };
     GpStatus status;
     GpGraphics *graphics;

+    GpImage *image;

     GpPointF ptf[2];
     UINT i;
 
     for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
     {
     GpPointF ptf[2];
     UINT i;
 
     for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
     {

-        graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale);
+        graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale, &image);

         ptf[0].X = td[i].in[0].X;
         ptf[0].Y = td[i].in[0].Y;
         ptf[1].X = td[i].in[1].X;
         ptf[0].X = td[i].in[0].X;
         ptf[0].Y = td[i].in[0].Y;
         ptf[1].X = td[i].in[1].X;


@@ -3733,6 +3740,8 @@ static void test_transform(void)
         expectf(td[i].in[1].Y, ptf[1].Y);
         status = GdipDeleteGraphics(graphics);
         expect(Ok, status);
         expectf(td[i].in[1].Y, ptf[1].Y);
         status = GdipDeleteGraphics(graphics);
         expect(Ok, status);

+        status = GdipDisposeImage(image);
+        expect(Ok, status);

     }
 }
 
     }
 }