Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 50172: [CMAKE] - add regtest.cmd to reactos.cab
by jgardou＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: jgardou Date: Mon Dec 27 21:05:32 2010 New Revision: 50172 URL: http://svn.reactos.org/svn/reactos?rev=50172&view=rev Log: [CMAKE] - add regtest.cmd to reactos.cab 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] Mon Dec 27 21:05:32 2010 @@ -267,3 +267,6 @@ add_livecd_target(setupldr loader) add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) + +#regtest +add_cab(${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/regtest.cmd 7)

1 0

[akhaldi] 50171: [CMAKE] - Improve amd64 toolchain support.
by akhaldi＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: akhaldi Date: Mon Dec 27 20:10:40 2010 New Revision: 50171 URL: http://svn.reactos.org/svn/reactos?rev=50171&view=rev Log: [CMAKE] - Improve amd64 toolchain support. Added: branches/cmake-bringup/config-amd64.cmake Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/gcc.cmake branches/cmake-bringup/toolchain-mingw32.cmake 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] Mon Dec 27 20:10:40 2010 @@ -3,48 +3,56 @@ project(REACTOS) # Compile options -include(config.cmake) +if(ARCH MATCHES i386) + include(config.cmake) +elseif(ARCH MATCHES amd64) + include(config-amd64.cmake) +endif() if(NOT CMAKE_CROSSCOMPILING) -add_definitions(-DTARGET_i386) -if(MSVC) -add_definitions(-Dinline=__inline) -endif() - -include_directories( - ${REACTOS_SOURCE_DIR}/tools/unicode - include - include/host - include/reactos - include/reactos/wine - ${REACTOS_BINARY_DIR}/include) - -add_subdirectory(tools) -add_subdirectory(lib) - -if(NOT MSVC) -export(TARGETS widl nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + if(ARCH MATCHES i386) + add_definitions(-DTARGET_i386) + if(MSVC) + add_definitions(-Dinline=__inline) + endif() + elseif(ARCH MATCHES amd64) + add_definitions(-DTARGET_amd64) + endif() + + include_directories( + ${REACTOS_SOURCE_DIR}/tools/unicode + include + include/host + include/reactos + include/reactos/wine + ${REACTOS_BINARY_DIR}/include) + + add_subdirectory(tools) + add_subdirectory(lib) + + if(NOT MSVC) + export(TARGETS widl nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + else() + export(TARGETS nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + endif() + else() -export(TARGETS nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) -endif() - -else() - -if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) - set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) -endif() - -set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") -include(${IMPORT_EXECUTABLES}) + + if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) + set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) + endif() + + set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") + include(${IMPORT_EXECUTABLES}) endif(NOT CMAKE_CROSSCOMPILING) # Compiler specific definitions and macros if(MSVC) -include(msc.cmake) + include(msc.cmake) else() -include(gcc.cmake) + include(gcc.cmake) endif(MSVC) # Generic macros @@ -65,147 +73,154 @@ if(CMAKE_CROSSCOMPILING) -#Some cleanup -file(REMOVE - ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt - ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt - ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt - ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt - ${REACTOS_BINARY_DIR}/boot/ros_cab.txt - ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt) - -#Some useful variables -set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") -set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") - -# Activate support for assembly source files -enable_language(ASM) - -# Activate language support for resource files -enable_language(RC) - - -if(DBG) -add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) -else() -add_definitions(-DDBG=0) -endif(DBG) - -if(KDBG) -add_definitions(-DKDBG=1) -else() -add_definitions(-DKDBG=0) -endif(KDBG) - -# Version Options -add_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_WIN32_WINDOWS=0x502 -D_SETUPAPI_VER=0x502) - -# Arch Options -add_definitions(-D_M_IX86 -D_X86_ -D__i386__) - -# Other -add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T) - -include_directories( - include - include/psdk - include/dxsdk - ${REACTOS_BINARY_DIR}/include - ${REACTOS_BINARY_DIR}/include/dxsdk - ${REACTOS_BINARY_DIR}/include/psdk - ${REACTOS_BINARY_DIR}/include/reactos - include/crt - include/ddk - include/ndk - include/reactos - include/reactos/libs) - -if(MSVC) -include_directories(include/crt/msc) -else() -include_directories(include/crt/mingw32) -endif(MSVC) - -add_subdirectory(include/psdk) -add_subdirectory(include/dxsdk) -add_subdirectory(include/reactos/idl) -add_subdirectory(include/reactos/wine) -add_subdirectory(include/reactos/mc) -add_subdirectory(include/asm) - -include(baseaddress.cmake) - -add_subdirectory(base) -add_subdirectory(boot) -add_subdirectory(dll) -add_subdirectory(drivers) -add_subdirectory(hal) -add_subdirectory(lib) -add_subdirectory(media) -add_subdirectory(modules) -add_subdirectory(ntoskrnl) -add_subdirectory(subsystems) - -# nci generated intermediate files - -list(APPEND nci_output - ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h - ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S - ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S - ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S - ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) - -list(APPEND nci_folders - ${CMAKE_CURRENT_BINARY_DIR}/dll/ntdll/def - ${CMAKE_CURRENT_BINARY_DIR}/lib/ntdllsys/ntdll - ${CMAKE_CURRENT_BINARY_DIR}/lib/win32ksys - ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/include/internal - ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/ex - ${CMAKE_CURRENT_BINARY_DIR}/subsystems/win32/win32k/include) - -file(MAKE_DIRECTORY ${nci_folders}) - -add_custom_command( - OUTPUT ${nci_output} - COMMAND native-nci -arch ${ARCH} ${REACTOS_SOURCE_DIR}/ntoskrnl/sysfuncs.lst ${REACTOS_SOURCE_DIR}/subsystems/win32/win32k/w32ksvc.db ${nci_output} - DEPENDS native-nci ${nci_folders}) - -set_source_files_properties(${nci_output} PROPERTIES GENERATED TRUE) - -add_custom_target(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) -add_custom_target(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) -add_custom_target(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) -add_custom_target(kernel_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h) -add_custom_target(subsystem_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h) -add_custom_target(kernel_zw ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S) - -file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) - -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h - COMMAND native-buildno ${REACTOS_BINARY_DIR}/include/reactos/buildno.h - DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h) - -add_custom_target(buildno_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) - -file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib) - -list(APPEND OUTPUT_FILES - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib8gen.c - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib16gen.c - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib32gen.c) - -add_custom_command( - OUTPUT ${OUTPUT_FILES} - COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib - DEPENDS native-gendib) - -add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES}) - -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) - -#bootcd and livecd -include(ros_cd.cmake) + #Some cleanup + file(REMOVE + ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt + ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt + ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt + ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt + ${REACTOS_BINARY_DIR}/boot/ros_cab.txt + ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt) + + #Some useful variables + set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") + set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") + + # Activate support for assembly source files + enable_language(ASM) + + # Activate language support for resource files + enable_language(RC) + + if(DBG) + add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) + else() + add_definitions(-DDBG=0) + endif() + + if(KDBG) + add_definitions(-DKDBG=1) + else() + add_definitions(-DKDBG=0) + endif() + + # Version Options + add_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_WIN32_WINDOWS=0x502 -D_SETUPAPI_VER=0x502) + + # Arch Options + if(ARCH MATCHES i386) + add_definitions(-D_M_IX86 -D_X86_ -D__i386__) + elseif(ARCH MATCHES amd64) + add_definitions(-D_M_AMD64 -D_AMD64_ -D_M_AXP64 -D__x86_64__ -D_WIN64) + endif() + + # Other + if(ARCH MATCHES i386) + add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T) + elseif(ARCH MATCHES amd64) + add_definitions(-DUSE_COMPILER_EXCEPTIONS -DNO_UNDERSCORE_PREFIX) + endif() + + include_directories( + include + include/psdk + include/dxsdk + ${REACTOS_BINARY_DIR}/include + ${REACTOS_BINARY_DIR}/include/dxsdk + ${REACTOS_BINARY_DIR}/include/psdk + ${REACTOS_BINARY_DIR}/include/reactos + include/crt + include/ddk + include/ndk + include/reactos + include/reactos/libs) + + if(MSVC) + include_directories(include/crt/msc) + else() + include_directories(include/crt/mingw32) + endif() + + add_subdirectory(include/psdk) + add_subdirectory(include/dxsdk) + add_subdirectory(include/reactos/idl) + add_subdirectory(include/reactos/wine) + add_subdirectory(include/reactos/mc) + add_subdirectory(include/asm) + + include(baseaddress.cmake) + + add_subdirectory(base) + add_subdirectory(boot) + add_subdirectory(dll) + add_subdirectory(drivers) + add_subdirectory(hal) + add_subdirectory(lib) + add_subdirectory(media) + add_subdirectory(modules) + add_subdirectory(ntoskrnl) + add_subdirectory(subsystems) + + # nci generated intermediate files + + list(APPEND nci_output + ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h + ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h + ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S + ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S + ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S + ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) + + list(APPEND nci_folders + ${CMAKE_CURRENT_BINARY_DIR}/dll/ntdll/def + ${CMAKE_CURRENT_BINARY_DIR}/lib/ntdllsys/ntdll + ${CMAKE_CURRENT_BINARY_DIR}/lib/win32ksys + ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/include/internal + ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/ex + ${CMAKE_CURRENT_BINARY_DIR}/subsystems/win32/win32k/include) + + file(MAKE_DIRECTORY ${nci_folders}) + + add_custom_command( + OUTPUT ${nci_output} + COMMAND native-nci -arch ${ARCH} ${REACTOS_SOURCE_DIR}/ntoskrnl/sysfuncs.lst ${REACTOS_SOURCE_DIR}/subsystems/win32/win32k/w32ksvc.db ${nci_output} + DEPENDS native-nci ${nci_folders}) + + set_source_files_properties(${nci_output} PROPERTIES GENERATED TRUE) + + add_custom_target(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) + add_custom_target(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) + add_custom_target(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) + add_custom_target(kernel_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h) + add_custom_target(subsystem_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h) + add_custom_target(kernel_zw ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S) + + file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) + + add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h + COMMAND native-buildno ${REACTOS_BINARY_DIR}/include/reactos/buildno.h + DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h) + + add_custom_target(buildno_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) + + file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib) + + list(APPEND OUTPUT_FILES + ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib8gen.c + ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib16gen.c + ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib32gen.c) + + add_custom_command( + OUTPUT ${OUTPUT_FILES} + COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib + DEPENDS native-gendib) + + add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES}) + + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) + + #bootcd and livecd + include(ros_cd.cmake) endif() 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] Mon Dec 27 20:10:40 2010 @@ -241,10 +241,15 @@ macro(add_idl_interface IDL_FILE) custom_incdefs() + if(ARCH MATCHES i386) + set(platform_flags "-m32 --win32") + elseif(ARCH MATCHES amd64) + set(platform_flags "-m64 --win64") + endif() get_filename_component(FILE ${IDL_FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${platform_flags} -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} DEPENDS ${IDL_FILE}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE) endmacro() Added: branches/cmake-bringup/config-amd64.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/config-amd64.cmak… ============================================================================== --- branches/cmake-bringup/config-amd64.cmake (added) +++ branches/cmake-bringup/config-amd64.cmake [iso-8859-1] Mon Dec 27 20:10:40 2010 @@ -1,0 +1,43 @@ + +set(SARCH "" CACHE STRING +"Sub-architecture to build for.") + +set(OARCH "athlon64" CACHE STRING +"Generate instructions for this CPU type. Specify one of: + k8 opteron athlon64 athlon-fx") + +set (OPTIMIZE "1" CACHE STRING +"What level of optimisation to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = -Os + 3 = -O1 + 4 = -O2 + 5 = -O3") + +set(DBG TRUE CACHE BOOL +"Whether to compile for debugging.") + +set(KDBG FALSE CACHE BOOL +"Whether to compile in the integrated kernel debugger.") + +set(GDB FALSE CACHE BOOL +"Whether to compile for debugging with GDB. +If you don't use GDB, don't enable this.") + +set(_WINKD_ TRUE CACHE BOOL +"Whether to compile with the KD protocol.") + +set(_ELF_ FALSE CACHE BOOL +"Whether to compile support for ELF files. +Do not enable unless you know what you're doing.") + +set(NSWPAT FALSE CACHE BOOL +"Whether to compile apps/libs with features covered software patents or not. +If you live in a country where software patents are valid/apply, don't +enable this (except they/you purchased a license from the patent owner). +This settings is disabled (0) by default.") + +set(USERMODE TRUE CACHE BOOL +"Whether to compile any usermode parts. This is while kernel mode is under + heavy development and usermode part not relevant for bootcd.") Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=501… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Dec 27 20:10:40 2010 @@ -24,16 +24,29 @@ add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) # Tuning -add_definitions(-march=pentium -mtune=i686) +if(ARCH MATCHES i386) + add_definitions(-march=${OARCH} -mtune=${TUNE}) +elseif(ARCH MATCHES amd64) + add_definitions(-march=${OARCH}) +endif() # Warnings add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch) # Optimizations -add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) +if(ARCH MATCHES i386) + add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) +elseif(ARCH MATCHES amd64) + add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=4) +endif() + +# Other +if(ARCH MATCHES amd64) +add_definitions(-U_X86_ -UWIN32) +endif() # Macros -MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) +macro(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) # Add the precompiled header to the build get_filename_component(FILE ${_header_filename} NAME) set(_gch_filename "${_target_name}_${FILE}.gch") @@ -43,7 +56,7 @@ get_directory_property(DIRINC INCLUDE_DIRECTORIES) foreach(item ${DIRINC}) list(APPEND ${_out_compile_flags} -I${item}) - endforeach(item) + endforeach() # This is a particular bit of undocumented/hacky magic I'm quite proud of get_directory_property(_compiler_flags DEFINITIONS) @@ -55,11 +68,11 @@ if (_target_defs) foreach(item ${_target_defs}) list(APPEND ${_out_compile_flags} -D${item}) - endforeach(item) - endif() -ENDMACRO(_PCH_GET_COMPILE_FLAGS) - -MACRO(add_pch _target_name _header_filename _src_list) + endforeach() + endif() +endmacro() + +macro(add_pch _target_name _header_filename _src_list) get_filename_component(FILE ${_header_filename} NAME) set(_gch_filename "${_target_name}_${FILE}.gch") list(APPEND ${_src_list} ${_gch_filename}) @@ -69,7 +82,7 @@ OUTPUT ${_gch_filename} COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} DEPENDS ${_header_filename}) -ENDMACRO(add_pch _target_name _header_filename _src_list) +endmacro() macro(add_linkerflag MODULE _flag) set(NEW_LINKER_FLAGS ${_flag}) @@ -99,11 +112,10 @@ macro(set_module_type MODULE TYPE) add_dependencies(${MODULE} psdk buildno_header) - if(${IS_CPP}) - target_link_libraries(${MODULE} stlport -lsupc++ -lgcc) - endif() - + target_link_libraries(${MODULE} stlport -lsupc++ -lgcc) + endif() + if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) set_entrypoint(${MODULE} NtProcessStartup@4) @@ -115,7 +127,7 @@ else() target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_common) + target_link_libraries(${MODULE} mingw_common) elseif(${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) set_entrypoint(${MODULE} mainCRTStartup) @@ -124,15 +136,15 @@ else() target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_common) + target_link_libraries(${MODULE} mingw_common) elseif(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) - if(DEFINED baseaddress_${MODULE}) - set_image_base(${MODULE} ${baseaddress_${MODULE}}) - else() - message(STATUS "${MODULE} has no base address") - endif() + if(DEFINED baseaddress_${MODULE}) + set_image_base(${MODULE} ${baseaddress_${MODULE}}) + else() + message(STATUS "${MODULE} has no base address") + endif() elseif(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) @@ -142,14 +154,14 @@ target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") elseif(${TYPE} MATCHES kernelmodedriver) - set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") - set_entrypoint(${MODULE} DriverEntry@8) - set_subsystem(${MODULE} native) + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") + set_entrypoint(${MODULE} DriverEntry@8) + set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) - add_dependencies(${MODULE} bugcodes) + add_dependencies(${MODULE} bugcodes) elseif(${TYPE} MATCHES nativedll) set_subsystem(${MODULE} native) - else() + else() message(FATAL_ERROR "Unknown module type : ${TYPE}") endif() endmacro() @@ -166,18 +178,24 @@ foreach(arg ${defines}) set(rc_result_defs "${rc_result_defs} -D${arg}") - endforeach(arg ${defines}) + endforeach() foreach(arg ${includes}) set(rc_result_incs "-I${arg} ${rc_result_incs}") - endforeach(arg ${includes}) + endforeach() set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>") endmacro() #idl files support set(IDL_COMPILER native-widl) -set(IDL_FLAGS -m32 --win32) + +if(ARCH MATCHES i386) + set(IDL_FLAGS -m32 --win32) +elseif(ARCH MATCHES amd64) + set(IDL_FLAGS -m64 --win64) +endif() + set(IDL_HEADER_ARG -h -H) #.h set(IDL_TYPELIB_ARG -t -T) #.tlb set(IDL_SERVER_ARG -s -S) #.c for server library Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Mon Dec 27 20:10:40 2010 @@ -34,7 +34,12 @@ set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") set(CMAKE_IDL_COMPILER native-widl) +if(ARCH MATCHES i386) set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <SOURCE>") +elseif(ARCH MATCHES amd64) +set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m64 --win64 -h -H <OBJECT> <SOURCE>") +endif() + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") set(CMAKE_C_CREATE_STATIC_LIBRARY "${MINGW_PREFIX}ar crs <TARGET> <LINK_FLAGS> <OBJECTS>")

