Alexandre Julliard : kernelbase: Reimplement LOCALE_*AM/PM 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: 37278557dd5f9c377e84ac1bc4922ce53c8f16c6
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=37278557dd5f9c377e84ac1bc4922ce53c8f16c6

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Mar 29 08:36:35 2022 +0200

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

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

---

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

diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index e3960c1e74e..b3cc0b0d3f0 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -1028,10 +1028,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
         return -1;
 
     case LOCALE_S1159:
-        return -1;
+        return locale_return_string( locale->s1159, type, buffer, len );
 
     case LOCALE_S2359:
-        return -1;
+        return locale_return_string( locale->s2359, type, buffer, len );
 
     case LOCALE_SDAYNAME1:
     case LOCALE_SDAYNAME2:
@@ -1216,10 +1216,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
         return -1;
 
     case LOCALE_SSHORTESTAM:
-        return -1;
+        return locale_return_string( locale->sshortestam, type, buffer, len );
 
     case LOCALE_SSHORTESTPM:
-        return -1;
+        return locale_return_string( locale->sshortestpm, type, buffer, len );
 
     case LOCALE_SENGLANGUAGE:
         return locale_return_string( locale->senglanguage, type, buffer, len );




More information about the wine-cvs mailing list