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
512a814e
Commit
512a814e
authored
Jan 20, 2015
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jan 20, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Just stop instead of erroring out on 8 or 9 in octal numbers.
parent
9bfd58a5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
vartest.c
dlls/oleaut32/tests/vartest.c
+0
-2
variant.c
dlls/oleaut32/variant.c
+2
-3
No files found.
dlls/oleaut32/tests/vartest.c
View file @
512a814e
...
...
@@ -1383,11 +1383,9 @@ static void test_VarParseNumFromStr(void)
/* VB oct char bigger than 7 */
CONVERT
(
"&o128"
,
NUMPRS_HEX_OCT
);
todo_wine
{
EXPECT
(
2
,
NUMPRS_HEX_OCT
,
0x40
,
4
,
3
,
0
);
EXPECTRGB
(
0
,
1
);
EXPECTRGB
(
1
,
2
);
}
EXPECTRGB
(
3
,
FAILDIG
);
/** NUMPRS_PARENS **/
...
...
dlls/oleaut32/variant.c
View file @
512a814e
...
...
@@ -1736,9 +1736,8 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags,
}
else
{
if
((
dwState
&
B_PROCESSING_OCT
)
&&
((
*
lpszStr
==
'8'
)
||
(
*
lpszStr
==
'9'
)))
{
return
DISP_E_TYPEMISMATCH
;
}
if
((
dwState
&
B_PROCESSING_OCT
)
&&
((
*
lpszStr
==
'8'
)
||
(
*
lpszStr
==
'9'
)))
break
;
if
(
pNumprs
->
dwOutFlags
&
NUMPRS_DECIMAL
)
pNumprs
->
nPwr10
--
;
/* Count decimal points in nPwr10 */
...
...
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