1 0

[tkreuzer] 50170: [CMAKE] Fix a definition in svcctl.idl (MSVC)
by tkreuzer＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: tkreuzer Date: Mon Dec 27 18:44:31 2010 New Revision: 50170 URL: http://svn.reactos.org/svn/reactos?rev=50170&view=rev Log: [CMAKE] Fix a definition in svcctl.idl (MSVC) Modified: branches/cmake-bringup/include/reactos/idl/svcctl.idl Modified: branches/cmake-bringup/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] Mon Dec 27 18:44:31 2010 @@ -434,7 +434,7 @@ /* Function 17 */ DWORD RQueryServiceConfigW( [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + [out, size_is(cbBufSize)] LPBYTE lpServiceConfig, /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); @@ -546,7 +546,7 @@ /* Function 29 */ DWORD RQueryServiceConfigA( [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + [out, size_is(cbBufSize)] LPBYTE lpServiceConfig, /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded);

1 0

[akhaldi] 50169: [CMAKE] - Improve formatting.
by akhaldi＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: akhaldi Date: Mon Dec 27 18:29:10 2010 New Revision: 50169 URL: http://svn.reactos.org/svn/reactos?rev=50169&view=rev Log: [CMAKE] - Improve formatting. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Mon Dec 27 18:29:10 2010 @@ -1,41 +1,43 @@ if(NOT ARCH) -set(ARCH i386) -endif(NOT ARCH) + set(ARCH i386) +endif() # Choose the right MinGW prefix if(ARCH MATCHES i386) -if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) -set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") -else() -set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") -endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") + else() + set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") + endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) elseif(ARCH MATCHES amd64) -set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") -endif(ARCH MATCHES i386) + set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") +endif() if(ENABLE_CCACHE) -set(CCACHE "ccache" CACHE STRING "ccache") + set(CCACHE "ccache" CACHE STRING "ccache") else() -set(CCACHE "" CACHE STRING "ccache") + set(CCACHE "" CACHE STRING "ccache") endif() # the name of the target operating system -SET(CMAKE_SYSTEM_NAME Windows) -SET(CMAKE_SYSTEM_PROCESSOR i686) +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR i686) # which compilers to use for C and C++ -SET(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc) -SET(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++) -SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) -SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) -SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -SET(CMAKE_IDL_COMPILER native-widl) +set(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc) +set(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++) +set(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) +set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") +set(CMAKE_IDL_COMPILER native-widl) -SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <SOURCE>") -SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") +set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <SOURCE>") +set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") + +set(CMAKE_C_CREATE_STATIC_LIBRARY "${MINGW_PREFIX}ar crs <TARGET> <LINK_FLAGS> <OBJECTS>") # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") @@ -44,11 +46,11 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") if(ARCH MATCHES i386) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds elseif(ARCH MATCHES amd64) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") -endif(ARCH MATCHES i386) + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") +endif() # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search @@ -56,4 +58,3 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -

