From 681a9c3f7c0e2ee2eeb8cb2c95ac89a1b1482017 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Thu, 15 Oct 2015 18:04:33 +0000 Subject: [PATCH] [DEVMGMT] - Delete the old devmgmt and replace it with the new one. - The new one is a temp container for devmgr.dll and simply calls DeviceManager_ExecuteW. Eventually mmc.exe will replace this module svn path=/trunk/; revision=69547 --- .../base/applications/mscutils/CMakeLists.txt | 2 +- .../mscutils/devmgmt/CMakeLists.txt | 15 +-- .../{devmgmt_new => devmgmt}/devmgmt.cpp | 0 .../{devmgmt_new => devmgmt}/devmgmt.h | 0 .../{devmgmt_new => devmgmt}/devmgmt.ico | Bin .../applications/mscutils/devmgmt/devmgmt.rc | 109 ++---------------- .../mscutils/devmgmt_new/CMakeLists.txt | 11 -- .../mscutils/devmgmt_new/devmgmt.rc | 11 -- 8 files changed, 17 insertions(+), 131 deletions(-) rename reactos/base/applications/mscutils/{devmgmt_new => devmgmt}/devmgmt.cpp (100%) rename reactos/base/applications/mscutils/{devmgmt_new => devmgmt}/devmgmt.h (100%) rename reactos/base/applications/mscutils/{devmgmt_new => devmgmt}/devmgmt.ico (100%) delete mode 100644 reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt delete mode 100644 reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc diff --git a/reactos/base/applications/mscutils/CMakeLists.txt b/reactos/base/applications/mscutils/CMakeLists.txt index 960ce2675be..cd3e5511e7c 100644 --- a/reactos/base/applications/mscutils/CMakeLists.txt +++ b/reactos/base/applications/mscutils/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(devmgmt_new) +add_subdirectory(devmgmt) add_subdirectory(eventvwr) add_subdirectory(servman) \ No newline at end of file diff --git a/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt b/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt index 47cf226f13e..de26cd9b811 100644 --- a/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt +++ b/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt @@ -1,16 +1,11 @@ -list(APPEND SOURCE - about.c - devmgmt.c - enumdevices.c - mainwnd.c - misc.c - precomp.h) +set_cpp(WITH_RTTI WITH_RUNTIME) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/dll) + +list(APPEND SOURCE devmgmt.cpp) -file(GLOB devmgmt_rc_deps res/*.*) -add_rc_deps(devmgmt.rc ${devmgmt_rc_deps}) add_executable(devmgmt ${SOURCE} devmgmt.rc) set_module_type(devmgmt win32gui UNICODE) add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) -add_pch(devmgmt precomp.h SOURCE) add_cd_file(TARGET devmgmt DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp b/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp similarity index 100% rename from reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp rename to reactos/base/applications/mscutils/devmgmt/devmgmt.cpp diff --git a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h b/reactos/base/applications/mscutils/devmgmt/devmgmt.h similarity index 100% rename from reactos/base/applications/mscutils/devmgmt_new/devmgmt.h rename to reactos/base/applications/mscutils/devmgmt/devmgmt.h diff --git a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.ico b/reactos/base/applications/mscutils/devmgmt/devmgmt.ico similarity index 100% rename from reactos/base/applications/mscutils/devmgmt_new/devmgmt.ico rename to reactos/base/applications/mscutils/devmgmt/devmgmt.ico diff --git a/reactos/base/applications/mscutils/devmgmt/devmgmt.rc b/reactos/base/applications/mscutils/devmgmt/devmgmt.rc index b535652f158..fe7db5360e1 100644 --- a/reactos/base/applications/mscutils/devmgmt/devmgmt.rc +++ b/reactos/base/applications/mscutils/devmgmt/devmgmt.rc @@ -1,98 +1,11 @@ -#include -#include - -#include "resource.h" - -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Device Manager" -#define REACTOS_STR_INTERNAL_NAME "devmgmt" -#define REACTOS_STR_ORIGINAL_FILENAME "devmgmt.exe" -#include - -#include - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -IDI_MAIN_ICON ICON "res/computer.ico" -IDB_ROOT_IMAGE BITMAP "res/root.bmp" - -/* main toolbar icons */ -IDB_PROP BITMAP "res/properties.bmp" -IDB_REFRESH BITMAP "res/refresh.bmp" -IDB_HELP BITMAP "res/help.bmp" -IDB_EXIT BITMAP "res/exit.bmp" - -/* UTF-8 */ -#pragma code_page(65001) - -#ifdef LANGUAGE_BG_BG - #include "lang/bg-BG.rc" -#endif -#ifdef LANGUAGE_CS_CZ - #include "lang/cs-CZ.rc" -#endif -#ifdef LANGUAGE_DE_DE - #include "lang/de-DE.rc" -#endif -#ifdef LANGUAGE_EL_GR - #include "lang/el-GR.rc" -#endif -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif -#ifdef LANGUAGE_ID_ID - #include "lang/id-ID.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "lang/it-IT.rc" -#endif -#ifdef LANGUAGE_JA_JP - #include "lang/ja-JP.rc" -#endif -#ifdef LANGUAGE_KO_KR - #include "lang/ko-KR.rc" -#endif -#ifdef LANGUAGE_NB_NO - #include "lang/no-NO.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_PT_BR - #include "lang/pt-BR.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_SQ_AL - #include "lang/sq-AL.rc" -#endif -#ifdef LANGUAGE_SV_SE - #include "lang/sv-SE.rc" -#endif -#ifdef LANGUAGE_TH_TH - #include "lang/th-TH.rc" -#endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif -#ifdef LANGUAGE_ZH_CN - #include "lang/zh-CN.rc" -#endif +#include +#include + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Device Manager" +#define REACTOS_STR_INTERNAL_NAME "devmgmt" +#define REACTOS_STR_ORIGINAL_FILENAME "devmgmt.exe" +#include + +#include + +1 ICON devmgmt.ico diff --git a/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt b/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt deleted file mode 100644 index de26cd9b811..00000000000 --- a/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ - -set_cpp(WITH_RTTI WITH_RUNTIME) - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/dll) - -list(APPEND SOURCE devmgmt.cpp) - -add_executable(devmgmt ${SOURCE} devmgmt.rc) -set_module_type(devmgmt win32gui UNICODE) -add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) -add_cd_file(TARGET devmgmt DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc b/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc deleted file mode 100644 index fe7db5360e1..00000000000 --- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include - -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Device Manager" -#define REACTOS_STR_INTERNAL_NAME "devmgmt" -#define REACTOS_STR_ORIGINAL_FILENAME "devmgmt.exe" -#include - -#include - -1 ICON devmgmt.ico -- 2.17.1