commit 9d3485bd875488af3411ff4586a556b0efdcecf0
author Steve Lhomme <robux4@ycbcr.xyz> Fri Apr 17 14:27:14 2020 +0200
committer Liu Hao <lh_mouse@126.com> Sat Apr 18 20:11:39 2020 +0800
tree 3cff9267677149a83eaa2fc97b9f3b0bc3489eb7
parent 6fd5d416a2429f103be0332fb25a2c1c66cb82fd

headers: add more locale API's allowed in winstore builds

https://docs.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-localization-obsolete-l1-2-0dll
https://docs.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-localization-ansi-l1-1-0dll
Signed-off-by: Liu Hao <lh_mouse@126.com>

mingw-w64-headers/include/winnls.h

diff --git a/mingw-w64-headers/include/winnls.h b/mingw-w64-headers/include/winnls.h
index cce28da..0e338e0 100644
--- a/mingw-w64-headers/include/winnls.h
+++ b/mingw-w64-headers/include/winnls.h
@@ -1007,12 +1007,10 @@
   WINBASEAPI LCID WINAPI GetThreadLocale (void);
   WINBASEAPI WINBOOL WINAPI SetThreadLocale (LCID Locale);
   WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage (void);
-  WINBASEAPI LANGID WINAPI GetUserDefaultUILanguage (void);
   WINBASEAPI LANGID WINAPI GetSystemDefaultLangID (void);
   WINBASEAPI LCID WINAPI GetSystemDefaultLCID (void);
   WINBASEAPI LCID WINAPI GetUserDefaultLCID (void);
   WINBASEAPI LANGID WINAPI SetThreadUILanguage (LANGID LangId);
-  WINBASEAPI WINBOOL WINAPI GetStringTypeExA (LCID Locale, DWORD dwInfoType, LPCSTR lpSrcStr, int cchSrc, LPWORD lpCharType);
   WINBASEAPI WINBOOL WINAPI GetStringTypeA (LCID Locale, DWORD dwInfoType, LPCSTR lpSrcStr, int cchSrc, LPWORD lpCharType);
   WINBASEAPI int WINAPI FoldStringA (DWORD dwMapFlags, LPCSTR lpSrcStr, int cchSrc, LPSTR lpDestStr, int cchDest);
   WINBASEAPI WINBOOL WINAPI EnumSystemLocalesA (LOCALE_ENUMPROCA lpLocaleEnumProc, DWORD dwFlags);
@@ -1021,8 +1019,6 @@
   WINBASEAPI WINBOOL WINAPI EnumSystemLanguageGroupsW (LANGUAGEGROUP_ENUMPROCW lpLanguageGroupEnumProc, DWORD dwFlags, LONG_PTR lParam);
   WINBASEAPI WINBOOL WINAPI EnumLanguageGroupLocalesA (LANGGROUPLOCALE_ENUMPROCA lpLangGroupLocaleEnumProc, LGRPID LanguageGroup, DWORD dwFlags, LONG_PTR lParam);
   WINBASEAPI WINBOOL WINAPI EnumLanguageGroupLocalesW (LANGGROUPLOCALE_ENUMPROCW lpLangGroupLocaleEnumProc, LGRPID LanguageGroup, DWORD dwFlags, LONG_PTR lParam);
-  WINBASEAPI WINBOOL WINAPI EnumUILanguagesA (UILANGUAGE_ENUMPROCA lpUILanguageEnumProc, DWORD dwFlags, LONG_PTR lParam);
-  WINBASEAPI WINBOOL WINAPI EnumUILanguagesW (UILANGUAGE_ENUMPROCW lpUILanguageEnumProc, DWORD dwFlags, LONG_PTR lParam);
 #if WINVER >= 0x0600
   WINBASEAPI LANGID WINAPI GetThreadUILanguage (void);
   WINBASEAPI WINBOOL WINAPI GetProcessPreferredUILanguages (DWORD dwFlags, PULONG pulNumLanguages, PZZWSTR pwszLanguagesBuffer, PULONG pcchLanguagesBuffer);
@@ -1039,7 +1035,6 @@
 
 #ifndef UNICODE
 #define FoldString FoldStringA
-#define GetStringTypeEx GetStringTypeExA
 #endif
 
 #define EnumSystemLocales __MINGW_NAME_AW(EnumSystemLocales)
@@ -1050,10 +1045,18 @@
 #endif
 
 #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
+  WINBASEAPI WINBOOL WINAPI GetStringTypeExA (LCID Locale, DWORD dwInfoType, LPCSTR lpSrcStr, int cchSrc, LPWORD lpCharType);
+  WINBASEAPI LANGID WINAPI GetUserDefaultUILanguage (void);
+  WINBASEAPI WINBOOL WINAPI EnumUILanguagesA (UILANGUAGE_ENUMPROCA lpUILanguageEnumProc, DWORD dwFlags, LONG_PTR lParam);
+  WINBASEAPI WINBOOL WINAPI EnumUILanguagesW (UILANGUAGE_ENUMPROCW lpUILanguageEnumProc, DWORD dwFlags, LONG_PTR lParam);
   WINBASEAPI WINBOOL WINAPI EnumSystemCodePagesA (CODEPAGE_ENUMPROCA lpCodePageEnumProc, DWORD dwFlags);
   WINBASEAPI WINBOOL WINAPI EnumSystemCodePagesW (CODEPAGE_ENUMPROCW lpCodePageEnumProc, DWORD dwFlags);
   WINBASEAPI LANGID WINAPI GetUserDefaultLangID (void);
 
+#ifndef UNICODE
+#define GetStringTypeEx GetStringTypeExA
+#endif
+
 #define EnumSystemCodePages __MINGW_NAME_AW(EnumSystemCodePages)
 
 #if WINVER >= 0x0600