Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 49079: [CMAKE] - Some work on the dlls. By Alexey Komarov.
by akhaldi＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: akhaldi Date: Sat Oct 9 19:15:45 2010 New Revision: 49079 URL: http://svn.reactos.org/svn/reactos?rev=49079&view=rev Log: [CMAKE] - Some work on the dlls. By Alexey Komarov. Added: branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/itss/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/localui/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libwinspool.a (with props) Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt 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 19:15:45 2010 @@ -122,7 +122,7 @@ add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd/${_dir}/${_nameoncd} COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}) - + add_custom_target(${_targetname}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd}) add_dependencies(${_targetname}_minicd ${_targetname}) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -54,7 +54,7 @@ #add_subdirectory(inetcomm) #add_subdirectory(inetmib1) add_subdirectory(initpki) -#add_subdirectory(inseng) +add_subdirectory(inseng) add_subdirectory(iphlpapi) #add_subdirectory(iprtprio) add_subdirectory(itircl) @@ -62,10 +62,10 @@ #add_subdirectory(jscript) add_subdirectory(kernel32) add_subdirectory(loadperf) -#add_subdirectory(localspl) -#add_subdirectory(localui) +add_subdirectory(localspl) +add_subdirectory(localui) add_subdirectory(lpk) -#add_subdirectory(lsasrv) +add_subdirectory(lsasrv) add_subdirectory(lz32) add_subdirectory(mapi32) add_subdirectory(mciavi32) @@ -73,18 +73,18 @@ add_subdirectory(mciqtz32) add_subdirectory(mciseq) add_subdirectory(mciwave) -#add_subdirectory(mlang) +add_subdirectory(mlang) add_subdirectory(mmdrv) add_subdirectory(modemui) add_subdirectory(mpr) add_subdirectory(mprapi) -#add_subdirectory(msacm32) +add_subdirectory(msacm32) add_subdirectory(msadp32.acm) add_subdirectory(msafd) add_subdirectory(mscat32) add_subdirectory(mscms) add_subdirectory(mscoree) -#add_subdirectory(msctf) +add_subdirectory(msctf) add_subdirectory(msftedit) add_subdirectory(msg711.acm) add_subdirectory(msgina) @@ -211,7 +211,7 @@ add_subdirectory(wintrust) add_subdirectory(wlanapi) add_subdirectory(wldap32) -#add_subdirectory(wmi) +add_subdirectory(wmi) add_subdirectory(ws2_32) add_subdirectory(ws2_32_new) add_subdirectory(ws2help) Added: branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inseng/… ============================================================================== --- branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,24 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(inseng ${CMAKE_CURRENT_SOURCE_DIR}/inseng.spec ${CMAKE_CURRENT_BINARY_DIR}/inseng.def) + +add_library(inseng SHARED inseng_main.c regsvr.c) + +set_module_type(inseng win32dll) + +target_link_libraries(inseng + ${CMAKE_CURRENT_BINARY_DIR}/inseng.def + uuid + wine) + +add_importlibs(inseng + ole32 + advapi32 + kernel32 + ntdll) + +add_dependencies(inseng inseng_def) Propchange: branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itss/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/itss/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/itss/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,30 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(itss ${CMAKE_CURRENT_SOURCE_DIR}/itss.spec ${CMAKE_CURRENT_BINARY_DIR}/itss.def) + +add_library(itss SHARED + chm_lib.c + lzx.c + itss.c + moniker.c + protocol.c + storage.c + rsrc.rc) + +set_module_type(itss win32dll) + +target_link_libraries(itss + ${CMAKE_CURRENT_BINARY_DIR}/itss.def + uuid + wine) + +add_importlibs(itss + urlmon + shlwapi + ole32 + ntdll) + +add_dependencies(itss itss_def wineheaders) Propchange: branches/cmake-bringup/dll/win32/itss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localsp… ============================================================================== --- branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,28 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(localspl ${CMAKE_CURRENT_SOURCE_DIR}/localspl.spec ${CMAKE_CURRENT_BINARY_DIR}/localspl.def) + +add_library(localspl SHARED + localmon.c + localspl_main.c + provider.c + localspl.rc) + +set_module_type(localspl win32dll) + +target_link_libraries(localspl + ${CMAKE_CURRENT_BINARY_DIR}/localspl.def + wine) + +add_importlibs(localspl + spoolss + user32 + advapi32 + kernel32 + ntdll) + +add_dependencies(localspl localspl_def) Propchange: branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… ============================================================================== --- branches/cmake-bringup/dll/win32/localui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,17 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(localui ${CMAKE_CURRENT_SOURCE_DIR}/localui.spec ${CMAKE_CURRENT_BINARY_DIR}/localui.def) + +add_library(localui SHARED localui.c localui.rc) + +set_module_type(localui win32dll) + +target_link_libraries(localui + ${CMAKE_CURRENT_BINARY_DIR}/localui.def + uuid + wine) + +add_importlibs(localui winspool user32 kernel32 ntdll) +add_dependencies(localui localui_def) Propchange: branches/cmake-bringup/dll/win32/localui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,26 @@ + +set_unicode() + +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass) + +spec2def(lsasrv ${CMAKE_CURRENT_SOURCE_DIR}/lsasrv.spec ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def) + +add_library(lsasrv SHARED + authport.c + lsarpc.c + lsasrv.c + privileges.c + sids.c + lsasrv.rc) + +set_entrypoint(lsasrv 0) + +target_link_libraries(lsasrv + ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def + lsa_server + wine + pseh) + +add_importlibs(lsasrv rpcrt4 kernel32 ntdll) +add_dependencies(lsasrv lsasrv_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mlang/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,27 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mlang ${CMAKE_CURRENT_SOURCE_DIR}/mlang.spec ${CMAKE_CURRENT_BINARY_DIR}/mlang.def) + +add_library(mlang SHARED mlang.c regsvr.c) + +set_entrypoint(mlang 0) + +target_link_libraries(mlang + ${CMAKE_CURRENT_BINARY_DIR}/mlang.def + uuid + wine) + +add_importlibs(mlang + ole32 + user32 + gdi32 + advapi32 + oleaut32 + kernel32 + ntdll) + +add_dependencies(mlang mlang_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,27 @@ + +set_unicode() + +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(msacm32 ${CMAKE_CURRENT_SOURCE_DIR}/msacm32.spec ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def) + +add_library(msacm32 SHARED + driver.c + filter.c + format.c + internal.c + msacm32_main.c + pcmconverter.c + stream.c) + +set_module_type(msacm32 win32dll) + +target_link_libraries(msacm32 + ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def + wine) + +add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) +add_dependencies(msacm32 msacm32_def) + +add_subdirectory(msacm32.drv) Propchange: branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,23 @@ + +set_unicode() + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/msacm32.drv.spec --filename msacm32.drv + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def PROPERTIES GENERATED TRUE) +add_custom_target(msacm32.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def) + +add_library(msacm32.drv SHARED wavemap.c wavemap.rc) + +set_entrypoint(msacm32.drv 0) +set_target_properties(msacm32.drv PROPERTIES SUFFIX "") + +target_link_libraries(msacm32.drv + ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def + wine) + +add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll) +add_dependencies(msacm32.drv msacm32.drv_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msctf/C… ============================================================================== --- branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,32 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(msctf ${CMAKE_CURRENT_SOURCE_DIR}/msctf.spec ${CMAKE_CURRENT_BINARY_DIR}/msctf.def) + +add_library(msctf SHARED + categorymgr.c + compartmentmgr.c + context.c + displayattributemgr.c + documentmgr.c + inputprocessor.c + langbarmgr.c + msctf.c + range.c + regsvr.c + threadmgr.c + version.rc) + +set_module_type(msctf win32dll) + +target_link_libraries(msctf + ${CMAKE_CURRENT_BINARY_DIR}/msctf.def + uuid + wine) + +add_importlibs(msctf ole32 oleaut32 user32 advapi32 kernel32 ntdll) +add_dependencies(msctf msctf_def) Propchange: branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -10,4 +10,4 @@ vfatxlib) add_importlibs(ufatx gcc kernel32 ntdll) -add_dependencies(ufatx ufatx_def) +add_dependencies(ufatx ufatx_def psdk buildno_header) Added: branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] Sat Oct 9 19:15:45 2010 @@ -1,0 +1,11 @@ + +spec2def(wmi ${CMAKE_CURRENT_SOURCE_DIR}/wmi.spec ${CMAKE_CURRENT_BINARY_DIR}/wmi.def) + +add_library(wmi SHARED wmi.rc) + +set_entrypoint(wmi 0) + +target_link_libraries(wmi ${CMAKE_CURRENT_BINARY_DIR}/wmi.def) + +add_importlibs(wmi advapi32) +add_dependencies(wmi wmi_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libwinspool.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libwinspool.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[cgutman] 49078: [WININET] - Add a ROS-specific change that was missed during the last winesync to fix winsock error handling - Remove the CP_UNIXCP definition - Use WSASetLastError instead of errn...
by cgutman＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: cgutman Date: Sat Oct 9 18:40:16 2010 New Revision: 49078 URL: http://svn.reactos.org/svn/reactos?rev=49078&view=rev Log: [WININET] - Add a ROS-specific change that was missed during the last winesync to fix winsock error handling - Remove the CP_UNIXCP definition - Use WSASetLastError instead of errno in inet_ntop.c - Thanks to IRC:igorko for pointing out the bug Modified: trunk/reactos/dll/win32/wininet/inet_ntop.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c Modified: trunk/reactos/dll/win32/wininet/inet_ntop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/inet_nto… ============================================================================== --- trunk/reactos/dll/win32/wininet/inet_ntop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/inet_ntop.c [iso-8859-1] Sat Oct 9 18:40:16 2010 @@ -15,9 +15,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ - -#define ENOSPC 28 -#define EAFNOSUPPORT 52 #ifndef IN6ADDRSZ #define IN6ADDRSZ 16 @@ -64,7 +61,7 @@ return (inet_ntop6(src, dst, size)); #endif default: - errno = EAFNOSUPPORT; + WSASetLastError(WSAEAFNOSUPPORT); return (NULL); } /* NOTREACHED */ @@ -88,7 +85,7 @@ char tmp[sizeof "255.255.255.255"]; if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) { - errno = ENOSPC; + WSASetLastError(WSAEINVAL); return (NULL); } strcpy(dst, tmp); @@ -182,7 +179,7 @@ * Check for overflow, copy, and we're done. */ if ((size_t)(tp - tmp) > size) { - errno = ENOSPC; + WSASetLastError(WSAEINVAL); return (NULL); } strcpy(dst, tmp); Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] Sat Oct 9 18:40:16 2010 @@ -47,10 +47,6 @@ #define ioctlsocket ioctl #endif /* __MINGW32__ */ -/* ReactOS-specific definitions */ -#undef CP_UNIXCP -#define CP_UNIXCP CP_THREAD_ACP - /* used for netconnection.c stuff */ typedef struct { @@ -441,7 +437,7 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available); LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); -int sock_get_error(int); +#define sock_get_error(x) WSAGetLastError() extern void URLCacheContainers_CreateDefaults(void); extern void URLCacheContainers_DeleteAll(void); Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… ============================================================================== --- trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Sat Oct 9 18:40:16 2010 @@ -513,6 +513,7 @@ return TRUE; } +#if 0 /* translate a unix error code into a winsock one */ int sock_get_error( int err ) { @@ -579,6 +580,7 @@ #endif return err; } +#endif /****************************************************************************** * NETCON_create

