wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 7ad740cd29c6bd87238df6231689b861058bc5a8

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2020-03-18 10:38:14 +11:00
parent a6f3bd989e
commit 13536af59c
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch
View File

@ -1,15 +1,15 @@
From 09f5111caeb4051ccb58f0a2ffaf87b849af0ffd Mon Sep 17 00:00:00 2001
From 9ecf6543f498cfc6c1cfb44033746cfd1ba16587 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Mon, 1 Jul 2019 09:58:55 +1000
Subject: [PATCH] loader: Add Keyboard Layouts registry enteries.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
loader/wine.inf.in | 209 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 209 insertions(+)
loader/wine.inf.in | 215 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 215 insertions(+)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 3a73f1fd046..d96d00eb770 100644
index 6e0cb212531..fc929859be3 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -39,6 +39,7 @@ AddReg=\
@ -44,10 +44,16 @@ index 3a73f1fd046..d96d00eb770 100644
MCI,\
Misc,\
Tapi,\
@@ -1159,6 +1163,211 @@ HKLM,System\CurrentControlSet\Control\Nls\Normalization,"5",,"normnfkc.nls"
HKLM,System\CurrentControlSet\Control\Nls\Normalization,"6",,"normnfkd.nls"
HKLM,System\CurrentControlSet\Control\Nls\Normalization,"d",,"normidna.nls"
@@ -1087,6 +1091,217 @@ HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021004",,"a"
HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021404",,"9"
HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00030404",,"9"
+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"1",,"normnfc.nls"
+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"2",,"normnfd.nls"
+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"5",,"normnfkc.nls"
+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"6",,"normnfkd.nls"
+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"d",,"normidna.nls"
+
+[KeyboardLayouts]
+HKLM,SYSTEM\CurrentControlSet\Control\Keyboard Layouts,,16
+HKLM,SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000401,,16
@ -257,5 +263,5 @@ index 3a73f1fd046..d96d00eb770 100644
HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y"
HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"
--
2.25.0
2.25.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "c2ee20c95bea55069d32cfa69a95ae3e4486a02b"
echo "7ad740cd29c6bd87238df6231689b861058bc5a8"
}
# Show version information

12
patches/winebuild-Fake_Dlls/0011-ntdll-Call-NtOpenFile-through-syscall-thunk.patch
View File

@ -1,4 +1,4 @@
From e3f71059e2f8a7ef08becb3a3bc2cd7cc3ed2d61 Mon Sep 17 00:00:00 2001
From 162663c659f87dc2ddf09202e7988ff4d50368e7 Mon Sep 17 00:00:00 2001
From: Paul Gofman <gofmanp@gmail.com>
Date: Fri, 3 Jan 2020 17:39:08 +0300
Subject: [PATCH] ntdll: Call NtOpenFile through syscall thunk.
@ -63,19 +63,19 @@ index 7e8fd20e9d7..8fcd53b26ba 100644
FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE )))
{
diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c
index 8833cfa712c..9ce92007500 100644
index afd65f3c02c..52f5d1f1d83 100644
--- a/dlls/ntdll/locale.c
+++ b/dlls/ntdll/locale.c
@@ -642,7 +642,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file )
@@ -659,7 +659,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file )
return STATUS_NO_MEMORY;
valueW.Length = sprintfW( valueW.Buffer, pathfmtW, system_dir, name ) * sizeof(WCHAR);
valueW.Length = sprintfW( valueW.Buffer, pathfmtW, dir, name ) * sizeof(WCHAR);
InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL );
- status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT );
+ status = __syscall_NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT );
if (!status) TRACE( "found %s\n", debugstr_w( valueW.Buffer ));
RtlFreeUnicodeString( &valueW );
if (status != STATUS_OBJECT_NAME_NOT_FOUND) return status;
@@ -666,7 +666,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file )
@@ -683,7 +683,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file )
strcatW( valueW.Buffer, name );
valueW.Length = strlenW(valueW.Buffer) * sizeof(WCHAR);
InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL );
@ -129,5 +129,5 @@ index a1c688745a7..83d610010b3 100644
{
BOOL is_64bit;
--
2.17.1
2.25.1