Author: gedmurphy Date: Mon Oct 19 07:04:17 2015 New Revision: 69612
URL: http://svn.reactos.org/svn/reactos?rev=69612&view=rev Log: [DEVMGR] - Explicitly state that we want to build DllMain without name mangling See issue 10347 for more details.
Modified: trunk/reactos/dll/win32/devmgr/api.cpp
Modified: trunk/reactos/dll/win32/devmgr/api.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/api.cpp?re... ============================================================================== --- trunk/reactos/dll/win32/devmgr/api.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/api.cpp [iso-8859-1] Mon Oct 19 07:04:17 2015 @@ -784,12 +784,40 @@ return FALSE; }
+class CDevMgrUIModule : public CComModule +{ +public: +}; + +CDevMgrUIModule gModule; + +STDAPI DllCanUnloadNow() +{ + return gModule.DllCanUnloadNow(); +} + +STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + return gModule.DllGetClassObject(rclsid, riid, ppv); +} + +STDAPI DllRegisterServer() +{ + return gModule.DllRegisterServer(FALSE); +} + +STDAPI DllUnregisterServer() +{ + return gModule.DllUnregisterServer(FALSE); +} + +extern "C" {
BOOL WINAPI -DllMain(IN HINSTANCE hinstDLL, -IN DWORD dwReason, -IN LPVOID lpvReserved) +DllMain(_In_ HINSTANCE hinstDLL, + _In_ DWORD dwReason, + _In_ LPVOID lpvReserved) { switch (dwReason) { @@ -801,30 +829,4 @@
return TRUE; } - -class CDevMgrUIModule : public CComModule -{ -public: -}; - -CDevMgrUIModule gModule; - -STDAPI DllCanUnloadNow() -{ - return gModule.DllCanUnloadNow(); -} - -STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) -{ - return gModule.DllGetClassObject(rclsid, riid, ppv); -} - -STDAPI DllRegisterServer() -{ - return gModule.DllRegisterServer(FALSE); -} - -STDAPI DllUnregisterServer() -{ - return gModule.DllUnregisterServer(FALSE); }