Various enhancements

- (WIP) Separate code by assembly
- Fix Push Notification Related Errors #15
- Fixed an issue where you couldn't do anything in the results after entering a race in landscape window
- Add Live playback slider

src/VERSIONINFO.rc

@@ -13,8 +13,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,36,0,0
- PRODUCTVERSION 1,36,0,0
+ FILEVERSION 1,37,0,0
+ PRODUCTVERSION 1,37,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -30,20 +30,20 @@ BEGIN
         BLOCK "000004b0"
         BEGIN
             VALUE "FileDescription", "Localization patch for Umamusume"
-            VALUE "FileVersion", "1.36.0.0"
+            VALUE "FileVersion", "1.37.0.0"
             VALUE "InternalName", "umamusume-localify"
             VALUE "LegalCopyright", "Copyright ⓒ Ji O Kim"
             VALUE "ProductName", "Umamusume Localify"
-            VALUE "ProductVersion", "1.36.0.0"
+            VALUE "ProductVersion", "1.37.0.0"
         END
         BLOCK "041204b0"
         BEGIN
             VALUE "FileDescription", "우마무스메 현지화 패치"
-            VALUE "FileVersion", "1.36.0.0"
+            VALUE "FileVersion", "1.37.0.0"
             VALUE "InternalName", "umamusume-localify"
             VALUE "LegalCopyright", "Copyright ⓒ Ji O Kim"
             VALUE "ProductName", "Umamusume Localify"
-            VALUE "ProductVersion", "1.36.0.0"
+            VALUE "ProductVersion", "1.37.0.0"
         END
     END
     BLOCK "VarFileInfo"

src/config/config.cpp

@@ -50,6 +50,7 @@ namespace config
 	bool champions_live_show_text = false;
 	int champions_live_resource_id = 1;
 	int champions_live_year = 2023;
