X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fbin%2Fpe.c;h=a697e9cb651621abed2d4a3f5648a6b3f1d3025e;hb=930fe819133ddb444bc6c22df09baf788183f6ad;hp=aa83ac9f3397971200612a0e58226e36fa8f5aa3;hpb=d95ad83dd0bfb3a8f6919f93ce5ead77a5905421;p=tpg%2Facess2.git

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