Fix C4055 on MSVC.

fancycode · fancycode · commit cc562219afd5 · 2015-12-20T22:07:30.000+01:00
diff --git a/MemoryModule.c b/MemoryModule.c
@@ -610,7 +610,7 @@ HMEMORYMODULE MemoryLoadLibraryEx(const void *data, size_t size,
     // get entry point of loaded library
     if (result->headers->OptionalHeader.AddressOfEntryPoint != 0) {
         if (result->isDLL) {
-            DllEntryProc DllEntry = (DllEntryProc) (code + result->headers->OptionalHeader.AddressOfEntryPoint);
+            DllEntryProc DllEntry = (DllEntryProc)(LPVOID)(code + result->headers->OptionalHeader.AddressOfEntryPoint);
             // notify library about attaching to process
             BOOL successfull = (*DllEntry)((HINSTANCE)code, DLL_PROCESS_ATTACH, 0);
             if (!successfull) {
@@ -619,7 +619,7 @@ HMEMORYMODULE MemoryLoadLibraryEx(const void *data, size_t size,
             }
             result->initialized = TRUE;
         } else {
-            result->exeEntry = (ExeEntryProc) (code + result->headers->OptionalHeader.AddressOfEntryPoint);
+            result->exeEntry = (ExeEntryProc)(LPVOID)(code + result->headers->OptionalHeader.AddressOfEntryPoint);
         }
     } else {
         result->exeEntry = NULL;
@@ -688,7 +688,7 @@ FARPROC MemoryGetProcAddress(HMEMORYMODULE module, LPCSTR name)
     }
 
     // AddressOfFunctions contains the RVAs to the "real" functions
-    return (FARPROC) (codeBase + (*(DWORD *) (codeBase + exports->AddressOfFunctions + (idx*4))));
+    return (FARPROC)(LPVOID)(codeBase + (*(DWORD *) (codeBase + exports->AddressOfFunctions + (idx*4))));
 }
 
 void MemoryFreeLibrary(HMEMORYMODULE mod)
@@ -700,7 +700,7 @@ void MemoryFreeLibrary(HMEMORYMODULE mod)
     }
     if (module->initialized) {
         // notify library about detaching from process
-        DllEntryProc DllEntry = (DllEntryProc) (module->codeBase + module->headers->OptionalHeader.AddressOfEntryPoint);
+        DllEntryProc DllEntry = (DllEntryProc)(LPVOID)(module->codeBase + module->headers->OptionalHeader.AddressOfEntryPoint);
         (*DllEntry)((HINSTANCE)module->codeBase, DLL_PROCESS_DETACH, 0);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ HMEMORYMODULE MemoryLoadLibraryEx(const void *data, size_t size,`
`610`	`610`	`// get entry point of loaded library`
`611`	`611`	`if (result->headers->OptionalHeader.AddressOfEntryPoint != 0) {`
`612`	`612`	`if (result->isDLL) {`
`613`		`- DllEntryProc DllEntry = (DllEntryProc) (code + result->headers->OptionalHeader.AddressOfEntryPoint);`
	`613`	`+ DllEntryProc DllEntry = (DllEntryProc)(LPVOID)(code + result->headers->OptionalHeader.AddressOfEntryPoint);`
`614`	`614`	`// notify library about attaching to process`
`615`	`615`	`BOOL successfull = (*DllEntry)((HINSTANCE)code, DLL_PROCESS_ATTACH, 0);`
`616`	`616`	`if (!successfull) {`
`@@ -619,7 +619,7 @@ HMEMORYMODULE MemoryLoadLibraryEx(const void *data, size_t size,`
`619`	`619`	`}`
`620`	`620`	`result->initialized = TRUE;`
`621`	`621`	`} else {`
`622`		`- result->exeEntry = (ExeEntryProc) (code + result->headers->OptionalHeader.AddressOfEntryPoint);`
	`622`	`+ result->exeEntry = (ExeEntryProc)(LPVOID)(code + result->headers->OptionalHeader.AddressOfEntryPoint);`
`623`	`623`	`}`
`624`	`624`	`} else {`
`625`	`625`	`result->exeEntry = NULL;`
`@@ -688,7 +688,7 @@ FARPROC MemoryGetProcAddress(HMEMORYMODULE module, LPCSTR name)`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`// AddressOfFunctions contains the RVAs to the "real" functions`
`691`		`- return (FARPROC) (codeBase + ((DWORD ) (codeBase + exports->AddressOfFunctions + (idx*4))));`
	`691`	`+ return (FARPROC)(LPVOID)(codeBase + ((DWORD ) (codeBase + exports->AddressOfFunctions + (idx*4))));`
`692`	`692`	`}`
`693`	`693`
`694`	`694`	`void MemoryFreeLibrary(HMEMORYMODULE mod)`
`@@ -700,7 +700,7 @@ void MemoryFreeLibrary(HMEMORYMODULE mod)`
`700`	`700`	`}`
`701`	`701`	`if (module->initialized) {`
`702`	`702`	`// notify library about detaching from process`
`703`		`- DllEntryProc DllEntry = (DllEntryProc) (module->codeBase + module->headers->OptionalHeader.AddressOfEntryPoint);`
	`703`	`+ DllEntryProc DllEntry = (DllEntryProc)(LPVOID)(module->codeBase + module->headers->OptionalHeader.AddressOfEntryPoint);`
`704`	`704`	`(*DllEntry)((HINSTANCE)module->codeBase, DLL_PROCESS_DETACH, 0);`
`705`	`705`	`}`
`706`	`706`