Module: wine Branch: master Commit: c388ad357a3e54fe6526ab9af4abf2aed530a649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c388ad357a3e54fe6526ab9af...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Feb 18 11:23:28 2020 +0100
wine.inf: Add registry keys for normalization forms.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/locale.c | 2 ++ loader/wine.inf.in | 6 ++++++ 2 files changed, 8 insertions(+)
diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 27dceaf8e7..07cf54576c 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -407,6 +407,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) static const WCHAR normnfdW[] = {'n','o','r','m','n','f','d','.','n','l','s',0}; static const WCHAR normnfkcW[] = {'n','o','r','m','n','f','k','c','.','n','l','s',0}; static const WCHAR normnfkdW[] = {'n','o','r','m','n','f','k','d','.','n','l','s',0}; + static const WCHAR normidnaW[] = {'n','o','r','m','i','d','n','a','.','n','l','s',0};
DWORD size; HANDLE handle; @@ -471,6 +472,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) case NormalizationD: name = normnfdW; break; case NormalizationKC: name = normnfkcW; break; case NormalizationKD: name = normnfkdW; break; + case 13: name = normidnaW; break; } break; } diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1b5c6ba95c..3a73f1fd04 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -1153,6 +1153,12 @@ 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" + [OLE] HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y" HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"