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
db3e0877
Commit
db3e0877
authored
Feb 03, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Map LANG_SERBIAN_NEUTRAL in RtlLocaleNameToLcid().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f51e44c1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
locale.c
dlls/kernel32/tests/locale.c
+3
-7
locale.c
dlls/ntdll/locale.c
+3
-0
No files found.
dlls/kernel32/tests/locale.c
View file @
db3e0877
...
...
@@ -2861,14 +2861,12 @@ static void test_LocaleNameToLCID(void)
for
(
ptr
=
neutralsublang_names
;
*
ptr
->
name
;
ptr
++
)
{
lcid
=
pLocaleNameToLCID
(
ptr
->
name
,
0
);
todo_wine_if
(
ptr
->
todo
)
ok
(
lcid
==
ptr
->
lcid
,
"%s: got wrong lcid 0x%04x, expected 0x%04x
\n
"
,
wine_dbgstr_w
(
ptr
->
name
),
lcid
,
ptr
->
lcid
);
ok
(
lcid
==
ptr
->
lcid
,
"%s: got wrong lcid 0x%04x, expected 0x%04x
\n
"
,
wine_dbgstr_w
(
ptr
->
name
),
lcid
,
ptr
->
lcid
);
*
buffer
=
0
;
ret
=
pLCIDToLocaleName
(
lcid
,
buffer
,
ARRAY_SIZE
(
buffer
),
0
);
ok
(
ret
>
0
,
"%s: got %d
\n
"
,
wine_dbgstr_w
(
ptr
->
name
),
ret
);
todo_wine_if
(
ptr
->
todo
)
ok
(
!
lstrcmpW
(
ptr
->
sname
,
buffer
),
"%s: got wrong locale name %s
\n
"
,
wine_dbgstr_w
(
ptr
->
name
),
wine_dbgstr_w
(
buffer
));
...
...
@@ -2974,7 +2972,6 @@ static void test_LocaleNameToLCID(void)
status
=
pRtlLocaleNameToLcid
(
ptr
->
name
,
&
lcid
,
2
);
ok
(
!
status
||
broken
(
ptr
->
lcid
==
MAKELANGID
(
LANG_CHINESE
,
SUBLANG_CHINESE_SIMPLIFIED
)),
/* vista */
"%s failed error %x
\n
"
,
wine_dbgstr_w
(
ptr
->
name
),
status
);
todo_wine_if
(
ptr
->
todo
)
if
(
!
status
)
ok
(
lcid
==
expect
,
"%s: got wrong lcid 0x%04x, expected 0x%04x
\n
"
,
wine_dbgstr_w
(
ptr
->
name
),
lcid
,
expect
);
status
=
pRtlLocaleNameToLcid
(
ptr
->
sname
,
&
lcid
,
0
);
...
...
@@ -4824,8 +4821,7 @@ static void test_GetLocaleInfoEx(void)
{
val
=
0
;
pGetLocaleInfoEx
(
ptr
->
name
,
LOCALE_ILANGUAGE
|
LOCALE_RETURN_NUMBER
,
(
WCHAR
*
)
&
val
,
sizeof
(
val
)
/
sizeof
(
WCHAR
));
todo_wine_if
(
ptr
->
todo
)
ok
(
val
==
ptr
->
lcid
,
"%s: got wrong lcid 0x%04x, expected 0x%04x
\n
"
,
wine_dbgstr_w
(
ptr
->
name
),
val
,
ptr
->
lcid
);
ok
(
val
==
ptr
->
lcid
,
"%s: got wrong lcid 0x%04x, expected 0x%04x
\n
"
,
wine_dbgstr_w
(
ptr
->
name
),
val
,
ptr
->
lcid
);
bufferW
[
0
]
=
0
;
ret
=
pGetLocaleInfoEx
(
ptr
->
name
,
LOCALE_SNAME
,
bufferW
,
ARRAY_SIZE
(
bufferW
));
ok
(
ret
==
lstrlenW
(
bufferW
)
+
1
,
"%s: got ret value %d
\n
"
,
wine_dbgstr_w
(
ptr
->
name
),
ret
);
...
...
dlls/ntdll/locale.c
View file @
db3e0877
...
...
@@ -1358,6 +1358,9 @@ NTSTATUS WINAPI RtlLocaleNameToLcid( const WCHAR *name, LCID *lcid, ULONG flags
case
MAKELANGID
(
LANG_CHINESE
,
SUBLANG_CHINESE_HONGKONG
):
*
lcid
=
MAKELCID
(
0x7c04
,
SORT_DEFAULT
);
break
;
case
MAKELANGID
(
LANG_SERBIAN
,
SUBLANG_NEUTRAL
):
*
lcid
=
LANG_SERBIAN_NEUTRAL
;
break
;
default:
*
lcid
=
MAKELANGID
(
PRIMARYLANGID
(
id
),
SUBLANG_NEUTRAL
);
break
;
...
...
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