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

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Mar 28 12:13:04 2022 +0200

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

Signed-off-by: Alexandre Julliard

---

dlls/kernelbase/locale.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index 258893cada6..39d7fe1ccd9 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -1103,7 +1103,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ
         return -1;

case LOCALE_SPARENT:
-        return -1;
+        return locale_return_string( locale->sparent, type, buffer, len );

case LOCALE_SCONSOLEFALLBACKNAME:
         return -1;
@@ -5017,17 +5017,6 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoEx( const WCHAR *name, LCTYPE info, WC

lcid = LocaleNameToLCID( name, 0 );
     if (!lcid) return 0;
-
-    /* special handling for neutral locale names */
-    if (name && lstrlenW( name ) == 2)
-    {
-        switch (LOWORD( info ))
-        {
-        case LOCALE_SPARENT:
-            if (len) buffer[0] = 0;
-            return 1;
-        }
-    }
     return GetLocaleInfoW( lcid, info, buffer, len );
 }