1 0

[fireball] 50168: [FASTFAT_NEW] - Some fixes to the previous commit.
by fireball＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: fireball Date: Mon Dec 27 18:14:24 2010 New Revision: 50168 URL: http://svn.reactos.org/svn/reactos?rev=50168&view=rev Log: [FASTFAT_NEW] - Some fixes to the previous commit. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Mon Dec 27 18:14:24 2010 @@ -1106,6 +1106,9 @@ Status = STATUS_SUCCESS; else Status = STATUS_UNMAPPABLE_CHARACTER; + + /* First run init is done */ + FirstRun = FALSE; } else { @@ -1158,8 +1161,9 @@ UNIMPLEMENTED; } - /* Check, if path is a directory or a file */ + /* Check, if path is a existing directory or file */ if (FfError == FF_ERR_FILE_OBJECT_IS_A_DIR || + FfError == FF_ERR_FILE_ALREADY_OPEN || FfError == FF_ERR_NONE) { if (FfError == FF_ERR_FILE_OBJECT_IS_A_DIR) @@ -1266,7 +1270,18 @@ } /* We come here only in the case when a new file is created */ - ASSERT(FALSE); + //ASSERT(FALSE); + DPRINT1("TODO: Create a new file/directory, called '%wZ'\n", &IrpSp->FileObject->FileName); + + Status = STATUS_NOT_IMPLEMENTED; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, Status); + + return Status; } NTSTATUS

