[DEVMGR]

More g++ fixes.
devmgr now compiles, just a few linker issues to fixup

svn path=/trunk/; revision=69519

diff --git a/reactos/dll/win32/devmgr_new/CMakeLists.txt b/reactos/dll/win32/devmgr_new/CMakeLists.txt
index 13148d3..e653222 100644 (file)
--- a/reactos/dll/win32/devmgr_new/CMakeLists.txt
+++ b/reactos/dll/win32/devmgr_new/CMakeLists.txt
@@ -7,6 +7,7 @@ set_cpp(WITH_RTTI WITH_RUNTIME)
 if(NOT MSVC)
     # HACK: this should be enabled globally!
     add_compile_flags_language("-std=c++11" "CXX")
 if(NOT MSVC)
     # HACK: this should be enabled globally!
     add_compile_flags_language("-std=c++11" "CXX")

+    add_compile_flags("-fexceptions")

 endif()
 
 include_directories(
 endif()
 
 include_directories(

diff --git a/reactos/dll/win32/devmgr_new/api.cpp b/reactos/dll/win32/devmgr_new/api.cpp
index d8d5ee8..0362581 100644 (file)
--- a/reactos/dll/win32/devmgr_new/api.cpp
+++ b/reactos/dll/win32/devmgr_new/api.cpp
@@ -2,7 +2,7 @@
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS devmgr.dll
 *
 * COPYRIGHT:       See COPYING in the top level directory
 * PROJECT:         ReactOS devmgr.dll

-* FILE:            lib/devmgr/stubs.c
+* FILE:            dll/win32/devmgr/api.cpp

 * PURPOSE:         devmgr.dll stubs
 * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
 *                  Ged Murphy (gedmurphy@reactos.org)
 * PURPOSE:         devmgr.dll stubs
 * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
 *                  Ged Murphy (gedmurphy@reactos.org)

diff --git a/reactos/dll/win32/devmgr_new/devmgr.rc b/reactos/dll/win32/devmgr_new/devmgr.rc
index 85b74a2..fb69740 100644 (file)
--- a/reactos/dll/win32/devmgr_new/devmgr.rc
+++ b/reactos/dll/win32/devmgr_new/devmgr.rc
@@ -9,8 +9,8 @@
 #define REACTOS_STR_INTERNAL_NAME     "devmgr"
 #define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll"
 
 #define REACTOS_STR_INTERNAL_NAME     "devmgr"
 #define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll"
 

-//#include <reactos/version.rc>
-//#include <reactos/manifest_dll.rc>
+#include <reactos/version.rc>
+#include <reactos/manifest_dll.rc>

 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

diff --git a/reactos/dll/win32/devmgr_new/precomp.h b/reactos/dll/win32/devmgr_new/precomp.h
index cd03b01..6e1ba80 100644 (file)
--- a/reactos/dll/win32/devmgr_new/precomp.h
+++ b/reactos/dll/win32/devmgr_new/precomp.h
@@ -1,4 +1,4 @@
-#pragma once
+//#pragma once

 
 #ifndef __REACTOS__
 
 
 #ifndef __REACTOS__
 

diff --git a/reactos/dll/win32/devmgr_new/properties/advprop.cpp b/reactos/dll/win32/devmgr_new/properties/advprop.cpp
index 9eab10a..56ec07d 100644 (file)
--- a/reactos/dll/win32/devmgr_new/properties/advprop.cpp
+++ b/reactos/dll/win32/devmgr_new/properties/advprop.cpp
@@ -613,7 +613,7 @@ AdvProcDriverDlgProc(IN HWND hwndDlg,
 static VOID
 SetListViewText(HWND hwnd,
                 INT iItem,
 static VOID
 SetListViewText(HWND hwnd,
                 INT iItem,

-                LPWSTR lpText)
+                LPCWSTR lpText)

 {
     LVITEM li;
 
 {
     LVITEM li;
 


@@ -622,7 +622,7 @@ SetListViewText(HWND hwnd,
     li.iSubItem = 0;
     li.state = 0; //(li.iItem == 0 ? LVIS_SELECTED : 0);
     li.stateMask = LVIS_SELECTED;
     li.iSubItem = 0;
     li.state = 0; //(li.iItem == 0 ? LVIS_SELECTED : 0);
     li.stateMask = LVIS_SELECTED;

-    li.pszText = lpText;
+    li.pszText = (LPWSTR)lpText;

     (void)ListView_InsertItem(hwnd,
                               &li);
 }
     (void)ListView_InsertItem(hwnd,
                               &li);
 }


@@ -1240,7 +1240,7 @@ DisplayDeviceCoinstallers(IN PDEVADVPROP_INFO dap,
 static VOID
 DisplayClassProperties(IN PDEVADVPROP_INFO dap,
                        IN HWND hwndListView,
 static VOID
 DisplayClassProperties(IN PDEVADVPROP_INFO dap,
                        IN HWND hwndListView,

-                       IN LPWSTR lpProperty)
+                       IN LPCWSTR lpProperty)

 {
     HDEVINFO DeviceInfoSet;
     PSP_DEVINFO_DATA DeviceInfoData;
 {
     HDEVINFO DeviceInfoSet;
     PSP_DEVINFO_DATA DeviceInfoData;

diff --git a/reactos/dll/win32/devmgr_new/properties/devprblm.cpp b/reactos/dll/win32/devmgr_new/properties/devprblm.cpp
index 68a1c5b..ecac5b8 100644 (file)
--- a/reactos/dll/win32/devmgr_new/properties/devprblm.cpp
+++ b/reactos/dll/win32/devmgr_new/properties/devprblm.cpp
@@ -518,7 +518,8 @@ DeviceProblemTextW(IN HMACHINE hMachine  OPTIONAL,
     }
     else
     {
     }
     else
     {

-        LPWSTR szProblem, szInfo = L"FIXME";
+        LPWSTR szProblem;
+        WCHAR szInfo[] = L"FIXME";

         DWORD dwRet;
         BOOL AdvFormat = FALSE;
         UINT StringIDs[] =
         DWORD dwRet;
         BOOL AdvFormat = FALSE;
         UINT StringIDs[] =