Author: hbelusca Date: Sun Oct 18 21:27:23 2015 New Revision: 69607
URL: http://svn.reactos.org/svn/reactos?rev=69607&view=rev Log: [the_other_devmgmt] Convert the bootstrap app back to C.
Added: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c - copied, changed from r69605, trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp Removed: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.h Modified: trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt
Modified: trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Sun Oct 18 21:27:23 2015 @@ -1,11 +1,7 @@
-set_cpp(WITH_RTTI WITH_RUNTIME) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/dll/devmgr)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/dll) - -list(APPEND SOURCE devmgmt.cpp) - -add_executable(devmgmt ${SOURCE} devmgmt.rc) +add_executable(devmgmt devmgmt.c devmgmt.rc) set_module_type(devmgmt win32gui UNICODE) -add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) +add_importlibs(devmgmt devmgr msvcrt kernel32) add_cd_file(TARGET devmgmt DESTINATION reactos/system32 FOR all)
Copied: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c (from r69605, trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c [iso-8859-1] Sun Oct 18 21:27:23 2015 @@ -1,7 +1,18 @@ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +/* + * PROJECT: ReactOS Device Managment + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/devmgmt/devmgmt.c + * PURPOSE: Bootstrap for the device manager + * COPYRIGHT: Copyright 2006 Ged Murphy gedmurphy@gmail.com + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winreg.h> + #include <cfgmgr32.h> -#include <devmgr/devmgr.h> +#include <devmgr.h>
int WINAPI wWinMain(HINSTANCE hThisInstance, @@ -16,5 +27,6 @@ { return GetLastError(); } + return 0; }
Removed: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.cpp (removed) @@ -1,20 +0,0 @@ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <cfgmgr32.h> -#include <devmgr/devmgr.h> - -int WINAPI -wWinMain(HINSTANCE hThisInstance, - HINSTANCE hPrevInstance, - LPWSTR lpCmdLine, - int nCmdShow) -{ - if (!DeviceManager_ExecuteW(NULL, - hThisInstance, - NULL, - nCmdShow)) - { - return GetLastError(); - } - return 0; -}
Removed: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.h (removed) @@ -1 +0,0 @@ -#pragma once