1 0

[pschweitzer] 50167: [FASTFAT] MagicValue--; ThanksTo(James, Amine); /* EOF */
by pschweitzer＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: pschweitzer Date: Mon Dec 27 18:11:35 2010 New Revision: 50167 URL: http://svn.reactos.org/svn/reactos?rev=50167&view=rev Log: [FASTFAT] MagicValue--; ThanksTo(James, Amine); /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/vfat.h trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Mon Dec 27 18:11:35 2010 @@ -152,7 +152,7 @@ ASSERT(NULL != DeviceExt); ASSERT(NULL != BasicInfo); /* Check volume label bit */ - ASSERT(0 == (*FCB->Attributes & 0x08)); + ASSERT(0 == (*FCB->Attributes & _A_VOLID)); if (FCB->Flags & FCB_IS_FATX_ENTRY) { Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Mon Dec 27 18:11:35 2010 @@ -2,6 +2,7 @@ #include <bugcodes.h> #include <ntdddisk.h> #include <debug.h> +#include <dos.h> #define USE_ROS_CC_AND_FS Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Mon Dec 27 18:11:35 2010 @@ -216,7 +216,7 @@ { RtlCopyMemory(VolumeLabelDirEntry.FatX.Filename, cString, LabelLen); memset(&VolumeLabelDirEntry.FatX.Filename[LabelLen], ' ', 42 - LabelLen); - VolumeLabelDirEntry.FatX.Attrib = 0x08; + VolumeLabelDirEntry.FatX.Attrib = _A_VOLID; } else { @@ -230,7 +230,7 @@ { memset(&VolumeLabelDirEntry.Fat.Filename[LabelLen], ' ', sizeof(VolumeLabelDirEntry.Fat.Filename) - LabelLen); } - VolumeLabelDirEntry.Fat.Attrib = 0x08; + VolumeLabelDirEntry.Fat.Attrib = _A_VOLID; } pRootFcb = vfatOpenRootFCB(DeviceExt);

