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 4f53be1a6e7c15c3648b0770f9d92685dc9a9717.

Browse Source
This commit is contained in:
Zebediah Figura
2020-03-05 22:33:21 -06:00
parent e61a75f75f
commit 5213d551f8
3 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/windowscodecs-GIF_Encoder/0008-windowscodecs-Add-initial-implementation-of-the-GIF-.patch
View File

@@ -1,20 +1,20 @@
From 0c50bf1c5e19330493e0cd108a703fd135f7541a Mon Sep 17 00:00:00 2001
From ad1e42eac7c54fd7dee27b37a1b5163180113455 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Sun, 16 Oct 2016 17:44:31 +0800
Subject: windowscodecs: Add initial implementation of the GIF encoder.
Subject: [PATCH] windowscodecs: Add initial implementation of the GIF encoder.
---
dlls/windowscodecs/clsfactory.c | 1 +
dlls/windowscodecs/gifformat.c | 999 +++++++++++++++++++++++++++++++--
dlls/windowscodecs/gifformat.c | 999 ++++++++++++++++++++++++-
dlls/windowscodecs/regsvr.c | 10 +
dlls/windowscodecs/wincodecs_private.h | 1 +
4 files changed, 977 insertions(+), 34 deletions(-)
diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c
index 77eeedc..98938eb 100644
index 32083a2a3..2de518a00 100644
--- a/dlls/windowscodecs/clsfactory.c
+++ b/dlls/windowscodecs/clsfactory.c
@@ -49,6 +49,7 @@ static const classinfo wic_classes[] = {
@@ -50,6 +50,7 @@ static const classinfo wic_classes[] = {
{&CLSID_WICPngEncoder, PngEncoder_CreateInstance},
{&CLSID_WICBmpEncoder, BmpEncoder_CreateInstance},
{&CLSID_WICGifDecoder, GifDecoder_CreateInstance},
@@ -23,7 +23,7 @@ index 77eeedc..98938eb 100644
{&CLSID_WICJpegDecoder, JpegDecoder_CreateInstance},
{&CLSID_WICJpegEncoder, JpegEncoder_CreateInstance},
diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c
index ddff88b..b5c56aa 100644
index df202ba45..1ebd5660f 100644
--- a/dlls/windowscodecs/gifformat.c
+++ b/dlls/windowscodecs/gifformat.c
@@ -1,6 +1,6 @@
@@ -123,7 +123,7 @@ index ddff88b..b5c56aa 100644
static HRESULT load_IMD_metadata(IStream *stream, const GUID *vendor, DWORD options,
MetadataItem **items, DWORD *count)
{
@@ -1455,3 +1457,932 @@ HRESULT GifDecoder_CreateInstance(REFIID iid, void** ppv)
@@ -1449,3 +1451,932 @@ HRESULT GifDecoder_CreateInstance(REFIID iid, void** ppv)
return ret;
}
@@ -400,7 +400,7 @@ index ddff88b..b5c56aa 100644
+ hr = configure_write_source(iface, source, rc, format,
+ This->width, This->height, This->xres, This->yres);
+ if (hr == S_OK)
+ hr = write_source(iface, source, rc, format, 8, This->width, This->height);
+ hr = write_source(iface, source, rc, format, 8, FALSE /* FIXME */, This->width, This->height);
+ }
+ else
+ hr = WINCODEC_ERR_WRONGSTATE;
@@ -1057,10 +1057,10 @@ index ddff88b..b5c56aa 100644
+ return ret;
+}
diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c
index 10a6c03..ab249b0 100644
index d215e3080..5d317768e 100644
--- a/dlls/windowscodecs/regsvr.c
+++ b/dlls/windowscodecs/regsvr.c
@@ -1391,6 +1391,16 @@ static struct regsvr_encoder const encoder_list[] = {
@@ -1404,6 +1404,16 @@ static struct regsvr_encoder const encoder_list[] = {
".bmp,.dib,.rle",
bmp_encode_formats
},
@@ -1078,10 +1078,10 @@ index 10a6c03..ab249b0 100644
"The Wine Project",
"JPEG Encoder",
diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h
index a8af0d6..b60db8c 100644
index 7686e8071..3e29b3a06 100644
--- a/dlls/windowscodecs/wincodecs_private.h
+++ b/dlls/windowscodecs/wincodecs_private.h
@@ -81,6 +81,7 @@ extern HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN
@@ -143,6 +143,7 @@ extern HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN
extern HRESULT BmpEncoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN;
extern HRESULT DibDecoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN;
extern HRESULT GifDecoder_CreateInstance(REFIID riid, void** ppv) DECLSPEC_HIDDEN;
@@ -1090,5 +1090,5 @@ index a8af0d6..b60db8c 100644
extern HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN;
extern HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN;
--
2.9.0
2.25.1