define exported extern "C" as declared

Dan Dees · Dan Dees · commit 6250b393a3ca · 2025-06-01T15:26:40.000+07:00
diff --git a/MemoryModule/Initialize.cpp b/MemoryModule/Initialize.cpp
@@ -6,7 +6,7 @@
 PMMP_GLOBAL_DATA MmpGlobalDataPtr;
 
 // DLL compliant access
-PMMP_GLOBAL_DATA NTAPI GetMmpGlobalDataPtr()
+extern "C" PMMP_GLOBAL_DATA NTAPI GetMmpGlobalDataPtr()
 {
    return MmpGlobalDataPtr;
 }
diff --git a/MemoryModule/LoadDllMemoryApi.cpp b/MemoryModule/LoadDllMemoryApi.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include <cstdlib>
 
-HMEMORYMODULE WINAPI LoadLibraryMemoryExW(
+extern "C" HMEMORYMODULE WINAPI LoadLibraryMemoryExW(
 	_In_ PVOID BufferAddress,
 	_In_ size_t Reserved,
 	_In_opt_ LPCWSTR DllBaseName,
@@ -15,7 +15,7 @@ HMEMORYMODULE WINAPI LoadLibraryMemoryExW(
 	return hMemoryModule;
 }
 
-HMEMORYMODULE WINAPI LoadLibraryMemoryExA(
+extern "C" HMEMORYMODULE WINAPI LoadLibraryMemoryExA(
 	_In_ PVOID BufferAddress,
 	_In_ size_t Reserved,
 	_In_opt_ LPCSTR DllBaseName,
@@ -59,11 +59,11 @@ HMEMORYMODULE WINAPI LoadLibraryMemoryExA(
 	return result;
 }
 
-HMEMORYMODULE WINAPI LoadLibraryMemory(_In_ PVOID BufferAddress) {
+extern "C" HMEMORYMODULE WINAPI LoadLibraryMemory(_In_ PVOID BufferAddress) {
 	return LoadLibraryMemoryExW(BufferAddress, 0, nullptr, nullptr, 0);
 }
 
-BOOL WINAPI FreeLibraryMemory(_In_ HMEMORYMODULE hMemoryModule) {
+extern "C" BOOL WINAPI FreeLibraryMemory(_In_ HMEMORYMODULE hMemoryModule) {
 	NTSTATUS status = LdrUnloadDllMemory(hMemoryModule);
 	if (!NT_SUCCESS(status)) {
 		SetLastError(RtlNtStatusToDosError(status));
diff --git a/MemoryModule/Loader.cpp b/MemoryModule/Loader.cpp
@@ -44,7 +44,7 @@ NTSTATUS NTAPI LdrMapDllMemory(
 	return STATUS_SUCCESS;
 }
 
-NTSTATUS NTAPI LdrLoadDllMemoryExW(
+extern "C" NTSTATUS NTAPI LdrLoadDllMemoryExW(
 	_Out_ HMEMORYMODULE* BaseAddress,
 	_Out_opt_ PVOID* LdrEntry,
 	_In_ DWORD dwFlags,
@@ -217,7 +217,7 @@ NTSTATUS NTAPI LdrLoadDllMemoryExW(
 	return status;
 }
 
-NTSTATUS NTAPI LdrUnloadDllMemory(_In_ HMEMORYMODULE BaseAddress) {
+extern "C" NTSTATUS NTAPI LdrUnloadDllMemory(_In_ HMEMORYMODULE BaseAddress) {
 	PLDR_DATA_TABLE_ENTRY CurEntry;
 	ULONG count = 0;
 	NTSTATUS status = STATUS_SUCCESS;
@@ -288,13 +288,14 @@ NTSTATUS NTAPI LdrUnloadDllMemory(_In_ HMEMORYMODULE BaseAddress) {
 	return status;
 }
 
+extern "C"
 DECLSPEC_NORETURN
 VOID NTAPI LdrUnloadDllMemoryAndExitThread(_In_ HMEMORYMODULE BaseAddress, _In_ DWORD dwExitCode) {
 	LdrUnloadDllMemory(BaseAddress);
 	RtlExitUserThread(dwExitCode);
 }
 
-NTSTATUS NTAPI LdrQuerySystemMemoryModuleFeatures(_Out_ PDWORD pFeatures) {
+extern "C" NTSTATUS NTAPI LdrQuerySystemMemoryModuleFeatures(_Out_ PDWORD pFeatures) {
 	NTSTATUS status = STATUS_SUCCESS;
 	__try {
 		*pFeatures = MmpGlobalDataPtr->MmpFeatures;
diff --git a/MemoryModule/MmpGlobalData.h b/MemoryModule/MmpGlobalData.h
@@ -153,4 +153,4 @@ typedef struct _MMP_GLOBAL_DATA {
 )
 
 extern PMMP_GLOBAL_DATA MmpGlobalDataPtr;
-PMMP_GLOBAL_DATA NTAPI GetMmpGlobalDataPtr() ;
+extern "C" PMMP_GLOBAL_DATA NTAPI GetMmpGlobalDataPtr() ;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`PMMP_GLOBAL_DATA MmpGlobalDataPtr;`
`7`	`7`
`8`	`8`	`// DLL compliant access`
`9`		`-PMMP_GLOBAL_DATA NTAPI GetMmpGlobalDataPtr()`
	`9`	`+extern "C" PMMP_GLOBAL_DATA NTAPI GetMmpGlobalDataPtr()`
`10`	`10`	`{`
`11`	`11`	`return MmpGlobalDataPtr;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,4 +153,4 @@ typedef struct _MMP_GLOBAL_DATA {`
`153`	`153`	`)`
`154`	`154`
`155`	`155`	`extern PMMP_GLOBAL_DATA MmpGlobalDataPtr;`
`156`		`-PMMP_GLOBAL_DATA NTAPI GetMmpGlobalDataPtr() ;`
	`156`	`+extern "C" PMMP_GLOBAL_DATA NTAPI GetMmpGlobalDataPtr() ;`