Rebase against 849163b1ed5e2586ee9f391e7a8b03f054bb620f.

patches/gdiplus-Grayscale_PNG/0002-gdiplus-tests-Add-a-test-for-loading-PNG-grayscale-i.patch

@@ -1,4 +1,4 @@
-From 1184612f4eca0f6a09150a42f8b56dce76ffd6b1 Mon Sep 17 00:00:00 2001
+From e567377f438a70ee3c69aed93ac7197ad867d7ad Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 3 Jun 2016 13:20:14 +0800
 Subject: gdiplus/tests: Add a test for loading PNG grayscale images.
@@ -8,7 +8,7 @@ Subject: gdiplus/tests: Add a test for loading PNG grayscale images.
  1 file changed, 59 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
-index 6a51714..0c28c9e 100644
+index 551d276..ab39dfe 100644
 --- a/dlls/gdiplus/tests/image.c
 +++ b/dlls/gdiplus/tests/image.c
 @@ -2,7 +2,7 @@
@@ -20,8 +20,8 @@ index 6a51714..0c28c9e 100644
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
-@@ -4725,6 +4725,63 @@ static void test_createeffect(void)
-     }
+@@ -4790,6 +4790,63 @@ static void test_getadjustedpalette(void)
+     GdipDisposeImageAttributes(imageattributes);
  }
  
 +/* RGB 24 bpp 1x1 pixel PNG image */
@@ -84,7 +84,7 @@ index 6a51714..0c28c9e 100644
  START_TEST(image)
  {
      struct GdiplusStartupInput gdiplusStartupInput;
-@@ -4737,6 +4794,7 @@ START_TEST(image)
+@@ -4802,6 +4859,7 @@ START_TEST(image)
  
      GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
  

patches/mshtml-Wine_Gecko_2.47/definition

@@ -1 +0,0 @@
-Fixes: Update Wine Gecko to version 2.47-beta1

patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch

@@ -79,7 +79,7 @@ index bb390e2..d766249 100644
 @@ -3216,6 +3216,8 @@ WINE_CONFIG_TEST(dlls/ntdll/tests)
  WINE_CONFIG_DLL(ntdsapi,,[implib])
  WINE_CONFIG_TEST(dlls/ntdsapi/tests)
- WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
+ WINE_CONFIG_DLL(ntoskrnl.exe,,[implib],[ntoskrnl])
 +WINE_CONFIG_TEST(dlls/ntoskrnl.exe/tests)
 +WINE_CONFIG_RESOURCE(dlls/ntoskrnl.exe/tests/driver.sys)
  WINE_CONFIG_DLL(ntprint)

patches/patchinstall.sh

@@ -51,13 +51,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "50917e283629cbe994f2d7f091ed46ac8b25cda6"
+	echo "849163b1ed5e2586ee9f391e7a8b03f054bb620f"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 1.9.12"
+	echo "Wine Staging 1.9.13 (unreleased)"
 	echo "Copyright (C) 2014-2016 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
@@ -193,7 +193,6 @@ patch_enable_all ()
 	enable_mpr_WNetGetUniversalNameW="$1"
 	enable_mscoree_CorValidateImage="$1"
 	enable_mshtml_HTMLLocation_put_hash="$1"
-	enable_mshtml_Wine_Gecko_2_47="$1"
 	enable_msidb_Implementation="$1"
 	enable_msvcr120__SetWinRTOutOfMemoryExceptionCallback="$1"
 	enable_msvcrt_Math_Precision="$1"
@@ -762,9 +761,6 @@ patch_enable ()
 		mshtml-HTMLLocation_put_hash)
 			enable_mshtml_HTMLLocation_put_hash="$2"
 			;;
-		mshtml-Wine_Gecko_2.47)
-			enable_mshtml_Wine_Gecko_2_47="$2"
-			;;
 		msidb-Implementation)
 			enable_msidb_Implementation="$2"
 			;;
@@ -4577,21 +4573,6 @@ if test "$enable_mshtml_HTMLLocation_put_hash" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset mshtml-Wine_Gecko_2.47
-# |
-# | Modified files:
-# |   *	dlls/appwiz.cpl/addons.c, dlls/mshtml/editor.c, dlls/mshtml/htmlcurstyle.c, dlls/mshtml/htmldoc.c,
-# | 	dlls/mshtml/htmlframebase.c, dlls/mshtml/htmlwindow.c, dlls/mshtml/mshtml_private.h, dlls/mshtml/mutation.c,
-# | 	dlls/mshtml/npplugin.c, dlls/mshtml/nsembed.c, dlls/mshtml/nsiface.idl, dlls/mshtml/nsio.c, dlls/mshtml/nsservice.c,
-# | 	dlls/mshtml/olecmd.c
-# |
-if test "$enable_mshtml_Wine_Gecko_2_47" -eq 1; then
-	patch_apply mshtml-Wine_Gecko_2.47/0001-mshtml-Wine-Gecko-2.47-beta1-release.patch
-	(
-		echo '+    { "Jacek Caban", "mshtml: Wine Gecko 2.47-beta1 release.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset msidb-Implementation
 # |
 # | Modified files:

staging/VERSION

@@ -1 +1 @@
-Wine Staging 1.9.12
+Wine Staging 1.9.13 (unreleased)