From b4c665d65afc0c824582402a89be43d0507143da Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 27 Feb 2015 01:18:50 +0100 Subject: [PATCH] Added patch for stub of gdiplus.GdipCreateEffect. --- README.md | 3 +- debian/changelog | 1 + ...diplus-Add-stub-for-GdipCreateEffect.patch | 44 +++++++++++++++++++ patches/gdiplus-GdipCreateEffect/definition | 1 + patches/patchinstall.sh | 43 +++++++++++++----- 5 files changed, 79 insertions(+), 13 deletions(-) create mode 100644 patches/gdiplus-GdipCreateEffect/0001-gdiplus-Add-stub-for-GdipCreateEffect.patch create mode 100644 patches/gdiplus-GdipCreateEffect/definition diff --git a/README.md b/README.md index cadb0dea..9ef821e5 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,9 @@ Wine. All those differences are also documented on the Included bug fixes and improvements =================================== -**Bugfixes and features included in the next upcoming release [5]:** +**Bugfixes and features included in the next upcoming release [6]:** +* Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163)) * Add support for CopyFileEx progress callback ([Wine Bug #22692](https://bugs.winehq.org/show_bug.cgi?id=22692)) * Allow to cancel a file operation via progress callback ([Wine Bug #22690](https://bugs.winehq.org/show_bug.cgi?id=22690)) * Fallback to global key state for threads without a queue ([Wine Bug #27238](https://bugs.winehq.org/show_bug.cgi?id=27238)) diff --git a/debian/changelog b/debian/changelog index acd413ab..9a4f6040 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ wine-staging (1.7.38) UNRELEASED; urgency=low * Added patch to implement SetFileInformationByHandle. * Added patch for CopyFileEx progress callback and cancellation support. * Added first set of patches for job objects (by Andrew Cook). + * Added patch for stub of gdiplus.GdipCreateEffect. * Removed patch to properly call DriverUnload when unloading device drivers (accepted upstream). * Removed patch to allow Accept-Encoding for HTTP/1.0 in wininet (accepted upstream). * Removed patch to declare pDirectInputCreateEx in a MSVC compatible way (accepted upstream). diff --git a/patches/gdiplus-GdipCreateEffect/0001-gdiplus-Add-stub-for-GdipCreateEffect.patch b/patches/gdiplus-GdipCreateEffect/0001-gdiplus-Add-stub-for-GdipCreateEffect.patch new file mode 100644 index 00000000..789b981b --- /dev/null +++ b/patches/gdiplus-GdipCreateEffect/0001-gdiplus-Add-stub-for-GdipCreateEffect.patch @@ -0,0 +1,44 @@ +From d3a2292073b81e25e2c1571cea63022c4c396a67 Mon Sep 17 00:00:00 2001 +From: David Hedberg +Date: Fri, 27 Feb 2015 01:17:01 +0100 +Subject: gdiplus: Add stub for GdipCreateEffect. + +--- + dlls/gdiplus/gdiplus.spec | 2 +- + dlls/gdiplus/image.c | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec +index cee3ea6..bbe6c4c 100644 +--- a/dlls/gdiplus/gdiplus.spec ++++ b/dlls/gdiplus/gdiplus.spec +@@ -610,7 +610,7 @@ + 610 stdcall GdipFindFirstImageItem(ptr ptr) + 611 stub GdipFindNextImageItem + 612 stdcall GdipGetImageItemData(ptr ptr) +-613 stub GdipCreateEffect ++613 stdcall GdipCreateEffect(ptr ptr) + 614 stdcall GdipDeleteEffect(ptr) + 615 stub GdipGetEffectParameterSize + 616 stub GdipGetEffectParameters +diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c +index e6921f5..d3f22dc 100644 +--- a/dlls/gdiplus/image.c ++++ b/dlls/gdiplus/image.c +@@ -137,6 +137,13 @@ static INT ipicture_pixel_width(IPicture *pic) + return x; + } + ++GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect) ++{ ++ FIXME("(%s, %p): stub\n", debugstr_guid(&guid), effect); ++ *effect = NULL; ++ return NotImplemented; ++} ++ + GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap* bitmap, CGpEffect* effect, + RECT* roi, BOOL useAuxData, VOID** auxData, INT* auxDataSize) + { +-- +2.3.0 + diff --git a/patches/gdiplus-GdipCreateEffect/definition b/patches/gdiplus-GdipCreateEffect/definition new file mode 100644 index 00000000..0ffc5758 --- /dev/null +++ b/patches/gdiplus-GdipCreateEffect/definition @@ -0,0 +1 @@ +Fixes: [32163] Add stub for gdiplus.GdipCreateEffect diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 415f0aa3..254404f5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -91,6 +91,7 @@ patch_enable_all () enable_fonts_Missing_Fonts="$1" enable_gdi32_MaxPixelFormats="$1" enable_gdi32_MultiMonitor="$1" + enable_gdiplus_GdipCreateEffect="$1" enable_gdiplus_GdipCreateRegionRgnData="$1" enable_imagehlp_BindImageEx="$1" enable_include_Winetest="$1" @@ -305,6 +306,9 @@ patch_enable () gdi32-MultiMonitor) enable_gdi32_MultiMonitor="$2" ;; + gdiplus-GdipCreateEffect) + enable_gdiplus_GdipCreateEffect="$2" + ;; gdiplus-GdipCreateRegionRgnData) enable_gdiplus_GdipCreateRegionRgnData="$2" ;; @@ -1527,6 +1531,18 @@ 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: @@ -1547,18 +1563,6 @@ 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: @@ -2079,6 +2083,21 @@ if test "$enable_gdi32_MultiMonitor" -eq 1; then ) >> "$patchlist" fi +# Patchset gdiplus-GdipCreateEffect +# | +# | This patchset fixes the following Wine bugs: +# | * [#32163] Add stub for gdiplus.GdipCreateEffect +# | +# | Modified files: +# | * dlls/gdiplus/gdiplus.spec, dlls/gdiplus/image.c +# | +if test "$enable_gdiplus_GdipCreateEffect" -eq 1; then + patch_apply gdiplus-GdipCreateEffect/0001-gdiplus-Add-stub-for-GdipCreateEffect.patch + ( + echo '+ { "David Hedberg", "gdiplus: Add stub for GdipCreateEffect.", 1 },'; + ) >> "$patchlist" +fi + # Patchset gdiplus-GdipCreateRegionRgnData # | # | This patchset fixes the following Wine bugs: