Alexandre Julliard : kernelbase: Reimplement LOCALE_*DISPLAYNAME in GetLocaleInfoW/Ex using the locale.nls data.

Alexandre Julliard julliard at winehq.org
Mon Mar 28 15:53:40 CDT 2022


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Mar 28 12:29:57 2022 +0200

kernelbase: Reimplement LOCALE_*DISPLAYNAME in GetLocaleInfoW/Ex using the locale.nls data.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernelbase/locale.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index 2faec8136b9..2e512240b2b 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -903,7 +903,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
         return locale_return_number( val, type, buffer, len );
 
     case LOCALE_SLOCALIZEDDISPLAYNAME:
-        return -1;
+        /* FIXME: localization */
+        return locale_return_string( locale->sengdisplayname, type, buffer, len );
 
     case LOCALE_SABBREVLANGNAME:
         return locale_return_string( locale->sabbrevlangname, type, buffer, len );
@@ -1161,10 +1162,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
         return -1;
 
     case LOCALE_SENGLISHDISPLAYNAME:
-        return -1;
+        return locale_return_string( locale->sengdisplayname, type, buffer, len );
 
     case LOCALE_SNATIVEDISPLAYNAME:
-        return -1;
+        return locale_return_string( locale->snativedisplayname, type, buffer, len );
 
     case LOCALE_INEGATIVEPERCENT:
         return -1;




More information about the wine-cvs mailing list