Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
730bdf6c
Commit
730bdf6c
authored
Nov 28, 2023
by
Jactry Zeng
Committed by
Alexandre Julliard
Nov 28, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Initialize locale from Mac language identifiers with script name.
parent
c2f4619d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
env.c
dlls/ntdll/unix/env.c
+6
-1
No files found.
dlls/ntdll/unix/env.c
View file @
730bdf6c
...
@@ -833,6 +833,7 @@ static void init_locale(void)
...
@@ -833,6 +833,7 @@ static void init_locale(void)
{
{
CFStringRef
lang
=
CFDictionaryGetValue
(
components
,
kCFLocaleLanguageCode
);
CFStringRef
lang
=
CFDictionaryGetValue
(
components
,
kCFLocaleLanguageCode
);
CFStringRef
country
=
CFDictionaryGetValue
(
components
,
kCFLocaleCountryCode
);
CFStringRef
country
=
CFDictionaryGetValue
(
components
,
kCFLocaleCountryCode
);
CFStringRef
script
=
CFDictionaryGetValue
(
components
,
kCFLocaleScriptCode
);
CFLocaleRef
mac_user_locale
=
NULL
;
CFLocaleRef
mac_user_locale
=
NULL
;
CFStringRef
locale_string
;
CFStringRef
locale_string
;
...
@@ -841,7 +842,11 @@ static void init_locale(void)
...
@@ -841,7 +842,11 @@ static void init_locale(void)
mac_user_locale
=
CFLocaleCopyCurrent
();
mac_user_locale
=
CFLocaleCopyCurrent
();
country
=
CFLocaleGetValue
(
mac_user_locale
,
kCFLocaleCountryCode
);
country
=
CFLocaleGetValue
(
mac_user_locale
,
kCFLocaleCountryCode
);
}
}
if
(
country
)
if
(
country
&&
script
)
locale_string
=
CFStringCreateWithFormat
(
NULL
,
NULL
,
CFSTR
(
"%@-%@-%@"
),
lang
,
script
,
country
);
else
if
(
script
)
locale_string
=
CFStringCreateWithFormat
(
NULL
,
NULL
,
CFSTR
(
"%@-%@"
),
lang
,
script
);
else
if
(
country
)
locale_string
=
CFStringCreateWithFormat
(
NULL
,
NULL
,
CFSTR
(
"%@-%@"
),
lang
,
country
);
locale_string
=
CFStringCreateWithFormat
(
NULL
,
NULL
,
CFSTR
(
"%@-%@"
),
lang
,
country
);
else
else
locale_string
=
CFStringCreateCopy
(
NULL
,
lang
);
locale_string
=
CFStringCreateCopy
(
NULL
,
lang
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment