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
f51e44c1
Commit
f51e44c1
authored
Feb 03, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernelbase: Map LANG_SERBIAN_NEUTRAL in ConvertDefaultLocale().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
db2666e9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
locale.c
dlls/kernel32/tests/locale.c
+4
-0
locale.c
dlls/kernelbase/locale.c
+2
-0
No files found.
dlls/kernel32/tests/locale.c
View file @
f51e44c1
...
...
@@ -3652,6 +3652,10 @@ static void test_ConvertDefaultLocale(void)
broken
(
lcid
==
0x7c04
)
||
/* winxp */
broken
(
lcid
==
0x0404
),
/* vista */
"Expected lcid = %08x got %08x
\n
"
,
MAKELANGID
(
LANG_CHINESE
,
SUBLANG_CHINESE_HONGKONG
),
lcid
);
lcid
=
ConvertDefaultLocale
(
LANG_SERBIAN_NEUTRAL
);
ok
(
lcid
==
MAKELANGID
(
LANG_SERBIAN
,
SUBLANG_SERBIAN_SERBIA_LATIN
)
||
broken
(
lcid
==
MAKELANGID
(
LANG_SERBIAN
,
SUBLANG_SERBIAN_LATIN
)
),
/* <= vista */
"Expected lcid = %08x got %08x
\n
"
,
MAKELANGID
(
LANG_SERBIAN
,
SUBLANG_SERBIAN_SERBIA_LATIN
),
lcid
);
/* Invariant language is not treated specially */
TEST_LCID
(
LANG_INVARIANT
,
SUBLANG_DEFAULT
,
SORT_DEFAULT
);
...
...
dlls/kernelbase/locale.c
View file @
f51e44c1
...
...
@@ -3189,6 +3189,8 @@ LCID WINAPI DECLSPEC_HOTPATCH ConvertDefaultLocale( LCID lcid )
return
MAKELANGID
(
LANG_CHINESE
,
SUBLANG_CHINESE_SIMPLIFIED
);
case
MAKELANGID
(
LANG_CHINESE
,
0x1f
):
return
MAKELANGID
(
LANG_CHINESE
,
SUBLANG_CHINESE_HONGKONG
);
case
LANG_SERBIAN_NEUTRAL
:
return
MAKELANGID
(
LANG_SERBIAN
,
SUBLANG_SERBIAN_SERBIA_LATIN
);
case
MAKELANGID
(
LANG_SPANISH
,
SUBLANG_NEUTRAL
):
return
MAKELANGID
(
LANG_SPANISH
,
SUBLANG_SPANISH_MODERN
);
case
MAKELANGID
(
LANG_IRISH
,
SUBLANG_NEUTRAL
):
...
...
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