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
0963a869
Commit
0963a869
authored
Jun 05, 2018
by
Piotr Caban
Committed by
Alexandre Julliard
Jun 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp120: Fix _Getcvt tests when zh_CN system locale is used.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
55f036e7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
msvcp120.c
dlls/msvcp120/tests/msvcp120.c
+11
-5
No files found.
dlls/msvcp120/tests/msvcp120.c
View file @
0963a869
...
...
@@ -190,7 +190,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps)
static
char
*
(
__cdecl
*
p_setlocale
)(
int
,
const
char
*
);
static
int
(
__cdecl
*
p__setmbcp
)(
int
);
static
int
(
__cdecl
*
p_
isleadbyte
)(
int
);
static
int
(
__cdecl
*
p_
_ismbblead
)(
unsigned
int
);
static
MSVCRT_long
(
__cdecl
*
p__Xtime_diff_to_millis2
)(
const
xtime
*
,
const
xtime
*
);
static
int
(
__cdecl
*
p_xtime_get
)(
xtime
*
,
int
);
...
...
@@ -673,7 +673,7 @@ static BOOL init(void)
hdll
=
GetModuleHandleA
(
"msvcr120.dll"
);
p_setlocale
=
(
void
*
)
GetProcAddress
(
hdll
,
"setlocale"
);
p__setmbcp
=
(
void
*
)
GetProcAddress
(
hdll
,
"_setmbcp"
);
p_
isleadbyte
=
(
void
*
)
GetProcAddress
(
hdll
,
"isleadbyte
"
);
p_
_ismbblead
=
(
void
*
)
GetProcAddress
(
hdll
,
"_ismbblead
"
);
hdll
=
GetModuleHandleA
(
"kernel32.dll"
);
pCreateSymbolicLinkA
=
(
void
*
)
GetProcAddress
(
hdll
,
"CreateSymbolicLinkA"
);
...
...
@@ -806,8 +806,14 @@ static void test__Getcvt(void)
ok
(
cvtvec
.
page
==
936
,
"cvtvec.page = %d
\n
"
,
cvtvec
.
page
);
ok
(
cvtvec
.
mb_max
==
2
,
"cvtvec.mb_max = %d
\n
"
,
cvtvec
.
mb_max
);
ok
(
cvtvec
.
unk
==
0
,
"cvtvec.unk = %d
\n
"
,
cvtvec
.
unk
);
for
(
i
=
0
;
i
<
32
;
i
++
)
ok
(
cvtvec
.
isleadbyte
[
i
]
==
0
,
"cvtvec.isleadbyte[%d] = %x
\n
"
,
i
,
cvtvec
.
isleadbyte
[
i
]);
for
(
i
=
0
;
i
<
32
;
i
++
)
{
BYTE
b
=
0
;
int
j
;
for
(
j
=
0
;
j
<
8
;
j
++
)
b
|=
(
p__ismbblead
(
i
*
8
+
j
)
?
1
:
0
)
<<
j
;
ok
(
cvtvec
.
isleadbyte
[
i
]
==
b
,
"cvtvec.isleadbyte[%d] = %x (%x)
\n
"
,
i
,
cvtvec
.
isleadbyte
[
i
],
b
);
}
p__setmbcp
(
936
);
p__Getcvt
(
&
cvtvec
);
...
...
@@ -819,7 +825,7 @@ static void test__Getcvt(void)
int
j
;
for
(
j
=
0
;
j
<
8
;
j
++
)
b
|=
(
p_
isleadbyte
(
i
*
8
+
j
)
?
1
:
0
)
<<
j
;
b
|=
(
p_
_ismbblead
(
i
*
8
+
j
)
?
1
:
0
)
<<
j
;
ok
(
cvtvec
.
isleadbyte
[
i
]
==
b
,
"cvtvec.isleadbyte[%d] = %x (%x)
\n
"
,
i
,
cvtvec
.
isleadbyte
[
i
],
b
);
}
}
...
...
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