1 0

[tkreuzer] 49077: [CMAKE] Fix option checking
by tkreuzer＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: tkreuzer Date: Sat Oct 9 16:25:03 2010 New Revision: 49077 URL: http://svn.reactos.org/svn/reactos?rev=49077&view=rev Log: [CMAKE] Fix option checking 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 16:25:03 2010 @@ -58,13 +58,13 @@ add_definitions(-DDBG=${DBG} -DKDBG=${KDBG}) -if(DBG MATCHES 1) +if(DBG) add_definitions(-D_SEH_ENABLE_TRACE) -endif(DBG MATCHES 1) +endif(DBG) -if((DBG MATCHES 1) OR (KDBG MATCHES 1)) +if(DBG OR KDBG) set(DBG_OR_KDBG true) -endif((DBG MATCHES 1) OR (KDBG MATCHES 1)) +endif(DBG OR KDBG) # Version Options add_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_WIN32_WINDOWS=0x502 -D_SETUPAPI_VER=0x502)

1 0

[tkreuzer] 49076: [CMAKE] Disable PSEH for MSVC
by tkreuzer＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: tkreuzer Date: Sat Oct 9 16:23:07 2010 New Revision: 49076 URL: http://svn.reactos.org/svn/reactos?rev=49076&view=rev Log: [CMAKE] Disable PSEH for MSVC Modified: branches/cmake-bringup/lib/pseh/CMakeLists.txt Modified: branches/cmake-bringup/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/pseh/CMakeLis… ============================================================================== --- branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] Sat Oct 9 16:23:07 2010 @@ -1,3 +1,5 @@ + +if(NOT MSVC) list(APPEND SOURCE framebased.c) @@ -15,3 +17,4 @@ add_library(pseh ${SOURCE}) add_dependencies(pseh psdk) +endif()

1 0

[tkreuzer] 49075: [CMAKE] Apply a custom script for MSVC to work around cmakes's WDK incompatibility.
by tkreuzer＠svn.reactos.org 09 Oct '10

09 Oct '10

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")

1 0

[spetreolle] 49074: [CMAKE] Fix winebuild link on unix.
by spetreolle＠svn.reactos.org 09 Oct '10

09 Oct '10

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)

1 0

[akhaldi] 49073: [CMAKE] - Fix libmpg123 and add it to build.
by akhaldi＠svn.reactos.org 09 Oct '10

09 Oct '10

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)

1 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 09 Oct '10

09 Oct '10

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)

1 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 09 Oct '10

09 Oct '10

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 */

1 0

[akhaldi] 49070: [CMAKE] - Apply the linker script to freeldr.
by akhaldi＠svn.reactos.org 09 Oct '10

09 Oct '10

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)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs