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 50f889fd19d329bef7c001f9eafd1030fc1e3a56.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-10-13 09:41:59 +11:00
parent f3fd4a3903
commit 1af920f698
6 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 221f46fd34a5bd6260024c5bf90842b8ed897de0 Mon Sep 17 00:00:00 2001
From 2acb9244431b15464254efcb9f597d71e9d3d784 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 00e9e32ee36..c859d852102 100644
index 4e9dccfbb51..3c5e88e3f2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3808,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
@@ -3691,6 +3691,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/win32u/tests)
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 af6c94c9f0b..bfa5c0cfce4 100644
index d023701c04b..23a97ddb412 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2922,6 +2922,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -2680,6 +2680,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,explorer.exe
11,,iexplore.exe
11,,notepad.exe
@@ -349,10 +349,10 @@ index af6c94c9f0b..bfa5c0cfce4 100644
; themes
10,resources\themes\light,light.msstyles
diff --git a/tools/make_specfiles b/tools/make_specfiles
index e6a831025c6..da3e87edec5 100755
index ecfc6d0e8f2..f8e6203bb96 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -503,6 +503,7 @@ my @dll_groups =
@@ -511,6 +511,7 @@ my @dll_groups =
[
"ntoskrnl.exe",
"hal",
@@ -361,5 +361,5 @@ index e6a831025c6..da3e87edec5 100755
[
"mscoree",
--
2.30.2
2.33.0