[ros-diffs] [gedmurphy] 69519: [DEVMGR] More g++ fixes. devmgr now compiles, just a few linker issues to fixup

Author: gedmurphy
Date: Mon Oct 12 20:44:54 2015
New Revision: 69519

URL: http://svn.reactos.org/svn/reactos?rev=69519&view=rev
Log:
[DEVMGR]
More g++ fixes. 
devmgr now compiles, just a few linker issues to fixup

Modified:
    trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt
    trunk/reactos/dll/win32/devmgr_new/api.cpp
    trunk/reactos/dll/win32/devmgr_new/devmgr.rc
    trunk/reactos/dll/win32/devmgr_new/precomp.h
    trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp
    trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp

Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt	[iso-8859-1] Mon Oct 12 20:44:54
2015
@@ -7,6 +7,7 @@
 if(NOT MSVC)
     # HACK: this should be enabled globally!
     add_compile_flags_language("-std=c++11" "CXX")
+    add_compile_flags("-fexceptions")
 endif()
 
 include_directories(

Modified: trunk/reactos/dll/win32/devmgr_new/api.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/api.c…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/api.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/api.cpp	[iso-8859-1] Mon Oct 12 20:44:54 2015
@@ -2,7 +2,7 @@
 *
 * 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(a)users.sourceforge.net)
 *                  Ged Murphy (gedmurphy(a)reactos.org)

Modified: trunk/reactos/dll/win32/devmgr_new/devmgr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/devmgr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/devmgr.rc	[iso-8859-1] Mon Oct 12 20:44:54 2015
@@ -9,8 +9,8 @@
 #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
 

Modified: trunk/reactos/dll/win32/devmgr_new/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/preco…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/precomp.h	[iso-8859-1] Mon Oct 12 20:44:54 2015
@@ -1,4 +1,4 @@
-#pragma once
+//#pragma once
 
 #ifndef __REACTOS__
 

Modified: trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp	[iso-8859-1] Mon Oct 12
20:44:54 2015
@@ -613,7 +613,7 @@
 static VOID
 SetListViewText(HWND hwnd,
                 INT iItem,
-                LPWSTR lpText)
+                LPCWSTR lpText)
 {
     LVITEM li;
 
@@ -622,7 +622,7 @@
     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);
 }
@@ -1240,7 +1240,7 @@
 static VOID
 DisplayClassProperties(IN PDEVADVPROP_INFO dap,
                        IN HWND hwndListView,
-                       IN LPWSTR lpProperty)
+                       IN LPCWSTR lpProperty)
 {
     HDEVINFO DeviceInfoSet;
     PSP_DEVINFO_DATA DeviceInfoData;

Modified: trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp	[iso-8859-1] Mon Oct 12
20:44:54 2015
@@ -518,7 +518,8 @@
     }
     else
     {
-        LPWSTR szProblem, szInfo = L"FIXME";
+        LPWSTR szProblem;
+        WCHAR szInfo[] = L"FIXME";
         DWORD dwRet;
         BOOL AdvFormat = FALSE;
         UINT StringIDs[] =