Merge master

Dalamud.Boot/Dalamud.Boot.vcxproj

@@ -28,7 +28,7 @@
     <PlatformToolset>v143</PlatformToolset>
     <LinkIncremental>false</LinkIncremental>
     <CharacterSet>Unicode</CharacterSet>
-    <OutDir>..\bin\$(Configuration)\</OutDir>
+    <OutDir>bin\$(Configuration)\</OutDir>
     <IntDir>obj\$(Configuration)\</IntDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -200,8 +200,10 @@
   <ItemGroup>
     <Manifest Include="themes.manifest" />
   </ItemGroup>
-  <Target Name="RemoveExtraFiles" AfterTargets="PostBuildEvent">
-    <Delete Files="$(OutDir)$(TargetName).lib" />
-    <Delete Files="$(OutDir)$(TargetName).exp" />
+  <Target Name="CopyOutputDlls" AfterTargets="PostBuildEvent">
+    <Copy SourceFiles="$(OutDir)$(TargetName).dll" DestinationFolder="..\bin\$(Configuration)\" />
+    <Copy SourceFiles="$(OutDir)$(TargetName).pdb" DestinationFolder="..\bin\$(Configuration)\" />
+
+    <Copy SourceFiles="$(OutDir)nethost.dll" DestinationFolder="..\bin\$(Configuration)\" />
   </Target>
-</Project>
+</Project>

Dalamud.Boot/DalamudStartInfo.cpp

