gcc weirdness

Author: DarkFire01

dll/shellext/shellbtrfs/shellext.h

@@ -388,8 +388,13 @@ class ntstatus_error : public exception {
     string msg;
 };
 
-#ifdef __REACTOS__
-inline wstring to_wstring(uint8_t a) { WCHAR buffer[16]; swprintf(buffer, L"%d", a); return wstring(buffer); } 
+#if defined(__REACTOS__) && !defined(__GNUC__)
+/* Older/MSVC standard libraries shipped no wchar_t to_wstring overloads, so
+   ReactOS provided its own. A modern libstdc++ (GCC) already declares the full
+   set of std::to_wstring overloads, and with the 'using namespace std' above
+   these local shims tie with them and make calls ambiguous; only define them
+   where the standard library does not. */
+inline wstring to_wstring(uint8_t a) { WCHAR buffer[16]; swprintf(buffer, L"%d", a); return wstring(buffer); }
 inline wstring to_wstring(uint16_t a) { WCHAR buffer[16]; swprintf(buffer, L"%d", a); return wstring(buffer); }
 inline wstring to_wstring(uint32_t a) { WCHAR buffer[32]; swprintf(buffer, L"%ld", a); return wstring(buffer); }
 inline wstring to_wstring(uint64_t a) { WCHAR buffer[64]; swprintf(buffer, L"%I64d", a); return wstring(buffer); }

dll/win32/msvcrt/CMakeLists.txt

@@ -126,6 +126,7 @@ list(APPEND MSVCRT_SOURCE
     ${SHARED_SOURCE}
     ${msvcrt_shared_asm}
     reactos/misc.c
+    reactos/mingw_compat.c
     reactos/system.cpp
     concurrency.c
     console.c

dll/win32/msvcrt/exit.c

@@ -321,6 +321,18 @@ void DECLSPEC_NORETURN CDECL _assert(const char* str, const char* file, unsigned
     _wassert(strW, fileW, line);
 }
 
+/*********************************************************************
+ *		__msvcrt_assert (MSVCRT.@)
+ *
+ * A modern mingw-w64 libstdc++/libmingwex calls __msvcrt_assert (imported from
+ * msvcrt.dll) from its assert() path. Real msvcrt exports it; ReactOS only
+ * shipped _assert, so forward to it here.
+ */
+void DECLSPEC_NORETURN CDECL __msvcrt_assert(const char* str, const char* file, unsigned int line)
+{
+    _assert(str, file, line);
+}
+
 /*********************************************************************
  *		_c_exit (MSVCRT.@)
  */

dll/win32/msvcrt/msvcrt.spec

@@ -331,6 +331,12 @@
 # stub -version=0x600+ _aligned_realloc_dbg(ptr long long str long)
 @ cdecl _amsg_exit(long)
 @ cdecl _assert(str str long)
+@ cdecl __msvcrt_assert(str str long)
+@ cdecl -ret64 lseek64(long int64 long)
+@ cdecl fstat64(long ptr)
+@ cdecl fseeko64(ptr int64 long)
+@ cdecl -ret64 ftello64(ptr)
+@ cdecl wctype(str)
 @ cdecl _atodbl(ptr str)
 @ cdecl -version=0x600+ _atodbl_l(ptr str ptr)
 @ cdecl -version=0x600+ _atof_l(str ptr)

dll/win32/msvcrt/reactos/mingw_compat.c

@@ -0,0 +1,70 @@
+/*
+ * PROJECT:     ReactOS msvcrt.dll
+ * LICENSE:     MIT (https://spdx.org/licenses/MIT)
+ * PURPOSE:     POSIX/large-file CRT names expected by a modern mingw-w64
+ *              libstdc++ (e.g. GCC 16). The real mingw CRT (msvcrt/ucrt)
+ *              exports these; ReactOS only shipped the _-prefixed Win32
+ *              variants, so provide thin forwarders here. Consumed by C++
+ *              modules that link the real libstdc++ (e.g. its std::basic_file).
+ */
+
+#include <stdio.h>
+#include <io.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <msvcrt.h>
+
+__int64 __cdecl lseek64(int _FileHandle, __int64 _Offset, int _Origin)
+{
+    return _lseeki64(_FileHandle, _Offset, _Origin);
+}
+
+int __cdecl fstat64(int _FileHandle, struct _stat64 *_Stat)
+{
+    return _fstat64(_FileHandle, _Stat);
+}
+
+int __cdecl fseeko64(FILE *_File, __int64 _Offset, int _Origin)
+{
+    return _fseeki64(_File, _Offset, _Origin);
+}
+
+__int64 __cdecl ftello64(FILE *_File)
+{
+    return _ftelli64(_File);
+}
+
+/*
+ * wctype() maps a character-class name to a mask usable with iswctype().
+ * msvcrt's ctype.c only compiles it for _MSVCR_VER >= 120, but a modern
+ * libstdc++ imports it from msvcrt.dll, so provide it here for plain msvcrt.
+ */
+#if _MSVCR_VER < 120
+unsigned short __cdecl wctype(const char *_Property)
+{
+    static const struct { const char *name; unsigned short mask; } properties[] =
+    {
+        { "alnum", _DIGIT | _ALPHA },
+        { "alpha", _ALPHA },
+        { "cntrl", _CONTROL },
+        { "digit", _DIGIT },
+        { "graph", _DIGIT | _PUNCT | _ALPHA },
+        { "lower", _LOWER },
+        { "print", _DIGIT | _PUNCT | _BLANK | _ALPHA },
+        { "punct", _PUNCT },
+        { "space", _SPACE },
+        { "upper", _UPPER },
+        { "xdigit", _HEX },
+    };
+    unsigned int i;
+
+    for (i = 0; i < sizeof(properties) / sizeof(properties[0]); i++)
+    {
+        if (strcmp(_Property, properties[i].name) == 0)
+            return properties[i].mask;
+    }
+
+    return 0;
+}
+#endif /* _MSVCR_VER < 120 */

dll/win32/urlmon/CMakeLists.txt

@@ -5,7 +5,12 @@ add_definitions(
     -DPROXY_DELEGATION
     -DWINE_REGISTER_DLL
     -D_CRT_NON_CONFORMING_SWPRINTFS
-    -DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}})
+    # NOTE: the spaces and quoting below are intentional. They force CMake to
+    # shell-quote this argument in the generated command, preventing bash (which
+    # is /bin/sh on some distros and is used by Ninja) from brace-expanding the
+    # unquoted "{a,b,c}" GUID initializer into multiple conflicting
+    # -DPROXY_CLSID_IS definitions ("'PROXY_CLSID_IS' redefined").
+    "-DPROXY_CLSID_IS={0x79EAC9F1, 0xBAF9, 0x11CE, {0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B}}")
 
 spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB)
 add_rpcproxy_files(urlmon_urlmon.idl)

