Rebase against 0a72708126f5b8fc06698172d973bb529944c3bf

This commit is contained in:
Alistair Leslie-Hughes
2018-03-01 12:28:01 +11:00
parent d3bcb61436
commit 9999806838
39 changed files with 695 additions and 1116 deletions

View File

@@ -1,14 +1,15 @@
From 86a10d59fa0f11717c0194fc0111568f8a948173 Mon Sep 17 00:00:00 2001
From 90841bbb1a05a2d2a016baf13ab0efb0b36d530b Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 20 Jul 2016 14:30:53 +0800
Subject: gdiplus/tests: Add some tests for GdipInitializePalette. (v2)
Subject: [PATCH] gdiplus/tests: Add some tests for
GdipInitializePalette. (v2)
---
dlls/gdiplus/tests/image.c | 146 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 146 insertions(+)
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index b3b47b6..4a0ec96 100644
index fd45ab31c4..6646fb046e 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -34,6 +34,8 @@ static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*);
@@ -20,8 +21,8 @@ index b3b47b6..4a0ec96 100644
#define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got))
#define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got))
@@ -5005,6 +5007,149 @@ static void test_png_color_formats(void)
}
@@ -5190,6 +5192,149 @@ static void test_GdipLoadImageFromStream(void)
IStream_Release(stream);
}
+static BYTE *init_bitmap(UINT *width, UINT *height, UINT *stride)
@@ -170,7 +171,7 @@ index b3b47b6..4a0ec96 100644
START_TEST(image)
{
HMODULE mod = GetModuleHandleA("gdiplus.dll");
@@ -5022,6 +5167,7 @@ START_TEST(image)
@@ -5214,6 +5359,7 @@ START_TEST(image)
pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram");
pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort");
@@ -179,5 +180,5 @@ index b3b47b6..4a0ec96 100644
test_supported_encoders();
test_CloneBitmapArea();
--
2.9.0
2.16.1