ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: Don't check for Wine Registry anymore

Browse source 
- Renames `IsLinux` to `IsWine` to better reflect that this will return true for macOS as well.
- Fixes a bug caused by misbehaving apps wanting to be helpful to Linux users
- Also makes Wine checking far more resilient in cases where XL_WINEONLINUX isn't set.
This commit is contained in:
Kaz Wolfe 2023-08-20 16:14:42 -07:00
parent 3e613cffd0
commit fd518f8e3f
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Dalamud/Utility/Util.cs
View file

@ -8,6 +8,7 @@ using System.Net.Http;
using System.Numerics;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Dalamud.Configuration.Internal;
@ -22,7 +23,6 @@ using Dalamud.Logging.Internal;
using Dalamud.Networking.Http;
using ImGuiNET;
using Lumina.Excel.GeneratedSheets;
using Microsoft.Win32;
using Serilog;
namespace Dalamud.Utility;
@ -491,32 +491,30 @@ public static class Util
}
/// <summary>
/// Heuristically determine if Dalamud is running on Linux/WINE.
/// Determine if Dalamud is currently running within a Wine context (e.g. either on macOS or Linux). This method
/// will not return information about the host operating system.
/// </summary>
/// <returns>Whether or not Dalamud is running on Linux/WINE.</returns>
public static bool IsLinux()
/// <returns>Returns true if Wine is detected, false otherwise.</returns>
public static bool IsWine()
{
bool Check1()
{
return EnvironmentConfiguration.XlWineOnLinux;
}
if (EnvironmentConfiguration.XlWineOnLinux) return true;
bool Check2()
{
var hModule = NativeFunctions.GetModuleHandleW("ntdll.dll");
var proc1 = NativeFunctions.GetProcAddress(hModule, "wine_get_version");
var proc2 = NativeFunctions.GetProcAddress(hModule, "wine_get_build_id");
var ntdll = NativeFunctions.GetModuleHandleW("ntdll.dll");
return proc1 != IntPtr.Zero || proc2 != IntPtr.Zero;
}
// Test to see if any Wine specific exports exist. If they do, then we are running on Wine.
// The exports "wine_get_version", "wine_get_build_id", and "wine_get_host_version" will tend to be hidden
// by most Linux users (else FFXIV will want a macOS license), so we will additionally check some lesser-known
// exports as well.
return AnyProcExists(
ntdll,
"wine_get_version",
"wine_get_build_id",
"wine_get_host_version",
"wine_server_call",
"wine_unix_to_nt_file_name");
bool Check3()
{
return Registry.CurrentUser.OpenSubKey(@"Software\Wine") != null ||
Registry.LocalMachine.OpenSubKey(@"Software\Wine") != null;
}
return Check1() || Check2() || Check3();
bool AnyProcExists(nint handle, params string[] procs) =>
procs.Any(p => NativeFunctions.GetProcAddress(handle, p) != nint.Zero);
}
/// <summary>