wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f7187ecbd62f778649e055af61cd2c6786ead7f1.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-11-13 20:36:59 +01:00
parent 8682bdd67a
commit e3182b014c
19 changed files with 96 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/windowscodecs-IWICPalette_InitializeFromBitmap/0003-gdiplus-Implement-GdipInitializePalette.-v2.patch
View File

@@ -1,4 +1,4 @@
From f6f04f14bb73690b6a45299469c52391699a6e88 Mon Sep 17 00:00:00 2001
From d7161fbc798020e8cc462e44660e448ddf8f585d Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 20 Jul 2016 14:30:09 +0800
Subject: gdiplus: Implement GdipInitializePalette. (v2)
@@ -10,7 +10,7 @@ Subject: gdiplus: Implement GdipInitializePalette. (v2)
3 files changed, 110 insertions(+), 1 deletion(-)
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index c163ef9..d380146 100644
index 40c19e6..4186b5b 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -615,7 +615,7 @@
@@ -21,14 +21,14 @@ index c163ef9..d380146 100644
+618 stdcall GdipInitializePalette(ptr long long long ptr)
619 stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr)
620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr)
621 stub GdipBitmapGetHistogram
621 stdcall GdipBitmapGetHistogram(ptr long long ptr ptr ptr ptr)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 1cee84b..7135eb4 100644
index 31cdc7c..42d30cf 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -5423,3 +5423,111 @@ GpStatus WINGDIPAPI GdipBitmapConvertFormat(GpBitmap *bitmap, PixelFormat format
FIXME("(%p, 0x%08x, %d, %d, %p, %f): stub\n", bitmap, format, dithertype, palettetype, palette, alphathreshold);
return NotImplemented;
@@ -5567,3 +5567,111 @@ GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num
*num_of_entries = 256;
return Ok;
}
+
+static GpStatus create_optimal_palette(ColorPalette *palette, INT desired,
@@ -139,10 +139,10 @@ index 1cee84b..7135eb4 100644
+ return InvalidParameter;
+}
diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index c6f16c4..4849104 100644
index 0c40223..0d6d9ea 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -262,6 +262,7 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*);
@@ -264,6 +264,7 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*);
GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB);
GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*);
GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*);

20
patches/windowscodecs-IWICPalette_InitializeFromBitmap/0004-gdiplus-tests-Add-some-tests-for-GdipInitializePalet.patch
View File

@@ -1,4 +1,4 @@
From baced9170457ba5c85df39c3c30ae60923a86488 Mon Sep 17 00:00:00 2001
From 86a10d59fa0f11717c0194fc0111568f8a948173 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)
@@ -8,19 +8,19 @@ Subject: gdiplus/tests: Add some tests for GdipInitializePalette. (v2)
1 file changed, 146 insertions(+)
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 28fd1a7..b74cb50 100644
index b3b47b6..4a0ec96 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -30,6 +30,8 @@
#include "gdiplus.h"
#include "wine/test.h"
@@ -34,6 +34,8 @@ static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*);
static GpStatus (WINAPI *pGdipBitmapGetHistogram)(GpBitmap*,HistogramFormat,UINT,UINT*,UINT*,UINT*,UINT*);
static GpStatus (WINAPI *pGdipImageSetAbort)(GpImage*,GdiplusAbort*);
+static GpStatus (WINGDIPAPI *pGdipInitializePalette)(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*);
+
#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))
@@ -4849,6 +4851,149 @@ static void test_png_color_formats(void)
@@ -5005,6 +5007,149 @@ static void test_png_color_formats(void)
}
}
@@ -169,10 +169,10 @@ index 28fd1a7..b74cb50 100644
+
START_TEST(image)
{
struct GdiplusStartupInput gdiplusStartupInput;
@@ -4861,6 +5006,7 @@ START_TEST(image)
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
HMODULE mod = GetModuleHandleA("gdiplus.dll");
@@ -5022,6 +5167,7 @@ START_TEST(image)
pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram");
pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort");
+ test_GdipInitializePalette();
test_png_color_formats();