Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
c2f4619d
Commit
c2f4619d
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: Use different variable names for Mac locales.
parent
29a2a7ef
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
env.c
dlls/ntdll/unix/env.c
+8
-8
No files found.
dlls/ntdll/unix/env.c
View file @
c2f4619d
...
...
@@ -807,9 +807,9 @@ static void init_locale(void)
#ifdef __APPLE__
if
(
!
system_locale
[
0
])
{
CFLocaleRef
locale
=
CFLocaleCopyCurrent
();
CFStringRef
lang
=
CFLocaleGetValue
(
locale
,
kCFLocaleLanguageCode
);
CFStringRef
country
=
CFLocaleGetValue
(
locale
,
kCFLocaleCountryCode
);
CFLocaleRef
mac_sys_
locale
=
CFLocaleCopyCurrent
();
CFStringRef
lang
=
CFLocaleGetValue
(
mac_sys_
locale
,
kCFLocaleLanguageCode
);
CFStringRef
country
=
CFLocaleGetValue
(
mac_sys_
locale
,
kCFLocaleCountryCode
);
CFStringRef
locale_string
;
if
(
country
)
...
...
@@ -818,7 +818,7 @@ static void init_locale(void)
locale_string
=
CFStringCreateCopy
(
NULL
,
lang
);
CFStringGetCString
(
locale_string
,
system_locale
,
sizeof
(
system_locale
),
kCFStringEncodingUTF8
);
CFRelease
(
locale
);
CFRelease
(
mac_sys_
locale
);
CFRelease
(
locale_string
);
}
if
(
!
user_locale
[
0
])
...
...
@@ -833,13 +833,13 @@ static void init_locale(void)
{
CFStringRef
lang
=
CFDictionaryGetValue
(
components
,
kCFLocaleLanguageCode
);
CFStringRef
country
=
CFDictionaryGetValue
(
components
,
kCFLocaleCountryCode
);
CFLocaleRef
locale
=
NULL
;
CFLocaleRef
mac_user_
locale
=
NULL
;
CFStringRef
locale_string
;
if
(
!
country
)
{
locale
=
CFLocaleCopyCurrent
();
country
=
CFLocaleGetValue
(
locale
,
kCFLocaleCountryCode
);
mac_user_
locale
=
CFLocaleCopyCurrent
();
country
=
CFLocaleGetValue
(
mac_user_
locale
,
kCFLocaleCountryCode
);
}
if
(
country
)
locale_string
=
CFStringCreateWithFormat
(
NULL
,
NULL
,
CFSTR
(
"%@-%@"
),
lang
,
country
);
...
...
@@ -847,7 +847,7 @@ static void init_locale(void)
locale_string
=
CFStringCreateCopy
(
NULL
,
lang
);
CFStringGetCString
(
locale_string
,
user_locale
,
sizeof
(
user_locale
),
kCFStringEncodingUTF8
);
CFRelease
(
locale_string
);
if
(
locale
)
CFRelease
(
locale
);
if
(
mac_user_locale
)
CFRelease
(
mac_user_
locale
);
CFRelease
(
components
);
}
}
...
...
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