Kernel - Reworked x86 physical memory allocation

[tpg/acess2.git] / Kernel / bin / pe.c

diff --git a/Kernel/bin/pe.c b/Kernel/bin/pe.c
index aa83ac9..a697e9c 100644 (file)
--- a/Kernel/bin/pe.c
+++ b/Kernel/bin/pe.c
@@ -13,11 +13,11 @@
 tBinary        *PE_Load(int fp);\r
 tBinary        *MZ_Open(int fp);\r
  int   PE_Relocate(void *Base);\r
- int   PE_GetSymbol(void *Base, char *Name, Uint *Ret);\r
+ int   PE_GetSymbol(void *Base, const char *Name, Uint *Ret);\r
 \r
 // === GLOBALS ===\r
 MODULE_DEFINE(0, 0x0032, BinPE, PE_Install, NULL, NULL);\r
-char   *gsPE_DefaultInterpreter = "/Acess/Libs/ld-acess.so";\r
+const char     *gsPE_DefaultInterpreter = "/Acess/Libs/ld-acess.so";\r
 tBinaryType    gPE_Loader = {\r
        NULL,\r
        ('M'|('Z'<<8)), 0xFFFF, // 'MZ'\r
@@ -29,7 +29,7 @@ tBinaryType   gPE_Loader = {
 int PE_Install(char **Arguments)\r
 {\r
        Binary_RegisterType(&gPE_Loader);\r
-       return 1;\r
+       return MODULE_ERR_OK;\r
 }\r
 \r
 /**\r
@@ -198,6 +198,7 @@ int PE_Relocate(void *Base)
        ENTER("pBase", Base);\r
        dosHdr = Base;\r
        peHeaders = (void*)( iBase + dosHdr->PeHdrOffs );\r
+       LOG("Prefered Base %p", peHeaders->OptHeader.ImageBase);\r
        peSections = (void*)( iBase + sizeof(tPE_IMAGE_HEADERS) );\r
        \r
        directory = (void*)(peSections[0].RVA + iBase);\r
@@ -230,7 +231,7 @@ int PE_Relocate(void *Base)
        return 0;\r
 }\r
 \r
-int PE_GetSymbol(void *Base, char *Name, Uint *Ret)\r
+int PE_GetSymbol(void *Base, const char *Name, Uint *Ret)\r
 {\r
        return 0;\r
 }\r