Implement support for TXT files that can't be loaded outside CPKs in 1.01.

blueskythlikesclouds · blueskythlikesclouds · commit a55a64724df3 · 2022-06-18T19:21:37.000+03:00
diff --git a/Source/DivaModLoader/Allocator.h b/Source/DivaModLoader/Allocator.h
@@ -4,6 +4,7 @@
 
 static inline FUNCTION_PTR(void*, __fastcall, operatorNew, sigOperatorNew(), size_t);
 static inline FUNCTION_PTR(void*, __fastcall, operatorDelete, sigOperatorDelete(), void*);
+static inline FUNCTION_PTR(void*, __fastcall, heapCMallocAllocate, sigHeapCMallocAllocate(), size_t type, size_t size, const char* name);
 
 template <class T>
 class Allocator
diff --git a/Source/DivaModLoader/Context.cpp b/Source/DivaModLoader/Context.cpp
@@ -2,6 +2,7 @@
 
 #include "CodeLoader.h"
 #include "DatabaseLoader.h"
+#include "FileLoader.h"
 #include "ModLoader.h"
 #include "Patches.h"
 #include "SigScan.h"
@@ -67,6 +68,7 @@ void Context::init()
     Patches::init();
     ModLoader::init();
     CodeLoader::init();
+    FileLoader::init();
 
     INSTALL_HOOK(WinMain);
 }
diff --git a/Source/DivaModLoader/DivaModLoader.vcxproj b/Source/DivaModLoader/DivaModLoader.vcxproj
@@ -104,6 +104,7 @@
     <ClInclude Include="Config.h" />
     <ClInclude Include="Context.h" />
     <ClInclude Include="DatabaseLoader.h" />
+    <ClInclude Include="FileLoader.h" />
     <ClInclude Include="ModLoader.h" />
     <ClInclude Include="Patches.h" />
     <ClInclude Include="Pch.h" />
@@ -116,6 +117,7 @@
     <ClCompile Include="Config.cpp" />
     <ClCompile Include="Context.cpp" />
     <ClCompile Include="DatabaseLoader.cpp" />
+    <ClCompile Include="FileLoader.cpp" />
     <ClCompile Include="ModLoader.cpp" />
     <ClCompile Include="Patches.cpp" />
     <ClCompile Include="Pch.cpp">
diff --git a/Source/DivaModLoader/DivaModLoader.vcxproj.filters b/Source/DivaModLoader/DivaModLoader.vcxproj.filters
@@ -12,6 +12,7 @@
     <ClInclude Include="Patches.h" />
     <ClInclude Include="SigScan.h" />
     <ClInclude Include="DatabaseLoader.h" />
+    <ClInclude Include="FileLoader.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Pch.cpp" />
@@ -22,5 +23,6 @@
     <ClCompile Include="Patches.cpp" />
     <ClCompile Include="SigScan.cpp" />
     <ClCompile Include="DatabaseLoader.cpp" />
+    <ClCompile Include="FileLoader.cpp" />
   </ItemGroup>
 </Project>
