added support for runtime arguments

vyrus001 · vyrus001 · commit 51619415ba14 · 2016-01-18T21:40:02.000-08:00
diff --git a/MemoryModule.c b/MemoryModule.c
@@ -428,9 +428,9 @@ static void _FreeLibrary(HCUSTOMMODULE module, void *userdata)
     FreeLibrary((HMODULE) module);
 }
 
-HMEMORYMODULE MemoryLoadLibrary(const void *data)
+HMEMORYMODULE MemoryLoadLibrary(const void *data, const char * argv[])
 {
-    return MemoryLoadLibraryEx(data, _LoadLibrary, _GetProcAddress, _FreeLibrary, NULL);
+    return MemoryLoadLibraryEx(data, _LoadLibrary, _GetProcAddress, _FreeLibrary, argv);
 }
 
 HMEMORYMODULE MemoryLoadLibraryEx(const void *data,
diff --git a/MemoryModule.h b/MemoryModule.h
@@ -49,7 +49,7 @@ typedef void (*CustomFreeLibraryFunc)(HCUSTOMMODULE, void *);
  * All dependencies are resolved using default LoadLibrary/GetProcAddress
  * calls through the Windows API.
  */
-HMEMORYMODULE MemoryLoadLibrary(const void *);
+HMEMORYMODULE MemoryLoadLibrary(const void *, const char *[]);
 
 /**
  * Load EXE/DLL from memory location using custom dependency resolvers.
diff --git a/example/DllLoader/DllLoader.cpp b/example/DllLoader/DllLoader.cpp
@@ -68,7 +68,7 @@ void LoadFromMemory(void)
     fread(data, 1, size, fp);
     fclose(fp);
 
-    handle = MemoryLoadLibrary(data);
+    handle = MemoryLoadLibrary(data, NULL);
     if (handle == NULL)
     {
         _tprintf(_T("Can't load library from memory.\n"));
diff --git a/example/DllLoader/DllLoaderLoader.cpp b/example/DllLoader/DllLoaderLoader.cpp
@@ -31,7 +31,7 @@ int RunFromMemory(void)
     fread(data, 1, size, fp);
     fclose(fp);
 
-    handle = MemoryLoadLibrary(data);
+    handle = MemoryLoadLibrary(data, NULL);
     if (handle == NULL)
     {
         _tprintf(_T("Can't load library from memory.\n"));

Original file line number	Diff line number	Diff line change
`@@ -428,9 +428,9 @@ static void _FreeLibrary(HCUSTOMMODULE module, void *userdata)`
`428`	`428`	`FreeLibrary((HMODULE) module);`
`429`	`429`	`}`
`430`	`430`
`431`		`-HMEMORYMODULE MemoryLoadLibrary(const void *data)`
	`431`	`+HMEMORYMODULE MemoryLoadLibrary(const void data, const char argv[])`
`432`	`432`	`{`
`433`		`- return MemoryLoadLibraryEx(data, _LoadLibrary, _GetProcAddress, _FreeLibrary, NULL);`
	`433`	`+ return MemoryLoadLibraryEx(data, _LoadLibrary, _GetProcAddress, _FreeLibrary, argv);`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`HMEMORYMODULE MemoryLoadLibraryEx(const void *data,`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ void LoadFromMemory(void)`
`68`	`68`	`fread(data, 1, size, fp);`
`69`	`69`	`fclose(fp);`
`70`	`70`
`71`		`- handle = MemoryLoadLibrary(data);`
	`71`	`+ handle = MemoryLoadLibrary(data, NULL);`
`72`	`72`	`if (handle == NULL)`
`73`	`73`	`{`
`74`	`74`	`_tprintf(_T("Can't load library from memory.\n"));`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ int RunFromMemory(void)`
`31`	`31`	`fread(data, 1, size, fp);`
`32`	`32`	`fclose(fp);`
`33`	`33`
`34`		`- handle = MemoryLoadLibrary(data);`
	`34`	`+ handle = MemoryLoadLibrary(data, NULL);`
`35`	`35`	`if (handle == NULL)`
`36`	`36`	`{`
`37`	`37`	`_tprintf(_T("Can't load library from memory.\n"));`