ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
October 2010
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
20 participants
435 discussions
Start a n
N
ew thread
[tkreuzer] 49075: [CMAKE] Apply a custom script for MSVC to work around cmakes's WDK incompatibility.
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sat Oct 9 16:13:29 2010 New Revision: 49075 URL:
http://svn.reactos.org/svn/reactos?rev=49075&view=rev
Log: [CMAKE] Apply a custom script for MSVC to work around cmakes's WDK incompatibility. Added: branches/cmake-bringup/PreLoad.cmake branches/cmake-bringup/cmake/ (with props) branches/cmake-bringup/cmake/Modules/ (with props) branches/cmake-bringup/cmake/Modules/Platform/ (with props) branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake Added: branches/cmake-bringup/PreLoad.cmake URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/PreLoad.cmake?rev…
============================================================================== --- branches/cmake-bringup/PreLoad.cmake (added) +++ branches/cmake-bringup/PreLoad.cmake [iso-8859-1] Sat Oct 9 16:13:29 2010 @@ -1,0 +1,7 @@ + +#message("PreLoad.cmake ...") + +SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules" CACHE INTERNAL "") + +#message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}") + Propchange: branches/cmake-bringup/cmake/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 9 16:13:29 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/cmake-bringup/cmake/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/cmake-bringup/cmake/ ------------------------------------------------------------------------------ bugtraq:url =
http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: branches/cmake-bringup/cmake/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/cmake-bringup/cmake/Modules/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 9 16:13:29 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/cmake-bringup/cmake/Modules/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/cmake-bringup/cmake/Modules/ ------------------------------------------------------------------------------ bugtraq:url =
http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: branches/cmake-bringup/cmake/Modules/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/cmake-bringup/cmake/Modules/Platform/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 9 16:13:29 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/cmake-bringup/cmake/Modules/Platform/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/cmake-bringup/cmake/Modules/Platform/ ------------------------------------------------------------------------------ bugtraq:url =
http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: branches/cmake-bringup/cmake/Modules/Platform/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Modules/Pla…
============================================================================== --- branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake (added) +++ branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake [iso-8859-1] Sat Oct 9 16:13:29 2010 @@ -1,0 +1,311 @@ +# try to load any previously computed information for C on this platform +INCLUDE( ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake OPTIONAL) +# try to load any previously computed information for CXX on this platform +INCLUDE( ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake OPTIONAL) + +SET(WIN32 1) + +INCLUDE(Platform/cl) + +############ +# Detect WDK build environment +IF($ENV{DDKBUILDENV} MATCHES "chk") + MESSAGE(STATUS "DDK/WDK checked build environment detected.") + SET(CMAKE_USE_WDK_ENV 1) +ENDIF() + +IF($ENV{DDKBUILDENV} MATCHES "fre") + MESSAGE(STATUS "DDK/WDK free build environment detected.") + SET(CMAKE_USE_WDK_ENV 1) +ENDIF() + +IF(CMAKE_USE_WDK_ENV) + + # Detect output architecture + IF(NOT ARCH) + IF($ENV{AMD64} MATCHES 1) + SET(ARCH amd64) + ELSE() + SET(ARCH i386) + ENDIF() + ENDIF() + + # Add library directories + STRING(REPLACE * ${ARCH} ATL_LIB_PATH $ENV{ATL_LIB_PATH}) + STRING(REPLACE * ${ARCH} CRT_LIB_PATH $ENV{CRT_LIB_PATH}) + STRING(REPLACE * ${ARCH} DDK_LIB_PATH $ENV{DDK_LIB_PATH}) + STRING(REPLACE * ${ARCH} KMDF_LIB_PATH $ENV{KMDF_LIB_PATH}) + STRING(REPLACE * ${ARCH} MFC_LIB_PATH $ENV{MFC_LIB_PATH}) + STRING(REPLACE * ${ARCH} SDK_LIB_PATH $ENV{SDK_LIB_PATH}) + LINK_DIRECTORIES(${ATL_LIB_PATH} + ${CRT_LIB_PATH} + ${DDK_LIB_PATH} + ${IFSKIT_LIB_PATH} + ${KMDF_LIB_PATH} + ${MFC_LIB_PATH} + ${SDK_LIB_PATH}) + + # Add environment variables + IF(NOT CMAKE_CROSSCOMPILING) + SET(ENV{INCLUDE} "$ENV{CRT_INC_PATH};$ENV{SDK_INC_PATH};$ENV{SDK_INC_PATH}\\crt\\stl60") + include_directories($ENV{INCLUDE}) + SET(ENV{LIBPATH} "${CRT_LIB_PATH};${SDK_LIB_PATH}") + + SET(ENV{USE_MSVCRT} 1) + SET(ENV{USE_STL} 1) + SET(ENV{STL_VER} 60) + + ENDIF() +ENDIF() + +############ + +SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows) +SET(CMAKE_CREATE_CONSOLE_EXE /subsystem:console) + +IF(CMAKE_GENERATOR MATCHES "Visual Studio 6") + SET (CMAKE_NO_BUILD_TYPE 1) +ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 6") +IF(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") + SET (CMAKE_NO_BUILD_TYPE 1) + SET (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING + "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.") + MARK_AS_ADVANCED(CMAKE_CONFIGURATION_TYPES) +ENDIF(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") +# does the compiler support pdbtype and is it the newer compiler +IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") + SET(CMAKE_COMPILER_2005 1) +ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") + +# make sure to enable languages after setting configuration types +ENABLE_LANGUAGE(RC) +SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") + +# for nmake we need to compute some information about the compiler +# that is being used. +# the compiler may be free command line, 6, 7, or 71, and +# each have properties that must be determined. +# to avoid running these tests with each cmake run, the +# test results are saved in CMakeCPlatform.cmake, a file +# that is automatically copied into try_compile directories +# by the global generator. +SET(MSVC_IDE 1) +IF(CMAKE_GENERATOR MATCHES "Makefiles") + SET(MSVC_IDE 0) + IF(NOT CMAKE_VC_COMPILER_TESTS_RUN) + SET(CMAKE_VC_COMPILER_TESTS 1) + SET(testNmakeCLVersionFile + "${CMAKE_ROOT}/Modules/CMakeTestNMakeCLVersion.c") + STRING(REGEX REPLACE "/" "\\\\" testNmakeCLVersionFile "${testNmakeCLVersionFile}") + MESSAGE(STATUS "Check for CL compiler version") + SET(CMAKE_TEST_COMPILER ${CMAKE_C_COMPILER}) + IF (NOT CMAKE_C_COMPILER) + SET(CMAKE_TEST_COMPILER ${CMAKE_CXX_COMPILER}) + ENDIF(NOT CMAKE_C_COMPILER) + EXEC_PROGRAM(${CMAKE_TEST_COMPILER} + ARGS /nologo -EP \"${testNmakeCLVersionFile}\" + OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT + RETURN_VALUE CMAKE_COMPILER_RETURN + ) + IF(NOT CMAKE_COMPILER_RETURN) + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining the version of compiler passed with the following output:\n" + "${CMAKE_COMPILER_OUTPUT}\n\n") + STRING(REGEX REPLACE "\n" " " compilerVersion "${CMAKE_COMPILER_OUTPUT}") + STRING(REGEX REPLACE ".*VERSION=(.*)" "\\1" + compilerVersion "${compilerVersion}") + MESSAGE(STATUS "Check for CL compiler version - ${compilerVersion}") + SET(MSVC60) + SET(MSVC70) + SET(MSVC71) + SET(MSVC80) + SET(CMAKE_COMPILER_2005) + IF("${compilerVersion}" LESS 1300) + SET(MSVC60 1) + SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 1) + ENDIF("${compilerVersion}" LESS 1300) + IF("${compilerVersion}" EQUAL 1300) + SET(MSVC70 1) + SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0) + ENDIF("${compilerVersion}" EQUAL 1300) + IF("${compilerVersion}" EQUAL 1310) + SET(MSVC71 1) + SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0) + ENDIF("${compilerVersion}" EQUAL 1310) + IF("${compilerVersion}" EQUAL 1400) + SET(MSVC80 1) + SET(CMAKE_COMPILER_2005 1) + ENDIF("${compilerVersion}" EQUAL 1400) + IF("${compilerVersion}" EQUAL 1500) + SET(MSVC90 1) + ENDIF("${compilerVersion}" EQUAL 1500) + IF("${compilerVersion}" EQUAL 1600) + SET(MSVC10 1) + ENDIF("${compilerVersion}" EQUAL 1600) + SET(MSVC_VERSION "${compilerVersion}") + ELSE(NOT CMAKE_COMPILER_RETURN) + MESSAGE(STATUS "Check for CL compiler version - failed") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining the version of compiler failed with the following output:\n" + "${CMAKE_COMPILER_OUTPUT}\n\n") + ENDIF(NOT CMAKE_COMPILER_RETURN) + # try to figure out if we are running the free command line + # tools from Microsoft. These tools do not provide debug libraries, + # so the link flags used have to be different. + MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp2") + SET(testForFreeVCFile + "${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx") + STRING(REGEX REPLACE "/" "\\\\" testForFreeVCFile "${testForFreeVCFile}") + MESSAGE(STATUS "Check if this is a free VC compiler") + EXEC_PROGRAM(${CMAKE_TEST_COMPILER} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp2 + ARGS /nologo /MD /EHsc + \"${testForFreeVCFile}\" + OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT + RETURN_VALUE CMAKE_COMPILER_RETURN + ) + IF(CMAKE_COMPILER_RETURN) + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if this is a free VC compiler failed with the following output:\n" + "${CMAKE_COMPILER_OUTPUT}\n\n") + MESSAGE(STATUS "Check if this is a free VC compiler - yes1") + SET(CMAKE_USING_VC_FREE_TOOLS 1) + ELSE(CMAKE_COMPILER_RETURN) + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if this is a free VC compiler passed with the following output:\n" + "${CMAKE_COMPILER_OUTPUT}\n\n") + MESSAGE(STATUS "Check if this is a free VC compiler - no") + SET(CMAKE_USING_VC_FREE_TOOLS 0) + ENDIF(CMAKE_COMPILER_RETURN) + MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3") + ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN) +ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") + +IF(MSVC_C_ARCHITECTURE_ID MATCHES 64) + SET(CMAKE_CL_64 1) +ELSE(MSVC_C_ARCHITECTURE_ID MATCHES 64) + SET(CMAKE_CL_64 0) +ENDIF(MSVC_C_ARCHITECTURE_ID MATCHES 64) +IF(CMAKE_FORCE_WIN64) + SET(CMAKE_CL_64 1) +ENDIF(CMAKE_FORCE_WIN64) + +IF("${MSVC_VERSION}" GREATER 1599) + SET(MSVC_INCREMENTAL_DEFAULT ON) +ENDIF() + +# default to Debug builds +IF(MSVC_VERSION GREATER 1310) + # for 2005 make sure the manifest is put in the dll with mt + SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") + SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}") + # create a C shared library + SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") + # create a C shared module just copy the shared library rule + SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") + SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}") + SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") + + SET(CMAKE_BUILD_TYPE_INIT Debug) + + IF($ENV{DDKBUILDENV} OR (NOT CMAKE_CROSSCOMPILING)) + SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") + SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") + ELSE() + SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1") + SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1") + ENDIF() + + SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") + SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") + SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ") + SET (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}") +ELSE(MSVC_VERSION GREATER 1310) + IF(CMAKE_USING_VC_FREE_TOOLS) + MESSAGE(STATUS "Using FREE VC TOOLS, NO DEBUG available") + SET(CMAKE_BUILD_TYPE_INIT Release) + SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR") + SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /GZ") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") + SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /GZ") + SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG") + ELSE(CMAKE_USING_VC_FREE_TOOLS) + SET(CMAKE_BUILD_TYPE_INIT Debug) + SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR") + SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /GZ") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") + SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /GZ") + SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") + ENDIF(CMAKE_USING_VC_FREE_TOOLS) + SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib") +ENDIF(MSVC_VERSION GREATER 1310) + +SET(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") + +# executable linker flags +SET (CMAKE_LINK_DEF_FILE_FLAG "/DEF:") +# set the stack size and the machine type +SET(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID}) +IF(NOT _MACHINE_ARCH_FLAG) + SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) +ENDIF(NOT _MACHINE_ARCH_FLAG) +SET (CMAKE_EXE_LINKER_FLAGS_INIT + "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}") + +# add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype +# on versions that support it +SET( MSVC_INCREMENTAL_YES_FLAG "") +IF(NOT MSVC_INCREMENTAL_DEFAULT) + SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") +ENDIF() + +IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) + SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") + SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") +ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) + SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") + SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") +ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) +# for release and minsize release default to no incremental linking +SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO") +SET(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO") + +# copy the EXE_LINKER flags to SHARED and MODULE linker flags +# shared linker flags +SET (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) +SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) +SET (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) +SET (CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) +SET (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) +# module linker flags +SET (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT}) +SET (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT}) +SET (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) +SET (CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) +SET (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) + +# save computed information for this platform +IF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake") + CONFIGURE_FILE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCPlatform.cmake IMMEDIATE) +ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake") + +IF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake") + CONFIGURE_FILE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXPlatform.cmake IMMEDIATE) +ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake")
14 years, 2 months
1
0
0
0
[spetreolle] 49074: [CMAKE] Fix winebuild link on unix.
by spetreolle@svn.reactos.org
Author: spetreolle Date: Sat Oct 9 14:53:52 2010 New Revision: 49074 URL:
http://svn.reactos.org/svn/reactos?rev=49074&view=rev
Log: [CMAKE] Fix winebuild link on unix. Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/C…
============================================================================== --- branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] Sat Oct 9 14:53:52 2010 @@ -1,7 +1,3 @@ - -add_definitions(-DEXEEXT=".exe") -add_definitions(-Dpclose=_pclose) -add_definitions(-Dpopen=_popen) list(APPEND SOURCE import.c @@ -16,6 +12,11 @@ utils.c ) +add_definitions(-DEXEEXT=".exe") +if(NOT UNIX) +add_definitions(-Dpclose=_pclose) +add_definitions(-Dpopen=_popen) +endif() if(MSVC) list(APPEND SOURCE getopt.c) include_directories(include)
14 years, 2 months
1
0
0
0
[akhaldi] 49073: [CMAKE] - Fix libmpg123 and add it to build.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Oct 9 14:34:03 2010 New Revision: 49073 URL:
http://svn.reactos.org/svn/reactos?rev=49073&view=rev
Log: [CMAKE] - Fix libmpg123 and add it to build. Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/CMak…
============================================================================== --- branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] Sat Oct 9 14:34:03 2010 @@ -6,7 +6,7 @@ add_subdirectory(freetype) add_subdirectory(fullfat) #add_subdirectory(icu4ros) -#add_subdirectory(libmpg123) +add_subdirectory(libmpg123) add_subdirectory(libsamplerate) add_subdirectory(libwine) add_subdirectory(libxml2) Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libm…
============================================================================== --- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Sat Oct 9 14:34:03 2010 @@ -1,13 +1,14 @@ -add_definitions(-DOPT_I386) -add_definitions(-DREAL_IS_FLOAT) -add_definitions(-DNOXFERMEM) -add_definitions(-DHAVE_CONFIG_H) -add_definitions(-DEOVERFLOW=75) -add_definitions(-Dlseek=_lseek) -add_definitions(-Dread=_read) -add_definitions(-Dstrdup=_strdup) +add_definitions( + -DOPT_I386 + -DREAL_IS_FLOAT + -DNOXFERMEM + -DHAVE_CONFIG_H + -DEOVERFLOW=75 + -Dlseek=_lseek + -Dread=_read + -Dstrdup=_strdup) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) add_library(libmpg123 compat.c @@ -35,3 +36,5 @@ synth_real.c synth_s32.c tabinit.c) + +add_dependencies(libmpg123 psdk)
14 years, 2 months
1
0
0
0
[spetreolle] 49072: [CMAKE] Add minicd target. This partial bootcd target produces a minicd iso, able to start the install process to the cabinet installation page.
by spetreolle@svn.reactos.org
Author: spetreolle Date: Sat Oct 9 13:54:36 2010 New Revision: 49072 URL:
http://svn.reactos.org/svn/reactos?rev=49072&view=rev
Log: [CMAKE] Add minicd target. This partial bootcd target produces a minicd iso, able to start the install process to the cabinet installation page. Added: branches/cmake-bringup/media/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/base/setup/usetup/CMakeLists.txt branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/dll/ntdll/CMakeLists.txt branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re…
============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -99,12 +99,28 @@ add_subdirectory(include/reactos/idl) add_subdirectory(include/reactos/mc) +#minicd target +set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") + +file(MAKE_DIRECTORY "${BOOTCD_DIR}") +file(MAKE_DIRECTORY "${BOOTCD_DIR}/loader") +file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos") +file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos/system32") + +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/minicd.iso + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/minicd.iso + DEPENDS native-cdmake) +add_custom_target(minicd DEPENDS ${REACTOS_BINARY_DIR}/minicd.iso) +add_minicd(${REACTOS_SOURCE_DIR}/boot/bootdata/bootcd.ini "" freeldr.ini) + add_subdirectory(base) add_subdirectory(boot) add_subdirectory(dll) add_subdirectory(drivers) add_subdirectory(hal) add_subdirectory(lib) +add_subdirectory(media) add_subdirectory(ntoskrnl) add_subdirectory(subsystems) Modified: branches/cmake-bringup/CMakeMacros.cmake URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake…
============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -75,7 +75,7 @@ DEPENDS native-winebuild) set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE) add_custom_target(${_target_name} ALL DEPENDS ${_object_file}) - + add_minicd(${_object_file} loader ${OBJECT_NAME}) ENDMACRO(CreateBootSectorTarget _target_name _asm_file _object_file) else() MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup…
============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -39,3 +39,4 @@ set_module_type(usetup nativecui) add_importlibs(usetup kernel32 ntdll) +add_minicd_target(usetup reactos/system32 smss.exe) Modified: branches/cmake-bringup/boot/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t…
============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -193,7 +193,7 @@ add_library(setupldr SHARED ${SETUPLDR_SOURCE}) -set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") if(ARCH MATCHES i386) target_link_libraries(setupldr mini_hal) @@ -205,3 +205,7 @@ cmlib rtl libcntpr) + +add_minicd_target(setupldr loader setupldr.sys) +add_minicd_target(freeldr loader freeldr.sys) +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/txtsetup.sif reactos txtsetup.sif) Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi…
============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -44,3 +44,5 @@ add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE}) add_dependencies(ntdll ntstatus version) + +add_minicd_target(ntdll reactos/system32 ntdll.dll) Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/boot…
============================================================================== --- branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -27,3 +27,4 @@ add_pch(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(bootvid bootvid_def psdk buildno_header bugcodes) +add_minicd_target(bootvid reactos bootvid.dll) Modified: branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kdco…
============================================================================== --- branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -21,3 +21,4 @@ -lhal) add_dependencies(kdcom kdcom_def psdk buildno_header bugcodes) +add_minicd_target(kdcom reactos kdcom.dll) Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/…
============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -146,5 +146,7 @@ add_importlibs(acpi ntoskrnl hal) add_dependencies(acpi psdk bugcodes) +add_minicd_target(acpi reactos acpi.sys) + add_subdirectory(cmbatt) -add_subdirectory(compbatt) +add_subdirectory(compbatt) Modified: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/isapn…
============================================================================== --- branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -10,3 +10,4 @@ add_importlibs(isapnp ntoskrnl hal) add_dependencies(isapnp psdk bugcodes buildno_header) +add_minicd_target(isapnp reactos isapnp.sys) Modified: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/C…
============================================================================== --- branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -9,3 +9,4 @@ add_importlibs(pci ntoskrnl hal) add_dependencies(pci psdk bugcodes buildno_header) +add_minicd_target(pci reactos pci.sys) Modified: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmci…
============================================================================== --- branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -9,3 +9,4 @@ add_importlibs(pcmcia ntoskrnl hal) add_dependencies(pcmcia psdk bugcodes buildno_header) +add_minicd_target(pcmcia reactos pcmcia.sys) Modified: branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste…
============================================================================== --- branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -29,3 +29,4 @@ add_pch(cdfs ${CMAKE_CURRENT_SOURCE_DIR}/cdfs.h ${SOURCE}) add_dependencies(cdfs psdk bugcodes) +add_minicd_target(cdfs reactos cdfs.sys) Modified: branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste…
============================================================================== --- branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -30,3 +30,4 @@ -lhal) add_dependencies(ext2fs psdk bugcodes) +add_minicd_target(ext2fs reactos ext2.sys) Modified: branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste…
============================================================================== --- branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -35,3 +35,4 @@ add_pch(fastfat ${CMAKE_CURRENT_SOURCE_DIR}/vfat.h ${SOURCE}) add_dependencies(fastfat psdk bugcodes) +add_minicd_target(fastfat reactos fastfat.sys) Modified: branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/i80…
============================================================================== --- branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -21,3 +21,4 @@ -lhal) add_dependencies(i8042prt psdk bugcodes) +add_minicd_target(i8042prt reactos i8042prt.sys) Modified: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/kbd…
============================================================================== --- branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -15,3 +15,4 @@ -lhal) add_dependencies(kbdclass psdk bugcodes) +add_minicd_target(kbdclass reactos kbdclass.sys) Modified: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/setup/blu…
============================================================================== --- branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -12,3 +12,4 @@ -lhal) add_dependencies(blue psdk bugcodes) +add_minicd_target(blue reactos blue.sys) Modified: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
============================================================================== --- branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -14,3 +14,4 @@ -lhal) add_dependencies(cdrom psdk bugcodes) +add_minicd_target(cdrom reactos cdrom.sys) Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
============================================================================== --- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -16,3 +16,4 @@ -lhal) add_dependencies(class2 class2_def psdk bugcodes) +add_minicd_target(class2 reactos class2.sys) Modified: branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
============================================================================== --- branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -14,3 +14,4 @@ -lhal) add_dependencies(disk psdk bugcodes) +add_minicd_target(disk reactos disk.sys) Modified: branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
============================================================================== --- branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -12,3 +12,4 @@ -lhal) add_dependencies(ramdisk psdk bugcodes) +add_minicd_target(ramdisk reactos ramdisk.sys) Modified: branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/f…
============================================================================== --- branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -17,3 +17,4 @@ -lhal) add_dependencies(floppy psdk bugcodes buildno_header) +add_minicd_target(floppy reactos floppy.sys) Modified: branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i…
============================================================================== --- branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -10,3 +10,4 @@ libcntpr) add_dependencies(atapi psdk bugcodes) +add_minicd_target(atapi reactos atapi.sys) Modified: branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i…
============================================================================== --- branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -23,3 +23,4 @@ -lgcc) add_dependencies(uniata psdk bugcodes buildno_header) +add_minicd_target(uniata reactos uniata.sys) Modified: branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/p…
============================================================================== --- branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -10,3 +10,4 @@ libcntpr) add_dependencies(buslogic psdk bugcodes) +add_minicd_target(buslogic reactos buslogic.sys) Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s…
============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -11,3 +11,4 @@ -lhal) add_dependencies(scsiport psdk bugcodes) +add_minicd_target(scsiport reactos scsiport.sys) Modified: branches/cmake-bringup/hal/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx…
============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -98,7 +98,7 @@ add_library(mini_hal ${MINI_HAL_SOURCE}) set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") add_dependencies(mini_hal psdk bugcodes) - +add_minicd_target(hal reactos hal.dll) else() #TBD endif(ARCH MATCHES i386) Added: branches/cmake-bringup/media/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/CMakeLists.…
============================================================================== --- branches/cmake-bringup/media/CMakeLists.txt (added) +++ branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -1,0 +1,3 @@ +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/l_intl.nls reactos l_intl.nls) +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/c_437.nls reactos c_437.nls) +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/c_1252.nls reactos c_1252.nls) Propchange: branches/cmake-bringup/media/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis…
============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Oct 9 13:54:36 2010 @@ -424,3 +424,5 @@ add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE}) set_source_files_properties(${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S PROPERTIES GENERATED TRUE) add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi) + +add_minicd_target(ntoskrnl reactos ntoskrnl.exe)
14 years, 2 months
1
0
0
0
[fireball] 49071: [HEAP] - Move (and cleanup) private heap definitions and structure to a standalone header file heap.h. It's explicitly included in heap_rewrite.c and heapdbg.c to prevent conflict...
by fireball@svn.reactos.org
Author: fireball Date: Sat Oct 9 13:02:34 2010 New Revision: 49071 URL:
http://svn.reactos.org/svn/reactos?rev=49071&view=rev
Log: [HEAP] - Move (and cleanup) private heap definitions and structure to a standalone header file heap.h. It's explicitly included in heap_rewrite.c and heapdbg.c to prevent conflicts with the existing heap manager in heap.c. Added: trunk/reactos/lib/rtl/heap.h (with props) Modified: trunk/reactos/lib/rtl/heap_rewrite.c trunk/reactos/lib/rtl/heapdbg.c Added: trunk/reactos/lib/rtl/heap.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=49071&v…
============================================================================== --- trunk/reactos/lib/rtl/heap.h (added) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Sat Oct 9 13:02:34 2010 @@ -1,0 +1,297 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/rtl/heap.h + * PURPOSE: Run-Time Libary Heap Manager header + * PROGRAMMER: Aleksey Bragin + */ + +/* INCLUDES ******************************************************************/ + +#ifndef RTL_HEAP_H +#define RTL_HEAP_H + +/* Core heap definitions */ +#define HEAP_FREELISTS 128 +#define HEAP_SEGMENTS 64 + +#define HEAP_ENTRY_SIZE ((ULONG)sizeof(HEAP_ENTRY)) +#define HEAP_ENTRY_SHIFT 3 +#define HEAP_MAX_BLOCK_SIZE ((0x80000 - PAGE_SIZE) >> HEAP_ENTRY_SHIFT) + +#define ARENA_INUSE_FILLER 0xBAADF00D +#define ARENA_FREE_FILLER 0xFEEEFEEE +#define HEAP_TAIL_FILL 0xab + +// from ntifs.h, should go to another header! +#define HEAP_GLOBAL_TAG 0x0800 +#define HEAP_PSEUDO_TAG_FLAG 0x8000 +#define HEAP_TAG_MASK (HEAP_MAXIMUM_TAG << HEAP_TAG_SHIFT) + +#define HEAP_EXTRA_FLAGS_MASK (HEAP_CAPTURE_STACK_BACKTRACES | \ + HEAP_SETTABLE_USER_VALUE | \ + (HEAP_TAG_MASK ^ (0xFF << HEAP_TAG_SHIFT))) + +/* Heap entry flags */ +#define HEAP_ENTRY_BUSY 0x01 +#define HEAP_ENTRY_EXTRA_PRESENT 0x02 +#define HEAP_ENTRY_FILL_PATTERN 0x04 +#define HEAP_ENTRY_VIRTUAL_ALLOC 0x08 +#define HEAP_ENTRY_LAST_ENTRY 0x10 +#define HEAP_ENTRY_SETTABLE_FLAG1 0x20 +#define HEAP_ENTRY_SETTABLE_FLAG2 0x40 +#define HEAP_ENTRY_SETTABLE_FLAG3 0x80 +#define HEAP_ENTRY_SETTABLE_FLAGS (HEAP_ENTRY_SETTABLE_FLAG1 | HEAP_ENTRY_SETTABLE_FLAG2 | HEAP_ENTRY_SETTABLE_FLAG3) + +/* Signatures */ +#define HEAP_SIGNATURE 0xeefeeff +#define HEAP_SEGMENT_SIGNATURE 0xffeeffee + +/* Segment flags */ +#define HEAP_USER_ALLOCATED 0x1 + +/* Heap structures */ +struct _HEAP_COMMON_ENTRY +{ + union + { + struct + { + USHORT Size; + UCHAR Flags; + UCHAR SmallTagIndex; + }; + struct + { + PVOID SubSegmentCode; + USHORT PreviousSize; + union + { + UCHAR SegmentOffset; + UCHAR LFHFlags; + }; + UCHAR UnusedBytes; + }; + struct + { + USHORT FunctionIndex; + USHORT ContextValue; + }; + struct + { + ULONG InterceptorValue; + USHORT UnusedBytesLength; + UCHAR EntryOffset; + UCHAR ExtendedBlockSignature; + }; + struct + { + ULONG Code1; + USHORT Code2; + UCHAR Code3; + UCHAR Code4; + }; + ULONGLONG AgregateCode; + }; +}; + +typedef struct _HEAP_FREE_ENTRY +{ + struct _HEAP_COMMON_ENTRY; + LIST_ENTRY FreeList; +} HEAP_FREE_ENTRY, *PHEAP_FREE_ENTRY; + +typedef struct _HEAP_ENTRY +{ + struct _HEAP_COMMON_ENTRY; +} HEAP_ENTRY, *PHEAP_ENTRY; + +C_ASSERT(sizeof(HEAP_ENTRY) == 8); +C_ASSERT((1 << HEAP_ENTRY_SHIFT) == sizeof(HEAP_ENTRY)); + +typedef struct _HEAP_TAG_ENTRY +{ + ULONG Allocs; + ULONG Frees; + ULONG Size; + USHORT TagIndex; + USHORT CreatorBackTraceIndex; + WCHAR TagName[24]; +} HEAP_TAG_ENTRY, *PHEAP_TAG_ENTRY; + +typedef struct _HEAP_PSEUDO_TAG_ENTRY +{ + ULONG Allocs; + ULONG Frees; + ULONG Size; +} HEAP_PSEUDO_TAG_ENTRY, *PHEAP_PSEUDO_TAG_ENTRY; + +typedef struct _HEAP_COUNTERS +{ + ULONG TotalMemoryReserved; + ULONG TotalMemoryCommitted; + ULONG TotalMemoryLargeUCR; + ULONG TotalSizeInVirtualBlocks; + ULONG TotalSegments; + ULONG TotalUCRs; + ULONG CommittOps; + ULONG DeCommitOps; + ULONG LockAcquires; + ULONG LockCollisions; + ULONG CommitRate; + ULONG DecommittRate; + ULONG CommitFailures; + ULONG InBlockCommitFailures; + ULONG CompactHeapCalls; + ULONG CompactedUCRs; + ULONG InBlockDeccommits; + ULONG InBlockDeccomitSize; +} HEAP_COUNTERS, *PHEAP_COUNTERS; + +typedef struct _HEAP_TUNING_PARAMETERS +{ + ULONG CommittThresholdShift; + ULONG MaxPreCommittThreshold; +} HEAP_TUNING_PARAMETERS, *PHEAP_TUNING_PARAMETERS; + +typedef struct _HEAP +{ + HEAP_ENTRY Entry; + ULONG SegmentSignature; + ULONG SegmentFlags; + LIST_ENTRY SegmentListEntry; + struct _HEAP *Heap; + PVOID BaseAddress; + ULONG NumberOfPages; + PHEAP_ENTRY FirstEntry; + PHEAP_ENTRY LastValidEntry; + ULONG NumberOfUnCommittedPages; + ULONG NumberOfUnCommittedRanges; + USHORT SegmentAllocatorBackTraceIndex; + USHORT Reserved; + LIST_ENTRY UCRSegmentList; + ULONG Flags; + ULONG ForceFlags; + ULONG CompatibilityFlags; + ULONG EncodeFlagMask; + HEAP_ENTRY Encoding; + ULONG PointerKey; + ULONG Interceptor; + ULONG VirtualMemoryThreshold; + ULONG Signature; + ULONG SegmentReserve; + ULONG SegmentCommit; + ULONG DeCommitFreeBlockThreshold; + ULONG DeCommitTotalFreeThreshold; + ULONG TotalFreeSize; + ULONG MaximumAllocationSize; + USHORT ProcessHeapsListIndex; + USHORT HeaderValidateLength; + PVOID HeaderValidateCopy; + USHORT NextAvailableTagIndex; + USHORT MaximumTagIndex; + PHEAP_TAG_ENTRY TagEntries; + LIST_ENTRY UCRList; + ULONG AlignRound; + ULONG AlignMask; + LIST_ENTRY VirtualAllocdBlocks; + LIST_ENTRY SegmentList; + struct _HEAP_SEGMENT *Segments[HEAP_SEGMENTS]; //FIXME: non-Vista + USHORT AllocatorBackTraceIndex; + ULONG NonDedicatedListLength; + PVOID BlocksIndex; + PVOID UCRIndex; + PHEAP_PSEUDO_TAG_ENTRY PseudoTagEntries; + LIST_ENTRY FreeLists[HEAP_FREELISTS]; //FIXME: non-Vista + union + { + ULONG FreeListsInUseUlong[HEAP_FREELISTS / (sizeof(ULONG) * 8)]; //FIXME: non-Vista + UCHAR FreeListsInUseBytes[HEAP_FREELISTS / (sizeof(UCHAR) * 8)]; //FIXME: non-Vista + } u; + PHEAP_LOCK LockVariable; + PRTL_HEAP_COMMIT_ROUTINE CommitRoutine; + PVOID FrontEndHeap; + USHORT FrontHeapLockCount; + UCHAR FrontEndHeapType; + HEAP_COUNTERS Counters; + HEAP_TUNING_PARAMETERS TuningParameters; +} HEAP, *PHEAP; + +typedef struct _HEAP_SEGMENT +{ + HEAP_ENTRY Entry; + ULONG SegmentSignature; + ULONG SegmentFlags; + LIST_ENTRY SegmentListEntry; + PHEAP Heap; + PVOID BaseAddress; + ULONG NumberOfPages; + PHEAP_ENTRY FirstEntry; + PHEAP_ENTRY LastValidEntry; + ULONG NumberOfUnCommittedPages; + ULONG NumberOfUnCommittedRanges; + USHORT SegmentAllocatorBackTraceIndex; + USHORT Reserved; + LIST_ENTRY UCRSegmentList; + PHEAP_ENTRY LastEntryInSegment; //FIXME: non-Vista +} HEAP_SEGMENT, *PHEAP_SEGMENT; + +typedef struct _HEAP_UCR_DESCRIPTOR +{ + LIST_ENTRY ListEntry; + LIST_ENTRY SegmentEntry; + PVOID Address; + ULONG Size; +} HEAP_UCR_DESCRIPTOR, *PHEAP_UCR_DESCRIPTOR; + +typedef struct _HEAP_ENTRY_EXTRA +{ + union + { + struct + { + USHORT AllocatorBackTraceIndex; + USHORT TagIndex; + ULONG_PTR Settable; + }; + UINT64 ZeroInit; + }; +} HEAP_ENTRY_EXTRA, *PHEAP_ENTRY_EXTRA; + +typedef HEAP_ENTRY_EXTRA HEAP_FREE_ENTRY_EXTRA, *PHEAP_FREE_ENTRY_EXTRA; + +typedef struct _HEAP_VIRTUAL_ALLOC_ENTRY +{ + LIST_ENTRY Entry; + HEAP_ENTRY_EXTRA ExtraStuff; + ULONG CommitSize; + ULONG ReserveSize; + HEAP_ENTRY BusyBlock; +} HEAP_VIRTUAL_ALLOC_ENTRY, *PHEAP_VIRTUAL_ALLOC_ENTRY; + +/* Global variables */ +extern HEAP_LOCK RtlpProcessHeapsListLock; +extern BOOLEAN RtlpPageHeapEnabled; + +/* Functions declarations */ + +/* heap.c */ +PHEAP_FREE_ENTRY NTAPI +RtlpCoalesceFreeBlocks (PHEAP Heap, + PHEAP_FREE_ENTRY FreeEntry, + PSIZE_T FreeSize, + BOOLEAN Remove); + +PHEAP_ENTRY_EXTRA NTAPI +RtlpGetExtraStuffPointer(PHEAP_ENTRY HeapEntry); + +/* heapdbg.c */ +HANDLE NTAPI +RtlpPageHeapCreate(ULONG Flags, + PVOID Addr, + SIZE_T TotalSize, + SIZE_T CommitSize, + PVOID Lock, + PRTL_HEAP_PARAMETERS Parameters); + +#endif Propchange: trunk/reactos/lib/rtl/heap.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev…
============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Sat Oct 9 13:02:34 2010 @@ -18,277 +18,12 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> +#include <heap.h> #define NDEBUG #include <debug.h> -// Various defines, to be moved to a separate header file -#define HEAP_FREELISTS 128 -#define HEAP_SEGMENTS 64 - -#define HEAP_ENTRY_SIZE ((ULONG)sizeof(HEAP_ENTRY)) -#define HEAP_ENTRY_SHIFT 3 -#define HEAP_MAX_BLOCK_SIZE ((0x80000 - PAGE_SIZE) >> HEAP_ENTRY_SHIFT) - -#define ARENA_INUSE_FILLER 0xBAADF00D -#define ARENA_FREE_FILLER 0xFEEEFEEE -#define HEAP_TAIL_FILL 0xab - -// from ntifs.h, should go to another header! -#define HEAP_GLOBAL_TAG 0x0800 -#define HEAP_PSEUDO_TAG_FLAG 0x8000 -#define HEAP_TAG_MASK (HEAP_MAXIMUM_TAG << HEAP_TAG_SHIFT) - -#define HEAP_EXTRA_FLAGS_MASK (HEAP_CAPTURE_STACK_BACKTRACES | \ - HEAP_SETTABLE_USER_VALUE | \ - (HEAP_TAG_MASK ^ (0xFF << HEAP_TAG_SHIFT))) - -struct _HEAP_COMMON_ENTRY -{ - union - { - struct - { - USHORT Size; // 0x0 - UCHAR Flags; // 0x2 - UCHAR SmallTagIndex; //0x3 - }; - struct - { - PVOID SubSegmentCode; // 0x0 - USHORT PreviousSize; // 0x4 - union - { - UCHAR SegmentOffset; // 0x6 - UCHAR LFHFlags; // 0x6 - }; - UCHAR UnusedBytes; // 0x7 - }; - struct - { - USHORT FunctionIndex; // 0x0 - USHORT ContextValue; // 0x2 - }; - struct - { - ULONG InterceptorValue; // 0x0 - USHORT UnusedBytesLength; // 0x4 - UCHAR EntryOffset; // 0x6 - UCHAR ExtendedBlockSignature; // 0x7 - }; - struct - { - ULONG Code1; // 0x0 - USHORT Code2; // 0x4 - UCHAR Code3; // 0x6 - UCHAR Code4; // 0x7 - }; - ULONGLONG AgregateCode; // 0x0 - }; -}; - -typedef struct _HEAP_FREE_ENTRY -{ - struct _HEAP_COMMON_ENTRY; - LIST_ENTRY FreeList; // 0x8 -} HEAP_FREE_ENTRY, *PHEAP_FREE_ENTRY; - -typedef struct _HEAP_ENTRY -{ - struct _HEAP_COMMON_ENTRY; -} HEAP_ENTRY, *PHEAP_ENTRY; - -C_ASSERT(sizeof(HEAP_ENTRY) == 8); -C_ASSERT((1 << HEAP_ENTRY_SHIFT) == sizeof(HEAP_ENTRY)); - -typedef struct _HEAP_TAG_ENTRY -{ - ULONG Allocs; - ULONG Frees; - ULONG Size; - USHORT TagIndex; - USHORT CreatorBackTraceIndex; - WCHAR TagName[24]; -} HEAP_TAG_ENTRY, *PHEAP_TAG_ENTRY; - -typedef struct _HEAP_PSEUDO_TAG_ENTRY -{ - ULONG Allocs; - ULONG Frees; - ULONG Size; -} HEAP_PSEUDO_TAG_ENTRY, *PHEAP_PSEUDO_TAG_ENTRY; - -typedef struct _HEAP_COUNTERS -{ - ULONG TotalMemoryReserved; - ULONG TotalMemoryCommitted; - ULONG TotalMemoryLargeUCR; - ULONG TotalSizeInVirtualBlocks; - ULONG TotalSegments; - ULONG TotalUCRs; - ULONG CommittOps; - ULONG DeCommitOps; - ULONG LockAcquires; - ULONG LockCollisions; - ULONG CommitRate; - ULONG DecommittRate; - ULONG CommitFailures; - ULONG InBlockCommitFailures; - ULONG CompactHeapCalls; - ULONG CompactedUCRs; - ULONG InBlockDeccommits; - ULONG InBlockDeccomitSize; -} HEAP_COUNTERS, *PHEAP_COUNTERS; - -typedef struct _HEAP_TUNING_PARAMETERS -{ - ULONG CommittThresholdShift; - ULONG MaxPreCommittThreshold; -} HEAP_TUNING_PARAMETERS, *PHEAP_TUNING_PARAMETERS; - -typedef struct _HEAP -{ - HEAP_ENTRY Entry; - ULONG SegmentSignature; - ULONG SegmentFlags; - LIST_ENTRY SegmentListEntry; - struct _HEAP *Heap; - PVOID BaseAddress; - ULONG NumberOfPages; - PHEAP_ENTRY FirstEntry; - PHEAP_ENTRY LastValidEntry; - ULONG NumberOfUnCommittedPages; - ULONG NumberOfUnCommittedRanges; - USHORT SegmentAllocatorBackTraceIndex; - USHORT Reserved; - LIST_ENTRY UCRSegmentList; - ULONG Flags; - ULONG ForceFlags; - ULONG CompatibilityFlags; - ULONG EncodeFlagMask; - HEAP_ENTRY Encoding; - ULONG PointerKey; - ULONG Interceptor; - ULONG VirtualMemoryThreshold; - ULONG Signature; - ULONG SegmentReserve; - ULONG SegmentCommit; - ULONG DeCommitFreeBlockThreshold; - ULONG DeCommitTotalFreeThreshold; - ULONG TotalFreeSize; - ULONG MaximumAllocationSize; - USHORT ProcessHeapsListIndex; - USHORT HeaderValidateLength; - PVOID HeaderValidateCopy; - USHORT NextAvailableTagIndex; - USHORT MaximumTagIndex; - PHEAP_TAG_ENTRY TagEntries; - LIST_ENTRY UCRList; - ULONG AlignRound; - ULONG AlignMask; - LIST_ENTRY VirtualAllocdBlocks; - LIST_ENTRY SegmentList; - struct _HEAP_SEGMENT *Segments[HEAP_SEGMENTS]; //FIXME: non-Vista - USHORT AllocatorBackTraceIndex; - ULONG NonDedicatedListLength; - PVOID BlocksIndex; - PVOID UCRIndex; - PHEAP_PSEUDO_TAG_ENTRY PseudoTagEntries; - LIST_ENTRY FreeLists[HEAP_FREELISTS]; //FIXME: non-Vista - union - { - ULONG FreeListsInUseUlong[HEAP_FREELISTS / (sizeof(ULONG) * 8)]; //FIXME: non-Vista - UCHAR FreeListsInUseBytes[HEAP_FREELISTS / (sizeof(UCHAR) * 8)]; //FIXME: non-Vista - } u; - PHEAP_LOCK LockVariable; - PRTL_HEAP_COMMIT_ROUTINE CommitRoutine; - PVOID FrontEndHeap; - USHORT FrontHeapLockCount; - UCHAR FrontEndHeapType; - HEAP_COUNTERS Counters; - HEAP_TUNING_PARAMETERS TuningParameters; -} HEAP, *PHEAP; - -typedef struct _HEAP_SEGMENT -{ - HEAP_ENTRY Entry; - ULONG SegmentSignature; - ULONG SegmentFlags; - LIST_ENTRY SegmentListEntry; - PHEAP Heap; - PVOID BaseAddress; - ULONG NumberOfPages; - PHEAP_ENTRY FirstEntry; - PHEAP_ENTRY LastValidEntry; - ULONG NumberOfUnCommittedPages; - ULONG NumberOfUnCommittedRanges; - USHORT SegmentAllocatorBackTraceIndex; - USHORT Reserved; - LIST_ENTRY UCRSegmentList; - PHEAP_ENTRY LastEntryInSegment; //FIXME: non-Vista -} HEAP_SEGMENT, *PHEAP_SEGMENT; - -typedef struct _HEAP_UCR_DESCRIPTOR -{ - LIST_ENTRY ListEntry; - LIST_ENTRY SegmentEntry; - PVOID Address; - ULONG Size; -} HEAP_UCR_DESCRIPTOR, *PHEAP_UCR_DESCRIPTOR; - -typedef struct _HEAP_ENTRY_EXTRA -{ - union - { - struct - { - USHORT AllocatorBackTraceIndex; - USHORT TagIndex; - ULONG_PTR Settable; - }; - UINT64 ZeroInit; - }; -} HEAP_ENTRY_EXTRA, *PHEAP_ENTRY_EXTRA; - -typedef HEAP_ENTRY_EXTRA HEAP_FREE_ENTRY_EXTRA, *PHEAP_FREE_ENTRY_EXTRA; - -typedef struct _HEAP_VIRTUAL_ALLOC_ENTRY -{ - LIST_ENTRY Entry; - HEAP_ENTRY_EXTRA ExtraStuff; - ULONG CommitSize; - ULONG ReserveSize; - HEAP_ENTRY BusyBlock; -} HEAP_VIRTUAL_ALLOC_ENTRY, *PHEAP_VIRTUAL_ALLOC_ENTRY; - -extern BOOLEAN RtlpPageHeapEnabled; -HANDLE NTAPI -RtlpSpecialHeapCreate(ULONG Flags, - PVOID Addr, - SIZE_T TotalSize, - SIZE_T CommitSize, - PVOID Lock, - PRTL_HEAP_PARAMETERS Parameters) { return NULL; }; - HEAP_LOCK RtlpProcessHeapsListLock; - -/* Heap entry flags */ -#define HEAP_ENTRY_BUSY 0x01 -#define HEAP_ENTRY_EXTRA_PRESENT 0x02 -#define HEAP_ENTRY_FILL_PATTERN 0x04 -#define HEAP_ENTRY_VIRTUAL_ALLOC 0x08 -#define HEAP_ENTRY_LAST_ENTRY 0x10 -#define HEAP_ENTRY_SETTABLE_FLAG1 0x20 -#define HEAP_ENTRY_SETTABLE_FLAG2 0x40 -#define HEAP_ENTRY_SETTABLE_FLAG3 0x80 -#define HEAP_ENTRY_SETTABLE_FLAGS (HEAP_ENTRY_SETTABLE_FLAG1 | HEAP_ENTRY_SETTABLE_FLAG2 | HEAP_ENTRY_SETTABLE_FLAG3) - -/* Signatures */ -#define HEAP_SIGNATURE 0xeefeeff -#define HEAP_SEGMENT_SIGNATURE 0xffeeffee - -/* Segment flags */ -#define HEAP_USER_ALLOCATED 0x1 /* Bitmaps stuff */ @@ -335,15 +70,6 @@ ULONG NTAPI RtlCompareMemoryUlong(PVOID Source, ULONG Length, ULONG Value); -PHEAP_FREE_ENTRY NTAPI -RtlpCoalesceFreeBlocks (PHEAP Heap, - PHEAP_FREE_ENTRY FreeEntry, - PSIZE_T FreeSize, - BOOLEAN Remove); - -PHEAP_ENTRY_EXTRA NTAPI -RtlpGetExtraStuffPointer(PHEAP_ENTRY HeapEntry); - /* FUNCTIONS *****************************************************************/ VOID NTAPI @@ -1546,7 +1272,7 @@ /* Check for a special heap */ if (RtlpPageHeapEnabled && !Addr && !Lock) { - Heap = RtlpSpecialHeapCreate(Flags, Addr, TotalSize, CommitSize, Lock, Parameters); + Heap = RtlpPageHeapCreate(Flags, Addr, TotalSize, CommitSize, Lock, Parameters); if (Heap) return Heap; //ASSERT(FALSE); Modified: trunk/reactos/lib/rtl/heapdbg.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapdbg.c?rev=4907…
============================================================================== --- trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] Sat Oct 9 13:02:34 2010 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <rtl.h> +#include <heap.h> #define NDEBUG #include <debug.h> @@ -21,4 +22,15 @@ /* FUNCTIONS ******************************************************************/ +HANDLE NTAPI +RtlpPageHeapCreate(ULONG Flags, + PVOID Addr, + SIZE_T TotalSize, + SIZE_T CommitSize, + PVOID Lock, + PRTL_HEAP_PARAMETERS Parameters) +{ + return NULL; +} + /* EOF */
14 years, 2 months
1
0
0
0
[akhaldi] 49070: [CMAKE] - Apply the linker script to freeldr.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Oct 9 12:53:12 2010 New Revision: 49070 URL:
http://svn.reactos.org/svn/reactos?rev=49070&view=rev
Log: [CMAKE] - Apply the linker script to freeldr. Modified: branches/cmake-bringup/boot/CMakeLists.txt Modified: branches/cmake-bringup/boot/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t…
============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Sat Oct 9 12:53:12 2010 @@ -170,7 +170,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch ${FREELDR_SOURCE}) -set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000" SUFFIX ".sys") +set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys") if(ARCH MATCHES i386) target_link_libraries(freeldr mini_hal)
14 years, 2 months
1
0
0
0
[fireball] 49069: [HEAP] - Implement setting/getting heap user values and flags (very easy provided heap design is now proper). Amount of winetest failures is down to 12 (but 3 crashes in child pro...
by fireball@svn.reactos.org
Author: fireball Date: Sat Oct 9 12:49:30 2010 New Revision: 49069 URL:
http://svn.reactos.org/svn/reactos?rev=49069&view=rev
Log: [HEAP] - Implement setting/getting heap user values and flags (very easy provided heap design is now proper). Amount of winetest failures is down to 12 (but 3 crashes in child processes). Modified: trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev…
============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Sat Oct 9 12:49:30 2010 @@ -12,6 +12,7 @@
http://binglongx.spaces.live.com/blog/cns!142CBF6D49079DE8!596.entry
http://www.phreedom.org/research/exploits/asn1-bitstring/
http://illmatics.com/Understanding_the_LFH.pdf
+
http://www.alex-ionescu.com/?p=18
*/ /* INCLUDES *****************************************************************/ @@ -243,7 +244,7 @@ { USHORT AllocatorBackTraceIndex; USHORT TagIndex; - ULONG Settable; + ULONG_PTR Settable; }; UINT64 ZeroInit; }; @@ -1153,7 +1154,7 @@ if (Segment->SegmentFlags & HEAP_USER_ALLOCATED) return; BaseAddress = Segment->BaseAddress; - DPRINT1("Destroying segment %p, BA %p\n", Segment, BaseAddress); + DPRINT("Destroying segment %p, BA %p\n", Segment, BaseAddress); /* Release virtual memory */ Status = ZwFreeVirtualMemory(NtCurrentProcess(), @@ -2983,7 +2984,15 @@ Flags |= HEAP_SETTABLE_USER_VALUE | ((InUseEntry->Flags & HEAP_ENTRY_SETTABLE_FLAGS) << 4); - UNIMPLEMENTED; + /* Get pointer to the old extra data */ + OldExtra = RtlpGetExtraStuffPointer(InUseEntry); + + /* Save tag index if it was set */ + if (OldExtra->TagIndex && + !(OldExtra->TagIndex & HEAP_PSEUDO_TAG_FLAG)) + { + Flags |= OldExtra->TagIndex << HEAP_TAG_SHIFT; + } } else if (InUseEntry->SmallTagIndex) { @@ -3131,7 +3140,7 @@ /* Check if it's really a heap */ if (Heap->Signature != HEAP_SIGNATURE) return FALSE; - /* Lock if it's lockable */ + /* Unlock if it's lockable */ if (!(Heap->Flags & HEAP_NO_SERIALIZE)) { RtlLeaveHeapLock(Heap->LockVariable); @@ -3307,8 +3316,49 @@ IN PVOID BaseAddress, IN PVOID UserValue) { - UNIMPLEMENTED; - return FALSE; + PHEAP Heap = (PHEAP)HeapHandle; + PHEAP_ENTRY HeapEntry; + PHEAP_ENTRY_EXTRA Extra; + BOOLEAN HeapLocked = FALSE; + + /* Force flags */ + Flags |= Heap->Flags; + + /* Lock if it's lockable */ + if (!(Heap->Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + } + + /* Get a pointer to the entry */ + HeapEntry = (PHEAP_ENTRY)BaseAddress - 1; + + /* If it's a free entry - return error */ + if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return FALSE; + } + + /* Check if this entry has an extra stuff associated with it */ + if (HeapEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + /* Use extra to store the value */ + Extra = RtlpGetExtraStuffPointer(HeapEntry); + Extra->Settable = (ULONG_PTR)UserValue; + } + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return TRUE; } /* @@ -3319,9 +3369,47 @@ RtlSetUserFlagsHeap(IN PVOID HeapHandle, IN ULONG Flags, IN PVOID BaseAddress, - IN ULONG UserFlags) -{ - return FALSE; + IN ULONG UserFlagsReset, + IN ULONG UserFlagsSet) +{ + PHEAP Heap = (PHEAP)HeapHandle; + PHEAP_ENTRY HeapEntry; + BOOLEAN HeapLocked = FALSE; + + /* Force flags */ + Flags |= Heap->Flags; + + /* Lock if it's lockable */ + if (!(Heap->Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + } + + /* Get a pointer to the entry */ + HeapEntry = (PHEAP_ENTRY)BaseAddress - 1; + + /* If it's a free entry - return error */ + if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return FALSE; + } + + /* Set / reset flags */ + HeapEntry->Flags &= ~(UserFlagsReset >> 4); + HeapEntry->Flags |= (UserFlagsSet >> 4); + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return TRUE; } /* @@ -3335,8 +3423,56 @@ OUT PVOID *UserValue, OUT PULONG UserFlags) { - UNIMPLEMENTED; - return FALSE; + PHEAP Heap = (PHEAP)HeapHandle; + PHEAP_ENTRY HeapEntry; + PHEAP_ENTRY_EXTRA Extra; + BOOLEAN HeapLocked = FALSE; + + /* Force flags */ + Flags |= Heap->Flags; + + /* Lock if it's lockable */ + if (!(Heap->Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + } + + /* Get a pointer to the entry */ + HeapEntry = (PHEAP_ENTRY)BaseAddress - 1; + + /* If it's a free entry - return error */ + if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return FALSE; + } + + /* Check if this entry has an extra stuff associated with it */ + if (HeapEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + /* Get pointer to extra data */ + Extra = RtlpGetExtraStuffPointer(HeapEntry); + + /* Pass user value */ + if (UserValue) + *UserValue = (PVOID)Extra->Settable; + + /* Decode and return user flags */ + if (UserFlags) + *UserFlags = (HeapEntry->Flags & HEAP_ENTRY_SETTABLE_FLAGS) << 4; + } + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return TRUE; } /*
14 years, 2 months
1
0
0
0
[akhaldi] 49068: [CMAKE] - Bring back explorer.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Oct 9 12:48:57 2010 New Revision: 49068 URL:
http://svn.reactos.org/svn/reactos?rev=49068&view=rev
Log: [CMAKE] - Bring back explorer. Modified: branches/cmake-bringup/base/shell/CMakeLists.txt branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL…
============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Sat Oct 9 12:48:57 2010 @@ -1,4 +1,4 @@ add_subdirectory(cmd) -#add_subdirectory(explorer) +add_subdirectory(explorer) add_subdirectory(explorer-new) Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor…
============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sat Oct 9 12:48:57 2010 @@ -45,24 +45,33 @@ utility/window.cpp utility/shellbrowserimpl.cpp) # utility/shelltests.cpp - add_executable(explorer ${SOURCE}) #${CMAKE_CURRENT_BINARY_DIR}/explorer_precomp.h.gch ${SOURCE}) +set_subsystem(explorer windows) +set_entrypoint(explorer WinMainCRTStartup) + target_link_libraries(explorer + -lsupc++ + -lstdc++ + -lgcc + -lmingw32 + -lmingwex wine - uuid) + mingw_wmain + mingw_common + uuid + -ladvapi32 + -lgdi32 + -luser32 + -lws2_32 + -lmsimg32 + -lcomctl32 + -lole32 + -loleaut32 + -lshell32 + -lnotifyhook + -lmsvcrt + -lkernel32 + -lntdll) -set_module_type(explorer win32gui) - -add_importlibs(explorer - advapi32 - gdi32 - user32 - ws2_32 - msimg32 - comctl32 - ole32 - oleaut32 - shell32 - notifyhook - msvcrt) +add_dependencies(explorer psdk buildno_header) Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming…
============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sat Oct 9 12:48:57 2010 @@ -41,7 +41,7 @@ add_library(mingw_common ${MINGW_COMMON_SOURCE}) if(NOT MSVC) - add_dependencies(mingw_common oldnames) + target_link_libraries(mingw_common oldnames) endif(NOT MSVC) set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlp…
============================================================================== --- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Sat Oct 9 12:48:57 2010 @@ -44,6 +44,6 @@ if(NOT MSVC) #those are mandatory to get correctly ordered linked libraries. - target_link_libraries(stlport supc++ msvcrt.dll.a) - add_importlibs(stlport msvcrt) + #target_link_libraries(stlport supc++ msvcrt.dll.a) + #add_importlibs(stlport msvcrt) endif()
14 years, 2 months
1
0
0
0
[akhaldi] 49067: [RAPPS] Igor Paliychuk: - Update some broken links. - Changed the cyrillic "P" to a latin "P" in the beginning of the VBox driver's russian and ukrainian descriptions (rapps doesn'...
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Oct 9 10:35:35 2010 New Revision: 49067 URL:
http://svn.reactos.org/svn/reactos?rev=49067&view=rev
Log: [RAPPS] Igor Paliychuk: - Update some broken links. - Changed the cyrillic "P" to a latin "P" in the beginning of the VBox driver's russian and ukrainian descriptions (rapps doesn't display it when it's cyrillic). Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mingw.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 0.9M Category = 12 URLSite =
http://www.7-zip.org/
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z465.exe
+URLDownload =
http://ovh.dl.sourceforge.net/project/sevenzip/7-Zip/4.65/7z465.exe
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -32,11 +32,11 @@ [Section.0419] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox Licence = Ðе Ñказано -Description = РазаÑÑ Ð¸Ð²Ð¸ÑÑйÑе ÑодеÑжимое в Ð¿Ð°Ð¿ÐºÑ "ReactOS", заÑем Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑезагÑÑзиÑе ÑиÑÑемÑ. +Description = PазаÑÑ Ð¸Ð²Ð¸ÑÑйÑе ÑодеÑжимое в Ð¿Ð°Ð¿ÐºÑ "ReactOS", заÑем Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑезагÑÑзиÑе ÑиÑÑемÑ. URLSite = Ðе Ñказано [Section.0422] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox Licence = ÐевÑдома -Description = РозаÑÑ ÑвÑйÑе вмÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" пÑÑÐ»Ñ Ñого двÑÑÑ Ð¿ÐµÑезаванÑажÑе ÑиÑÑемÑ. +Description = PозаÑÑ ÑвÑйÑе вмÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" пÑÑÐ»Ñ Ñого двÑÑÑ Ð¿ÐµÑезаванÑажÑе ÑиÑÑемÑ. URLSite = Ðе вказано Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 132MB Category = 4 URLSite =
http://www.blizzard.com/diablo2/
-URLDownload =
http://ftp.freenet.de/pub/filepilot/windows/spiele/diabloiidemo.exe
+URLDownload =
http://pub.zoneofgames.ru/demos/diabloiidemo.exe
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 1.4MB Category = 15 URLSite =
http://www.dosbox.com/
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.74-win32-installer…
+URLDownload =
http://ovh.dl.sourceforge.net/project/dosbox/dosbox/0.74/DOSBox0.74-win32-i…
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 3.1MB Category = 4 URLSite =
http://lgames.sourceforge.net/index.php?project=LBreakout2
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe
+URLDownload =
http://ovh.dl.sourceforge.net/project/lgames/binaries/lbreakout2-2.4.1-win3…
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 2.0MB Category = 4 URLSite =
http://lgames.sourceforge.net/index.php?project=LGeneral
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe
+URLDownload =
http://ovh.dl.sourceforge.net/project/lgames/binaries/lgeneral-1.1-win32.exe
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 1.4MB Category = 4 URLSite =
http://lgames.sourceforge.net/index.php?project=LMarbles
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe
+URLDownload =
http://ovh.dl.sourceforge.net/project/lgames/binaries/lmarbles-1.0.6-win32.…
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mingw.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -2,13 +2,13 @@ [Section] Name = MinGW -Version = 5.1.6 +Version = 20100909 Licence = Public domain/GPL Description = A Port of the GNU toolchain with GCC, GDB, GNU make, etc. -Size = 155kb +Size = 568kb Category = 7 URLSite =
http://mingw.org/
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.6.exe
+URLDownload =
http://ovh.dl.sourceforge.net/project/mingw/Automated%20MinGW%20Installer/m…
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 3.4MB Category = 4 URLSite =
http://www.openttd.org/
-URLDownload =
http://binaries.openttd.org/releases/1.0.4/openttd-1.0.4-windows-win32.exe
+URLDownload =
http://cz.binaries.openttd.org/openttd/binaries/releases/1.0.4/openttd-1.0.…
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 1.2M Category = 4 URLSite =
http://remood.sourceforge.net/
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/remood/remoodsetup-win32_08a.exe
+URLDownload =
http://ovh.dl.sourceforge.net/project/remood/ReMooD/0.8a/remoodsetup-win32_…
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 13.8MB Category = 7 URLSite =
http://reactos.org/wiki/Build_Environment
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.5.1.1.exe
+URLDownload =
http://ovh.dl.sourceforge.net/project/reactos/RosBE-Windows/i386/1.5.1/RosB…
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 11.1MB Category = 7 URLSite =
http://reactos.org/wiki/Build_Environment/
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-ARM-1.0.exe
+URLDownload =
http://ovh.dl.sourceforge.net/project/reactos/RosBE-Windows/arm/1.0/RosBE-A…
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 14.2MB Category = 1 URLSite =
http://smplayer.sourceforge.net/
-URLDownload =
http://downloads.sourceforge.net/project/smplayer/SMPlayer/0.6.9/smplayer-0…
+URLDownload =
http://ovh.dl.sourceforge.net/project/smplayer/SMPlayer/0.6.9/smplayer-0.6.…
CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 10MB Category = 3 URLSite =
http://tuxpaint.org/
-URLDownload =
http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.21-win32-in…
+URLDownload =
http://ovh.dl.sourceforge.net/project/tuxpaint/tuxpaint/0.9.21/tuxpaint-0.9…
CDPath = none [Section.0407]
14 years, 2 months
1
0
0
0
[akhaldi] 49066: [CMAKE] - Introduce lesser verbose makefiles.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Oct 9 10:10:39 2010 New Revision: 49066 URL:
http://svn.reactos.org/svn/reactos?rev=49066&view=rev
Log: [CMAKE] - Introduce lesser verbose makefiles. Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re…
============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Oct 9 10:10:39 2010 @@ -20,6 +20,8 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) + +set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) add_definitions(-D__REACTOS__)
14 years, 2 months
1
0
0
0
← Newer
1
...
29
30
31
32
33
34
35
...
44
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
Results per page:
10
25
50
100
200