From 2acba2b81f93cdd6dd766c9140389c9ec12ded08 Mon Sep 17 00:00:00 2001
From: Kaz Wolfe <root@kazwolfe.io>
Date: Tue, 12 Sep 2023 17:06:22 -0700
Subject: [PATCH] Update Dalamud.Boot to use extra import checks

- Ports extra import checks to Dalamud Boot
- Renames is_running_on_linux to is_running_on_wine
- Update relevant logging string for VEH
---
 Dalamud.Boot/dllmain.cpp | 4 ++--
 Dalamud.Boot/utils.cpp   | 6 +++++-
 Dalamud.Boot/utils.h     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dalamud.Boot/dllmain.cpp b/Dalamud.Boot/dllmain.cpp
index 9a741a47f..94f1c7d0f 100644
--- a/Dalamud.Boot/dllmain.cpp
+++ b/Dalamud.Boot/dllmain.cpp
@@ -133,8 +133,8 @@ DWORD WINAPI InitializeImpl(LPVOID lpParam, HANDLE hMainThreadContinue) {
     // ============================== VEH ======================================== //
 
     logging::I("Initializing VEH...");
-    if (utils::is_running_on_linux()) {
-        logging::I("=> VEH was disabled, running on linux");
+    if (utils::is_running_on_wine()) {
+        logging::I("=> VEH was disabled, running on wine");
     } else if (g_startInfo.BootVehEnabled) {
         if (veh::add_handler(g_startInfo.BootVehFull, g_startInfo.WorkingDirectory))
             logging::I("=> Done!");
diff --git a/Dalamud.Boot/utils.cpp b/Dalamud.Boot/utils.cpp
index 79205eb8d..b45795045 100644
--- a/Dalamud.Boot/utils.cpp
+++ b/Dalamud.Boot/utils.cpp
@@ -578,7 +578,7 @@ std::vector<std::string> utils::get_env_list(const wchar_t* pcszName) {
     return res;
 }
 
-bool utils::is_running_on_linux() {
+bool utils::is_running_on_wine() {
     if (get_env<bool>(L"XL_WINEONLINUX"))
         return true;
     HMODULE hntdll = GetModuleHandleW(L"ntdll.dll");
@@ -588,6 +588,10 @@ bool utils::is_running_on_linux() {
         return true;
     if (GetProcAddress(hntdll, "wine_get_host_version"))
         return true;
+    if (GetProcAddress(hntdll, "wine_server_call"))
+        return true;
+    if (GetProcAddress(hntdll, "wine_unix_to_nt_file_name"))
+        return true;
     return false;
 }
 
diff --git a/Dalamud.Boot/utils.h b/Dalamud.Boot/utils.h
index 5d5c90dde..5e3caa4d6 100644
--- a/Dalamud.Boot/utils.h
+++ b/Dalamud.Boot/utils.h
@@ -264,7 +264,7 @@ namespace utils {
         return get_env_list<T>(unicode::convert<std::wstring>(pcszName).c_str());
     }
 
-    bool is_running_on_linux();
+    bool is_running_on_wine();
 
     std::filesystem::path get_module_path(HMODULE hModule);