Rebase against 64b96eec7d0aea470f897a3ed0ac9e1b3a680cc5.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "2e9a72759cc8508d1ddb7be5d813fdd7bc64e6a5"
+	echo "64b96eec7d0aea470f897a3ed0ac9e1b3a680cc5"
 }
 
 # Show version information
@@ -154,7 +154,6 @@ patch_enable_all ()
 	enable_ntdll_Syscall_Emulation="$1"
 	enable_ntdll_WRITECOPY="$1"
 	enable_ntdll_ext4_case_folder="$1"
-	enable_ntoskrnl_Stubs="$1"
 	enable_nvapi_Stub_DLL="$1"
 	enable_nvcuda_CUDA_Support="$1"
 	enable_nvcuvid_CUDA_Video_Support="$1"
@@ -489,9 +488,6 @@ patch_enable ()
 		ntdll-ext4-case-folder)
 			enable_ntdll_ext4_case_folder="$2"
 			;;
-		ntoskrnl-Stubs)
-			enable_ntoskrnl_Stubs="$2"
-			;;
 		nvapi-Stub_DLL)
 			enable_nvapi_Stub_DLL="$2"
 			;;
@@ -1309,13 +1305,6 @@ if test "$enable_fltmgr_sys_FltBuildDefaultSecurityDescriptor" -eq 1; then
 	enable_winedevice_Default_Drivers=1
 fi
 
-if test "$enable_winedevice_Default_Drivers" -eq 1; then
-	if test "$enable_ntoskrnl_Stubs" -gt 1; then
-		abort "Patchset ntoskrnl-Stubs disabled, but winedevice-Default_Drivers depends on that."
-	fi
-	enable_ntoskrnl_Stubs=1
-fi
-
 if test "$enable_eventfd_synchronization" -eq 1; then
 	if test "$enable_ntdll_Junction_Points" -gt 1; then
 		abort "Patchset ntdll-Junction_Points disabled, but eventfd_synchronization depends on that."
@@ -1967,21 +1956,8 @@ if test "$enable_explorer_Video_Registry_Key" -eq 1; then
 	patch_apply explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch
 fi
 
-# Patchset ntoskrnl-Stubs
-# |
-# | Modified files:
-# |   *	dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-# |
-if test "$enable_ntoskrnl_Stubs" -eq 1; then
-	patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch
-	patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-IoGetDeviceAttachmentBaseRef-stub.patch
-fi
-
 # Patchset winedevice-Default_Drivers
 # |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	ntoskrnl-Stubs
-# |
 # | Modified files:
 # |   *	configure.ac, dlls/dxgkrnl.sys/Makefile.in, dlls/dxgkrnl.sys/dxgkrnl.sys.spec, dlls/dxgkrnl.sys/main.c,
 # | 	dlls/dxgmms1.sys/Makefile.in, dlls/dxgmms1.sys/dxgmms1.sys.spec, dlls/dxgmms1.sys/main.c,
@@ -1998,7 +1974,7 @@ fi
 # Patchset fltmgr.sys-FltBuildDefaultSecurityDescriptor
 # |
 # | This patchset has the following (direct or indirect) dependencies:
-# |   *	ntoskrnl-Stubs, winedevice-Default_Drivers
+# |   *	winedevice-Default_Drivers
 # |
 # | This patchset fixes the following Wine bugs:
 # |   *	[#49089] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor

patches/winex11-UpdateLayeredWindow/0001-winex11-Fix-alpha-blending-in-X11DRV_UpdateLayeredWi.patch

@@ -1,4 +1,4 @@
-From 0c3858177e20be4689445e8f71b705a5792baa93 Mon Sep 17 00:00:00 2001
+From bfc1aa75005a50ac1910e727efd7ba385b653c07 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 24 Jan 2017 12:37:46 +0100
 Subject: [PATCH] winex11: Fix alpha blending in X11DRV_UpdateLayeredWindow.
@@ -9,10 +9,10 @@ Based on a patch by Dmitry Timoshkov.
  1 file changed, 13 insertions(+), 14 deletions(-)
 
 diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
