Rebase against 056c9df854817670dc4fb9c095cba29c99089ac8.

patches/ntdll-NtQueryVirtualMemory/0005-ntdll-tests-Add-test-to-ensure-section-name-is-full-.patch

@@ -1,4 +1,4 @@
-From e088b03ac3d6419ba2c6b825b5b14de8527acbe4 Mon Sep 17 00:00:00 2001
+From 951b3002db9c9277a01d965da4d0996a328ec9db Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 28 May 2017 10:33:40 +0200
 Subject: [PATCH] ntdll/tests: Add test to ensure section name is full path.
@@ -8,7 +8,7 @@ Subject: [PATCH] ntdll/tests: Add test to ensure section name is full path.
  1 file changed, 9 insertions(+)
 
 diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
-index e335e758175..66c5e81830d 100644
+index 766ca086c76..c953740d050 100644
 --- a/dlls/ntdll/tests/info.c
 +++ b/dlls/ntdll/tests/info.c
 @@ -22,6 +22,7 @@
@@ -17,17 +17,17 @@ index e335e758175..66c5e81830d 100644
  
 +static NTSTATUS (WINAPI * pRtlDowncaseUnicodeString)(UNICODE_STRING *, const UNICODE_STRING *, BOOLEAN);
  static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG);
+ static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG);
  static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG);
- static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*);
-@@ -75,6 +76,7 @@ static BOOL InitFunctionPtrs(void)
+@@ -76,6 +77,7 @@ static BOOL InitFunctionPtrs(void)
          return FALSE;
      }
  
 +    NTDLL_GET_PROC(RtlDowncaseUnicodeString);
      NTDLL_GET_PROC(NtQuerySystemInformation);
+     NTDLL_GET_PROC(NtSetSystemInformation);
      NTDLL_GET_PROC(RtlGetNativeSystemInformation);
-     NTDLL_GET_PROC(NtPowerInformation);
-@@ -2175,6 +2177,7 @@ static void test_queryvirtualmemory(void)
+@@ -2211,6 +2213,7 @@ static void test_queryvirtualmemory(void)
  {
      NTSTATUS status;
      SIZE_T readcount;
@@ -35,7 +35,7 @@ index e335e758175..66c5e81830d 100644
      static const char teststring[] = "test string";
      static char datatestbuf[42] = "abc";
      static char rwtestbuf[42];
-@@ -2184,6 +2187,8 @@ static void test_queryvirtualmemory(void)
+@@ -2220,6 +2223,8 @@ static void test_queryvirtualmemory(void)
      void *user_shared_data = (void *)0x7ffe0000;
      char buffer_name[sizeof(MEMORY_SECTION_NAME) + MAX_PATH * sizeof(WCHAR)];
      MEMORY_SECTION_NAME *msn = (MEMORY_SECTION_NAME *)buffer_name;
@@ -44,7 +44,7 @@ index e335e758175..66c5e81830d 100644
  
      module = GetModuleHandleA( "ntdll.dll" );
      trace("Check flags of the PE header of NTDLL.DLL at %p\n", module);
-@@ -2302,6 +2307,10 @@ static void test_queryvirtualmemory(void)
+@@ -2337,6 +2342,10 @@ static void test_queryvirtualmemory(void)
      ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
      ok( readcount > 0, "Expected readcount to be > 0\n");
      trace ("Section Name: %s\n", wine_dbgstr_w(msn->SectionFileName.Buffer));

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "b65ca133052ed9053e48c571155a764d4d711277"
+	echo "056c9df854817670dc4fb9c095cba29c99089ac8"
 }
 
 # Show version information

patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch

@@ -1,4 +1,4 @@
-From 4d0e15f41b11c1ae69c3aff6fb17c0539ce43766 Mon Sep 17 00:00:00 2001
+From 547a512a92e719ea5dc1c812e4505680c006b2a0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:41:02 +0200
 Subject: [PATCH] dxgkrnl.sys: Add stub driver.
@@ -116,7 +116,7 @@ index 00000000000..c5639c237c8
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index e4f3d74886c..9d9e862101b 100644
+index 0a43cc779cb..f524f917243 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
 @@ -2611,6 +2611,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -125,16 +125,16 @@ index e4f3d74886c..9d9e862101b 100644
  11,,winetest.exe,-
 +12,,dxgkrnl.sys,-
  12,,fltmgr.sys,-
+ 12,,hidclass.sys,-
  12,,http.sys,-
- 12,,ksecdd.sys,-
-@@ -2664,6 +2665,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2667,6 +2668,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,iexplore.exe
  11,,notepad.exe
  11,,winetest.exe,-
 +12,,dxgkrnl.sys
  12,,fltmgr.sys
+ 12,,hidclass.sys
  12,,http.sys
- 12,,ksecdd.sys
 -- 
 2.26.2
 

patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch

@@ -1,4 +1,4 @@
-From c120934a030791fdb858892fe86d278874e5e16a Mon Sep 17 00:00:00 2001
+From 747017a3787d4ad68f26b1047cc097afe53133be Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:42:32 +0200
 Subject: [PATCH] dxgmms1.sys: Add stub driver.
@@ -92,7 +92,7 @@ index 00000000000..686493d3296
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index 9d9e862101b..180c3be2a04 100644
+index f524f917243..c62a360e1c1 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
 @@ -2612,6 +2612,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -101,16 +101,16 @@ index 9d9e862101b..180c3be2a04 100644
  12,,dxgkrnl.sys,-
 +12,,dxgmms1.sys,-
  12,,fltmgr.sys,-
+ 12,,hidclass.sys,-
  12,,http.sys,-
- 12,,ksecdd.sys,-
-@@ -2666,6 +2667,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2669,6 +2670,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,notepad.exe
  11,,winetest.exe,-
  12,,dxgkrnl.sys
 +12,,dxgmms1.sys
  12,,fltmgr.sys
+ 12,,hidclass.sys
  12,,http.sys
- 12,,ksecdd.sys
 -- 
 2.26.2
 

staging/upstream-commit

@@ -1 +1 @@
-b65ca133052ed9053e48c571155a764d4d711277
+056c9df854817670dc4fb9c095cba29c99089ac8