Kernel/modules - moved relocation to before dep checks, the strings need to be reloca...

diff --git a/KernelLand/Kernel/modules.c b/KernelLand/Kernel/modules.c
index e3e0ebe..8202b08 100644 (file)
--- a/KernelLand/Kernel/modules.c
+++ b/KernelLand/Kernel/modules.c
@@ -351,9 +351,17 @@ int Module_LoadFile(const char *Path, const char *ArgString)
                Log_Warning("Module", "Module_LoadFile - Unable to load '%s'", Path);
                return 0;
        }
+
+       // TODO: I need a way of relocating the dependencies before everything else, so
+       // they can be resolved before any other link errors
+       if( !Binary_Relocate(base) ) {
+               Log_Warning("Relocation of module %s failed", Path);
+               Binary_Unload(base);
+               return 0;
+       }
        
        // Check for Acess Driver
-       if( Binary_FindSymbol(base, "DriverInfo", (Uint*)&info )  )
+       if( Binary_FindSymbol(base, "DriverInfo", (Uint*)&info ) == 0 )
        {
                for( loader = gModule_Loaders; loader; loader = loader->Next)
                {
@@ -375,12 +383,6 @@ int Module_LoadFile(const char *Path, const char *ArgString)
                return 0;
        }
 
-       if( !Binary_Relocate(base) ) {
-               Log_Warning("Relocation of module %s failed", Path);
-               Binary_Unload(base);
-               return 0;
-       }
-
        // Initialise (and register)
        if( loader ? loader->Loader(base) : Module_int_Initialise( info, ArgString ) )
        {