diff --git a/Source/DivaModLoader/FileLoader.cpp b/Source/DivaModLoader/FileLoader.cpp
@@ -0,0 +1,48 @@
+﻿#include "FileLoader.h"
+#include "Allocator.h"
+
+// This piece of code here only applies to 1.01. For some reason, not all TXT files can be loaded
+// outside CPKs in this version, so we need to do it manually.
+
+struct CpkFileHandle
+{
+    char type[0x100]; // "criloader"
+    void* data; // 0x100
+    size_t dataSize; // 0x108
+    uint8_t gap110[0x18];
+};
+
+HOOK(CpkFileHandle*, __fastcall, OpenFileFromCpk, sigLoadFileFromCpk(), const char* fileName, bool a2, bool a3)
+{
+    // I don't know what these arguments mean, but they are utilized by files
+    // that we are interested in manually loading.
+    if (a2 && a3)
+    {
+        FILE* file = fopen(fileName, "rb");
+        if (file)
+        {
+            // Replicate the exact same data structure as the original function.
+            CpkFileHandle* handle = (CpkFileHandle*)operatorNew(sizeof(CpkFileHandle));
+            ZeroMemory(handle, sizeof(*handle));
+
+            strcpy(handle->type, "criloader");
+
+            // Load entirety of the file at once.
+            fseek(file, 0, SEEK_END);
+            handle->dataSize = ftell(file);
+            fseek(file, 0, SEEK_SET);
+            handle->data = heapCMallocAllocate(5, handle->dataSize, "cri file extract buffer");
+            fread(handle->data, handle->dataSize, 1, file);
+            fclose(file);
+
+            return handle;
+        }
+    }
+
+    return originalOpenFileFromCpk(fileName, a2, a3);
+}
+
+void FileLoader::init()
+{
+    INSTALL_HOOK(OpenFileFromCpk);
+}
diff --git a/Source/DivaModLoader/FileLoader.h b/Source/DivaModLoader/FileLoader.h
@@ -0,0 +1,7 @@
+﻿#pragma once
+
+class FileLoader
+{
+public:
+    static void init();
+};
diff --git a/Source/DivaModLoader/SigScan.cpp b/Source/DivaModLoader/SigScan.cpp
@@ -89,7 +89,9 @@ SIG_SCAN(sigCrtMain, 0x1409794C8, "\x48\x89\x5C\x24\x00\x57\x48\x83\xEC\x30\xB9\
 SIG_SCAN(sigWinMain, 0x1402C34E0, "\x40\x55\x53\x57\x41\x54\x41\x55\x48\x8D\xAC\x24\x00\x00\x00\x00\xB8\x00\x00\x00\x00\xE8\x00\x00\x00\x00\x48\x2B\xE0\x48\x8B\x05\x00\x00\x00\x00\x48\x33\xC4\x48\x89\x85\x00\x00\x00\x00\x48\x8B\xD9\xBA\x00\x00\x00\x00\x33\xC9\x45\x8B\xE1\xFF\x15\x00\x00\x00\x00\xFF\x15\x00\x00\x00\x00\x4C\x8B\xC0\x48\x8D\x95\x00\x00\x00\x00\x48\x8D\x8D\x00\x00\x00\x00", "xxxxxxxxxxxx????x????x????xxxxxx????xxxxxx????xxxx????xxxxxxx????xx????xxxxxx????xxx????")
 SIG_SCAN(sigOperatorNew, 0x140978A10, "\x40\x53\x48\x83\xEC\x20\x48\x8B\xD9\xEB\x0F\x48\x8B\xCB\xE8\x00\x00\x00\x00\x85\xC0\x74\x13\x48\x8B\xCB\xE8\x00\x00\x00\x00\x48\x85\xC0\x74\xE7\x48\x83\xC4\x20\x5B\xC3\x48\x83\xFB\xFF\x74\x06\xE8\x00\x00\x00\x00\xCC\xE8\x00\x00\x00\x00\xCC\x40\x53", "xxxxxxxxxxxxxxx????xxxxxxxx????xxxxxxxxxxxxxxxxxx????xx????xxx")
 SIG_SCAN(sigOperatorDelete, 0x1409B30D0, "\x48\x85\xC9\x74\x37\x53\x48\x83\xEC\x20\x4C\x8B\xC1\x33\xD2\x48\x8B\x0D\x00\x00\x00\x00\xFF\x15\x00\x00\x00\x00\x85\xC0\x75\x17\xE8\x00\x00\x00\x00\x48\x8B\xD8\xFF\x15\x00\x00\x00\x00\x8B\xC8\xE8\x00\x00\x00\x00\x89\x03\x48\x83\xC4\x20\x5B\xC3", "xxxxxxxxxxxxxxxxxx????xx????xxxxx????xxxxx????xxx????xxxxxxxx")
+SIG_SCAN(sigHeapCMallocAllocate, 0x1404403B0, "\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x57\x48\x83\xEC\x20\x0F\xB6\x05\x00\x00\x00\x00\x49\x8B\xE8\x48\x63\xF9\x48\x8B\xF2\x84\xC0\x75\x0C\xE8\x00\x00\x00\x00\x0F\xB6\x05\x00\x00\x00\x00", "xxxx?xxxx?xxxxxxxx????xxxxxxxxxxxxxx????xxx????")
 SIG_SCAN(sigInitRomDirectoryPaths, 0x1402A2510, "\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x55\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8B\xEC\x48\x81\xEC\x00\x00\x00\x00\x48\x8B\x05\x00\x00\x00\x00\x48\x33\xC4\x48\x89\x45\xF0\x48\x8D\x0D\x00\x00\x00\x00\xE8\x00\x00\x00\x00\x33\xF6\x48\x89\x75\xD0\x48\x89\x75\xE0\xBF\x00\x00\x00\x00\x48\x89\x7D\xE8\x40\x88\x75\xD0\x45\x33\xC0\x48\x8D\x15\x00\x00\x00\x00\x48\x8D\x4D\xD0\xE8\x00\x00\x00\x00\x90\x44\x8D\x46\x02\x48\x8D\x15\x00\x00\x00\x00\x48\x8D\x4D\xD0\xE8\x00\x00\x00\x00\x89\x75\xC0\x4C\x8D\x25\x00\x00\x00\x00\x48\x8D\x5E\xFF\x0F\x1F\x80\x00\x00\x00\x00", "xxxx?xxxx?xxxx?xxxxxxxxxxxxxxx????xxx????xxxxxxxxxx????x????xxxxxxxxxxx????xxxxxxxxxxxxxx????xxxxx????xxxxxxxx????xxxxx????xxxxxx????xxxxxxx????")
 SIG_SCAN(sigInitSteamAPIManager, 0x1405FFE20, "\x48\x89\x5C\x24\x00\x57\x48\x83\xEC\x20\x48\x8B\xF9\x80\x79\x08\x00\x0F\x85\x00\x00\x00\x00\xB9\x00\x00\x00\x00\xFF\x15\x00\x00\x00\x00\x84\xC0\x74\x0F\xC6\x47\x08\x00\x48\x8B\x5C\x24\x00\x48\x83\xC4\x20\x5F\xC3", "xxxx?xxxxxxxxxxxxxx????x????xx????xxxxxxxxxxxx?xxxxxx")
 SIG_SCAN(sigResolveFilePath, 0x1402A5500, "\x48\x89\x5C\x24\x00\x55\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x83\xEC\x40\x48\x8B\x05\x00\x00\x00\x00\x48\x33\xC4\x48\x89\x44\x24\x00\x4C\x8B\xE2\x4C\x8B\xF9\x33\xC0\x0F\x57\xC9\xF3\x0F\x7F\x4C\x24\x00\x48\x89\x44\x24\x00\x48\x8D\x54\x24\x00\xE8\x00\x00\x00\x00\x83\xF8\x01\x75\x46\x49\x8B\xCF\xE8\x00\x00\x00\x00\x84\xC0\x74\x28\x4D\x85\xE4\x0F\x84\x00\x00\x00\x00\x4D\x3B\xE7\x0F\x84\x00\x00\x00\x00\x49\x8B\xD7\x49\x83\x7F\x00\x00\x72\x03\x49\x8B\x17", "xxxx?xxxxxxxxxxxxxxxxxx????xxxxxxx?xxxxxxxxxxxxxxxx?xxxx?xxxx?x????xxxxxxxxx????xxxxxxxxx????xxxxx????xxxxxx??xxxxx")
-SIG_SCAN(sigInitMdataMgr, 0x14043E150, "\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x41\x54\x41\x56\x41\x57\x48\x83\xEC\x60\x48\x8B\x44\x24\x00\x48\x89\x44\x24\x00\x4C\x8D\x25\x00\x00\x00\x00\x4C\x89\x64\x24\x00\x49\x8B\xCC", "xxxx?xxxx?xxxx?xxxx?xxxxxxxxxxxxxx?xxxx?xxx????xxxx?xxx")
+SIG_SCAN(sigInitMdataMgr, 0x14043E150, "\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x41\x54\x41\x56\x41\x57\x48\x83\xEC\x60\x48\x8B\x44\x24\x00\x48\x89\x44\x24\x00\x4C\x8D\x25\x00\x00\x00\x00\x4C\x89\x64\x24\x00\x49\x8B\xCC", "xxxx?xxxx?xxxx?xxxx?xxxxxxxxxxxxxx?xxxx?xxx????xxxx?xxx")
+SIG_SCAN(sigLoadFileFromCpk, 0x140171880, "\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x55\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\x6C\x24\x00\x48\x81\xEC\x00\x00\x00\x00\x48\x8B\x05\x00\x00\x00\x00\x48\x33\xC4\x48\x89\x45\x27\x45\x0F\xB6\xE8\x44\x0F\xB6\xE2\x48\x8B\xF1\x48\x83\x3D\x00\x00\x00\x00\x00\x75\x07\x33\xC0\xE9\x00\x00\x00\x00", "xxxx?xxxx?xxxx?xxxxxxxxxxxxx?xxx????xxx????xxxxxxxxxxxxxxxxxxxxx?????xxxxx????")
diff --git a/Source/DivaModLoader/SigScan.h b/Source/DivaModLoader/SigScan.h
@@ -15,10 +15,13 @@ extern void* sigWinMain();
 
 extern void* sigOperatorNew();
 extern void* sigOperatorDelete();
+extern void* sigHeapCMallocAllocate();
 
 extern void* sigInitRomDirectoryPaths();
 
 extern void* sigInitSteamAPIManager();
 
 extern void* sigResolveFilePath();
-extern void* sigInitMdataMgr();
+extern void* sigInitMdataMgr();
+
+extern void* sigLoadFileFromCpk();
