Skip to content

W
wine-winehq
Commit 512a814e authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

oleaut32: Just stop instead of erroring out on 8 or 9 in octal numbers.

parent 9bfd58a5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
dlls/oleaut32/tests/vartest.c
View file @ 512a814e
...@@ -1383,11 +1383,9 @@ static void test_VarParseNumFromStr(void) ...@@ -1383,11 +1383,9 @@ static void test_VarParseNumFromStr(void)
/* VB oct char bigger than 7 */ /* VB oct char bigger than 7 */
CONVERT("&o128", NUMPRS_HEX_OCT); CONVERT("&o128", NUMPRS_HEX_OCT);
todo_wine {
EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0); EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0);
EXPECTRGB(0,1); EXPECTRGB(0,1);
EXPECTRGB(1,2); EXPECTRGB(1,2);
}
EXPECTRGB(3,FAILDIG); EXPECTRGB(3,FAILDIG);
/** NUMPRS_PARENS **/ /** NUMPRS_PARENS **/
......
dlls/oleaut32/variant.c
View file @ 512a814e
...@@ -1736,9 +1736,8 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, ...@@ -1736,9 +1736,8 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags,
} }
else else
{ {
if ((dwState & B_PROCESSING_OCT) && ((*lpszStr == '8') || (*lpszStr == '9'))) { if ((dwState & B_PROCESSING_OCT) && ((*lpszStr == '8') || (*lpszStr == '9')))
return DISP_E_TYPEMISMATCH; break;
}
if (pNumprs->dwOutFlags & NUMPRS_DECIMAL) if (pNumprs->dwOutFlags & NUMPRS_DECIMAL)
pNumprs->nPwr10--; /* Count decimal points in nPwr10 */ pNumprs->nPwr10--; /* Count decimal points in nPwr10 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment