Merge branch 'JohnnyonFlame:master' into master

Author: JeodC

gmloader/libyoyo.cpp

@@ -47,12 +47,12 @@ ABI_ATTR char (*Variable_SetBuiltIn_Direct)(void* inst, int var_slot, int array_
 ABI_ATTR void (*Code_Function_GET_the_function)(int numb,char **name,void **code,int *args, int *unk) = NULL;
 ABI_ATTR void (*_RefThing__dec)(void *ref) = NULL;
 ABI_ATTR int (*Variable_BuiltIn_Find)(const char *name) = NULL;
+ABI_ATTR long (*PrepareGame)(void) = NULL;
 ABI_ATTR int (*Code_Variable_Find_Slot_From_Name)(void *instance, const char *name) = NULL;
 ABI_ATTR int (*Variable_FindName)(const char *name) = NULL; /* Unavailable in GMS 1.4+, very old symbol */
 ABI_ATTR long (*ExecuteIt)(void *self, void *other, void *code, RValue *args) = NULL;
 ABI_ATTR long (*ExecuteIt_flags)(void *self, void *other, void *code, RValue *args, int argc) = NULL;
 
-
 bionic_off_t *g_GameFileLength = NULL; //android had 32bit off_t???
 char **g_pWorkingDirectory = NULL;
 char *g_fNoAudio = NULL;
@@ -87,6 +87,8 @@ void **g_pGameFileBuffer = NULL;
 void **g_ppYYStackTrace = NULL;
 int *Extension_Main_number = NULL;
 
+ReentrantHook REHPrepareGame = {};
+
 uint8_t prev_kbd_state[N_KEYS] = {};
 uint8_t cur_keys[N_KEYS] = {};
 
@@ -246,6 +248,16 @@ ABI_ATTR void game_change_reimpl(RValue *ret, void *self, void *other, int argc,
     }
 }
 
