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

Added patch to ignore garbage after decoding gif lines.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-04-27 03:59:48 +02:00
parent 157d49eb57
commit 90eb3105b8
5 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
patches/patchinstall.sh
View File

@@ -218,6 +218,7 @@ patch_enable_all ()
enable_wbemprox_Localhost="$1"
enable_wbemprox_Win32_SystemEnclosure="$1"
enable_wiaservc_IEnumWIA_DEV_INFO="$1"
enable_windowscodecs_GIF_Decoder="$1"
enable_windowscodecs_TIFF_Decoder="$1"
enable_wine_inf_Performance="$1"
enable_wine_inf_ProfileList_UserSID="$1"
@@ -729,6 +730,9 @@ patch_enable ()
wiaservc-IEnumWIA_DEV_INFO)
enable_wiaservc_IEnumWIA_DEV_INFO="$2"
;;
windowscodecs-GIF_Decoder)
enable_windowscodecs_GIF_Decoder="$2"
;;
windowscodecs-TIFF_Decoder)
enable_windowscodecs_TIFF_Decoder="$2"
;;
@@ -4538,6 +4542,21 @@ if test "$enable_wiaservc_IEnumWIA_DEV_INFO" -eq 1; then
) >> "$patchlist"
fi
# Patchset windowscodecs-GIF_Decoder
# |
# | This patchset fixes the following Wine bugs:
# | * [#32227] Ignore garbage after decoding gif lines
# |
# | Modified files:
# | * dlls/windowscodecs/ungif.c
# |
if test "$enable_windowscodecs_GIF_Decoder" -eq 1; then
patch_apply windowscodecs-GIF_Decoder/0001-windowscodecs-Don-t-fail-to-decode-GIF-if-an-image-h.patch
(
echo '+ { "Dmitry Timoshkov", "windowscodecs: Don'\''t fail to decode GIF if an image has been already loaded.", 1 },';
) >> "$patchlist"
fi
# Patchset windowscodecs-TIFF_Decoder
# |
# | This patchset fixes the following Wine bugs:

26
patches/windowscodecs-GIF_Decoder/0001-windowscodecs-Don-t-fail-to-decode-GIF-if-an-image-h.patch Normal file
View File

@@ -0,0 +1,26 @@
From ccd2fe7c16c909728d157283d38419af6decfdaf Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 25 Apr 2014 12:13:56 +0900
Subject: windowscodecs: Don't fail to decode GIF if an image has been already
loaded.
---
dlls/windowscodecs/ungif.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c
index 427b32f..e08cb4b 100644
--- a/dlls/windowscodecs/ungif.c
+++ b/dlls/windowscodecs/ungif.c
@@ -491,7 +491,7 @@ DGifGetLine(GifFileType * GifFile,
* image until empty block (size 0) detected. We use GetCodeNext. */
do
if (DGifGetCodeNext(GifFile, &Dummy) == GIF_ERROR)
- return GIF_ERROR;
+ break;
while (Dummy != NULL) ;
}
return GIF_OK;
--
2.3.5

1
patches/windowscodecs-GIF_Decoder/definition Normal file
View File

@@ -0,0 +1 @@
Fixes: [32227] Ignore garbage after decoding gif lines