Rebase against ad03df1222c2bb22e991641dcc0d9e4ed684158b.

This commit is contained in:
Alistair Leslie-Hughes
2021-06-24 11:10:07 +10:00
parent 9bf50b7e1f
commit 0dd44a250f
4 changed files with 17 additions and 17 deletions

View File

@@ -1,4 +1,4 @@
From 0c4efb2f3ff519fdf2a93e7dc4741c9321315a51 Mon Sep 17 00:00:00 2001
From 221f46fd34a5bd6260024c5bf90842b8ed897de0 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,10 +16,10 @@ 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 0972051831f..e277f1bdd23 100644
index 00e9e32ee36..c859d852102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3821,6 +3821,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
@@ -3808,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
WINE_CONFIG_MAKEFILE(dlls/wiaservc)
WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests)
WINE_CONFIG_MAKEFILE(dlls/wimgapi)
@@ -337,17 +337,17 @@ 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 b47926d0701..7f10100f9df 100644
index af6c94c9f0b..bfa5c0cfce4 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2921,6 +2921,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -2922,6 +2922,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,explorer.exe
11,,iexplore.exe
11,,notepad.exe
+11,,win32k.sys
11,,winetest.exe,-
; skip .NET fake dlls in Wine Mono package
11,,aspnet_regiis.exe,-
; themes
10,resources\themes\light,light.msstyles
diff --git a/tools/make_specfiles b/tools/make_specfiles
index e6a831025c6..da3e87edec5 100755
--- a/tools/make_specfiles