1 0

[tkreuzer] 50166: [PSEH] Allow configuration of native SEH vs PSEH vs dummy PSEH with macro definitions (USE_NATIVE_SEH, USE_DUMMY_PSEH)
by tkreuzer＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: tkreuzer Date: Mon Dec 27 17:55:53 2010 New Revision: 50166 URL: http://svn.reactos.org/svn/reactos?rev=50166&view=rev Log: [PSEH] Allow configuration of native SEH vs PSEH vs dummy PSEH with macro definitions (USE_NATIVE_SEH, USE_DUMMY_PSEH) Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Mon Dec 27 17:55:53 2010 @@ -19,16 +19,37 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef _M_AMD64 -#include "pseh2_64.h" -#else #ifndef KJK_PSEH2_H_ #define KJK_PSEH2_H_ -#if !defined (__arm__) && !defined(__clang__) - -#if defined(__GNUC__) +#if defined(USE_DUMMY_PSEH) || defined (__arm__) || defined(__clang__) || defined(_M_AMD64) + +#define _SEH2_TRY { +#define _SEH2_FINALLY } { +#define _SEH2_EXCEPT(...) } if (0) { +#define _SEH2_END } +#define _SEH2_GetExceptionInformation() +#define _SEH2_GetExceptionCode() 0 +#define _SEH2_AbnormalTermination() +#define _SEH2_YIELD(STMT_) STMT_ +#define _SEH2_LEAVE + +#elif defined(USE_NATIVE_SEH) || defined(_MSC_VER) + +#include <excpt.h> +#define _SEH2_TRY __try +#define _SEH2_FINALLY __finally +#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) +#define _SEH2_END +#define _SEH2_GetExceptionInformation() (GetExceptionInformation()) +#define _SEH2_GetExceptionCode() (GetExceptionCode()) +#define _SEH2_AbnormalTermination() (AbnormalTermination()) +#define _SEH2_YIELD(STMT_) STMT_ +#define _SEH2_LEAVE __leave + +#elif defined(__GNUC__) + struct _EXCEPTION_RECORD; struct _EXCEPTION_POINTERS; struct _CONTEXT; @@ -76,8 +97,7 @@ _SEH2HandleTryLevel_t; #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif extern int __cdecl _SEH2EnterFrameAndTrylevel(_SEH2Frame_t *, volatile _SEH2TryLevel_t *); @@ -369,41 +389,11 @@ __SEH_END_SCOPE_CHAIN; + #else - -#include <excpt.h> - -#define _SEH2_TRY __try -#define _SEH2_FINALLY __finally -#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) -#define _SEH2_END - -#define _SEH2_GetExceptionInformation() (GetExceptionInformation()) -#define _SEH2_GetExceptionCode() (GetExceptionCode()) -#define _SEH2_AbnormalTermination() (AbnormalTermination()) - -#define _SEH2_YIELD(STMT_) STMT_ -#define _SEH2_LEAVE __leave - +#error no PSEH support #endif -#else - -#define _SEH2_TRY { -#define _SEH2_FINALLY } { -#define _SEH2_EXCEPT(...) } if (0) { -#define _SEH2_END } - -#define _SEH2_GetExceptionInformation() -#define _SEH2_GetExceptionCode() 0 -#define _SEH2_AbnormalTermination() - -#define _SEH2_YIELD(STMT_) STMT_ -#define _SEH2_LEAVE - -#endif - -#endif -#endif +#endif /* !KJK_PSEH2_H_ */ /* EOF */

