Rebase against 18883a76762afab3e18e1279a9666240e19d4d03.

This commit is contained in:
Zebediah Figura
2019-04-08 17:01:18 -05:00
parent be0910e9a9
commit 52a77f6b00
16 changed files with 163 additions and 385 deletions

View File

@@ -1,4 +1,4 @@
From e62cddcd96e6606e9df2b2bab91c2c0b46e1a72e Mon Sep 17 00:00:00 2001
From ec2da26fdd7259af7c473698fc6aa15469393e8b 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 9d044c749..9f8fa30d3 100644
index dcf2d4930..fbc6acda7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3263,6 +3263,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
@@ -3268,6 +3268,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
WINE_CONFIG_MAKEFILE(dlls/dxerr9)
WINE_CONFIG_MAKEFILE(dlls/dxgi)
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
@@ -116,7 +116,7 @@ index 000000000..c5639c237
+ return STATUS_SUCCESS;
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 48a9f4b91..1e97e8afb 100644
index 4d28a93c3..279271f54 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2553,6 +2553,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -133,8 +133,8 @@ index 48a9f4b91..1e97e8afb 100644
11,,winetest.exe,-
+12,,dxgkrnl.sys
12,,fltmgr.sys
12,,ksecdd.sys,
12,,ksecdd.sys
12,,mountmgr.sys
--
2.20.1
2.21.0

View File

@@ -1,4 +1,4 @@
From 97a04cdd0ee352140773036c90ffbf4a9082258c Mon Sep 17 00:00:00 2001
From 7215993b74878cfd57aa7251fde74d18b233ba14 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 9f8fa30d3..732a9f744 100644
index fbc6acda7..f8eed3baa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3264,6 +3264,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
@@ -3269,6 +3269,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
WINE_CONFIG_MAKEFILE(dlls/dxgi)
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys)
@@ -92,7 +92,7 @@ index 000000000..686493d32
+ return STATUS_SUCCESS;
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 1e97e8afb..ee720aed8 100644
index 279271f54..29afb4182 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -109,8 +109,8 @@ index 1e97e8afb..ee720aed8 100644
12,,dxgkrnl.sys
+12,,dxgmms1.sys
12,,fltmgr.sys
12,,ksecdd.sys,
12,,ksecdd.sys
12,,mountmgr.sys
--
2.20.1
2.21.0