wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

gdiplus: Add missing returns in initialize_decoder_wic.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-03-20 22:39:16 +01:00
parent 483cf18923
commit c5f0106cd6
2 changed files with 61 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
patches/gdiplus-Coverity/0001-gdiplus-Add-missing-returns-in-initialize_decoder_wi.patch Normal file
View File

@ -0,0 +1,33 @@
From 79843a592a6b6d7b68e933d19bc59490f276f510 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 20 Mar 2015 22:34:49 +0100
Subject: gdiplus: Add missing returns in initialize_decoder_wic (Coverity).
---
dlls/gdiplus/image.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 8eb1419..77b9305 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -3425,13 +3425,13 @@ static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICB
TRACE("%p,%s\n", stream, wine_dbgstr_guid(container));
hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory);
- if (FAILED(hr)) hresult_to_status(hr);
+ if (FAILED(hr)) return hresult_to_status(hr);
hr = IWICImagingFactory_CreateDecoder(factory, container, NULL, decoder);
IWICImagingFactory_Release(factory);
- if (FAILED(hr)) hresult_to_status(hr);
+ if (FAILED(hr)) return hresult_to_status(hr);
hr = IWICBitmapDecoder_Initialize(*decoder, stream, WICDecodeMetadataCacheOnLoad);
- if (FAILED(hr)) hresult_to_status(hr);
+ if (FAILED(hr)) return hresult_to_status(hr);
return Ok;
}
--
2.3.2

40
patches/patchinstall.sh
View File

@ -101,6 +101,7 @@ patch_enable_all ()
enable_fonts_Missing_Fonts="$1"
enable_gdi32_MaxPixelFormats="$1"
enable_gdi32_MultiMonitor="$1"
enable_gdiplus_Coverity="$1"
enable_gdiplus_GdipCreateEffect="$1"
enable_gdiplus_GdipCreateRegionRgnData="$1"
enable_imagehlp_BindImageEx="$1"
@ -361,6 +362,9 @@ patch_enable ()
gdi32-MultiMonitor)
enable_gdi32_MultiMonitor="$2"
;;
gdiplus-Coverity)
enable_gdiplus_Coverity="$2"
;;
gdiplus-GdipCreateEffect)
enable_gdiplus_GdipCreateEffect="$2"
;;
@ -1803,18 +1807,6 @@ if test "$enable_dxgi_GetDesc" -eq 1; then
) >> "$patchlist"
fi
# Patchset makedep-PARENTSPEC
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makedep_PARENTSPEC" -eq 1; then
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
(
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
) >> "$patchlist"
fi
# Patchset ntdll-DllRedirects
# |
# | Modified files:
@ -1835,6 +1827,18 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then
) >> "$patchlist"
fi
# Patchset makedep-PARENTSPEC
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makedep_PARENTSPEC" -eq 1; then
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
(
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-CSMT_Helper
# |
# | Modified files:
@ -2403,6 +2407,18 @@ if test "$enable_gdi32_MultiMonitor" -eq 1; then
) >> "$patchlist"
fi
# Patchset gdiplus-Coverity
# |
# | Modified files:
# | * dlls/gdiplus/image.c
# |
if test "$enable_gdiplus_Coverity" -eq 1; then
patch_apply gdiplus-Coverity/0001-gdiplus-Add-missing-returns-in-initialize_decoder_wi.patch
(
echo '+ { "Sebastian Lackner", "gdiplus: Add missing returns in initialize_decoder_wic (Coverity).", 1 },';
) >> "$patchlist"
fi
# Patchset gdiplus-GdipCreateEffect
# |
# | This patchset fixes the following Wine bugs: