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 619bd1867ac650aa664327765a8ec7fbdeaa73d8.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-06-16 07:59:02 +10:00
parent eeec769eeb
commit c933b26cb6
5 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From e4a379c6f59b132e13194de5480f7b9b5e1485a3 Mon Sep 17 00:00:00 2001
From 0c4efb2f3ff519fdf2a93e7dc4741c9321315a51 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.
@@ -16,17 +16,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 daa7203748c..8844de0161e 100644
index 0972051831f..e277f1bdd23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3799,6 +3799,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
@@ -3821,6 +3821,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
WINE_CONFIG_MAKEFILE(dlls/wiaservc)
WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests)
WINE_CONFIG_MAKEFILE(dlls/wimgapi)
+WINE_CONFIG_MAKEFILE(dlls/win32k.sys)
WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/win32u)
WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16)
diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in
new file mode 100644
index 00000000000..7fac5d557eb
@@ -337,10 +337,10 @@ index 00000000000..c79439151e4
+@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove
+@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 6ae4e96e37f..82159d3bd7b 100644
index b47926d0701..7f10100f9df 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2680,6 +2680,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -2921,6 +2921,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,explorer.exe
11,,iexplore.exe
11,,notepad.exe
@@ -349,10 +349,10 @@ index 6ae4e96e37f..82159d3bd7b 100644
; skip .NET fake dlls in Wine Mono package
11,,aspnet_regiis.exe,-
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 4a151545aa0..3934cbb93d4 100755
index e6a831025c6..da3e87edec5 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -498,6 +498,7 @@ my @dll_groups =
@@ -503,6 +503,7 @@ my @dll_groups =
[
"ntoskrnl.exe",
"hal",