Rebase against 8ee1e3453e2e714241bcaac0cd75f4af3f828c8d.

2025-09-12 18:50:20 -07:00 · 2019-04-05 18:43:06 -05:00
parent ac1bb98de4
commit 0e7183639d
5 changed files with 87 additions and 100 deletions
--- a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
+++ b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
@@ -1,13 +1,13 @@
-From e9e9334afc2b59ee6ae5cc0a93fb375effca227a Mon Sep 17 00:00:00 2001
+From e62cddcd96e6606e9df2b2bab91c2c0b46e1a72e 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.

 ---
 configure.ac                      |  1 +
- dlls/dxgkrnl.sys/Makefile.in      |  6 ++++++
- dlls/dxgkrnl.sys/dxgkrnl.sys.spec | 26 ++++++++++++++++++++++++++
- dlls/dxgkrnl.sys/main.c           | 39 +++++++++++++++++++++++++++++++++++++++
+ dlls/dxgkrnl.sys/Makefile.in      |  6 +++++
+ dlls/dxgkrnl.sys/dxgkrnl.sys.spec | 26 +++++++++++++++++++++
+ dlls/dxgkrnl.sys/main.c           | 39 +++++++++++++++++++++++++++++++
 loader/wine.inf.in                |  2 ++
 5 files changed, 74 insertions(+)
 create mode 100644 dlls/dxgkrnl.sys/Makefile.in
@@ -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 301e374..309c114 100644
+index 9d044c749..9f8fa30d3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3316,6 +3316,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
+@@ -3263,6 +3263,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 301e374..309c114 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 0000000..e18ea70
+index 000000000..e18ea70a9
 --- /dev/null
 +++ b/dlls/dxgkrnl.sys/Makefile.in
@@ -0,0 +1,6 @@
@@ -40,7 +40,7 @@ index 0000000..e18ea70
 +	main.c
 diff --git a/dlls/dxgkrnl.sys/dxgkrnl.sys.spec b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec
 new file mode 100644
-index 0000000..8487664
+index 000000000..8487664f8
 --- /dev/null
 +++ b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec
@@ -0,0 +1,26 @@
@@ -72,7 +72,7 @@ index 0000000..8487664
 +@ stub g_loggerInfo
 diff --git a/dlls/dxgkrnl.sys/main.c b/dlls/dxgkrnl.sys/main.c
 new file mode 100644
-index 0000000..c5639c2
+index 000000000..c5639c237
 --- /dev/null
 +++ b/dlls/dxgkrnl.sys/main.c
@@ -0,0 +1,39 @@
@@ -116,25 +116,25 @@ index 0000000..c5639c2
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index a76bb0a..f0ff79f 100644
+index 48a9f4b91..1e97e8afb 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2604,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2553,6 +2553,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,,ksecdd.sys,-
 12,,mountmgr.sys,-
- 12,,ndis.sys,-
-@@ -2648,6 +2649,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2602,6 +2603,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,,ksecdd.sys,
 12,,mountmgr.sys
- 12,,ndis.sys
 -- 
-1.9.1
+2.20.1

--- a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
+++ b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
@@ -1,13 +1,13 @@
-From 7aae5361e86f2d4734d7242c6fdf790a01aaca1c Mon Sep 17 00:00:00 2001
+From 97a04cdd0ee352140773036c90ffbf4a9082258c 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.

 ---
 configure.ac                      |  1 +
- dlls/dxgmms1.sys/Makefile.in      |  6 ++++++
+ dlls/dxgmms1.sys/Makefile.in      |  6 +++++
 dlls/dxgmms1.sys/dxgmms1.sys.spec |  2 ++
- dlls/dxgmms1.sys/main.c           | 39 +++++++++++++++++++++++++++++++++++++++
+ dlls/dxgmms1.sys/main.c           | 39 +++++++++++++++++++++++++++++++
 loader/wine.inf.in                |  2 ++
 5 files changed, 50 insertions(+)
 create mode 100644 dlls/dxgmms1.sys/Makefile.in
@@ -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 309c114..655d93a 100644
+index 9f8fa30d3..732a9f744 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3317,6 +3317,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
+@@ -3264,6 +3264,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 309c114..655d93a 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 0000000..affb9ce
+index 000000000..affb9ce95
 --- /dev/null
 +++ b/dlls/dxgmms1.sys/Makefile.in
@@ -0,0 +1,6 @@
@@ -40,7 +40,7 @@ index 0000000..affb9ce
 +	main.c
 diff --git a/dlls/dxgmms1.sys/dxgmms1.sys.spec b/dlls/dxgmms1.sys/dxgmms1.sys.spec
 new file mode 100644
-index 0000000..124b0bf
+index 000000000..124b0bf94
 --- /dev/null
 +++ b/dlls/dxgmms1.sys/dxgmms1.sys.spec
@@ -0,0 +1,2 @@
@@ -48,7 +48,7 @@ index 0000000..124b0bf
 +@ stub VidSchInterface
 diff --git a/dlls/dxgmms1.sys/main.c b/dlls/dxgmms1.sys/main.c
 new file mode 100644
-index 0000000..686493d
+index 000000000..686493d32
 --- /dev/null
 +++ b/dlls/dxgmms1.sys/main.c
@@ -0,0 +1,39 @@
@@ -92,25 +92,25 @@ index 0000000..686493d
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index f0ff79f..bd83ba2 100644
+index 1e97e8afb..ee720aed8 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2605,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2554,6 +2554,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,,ksecdd.sys,-
 12,,mountmgr.sys,-
- 12,,ndis.sys,-
-@@ -2650,6 +2651,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2604,6 +2605,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,,ksecdd.sys,
 12,,mountmgr.sys
- 12,,ndis.sys
 -- 
-1.9.1
+2.20.1