Module: wine Branch: oldstable Commit: f82b97c7781be50010e44edc5f837ad26d1fa62a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f82b97c7781be50010e44edc5...
Author: Francois Gouget fgouget@codeweavers.com Date: Tue Jul 27 01:43:17 2021 +0200
oleaut32/tests: Add more VarParseNumFromStr() hexadecimal/octal tests.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit a74e2871abd83422f2a152b537dd510ee73b1cbd) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/oleaut32/tests/vartest.c | 49 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index ebf4e28d92f..0d42dd7e852 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1494,7 +1494,7 @@ static void test_VarParseNumFromStrEn(void) EXPECTFAIL; EXPECTRGB(0,FAILDIG);
- /* Octal */ + /* A leading 0 does not an octal number make */ CONVERT("0100", NUMPRS_HEX_OCT); EXPECT(1,NUMPRS_HEX_OCT,0,4,0,2); EXPECTRGB(0,1); @@ -1545,6 +1545,20 @@ static void test_VarParseNumFromStrEn(void) EXPECTRGB(1,2); EXPECTRGB(3,FAILDIG);
+ /* Only integers are allowed when using an alternative radix */ + CONVERT("&ha.2", NUMPRS_HEX_OCT|NUMPRS_DECIMAL); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_DECIMAL,NUMPRS_HEX_OCT,3,4,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,10); + todo_wine EXPECTRGB(1,FAILDIG); + + /* Except if it looks like a plain decimal number */ + CONVERT("01.2", NUMPRS_HEX_OCT|NUMPRS_DECIMAL); + EXPECT(2,NUMPRS_HEX_OCT|NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-1); + EXPECT2(1,2); + EXPECTRGB(3,FAILDIG); + /** NUMPRS_PARENS **/
/* Empty parens = error */ @@ -1583,6 +1597,14 @@ static void test_VarParseNumFromStrEn(void) */ EXPECTRGB(4,FAILDIG);
+ /* With flag, thousands sep. and following digits consumed */ + CONVERT("&h1,000", NUMPRS_HEX_OCT|NUMPRS_THOUSANDS); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_THOUSANDS,NUMPRS_HEX_OCT,3,4,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,1); + todo_wine EXPECTRGB(1,FAILDIG); + /* With flag and decimal point, thousands sep. but not decimals consumed */ CONVERT("1,001.0", NUMPRS_THOUSANDS); EXPECT(4,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,0); @@ -1635,6 +1657,17 @@ static void test_VarParseNumFromStrEn(void) EXPECT2(1,1); EXPECTRGB(2,FAILDIG);
+ /* With flag, currency amounts cannot be in hexadecimal */ + CONVERT("$&ha", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); + todo_wine EXPECTFAIL; + + CONVERT("&ha$", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_CURRENCY,NUMPRS_HEX_OCT,3,4,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,10); + EXPECTRGB(1,FAILDIG); + /* With flag, the sign cannot be repeated before the amount */ CONVERT("$$11", NUMPRS_CURRENCY); EXPECTFAIL; @@ -1767,6 +1800,20 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,3,0,1); EXPECT2(1,FAILDIG);
+ /* With flag, incompatible with NUMPRS_HEX_OCT */ + CONVERT("&o1e1", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,3,3,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECT2(1,FAILDIG); + + /* With flag, even if it sort of looks like an exponent */ + CONVERT("&h1e2", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); + EXPECT(3,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,5,4,0); + EXPECT2(1,0xe); + EXPECTRGB(2,2); + EXPECTRGB(3,FAILDIG); + /* Negative exponents are accepted without flags */ CONVERT("1e-1", NUMPRS_EXPONENT); EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,4,0,-1);