From 84922f9148cdfa3f2ed261d366975ef41951fa37 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 12 Apr 2016 20:18:38 +0200
Subject: [PATCH] Rebase against 944190bad442f19fba5e0073d284469bd2329652.

---
 ...ow-changing-the-opengl-pixel-format-o.patch | 18 +++++++++---------
 ...-USER_SHARED_DATA-before-accessing-me.patch |  8 ++++----
 patches/patchinstall.sh                        |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch b/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch
index 573a00cf..47cd848e 100644
--- a/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch
+++ b/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch
@@ -1,4 +1,4 @@
-From a408faad22694f7dd6b9e24b3f47ac60fc6f4c4f Mon Sep 17 00:00:00 2001
+From 4d175fa573da8103e76f59f93b528dc9d37c146d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 3 Jun 2015 22:57:21 +0200
 Subject: winex11.drv: Allow changing the opengl pixel format on the desktop
@@ -16,11 +16,11 @@ it seems to be a suitable workaround as it fixes multiple applications.
  2 files changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
-index 5bf7121..0c2df95 100644
+index e6edb00..5a75f3a 100644
 --- a/dlls/d3d9/tests/device.c
 +++ b/dlls/d3d9/tests/device.c
-@@ -10769,6 +10769,21 @@ static void test_check_device_format(void)
-     IDirect3D9_Release(d3d);
+@@ -11049,6 +11049,21 @@ done:
+     DestroyWindow(window);
  }
  
 +static void test_desktop_window(void)
@@ -41,19 +41,19 @@ index 5bf7121..0c2df95 100644
  START_TEST(device)
  {
      WNDCLASSA wc = {0};
-@@ -10883,6 +10898,7 @@ START_TEST(device)
-     test_resource_priority();
+@@ -11164,6 +11179,7 @@ START_TEST(device)
      test_swapchain_parameters();
      test_check_device_format();
+     test_miptree_layout();
 +    test_desktop_window();
  
      UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));
  }
 diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
-index 3d0bd24..845b022 100644
+index ab29ce4..ce87d14 100644
 --- a/dlls/winex11.drv/opengl.c
 +++ b/dlls/winex11.drv/opengl.c
-@@ -1434,12 +1434,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
+@@ -1454,12 +1454,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
  
      TRACE("(%p,%d)\n", hdc, format);
  
@@ -71,5 +71,5 @@ index 3d0bd24..845b022 100644
      if (!fmt)
      {
 -- 
-2.7.0
+2.7.1
 
diff --git a/patches/ntdll-User_Shared_Data/0002-ntoskrnl-Update-USER_SHARED_DATA-before-accessing-me.patch b/patches/ntdll-User_Shared_Data/0002-ntoskrnl-Update-USER_SHARED_DATA-before-accessing-me.patch
index ca1e4e02..72dbd660 100644
--- a/patches/ntdll-User_Shared_Data/0002-ntoskrnl-Update-USER_SHARED_DATA-before-accessing-me.patch
+++ b/patches/ntdll-User_Shared_Data/0002-ntoskrnl-Update-USER_SHARED_DATA-before-accessing-me.patch
@@ -1,4 +1,4 @@
-From af766674c13b728cd090803c41b0a304d7138bc3 Mon Sep 17 00:00:00 2001
+From 98309717f9b844c0640de546337bf51b003310b5 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Fri, 19 Jun 2015 15:57:14 +0200
 Subject: ntoskrnl: Update USER_SHARED_DATA before accessing memory.
@@ -8,11 +8,11 @@ Subject: ntoskrnl: Update USER_SHARED_DATA before accessing memory.
  1 file changed, 5 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
-index 1306d5f..a941428 100644
+index 48f16f2..df5399e 100644
 --- a/dlls/ntoskrnl.exe/instr.c
 +++ b/dlls/ntoskrnl.exe/instr.c
 @@ -495,8 +495,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int);
- #define SIB_INDEX( sib, rex )   (((sib) >> 3) & 7) | (((rex) & REX_R) ? 8 : 0)
+ #define SIB_INDEX( sib, rex )   (((sib) >> 3) & 7) | (((rex) & REX_X) ? 8 : 0)
  #define SIB_BASE( sib, rex )    (((sib) & 7) | (((rex) & REX_B) ? 8 : 0))
  
 -/* keep in sync with dlls/ntdll/thread.c:thread_init */
@@ -51,5 +51,5 @@ index 1306d5f..a941428 100644
              return ExceptionContinueExecution;
          }
 -- 
-2.4.3
+2.7.1
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 45473647..5b61fd13 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "1c201a96c57a68caaf6c976d7f3732738c9d9ac8"
+	echo "944190bad442f19fba5e0073d284469bd2329652"
 }
 
 # Show version information