[DEVMGMT]

- A few fixes and turn it on in the build to check the build machines are happy

svn path=/trunk/; revision=69546

diff --git a/reactos/base/applications/mscutils/CMakeLists.txt b/reactos/base/applications/mscutils/CMakeLists.txt
index cd3e551..960ce26 100644 (file)
--- a/reactos/base/applications/mscutils/CMakeLists.txt
+++ b/reactos/base/applications/mscutils/CMakeLists.txt
@@ -1,4 +1,4 @@
 
-add_subdirectory(devmgmt)
+add_subdirectory(devmgmt_new)
 add_subdirectory(eventvwr)
 add_subdirectory(servman)
\ No newline at end of file

diff --git a/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt b/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt
index 4f99eaf..de26cd9 100644 (file)
--- a/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt
+++ b/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt
@@ -3,8 +3,7 @@ set_cpp(WITH_RTTI WITH_RUNTIME)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/dll)
 
-list(APPEND SOURCE
-    devmgmt.cpp)
+list(APPEND SOURCE devmgmt.cpp)
 
 add_executable(devmgmt ${SOURCE} devmgmt.rc)
 set_module_type(devmgmt win32gui UNICODE)

diff --git a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp b/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp
index 844aff5..1256993 100644 (file)
--- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp
+++ b/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp
@@ -1,7 +1,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <cfgmgr32.h>
-#include <devmgr\devmgr.h>
+#include <devmgr/devmgr.h>
 
 int WINAPI
 wWinMain(HINSTANCE hThisInstance,

diff --git a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc b/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc
index e1e436c..fe7db53 100644 (file)
Binary files a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc and b/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc differ