ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: VarParseNumFromStr() does not allow leading thousands separators. 

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit de70f7289e)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Francois Gouget 2021-07-22 00:03:47 +02:00 committed by Michael Stefaniuc
parent 806b738a11
commit 014c114a28
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/oleaut32/tests/vartest.c
View File

@ -1605,7 +1605,7 @@ static void test_VarParseNumFromStrEn(void)
/* With flag, but leading thousands separators are not allowed */ /* With flag, but leading thousands separators are not allowed */
CONVERT(",1,000", NUMPRS_THOUSANDS); CONVERT(",1,000", NUMPRS_THOUSANDS);
todo_wine EXPECTFAIL; EXPECTFAIL;
/* With flag, thousands separator not needed but still reported */ /* With flag, thousands separator not needed but still reported */
CONVERT("1,", NUMPRS_THOUSANDS); CONVERT("1,", NUMPRS_THOUSANDS);
@ -1982,7 +1982,7 @@ static void test_VarParseNumFromStrFr(void)
/* With flag, but leading thousands separators are not allowed */ /* With flag, but leading thousands separators are not allowed */
CONVERT(" 1 000", NUMPRS_THOUSANDS); CONVERT(" 1 000", NUMPRS_THOUSANDS);
todo_wine EXPECTFAIL; EXPECTFAIL;
/* With flag, thousands separator not needed but still reported */ /* With flag, thousands separator not needed but still reported */
CONVERT("1 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); CONVERT("1 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL);

6
dlls/oleaut32/variant.c
View File

@ -1651,6 +1651,12 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags,
lpszStr++; lpszStr++;
} while (iswspace(*lpszStr)); } while (iswspace(*lpszStr));
} }
else if (pNumprs->dwInFlags & NUMPRS_THOUSANDS &&
((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) ||
(cDigitSeparator2 && *lpszStr == cDigitSeparator2)))
{
return DISP_E_TYPEMISMATCH; /* Not allowed before the first digit */
}
else if (pNumprs->dwInFlags & NUMPRS_LEADING_PLUS && else if (pNumprs->dwInFlags & NUMPRS_LEADING_PLUS &&
*lpszStr == chars.cPositiveSymbol && *lpszStr == chars.cPositiveSymbol &&
!(pNumprs->dwOutFlags & NUMPRS_LEADING_PLUS)) !(pNumprs->dwOutFlags & NUMPRS_LEADING_PLUS))