[ros-diffs] [reactos] 21/33: [UCRT] Fix GCC/Clang build of enum_system_locales_ex_nolock

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bb9f6bf288a444f0c70e…

commit 7bb9f6bf288a444f0c70ed59cd393935d850b539
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Wed Oct 16 13:02:08 2024 +0300
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Thu Jan 16 14:18:53 2025 +0200

    [UCRT] Fix GCC/Clang build of enum_system_locales_ex_nolock
    
    Add static function for Clang.
    Add missing __stdcall in a lambda for GCC.
    MSVC does this automagically. See
https://devblogs.microsoft.com/oldnewthing/20150220-00/?p=44623.
---
 sdk/lib/ucrt/internal/winapi_thunks.cpp | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/sdk/lib/ucrt/internal/winapi_thunks.cpp
b/sdk/lib/ucrt/internal/winapi_thunks.cpp
index 15e9d63cfa1..d0e50cfaa58 100644
--- a/sdk/lib/ucrt/internal/winapi_thunks.cpp
+++ b/sdk/lib/ucrt/internal/winapi_thunks.cpp
@@ -438,6 +438,14 @@ extern "C" int WINAPI __acrt_CompareStringEx(
     return CompareStringW(__acrt_LocaleNameToLCID(locale_name, 0), flags, string1,
string1_count, string2, string2_count);
 }
 
+#ifdef __clang__
+static LOCALE_ENUMPROCEX static_enum_proc;
+static BOOL CALLBACK LocaleEnumProcW(LPWSTR locale_string)
+{
+    return __crt_fast_decode_pointer(static_enum_proc)(locale_string, 0, 0);
+}
+#endif
+
 // This has been split into its own function to work around a bug in the Dev12
 // C++ compiler where nested captureless lambdas are not convertible to the
 // required function pointer type.
@@ -445,11 +453,21 @@ static BOOL enum_system_locales_ex_nolock(
     LOCALE_ENUMPROCEX const enum_proc
     ) throw()
 {
+#ifndef __clang__
     static LOCALE_ENUMPROCEX static_enum_proc;
+#endif
 
     static_enum_proc = __crt_fast_encode_pointer(enum_proc);
-    BOOL const result = EnumSystemLocalesW(
-        [](LPWSTR locale_string) { return
__crt_fast_decode_pointer(static_enum_proc)(locale_string, 0, 0); },
+    BOOL const result = EnumSystemLocalesW((LOCALE_ENUMPROCW)
+#ifdef __clang__
+        LocaleEnumProcW,
+#else
+        [](LPWSTR locale_string)
+        #if defined(__GNUC__) && !defined(__clang__)
+        __stdcall
+        #endif // __GNUC__
+        { return __crt_fast_decode_pointer(static_enum_proc)(locale_string, 0, 0); },
+#endif
         LCID_INSTALLED);
     static_enum_proc = __crt_fast_encode_pointer(nullptr);