Rebase against 839995d5e9afcbcdcd084eac3a8e6e48a2173eda.

patches/ntoskrnl-Stubs/0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch

@@ -1,4 +1,4 @@
-From b3df25d2fc4e83fbd018c56c95f627a29a777429 Mon Sep 17 00:00:00 2001
+From 3b325b1efd31f5162d119b7f7cef2edc06f3d627 Mon Sep 17 00:00:00 2001
 From: Austin English <austinenglish@gmail.com>
 Date: Wed, 24 Dec 2014 15:35:23 -0600
 Subject: ntoskrnl.exe: add KeWaitForMultipleObjects stub
@@ -9,18 +9,18 @@ Subject: ntoskrnl.exe: add KeWaitForMultipleObjects stub
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
-index af1626d..807a172 100644
+index 7c35d14..7ffae6e 100644
 --- a/dlls/ntoskrnl.exe/ntoskrnl.c
 +++ b/dlls/ntoskrnl.exe/ntoskrnl.c
-@@ -29,6 +29,7 @@
+@@ -30,6 +30,7 @@
  
  #include "ntstatus.h"
  #define WIN32_NO_STATUS
 +#include "ntdef.h"
  #include "windef.h"
+ #include "winsvc.h"
  #include "winternl.h"
- #include "excpt.h"
-@@ -1480,6 +1481,19 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object,
+@@ -1918,6 +1919,19 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object,
  }
  
  /***********************************************************************
@@ -41,7 +41,7 @@ index af1626d..807a172 100644
   */
  VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject)
 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-index b824250..720ce3e 100644
+index 119d406..059f49c 100644
 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
 +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
 @@ -627,7 +627,7 @@
@@ -54,5 +54,5 @@ index b824250..720ce3e 100644
  @ stdcall KeWaitForSingleObject(ptr long long long ptr)
  @ stub KiBugCheckData
 -- 
-2.2.1
+2.9.0
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "a875e3c6ab075c0603e7bf1430abdba704640602"
+	echo "839995d5e9afcbcdcd084eac3a8e6e48a2173eda"
 }
 
 # Show version information

patches/winex11-XEMBED/0001-winex11-Enable-disable-windows-when-they-are-un-mapped.patch

@@ -1,26 +1,26 @@
-From 90f7d78cf1ee2bf4329b298cb24e0e5145637557 Mon Sep 17 00:00:00 2001
+From e7e33093dfa9f46069dbc7fa53dcdb2330cbdc57 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Fri, 22 Nov 2013 18:54:18 +0100
 Subject: winex11: Enable/disable windows when they are (un)mapped by foreign
  applications
 
 ---
- dlls/winex11.drv/event.c |   17 +++++++++++++++++
+ dlls/winex11.drv/event.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
-index 767c003..f39b922 100644
+index d81ff2e..c8ce8ad 100644
 --- a/dlls/winex11.drv/event.c
 +++ b/dlls/winex11.drv/event.c
-@@ -922,6 +922,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev )
- static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
+@@ -929,6 +929,7 @@ static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev )
+ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
  {
      struct x11drv_win_data *data;
 +    BOOL is_embedded;
  
      if (event->xany.window == x11drv_thread_data()->clip_window)
      {
-@@ -936,7 +937,12 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
+@@ -943,7 +944,12 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
          if (hwndFocus && IsChild( hwnd, hwndFocus ))
              set_input_focus( data );
      }
@@ -30,12 +30,12 @@ index 767c003..f39b922 100644
 +
 +    if (is_embedded)
 +        EnableWindow( hwnd, TRUE );
+     return TRUE;
  }
  
- 
-@@ -945,8 +951,19 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
+@@ -953,8 +959,19 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
   */
- static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event )
+ static BOOL X11DRV_UnmapNotify( HWND hwnd, XEvent *event )
  {
 +    struct x11drv_win_data *data;
 +    BOOL is_embedded;
@@ -43,16 +43,16 @@ index 767c003..f39b922 100644
      if (event->xany.window == x11drv_thread_data()->clip_window)
          clipping_cursor = FALSE;
 +
-+    if (!(data = get_win_data( hwnd ))) return;
++    if (!(data = get_win_data( hwnd ))) return FALSE;
 +
 +    is_embedded = data->embedded;
 +    release_win_data( data );
 +
 +    if (is_embedded)
 +        EnableWindow( hwnd, FALSE );
+     return TRUE;
  }
  
- 
 -- 
-1.7.9.5
+2.9.0