mirror of
https://github.com/reactos/reactos.git
synced 2024-10-05 17:06:29 +00:00
[DEVMGR]
More g++ fixes. devmgr now compiles, just a few linker issues to fixup svn path=/trunk/; revision=69519
This commit is contained in:
parent
b4667495f4
commit
4a5138f4ac
|
@ -7,6 +7,7 @@ set_cpp(WITH_RTTI WITH_RUNTIME)
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
# HACK: this should be enabled globally!
|
# HACK: this should be enabled globally!
|
||||||
add_compile_flags_language("-std=c++11" "CXX")
|
add_compile_flags_language("-std=c++11" "CXX")
|
||||||
|
add_compile_flags("-fexceptions")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS devmgr.dll
|
* PROJECT: ReactOS devmgr.dll
|
||||||
* FILE: lib/devmgr/stubs.c
|
* FILE: dll/win32/devmgr/api.cpp
|
||||||
* PURPOSE: devmgr.dll stubs
|
* PURPOSE: devmgr.dll stubs
|
||||||
* PROGRAMMER: Thomas Weidenmueller (w3seek@users.sourceforge.net)
|
* PROGRAMMER: Thomas Weidenmueller (w3seek@users.sourceforge.net)
|
||||||
* Ged Murphy (gedmurphy@reactos.org)
|
* Ged Murphy (gedmurphy@reactos.org)
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
#define REACTOS_STR_INTERNAL_NAME "devmgr"
|
#define REACTOS_STR_INTERNAL_NAME "devmgr"
|
||||||
#define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll"
|
#define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll"
|
||||||
|
|
||||||
//#include <reactos/version.rc>
|
#include <reactos/version.rc>
|
||||||
//#include <reactos/manifest_dll.rc>
|
#include <reactos/manifest_dll.rc>
|
||||||
|
|
||||||
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#pragma once
|
//#pragma once
|
||||||
|
|
||||||
#ifndef __REACTOS__
|
#ifndef __REACTOS__
|
||||||
|
|
||||||
|
|
|
@ -613,7 +613,7 @@ AdvProcDriverDlgProc(IN HWND hwndDlg,
|
||||||
static VOID
|
static VOID
|
||||||
SetListViewText(HWND hwnd,
|
SetListViewText(HWND hwnd,
|
||||||
INT iItem,
|
INT iItem,
|
||||||
LPWSTR lpText)
|
LPCWSTR lpText)
|
||||||
{
|
{
|
||||||
LVITEM li;
|
LVITEM li;
|
||||||
|
|
||||||
|
@ -622,7 +622,7 @@ SetListViewText(HWND hwnd,
|
||||||
li.iSubItem = 0;
|
li.iSubItem = 0;
|
||||||
li.state = 0; //(li.iItem == 0 ? LVIS_SELECTED : 0);
|
li.state = 0; //(li.iItem == 0 ? LVIS_SELECTED : 0);
|
||||||
li.stateMask = LVIS_SELECTED;
|
li.stateMask = LVIS_SELECTED;
|
||||||
li.pszText = lpText;
|
li.pszText = (LPWSTR)lpText;
|
||||||
(void)ListView_InsertItem(hwnd,
|
(void)ListView_InsertItem(hwnd,
|
||||||
&li);
|
&li);
|
||||||
}
|
}
|
||||||
|
@ -1240,7 +1240,7 @@ DisplayDeviceCoinstallers(IN PDEVADVPROP_INFO dap,
|
||||||
static VOID
|
static VOID
|
||||||
DisplayClassProperties(IN PDEVADVPROP_INFO dap,
|
DisplayClassProperties(IN PDEVADVPROP_INFO dap,
|
||||||
IN HWND hwndListView,
|
IN HWND hwndListView,
|
||||||
IN LPWSTR lpProperty)
|
IN LPCWSTR lpProperty)
|
||||||
{
|
{
|
||||||
HDEVINFO DeviceInfoSet;
|
HDEVINFO DeviceInfoSet;
|
||||||
PSP_DEVINFO_DATA DeviceInfoData;
|
PSP_DEVINFO_DATA DeviceInfoData;
|
||||||
|
|
|
@ -518,7 +518,8 @@ DeviceProblemTextW(IN HMACHINE hMachine OPTIONAL,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LPWSTR szProblem, szInfo = L"FIXME";
|
LPWSTR szProblem;
|
||||||
|
WCHAR szInfo[] = L"FIXME";
|
||||||
DWORD dwRet;
|
DWORD dwRet;
|
||||||
BOOL AdvFormat = FALSE;
|
BOOL AdvFormat = FALSE;
|
||||||
UINT StringIDs[] =
|
UINT StringIDs[] =
|
||||||
|
|
Loading…
Reference in a new issue