add a shortcut for 3dGameMode, resolve links in file system

eriforce · Aug 28, 2024 · 6496e97 · 6496e97
1 parent fdf2d4d
commit 6496e97
Show file tree

Hide file tree

Showing 21 changed files with 224 additions and 98 deletions.
diff --git a/src/Magpie.App/App.cpp b/src/Magpie.App/App.cpp
@@ -30,12 +30,12 @@
 #include "EffectsService.h"
 #include "UpdateService.h"
 #include "LocalizationService.h"
-#include "Logger.h"
 
 namespace winrt::Magpie::App::implementation {
 
 App::App() {
 	UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e) {
+		Logger::Get().Error(to_string(e.Message()));
 		Logger::Get().ComCritical("未处理的异常", e.Exception().value);
 
 		if (IsDebuggerPresent()) {

diff --git a/src/Magpie.App/App.idl b/src/Magpie.App/App.idl
@@ -43,6 +43,7 @@ namespace Magpie.App {
 	enum ShortcutAction {
 		Scale,
 		Overlay,
+		Is3DGameMode,
 		COUNT_OR_NONE
 	};
 

diff --git a/src/Magpie.App/AppSettings.cpp b/src/Magpie.App/AppSettings.cpp
@@ -500,6 +500,8 @@ bool AppSettings::_Save(const _AppSettingsData& data) noexcept {
 	writer.Uint(EncodeShortcut(data._shortcuts[(size_t)ShortcutAction::Scale]));
 	writer.Key("overlay");
 	writer.Uint(EncodeShortcut(data._shortcuts[(size_t)ShortcutAction::Overlay]));
+	writer.Key("3DGameMode");
+	writer.Uint(EncodeShortcut(data._shortcuts[(size_t)ShortcutAction::Is3DGameMode]));
 	writer.EndObject();
 
 	writer.Key("autoRestore");
@@ -655,6 +657,11 @@ void AppSettings::_LoadSettings(const rapidjson::GenericObject<true, rapidjson::
 		if (overlayNode != shortcutsObj.MemberEnd() && overlayNode->value.IsUint()) {
 			DecodeShortcut(overlayNode->value.GetUint(), _shortcuts[(size_t)ShortcutAction::Overlay]);
 		}
+
+		auto is3DGameModeNode = shortcutsObj.FindMember("3DGameMode");
+		if (is3DGameModeNode != shortcutsObj.MemberEnd() && is3DGameModeNode->value.IsUint()) {
+			DecodeShortcut(is3DGameModeNode->value.GetUint(), _shortcuts[(size_t)ShortcutAction::Is3DGameMode]);
+		}
 	}
 
 	JsonHelper::ReadBool(root, "autoRestore", _isAutoRestore);
@@ -788,6 +795,10 @@ bool AppSettings::_LoadProfile(
 
 		JsonHelper::ReadBool(profileObj, "autoScale", profile.isAutoScale);
 		JsonHelper::ReadString(profileObj, "launchParameters", profile.launchParameters);
+
+		if (!profile.isPackaged) {
+			_SetTruePath(profile);
+		}
 	}
 
 	JsonHelper::ReadInt(profileObj, "scalingMode", profile.scalingMode);
@@ -891,6 +902,37 @@ bool AppSettings::_LoadProfile(
 	return true;
 }
 
+fire_and_forget AppSettings::_SetTruePath(Profile& profile) const {
+	HANDLE handle = CreateFile(
+		profile.pathRule.c_str(),
+		GENERIC_READ,
+		FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+		NULL,
+		OPEN_EXISTING,
+		FILE_ATTRIBUTE_NORMAL,
+		NULL
+	);
+
+	if (handle == INVALID_HANDLE_VALUE) {
+		co_return;
+	}
+
+	TCHAR path[MAX_PATH];
+	DWORD length = GetFinalPathNameByHandle(
+		handle,
+		path,
+		MAX_PATH,
+		0
+	);
+
+	if (length > 0) {
+		// Skip `\\?\` prefix
+		profile.truePath = &path[4];
+	}
+
+	CloseHandle(handle);
+}
+
 bool AppSettings::_SetDefaultShortcuts() noexcept {
 	bool changed = false;
 
@@ -912,6 +954,15 @@ bool AppSettings::_SetDefaultShortcuts() noexcept {
 		changed = true;
 	}
 
+	Shortcut& is3DGameModeShortcut = _shortcuts[(size_t)ShortcutAction::Is3DGameMode];
+	if (is3DGameModeShortcut.IsEmpty()) {
+		is3DGameModeShortcut.win = true;
+		is3DGameModeShortcut.shift = true;
+		is3DGameModeShortcut.code = 'E';
+
+		changed = true;
+	}
+
 	return changed;
 }
 

diff --git a/src/Magpie.App/AppSettings.h b/src/Magpie.App/AppSettings.h
@@ -305,6 +305,7 @@ class AppSettings : private _AppSettingsData {
 		Profile& profile,
 		bool isDefault = false
 	) const noexcept;
+	fire_and_forget _SetTruePath(Profile& profile) const;
 	bool _SetDefaultShortcuts() noexcept;
 	void _SetDefaultScalingModes() noexcept;