+extern int setup_ended;
+ABI_ATTR long PrepareGame_hook()
+{
+    setup_ended = 1;
+    rehook_unhook(&REHPrepareGame);
+    long ret = PrepareGame();
+    warning("- PrepareGame done.\n");
+    return ret;
+}
+
 void patch_libyoyo(so_module *mod)
 {
     // Load all of the native symbols referenced
@@ -323,6 +335,11 @@ void patch_libyoyo(so_module *mod)
     // Depth disable
     FIND_SYMBOL(mod, surface_depth_disable, "_Z21F_SurfaceDepthDisableR6RValueP9CInstanceS2_iPS_");
 
+    // Hook the start of the game so we know setup is done
+    ENSURE_SYMBOL(mod, PrepareGame, "_Z11PrepareGamev");
+    rehook_new(mod, &REHPrepareGame, (uintptr_t)PrepareGame, (uintptr_t)&PrepareGame_hook);
+    rehook_hook(&REHPrepareGame);
+
     // Disable extension support
     FIND_SYMBOL(mod, Extension_Main_number, "Extension_Main_number");
     if (gmloader_config.disable_extensions == 1) {

gmloader/libyoyo.h

@@ -325,6 +325,7 @@ extern void **g_nYYCode;
 extern void **g_pGameFileBuffer;
 extern void **g_ppYYStackTrace;
 extern int *Extension_Main_number;
+extern ReentrantHook REHPrepareGame;
 
 extern const char *gc_workdir;
 extern int relaunch_flag;

gmloader/main.cpp

@@ -20,6 +20,7 @@
 int relaunch_flag = 0;
 char *program_name = nullptr;
 const char* gc_workdir = nullptr;
+bool override_apk = false;
 
 /*
       Don't touch this incantation. It serves no practical
@@ -143,6 +144,7 @@ int main(int argc, char *argv[])
     // Apply apk_path override if provided
     if (!override_apk_path.empty()) {
         gmloader_config.apk_path = override_apk_path;
+        override_apk = true;
     }
 
     char platform_ov[32];

gmloader/texture.cpp

@@ -18,6 +18,8 @@ namespace fs = std::filesystem;
 int image_preload_idx = 0;
 int setup_ended = 0;
 
+extern bool override_apk;
+
 typedef struct pvrtc_file {
     uint32_t Version = 0x03525650;
     uint32_t Flags = 0;
@@ -50,7 +52,18 @@ void LoadTextureFromPNG_generic(void *arg1, int arg2, uint32_t *flags, uint32_t
                 uint32_t idx = (data[1] << 8) >> 8;
 
                 // Load from APK first and then try the gamedir
-                fs::path pvr_path = fs::path(gmloader_config.save_dir)  / "textures" / (std::to_string(idx) + ".pvr");
+                fs::path pvr_path;
+                if (override_apk) {
+                    // Sanitize the apk path
+                    std::string tex_path = gmloader_config.apk_path;
+                    if (tex_path.rfind("assets/", 0) == 0) {
+                        tex_path = tex_path.substr(7); // Remove "assets/"
+                    }
+                    pvr_path = fs::path(gmloader_config.save_dir)  / "textures" / tex_path / (std::to_string(idx) + ".pvr");
+                }
+                else {
+                    pvr_path = fs::path(gmloader_config.save_dir)  / "textures" / (std::to_string(idx) + ".pvr");
+                }
                 int ret = io_load_file(pvr_path.c_str(), (void **)&ext_data, &ext_data_sz);
                 if (ret != 1) {
                     fatal_error("Failed to load '%s'!\n", pvr_path.c_str());
@@ -186,23 +199,28 @@ uint32_t png_get_IHDR_hook(struct png_struct *png_ptr, png_info *info_ptr, uint3
         *interlace_type = info_ptr->interlace_type;
 
     if (!setup_ended && *width == 2 && *height == 1) {
-        fs::path path = fs::path(gmloader_config.save_dir) / "textures" / (std::to_string(image_preload_idx) + ".pvr");
-        uint32_t _sz;
-        uint32_t *buffer;
-
-        *width = 0;
-        *height = 0;
+        fs::path path;
+        if (override_apk) {
+            // Sanitize the apk path
+            std::string tex_path = gmloader_config.apk_path;
+            if (tex_path.rfind("assets/", 0) == 0) {
+                tex_path = tex_path.substr(7); // Remove "assets/"
+            }
+            path = fs::path(gmloader_config.save_dir)  / "textures" / tex_path / (std::to_string(image_preload_idx) + ".pvr");
+        }
+        else {
+            path = fs::path(gmloader_config.save_dir)  / "textures" / (std::to_string(image_preload_idx) + ".pvr");
+        }
 
         FILE *f = fopen(path.c_str(), "rb");
         if (f) {
             fseek(f, 0x18, SEEK_SET);
             fread(height, 1, 4, f);
             fread(width, 1, 4, f);
             fclose(f);
-        }
-
-        if (*width == 0 || *height == 0) {
-            warning("Texture %d metadata preload failure.\n", image_preload_idx);
+        } else {
+            fatal_error("Texture %d metadata preload failure.\n", image_preload_idx);
+            exit(-1);
         }
 
         image_preload_idx++;

loader/so_util.cpp

@@ -679,4 +679,25 @@ void hook_symbols(so_module *mod, DynLibHooks *hooks)
   for (int i = 0; hooks[i].symbol != NULL; i++) {
     hook_symbol(mod, hooks[i].symbol, hooks[i].hook, hooks[i].opt);
   }
+}
+
+void rehook_new(so_module *mod, ReentrantHook *hook, uintptr_t addr, uintptr_t dst)
+{
+  hook->addr = addr;
+  memcpy(hook->prologue, (void *)addr, sizeof(hook->prologue));
+  hook_address(mod, addr, dst);
+  memcpy(hook->trampoline, (void *)addr, sizeof(hook->trampoline));
+  rehook_unhook(hook);
+}
+
+void rehook_hook(ReentrantHook *hook)
+{
+  memcpy((void *)hook->addr, (void *)hook->trampoline, sizeof(hook->trampoline));
+  __builtin___clear_cache((void *)hook->addr, (void *)hook->addr+sizeof(hook->trampoline));
+}
+
+void rehook_unhook(ReentrantHook *hook)
+{
+  memcpy((void *)hook->addr, (void *)hook->prologue, sizeof(hook->prologue));
+  __builtin___clear_cache((void *)hook->addr, (void *)hook->addr+sizeof(hook->prologue));
 }

loader/so_util.h

@@ -111,9 +111,22 @@ typedef struct {
   int opt;
 } DynLibHooks;
 
+/* 
+  Do you need a hook that does something and then goes back to doing the normal
+  code path? Use this.
+*/
+typedef struct {
+  uintptr_t addr;
+  uint32_t prologue[4]; /* worst case scenario */
+  uint32_t trampoline[4]; /* in case we want to re-hook it */
+} ReentrantHook;
+
 void hook_address(so_module *mod, uintptr_t addr, uintptr_t dst);
 void hook_symbol(so_module *mod, const char *symbol, uintptr_t dst, int is_optional);
 void hook_symbols(so_module *mod, DynLibHooks *hooks);
+void rehook_new(so_module *mod, ReentrantHook *hook, uintptr_t addr, uintptr_t dst);
+void rehook_hook(ReentrantHook *hook);
+void rehook_unhook(ReentrantHook *hook);
 
 int so_load(so_module *mod, const char *filename, uintptr_t load_addr, void *so_data, size_t sz);
 void so_relocate(so_module *mod);