-index 8b191ca23ed..37c46e6413b 100644
+index 3b0ccd8d22a..2ae27dacd2a 100644
 --- a/dlls/winex11.drv/window.c
 +++ b/dlls/winex11.drv/window.c
-@@ -440,14 +440,11 @@ static void sync_window_region( struct x11drv_win_data *data, HRGN win_region )
+@@ -415,14 +415,11 @@ static void sync_window_region( struct x11drv_win_data *data, HRGN win_region )
  
  
  /***********************************************************************
@@ -30,7 +30,7 @@ index 8b191ca23ed..37c46e6413b 100644
  
      if (opacity == 0xffffffff)
          XDeleteProperty( display, win, x11drv_atom(_NET_WM_WINDOW_OPACITY) );
-@@ -1620,7 +1617,7 @@ static void create_whole_window( struct x11drv_win_data *data )
+@@ -1603,7 +1600,7 @@ static void create_whole_window( struct x11drv_win_data *data )
  
      /* set the window opacity */
      if (!NtUserGetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0;
@@ -39,7 +39,7 @@ index 8b191ca23ed..37c46e6413b 100644
  
      XFlush( data->display );  /* make sure the window exists before we start painting to it */
  
-@@ -1752,7 +1749,7 @@ void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style )
+@@ -1735,7 +1732,7 @@ void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style )
      {
          data->layered = FALSE;
          set_window_visual( data, &default_visual, FALSE );
@@ -48,7 +48,7 @@ index 8b191ca23ed..37c46e6413b 100644
          if (data->surface) set_surface_color_key( data->surface, CLR_INVALID );
      }
  done:
-@@ -2679,7 +2676,7 @@ void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWO
+@@ -2662,7 +2659,7 @@ void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWO
          set_window_visual( data, &default_visual, FALSE );
  
          if (data->whole_window)
@@ -57,7 +57,7 @@ index 8b191ca23ed..37c46e6413b 100644
          if (data->surface)
              set_surface_color_key( data->surface, (flags & LWA_COLORKEY) ? key : CLR_INVALID );
  
-@@ -2703,7 +2700,7 @@ void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWO
+@@ -2686,7 +2683,7 @@ void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWO
          Window win = X11DRV_get_whole_window( hwnd );
          if (win)
          {
@@ -66,7 +66,7 @@ index 8b191ca23ed..37c46e6413b 100644
              if (flags & LWA_COLORKEY)
                  FIXME( "LWA_COLORKEY not supported on foreign process window %p\n", hwnd );
          }
-@@ -2719,7 +2716,6 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
+@@ -2702,7 +2699,6 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
  {
      struct window_surface *surface;
      struct x11drv_win_data *data;
@@ -74,7 +74,7 @@ index 8b191ca23ed..37c46e6413b 100644
      COLORREF color_key = (info->dwFlags & ULW_COLORKEY) ? info->crKey : CLR_INVALID;
      char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
      BITMAPINFO *bmi = (BITMAPINFO *)buffer;
-@@ -2747,6 +2743,10 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
+@@ -2730,6 +2726,10 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
      }
      else set_surface_color_key( surface, color_key );
  
@@ -85,9 +85,9 @@ index 8b191ca23ed..37c46e6413b 100644
      if (surface) window_surface_add_ref( surface );
      mapped = data->mapped;
      release_win_data( data );
-@@ -2781,16 +2781,15 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
+@@ -2764,16 +2764,15 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
      {
-         IntersectRect( &rect, &rect, info->prcDirty );
+         intersect_rect( &rect, &rect, info->prcDirty );
          memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage );
 -        NtGdiPatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS );
      }
@@ -105,5 +105,5 @@ index 8b191ca23ed..37c46e6413b 100644
      {
          memcpy( dst_bits, src_bits, bmi->bmiHeader.biSizeImage );
 -- 
-2.35.1
+2.34.1
 

staging/upstream-commit

@@ -1 +1 @@
-2e9a72759cc8508d1ddb7be5d813fdd7bc64e6a5
+64b96eec7d0aea470f897a3ed0ac9e1b3a680cc5