mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-12 10:17:22 +01:00
feat: add minidump writer
This commit is contained in:
parent
a585c3f1af
commit
805a887f2e
14 changed files with 477 additions and 12 deletions
|
|
@ -162,6 +162,7 @@
|
||||||
<ClInclude Include="..\lib\TsudaKageyu-minhook\src\HDE\table32.h" />
|
<ClInclude Include="..\lib\TsudaKageyu-minhook\src\HDE\table32.h" />
|
||||||
<ClInclude Include="..\lib\TsudaKageyu-minhook\src\HDE\table64.h" />
|
<ClInclude Include="..\lib\TsudaKageyu-minhook\src\HDE\table64.h" />
|
||||||
<ClInclude Include="..\lib\TsudaKageyu-minhook\src\trampoline.h" />
|
<ClInclude Include="..\lib\TsudaKageyu-minhook\src\trampoline.h" />
|
||||||
|
<ClInclude Include="crashhandler_shared.h" />
|
||||||
<ClInclude Include="DalamudStartInfo.h" />
|
<ClInclude Include="DalamudStartInfo.h" />
|
||||||
<ClInclude Include="hooks.h" />
|
<ClInclude Include="hooks.h" />
|
||||||
<ClInclude Include="logging.h" />
|
<ClInclude Include="logging.h" />
|
||||||
|
|
|
||||||
|
|
@ -139,6 +139,7 @@
|
||||||
<Filter>MinHook</Filter>
|
<Filter>MinHook</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="resource.h" />
|
<ClInclude Include="resource.h" />
|
||||||
|
<ClInclude Include="crashhandler_shared.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ResourceCompile Include="Dalamud.Boot.rc" />
|
<ResourceCompile Include="Dalamud.Boot.rc" />
|
||||||
|
|
|
||||||
15
Dalamud.Boot/crashhandler_shared.h
Normal file
15
Dalamud.Boot/crashhandler_shared.h
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "windows.h"
|
||||||
|
|
||||||
|
struct exception_info
|
||||||
|
{
|
||||||
|
void* ExceptionPointers; // Cannot dereference!
|
||||||
|
DWORD ThreadId;
|
||||||
|
DWORD ProcessId;
|
||||||
|
BOOL DoFullDump;
|
||||||
|
wchar_t DumpPath[1000];
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr wchar_t SHARED_INFO_FILE_NAME[] = L"DalamudCrashInfoShare";
|
||||||
|
constexpr wchar_t CRASHDUMP_EVENT_NAME[] = L"Global\\DalamudRequestWriteDump";
|
||||||
|
|
@ -136,7 +136,7 @@ DWORD WINAPI InitializeImpl(LPVOID lpParam, HANDLE hMainThreadContinue) {
|
||||||
if (utils::is_running_on_linux()) {
|
if (utils::is_running_on_linux()) {
|
||||||
logging::I("=> VEH was disabled, running on linux");
|
logging::I("=> VEH was disabled, running on linux");
|
||||||
} else if (g_startInfo.BootVehEnabled) {
|
} else if (g_startInfo.BootVehEnabled) {
|
||||||
if (veh::add_handler(g_startInfo.BootVehFull))
|
if (veh::add_handler(g_startInfo.BootVehFull, g_startInfo.WorkingDirectory))
|
||||||
logging::I("=> Done!");
|
logging::I("=> Done!");
|
||||||
else
|
else
|
||||||
logging::I("=> Failed!");
|
logging::I("=> Failed!");
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,8 @@
|
||||||
#include "logging.h"
|
#include "logging.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
|
#include "crashhandler_shared.h"
|
||||||
|
|
||||||
#pragma comment(lib, "comctl32.lib")
|
#pragma comment(lib, "comctl32.lib")
|
||||||
|
|
||||||
#if defined _M_IX86
|
#if defined _M_IX86
|
||||||
|
|
@ -24,6 +26,9 @@
|
||||||
PVOID g_veh_handle = nullptr;
|
PVOID g_veh_handle = nullptr;
|
||||||
bool g_veh_do_full_dump = false;
|
bool g_veh_do_full_dump = false;
|
||||||
|
|
||||||
|
exception_info* g_crashhandler_shared_info;
|
||||||
|
HANDLE g_crashhandler_event;
|
||||||
|
|
||||||
bool is_whitelist_exception(const DWORD code)
|
bool is_whitelist_exception(const DWORD code)
|
||||||
{
|
{
|
||||||
switch (code)
|
switch (code)
|
||||||
|
|
@ -293,13 +298,18 @@ LONG exception_handler(EXCEPTION_POINTERS* ex)
|
||||||
ex_info.ExceptionPointers = ex;
|
ex_info.ExceptionPointers = ex;
|
||||||
ex_info.ThreadId = GetCurrentThreadId();
|
ex_info.ThreadId = GetCurrentThreadId();
|
||||||
|
|
||||||
auto miniDumpType = MiniDumpWithDataSegs;
|
if (g_crashhandler_shared_info && g_crashhandler_event)
|
||||||
if (g_veh_do_full_dump)
|
{
|
||||||
miniDumpType = MiniDumpWithFullMemory;
|
memset(g_crashhandler_shared_info, 0, sizeof(exception_info));
|
||||||
|
|
||||||
HANDLE file = CreateFileW(dmp_path.c_str(), GENERIC_WRITE, FILE_SHARE_WRITE, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
|
wcsncpy_s(g_crashhandler_shared_info->DumpPath, dmp_path.c_str(), 1000);
|
||||||
//MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), file, miniDumpType, &ex_info, nullptr, nullptr);
|
g_crashhandler_shared_info->ThreadId = GetThreadId(GetCurrentThread());
|
||||||
CloseHandle(file);
|
g_crashhandler_shared_info->ProcessId = GetCurrentProcessId();
|
||||||
|
g_crashhandler_shared_info->ExceptionPointers = ex;
|
||||||
|
g_crashhandler_shared_info->DoFullDump = g_veh_do_full_dump;
|
||||||
|
|
||||||
|
SetEvent(g_crashhandler_event);
|
||||||
|
}
|
||||||
|
|
||||||
std::wstring message;
|
std::wstring message;
|
||||||
void* fn;
|
void* fn;
|
||||||
|
|
@ -384,7 +394,7 @@ LONG exception_handler(EXCEPTION_POINTERS* ex)
|
||||||
return EXCEPTION_CONTINUE_SEARCH;
|
return EXCEPTION_CONTINUE_SEARCH;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool veh::add_handler(bool doFullDump)
|
bool veh::add_handler(bool doFullDump, std::string workingDirectory)
|
||||||
{
|
{
|
||||||
if (g_veh_handle)
|
if (g_veh_handle)
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -393,6 +403,58 @@ bool veh::add_handler(bool doFullDump)
|
||||||
|
|
||||||
g_veh_do_full_dump = doFullDump;
|
g_veh_do_full_dump = doFullDump;
|
||||||
|
|
||||||
|
auto file_mapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(exception_info), SHARED_INFO_FILE_NAME);
|
||||||
|
if (!file_mapping) {
|
||||||
|
std::cout << "Could not map info share file.\n";
|
||||||
|
g_crashhandler_shared_info = nullptr;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
g_crashhandler_shared_info = (exception_info*)MapViewOfFile(file_mapping, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(exception_info));
|
||||||
|
if (!g_crashhandler_shared_info) {
|
||||||
|
std::cout << "Could not map view of info share file.\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
g_crashhandler_event = CreateEvent(
|
||||||
|
NULL, // default security attributes
|
||||||
|
TRUE, // manual-reset event
|
||||||
|
FALSE, // initial state is nonsignaled
|
||||||
|
CRASHDUMP_EVENT_NAME // object name
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!g_crashhandler_event)
|
||||||
|
{
|
||||||
|
std::cout << "Couldn't acquire event handle\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
auto handler_path = std::filesystem::path(workingDirectory) / "DalamudCrashHandler.exe";
|
||||||
|
|
||||||
|
// additional information
|
||||||
|
STARTUPINFO si;
|
||||||
|
PROCESS_INFORMATION pi;
|
||||||
|
|
||||||
|
// set the size of the structures
|
||||||
|
ZeroMemory( &si, sizeof(si) );
|
||||||
|
si.cb = sizeof(si);
|
||||||
|
ZeroMemory( &pi, sizeof(pi) );
|
||||||
|
|
||||||
|
CreateProcess( handler_path.c_str(), // the path
|
||||||
|
NULL, // Command line
|
||||||
|
NULL, // Process handle not inheritable
|
||||||
|
NULL, // Thread handle not inheritable
|
||||||
|
FALSE, // Set handle inheritance to FALSE
|
||||||
|
0, // No creation flags
|
||||||
|
NULL, // Use parent's environment block
|
||||||
|
NULL, // Use parent's starting directory
|
||||||
|
&si, // Pointer to STARTUPINFO structure
|
||||||
|
&pi // Pointer to PROCESS_INFORMATION structure (removed extra parentheses)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Close process and thread handles.
|
||||||
|
CloseHandle( pi.hProcess );
|
||||||
|
CloseHandle( pi.hThread );
|
||||||
|
|
||||||
return g_veh_handle != nullptr;
|
return g_veh_handle != nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,6 @@
|
||||||
|
|
||||||
namespace veh
|
namespace veh
|
||||||
{
|
{
|
||||||
bool add_handler(bool doFullDump);
|
bool add_handler(bool doFullDump, std::string workingDirectory);
|
||||||
bool remove_handler();
|
bool remove_handler();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
14
Dalamud.sln
14
Dalamud.sln
|
|
@ -34,6 +34,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs", "lib\F
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs.Generators", "lib\FFXIVClientStructs\FFXIVClientStructs.Generators\FFXIVClientStructs.Generators.csproj", "{05AB2F46-268B-4915-806F-DDF813E2D59D}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs.Generators", "lib\FFXIVClientStructs\FFXIVClientStructs.Generators\FFXIVClientStructs.Generators.csproj", "{05AB2F46-268B-4915-806F-DDF813E2D59D}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DalamudCrashHandler", "DalamudCrashHandler\DalamudCrashHandler.vcxproj", "{317A264C-920B-44A1-8A34-F3A6827B0705}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
|
@ -186,6 +188,18 @@ Global
|
||||||
{05AB2F46-268B-4915-806F-DDF813E2D59D}.Release|x64.Build.0 = Release|Any CPU
|
{05AB2F46-268B-4915-806F-DDF813E2D59D}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{05AB2F46-268B-4915-806F-DDF813E2D59D}.Release|x86.ActiveCfg = Release|Any CPU
|
{05AB2F46-268B-4915-806F-DDF813E2D59D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{05AB2F46-268B-4915-806F-DDF813E2D59D}.Release|x86.Build.0 = Release|Any CPU
|
{05AB2F46-268B-4915-806F-DDF813E2D59D}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Debug|Any CPU.Build.0 = Debug|x64
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Debug|x86.ActiveCfg = Debug|Win32
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Debug|x86.Build.0 = Debug|Win32
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Release|Any CPU.ActiveCfg = Release|x64
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Release|Any CPU.Build.0 = Release|x64
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Release|x64.Build.0 = Release|x64
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Release|x86.ActiveCfg = Release|Win32
|
||||||
|
{317A264C-920B-44A1-8A34-F3A6827B0705}.Release|x86.Build.0 = Release|Win32
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
|
||||||
136
DalamudCrashHandler/DalamudCrashHandler.cpp
Normal file
136
DalamudCrashHandler/DalamudCrashHandler.cpp
Normal file
|
|
@ -0,0 +1,136 @@
|
||||||
|
#include <iostream>
|
||||||
|
#include <windows.h>
|
||||||
|
#include <minidumpapiset.h>
|
||||||
|
#include <tlhelp32.h>
|
||||||
|
|
||||||
|
#include "../Dalamud.Boot/crashhandler_shared.h"
|
||||||
|
|
||||||
|
DWORD WINAPI MyThreadFunction(LPVOID lpParam)
|
||||||
|
{
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
PROCESSENTRY32 entry;
|
||||||
|
entry.dwSize = sizeof(PROCESSENTRY32);
|
||||||
|
|
||||||
|
HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, NULL);
|
||||||
|
|
||||||
|
if (Process32First(snapshot, &entry) == TRUE)
|
||||||
|
{
|
||||||
|
bool had_xiv = false;
|
||||||
|
|
||||||
|
while (Process32Next(snapshot, &entry) == TRUE)
|
||||||
|
{
|
||||||
|
// Exit if there's another crash handler
|
||||||
|
// TODO(goat): We should make this more robust and ensure that there is one per PID
|
||||||
|
if (_wcsicmp(entry.szExeFile, L"DalamudCrashHandler.exe") == 0 &&
|
||||||
|
entry.th32ProcessID != GetCurrentProcessId())
|
||||||
|
{
|
||||||
|
ExitProcess(0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_wcsicmp(entry.szExeFile, L"ffxiv_dx11.exe") == 0)
|
||||||
|
{
|
||||||
|
had_xiv = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!had_xiv)
|
||||||
|
{
|
||||||
|
ExitProcess(0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CloseHandle(snapshot);
|
||||||
|
|
||||||
|
Sleep(1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
CreateThread(
|
||||||
|
NULL, // default security attributes
|
||||||
|
0, // use default stack size
|
||||||
|
MyThreadFunction, // thread function name
|
||||||
|
NULL, // argument to thread function
|
||||||
|
0, // use default creation flags
|
||||||
|
NULL); // returns the thread identifier
|
||||||
|
|
||||||
|
auto file_mapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(exception_info), SHARED_INFO_FILE_NAME);
|
||||||
|
if (!file_mapping) {
|
||||||
|
std::cout << "Could not map info share file.\n";
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto file_ptr = MapViewOfFile(file_mapping, FILE_MAP_READ, 0, 0, sizeof(exception_info));
|
||||||
|
if (!file_ptr) {
|
||||||
|
std::cout << "Could not map view of info share file.\n";
|
||||||
|
return -3;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::cout << "Waiting for crash...\n";
|
||||||
|
|
||||||
|
auto crash_event = CreateEvent(
|
||||||
|
NULL, // default security attributes
|
||||||
|
TRUE, // manual-reset event
|
||||||
|
FALSE, // initial state is nonsignaled
|
||||||
|
CRASHDUMP_EVENT_NAME // object name
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!crash_event)
|
||||||
|
{
|
||||||
|
std::cout << "Couldn't acquire event handle\n";
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto wait_result = WaitForSingleObject(crash_event, INFINITE);
|
||||||
|
std::cout << "Crash triggered, writing dump!\n";
|
||||||
|
|
||||||
|
auto info_share = (exception_info*)file_ptr;
|
||||||
|
|
||||||
|
if (!info_share->ExceptionPointers)
|
||||||
|
{
|
||||||
|
std::cout << "info_share->ExceptionPointers was nullptr\n";
|
||||||
|
return -4;
|
||||||
|
}
|
||||||
|
|
||||||
|
MINIDUMP_EXCEPTION_INFORMATION mdmp_info;
|
||||||
|
mdmp_info.ClientPointers = true;
|
||||||
|
mdmp_info.ExceptionPointers = (PEXCEPTION_POINTERS)info_share->ExceptionPointers;
|
||||||
|
mdmp_info.ThreadId = info_share->ThreadId;
|
||||||
|
|
||||||
|
|
||||||
|
std::cout << "Dump for " << info_share->ProcessId << std::endl;
|
||||||
|
HANDLE file = CreateFileW(info_share->DumpPath, GENERIC_WRITE, FILE_SHARE_WRITE, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
|
||||||
|
if (!file)
|
||||||
|
{
|
||||||
|
auto hr = GetLastError();
|
||||||
|
std::cout << "Failed to open dump file: " << std::hex << hr << std::endl;
|
||||||
|
return -6;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto process = OpenProcess(PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_QUERY_INFORMATION, FALSE, info_share->ProcessId);
|
||||||
|
if (!process)
|
||||||
|
{
|
||||||
|
auto hr = GetLastError();
|
||||||
|
std::cout << "Failed to open " << info_share->ProcessId << ": " << std::hex << hr << std::endl;
|
||||||
|
return -6;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto success = MiniDumpWriteDump(process, info_share->ProcessId, file, MiniDumpWithFullMemory, &mdmp_info, NULL, NULL);
|
||||||
|
if (!success)
|
||||||
|
{
|
||||||
|
auto hr = GetLastError();
|
||||||
|
std::cout << "Failed: " << std::hex << hr << std::endl;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO(goat): Technically, we should have another event or a semaphore to block xiv while dumping...
|
||||||
|
|
||||||
|
CloseHandle(file);
|
||||||
|
CloseHandle(process);
|
||||||
|
CloseHandle(file_mapping);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
71
DalamudCrashHandler/DalamudCrashHandler.rc
Normal file
71
DalamudCrashHandler/DalamudCrashHandler.rc
Normal file
|
|
@ -0,0 +1,71 @@
|
||||||
|
// Microsoft Visual C++ generated resource script.
|
||||||
|
//
|
||||||
|
#include "resource.h"
|
||||||
|
|
||||||
|
#define APSTUDIO_READONLY_SYMBOLS
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Generated from the TEXTINCLUDE 2 resource.
|
||||||
|
//
|
||||||
|
#include "winres.h"
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
#undef APSTUDIO_READONLY_SYMBOLS
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
// English (United Kingdom) resources
|
||||||
|
|
||||||
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
|
||||||
|
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
|
||||||
|
#pragma code_page(1252)
|
||||||
|
|
||||||
|
#ifdef APSTUDIO_INVOKED
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// TEXTINCLUDE
|
||||||
|
//
|
||||||
|
|
||||||
|
1 TEXTINCLUDE
|
||||||
|
BEGIN
|
||||||
|
"resource.h\0"
|
||||||
|
END
|
||||||
|
|
||||||
|
2 TEXTINCLUDE
|
||||||
|
BEGIN
|
||||||
|
"#include ""winres.h""\r\n"
|
||||||
|
"\0"
|
||||||
|
END
|
||||||
|
|
||||||
|
3 TEXTINCLUDE
|
||||||
|
BEGIN
|
||||||
|
"\r\n"
|
||||||
|
"\0"
|
||||||
|
END
|
||||||
|
|
||||||
|
#endif // APSTUDIO_INVOKED
|
||||||
|
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Icon
|
||||||
|
//
|
||||||
|
|
||||||
|
// Icon with lowest ID value placed first to ensure application icon
|
||||||
|
// remains consistent on all systems.
|
||||||
|
IDI_ICON1 ICON "dalamud.ico"
|
||||||
|
|
||||||
|
#endif // English (United Kingdom) resources
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef APSTUDIO_INVOKED
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Generated from the TEXTINCLUDE 3 resource.
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
#endif // not APSTUDIO_INVOKED
|
||||||
|
|
||||||
93
DalamudCrashHandler/DalamudCrashHandler.vcxproj
Normal file
93
DalamudCrashHandler/DalamudCrashHandler.vcxproj
Normal file
|
|
@ -0,0 +1,93 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<VCProjectVersion>16.0</VCProjectVersion>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<ProjectGuid>{317a264c-920b-44a1-8a34-f3a6827b0705}</ProjectGuid>
|
||||||
|
<RootNamespace>DalamudCrashHandler</RootNamespace>
|
||||||
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
|
<OutDir>..\bin\$(Configuration)\</OutDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="Shared">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalDependencies>Dbghelp.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="DalamudCrashHandler.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\Dalamud.Boot\crashhandler_shared.h" />
|
||||||
|
<ClInclude Include="resource.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ResourceCompile Include="DalamudCrashHandler.rc" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Image Include="dalamud.ico" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
40
DalamudCrashHandler/DalamudCrashHandler.vcxproj.filters
Normal file
40
DalamudCrashHandler/DalamudCrashHandler.vcxproj.filters
Normal file
|
|
@ -0,0 +1,40 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||||
|
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Header Files">
|
||||||
|
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||||
|
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Resource Files">
|
||||||
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="DalamudCrashHandler.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\Dalamud.Boot\crashhandler_shared.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="resource.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ResourceCompile Include="DalamudCrashHandler.rc">
|
||||||
|
<Filter>Resource Files</Filter>
|
||||||
|
</ResourceCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Image Include="dalamud.ico">
|
||||||
|
<Filter>Resource Files</Filter>
|
||||||
|
</Image>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
BIN
DalamudCrashHandler/dalamud.ico
Normal file
BIN
DalamudCrashHandler/dalamud.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
16
DalamudCrashHandler/resource.h
Normal file
16
DalamudCrashHandler/resource.h
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
//{{NO_DEPENDENCIES}}
|
||||||
|
// Microsoft Visual C++ generated include file.
|
||||||
|
// Used by DalamudCrashHandler.rc
|
||||||
|
//
|
||||||
|
#define IDI_ICON1 101
|
||||||
|
|
||||||
|
// Next default values for new objects
|
||||||
|
//
|
||||||
|
#ifdef APSTUDIO_INVOKED
|
||||||
|
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||||
|
#define _APS_NEXT_RESOURCE_VALUE 102
|
||||||
|
#define _APS_NEXT_COMMAND_VALUE 40001
|
||||||
|
#define _APS_NEXT_CONTROL_VALUE 1001
|
||||||
|
#define _APS_NEXT_SYMED_VALUE 101
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
@ -32,6 +32,9 @@ public class DalamudBuild : NukeBuild
|
||||||
AbsolutePath DalamudBootProjectDir => RootDirectory / "Dalamud.Boot";
|
AbsolutePath DalamudBootProjectDir => RootDirectory / "Dalamud.Boot";
|
||||||
AbsolutePath DalamudBootProjectFile => DalamudBootProjectDir / "Dalamud.Boot.vcxproj";
|
AbsolutePath DalamudBootProjectFile => DalamudBootProjectDir / "Dalamud.Boot.vcxproj";
|
||||||
|
|
||||||
|
AbsolutePath DalamudCrashHandlerProjectDir => RootDirectory / "DalamudCrashHandler";
|
||||||
|
AbsolutePath DalamudCrashHandlerProjectFile => DalamudBootProjectDir / "DalamudCrashHandler.vcxproj";
|
||||||
|
|
||||||
AbsolutePath InjectorProjectDir => RootDirectory / "Dalamud.Injector";
|
AbsolutePath InjectorProjectDir => RootDirectory / "Dalamud.Injector";
|
||||||
AbsolutePath InjectorProjectFile => InjectorProjectDir / "Dalamud.Injector.csproj";
|
AbsolutePath InjectorProjectFile => InjectorProjectDir / "Dalamud.Injector.csproj";
|
||||||
|
|
||||||
|
|
@ -72,6 +75,14 @@ public class DalamudBuild : NukeBuild
|
||||||
.SetConfiguration(Configuration));
|
.SetConfiguration(Configuration));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Target CompileDalamudCrashHandler => _ => _
|
||||||
|
.Executes(() =>
|
||||||
|
{
|
||||||
|
MSBuildTasks.MSBuild(s => s
|
||||||
|
.SetTargetPath(DalamudCrashHandlerProjectFile)
|
||||||
|
.SetConfiguration(Configuration));
|
||||||
|
});
|
||||||
|
|
||||||
Target CompileInjector => _ => _
|
Target CompileInjector => _ => _
|
||||||
.DependsOn(Restore)
|
.DependsOn(Restore)
|
||||||
.Executes(() =>
|
.Executes(() =>
|
||||||
|
|
@ -118,6 +129,11 @@ public class DalamudBuild : NukeBuild
|
||||||
.SetConfiguration(Configuration)
|
.SetConfiguration(Configuration)
|
||||||
.SetTargets("Clean"));
|
.SetTargets("Clean"));
|
||||||
|
|
||||||
|
MSBuildTasks.MSBuild(s => s
|
||||||
|
.SetProjectFile(DalamudCrashHandlerProjectFile)
|
||||||
|
.SetConfiguration(Configuration)
|
||||||
|
.SetTargets("Clean"));
|
||||||
|
|
||||||
DotNetTasks.DotNetClean(s => s
|
DotNetTasks.DotNetClean(s => s
|
||||||
.SetProject(InjectorProjectFile)
|
.SetProject(InjectorProjectFile)
|
||||||
.SetConfiguration(Configuration));
|
.SetConfiguration(Configuration));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue