Revert F92LA compatibility changes: d1380b4 and d7e1da5

thelink2012 · thelink2012 · commit 418739036831 · 2026-04-25T17:06:29.000-03:00
I am not sure they work, very old develop code.
diff --git a/src/core/loader.cpp b/src/core/loader.cpp
@@ -35,70 +35,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     return TRUE;
 }
 
-void Loader::InitFromEntryPoint()
-{
-    typedef function_hooker<0x53ECBD, void(int)> ridle_hook;
-    typedef function_hooker<0x53ECCB, void(int)> rfidle_hook;   // Actually void() but... meh
-
-    // This may be called more than once due to the cinit/WinMain trick at Patch().
-    static bool has_patches = false;
-    if(has_patches) return;
-    has_patches = true;
-
-    auto& gvm = injector::address_manager::singleton();
-
-#ifndef NDEBUG
-    if(!gvm.IsSA())
-    {
-        static int& gGameState = *mem_ptr(0xC8D4C0).get<int>();
-
-        gGameState = 5; // skip intro
-        if(gvm.IsIII())
-            MakeNOP(raw_ptr(0x5811F8), 10);
-        else if(gvm.IsVC())
-            MakeNOP(raw_ptr(0x601B3B), 10);
-
-        if(gvm.IsIII())
-            MakeJMP(raw_ptr(0x405DB0), &Loader::Log);
-        else if(gvm.IsVC())
-            MakeJMP(raw_ptr(0x401000), &Loader::Log);
-
-        // Debugger does not attach properly in III/VC DxWnd, so we need to do it manually.
-        LaunchDebugger();
-    }
-#endif
-
-    // Install exception filter to log crashes
-    InstallExceptionCatcher([](const char* buffer)
-    {
-        Log("\n\n");
-        LogGameVersion();
-        Log(buffer);
-        loader.Shutdown();
-    });
-
-    // To be called each frame
-    auto CallTick = [this](ridle_hook::func_type Idle, int& i)
-    {
-        this->Tick();
-        return Idle(i);
-    };
-
-    // Do tick hook only if possible
-    if(try_address(ridle_hook::addr))  make_static_hook<ridle_hook>(CallTick);
-    if(try_address(rfidle_hook::addr)) make_static_hook<rfidle_hook>(CallTick);
-
-    this->Startup();
-}
-
 /*
  *  Loader::Patch
  *      Patches the game code to run the loader
  */
 bool Loader::Patch()
 {
     typedef function_hooker_stdcall<0x8246EC, int(HINSTANCE, HINSTANCE, LPSTR, int)> winmain_hook;
-    typedef function_hooker<0x8246AC, int()> cinit_hook;
+    typedef function_hooker<0x53ECBD, void(int)> ridle_hook;
+    typedef function_hooker<0x53ECCB, void(int)> rfidle_hook;   // Actually void() but... meh
 
     auto& gvm = injector::address_manager::singleton();
     gvm.set_name("Mod Loader");
@@ -109,39 +54,74 @@ bool Loader::Patch()
         if(injector::ReadMemory<int>(0xC920E8)) // RwInitialized -- should enter only when using the mss32 loader on III/VC
         {
             const char* buf = "You installed Mod Loader wrongly!\n\n"
-                "You need Ultimate ASI Loader, and modloader.asi must be in the 'scripts/' directory.\n\n"
-                "Please refer to the 'Readme.txt' or 'Leia-me.txt' for more information.";
+                              "You need Ultimate ASI Loader, and modloader.asi must be in the 'scripts/' directory.\n\n"
+                              "Please refer to the 'Readme.txt' or 'Leia-me.txt' for more information.";
             this->Error(buf);
             return false;
         }
 
         // Hook WinMain to run mod loader
         injector::make_static_hook<winmain_hook>([this](winmain_hook::func_type WinMain,
-            HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+                                                    HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
         {
-            // Avoid circular looping forever
+            // Avoind circular looping forever
             static bool bRan = false;
             if(bRan) return WinMain(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
             bRan = true;
             
-            this->InitFromEntryPoint();
-            auto WinMainNext = (winmain_hook::func_type_raw)ReadRelativeOffset(winmain_hook::addr + 1).get();
-            auto result = WinMainNext(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
+#ifndef NDEBUG
+            auto& gvm = injector::address_manager::singleton();
+            if(!gvm.IsSA())
+            {
+                static int& gGameState = *mem_ptr(0xC8D4C0).get<int>();
+
+                gGameState = 5; // skip intro
+                if(gvm.IsIII())
+                    MakeNOP(raw_ptr(0x5811F8), 10);
+                else if(gvm.IsVC())
+                    MakeNOP(raw_ptr(0x601B3B), 10);
+
+                if(gvm.IsIII())
+                    MakeJMP(raw_ptr(0x405DB0), &Loader::Log);
+                else if(gvm.IsVC())
+                    MakeJMP(raw_ptr(0x401000), &Loader::Log);
+
+                // Debugger does not attach properly in III/VC DxWnd, so we need to do it manually.
+                LaunchDebugger();
+            }
+#endif
+
+            // Install exception filter to log crashes
+            InstallExceptionCatcher([](const char* buffer)
+            {
+                Log("\n\n");
+                LogGameVersion();
+                Log(buffer);
+                loader.Shutdown();
+            });
+
+            // To be called each frame
+            auto CallTick = [this](ridle_hook::func_type Idle, int& i)
+            {
+                this->Tick();
+                return Idle(i);
+            };
+
+            // Do tick hook only if possible
+            if(try_address(ridle_hook::addr))  make_static_hook<ridle_hook>(CallTick);
+            if(try_address(rfidle_hook::addr)) make_static_hook<rfidle_hook>(CallTick);
+
+            // Startup the loader and call WinMain, Shutdown the loader after WinMain.
+            // If any mod hooked WinMain at Startup, no conflict will happen, we're takin' care of that
+            {
+            this->Startup();
+            auto WinMain = (winmain_hook::func_type_raw) ReadRelativeOffset(winmain_hook::addr + 1).get();
+            auto result = WinMain(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
             this->Shutdown();
             return result;
+            }
         });
 
-        // If possible, startup before WinMain.
-        // This is important for certain mods (e.g. FLA) that need to change offsets of
-        // functions that run pre-WinMain (e.g. global constructors).
-        if(try_address(cinit_hook::addr))
-        {
-            injector::make_static_hook<cinit_hook>([this](cinit_hook::func_type cinit) {
-                this->InitFromEntryPoint();
-                return cinit();
-            });
-        }
-
         return true;
     }
     else
diff --git a/src/core/loader.hpp b/src/core/loader.hpp
@@ -558,7 +558,6 @@ class Loader : public modloader_t
         bool Patch();
         
         // Start or Shutdown the loader
-        void InitFromEntryPoint();
         void Startup();
         void Shutdown();
         
diff --git a/src/plugins/gta3/std.stream/backend.cpp b/src/plugins/gta3/std.stream/backend.cpp
@@ -428,46 +428,6 @@ void CAbstractStreaming::BuildPrevOnCdMap()
 }
 
 
-/*
- *  CAbstractStreaming::Patch
- *      Same as Patch() but called much later during game loading. This is used to
- *      improve compatibility with certain mods that modify pointer offsets.
- */
-void CAbstractStreaming::PatchDelayed()
-{
-    // Pointers
-    ms_aInfoForModel = ReadMemory<CStreamingInfo*>(0x40D014, true);
-    LoadCdDirectory2 = ReadRelativeOffset(0x5B8310 + 1).get<void(const char*, int)>();
-    clothesDirectory = gvm.IsSA()? ReadMemory<CDirectory*>(lazy_ptr<0x5A419B>(), true) : nullptr;
-
-    // Part of standard models hooks
-    if(gvm.IsSA())
-    {
-        MakeCALL(0x40CCA6, raw_ptr(HOOK_RegisterNextModelRead));
-        MakeNOP(0x40CCA6 + 5, 2);
-    }
-    else if(gvm.IsVC())
-    {
-        MakeCALL(0x40CCA6, raw_ptr(HOOK_RegisterNextModelRead_VC));
-        MakeCALL(xVc(0x40B738), raw_ptr(HOOK_RegisterNextModelRead_VC));
-        MakeNOP(0x40CCA6 + 5, 1);
-        MakeNOP(xVc(0x40B738) + 5, 1);
-    }
-    else if(gvm.IsIII()) // doesn't need to be delayed but keep together VC/SA hooks
-    {
-        using xcd_hook1 = function_hooker_thiscall<xIII(0x40A128), char(CStreamingInfo*, int*, int*)>;
-        using xcd_hook2 = function_hooker_thiscall<xIII(0x40A4F3), char(CStreamingInfo*, int*, int*)>;
-
-        auto fn_register = [this](xcd_hook1::func_type GetCdPosnAndSize, CStreamingInfo*& model, int*& pOffset, int*& pSize)
-        {
-            RegisterNextModelRead(this->InfoForModelIndex(*model));
-            return GetCdPosnAndSize(model, pOffset, pSize);
-        };
-
-        make_static_hook<xcd_hook1>(fn_register);
-        make_static_hook<xcd_hook2>(fn_register);
-    }
-}
 
 /*
  *  CAbstractStreaming::Patch
@@ -494,7 +454,10 @@ void CAbstractStreaming::Patch()
 		if(!gvm.IsSA())
 			this->bHasInitializedStreaming = false;
 
-        PatchDelayed();
+        // Pointers
+        ms_aInfoForModel = ReadMemory<CStreamingInfo*>(0x40D014, true);
+        LoadCdDirectory2 = ReadRelativeOffset(0x5B8310 + 1).get<void(const char*, int)>();
+        clothesDirectory = gvm.IsSA()? ReadMemory<CDirectory*>(lazy_ptr<0x5A419B>(), true) : nullptr;
 
         //
         this->InitialiseStructAbstraction();
@@ -562,7 +525,32 @@ void CAbstractStreaming::Patch()
 		}
 
         // We need to know the next model to be read before the CdStreamRead call happens
-        // XXX this hook has been moved to PatchDelayed!
+        if(gvm.IsSA())
+        {
+            MakeCALL(0x40CCA6, raw_ptr(HOOK_RegisterNextModelRead));
+            MakeNOP(0x40CCA6 + 5, 2);
+        }
+        else if(gvm.IsVC())
+        {
+            MakeCALL(0x40CCA6, raw_ptr(HOOK_RegisterNextModelRead_VC));
+            MakeCALL(xVc(0x40B738), raw_ptr(HOOK_RegisterNextModelRead_VC));
+            MakeNOP(0x40CCA6 + 5, 1);
+            MakeNOP(xVc(0x40B738) + 5, 1);
+        }
+        else if(gvm.IsIII())
+        {
+            using xcd_hook1 = function_hooker_thiscall<xIII(0x40A128), char(CStreamingInfo*, int*, int*)>;
+            using xcd_hook2 = function_hooker_thiscall<xIII(0x40A4F3), char(CStreamingInfo*, int*, int*)>;
+
+            auto fn_register = [this](xcd_hook1::func_type GetCdPosnAndSize, CStreamingInfo*& model, int*& pOffset, int*& pSize)
+            {
+                RegisterNextModelRead(this->InfoForModelIndex(*model));
+                return GetCdPosnAndSize(model, pOffset, pSize);
+            };
+
+            make_static_hook<xcd_hook1>(fn_register);
+            make_static_hook<xcd_hook2>(fn_register);
+        }
 
         // We need to return a new hFile if the file is on disk
         if(gvm.IsSA())
@@ -707,29 +695,30 @@ void CAbstractStreaming::Patch()
         // Although streamed COLs exist in Vice too, they are checked, so we don't need to check ourselves
         if(gvm.IsSA())
         {
+            TraitsSA traits; // see comment above
+
             // CColStore finding method is dummie, so we need to avoid duplicate cols by ourselves
-            make_static_hook<addcol_hook>([this](addcol_hook::func_type AddColSlot, const char*& name)
+            make_static_hook<addcol_hook>([this, traits](addcol_hook::func_type AddColSlot, const char*& name)
             {
-                const auto col_start = TraitsSA::BaseIndexForCOL();
-                return this->FindOrRegisterResource(name, "col", col_start, AddColSlot, name);
+                return this->FindOrRegisterResource(name, "col", traits.col_start, AddColSlot, name);
             });
         }
 
         // The following files are in SA only
         if(gvm.IsSA())
         {
+            TraitsSA traits;
+
             // CVehicleRecording do not care about duplicates, but we should
-            make_static_hook<addr3_hook>([this](addr3_hook::func_type RegisterRecordingFile, const char*& name)
+            make_static_hook<addr3_hook>([this, traits](addr3_hook::func_type RegisterRecordingFile, const char*& name)
             {
-                const auto rrr_start = TraitsSA::BaseIndexForRRR();
-                return this->FindOrRegisterResource(name, "rrr", rrr_start, RegisterRecordingFile, name);
+                return this->FindOrRegisterResource(name, "rrr", traits.rrr_start, RegisterRecordingFile, name);
             });
             
             // CStreamedScripts do not care about duplicates but we should
-            make_static_hook<addscm_hook>([this](addscm_hook::func_type RegisterScript, void*& self, const char*& name)
+            make_static_hook<addscm_hook>([this, traits](addscm_hook::func_type RegisterScript, void*& self, const char*& name)
             {
-                const auto scm_start = TraitsSA::BaseIndexForSCM();
-                return this->FindOrRegisterResource(name, "scm", scm_start, RegisterScript, self, name);
+                return this->FindOrRegisterResource(name, "scm", traits.scm_start, RegisterScript, self, name);
             });
         }
     }
diff --git a/src/plugins/gta3/std.stream/streaming.hpp b/src/plugins/gta3/std.stream/streaming.hpp
@@ -249,7 +249,6 @@ class CAbstractStreaming
         void InitialiseStructAbstraction();
         const LibF92LA& GetF92LA();
         void Patch();
-        void PatchDelayed();
         void DataPatch();
         void InitRefreshInterface();
         void ShutRefreshInterface();
diff --git a/src/shared/traits/gta3/sa.hpp b/src/shared/traits/gta3/sa.hpp
@@ -19,10 +19,10 @@ struct TraitsSA : TraitsGTA
 
     // Indices range
     const id_t dff_start   = 0;
-    const id_t txd_start   = BaseIndexForTXD();
-    const id_t col_start   = BaseIndexForCOL();
-    const id_t rrr_start   = BaseIndexForRRR();
-    const id_t scm_start   = BaseIndexForSCM();
+    const id_t txd_start   = injector::lazy_object<0x5B62CF, unsigned int>::get();  // uint32_t not working properly on GCC here
+    const id_t col_start   = injector::lazy_object<0x5B6314, unsigned int>::get();  // Why?
+    const id_t rrr_start   = injector::lazy_object<0x5B63F1, unsigned int>::get();
+    const id_t scm_start   = injector::lazy_object<0x5B641F, unsigned int>::get();
 
     const id_t max_models  = txd_start;
     const id_t dff_end     = txd_start;
@@ -124,33 +124,4 @@ struct TraitsSA : TraitsGTA
         return 0;
     }
 
-    // Indices range
-
-    // TODO do the same in TraitsIII/VC and get rid of non-static dff_start/etc
-
-    static id_t BaseIndexForDFF()
-    {
-        return 0;
-    }
-
-    static id_t BaseIndexForTXD()
-    {
-        // XXX uint32_t not working properly on GCC here
-        return injector::lazy_object<0x5B62CF, unsigned int>::get();
-    }
-
-    static id_t BaseIndexForCOL()
-    {
-        return injector::lazy_object<0x5B6314, unsigned int>::get();
-    }
-
-    static id_t BaseIndexForRRR()
-    {
-        return injector::lazy_object<0x5B63F1, unsigned int>::get();;
-    }
-
-    static id_t BaseIndexForSCM()
-    {
-        return injector::lazy_object<0x5B641F, unsigned int>::get();
-    }
 };
diff --git a/src/translator/gta3/sa/10us.hpp b/src/translator/gta3/sa/10us.hpp
@@ -21,7 +21,6 @@ static void sa_10us(std::map<memory_pointer_raw, memory_pointer_raw>& map)
     // Core
     if(true)
     {
-        map[0x8246AC] = 0x8246AC;   // call    _cinit
         map[0x8246EC] = 0x8246EC;   // call    _WinMain
         map[0x53ECBD] = 0x53ECBD;   // call    _Z4IdlePv
         map[0x53ECCB] = 0x53ECCB;   // call    _Z12FrontendIdlePv

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ static void sa_10us(std::map<memory_pointer_raw, memory_pointer_raw>& map)`
`21`	`21`	`// Core`
`22`	`22`	`if(true)`
`23`	`23`	`{`
`24`		`- map[0x8246AC] = 0x8246AC; // call _cinit`
`25`	`24`	`map[0x8246EC] = 0x8246EC; // call _WinMain`
`26`	`25`	`map[0x53ECBD] = 0x53ECBD; // call _Z4IdlePv`
`27`	`26`	`map[0x53ECCB] = 0x53ECCB; // call _Z12FrontendIdlePv`