Francois Gouget : oleaut32: Fix VarParseNumFromStr()'s support for two-character currencies.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4e34e7513d3fdd590c8d5edff4003efc7ba4b135
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4e34e7513d3fdd590c8d5edff...

Author: Francois Gouget 
Date:   Tue Jul 20 14:02:23 2021 +0200

oleaut32: Fix VarParseNumFromStr()'s support for two-character currencies.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51452
Signed-off-by: Francois Gouget 
Signed-off-by: Alexandre Julliard

---

dlls/oleaut32/tests/vartest.c | 7 +++----
 dlls/oleaut32/variant.c       | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index c4cc0074ffa..8a666281384 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -2154,14 +2154,13 @@ static void test_VarParseNumFromStrMisc(void)
   /* 2 Polish zloty */
   lcid = MAKELCID(MAKELANGID(LANG_POLISH,SUBLANG_POLISH_POLAND),SORT_DEFAULT);
   WCONVERT(L"z\x142\x32", NUMPRS_CURRENCY|NUMPRS_USE_ALL);
-  todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,3,0,0);
-  todo_wine EXPECT2(2,FAILDIG);
+  EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,3,0,0);
+  EXPECT2(2,FAILDIG);

/* Multi-character currencies can be repeated too "zl2zlzl" */
   WCONVERT(L"z\x142\x32z\x142z\x142", NUMPRS_CURRENCY|NUMPRS_USE_ALL);
   todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,7,0,0);
-  todo_wine EXPECTRGB(0,2);
-  EXPECTRGB(1,FAILDIG);
+  EXPECT2(2,FAILDIG);

lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT);
   WCONVERT(L"3CHF", NUMPRS_CURRENCY|NUMPRS_USE_ALL);
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index fdc402c7a62..71c3204e0a0 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -1669,8 +1669,8 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla
              (!chars.cCurrencyLocal2 || lpszStr[1] == chars.cCurrencyLocal2))
     {
       pNumprs->dwOutFlags |= NUMPRS_CURRENCY;
-      cchUsed++;
-      lpszStr++;
+      cchUsed += chars.cCurrencyLocal2 ? 2 : 1;
+      lpszStr += chars.cCurrencyLocal2 ? 2 : 1;
       /* Only accept currency characters */
       chars.cDecimalPoint = chars.cCurrencyDecimalPoint;
       chars.cDigitSeparator = chars.cCurrencyDigitSeparator;