+	bool live_slider_always_show = false;
 	/*
 	 * ModeNormal 0
 	 * Mode60FPS 1
@@ -74,7 +75,7 @@ namespace config
 
 	wstring text_id_dict;
 
-	WDocument code_map;
+	rapidjson::Document code_map;
 
 	bool has_json_parse_error = false;
 	wstring json_parse_error_msg;
@@ -85,6 +86,13 @@ namespace config
 	WDocument config_document;
 	WDocument backup_document;
 
+	namespace runtime
+	{
+		bool useDefaultFPS = false;
+		float ratioVertical = 0.5625f;
+		float ratioHorizontal = 1.7777778f;
+	}
+
 	void read_config_init()
 	{
 		wifstream config_stream{ "config.json" };
@@ -269,6 +277,8 @@ if (document.HasMember(L##_name_) && document[L##_name_].Is##_type_())\
 
 			GetValue("characterSystemTextCaptionPositionY", Float, character_system_text_caption_position_y);
 
+			GetValue("liveSliderAlwaysShow", Bool, live_slider_always_show);
+
 			GetValue("championsLiveShowText", Bool, champions_live_show_text);
 
 			GetValue("championsLiveResourceId", Int, champions_live_resource_id,
@@ -297,12 +307,11 @@ if (document.HasMember(L##_name_) && document[L##_name_].Is##_type_())\
 			GetValue("textIdDict", String, text_id_dict);
 
 			GetValue("codeMapPath", String, auto path,
-				wifstream code_map_stream{ path };
-				code_map_stream.imbue(locale(".UTF-8"));
+				ifstream code_map_stream{ path };
 
 				if (code_map_stream.is_open())
 				{
-					rapidjson::WIStreamWrapper wrapper{ code_map_stream };
+					rapidjson::IStreamWrapper wrapper{ code_map_stream };
 					code_map.ParseStream(wrapper);
 
 					code_map_stream.close();

src/config/config.hpp

@@ -9,6 +9,8 @@
 #include <unordered_map>
 #include <vector>
 
+#define RAPIDJSON_HAS_STDSTRING 1
+
 #include <rapidjson/rapidjson.h>
 #include <rapidjson/document.h>
 #include <rapidjson/encodings.h>
@@ -78,6 +80,7 @@ namespace config
 	extern bool champions_live_show_text;
 	extern int champions_live_resource_id;
 	extern int champions_live_year;
+	extern bool live_slider_always_show;
 	/*
 	 * ModeNormal 0
 	 * Mode60FPS 1
@@ -102,7 +105,7 @@ namespace config
 
 	extern wstring text_id_dict;
 
-	extern WDocument code_map;
+	extern rapidjson::Document code_map;
 
 	extern bool has_json_parse_error;
 	extern wstring json_parse_error_msg;
@@ -113,6 +116,13 @@ namespace config
 	extern WDocument config_document;
 	extern WDocument backup_document;
 
+	namespace runtime
+	{
+		extern bool useDefaultFPS;
+		extern float ratioVertical;
+		extern float ratioHorizontal;
+	}
+
 	void read_config_init();
 	bool read_config();
 	void write_config();

src/dllproxy/proxy.cpp

@@ -1,5 +1,7 @@
 #include <stdinclude.hpp>
 
+#include "proxy.hpp"
+
 extern "C"
 {
 	void* GetFileVersionInfoA_Original = nullptr;
@@ -23,7 +25,7 @@ extern "C"
 
 using namespace std;
 
-namespace
+namespace proxy
 {
 	class version_init
 	{
@@ -46,25 +48,25 @@ namespace
 
 			// Loading version.dll from another path is prohibited.
 			//auto original_dll = LoadLibraryW(dll_path.data());
-			auto original_dll = LoadLibraryW(L"version.win.dll");
+			version = LoadLibraryW(L"version.win.dll");
 
-			GetFileVersionInfoA_Original = GetProcAddress(original_dll, "GetFileVersionInfoA");
-			GetFileVersionInfoByHandle_Original = GetProcAddress(original_dll, "GetFileVersionInfoByHandle");
-			GetFileVersionInfoExA_Original = GetProcAddress(original_dll, "GetFileVersionInfoExA");
-			GetFileVersionInfoExW_Original = GetProcAddress(original_dll, "GetFileVersionInfoExW");
-			GetFileVersionInfoSizeA_Original = GetProcAddress(original_dll, "GetFileVersionInfoSizeA");
-			GetFileVersionInfoSizeExA_Original = GetProcAddress(original_dll, "GetFileVersionInfoSizeExA");
-			GetFileVersionInfoSizeExW_Original = GetProcAddress(original_dll, "GetFileVersionInfoSizeExW");
-			GetFileVersionInfoSizeW_Original = GetProcAddress(original_dll, "GetFileVersionInfoSizeW");
-			GetFileVersionInfoW_Original = GetProcAddress(original_dll, "GetFileVersionInfoW");
-			VerFindFileA_Original = GetProcAddress(original_dll, "VerFindFileA");
-			VerFindFileW_Original = GetProcAddress(original_dll, "VerFindFileW");
-			VerInstallFileA_Original = GetProcAddress(original_dll, "VerInstallFileA");
-			VerInstallFileW_Original = GetProcAddress(original_dll, "VerInstallFileW");
-			VerLanguageNameA_Original = GetProcAddress(original_dll, "VerLanguageNameA");
-			VerLanguageNameW_Original = GetProcAddress(original_dll, "VerLanguageNameW");
-			VerQueryValueA_Original = GetProcAddress(original_dll, "VerQueryValueA");
-			VerQueryValueW_Original = GetProcAddress(original_dll, "VerQueryValueW");
+			GetFileVersionInfoA_Original = GetProcAddress(version, "GetFileVersionInfoA");
+			GetFileVersionInfoByHandle_Original = GetProcAddress(version, "GetFileVersionInfoByHandle");
+			GetFileVersionInfoExA_Original = GetProcAddress(version, "GetFileVersionInfoExA");
+			GetFileVersionInfoExW_Original = GetProcAddress(version, "GetFileVersionInfoExW");
+			GetFileVersionInfoSizeA_Original = GetProcAddress(version, "GetFileVersionInfoSizeA");
+			GetFileVersionInfoSizeExA_Original = GetProcAddress(version, "GetFileVersionInfoSizeExA");
+			GetFileVersionInfoSizeExW_Original = GetProcAddress(version, "GetFileVersionInfoSizeExW");
+			GetFileVersionInfoSizeW_Original = GetProcAddress(version, "GetFileVersionInfoSizeW");
+			GetFileVersionInfoW_Original = GetProcAddress(version, "GetFileVersionInfoW");
+			VerFindFileA_Original = GetProcAddress(version, "VerFindFileA");
+			VerFindFileW_Original = GetProcAddress(version, "VerFindFileW");
+			VerInstallFileA_Original = GetProcAddress(version, "VerInstallFileA");
+			VerInstallFileW_Original = GetProcAddress(version, "VerInstallFileW");
+			VerLanguageNameA_Original = GetProcAddress(version, "VerLanguageNameA");
+			VerLanguageNameW_Original = GetProcAddress(version, "VerLanguageNameW");
+			VerQueryValueA_Original = GetProcAddress(version, "VerQueryValueA");
+			VerQueryValueW_Original = GetProcAddress(version, "VerQueryValueW");
 		};
 	};
 

src/dllproxy/proxy.hpp

@@ -0,0 +1,4 @@
+namespace proxy
+{
+	static HMODULE version;
+}