Alexandre Julliard : ntdll: Delay NFC table loading on macOS.
Alexandre Julliard
julliard at winehq.org
Tue Mar 3 16:24:51 CST 2020
Module: wine
Branch: master
Commit: 35c223850e1bc9e8f97bfaf403bfabca69db3447
URL: https://source.winehq.org/git/wine.git/?a=commit;h=35c223850e1bc9e8f97bfaf403bfabca69db3447
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Mar 3 09:06:21 2020 +0100
ntdll: Delay NFC table loading on macOS.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48689
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/locale.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c
index 8a2b233f88..5602c18df5 100644
--- a/dlls/ntdll/locale.c
+++ b/dlls/ntdll/locale.c
@@ -799,13 +799,7 @@ void init_unix_codepage(void)
#else /* __APPLE__ || __ANDROID__ */
-void init_unix_codepage(void)
-{
-#ifdef __APPLE__
- const struct norm_table *info;
- load_norm_table( NormalizationC, &info );
-#endif
-}
+void init_unix_codepage(void) { }
#endif /* __APPLE__ || __ANDROID__ */
@@ -909,6 +903,10 @@ void init_locale( HMODULE module )
user_lcid = unix_locale_to_lcid( setlocale( LC_MESSAGES, NULL ));
#ifdef __APPLE__
+ {
+ const struct norm_table *info;
+ load_norm_table( NormalizationC, &info );
+ }
if (!system_lcid)
{
char buffer[LOCALE_NAME_MAX_LENGTH];
More information about the wine-cvs
mailing list