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
8905bd92
Commit
8905bd92
authored
Apr 05, 2018
by
Piotr Caban
Committed by
Alexandre Julliard
Apr 09, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Support "China" country name in setlocale function.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
19bb93ec
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
locale.c
dlls/msvcrt/locale.c
+3
-0
locale.c
dlls/msvcrt/tests/locale.c
+0
-2
No files found.
dlls/msvcrt/locale.c
View file @
8905bd92
...
...
@@ -249,6 +249,9 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage)
if
(
!
search
.
search_country
[
0
]
&&
!
search
.
search_codepage
[
0
])
remap_synonym
(
search
.
search_language
);
if
(
!
strcasecmp
(
search
.
search_country
,
"China"
))
strcpy
(
search
.
search_country
,
"People's Republic of China"
);
EnumResourceLanguagesA
(
GetModuleHandleA
(
"KERNEL32"
),
(
LPSTR
)
RT_STRING
,
(
LPCSTR
)
LOCALE_ILANGUAGE
,
find_best_locale_proc
,
(
LONG_PTR
)
&
search
);
...
...
dlls/msvcrt/tests/locale.c
View file @
8905bd92
...
...
@@ -144,12 +144,10 @@ static void test_setlocale(void)
||
broken
(
!
strcmp
(
ret
,
"Chinese_Taiwan.950"
)),
"ret = %s
\n
"
,
ret
);
ret
=
setlocale
(
LC_ALL
,
"Chinese_China.936"
);
todo_wine
ok
(
ret
!=
NULL
||
broken
(
ret
==
NULL
),
"ret == NULL
\n
"
);
if
(
ret
)
{
trace
(
"Chinese_China.936=%s
\n
"
,
ret
);
todo_wine
ok
(
!
strcmp
(
ret
,
"Chinese (Simplified)_People's Republic of China.936"
)
/* Vista - Win7 */
||
!
strcmp
(
ret
,
"Chinese (Simplified)_China.936"
)
/* Win8 - Win10 */
||
broken
(
!
strcmp
(
ret
,
"Chinese_People's Republic of China.936"
)),
"ret = %s
\n
"
,
ret
);
...
...
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