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
17431e23
Commit
17431e23
authored
Jan 17, 2017
by
Huw Davies
Committed by
Alexandre Julliard
Jan 17, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel32/tests: Fix the invariant locale's country abbreviation on Windows 10.
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8948174a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
locale.c
dlls/kernel32/tests/locale.c
+6
-4
No files found.
dlls/kernel32/tests/locale.c
View file @
17431e23
...
...
@@ -4726,7 +4726,7 @@ static void test_EnumSystemGeoID(void)
struct
invariant_entry
{
const
char
*
name
;
int
id
;
const
char
*
expect
;
const
char
*
expect
,
*
expect2
;
};
#define X(x) #x, x
...
...
@@ -4737,7 +4737,7 @@ static const struct invariant_entry invariant_list[] = {
{
X
(
LOCALE_SNATIVELANGNAME
),
"Invariant Language"
},
{
X
(
LOCALE_ICOUNTRY
),
"1"
},
{
X
(
LOCALE_SENGCOUNTRY
),
"Invariant Country"
},
{
X
(
LOCALE_SABBREVCTRYNAME
),
"IVC"
},
{
X
(
LOCALE_SABBREVCTRYNAME
),
"IVC"
,
""
},
{
X
(
LOCALE_SNATIVECTRYNAME
),
"Invariant Country"
},
{
X
(
LOCALE_IDEFAULTLANGUAGE
),
"0409"
},
{
X
(
LOCALE_IDEFAULTCOUNTRY
),
"1"
},
...
...
@@ -4864,9 +4864,11 @@ static void test_invariant(void)
else
{
len
=
strlen
(
ptr
->
expect
)
+
1
;
/* include \0 */
ok
(
ret
==
len
,
"For id %d, expected ret == %d, got %d, error %d
\n
"
,
ok
(
ret
==
len
||
(
ptr
->
expect2
&&
ret
==
strlen
(
ptr
->
expect2
)
+
1
),
"For id %d, expected ret == %d, got %d, error %d
\n
"
,
ptr
->
id
,
len
,
ret
,
GetLastError
());
ok
(
!
strcmp
(
buffer
,
ptr
->
expect
),
"For id %d, Expected %s, got '%s'
\n
"
,
ok
(
!
strcmp
(
buffer
,
ptr
->
expect
)
||
(
ptr
->
expect2
&&
!
strcmp
(
buffer
,
ptr
->
expect2
)),
"For id %d, Expected %s, got '%s'
\n
"
,
ptr
->
id
,
ptr
->
expect
,
buffer
);
}
...
...
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