1 0

[akhaldi] 50165: [CRT] - Add missing _A_VOLID definition.
by akhaldi＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: akhaldi Date: Mon Dec 27 17:51:08 2010 New Revision: 50165 URL: http://svn.reactos.org/svn/reactos?rev=50165&view=rev Log: [CRT] - Add missing _A_VOLID definition. Modified: trunk/reactos/include/crt/dos.h Modified: trunk/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dos.h?rev=5016… ============================================================================== --- trunk/reactos/include/crt/dos.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dos.h [iso-8859-1] Mon Dec 27 17:51:08 2010 @@ -30,8 +30,9 @@ #define _A_RDONLY 0x01 #define _A_HIDDEN 0x02 #define _A_SYSTEM 0x04 +#define _A_VOLID 0x08 #define _A_SUBDIR 0x10 -#define _A_ARCH 0x20 +#define _A_ARCH 0x20 #ifndef _GETDISKFREE_DEFINED #define _GETDISKFREE_DEFINED

1 0

[fireball] 50164: [FASTFAT_NEW] - Substantially improve FatiCreate routine, to handle previously unhandled cases, fix wrong code structure in some places, add a stub for further implementation of a...
by fireball＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: fireball Date: Mon Dec 27 16:49:21 2010 New Revision: 50164 URL: http://svn.reactos.org/svn/reactos?rev=50164&view=rev Log: [FASTFAT_NEW] - Substantially improve FatiCreate routine, to handle previously unhandled cases, fix wrong code structure in some places, add a stub for further implementation of a new file creation branch. - Hackskip setting delay-on-close for a file for now (with a debug print reminder!) Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c trunk/reactos/drivers/filesystems/fastfat_new/create.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] Mon Dec 27 16:49:21 2010 @@ -221,7 +221,8 @@ Fcb->Condition == FcbGood) { /* Yes, a delayed one */ - SetFlag(Fcb->State, FCB_STATE_DELAY_CLOSE); + //SetFlag(Fcb->State, FCB_STATE_DELAY_CLOSE); + DPRINT1("Setting a delay on close for some reason for FCB %p, FF handle %p, file name '%wZ'\n", Fcb, Fcb->FatHandle, &Fcb->FullFileName); } /* Unlock all file locks */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Mon Dec 27 16:49:21 2010 @@ -522,7 +522,7 @@ NTSTATUS Status; IO_STATUS_BLOCK Iosb; PIO_STACK_LOCATION IrpSp; - BOOLEAN EndBackslash = FALSE, OpenedAsDos; + BOOLEAN EndBackslash = FALSE, OpenedAsDos, FirstRun = TRUE; UNICODE_STRING RemainingPart, FirstName, NextName, FileNameUpcased; OEM_STRING AnsiFirstName; FF_ERROR FfError; @@ -592,6 +592,13 @@ if (RelatedFO) FileObject->Vpb = RelatedFO->Vpb; + /* Reject open by id */ + if (Options & FILE_OPEN_BY_FILE_ID) + { + FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_PARAMETER); + return STATUS_INVALID_PARAMETER; + } + /* Prepare file attributes mask */ FileAttributes &= (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | @@ -652,12 +659,22 @@ DPRINT1("This volume is locked\n"); Status = STATUS_ACCESS_DENIED; + /* Set volume dismount status */ + if (Vcb->Condition != VcbGood) + Status = STATUS_VOLUME_DISMOUNTED; + /* Cleanup and return */ FatReleaseVcb(IrpContext, Vcb); + FatCompleteRequest(IrpContext, Irp, Status); return Status; } - // TODO: Check if the volume is write protected and disallow DELETE_ON_CLOSE + /* Check if the volume is write protected and disallow DELETE_ON_CLOSE */ + if (DeleteOnClose & FlagOn(Vcb->State, VCB_STATE_FLAG_WRITE_PROTECTED)) + { + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; + } // TODO: Make sure EAs aren't supported on FAT32 @@ -716,18 +733,24 @@ { DPRINT1("Invalid file object!\n"); + Status = STATUS_OBJECT_PATH_NOT_FOUND; + /* Cleanup and return */ FatReleaseVcb(IrpContext, Vcb); - return STATUS_OBJECT_PATH_NOT_FOUND; + FatCompleteRequest(IrpContext, Irp, Status); + return Status; } /* File path must be relative */ if (FileName.Length != 0 && FileName.Buffer[0] == L'\\') { + Status = STATUS_OBJECT_NAME_INVALID; + /* The name is absolute, fail */ FatReleaseVcb(IrpContext, Vcb); - return STATUS_OBJECT_NAME_INVALID; + FatCompleteRequest(IrpContext, Irp, Status); + return Status; } /* Make sure volume is the same */ @@ -751,18 +774,34 @@ if (NonDirectoryFile) { DPRINT1("Trying to open root dir as a file\n"); + Status = STATUS_FILE_IS_A_DIRECTORY; /* Cleanup and return */ FatReleaseVcb(IrpContext, Vcb); - return STATUS_FILE_IS_A_DIRECTORY; + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + } + + /* Check for target directory on a root dir */ + if (OpenTargetDirectory) + { + Status = STATUS_INVALID_PARAMETER; + + /* Cleanup and return */ + FatReleaseVcb(IrpContext, Vcb); + FatCompleteRequest(IrpContext, Irp, Status); + return Status; } /* Check delete on close on a root dir */ if (DeleteOnClose) { + Status = STATUS_CANNOT_DELETE; + /* Cleanup and return */ FatReleaseVcb(IrpContext, Vcb); - return STATUS_CANNOT_DELETE; + FatCompleteRequest(IrpContext, Irp, Status); + return Status; } /* Call root directory open routine */ @@ -777,6 +816,7 @@ /* Cleanup and return */ FatReleaseVcb(IrpContext, Vcb); + FatCompleteRequest(IrpContext, Irp, Iosb.Status); return Iosb.Status; } else @@ -908,6 +948,27 @@ { ASSERT(FALSE); } + } + + /* Treat page file in a special way */ + if (IsPagingFile) + { + UNIMPLEMENTED; + // FIXME: System file too + } + + /* Make sure there is no pending delete on a higher-level FCB */ + if (Fcb->State & FCB_STATE_DELETE_ON_CLOSE) + { + Iosb.Status = STATUS_DELETE_PENDING; + + /* Cleanup and return */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + + return Iosb.Status; } /* We have a valid FCB now */ @@ -1038,23 +1099,34 @@ ParentDcb = Fcb; while (TRUE) { - FsRtlDissectName(RemainingPart, &FirstName, &RemainingPart); - - /* Check for validity */ - if ((RemainingPart.Length && RemainingPart.Buffer[0] == L'\\') || - (NextName.Length > 255 * sizeof(WCHAR))) - { - /* The name is invalid */ - DPRINT1("Invalid name found\n"); - Iosb.Status = STATUS_OBJECT_NAME_INVALID; - ASSERT(FALSE); - } - - /* Convert the name to ANSI */ - AnsiFirstName.Buffer = ExAllocatePool(PagedPool, FirstName.Length); - AnsiFirstName.Length = 0; - AnsiFirstName.MaximumLength = FirstName.Length; - Status = RtlUpcaseUnicodeStringToCountedOemString(&AnsiFirstName, &FirstName, FALSE); + if (FirstRun) + { + RemainingPart = NextName; + if (AnsiFirstName.Length) + Status = STATUS_SUCCESS; + else + Status = STATUS_UNMAPPABLE_CHARACTER; + } + else + { + FsRtlDissectName(RemainingPart, &FirstName, &RemainingPart); + + /* Check for validity */ + if ((RemainingPart.Length && RemainingPart.Buffer[0] == L'\\') || + (NextName.Length > 255 * sizeof(WCHAR))) + { + /* The name is invalid */ + DPRINT1("Invalid name found\n"); + Iosb.Status = STATUS_OBJECT_NAME_INVALID; + ASSERT(FALSE); + } + + /* Convert the name to ANSI */ + AnsiFirstName.Buffer = ExAllocatePool(PagedPool, FirstName.Length); + AnsiFirstName.Length = 0; + AnsiFirstName.MaximumLength = FirstName.Length; + Status = RtlUpcaseUnicodeStringToCountedOemString(&AnsiFirstName, &FirstName, FALSE); + } if (!NT_SUCCESS(Status)) { @@ -1087,90 +1159,114 @@ } /* Check, if path is a directory or a file */ - if (FfError == FF_ERR_FILE_OBJECT_IS_A_DIR) - { - if (NonDirectoryFile) - { - DPRINT1("Can't open dir as a file\n"); + if (FfError == FF_ERR_FILE_OBJECT_IS_A_DIR || + FfError == FF_ERR_NONE) + { + if (FfError == FF_ERR_FILE_OBJECT_IS_A_DIR) + { + if (NonDirectoryFile) + { + DPRINT1("Can't open dir as a file\n"); + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + Iosb.Status = STATUS_FILE_IS_A_DIRECTORY; + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + return Iosb.Status; + } + + /* Open this directory */ + Iosb = FatiOpenExistingDir(IrpContext, + FileObject, + Vcb, + ParentDcb, + DesiredAccess, + ShareAccess, + AllocationSize, + EaBuffer, + EaLength, + FileAttributes, + CreateDisposition, + DeleteOnClose); + + Irp->IoStatus.Information = Iosb.Information; /* Unlock VCB */ FatReleaseVcb(IrpContext, Vcb); /* Complete the request */ - Iosb.Status = STATUS_FILE_IS_A_DIRECTORY; FatCompleteRequest(IrpContext, Irp, Iosb.Status); + return Iosb.Status; } - - /* Open this directory */ - Iosb = FatiOpenExistingDir(IrpContext, - FileObject, - Vcb, - ParentDcb, - DesiredAccess, - ShareAccess, - AllocationSize, - EaBuffer, - EaLength, - FileAttributes, - CreateDisposition, - DeleteOnClose); - - Irp->IoStatus.Information = Iosb.Information; - - /* Unlock VCB */ - FatReleaseVcb(IrpContext, Vcb); - - /* Complete the request */ - FatCompleteRequest(IrpContext, Irp, Iosb.Status); - - return Iosb.Status; - } - - /* If end backslash here, then it's definately not permitted, - since we're opening files here */ - if (EndBackslash) - { - /* Unlock VCB */ - FatReleaseVcb(IrpContext, Vcb); - - /* Complete the request */ - Iosb.Status = STATUS_OBJECT_NAME_INVALID; - FatCompleteRequest(IrpContext, Irp, Iosb.Status); - return Iosb.Status; - } - - /* Try to open the file */ - Iosb = FatiOpenExistingFile(IrpContext, - FileObject, - Vcb, - ParentDcb, - DesiredAccess, - ShareAccess, - AllocationSize, - EaBuffer, - EaLength, - FileAttributes, - CreateDisposition, - FALSE, - DeleteOnClose, - OpenedAsDos); - - /* In case of success set cache supported flag */ - if (NT_SUCCESS(Iosb.Status) && !NoIntermediateBuffering) - { - SetFlag(FileObject->Flags, FO_CACHE_SUPPORTED); - } - - Irp->IoStatus.Information = Iosb.Information; - - /* Unlock VCB */ - FatReleaseVcb(IrpContext, Vcb); - - /* Complete the request */ - FatCompleteRequest(IrpContext, Irp, Iosb.Status); - - return Iosb.Status; + else + { + /* This is opening an existing file */ + if (OpenDirectory) + { + /* But caller wanted a dir */ + Status = STATUS_NOT_A_DIRECTORY; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, Status); + + return Status; + } + + /* If end backslash here, then it's definately not permitted, + since we're opening files here */ + if (EndBackslash) + { + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + Iosb.Status = STATUS_OBJECT_NAME_INVALID; + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + return Iosb.Status; + } + + /* Try to open the file */ + Iosb = FatiOpenExistingFile(IrpContext, + FileObject, + Vcb, + ParentDcb, + DesiredAccess, + ShareAccess, + AllocationSize, + EaBuffer, + EaLength, + FileAttributes, + CreateDisposition, + FALSE, + DeleteOnClose, + OpenedAsDos); + + /* In case of success set cache supported flag */ + if (NT_SUCCESS(Iosb.Status) && !NoIntermediateBuffering) + { + SetFlag(FileObject->Flags, FO_CACHE_SUPPORTED); + } + + Irp->IoStatus.Information = Iosb.Information; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + + return Iosb.Status; + } + } + + /* We come here only in the case when a new file is created */ + ASSERT(FALSE); } NTSTATUS

