Updated ddraw-Write_Vtable patchset

patches/ddraw-Write_Vtable/0002-ddraw-Allow-writing-to-vtable-for-surface-and-palett.patch

@@ -0,0 +1,67 @@
+From 4d068ed386b282bc2fc30c13ba0845dfa6f135ef Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 3 Apr 2019 10:36:47 +1100
+Subject: [PATCH] ddraw: Allow writing to vtable for surface and palette
+
+Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46949
+---
+ dlls/ddraw/palette.c | 2 +-
+ dlls/ddraw/surface.c | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c
+index 87aec96443a..7cfd662f2ec 100644
+--- a/dlls/ddraw/palette.c
++++ b/dlls/ddraw/palette.c
+@@ -218,7 +218,7 @@ static HRESULT WINAPI ddraw_palette_GetEntries(IDirectDrawPalette *iface,
+     return hr;
+ }
+ 
+-static const struct IDirectDrawPaletteVtbl ddraw_palette_vtbl =
++static struct IDirectDrawPaletteVtbl ddraw_palette_vtbl =
+ {
+     /*** IUnknown ***/
+     ddraw_palette_QueryInterface,
+diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
+index 8820f211852..9c9cdb358bf 100644
+--- a/dlls/ddraw/surface.c
++++ b/dlls/ddraw/surface.c
+@@ -5399,7 +5399,7 @@ static HRESULT WINAPI d3d_texture1_Load(IDirect3DTexture *iface, IDirect3DTextur
+  * The VTable
+  *****************************************************************************/
+ 
+-static const struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl =
++static struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl =
+ {
+     /* IUnknown */
+     ddraw_surface7_QueryInterface,
+@@ -5458,7 +5458,7 @@ static const struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl =
+     ddraw_surface7_GetLOD,
+ };
+ 
+-static const struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl =
++static struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl =
+ {
+     /* IUnknown */
+     ddraw_surface4_QueryInterface,
+@@ -5512,7 +5512,7 @@ static const struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl =
+     ddraw_surface4_ChangeUniquenessValue,
+ };
+ 
+-static const struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl =
++static struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl =
+ {
+     /* IUnknown */
+     ddraw_surface3_QueryInterface,
+@@ -5560,7 +5560,7 @@ static const struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl =
+     ddraw_surface3_SetSurfaceDesc,
+ };
+ 
+-static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl =
++static struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl =
+ {
+     /* IUnknown */
+     ddraw_surface2_QueryInterface,
+-- 
+2.20.1
+

patches/ddraw-Write_Vtable/definition

@@ -1 +1,2 @@
-Fixes: [39534] Make ddraw1 and ddraw_surface1 vtable as writable
+Fixes: [39534] Make ddraw1 and ddraw_surface1 vtable as writable.
+Fixes: [46949] Make ddraw[2-7] and palette vtable as writable.

patches/patchinstall.sh

@@ -3109,12 +3109,14 @@ fi
 # |   *	[#39534] Make ddraw1 and ddraw_surface1 vtable as writable
 # |
 # | Modified files:
-# |   *	dlls/ddraw/ddraw.c, dlls/ddraw/surface.c
+# |   *	dlls/ddraw/ddraw.c, dlls/ddraw/palette.c, dlls/ddraw/surface.c
 # |
 if test "$enable_ddraw_Write_Vtable" -eq 1; then
 	patch_apply ddraw-Write_Vtable/0001-ddraw-Remove-const-from-ddraw1_vtbl-and-ddraw_surfac.patch
+	patch_apply ddraw-Write_Vtable/0002-ddraw-Allow-writing-to-vtable-for-surface-and-palett.patch
 	(
 		printf '%s\n' '+    { "Michael Müller", "ddraw: Remove const from ddraw1_vtbl and ddraw_surface1_vtbl.", 1 },';
+		printf '%s\n' '+    { "Alistair Leslie-Hughes", "ddraw: Allow writing to vtable for surface and palette.", 1 },';
 	) >> "$patchlist"
 fi
 
@@ -5959,8 +5961,7 @@ fi
 # |   *	[#41369] Add UIAnimation and stubs interfaces
 # |
 # | Modified files:
-# |   *	dlls/uianimation/Makefile.in, dlls/uianimation/main.c, dlls/uianimation/uianimation.spec,
-# | 	dlls/uianimation/uianimation_typelib.idl
+# |   *	dlls/uianimation/Makefile.in, dlls/uianimation/main.c, dlls/uianimation/uianimation_typelib.idl
 # |
 if test "$enable_uianimation_stubs" -eq 1; then
 	patch_apply uianimation-stubs/0002-uianimation-Add-stub-dll.patch