Rebase against 6e30b042e17b4a62f48ca29f26cf9e62c7fd077a.

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

@@ -1,4 +1,4 @@
-From 8e79e9494a7d4c9173066772b09afa26e643ef33 Mon Sep 17 00:00:00 2001
+From 863dce444080b590bef8a9f31e38fc69aa18b29a 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 49041bb..8c253cd 100644
+index 082a693..91fcf0f 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
 @@ -222,6 +222,8 @@
@@ -18,9 +18,9 @@ index 49041bb..8c253cd 100644
  
 +@ cdecl wined3d_strictdrawing_set(long)
 +
- @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr)
  @ cdecl wined3d_surface_get_parent(ptr)
  @ cdecl wined3d_surface_get_pitch(ptr)
+ @ cdecl wined3d_surface_set_overlay_position(ptr long long)
 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 4227226984e3726aba1b0570db87679776842c5a Mon Sep 17 00:00:00 2001
+From d87fa0b16491e8ec3b38fbe9b43c6f91adceee02 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 f1ba858..a6fbceb 100644
+index d6358f8..f9862df 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 f1ba858..a6fbceb 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 2a36619..e6c6258 100644
+index 57925a6..90c8847 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,11 +62,11 @@ index 2a36619..e6c6258 100644
  {
      unsigned int alignment;
 diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index 86d03f0..c07e0ca 100644
+index 082a693..5eb4e89 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
-@@ -225,6 +225,7 @@
- @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr)
+@@ -224,6 +224,7 @@
+ 
  @ cdecl wined3d_surface_get_parent(ptr)
  @ cdecl wined3d_surface_get_pitch(ptr)
 +@ cdecl wined3d_surface_get_resource(ptr)
@@ -74,11 +74,11 @@ index 86d03f0..c07e0ca 100644
  @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr)
  @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr)
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index 8f9d80a..1b13a20 100644
+index 36e34ea..d740737 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
-@@ -2477,6 +2477,7 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock);
- HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y);
+@@ -2476,6 +2476,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);

patches/patchinstall.sh

@@ -51,13 +51,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "c266d373deb417abef4883f59daa5d517b77e76c"
+	echo "6e30b042e17b4a62f48ca29f26cf9e62c7fd077a"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 1.9.3"
+	echo "Wine Staging 1.9.4 (unreleased)"
 	echo "Copyright (C) 2014-2016 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"

staging/VERSION

@@ -1 +1 @@
-Wine Staging 1.9.3
+Wine Staging 1.9.4 (unreleased)