1 0

[jgardou] 50163: [GDI32] - Consistent formatting, no code change.
by jgardou＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: jgardou Date: Mon Dec 27 16:23:59 2010 New Revision: 50163 URL: http://svn.reactos.org/svn/reactos?rev=50163&view=rev Log: [GDI32] - Consistent formatting, no code change. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/main/dllmain.c trunk/reactos/dll/win32/gdi32/misc/gdientry.c trunk/reactos/dll/win32/gdi32/misc/heap.c trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c trunk/reactos/dll/win32/gdi32/misc/wingl.c trunk/reactos/dll/win32/gdi32/objects/arc.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/gdi32/objects/brush.c trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/eng.c trunk/reactos/dll/win32/gdi32/objects/enhmfile.c trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/dll/win32/gdi32/objects/icm.c trunk/reactos/dll/win32/gdi32/objects/linedda.c trunk/reactos/dll/win32/gdi32/objects/metafile.c trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/dll/win32/gdi32/objects/palette.c trunk/reactos/dll/win32/gdi32/objects/path.c trunk/reactos/dll/win32/gdi32/objects/pen.c trunk/reactos/dll/win32/gdi32/objects/printdrv.c trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/dll/win32/gdi32/objects/utils.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… Modified: trunk/reactos/dll/win32/gdi32/misc/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/heap.… Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… Modified: trunk/reactos/dll/win32/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/wingl… Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ar… Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/br… Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… Modified: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… Modified: trunk/reactos/dll/win32/gdi32/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ic… Modified: trunk/reactos/dll/win32/gdi32/objects/linedda.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/li… Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… Modified: trunk/reactos/dll/win32/gdi32/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… Modified: trunk/reactos/dll/win32/gdi32/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pe… Modified: trunk/reactos/dll/win32/gdi32/objects/printdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pr… Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… Modified: trunk/reactos/dll/win32/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ut…

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