Rebase against 448344c5e443b35c06bc0cc4f2e8ee9b7968008f

patches/patchinstall.sh

@@ -52,13 +52,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "c5023aea7e97213159b754a168b7abddc89664bb"
+	echo "448344c5e443b35c06bc0cc4f2e8ee9b7968008f"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 3.6"
+	echo "Wine Staging 3.6 (Unreleased)"
 	echo "Copyright (C) 2014-2018 the Wine Staging project authors."
 	echo "Copyright (C) 2018 Alistair Leslie-Hughes"
 	echo ""

patches/riched20-Class_Tests/0001-riched20-tests-Add-a-test-to-see-what-richedit-class.patch

@@ -1,19 +1,19 @@
-From c36ca805fa81799134509231bdbc028dcd1c994e Mon Sep 17 00:00:00 2001
+From 25c7cb641ea4e2c051e58190ed6b094ac84861d9 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 13 May 2016 16:05:13 +0800
-Subject: riched20/tests: Add a test to see what richedit class flavours should
- be available.
+Subject: [PATCH] riched20/tests: Add a test to see what richedit class
+ flavours should be available.
 
 ---
  dlls/riched20/tests/editor.c | 33 +++++++++++++++++++++++++++++++++
  1 file changed, 33 insertions(+)
 
 diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
-index 351695a..1dfcce2 100644
+index 2a6907b..6712ab1 100644
 --- a/dlls/riched20/tests/editor.c
 +++ b/dlls/riched20/tests/editor.c
-@@ -8408,6 +8408,38 @@ static void test_eop_char_fmt(void)
-     DestroyWindow( edit );
+@@ -8889,6 +8889,38 @@ static void test_EM_SELECTIONTYPE(void)
+     DestroyWindow(hwnd);
  }
  
 +static void test_window_classes(void)
@@ -51,7 +51,7 @@ index 351695a..1dfcce2 100644
  START_TEST( editor )
  {
    BOOL ret;
-@@ -8417,6 +8449,7 @@ START_TEST( editor )
+@@ -8898,6 +8930,7 @@ START_TEST( editor )
    ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError());
    is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE);
  
@@ -60,5 +60,5 @@ index 351695a..1dfcce2 100644
    test_EM_FINDTEXT(FALSE);
    test_EM_FINDTEXT(TRUE);
 -- 
-2.9.0
+1.9.1
 

patches/user32-GetAutoRotationState/0001-user32-Add-semi-stub-for-GetAutoRotationState.patch

@@ -1,4 +1,4 @@
-From d0df39ea652f6bd3470eda92e046882f7510be67 Mon Sep 17 00:00:00 2001
+From 1e70ffc87cfb0fc1c287bd1800a0023f673e9874 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 8 Jan 2017 18:22:30 +0100
 Subject: [PATCH] user32: Add semi-stub for GetAutoRotationState.
@@ -9,10 +9,10 @@ Subject: [PATCH] user32: Add semi-stub for GetAutoRotationState.
  2 files changed, 34 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
-index 425acae..53155ae 100644
+index 6a5482b..6f8ebf3 100644
 --- a/dlls/user32/sysparams.c
 +++ b/dlls/user32/sysparams.c
-@@ -3342,8 +3342,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
+@@ -3408,8 +3408,15 @@ BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt )
   */
  BOOL WINAPI GetAutoRotationState( AR_STATE *state )
  {
@@ -31,18 +31,18 @@ index 425acae..53155ae 100644
  }
  
 diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
-index e662517..1efbb15 100644
+index a4247f2..da3a67a 100644
 --- a/dlls/user32/tests/sysparams.c
 +++ b/dlls/user32/tests/sysparams.c
-@@ -52,6 +52,7 @@ static DPI_AWARENESS (WINAPI *pGetAwarenessFromDpiAwarenessContext)(DPI_AWARENES
- static BOOL (WINAPI *pIsValidDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
- static INT (WINAPI *pGetSystemMetricsForDpi)(INT,UINT);
+@@ -55,6 +55,7 @@ static INT (WINAPI *pGetSystemMetricsForDpi)(INT,UINT);
  static BOOL (WINAPI *pSystemParametersInfoForDpi)(UINT,UINT,void*,UINT,UINT);
+ static BOOL (WINAPI *pLogicalToPhysicalPointForPerMonitorDPI)(HWND,POINT*);
+ static BOOL (WINAPI *pPhysicalToLogicalPointForPerMonitorDPI)(HWND,POINT*);
 +static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE);
  
  static BOOL strict;
  static int dpi, real_dpi;
-@@ -3432,6 +3433,28 @@ static void test_window_dpi(void)
+@@ -3570,6 +3571,28 @@ static void test_window_dpi(void)
      pSetThreadDpiAwarenessContext( orig );
  }
  
@@ -71,15 +71,15 @@ index e662517..1efbb15 100644
  START_TEST(sysparams)
  {
      int argc;
-@@ -3458,6 +3481,7 @@ START_TEST(sysparams)
-     pIsValidDpiAwarenessContext = (void*)GetProcAddress(hdll, "IsValidDpiAwarenessContext");
-     pGetSystemMetricsForDpi = (void*)GetProcAddress(hdll, "GetSystemMetricsForDpi");
+@@ -3599,6 +3622,7 @@ START_TEST(sysparams)
      pSystemParametersInfoForDpi = (void*)GetProcAddress(hdll, "SystemParametersInfoForDpi");
+     pLogicalToPhysicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "LogicalToPhysicalPointForPerMonitorDPI");
+     pPhysicalToLogicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "PhysicalToLogicalPointForPerMonitorDPI");
 +    pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState");
  
      hInstance = GetModuleHandleA( NULL );
      hdc = GetDC(0);
-@@ -3479,6 +3503,7 @@ START_TEST(sysparams)
+@@ -3620,6 +3644,7 @@ START_TEST(sysparams)
      test_metrics_for_dpi( 192 );
      test_EnumDisplaySettings( );
      test_GetSysColorBrush( );
@@ -88,5 +88,5 @@ index e662517..1efbb15 100644
      change_counter = 0;
      change_last_param = 0;
 -- 
-2.7.4
+1.9.1
 

staging/VERSION

@@ -1 +1 @@
-Wine Staging 3.6
+Wine Staging 3.6 (Unreleased)