@@ -109,6 +109,7 @@ void from_json(const nlohmann::json& json, DalamudStartInfo& config) {
     config.PluginDirectory = json.value("PluginDirectory", config.PluginDirectory);
     config.AssetDirectory = json.value("AssetDirectory", config.AssetDirectory);
     config.Language = json.value("Language", config.Language);
+    config.Platform = json.value("Platform", config.Platform);
     config.GameVersion = json.value("GameVersion", config.GameVersion);
     config.TroubleshootingPackData = json.value("TroubleshootingPackData", std::string{});
     config.DelayInitializeMs = json.value("DelayInitializeMs", config.DelayInitializeMs);

Dalamud.Boot/DalamudStartInfo.h

@@ -17,7 +17,7 @@ struct DalamudStartInfo {
         DirectHook = 1,
     };
     friend void from_json(const nlohmann::json&, DotNetOpenProcessHookMode&);
-    
+
     enum class ClientLanguage : int {
         Japanese,
         English,
@@ -47,6 +47,7 @@ struct DalamudStartInfo {
     std::string PluginDirectory;
     std::string AssetDirectory;
     ClientLanguage Language = ClientLanguage::English;
+    std::string Platform;
     std::string GameVersion;
     std::string TroubleshootingPackData;
     int DelayInitializeMs = 0;

Dalamud.Boot/dllmain.cpp

@@ -15,7 +15,7 @@ HINSTANCE g_hGameInstance = GetModuleHandleW(nullptr);
 
 HRESULT WINAPI InitializeImpl(LPVOID lpParam, HANDLE hMainThreadContinue) {
     g_startInfo.from_envvars();
-    
+
     std::string jsonParseError;
     try {
         from_json(nlohmann::json::parse(std::string_view(static_cast<char*>(lpParam))), g_startInfo);
@@ -25,7 +25,7 @@ HRESULT WINAPI InitializeImpl(LPVOID lpParam, HANDLE hMainThreadContinue) {
 
     if (g_startInfo.BootShowConsole)
         ConsoleSetup(L"Dalamud Boot");
-    
+
     logging::update_dll_load_status(true);
 
     const auto logFilePath = unicode::convert<std::wstring>(g_startInfo.BootLogPath);
@@ -33,16 +33,16 @@ HRESULT WINAPI InitializeImpl(LPVOID lpParam, HANDLE hMainThreadContinue) {
     auto attemptFallbackLog = false;
     if (logFilePath.empty()) {
         attemptFallbackLog = true;
-        
+
         logging::I("No log file path given; not logging to file.");
     } else {
         try {
             logging::start_file_logging(logFilePath, !g_startInfo.BootShowConsole);
             logging::I("Logging to file: {}", logFilePath);
-            
+
         } catch (const std::exception& e) {
             attemptFallbackLog = true;
-            
+
             logging::E("Couldn't open log file: {}", logFilePath);
             logging::E("Error: {} / {}", errno, e.what());
         }
@@ -63,15 +63,15 @@ HRESULT WINAPI InitializeImpl(LPVOID lpParam, HANDLE hMainThreadContinue) {
         SYSTEMTIME st;
         GetLocalTime(&st);
         logFilePath += std::format(L"Dalamud.Boot.{:04}{:02}{:02}.{:02}{:02}{:02}.{:03}.{}.log", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds, GetCurrentProcessId());
-        
+
         try {
             logging::start_file_logging(logFilePath, !g_startInfo.BootShowConsole);
             logging::I("Logging to fallback log file: {}", logFilePath);
-            
+
         } catch (const std::exception& e) {
             if (!g_startInfo.BootShowConsole && !g_startInfo.BootDisableFallbackConsole)
                 ConsoleSetup(L"Dalamud Boot - Fallback Console");
-            
+
             logging::E("Couldn't open fallback log file: {}", logFilePath);
             logging::E("Error: {} / {}", errno, e.what());
         }
@@ -87,7 +87,7 @@ HRESULT WINAPI InitializeImpl(LPVOID lpParam, HANDLE hMainThreadContinue) {
     } else {
         logging::E("Failed to initialize MinHook (status={}({}))", MH_StatusToString(mhStatus), static_cast<int>(mhStatus));
     }
-    
+
     logging::I("Dalamud.Boot Injectable, (c) 2021 XIVLauncher Contributors");
     logging::I("Built at: " __DATE__ "@" __TIME__);
 
@@ -241,11 +241,11 @@ BOOL APIENTRY DllMain(const HMODULE hModule, const DWORD dwReason, LPVOID lpRese
         case DLL_PROCESS_DETACH:
             // do not show debug message boxes on abort() here
             _set_abort_behavior(0, _WRITE_ABORT_MSG);
-            
+
             // process is terminating; don't bother cleaning up
             if (lpReserved)
                 return TRUE;
-        
+
             logging::update_dll_load_status(false);
 
             xivfixes::apply_all(false);

Dalamud.Boot/utils.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "DalamudStartInfo.h"
 
 #include "utils.h"
 
@@ -103,7 +104,7 @@ bool utils::loaded_module::find_imported_function_pointer(const char* pcszDllNam
     ppFunctionAddress = nullptr;
 
     // This span might be too long in terms of meaningful data; it only serves to prevent accessing memory outsides boundaries.
-    for (const auto& importDescriptor : span_as<IMAGE_IMPORT_DESCRIPTOR>(directory.VirtualAddress, directory.Size / sizeof IMAGE_IMPORT_DESCRIPTOR)) {
+    for (const auto& importDescriptor : span_as<IMAGE_IMPORT_DESCRIPTOR>(directory.VirtualAddress, directory.Size / sizeof(IMAGE_IMPORT_DESCRIPTOR))) {
 
         // Having all zero values signals the end of the table. We didn't find anything.
         if (!importDescriptor.OriginalFirstThunk && !importDescriptor.TimeDateStamp && !importDescriptor.ForwarderChain && !importDescriptor.FirstThunk)
@@ -584,6 +585,10 @@ std::vector<std::string> utils::get_env_list(const wchar_t* pcszName) {
     return res;
 }
 
+bool utils::is_running_on_wine() {
+    return g_startInfo.Platform != "WINDOWS";
+}
+
 std::filesystem::path utils::get_module_path(HMODULE hModule) {
     std::wstring buf(MAX_PATH, L'\0');
     while (true) {

Dalamud.Boot/utils.h

@@ -121,7 +121,7 @@ namespace utils {
         memory_tenderizer(const void* pAddress, size_t length, DWORD dwNewProtect);
 
         template<typename T, typename = std::enable_if_t<std::is_trivial_v<T>&& std::is_standard_layout_v<T>>>
-        memory_tenderizer(const T& object, DWORD dwNewProtect) : memory_tenderizer(&object, sizeof T, dwNewProtect) {}
+        memory_tenderizer(const T& object, DWORD dwNewProtect) : memory_tenderizer(&object, sizeof(T), dwNewProtect) {}
 
         template<typename T>
         memory_tenderizer(std::span<const T> s, DWORD dwNewProtect) : memory_tenderizer(&s[0], s.size(), dwNewProtect) {}
@@ -267,6 +267,8 @@ namespace utils {
         return get_env_list<T>(unicode::convert<std::wstring>(pcszName).c_str());
     }
 
+    bool is_running_on_wine();
+
     std::filesystem::path get_module_path(HMODULE hModule);
 
     /// @brief Find the game main window.