Alexandre Julliard : kernelbase: Reimplement LOCALE_ICOUNTRY/IGEOID in GetLocaleInfoW/Ex using the locale.nls data.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Tue Mar 29 08:36:46 2022 +0200

kernelbase: Reimplement LOCALE_ICOUNTRY/IGEOID in GetLocaleInfoW/Ex using the locale.nls data.

Signed-off-by: Alexandre Julliard

---

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

diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index 98e0041f901..2a74cab6500 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -923,7 +923,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
         return locale_return_string( locale->snativelangname, type, buffer, len );

case LOCALE_ICOUNTRY:
-        return -1;
+        return locale_return_number( locale->icountry, type, buffer, len );

case LOCALE_SLOCALIZEDCOUNTRYNAME:
         /* FIXME: localization */
@@ -939,7 +939,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
         return locale_return_number( locale->idefaultlanguage, type, buffer, len );

case LOCALE_IDEFAULTCOUNTRY:
-        return -1;
+        return locale_return_number( locale->icountry, type, buffer, len );

case LOCALE_IDEFAULTCODEPAGE:
         val = locale->idefaultcodepage == CP_UTF8 ? CP_OEMCP : locale->idefaultcodepage;
@@ -1119,7 +1119,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
         return locale_return_string( locale->siso3166ctryname, type, buffer, len );

case LOCALE_IGEOID:
-        return -1;
+        return locale_return_number( locale->igeoid, type, buffer, len );

case LOCALE_SNAME:
         if (SORTIDFROMLCID(lcid))  /* custom sort locale */