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
38794b4b
Commit
38794b4b
authored
Oct 07, 2011
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Oct 08, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix some VarCyFrom* tests.
Due to a broken EXPECTRES macro the EXPECT_OVERFLOW accepts S_OK return values.
parent
6b164a52
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
vartype.c
dlls/oleaut32/tests/vartype.c
+6
-2
vartype.c
dlls/oleaut32/vartype.c
+1
-1
No files found.
dlls/oleaut32/tests/vartype.c
View file @
38794b4b
...
...
@@ -3720,7 +3720,9 @@ static void test_VarCyFromUI8(void)
CONVERT
(
VarCyFromUI8
,
0
);
EXPECTCY
(
0
);
CONVERT
(
VarCyFromUI8
,
1
);
EXPECTCY
(
1
);
CONVERT_I8
(
VarCyFromUI8
,
214748
,
1566804068
);
EXPECTCY64
(
2147483647ul
,
4294951488ul
);
CONVERT_I8
(
VarCyFromUI8
,
214748
,
1566804069
);
EXPECT_OVERFLOW
;
CONVERT_I8
(
VarCyFromUI8
,
214748
,
1566804069
);
EXPECTCY64
(
2147483647ul
,
4294961488ul
);
CONVERT_I8
(
VarCyFromUI8
,
214748
,
1566804070
);
EXPECT_OVERFLOW
;
CONVERT_I8
(
VarCyFromUI8
,
214749
,
1566804068
);
EXPECT_OVERFLOW
;
}
static
void
test_VarCyFromDec
(
void
)
...
...
@@ -3736,7 +3738,9 @@ static void test_VarCyFromDec(void)
CONVERT_DEC
(
VarCyFromDec
,
0
,
0
,
0
,
1
);
EXPECTCY
(
1
);
CONVERT_DEC64
(
VarCyFromDec
,
0
,
0
,
0
,
214748
,
1566804068
);
EXPECTCY64
(
2147483647ul
,
4294951488ul
);
CONVERT_DEC64
(
VarCyFromDec
,
0
,
0
,
0
,
214748
,
1566804069
);
EXPECT_OVERFLOW
;
CONVERT_DEC64
(
VarCyFromDec
,
0
,
0
,
0
,
214748
,
1566804069
);
EXPECTCY64
(
2147483647ul
,
4294961488ul
);
CONVERT_DEC64
(
VarCyFromDec
,
0
,
0
,
0
,
214748
,
1566804070
);
EXPECT_OVERFLOW
;
CONVERT_DEC64
(
VarCyFromDec
,
0
,
0
,
0
,
214749
,
1566804068
);
EXPECT_OVERFLOW
;
CONVERT_DEC
(
VarCyFromDec
,
2
,
0
,
0
,
100
);
EXPECTCY
(
1
);
CONVERT_DEC
(
VarCyFromDec
,
2
,
0x80
,
0
,
100
);
EXPECTCY
(
-
1
);
...
...
dlls/oleaut32/vartype.c
View file @
38794b4b
...
...
@@ -3764,7 +3764,7 @@ HRESULT WINAPI VarCyFromI8(LONG64 llIn, CY* pCyOut)
*/
HRESULT
WINAPI
VarCyFromUI8
(
ULONG64
ullIn
,
CY
*
pCyOut
)
{
if
(
ullIn
>
=
(
I8_MAX
/
CY_MULTIPLIER
))
return
DISP_E_OVERFLOW
;
if
(
ullIn
>
(
I8_MAX
/
CY_MULTIPLIER
))
return
DISP_E_OVERFLOW
;
pCyOut
->
int64
=
ullIn
*
CY_MULTIPLIER
;
return
S_OK
;
}
...
...
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