drivers/base/kdnet/kdnet_init.c

@@ -48,7 +48,7 @@ static ULONGLONG KdNetBase36ToU64(const char* s, const char** end)
 static BOOLEAN KdNetReadTokenCI(const char* opts, const char* key, char* out, SIZE_T outChars);
 static BOOLEAN KdNetParseIpv4(const char* s, ULONG* outHostOrder);
 static BOOLEAN KdNetParseUlongDec(const char* s, ULONG* out);
-static __forceinline BOOLEAN KdNetHasFlagCI(const char* opts, const char* key);
+static __inline BOOLEAN KdNetHasFlagCI(const char* opts, const char* key);
 static KDNET_SHARED_DATA g_KdNetSharedData;
 
 static VOID KdNetWireRuntimeParameters(_In_opt_ PCHAR LoaderOptions)
@@ -127,12 +127,12 @@ static VOID KdNetWireRuntimeParameters(_In_opt_ PCHAR LoaderOptions)
     }
 }
 
-static __forceinline int KdNetIsSpace(char c)
+static __inline int KdNetIsSpace(char c)
 {
     return (c == ' ' || c == '\t' || c == '\r' || c == '\n');
 }
 
-static __forceinline char KdNetToUpper(char c)
+static __inline char KdNetToUpper(char c)
 {
     if (c >= 'a' && c <= 'z') return (char)(c - ('a' - 'A'));
     return c;
@@ -249,7 +249,7 @@ static BOOLEAN KdNetParseIpv4(const char* s, ULONG* outHostOrder)
     return TRUE;
 }
 
-static __forceinline BOOLEAN KdNetHasFlagCI(const char* opts, const char* key)
+static __inline BOOLEAN KdNetHasFlagCI(const char* opts, const char* key)
 {
     return (KdNetFindKeyCI(opts, key) != NULL);
 }

