diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index c487d4ad..224f265e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "976c2aa649a526188afd9c0647869ccc82068341" + echo "1744277bee3c3c77ae657f42d8fac466cfac7924" } # Show version information @@ -322,7 +322,6 @@ patch_enable_all () enable_secur32_Zero_Buffer_Length="$1" enable_server_ClipCursor="$1" enable_server_CreateProcess_ACLs="$1" - enable_server_Debug_Registers="$1" enable_server_Desktop_Refcount="$1" enable_server_FileEndOfFileInformation="$1" enable_server_File_Permissions="$1" @@ -1232,9 +1231,6 @@ patch_enable () server-CreateProcess_ACLs) enable_server_CreateProcess_ACLs="$2" ;; - server-Debug_Registers) - enable_server_Debug_Registers="$2" - ;; server-Desktop_Refcount) enable_server_Desktop_Refcount="$2" ;; @@ -7286,21 +7282,6 @@ if test "$enable_server_ClipCursor" -eq 1; then ) >> "$patchlist" fi -# Patchset server-Debug_Registers -# | -# | This patchset fixes the following Wine bugs: -# | * [#38322] Reset debug registers when creating threads -# | -# | Modified files: -# | * dlls/ntdll/tests/exception.c, server/thread.c -# | -if test "$enable_server_Debug_Registers" -eq 1; then - patch_apply server-Debug_Registers/0001-server-Reset-debug-registers-when-creating-threads.patch - ( - printf '%s\n' '+ { "Michael Müller", "server: Reset debug registers when creating threads.", 1 },'; - ) >> "$patchlist" -fi - # Patchset server-Desktop_Refcount # | # | Modified files: diff --git a/patches/server-Debug_Registers/definition b/patches/server-Debug_Registers/definition index 5d63f861..7ef24d71 100644 --- a/patches/server-Debug_Registers/definition +++ b/patches/server-Debug_Registers/definition @@ -1 +1,2 @@ Fixes: [38322] Reset debug registers when creating threads +Disabled: true diff --git a/patches/windowscodecs-IWICPalette_InitializeFromBitmap/0003-gdiplus-Implement-GdipInitializePalette.-v2.patch b/patches/windowscodecs-IWICPalette_InitializeFromBitmap/0003-gdiplus-Implement-GdipInitializePalette.-v2.patch index 496fe1e1..5321bdc9 100644 --- a/patches/windowscodecs-IWICPalette_InitializeFromBitmap/0003-gdiplus-Implement-GdipInitializePalette.-v2.patch +++ b/patches/windowscodecs-IWICPalette_InitializeFromBitmap/0003-gdiplus-Implement-GdipInitializePalette.-v2.patch @@ -1,4 +1,4 @@ -From d7161fbc798020e8cc462e44660e448ddf8f585d Mon Sep 17 00:00:00 2001 +From 85a020ca141a192baaf44765971e7dad2397978f Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 20 Jul 2016 14:30:09 +0800 Subject: gdiplus: Implement GdipInitializePalette. (v2) @@ -10,7 +10,7 @@ Subject: gdiplus: Implement GdipInitializePalette. (v2) 3 files changed, 110 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec -index 40c19e6..4186b5b 100644 +index 25b27e71eb0..b29e41ebfa0 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -615,7 +615,7 @@ @@ -23,10 +23,10 @@ index 40c19e6..4186b5b 100644 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stdcall GdipBitmapGetHistogram(ptr long long ptr ptr ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c -index 31cdc7c..42d30cf 100644 +index 80ad65f050d..37083f1ac0d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c -@@ -5567,3 +5567,111 @@ GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num +@@ -5606,3 +5606,111 @@ GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num *num_of_entries = 256; return Ok; } @@ -139,11 +139,11 @@ index 31cdc7c..42d30cf 100644 + return InvalidParameter; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h -index 0c40223..0d6d9ea 100644 +index 10d537a0170..cce9941f4f0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h -@@ -264,6 +264,7 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); - GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB); +@@ -266,6 +266,7 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB); + GpStatus WINGDIPAPI GdipGraphicsSetAbort(GpGraphics*,GdiplusAbort*); GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*); GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*); +GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*); @@ -151,5 +151,5 @@ index 0c40223..0d6d9ea 100644 GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics*,REAL,REAL,BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics*,INT,INT,BOOL*); -- -2.9.0 +2.13.1