From e2bc0f565c98a2807c3395be5648719089500748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?= <7645683+bruvzg@users.noreply.github.com> Date: Sat, 28 Mar 2026 00:19:18 +0200 Subject: [PATCH] [Windows] Fix Windows version detection. --- platform/windows/display_server_windows.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index d664de084b..cb0ab19a79 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -7470,13 +7470,16 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis ZeroMemory(&os_ver, sizeof(OSVERSIONINFOW)); os_ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); -#if defined(ANGLE_ENABLED) HMODULE nt_lib = LoadLibraryW(L"ntdll.dll"); +#if defined(ANGLE_ENABLED) bool is_wine = false; +#endif if (nt_lib) { WineGetVersionPtr wine_get_version = (WineGetVersionPtr)(void *)GetProcAddress(nt_lib, "wine_get_version"); // Do not read Windows build number under Wine, it can be set to arbitrary value. if (wine_get_version) { +#if defined(ANGLE_ENABLED) is_wine = true; +#endif } else { RtlGetVersionPtr RtlGetVersion = (RtlGetVersionPtr)(void *)GetProcAddress(nt_lib, "RtlGetVersion"); if (RtlGetVersion) { @@ -7485,7 +7488,6 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis } FreeLibrary(nt_lib); } -#endif // Load UXTheme. if (os_ver.dwBuildNumber >= 10240) { // Not available on Wine, use only if real Windows 10/11 detected.