drivers/base/kdnet/kdnet_net.c

@@ -9,7 +9,7 @@ PDEBUG_NET_DATA      KdNetData = NULL;
 
 /* ----------------------------------------------------------- tiny utils ---*/
 
-static __forceinline USHORT KdNetSwap16(USHORT v)
+static __inline USHORT KdNetSwap16(USHORT v)
 {
     return (USHORT)((v >> 8) | (v << 8));
 }

drivers/bus/acpi_new/acpi_new.h

@@ -85,19 +85,19 @@ typedef struct _ACPI_NEW_CONTROL_EXTENSION
     ACPI_NEW_COMMON_EXTENSION Common;
 } ACPI_NEW_CONTROL_EXTENSION, *PACPI_NEW_CONTROL_EXTENSION;
 
-static __forceinline BOOLEAN AcpiNewIsFdo(_In_ PDEVICE_OBJECT DeviceObject)
+static __inline BOOLEAN AcpiNewIsFdo(_In_ PDEVICE_OBJECT DeviceObject)
 {
     PACPI_NEW_COMMON_EXTENSION common = (PACPI_NEW_COMMON_EXTENSION)DeviceObject->DeviceExtension;
     return common && (common->Type == AcpiNewDeviceFdo);
 }
 
-static __forceinline BOOLEAN AcpiNewIsPdo(_In_ PDEVICE_OBJECT DeviceObject)
+static __inline BOOLEAN AcpiNewIsPdo(_In_ PDEVICE_OBJECT DeviceObject)
 {
     PACPI_NEW_COMMON_EXTENSION common = (PACPI_NEW_COMMON_EXTENSION)DeviceObject->DeviceExtension;
     return common && (common->Type == AcpiNewDevicePdo);
 }
 
-static __forceinline BOOLEAN AcpiNewIsControl(_In_ PDEVICE_OBJECT DeviceObject)
+static __inline BOOLEAN AcpiNewIsControl(_In_ PDEVICE_OBJECT DeviceObject)
 {
     PACPI_NEW_COMMON_EXTENSION common = (PACPI_NEW_COMMON_EXTENSION)DeviceObject->DeviceExtension;
     return common && (common->Type == AcpiNewDeviceControl);

drivers/bus/acpi_new/ec.c

@@ -32,22 +32,22 @@ typedef struct _ACPI_NEW_EC_CONTEXT
 
 static ACPI_NEW_EC_CONTEXT g_Ec;
 
-static __forceinline UCHAR EcReadStatus(_In_ PACPI_NEW_EC_CONTEXT Ec)
+static __inline UCHAR EcReadStatus(_In_ PACPI_NEW_EC_CONTEXT Ec)
 {
     return READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)Ec->CmdPort);
 }
 
-static __forceinline UCHAR EcReadData(_In_ PACPI_NEW_EC_CONTEXT Ec)
+static __inline UCHAR EcReadData(_In_ PACPI_NEW_EC_CONTEXT Ec)
 {
     return READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)Ec->DataPort);
 }
 
-static __forceinline VOID EcWriteCmd(_In_ PACPI_NEW_EC_CONTEXT Ec, _In_ UCHAR Value)
+static __inline VOID EcWriteCmd(_In_ PACPI_NEW_EC_CONTEXT Ec, _In_ UCHAR Value)
 {
     WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)Ec->CmdPort, Value);
 }
 
-static __forceinline VOID EcWriteData(_In_ PACPI_NEW_EC_CONTEXT Ec, _In_ UCHAR Value)
+static __inline VOID EcWriteData(_In_ PACPI_NEW_EC_CONTEXT Ec, _In_ UCHAR Value)
 {
     WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)Ec->DataPort, Value);
 }
@@ -165,7 +165,7 @@ static BOOLEAN EcQuery(_In_ PACPI_NEW_EC_CONTEXT Ec, _Out_ UCHAR *Query)
     return FALSE;
 }
 
-static __forceinline CHAR AcpiNewHexDigit(_In_ UCHAR N)
+static __inline CHAR AcpiNewHexDigit(_In_ UCHAR N)
 {
     N &= 0xF;
     return (N < 10) ? (CHAR)('0' + N) : (CHAR)('A' + (N - 10));