From 5aaa6edd08f64b723d2ee0d2d972a10183d7a493 Mon Sep 17 00:00:00 2001
From: Ged Murphy <gedmurphy@reactos.org>
Date: Tue, 22 Sep 2015 21:44:19 +0000
Subject: [PATCH] [DEVMGR] - A few cmake fixes

svn path=/trunk/; revision=69321
---
 reactos/dll/win32/devmgr_new/CMakeLists.txt            | 7 +++++--
 reactos/dll/win32/devmgr_new/properties/advprop.cpp    | 2 +-
 reactos/dll/win32/devmgr_new/properties/devprblm.cpp   | 2 +-
 reactos/dll/win32/devmgr_new/properties/hwpage.cpp     | 2 +-
 reactos/dll/win32/devmgr_new/properties/hwresource.cpp | 2 +-
 reactos/dll/win32/devmgr_new/properties/misc.cpp       | 2 +-
 reactos/dll/win32/devmgr_new/properties/properties.h   | 2 +-
 reactos/dll/win32/devmgr_new/stdafx.h                  | 6 ++++++
 8 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/reactos/dll/win32/devmgr_new/CMakeLists.txt b/reactos/dll/win32/devmgr_new/CMakeLists.txt
index a21c4afbfde..d3e20c42b52 100644
--- a/reactos/dll/win32/devmgr_new/CMakeLists.txt
+++ b/reactos/dll/win32/devmgr_new/CMakeLists.txt
@@ -3,7 +3,10 @@ spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB)
 
 set_cpp(WITH_RTTI WITH_RUNTIME)
 
-include_directories(${REACTOS_SOURCE_DIR}/lib/atl includes devmgmt)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/dll
+	${REACTOS_SOURCE_DIR}/lib/atl 
+	includes)
 
 list(APPEND SOURCE
     stdafx.h
@@ -13,7 +16,6 @@ list(APPEND SOURCE
     properties/hwpage.cpp
     properties/hwresource.cpp
     properties/misc.cpp
-    properties/stubs.cpp
     devmgmt/ClassNode.cpp
     devmgmt/DeviceNode.cpp
     devmgmt/DeviceView.cpp
@@ -30,4 +32,5 @@ add_library(devmgr SHARED
 set_module_type(devmgr win32dll UNICODE)
 target_link_libraries(devmgr uuid atlnew wine)
 add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll)
+add_pch(devmgr stdafx.h SOURCE)
 add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/devmgr_new/properties/advprop.cpp b/reactos/dll/win32/devmgr_new/properties/advprop.cpp
index d7023c8d651..409ca6ae56d 100644
--- a/reactos/dll/win32/devmgr_new/properties/advprop.cpp
+++ b/reactos/dll/win32/devmgr_new/properties/advprop.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 
diff --git a/reactos/dll/win32/devmgr_new/properties/devprblm.cpp b/reactos/dll/win32/devmgr_new/properties/devprblm.cpp
index 6ce4afe045e..add08abd376 100644
--- a/reactos/dll/win32/devmgr_new/properties/devprblm.cpp
+++ b/reactos/dll/win32/devmgr_new/properties/devprblm.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 
diff --git a/reactos/dll/win32/devmgr_new/properties/hwpage.cpp b/reactos/dll/win32/devmgr_new/properties/hwpage.cpp
index bb40361ad94..3d35cc6415e 100644
--- a/reactos/dll/win32/devmgr_new/properties/hwpage.cpp
+++ b/reactos/dll/win32/devmgr_new/properties/hwpage.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 
diff --git a/reactos/dll/win32/devmgr_new/properties/hwresource.cpp b/reactos/dll/win32/devmgr_new/properties/hwresource.cpp
index 1fbbbbfb24e..d938384a53f 100644
--- a/reactos/dll/win32/devmgr_new/properties/hwresource.cpp
+++ b/reactos/dll/win32/devmgr_new/properties/hwresource.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 
diff --git a/reactos/dll/win32/devmgr_new/properties/misc.cpp b/reactos/dll/win32/devmgr_new/properties/misc.cpp
index 59b784a30d4..74e47474c26 100644
--- a/reactos/dll/win32/devmgr_new/properties/misc.cpp
+++ b/reactos/dll/win32/devmgr_new/properties/misc.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 
diff --git a/reactos/dll/win32/devmgr_new/properties/properties.h b/reactos/dll/win32/devmgr_new/properties/properties.h
index 5e271add808..ec822ae8e24 100644
--- a/reactos/dll/win32/devmgr_new/properties/properties.h
+++ b/reactos/dll/win32/devmgr_new/properties/properties.h
@@ -1,7 +1,7 @@
 #ifndef __DEVMGR_H
 #define __DEVMGR_H
 
-//WINE_DEFAULT_DEBUG_CHANNEL(devmgr);
+WINE_DEFAULT_DEBUG_CHANNEL(devmgr);
 
 extern HINSTANCE hDllInstance;
 
diff --git a/reactos/dll/win32/devmgr_new/stdafx.h b/reactos/dll/win32/devmgr_new/stdafx.h
index dc4d66a7c4c..3ed79c778b1 100644
--- a/reactos/dll/win32/devmgr_new/stdafx.h
+++ b/reactos/dll/win32/devmgr_new/stdafx.h
@@ -53,6 +53,8 @@ OUT LPDWORD lpReboot);
 #include <process.h>
 #include <WindowsX.h>
 #include <strsafe.h>
+#include <regstr.h>
+#include <newdevp.h>
 
 #include <setupapi.h>
 #include <commctrl.h>
@@ -64,4 +66,8 @@ OUT LPDWORD lpReboot);
 #include <atlstr.h>
 #include <atlcoll.h>
 
+#include <wine/debug.h>
+
+//WINE_DEFAULT_DEBUG_CHANNEL(devmgr);
+
 #endif
\ No newline at end of file