Rebase against 02008a6f2e373ba4ff06deb8ca124ecd65b57227.

patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch

@@ -1,4 +1,4 @@
-From cb7b1ca0fccd0078815b117deed0380b68e6daaa Mon Sep 17 00:00:00 2001
+From 166196873b1b6149e6f026abefef31b17e087cf4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 20 Jul 2014 22:22:14 +0200
 Subject: wined3d: allow changing strict drawing through an exported function
@@ -9,7 +9,7 @@ Subject: wined3d: allow changing strict drawing through an exported function
  2 files changed, 7 insertions(+)
 
 diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index 4ec8336..a58f4e4 100644
+index 53eb97a..57500f2 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
 @@ -222,6 +222,8 @@
@@ -20,7 +20,7 @@ index 4ec8336..a58f4e4 100644
 +
  @ cdecl wined3d_surface_get_parent(ptr)
  @ cdecl wined3d_surface_get_pitch(ptr)
- @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr)
+ @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr)
 diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
 index 0543d97..78cc3a2 100644
 --- a/dlls/wined3d/wined3d_main.c

patches/ddraw-Revert_Surface_Init/0001-Revert-ddraw-Use-wined3d_texture_get_sub_resource-in.patch

@@ -1,4 +1,4 @@
-From 6d4b1e67c342ec2e570f0c90774edb7c55e3649a Mon Sep 17 00:00:00 2001
+From b3537f3ed8a0d03005241cacc0470adb4337bd30 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 7 Feb 2016 18:52:16 +0100
 Subject: Revert "ddraw: Use wined3d_texture_get_sub_resource() in
@@ -13,7 +13,7 @@ This reverts commit b1709522307a160a7c151f5293095a3c26ab998f.
  4 files changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index e918f25..4888d1d 100644
+index 9b7d76e..acb3667 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
 @@ -1268,7 +1268,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7
@@ -44,7 +44,7 @@ index e918f25..4888d1d 100644
      wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture);
      src_impl->wined3d_texture = texture;
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index e36e353..bdf40ce 100644
+index 53f4d09..b9d5144 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
 @@ -1890,6 +1890,13 @@ void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface)
@@ -62,7 +62,7 @@ index e36e353..bdf40ce 100644
  {
      unsigned int alignment;
 diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index 4ec8336..f60db7c 100644
+index 53eb97a..ab45b94 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
 @@ -224,6 +224,7 @@
@@ -70,21 +70,21 @@ index 4ec8336..f60db7c 100644
  @ cdecl wined3d_surface_get_parent(ptr)
  @ cdecl wined3d_surface_get_pitch(ptr)
 +@ cdecl wined3d_surface_get_resource(ptr)
- @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr)
  @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr)
  
+ @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr)
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index b43b31d..9f41718 100644
+index 40f3d49..f8edfcf 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
-@@ -2476,6 +2476,7 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock);
+@@ -2477,6 +2477,7 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock);
  
  void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface);
  DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);
 +struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface);
- HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect,
-         struct wined3d_surface *dst_surface, const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx);
  HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface,
+         DWORD flags, struct wined3d_surface *ref);
+ 
 -- 
 2.7.0
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "e395d4e766ef60030ee05947ffc9fac0c3fbe84b"
+	echo "02008a6f2e373ba4ff06deb8ca124ecd65b57227"
 }
 
 # Show version information