[DEVMGR]

Fix building with RosBE/g++

svn path=/trunk/; revision=69538

diff --git a/reactos/dll/win32/devmgr_new/CMakeLists.txt b/reactos/dll/win32/devmgr_new/CMakeLists.txt
index e653222..be9a5df 100644 (file)
--- a/reactos/dll/win32/devmgr_new/CMakeLists.txt
+++ b/reactos/dll/win32/devmgr_new/CMakeLists.txt
@@ -2,12 +2,11 @@ PROJECT(DEVMGR)
 
 spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB)
 
-set_cpp(WITH_RTTI WITH_RUNTIME)
+set_cpp(WITH_RTTI WITH_RUNTIME WITH_EXCEPTIONS)
 
 if(NOT MSVC)
     # HACK: this should be enabled globally!
     add_compile_flags_language("-std=c++11" "CXX")
-    add_compile_flags("-fexceptions")
 endif()
 
 include_directories(

diff --git a/reactos/dll/win32/devmgr_new/api.cpp b/reactos/dll/win32/devmgr_new/api.cpp
index 0362581..423aa00 100644 (file)
--- a/reactos/dll/win32/devmgr_new/api.cpp
+++ b/reactos/dll/win32/devmgr_new/api.cpp
@@ -17,6 +17,7 @@
 */
 
 #include "precomp.h"
+#include <devmgr/devmgr.h>
 #include "devmgmt/MainWindow.h"
 
 HINSTANCE hDllInstance = NULL;

diff --git a/reactos/dll/win32/devmgr_new/devmgr.spec b/reactos/dll/win32/devmgr_new/devmgr.spec
index 0ef1127..b7f75f0 100644 (file)
--- a/reactos/dll/win32/devmgr_new/devmgr.spec
+++ b/reactos/dll/win32/devmgr_new/devmgr.spec
@@ -21,7 +21,7 @@
 23 stdcall DeviceProblenWizard_RunDLLA(ptr ptr str long) DeviceProblemWizard_RunDLLA
 24 stdcall DeviceProblenWizard_RunDLLW(ptr ptr wstr long) DeviceProblemWizard_RunDLLW
 
-@ stub -private DllCanUnloadNow
-@ stub -private DllGetClassObject
-@ stub -private DllRegisterServer
-@ stub -private DllUnregisterServer
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()