Rebase against f7187ecbd62f778649e055af61cd2c6786ead7f1.

patches/gdiplus-Grayscale_PNG/0002-gdiplus-tests-Add-a-test-for-loading-PNG-grayscale-i.patch

@@ -1,4 +1,4 @@
-From e567377f438a70ee3c69aed93ac7197ad867d7ad Mon Sep 17 00:00:00 2001
+From eff83781e6c1be78d1614810902b2b0f38f6045e Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 3 Jun 2016 13:20:14 +0800
 Subject: gdiplus/tests: Add a test for loading PNG grayscale images.
@@ -8,7 +8,7 @@ Subject: gdiplus/tests: Add a test for loading PNG grayscale images.
  1 file changed, 59 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
-index 551d276..ab39dfe 100644
+index 6abd026..3d123ad 100644
 --- a/dlls/gdiplus/tests/image.c
 +++ b/dlls/gdiplus/tests/image.c
 @@ -2,7 +2,7 @@
@@ -20,8 +20,8 @@ index 551d276..ab39dfe 100644
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
-@@ -4790,6 +4790,63 @@ static void test_getadjustedpalette(void)
-     GdipDisposeImageAttributes(imageattributes);
+@@ -4941,6 +4941,63 @@ static void test_imageabort(void)
+     GdipDisposeImage((GpImage*)bm);
  }
  
 +/* RGB 24 bpp 1x1 pixel PNG image */
@@ -83,15 +83,15 @@ index 551d276..ab39dfe 100644
 +
  START_TEST(image)
  {
-     struct GdiplusStartupInput gdiplusStartupInput;
-@@ -4802,6 +4859,7 @@ START_TEST(image)
- 
-     GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
+     HMODULE mod = GetModuleHandleA("gdiplus.dll");
+@@ -4958,6 +5015,7 @@ START_TEST(image)
+     pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram");
+     pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort");
  
 +    test_png_color_formats();
      test_supported_encoders();
      test_CloneBitmapArea();
      test_ARGB_conversion();
 -- 
-2.8.0
+2.9.0