Alistair Leslie-Hughes : oleaut32: Correctly get the Currency separator in VarFormatCurrency.

Alexandre Julliard julliard at winehq.org
Wed May 15 14:32:21 CDT 2019


Module: wine
Branch: stable
Commit: 31b05fdc7229ba8c95b370e55336cb4380f4dab0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=31b05fdc7229ba8c95b370e55336cb4380f4dab0

Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date:   Sun Feb 24 07:00:32 2019 +0000

oleaut32: Correctly get the Currency separator in VarFormatCurrency.

LOCALE_SCURRENCY allows for 13 chracters including the NULL.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46442
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 29cf8ee8ab54f35def5b4c5ed7d155b730bf901e)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/oleaut32/varformat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c
index 470ea4e..d6ce4a9 100644
--- a/dlls/oleaut32/varformat.c
+++ b/dlls/oleaut32/varformat.c
@@ -2443,7 +2443,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading,
 
   if (SUCCEEDED(hRet))
   {
-    WCHAR buff[256], decimal[8], thousands[8], currency[8];
+    WCHAR buff[256], decimal[8], thousands[8], currency[13];
     CURRENCYFMTW numfmt;
 
     if (nDigits < 0)
@@ -2484,7 +2484,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading,
     numfmt.lpThousandSep = thousands;
     GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, ARRAY_SIZE(thousands));
     numfmt.lpCurrencySymbol = currency;
-    GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, currency, ARRAY_SIZE(currency));
+    GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, currency, ARRAY_SIZE(currency));
 
     /* use NLS as per VarFormatNumber() */
     if (GetCurrencyFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, buff, ARRAY_SIZE(buff)))




More information about the wine-cvs mailing list