From d41f9c44b4b21ebd34dd5f08a1a2258f5916553f Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Mon, 19 Oct 2015 07:04:17 +0000 Subject: [PATCH] [DEVMGR] - Explicitly state that we want to build DllMain without name mangling See issue 10347 for more details. svn path=/trunk/; revision=69612 --- reactos/dll/win32/devmgr/api.cpp | 38 +++++++++++++++++--------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/reactos/dll/win32/devmgr/api.cpp b/reactos/dll/win32/devmgr/api.cpp index b053bce5b1e..1404d0aba2c 100644 --- a/reactos/dll/win32/devmgr/api.cpp +++ b/reactos/dll/win32/devmgr/api.cpp @@ -784,24 +784,6 @@ DeviceManagerPrintW(LPCWSTR lpMachineName, return FALSE; } - -BOOL -WINAPI -DllMain(IN HINSTANCE hinstDLL, -IN DWORD dwReason, -IN LPVOID lpvReserved) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - hDllInstance = hinstDLL; - break; - } - - return TRUE; -} - class CDevMgrUIModule : public CComModule { public: @@ -827,4 +809,24 @@ STDAPI DllRegisterServer() STDAPI DllUnregisterServer() { return gModule.DllUnregisterServer(FALSE); +} + +extern "C" { + +BOOL +WINAPI +DllMain(_In_ HINSTANCE hinstDLL, + _In_ DWORD dwReason, + _In_ LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + hDllInstance = hinstDLL; + break; + } + + return TRUE; +} } \ No newline at end of file