Added patch to ignore garbage after decoding gif lines.

README.md

@@ -39,10 +39,11 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [3]:**
+**Bug fixes and features included in the next upcoming release [4]:**
 
 * Fix check for texture levels in wined3d_device_update_texture ([Wine Bug #38048](https://bugs.winehq.org/show_bug.cgi?id=38048))
 * Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38480](https://bugs.winehq.org/show_bug.cgi?id=38480))
+* Ignore garbage after decoding gif lines ([Wine Bug #32227](https://bugs.winehq.org/show_bug.cgi?id=32227))
 * Support for FileFsFullSizeInformation information class
 
 

debian/changelog

@@ -2,6 +2,7 @@ wine-staging (1.7.42) UNRELEASED; urgency=low
   * Added patch to implement FileFsFullSizeInformation information class.
   * Added patch to update timezone information in wine.inf.
   * Added patch to fix check for texture levels in wined3d_device_update_texture.
+  * Added patch to ignore garbage after decoding gif lines.
   * Removed patch to avoid crash when trying to bind mshtml event scripts to window (fixed upstream).
   * Removed patch for stub of ntdll.WinSqmIsOptedIn (fixed upstream).
   * Removed patch to fix issues with invalid console handles for new processes (accepted upstream). 

patches/patchinstall.sh

@@ -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:

patches/windowscodecs-GIF_Decoder/0001-windowscodecs-Don-t-fail-to-decode-GIF-if-an-image-h.patch

@@ -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
+

patches/windowscodecs-GIF_Decoder/definition

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