X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Floadlib.c;h=3f8e674260b3a988554a9ae724d216b75c1e57a5;hb=2fcb3775f3afee7bfa9aa3cbb6aea3c6c3426e64;hp=b6637c227773c8f13cc93e2069853426d2726f3a;hpb=40b3565d79c0fd55f83e6470a458945efa21f6da;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/loadlib.c b/Usermode/Libraries/ld-acess.so_src/loadlib.c
index b6637c22..3f8e6742 100644
--- a/Usermode/Libraries/ld-acess.so_src/loadlib.c
+++ b/Usermode/Libraries/ld-acess.so_src/loadlib.c
@@ -15,7 +15,7 @@
 
 // === PROTOTYPES ===
 void	*IsFileLoaded(const char *file);
- int	GetSymbolFromBase(void *base, const char *name, void **ret);
+ int	GetSymbolFromBase(void *base, const char *name, void **ret, size_t *size);
 
 // === IMPORTS ===
 extern const struct {
@@ -23,6 +23,7 @@ extern const struct {
 	char	*Name;
 }	caLocalExports[];
 extern const int	ciNumLocalExports;
+extern char	**gEnvP;
 
 // === GLOABLS ===
 tLoadedLib	gLoadedLibraries[MAX_LOADED_LIBRARIES];
@@ -90,7 +91,7 @@ void *LoadLibrary(const char *SoName, const char *SearchDir, char **envp)
 	
 	// Call Entrypoint
 	DEBUGS(" LoadLibrary: '%s' Entry %p", SoName, fEntry);
-	fEntry(base, 0, NULL, envp);
+	fEntry(base, 0, NULL, gEnvP);
 	
 	DEBUGS("LoadLibrary: RETURN 1");
 	return base;
@@ -197,7 +198,7 @@ void Unload(void *Base)
  \fn Uint GetSymbol(const char *name)
  \brief Gets a symbol value from a loaded library
 */
-void *GetSymbol(const char *name)
+void *GetSymbol(const char *name, size_t *Size)
 {
 	 int	i;
 	void	*ret;
@@ -216,7 +217,7 @@ void *GetSymbol(const char *name)
 		
 		//SysDebug(" GetSymbol: Trying 0x%x, '%s'",
 		//	gLoadedLibraries[i].Base, gLoadedLibraries[i].Name);
-		if(GetSymbolFromBase(gLoadedLibraries[i].Base, name, &ret))	return ret;
+		if(GetSymbolFromBase(gLoadedLibraries[i].Base, name, &ret, Size))	return ret;
 	}
 	SysDebug("GetSymbol: === Symbol '%s' not found ===", name);
 	return 0;
@@ -226,13 +227,13 @@ void *GetSymbol(const char *name)
  \fn int GetSymbolFromBase(Uint base, char *name, Uint *ret)
  \breif Gets a symbol from a specified library
 */
-int GetSymbolFromBase(void *base, const char *name, void **ret)
+int GetSymbolFromBase(void *base, const char *name, void **ret, size_t *Size)
 {
 	uint8_t	*hdr = base;
 	if(hdr[0] == 0x7F && hdr[1] == 'E' && hdr[2] == 'L' && hdr[3] == 'F')
-		return ElfGetSymbol(base, name, ret);
+		return ElfGetSymbol(base, name, ret, Size);
 	if(hdr[0] == 'M' && hdr[1] == 'Z')
-		return PE_GetSymbol(base, name, ret);
+		return PE_GetSymbol(base, name, ret, Size);
 	SysDebug("Unknown type at %p (%02x %02x %02x %02x)", base,
 		hdr[0], hdr[1], hdr[2], hdr[3]);
 	return 0;