wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f9e1dbb83d850a2f7cb17079e02de139e2f8b920

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-02-23 09:33:49 +11:00
parent 84fb9656a1
commit 9d84ed42f1
42 changed files with 412 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
From bb9c9298a20f26135492ded2056eb2e49e72c024 Mon Sep 17 00:00:00 2001
From 63db6f4c97b04136eaf47c73a16eea4cbf7ae6a8 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: dxgkrnl.sys: Add stub driver.
Subject: [PATCH] dxgkrnl.sys: Add stub driver.
---
configure.ac | 1 +
@@ -15,12 +15,12 @@ Subject: dxgkrnl.sys: Add stub driver.
create mode 100644 dlls/dxgkrnl.sys/main.c
diff --git a/configure.ac b/configure.ac
index 34f2a1af63d..90ea217e887 100644
index 588eecb..cf1ba3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3158,6 +3158,7 @@ WINE_CONFIG_LIB(dxerr8)
@@ -3319,6 +3319,7 @@ WINE_CONFIG_LIB(dxerr8)
WINE_CONFIG_LIB(dxerr9)
WINE_CONFIG_DLL(dxgi,,[implib])
WINE_CONFIG_DLL(dxgi)
WINE_CONFIG_TEST(dlls/dxgi/tests)
+WINE_CONFIG_DLL(dxgkrnl.sys)
WINE_CONFIG_LIB(dxguid)
@@ -28,7 +28,7 @@ index 34f2a1af63d..90ea217e887 100644
WINE_CONFIG_TEST(dlls/dxva2/tests)
diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in
new file mode 100644
index 00000000000..e18ea70a995
index 0000000..e18ea70
--- /dev/null
+++ b/dlls/dxgkrnl.sys/Makefile.in
@@ -0,0 +1,6 @@
@@ -40,7 +40,7 @@ index 00000000000..e18ea70a995
+ main.c
diff --git a/dlls/dxgkrnl.sys/dxgkrnl.sys.spec b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec
new file mode 100644
index 00000000000..8487664f8a7
index 0000000..8487664
--- /dev/null
+++ b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec
@@ -0,0 +1,26 @@
@@ -72,7 +72,7 @@ index 00000000000..8487664f8a7
+@ stub g_loggerInfo
diff --git a/dlls/dxgkrnl.sys/main.c b/dlls/dxgkrnl.sys/main.c
new file mode 100644
index 00000000000..c5639c237c8
index 0000000..c5639c2
--- /dev/null
+++ b/dlls/dxgkrnl.sys/main.c
@@ -0,0 +1,39 @@
@@ -116,10 +116,10 @@ index 00000000000..c5639c237c8
+ return STATUS_SUCCESS;
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 275862845d1..654858f7537 100644
index a76bb0a..f0ff79f 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2595,6 +2595,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -2604,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
10,syswow64,stdole2.tlb
11,,iexplore.exe
11,,winetest.exe,-
@@ -127,7 +127,7 @@ index 275862845d1..654858f7537 100644
12,,fltmgr.sys,-
12,,mountmgr.sys,-
12,,ndis.sys,-
@@ -2639,6 +2640,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -2648,6 +2649,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,iexplore.exe
11,,notepad.exe
11,,winetest.exe,-
@@ -136,5 +136,5 @@ index 275862845d1..654858f7537 100644
12,,mountmgr.sys
12,,ndis.sys
--
2.13.1
1.9.1

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

@@ -1,7 +1,7 @@
From 0a1d6232f852b4ff869786aff4ec20e78ac2ce72 Mon Sep 17 00:00:00 2001
From cf71906be02cd7ac2862f7066108a32b2bb48de4 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: dxgmms1.sys: Add stub driver.
Subject: [PATCH] dxgmms1.sys: Add stub driver.
---
configure.ac | 1 +
@@ -15,11 +15,11 @@ Subject: dxgmms1.sys: Add stub driver.
create mode 100644 dlls/dxgmms1.sys/main.c
diff --git a/configure.ac b/configure.ac
index 90ea217e887..5aaa20c22b6 100644
index cf1ba3d..343f4b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3159,6 +3159,7 @@ WINE_CONFIG_LIB(dxerr9)
WINE_CONFIG_DLL(dxgi,,[implib])
@@ -3320,6 +3320,7 @@ WINE_CONFIG_LIB(dxerr9)
WINE_CONFIG_DLL(dxgi)
WINE_CONFIG_TEST(dlls/dxgi/tests)
WINE_CONFIG_DLL(dxgkrnl.sys)
+WINE_CONFIG_DLL(dxgmms1.sys)
@@ -28,7 +28,7 @@ index 90ea217e887..5aaa20c22b6 100644
WINE_CONFIG_TEST(dlls/dxva2/tests)
diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in
new file mode 100644
index 00000000000..affb9ce95f8
index 0000000..affb9ce
--- /dev/null
+++ b/dlls/dxgmms1.sys/Makefile.in
@@ -0,0 +1,6 @@
@@ -40,7 +40,7 @@ index 00000000000..affb9ce95f8
+ main.c
diff --git a/dlls/dxgmms1.sys/dxgmms1.sys.spec b/dlls/dxgmms1.sys/dxgmms1.sys.spec
new file mode 100644
index 00000000000..124b0bf944d
index 0000000..124b0bf
--- /dev/null
+++ b/dlls/dxgmms1.sys/dxgmms1.sys.spec
@@ -0,0 +1,2 @@
@@ -48,7 +48,7 @@ index 00000000000..124b0bf944d
+@ stub VidSchInterface
diff --git a/dlls/dxgmms1.sys/main.c b/dlls/dxgmms1.sys/main.c
new file mode 100644
index 00000000000..686493d3296
index 0000000..686493d
--- /dev/null
+++ b/dlls/dxgmms1.sys/main.c
@@ -0,0 +1,39 @@
@@ -92,10 +92,10 @@ index 00000000000..686493d3296
+ return STATUS_SUCCESS;
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 654858f7537..176647b8beb 100644
index f0ff79f..bd83ba2 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2596,6 +2596,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -2605,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,iexplore.exe
11,,winetest.exe,-
12,,dxgkrnl.sys,-
@@ -103,7 +103,7 @@ index 654858f7537..176647b8beb 100644
12,,fltmgr.sys,-
12,,mountmgr.sys,-
12,,ndis.sys,-
@@ -2641,6 +2642,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -2650,6 +2651,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,notepad.exe
11,,winetest.exe,-
12,,dxgkrnl.sys
@@ -112,5 +112,5 @@ index 654858f7537..176647b8beb 100644
12,,mountmgr.sys
12,,ndis.sys
--
2.13.1
1.9.1