You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 6d26689484070b2c4ad4e0e16812c6eb8176cd40.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 547a512a92e719ea5dc1c812e4505680c006b2a0 Mon Sep 17 00:00:00 2001
|
||||
From fb48a8c56b8d7007f4dfc2771c142efc72c432c7 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.
|
||||
@@ -8,17 +8,16 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver.
|
||||
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(+)
|
||||
4 files changed, 72 insertions(+)
|
||||
create mode 100644 dlls/dxgkrnl.sys/Makefile.in
|
||||
create mode 100644 dlls/dxgkrnl.sys/dxgkrnl.sys.spec
|
||||
create mode 100644 dlls/dxgkrnl.sys/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 27ab432a44a..0a6d1b0639e 100644
|
||||
index f52cfc1e2b6..4eff254d273 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3282,6 +3282,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
|
||||
@@ -3271,6 +3271,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxerr9)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgi)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
|
||||
@@ -115,26 +114,6 @@ index 00000000000..c5639c237c8
|
||||
+ TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) );
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
||||
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"
|
||||
10,syswow64,stdole2.tlb
|
||||
11,,iexplore.exe
|
||||
11,,winetest.exe,-
|
||||
+12,,dxgkrnl.sys,-
|
||||
12,,fltmgr.sys,-
|
||||
12,,hidclass.sys,-
|
||||
12,,http.sys,-
|
||||
@@ -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
|
||||
--
|
||||
2.26.2
|
||||
2.30.1
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 747017a3787d4ad68f26b1047cc097afe53133be Mon Sep 17 00:00:00 2001
|
||||
From dc0b6c029501ccaaaf558136280de80fd846b762 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.
|
||||
@@ -8,17 +8,16 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver.
|
||||
dlls/dxgmms1.sys/Makefile.in | 6 +++++
|
||||
dlls/dxgmms1.sys/dxgmms1.sys.spec | 2 ++
|
||||
dlls/dxgmms1.sys/main.c | 39 +++++++++++++++++++++++++++++++
|
||||
loader/wine.inf.in | 2 ++
|
||||
5 files changed, 50 insertions(+)
|
||||
4 files changed, 48 insertions(+)
|
||||
create mode 100644 dlls/dxgmms1.sys/Makefile.in
|
||||
create mode 100644 dlls/dxgmms1.sys/dxgmms1.sys.spec
|
||||
create mode 100644 dlls/dxgmms1.sys/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0a6d1b0639e..6966f95ce88 100644
|
||||
index 4eff254d273..0a3a89e7720 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3283,6 +3283,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
|
||||
@@ -3272,6 +3272,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgi)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys)
|
||||
@@ -91,26 +90,6 @@ index 00000000000..686493d3296
|
||||
+ TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) );
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
||||
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"
|
||||
11,,iexplore.exe
|
||||
11,,winetest.exe,-
|
||||
12,,dxgkrnl.sys,-
|
||||
+12,,dxgmms1.sys,-
|
||||
12,,fltmgr.sys,-
|
||||
12,,hidclass.sys,-
|
||||
12,,http.sys,-
|
||||
@@ -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
|
||||
--
|
||||
2.26.2
|
||||
2.30.1
|
||||
|
||||
|
Reference in New Issue
Block a user