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 acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-03-06 09:29:38 +11:00
parent e09e1fd366
commit fcca2476bf
42 changed files with 395 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
View File

@@ -1,4 +1,4 @@
From ae853a70af3455e1da80e89944a1cbc91e787421 Mon Sep 17 00:00:00 2001
From edc11b762bfe2c635a7d4cb60f779398b80cb780 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:38:38 +0200
Subject: [PATCH] win32k.sys: Add stub driver.
@@ -15,17 +15,17 @@ Subject: [PATCH] win32k.sys: Add stub driver.
create mode 100644 dlls/win32k.sys/win32k.sys.spec
diff --git a/configure.ac b/configure.ac
index 9033656..4ce2e89 100644
index fda7c09..301e374 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3685,6 +3685,7 @@ WINE_CONFIG_DLL(wiaservc)
WINE_CONFIG_TEST(dlls/wiaservc/tests)
WINE_CONFIG_DLL(wimgapi)
WINE_CONFIG_DLL(win32s16.dll16,enable_win16)
+WINE_CONFIG_DLL(win32k.sys)
WINE_CONFIG_DLL(win87em.dll16,enable_win16)
WINE_CONFIG_DLL(winaspi.dll16,enable_win16)
WINE_CONFIG_DLL(windebug.dll16,enable_win16)
@@ -3791,6 +3791,7 @@ WINE_CONFIG_MAKEFILE(dlls/wiaservc)
WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests)
WINE_CONFIG_MAKEFILE(dlls/wimgapi)
WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16)
+WINE_CONFIG_MAKEFILE(dlls/win32k.sys)
WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16)
diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in
new file mode 100644
index 0000000..615d833
@@ -336,10 +336,10 @@ index 0000000..c794391
+@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove
+@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 6b59b32..e476c0d 100755
index eac36ca..28ac498 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -410,6 +410,7 @@ my @dll_groups =
@@ -429,6 +429,7 @@ my @dll_groups =
[
"ntoskrnl.exe",
"hal",
@@ -348,5 +348,5 @@ index 6b59b32..e476c0d 100755
);
--
2.7.4
1.9.1

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

@@ -1,4 +1,4 @@
From e898a695975defcd91cf6d81ee356937177975d8 Mon Sep 17 00:00:00 2001
From e9e9334afc2b59ee6ae5cc0a93fb375effca227a 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,17 +15,17 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver.
create mode 100644 dlls/dxgkrnl.sys/main.c
diff --git a/configure.ac b/configure.ac
index 4ce2e89..3d5aef7 100644
index 301e374..309c114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3227,6 +3227,7 @@ WINE_CONFIG_LIB(dxerr8)
WINE_CONFIG_LIB(dxerr9)
WINE_CONFIG_DLL(dxgi)
WINE_CONFIG_TEST(dlls/dxgi/tests)
+WINE_CONFIG_DLL(dxgkrnl.sys)
WINE_CONFIG_LIB(dxguid)
WINE_CONFIG_DLL(dxva2)
WINE_CONFIG_TEST(dlls/dxva2/tests)
@@ -3316,6 +3316,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
WINE_CONFIG_MAKEFILE(dlls/dxerr9)
WINE_CONFIG_MAKEFILE(dlls/dxgi)
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
+WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys)
WINE_CONFIG_MAKEFILE(dlls/dxguid)
WINE_CONFIG_MAKEFILE(dlls/dxva2)
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
@@ -116,10 +116,10 @@ index 0000000..c5639c2
+ return STATUS_SUCCESS;
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 3c55125..c69b880 100644
index a76bb0a..f0ff79f 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2548,6 +2548,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 3c55125..c69b880 100644
12,,fltmgr.sys,-
12,,mountmgr.sys,-
12,,ndis.sys,-
@@ -2592,6 +2593,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 3c55125..c69b880 100644
12,,mountmgr.sys
12,,ndis.sys
--
2.7.4
1.9.1

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

@@ -1,4 +1,4 @@
From b1ca94de8e18fd482609c5b6e9ae38126ecfaa65 Mon Sep 17 00:00:00 2001
From 7aae5361e86f2d4734d7242c6fdf790a01aaca1c 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,17 +15,17 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver.
create mode 100644 dlls/dxgmms1.sys/main.c
diff --git a/configure.ac b/configure.ac
index 3d5aef7..ab6752a 100644
index 309c114..655d93a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3228,6 +3228,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)
WINE_CONFIG_LIB(dxguid)
WINE_CONFIG_DLL(dxva2)
WINE_CONFIG_TEST(dlls/dxva2/tests)
@@ -3317,6 +3317,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
WINE_CONFIG_MAKEFILE(dlls/dxgi)
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys)
+WINE_CONFIG_MAKEFILE(dlls/dxgmms1.sys)
WINE_CONFIG_MAKEFILE(dlls/dxguid)
WINE_CONFIG_MAKEFILE(dlls/dxva2)
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
@@ -92,10 +92,10 @@ index 0000000..686493d
+ return STATUS_SUCCESS;
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index c69b880..03016c1 100644
index f0ff79f..bd83ba2 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2549,6 +2549,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 c69b880..03016c1 100644
12,,fltmgr.sys,-
12,,mountmgr.sys,-
12,,ndis.sys,-
@@ -2594,6 +2595,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 c69b880..03016c1 100644
12,,mountmgr.sys
12,,ndis.sys
--
2.7.4
1.9.1