Rebase against 7ad740cd29c6bd87238df6231689b861058bc5a8

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

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