Rebase against b65ca133052ed9053e48c571155a764d4d711277.

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

@@ -1,4 +1,4 @@
-From ec2da26fdd7259af7c473698fc6aa15469393e8b Mon Sep 17 00:00:00 2001
+From 4d0e15f41b11c1ae69c3aff6fb17c0539ce43766 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.
@@ -15,10 +15,10 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver.
  create mode 100644 dlls/dxgkrnl.sys/main.c
 
 diff --git a/configure.ac b/configure.ac
-index dcf2d4930..fbc6acda7 100644
+index 27ab432a44a..0a6d1b0639e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3268,6 +3268,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
+@@ -3282,6 +3282,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
  WINE_CONFIG_MAKEFILE(dlls/dxerr9)
  WINE_CONFIG_MAKEFILE(dlls/dxgi)
  WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
@@ -28,7 +28,7 @@ index dcf2d4930..fbc6acda7 100644
  WINE_CONFIG_MAKEFILE(dlls/dxva2/tests)
 diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in
 new file mode 100644
-index 000000000..e18ea70a9
+index 00000000000..50390fbbb1e
 --- /dev/null
 +++ b/dlls/dxgkrnl.sys/Makefile.in
 @@ -0,0 +1,6 @@
@@ -40,7 +40,7 @@ index 000000000..e18ea70a9
 +	main.c
 diff --git a/dlls/dxgkrnl.sys/dxgkrnl.sys.spec b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec
 new file mode 100644
-index 000000000..8487664f8
+index 00000000000..8487664f8a7
 --- /dev/null
 +++ b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec
 @@ -0,0 +1,26 @@
@@ -72,7 +72,7 @@ index 000000000..8487664f8
 +@ stub g_loggerInfo
 diff --git a/dlls/dxgkrnl.sys/main.c b/dlls/dxgkrnl.sys/main.c
 new file mode 100644
-index 000000000..c5639c237
+index 00000000000..c5639c237c8
 --- /dev/null
 +++ b/dlls/dxgkrnl.sys/main.c
 @@ -0,0 +1,39 @@
@@ -116,25 +116,25 @@ index 000000000..c5639c237
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index 4d28a93c3..279271f54 100644
+index e4f3d74886c..9d9e862101b 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2553,6 +2553,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2611,6 +2611,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  10,syswow64,stdole2.tlb
  11,,iexplore.exe
  11,,winetest.exe,-
 +12,,dxgkrnl.sys,-
  12,,fltmgr.sys,-
+ 12,,http.sys,-
  12,,ksecdd.sys,-
- 12,,mountmgr.sys,-
-@@ -2602,6 +2603,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2664,6 +2665,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,,http.sys
  12,,ksecdd.sys
- 12,,mountmgr.sys
 -- 
-2.21.0
+2.26.2
 

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

@@ -1,4 +1,4 @@
-From 7215993b74878cfd57aa7251fde74d18b233ba14 Mon Sep 17 00:00:00 2001
+From c120934a030791fdb858892fe86d278874e5e16a 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.
@@ -15,10 +15,10 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver.
  create mode 100644 dlls/dxgmms1.sys/main.c
 
 diff --git a/configure.ac b/configure.ac
-index fbc6acda7..f8eed3baa 100644
+index 0a6d1b0639e..6966f95ce88 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3269,6 +3269,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
+@@ -3283,6 +3283,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
  WINE_CONFIG_MAKEFILE(dlls/dxgi)
  WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
  WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys)
@@ -28,7 +28,7 @@ index fbc6acda7..f8eed3baa 100644
  WINE_CONFIG_MAKEFILE(dlls/dxva2/tests)
 diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in
 new file mode 100644
-index 000000000..affb9ce95
+index 00000000000..3ecc3ee5a3e
 --- /dev/null
 +++ b/dlls/dxgmms1.sys/Makefile.in
 @@ -0,0 +1,6 @@
@@ -40,7 +40,7 @@ index 000000000..affb9ce95
 +	main.c
 diff --git a/dlls/dxgmms1.sys/dxgmms1.sys.spec b/dlls/dxgmms1.sys/dxgmms1.sys.spec
 new file mode 100644
-index 000000000..124b0bf94
+index 00000000000..124b0bf944d
 --- /dev/null
 +++ b/dlls/dxgmms1.sys/dxgmms1.sys.spec
 @@ -0,0 +1,2 @@
@@ -48,7 +48,7 @@ index 000000000..124b0bf94
 +@ stub VidSchInterface
 diff --git a/dlls/dxgmms1.sys/main.c b/dlls/dxgmms1.sys/main.c
 new file mode 100644
-index 000000000..686493d32
+index 00000000000..686493d3296
 --- /dev/null
 +++ b/dlls/dxgmms1.sys/main.c
 @@ -0,0 +1,39 @@
@@ -92,25 +92,25 @@ index 000000000..686493d32
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index 279271f54..29afb4182 100644
+index 9d9e862101b..180c3be2a04 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2612,6 +2612,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,iexplore.exe
  11,,winetest.exe,-
  12,,dxgkrnl.sys,-
 +12,,dxgmms1.sys,-
  12,,fltmgr.sys,-
+ 12,,http.sys,-
  12,,ksecdd.sys,-
- 12,,mountmgr.sys,-
-@@ -2604,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2666,6 +2667,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,,http.sys
  12,,ksecdd.sys
- 12,,mountmgr.sys
 -- 
-2.21.0
+2.26.2