Alexandre Julliard : kernelbase: Reimplement LOCALE_*CURRNAME/CURRENCY in GetLocaleInfoW/Ex using the locale.nls data.
Alexandre Julliard
julliard at winehq.org
Tue Mar 29 15:09:53 CDT 2022
Module: wine
Branch: master
Commit: 62cd33e6b0fd60dbd2a12d6734ff821f8ca5187d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=62cd33e6b0fd60dbd2a12d6734ff821f8ca5187d
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Mar 29 08:36:41 2022 +0200
kernelbase: Reimplement LOCALE_*CURRNAME/CURRENCY in GetLocaleInfoW/Ex using the locale.nls data.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernelbase/locale.c | 8 ++++----
dlls/oleaut32/tests/vartest.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index b3cc0b0d3f0..98e0041f901 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -970,10 +970,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
return -1;
case LOCALE_SCURRENCY:
- return -1;
+ return locale_return_string( locale->scurrency, type, buffer, len );
case LOCALE_SINTLSYMBOL:
- return -1;
+ return locale_return_string( locale->sintlsymbol, type, buffer, len );
case LOCALE_SMONDECIMALSEP:
return -1;
@@ -1241,10 +1241,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
return -1;
case LOCALE_SENGCURRNAME:
- return -1;
+ return locale_return_string( locale->sengcurrname, type, buffer, len );
case LOCALE_SNATIVECURRNAME:
- return -1;
+ return locale_return_string( locale->snativecurrname, type, buffer, len );
case LOCALE_ICALENDARTYPE:
return -1;
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index 03eb566f555..db0562e2d03 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -2460,10 +2460,10 @@ static void test_VarParseNumFromStrMisc(void)
lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT);
WCONVERT(L"3CHF", NUMPRS_CURRENCY|NUMPRS_USE_ALL);
/* Windows <= 8.1 uses an old currency symbol: "fr. 5" */
- todo_wine ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08lx\n", hres);
+ ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08lx\n", hres);
if (hres == S_OK)
{
- todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0);
+ EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0);
EXPECT2(3,FAILDIG);
}
More information about the wine-cvs
mailing list