Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 03/03: Search for host-tools path

by Andrew Cook

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0341ea5e7bb96fd99b3e6… commit 0341ea5e7bb96fd99b3e6c48b6afc931aaeb59a1 Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Fri Feb 15 12:33:13 2019 +1100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:39:44 2019 +0200 Search for host-tools path Allows source-relative paths --- sdk/cmake/host-tools.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 41b82d29fac..04e58f7c7bb 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -48,7 +48,12 @@ function(setup_host_tools) if(WITH_HOST_TOOLS) # Use pre-built tools, required for cross compiling with msvc # as only one target architecture is available at a time - set(HOST_TOOLS_DIR ${WITH_HOST_TOOLS}) + find_path(HOST_TOOLS_DIR + NAMES ImportExecutables.cmake + HINTS ${WITH_HOST_TOOLS} ${REACTOS_SOURCE_DIR}/${WITH_HOST_TOOLS} + NO_CMAKE_PATH + NO_CMAKE_ENVIRONMENT_PATH) + message(STATUS "Using prebuilt host tools: ${HOST_TOOLS_DIR}") include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) else() # Build host-tools. Changes to tool sources will rebuild targets

5 years, 1 month

[reactos] 02/03: Add WITH_HOST_TOOLS option

by Andrew Cook

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f67345320fdc400e2f354… commit f67345320fdc400e2f354c4eed915fee96eb01b4 Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Wed Feb 13 21:06:49 2019 +1100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:39:43 2019 +0200 Add WITH_HOST_TOOLS option Required for cross-compiling with msvc as only one target architecture is available at a time in the dev prompt --- sdk/cmake/host-tools.cmake | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 25559192ee2..41b82d29fac 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -1,6 +1,6 @@ -function(setup_host_tools) - file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/host-tools) +function(configure_host_tools HOST_TOOLS_DIR) + file(MAKE_DIRECTORY ${HOST_TOOLS_DIR}) message(STATUS "Configuring host tools...") # cmake sets CC and CXX when those languages are enabled @@ -13,7 +13,7 @@ function(setup_host_tools) -DARCH:STRING=${ARCH} ${USE_CLANG_CL_ARG} ${REACTOS_SOURCE_DIR} - WORKING_DIRECTORY ${REACTOS_BINARY_DIR}/host-tools + WORKING_DIRECTORY ${HOST_TOOLS_DIR} RESULT_VARIABLE _host_config_result OUTPUT_VARIABLE _host_config_log ERROR_VARIABLE _host_config_log) @@ -31,15 +31,30 @@ function(setup_host_tools) # custom target + symbolic output prevents cmake from running # the command multiple times per build add_custom_command( - COMMAND ${CMAKE_COMMAND} --build ${REACTOS_BINARY_DIR}/host-tools + COMMAND ${CMAKE_COMMAND} --build ${HOST_TOOLS_DIR} OUTPUT host_tools) add_custom_target(build-host-tools ALL DEPENDS host_tools) - include(${REACTOS_BINARY_DIR}/host-tools/ImportExecutables.cmake) - include(${REACTOS_BINARY_DIR}/host-tools/TargetList.cmake) + include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) + include(${HOST_TOOLS_DIR}/TargetList.cmake) foreach(_target ${NATIVE_TARGETS}) add_dependencies(native-${_target} build-host-tools) endforeach() endfunction() + +function(setup_host_tools) + if(WITH_HOST_TOOLS) + # Use pre-built tools, required for cross compiling with msvc + # as only one target architecture is available at a time + set(HOST_TOOLS_DIR ${WITH_HOST_TOOLS}) + include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) + else() + # Build host-tools. Changes to tool sources will rebuild targets + # using that tool + set(HOST_TOOLS_DIR ${REACTOS_BINARY_DIR}/host-tools) + configure_host_tools(${HOST_TOOLS_DIR}) + endif() + +endfunction()

5 years, 1 month

[reactos] 01/03: Rework host tools

by Andrew Cook

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce531a28ec7383340aae3… commit ce531a28ec7383340aae39d6714c1319171b49f8 Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Mon Oct 1 21:07:44 2018 +1000 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:39:31 2019 +0200 Rework host tools Now configured at the same time as reactos and only one list of targets to maintain Correctly rebuilds when a tool changes (tested widl) --- CMakeLists.txt | 38 ++++++--------------- configure.cmd | 59 +------------------------------- configure.sh | 27 +-------------- sdk/cmake/gcc.cmake | 7 +--- sdk/cmake/host-tools.cmake | 83 ++++++++++++++++++++++++---------------------- sdk/cmake/host-tools.in | 1 + sdk/tools/CMakeLists.txt | 4 +-- 7 files changed, 59 insertions(+), 160 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52193933fa3..f5ccbd70289 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,10 +31,6 @@ set(CMAKE_COLOR_MAKEFILE OFF) set(CMAKE_POSITION_INDEPENDENT_CODE OFF) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) -if(NOT DEFINED NEW_STYLE_BUILD) - set(NEW_STYLE_BUILD TRUE) -endif() - if(NOT ARCH) set(ARCH i386) endif() @@ -75,11 +71,7 @@ endif() # include(sdk/cmake/bison-flex.cmake) if(NOT CMAKE_CROSSCOMPILING) - - if(NEW_STYLE_BUILD) - set(TOOLS_FOLDER ${CMAKE_CURRENT_BINARY_DIR}) - endif() - + set(TOOLS_FOLDER ${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DTARGET_${ARCH}) if(MSVC) @@ -105,22 +97,22 @@ if(NOT CMAKE_CROSSCOMPILING) add_subdirectory(sdk/tools) add_subdirectory(sdk/lib) - if(NOT NEW_STYLE_BUILD) - if(NOT MSVC) - export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc rsym mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - else() - export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - endif() + set(NATIVE_TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb) + if(NOT MSVC) + list(APPEND NATIVE_TARGETS rsym) endif() + export(TARGETS ${NATIVE_TARGETS} FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + configure_file(sdk/cmake/host-tools.in ${CMAKE_BINARY_DIR}/TargetList.cmake) + else() + # Add host tools target + include(sdk/cmake/host-tools.cmake) + setup_host_tools() + # We don't need CMake importlib handling. unset(CMAKE_IMPORT_LIBRARY_SUFFIX) - if(NEW_STYLE_BUILD) - include(sdk/cmake/host-tools.cmake) - endif() - # Print build type message("-- Build Type: ${CMAKE_BUILD_TYPE}") @@ -134,14 +126,6 @@ else() #useful stuff! include(CMakeParseArguments) - if(NOT NEW_STYLE_BUILD) - 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() - if(DBG) add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) else() diff --git a/configure.cmd b/configure.cmd index 4509ff04231..a6acd1c9a0c 100755 --- a/configure.cmd +++ b/configure.cmd @@ -18,18 +18,6 @@ if /I "%1" == "/?" ( goto quit ) -REM Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR% -if /I "%1" == "arm_hosttools" ( - echo Configuring x86 host tools for ARM cross build - - REM This launches %VSINSTALLDIR%VS\vcvarsall.bat - call %2 x86 - - REM Configure host tools for x86. - cmake -G %3 -A Win32 -DARCH:STRING=i386 %~dp0 - exit -) - REM Get the source root directory set REACTOS_SOURCE_DIR=%~dp0 @@ -95,14 +83,11 @@ if not defined ARCH ( goto quit ) -set NEW_STYLE_BUILD=1 set USE_CLANG_CL=0 REM Parse command line parameters :repeat - if /I "%1" == "-DNEW_STYLE_BUILD" ( - set NEW_STYLE_BUILD=%2 - ) else if "%BUILD_ENVIRONMENT%" == "MinGW" ( + if "%BUILD_ENVIRONMENT%" == "MinGW" ( if /I "%1" == "Codeblocks" ( set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles" ) else if /I "%1" == "Eclipse" ( @@ -210,50 +195,12 @@ if "%VS_SOLUTION%" == "1" ( goto quit ) -if "%NEW_STYLE_BUILD%"=="0" ( - - if not exist host-tools ( - mkdir host-tools - ) - - if not exist reactos ( - mkdir reactos - ) - - echo Preparing host tools... - cd host-tools - if EXIST CMakeCache.txt ( - del CMakeCache.txt /q - ) - - set REACTOS_BUILD_TOOLS_DIR=!CD! - - REM Use x86 for ARM host tools - if "%ARCH%" == "arm" ( - REM Launch new script instance for x86 host tools configuration - start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR% - ) else ( - cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%" - ) - - cd.. - -) - echo Preparing reactos... -if "%NEW_STYLE_BUILD%"=="0" ( - cd reactos -) - if EXIST CMakeCache.txt ( del CMakeCache.txt /q - del host-tools\CMakeCache.txt /q ) -if "%NEW_STYLE_BUILD%"=="0" ( - set BUILD_TOOLS_FLAG=-DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" -) if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=%MINGW_TOOCHAIN_FILE% -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %* "%REACTOS_SOURCE_DIR%" @@ -263,10 +210,6 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DRUNTIME_CHECKS:BOOL=%VS_RUNTIME_CHECKS% %* "%REACTOS_SOURCE_DIR%" ) -if "%NEW_STYLE_BUILD%"=="0" ( - cd.. -) - if %ERRORLEVEL% NEQ 0 ( goto quit ) diff --git a/configure.sh b/configure.sh index 52417c06e5d..9ff728088ef 100755 --- a/configure.sh +++ b/configure.sh @@ -9,7 +9,6 @@ BUILD_ENVIRONMENT=MinGW ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -USE_NEW_STYLE=1 usage() { echo Invalid parameter given. @@ -34,9 +33,6 @@ while [ $# -gt 0 ]; do makefiles|Makefiles) CMAKE_GENERATOR="Unix Makefiles" ;; - with-host-tools) - USE_NEW_STYLE=0 - ;; *) usage esac @@ -50,30 +46,9 @@ if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then cd "$REACTOS_OUTPUT_PATH" fi -#EXTRA_ARGS="" -if [ $USE_NEW_STYLE -eq 0 ]; then - mkdir -p host-tools - mkdir -p reactos - echo Preparing host tools... - cd host-tools - rm -f CMakeCache.txt - - REACTOS_BUILD_TOOLS_DIR="$PWD" - cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR" - - EXTRA_ARGS="$EXTRA_ARGS -DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR" - - cd .. -fi - echo Preparing reactos... - -if [ $USE_NEW_STYLE -eq 0 ]; then - cd reactos -fi - rm -f CMakeCache.txt host-tools/CMakeCache.txt -cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands $ex: ninja, make, makex, etc...$. diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index b3db8626d07..2493d999bf5 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -228,12 +228,7 @@ elseif(NO_ROSSYM) set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") else() # Normal rsym build - if(NEW_STYLE_BUILD) - string(TOUPPER ${CMAKE_BUILD_TYPE} _build_type) - get_target_property(RSYM native-rsym IMPORTED_LOCATION_${_build_type}) - else() - get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) - endif() + get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 100df6fd524..25559192ee2 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -1,42 +1,45 @@ -if(CMAKE_HOST_WIN32) - set(native_suffix ".exe") -endif() - -string(TOUPPER ${CMAKE_BUILD_TYPE} _build_type) - -# List of host tools -list(APPEND host_tools_list bin2c hpp widl gendib cabman fatten isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb) -if(NOT MSVC) - list(APPEND host_tools_list rsym) -endif() - -foreach(_host_tool ${host_tools_list}) - if(MSVC_IDE) - get_filename_component(_tool_location "${CMAKE_CURRENT_BINARY_DIR}/host-tools/${CMAKE_BUILD_TYPE}/${_host_tool}${native_suffix}" ABSOLUTE) - else() - get_filename_component(_tool_location "${CMAKE_CURRENT_BINARY_DIR}/host-tools/${_host_tool}${native_suffix}" ABSOLUTE) +function(setup_host_tools) + file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/host-tools) + + message(STATUS "Configuring host tools...") + # cmake sets CC and CXX when those languages are enabled + # so we need to clear them here + execute_process(COMMAND + ${CMAKE_COMMAND} + -E env --unset=CC --unset=CXX + ${CMAKE_COMMAND} + -G "${CMAKE_GENERATOR}" + -DARCH:STRING=${ARCH} + ${USE_CLANG_CL_ARG} + ${REACTOS_SOURCE_DIR} + WORKING_DIRECTORY ${REACTOS_BINARY_DIR}/host-tools + RESULT_VARIABLE _host_config_result + OUTPUT_VARIABLE _host_config_log + ERROR_VARIABLE _host_config_log) + + # Show cmake output only if host-tools breaks + if(NOT _host_config_result EQUAL 0) + message("\nHost tools log:") + message("${_host_config_log}") + message(FATAL_ERROR "Failed to configure host tools") endif() - list(APPEND tools_binaries ${_tool_location}) - add_executable(native-${_host_tool} IMPORTED) - set_property(TARGET native-${_host_tool} PROPERTY IMPORTED_LOCATION_${_build_type} ${_tool_location}) - add_dependencies(native-${_host_tool} host-tools) -endforeach() - -if(USE_CLANG_CL) - # FIXME: Fix host tools build with clang - #set(USE_CLANG_CL_ARG "-DCMAKE_C_COMPILER=clang-cl;-DCMAKE_CXX_COMPILER=clang-cl") -endif() - -include(ExternalProject) - -ExternalProject_Add(host-tools - SOURCE_DIR ${REACTOS_SOURCE_DIR} - BINARY_DIR ${REACTOS_BINARY_DIR}/host-tools - STAMP_DIR ${REACTOS_BINARY_DIR}/host-tools/stamps - BUILD_ALWAYS 1 - PREFIX host-tools - EXCLUDE_FROM_ALL 1 - CMAKE_ARGS "-DNEW_STYLE_BUILD=1;-DARCH:STRING=${ARCH};${USE_CLANG_CL_ARG}" - INSTALL_COMMAND "" - BUILD_BYPRODUCTS ${tools_binaries}) + + set_property(SOURCE host_tools PROPERTY SYMBOLIC 1) + + # Make a host-tools target so it'll be built when needed + # custom target + symbolic output prevents cmake from running + # the command multiple times per build + add_custom_command( + COMMAND ${CMAKE_COMMAND} --build ${REACTOS_BINARY_DIR}/host-tools + OUTPUT host_tools) + add_custom_target(build-host-tools ALL DEPENDS host_tools) + + include(${REACTOS_BINARY_DIR}/host-tools/ImportExecutables.cmake) + include(${REACTOS_BINARY_DIR}/host-tools/TargetList.cmake) + + foreach(_target ${NATIVE_TARGETS}) + add_dependencies(native-${_target} build-host-tools) + endforeach() + +endfunction() diff --git a/sdk/cmake/host-tools.in b/sdk/cmake/host-tools.in new file mode 100644 index 00000000000..1d82da932c3 --- /dev/null +++ b/sdk/cmake/host-tools.in @@ -0,0 +1 @@ +set(NATIVE_TARGETS @NATIVE_TARGETS@) diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index f7217280154..d89372552e9 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -1,9 +1,7 @@ function(add_host_tool _tool) add_executable(${_tool} ${ARGN}) - if(NEW_STYLE_BUILD) - set_target_properties(${_tool} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TOOLS_FOLDER}) - endif() + set_target_properties(${_tool} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TOOLS_FOLDER}) endfunction() #add_executable(pefixup pefixup.c)

5 years, 1 month

[reactos] 01/01: [NTOS:IO] iomgr.c: Add a missing '#if defined(KDBG)'

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87a625bd6c45f3244818a… commit 87a625bd6c45f3244818a56e2087fc93fad04198 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jun 8 04:16:20 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:36:49 2019 +0200 [NTOS:IO] iomgr.c: Add a missing '#if defined(KDBG)' --- ntoskrnl/io/iomgr/iomgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 8d01f35079e..a9c7ba35991 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -584,7 +584,7 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Initialize PnP root relations */ IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); -#ifndef _WINKD_ +#if !defined(_WINKD_) && defined(KDBG) /* Read KDB Data */ KdbInit();

5 years, 1 month

[reactos] 04/04: [UDFS] Avoid freeing Vcb when it couldn't have been allocated in UDFPnpSurpriseRemove() CORE-11203

by Victor Martinez

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d60acd88cb7e1a7a113c6… commit d60acd88cb7e1a7a113c6d41c0e4d8be9ed9dab8 Author: Victor Martinez <vicmarcal(a)gmail.com> AuthorDate: Sat Aug 17 16:44:57 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Aug 17 16:49:11 2019 +0300 [UDFS] Avoid freeing Vcb when it couldn't have been allocated in UDFPnpSurpriseRemove() CORE-11203 --- drivers/filesystems/udfs/pnp.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/udfs/pnp.cpp b/drivers/filesystems/udfs/pnp.cpp index 61db744d51f..fa24c84a3e3 100644 --- a/drivers/filesystems/udfs/pnp.cpp +++ b/drivers/filesystems/udfs/pnp.cpp @@ -588,7 +588,12 @@ Return Value: // Knock as many files down for this volume as we can. Vcb->Vpb->RealDevice->Flags |= DO_VERIFY_VOLUME; Buf = (PPREVENT_MEDIA_REMOVAL_USER_IN)MyAllocatePool__(NonPagedPool, sizeof(PREVENT_MEDIA_REMOVAL_USER_IN)); - if(!Buf) try_return(RC = STATUS_INSUFFICIENT_RESOURCES); + if(!Buf) { + VcbAcquired = FALSE; + VcbDeleted = FALSE; + try_return(RC = STATUS_INSUFFICIENT_RESOURCES); + } + UDFDoDismountSequence(Vcb, Buf, FALSE); Vcb->VCBFlags &= ~UDF_VCB_FLAGS_VOLUME_MOUNTED; Vcb->WriteSecurity = FALSE;

5 years, 1 month

[reactos] 03/04: [UDFS] Fix NewCFBName leakage in UDFFirstOpenFile() CORE-11098

by Victor Martinez

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5e4362b6dc87a2e001cb… commit e5e4362b6dc87a2e001cb3f68000e85f7fede4fd Author: Victor Martinez <vicmarcal(a)gmail.com> AuthorDate: Sat Aug 17 16:39:55 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Aug 17 16:49:11 2019 +0300 [UDFS] Fix NewCFBName leakage in UDFFirstOpenFile() CORE-11098 --- drivers/filesystems/udfs/create.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/filesystems/udfs/create.cpp b/drivers/filesystems/udfs/create.cpp index 3c777e8f493..6455389d52b 100644 --- a/drivers/filesystems/udfs/create.cpp +++ b/drivers/filesystems/udfs/create.cpp @@ -2312,7 +2312,10 @@ UDFFirstOpenFile( ((LocalPath->Buffer[LocalPath->Length/sizeof(WCHAR)-1] != L':') /*&& (LocalPath->Buffer[LocalPath->Length/sizeof(WCHAR)-1] != L'\\')*/) )) { RC = MyAppendUnicodeToString(&(NewFCBName->ObjectName), L"\\"); - if(!NT_SUCCESS(RC)) return STATUS_INSUFFICIENT_RESOURCES; + if(!NT_SUCCESS(RC)) { + UDFReleaseObjectName(NewFCBName); + return STATUS_INSUFFICIENT_RESOURCES; + } } // Make link between Fcb and FileInfo @@ -2321,9 +2324,11 @@ UDFFirstOpenFile( (*PtrNewFcb)->ParentFcb = RelatedFileInfo->Fcb; if(!((*PtrNewFcb)->NTRequiredFCB = NewFileInfo->Dloc->CommonFcb)) { - if(!((*PtrNewFcb)->NTRequiredFCB = - (PtrUDFNTRequiredFCB)MyAllocatePool__(NonPagedPool, UDFQuadAlign(sizeof(UDFNTRequiredFCB))) ) ) + (*PtrNewFcb)->NTRequiredFCB = (PtrUDFNTRequiredFCB)MyAllocatePool__(NonPagedPool, UDFQuadAlign(sizeof(UDFNTRequiredFCB))); + if(!((*PtrNewFcb)->NTRequiredFCB)) { + UDFReleaseObjectName(NewFCBName); return STATUS_INSUFFICIENT_RESOURCES; + } UDFPrint(("UDFAllocateNtReqFCB: %x\n", (*PtrNewFcb)->NTRequiredFCB)); RtlZeroMemory((*PtrNewFcb)->NTRequiredFCB, UDFQuadAlign(sizeof(UDFNTRequiredFCB))); @@ -2333,6 +2338,7 @@ UDFFirstOpenFile( if(!(NewFileInfo->Dloc->CommonFcb->NtReqFCBFlags & UDF_NTREQ_FCB_VALID)) { (*PtrNewFcb)->NTRequiredFCB = NULL; BrutePoint(); + UDFReleaseObjectName(NewFCBName); return STATUS_ACCESS_DENIED; } }

5 years, 1 month

[reactos] 02/04: [UDFS] Fix accessing an already freed pointer in UDFMarkAllocatedAsNotXXX() CORE-11182

by Victor Martinez

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b64865fbdf7d816a773df… commit b64865fbdf7d816a773df490f595ad0c48b99b63 Author: Victor Martinez <vicmarcal(a)gmail.com> AuthorDate: Sat Aug 17 16:30:21 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Aug 17 16:49:11 2019 +0300 [UDFS] Fix accessing an already freed pointer in UDFMarkAllocatedAsNotXXX() CORE-11182 --- drivers/filesystems/udfs/udf_info/extent.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/filesystems/udfs/udf_info/extent.cpp b/drivers/filesystems/udfs/udf_info/extent.cpp index db4f23fa5b8..5e507d35591 100644 --- a/drivers/filesystems/udfs/udf_info/extent.cpp +++ b/drivers/filesystems/udfs/udf_info/extent.cpp @@ -2158,6 +2158,7 @@ UDFMarkAllocatedAsNotXXX( Extent[i].extLocation = 0; Extent[i].extLength = (Extent[i].extLength & UDF_EXTENT_LENGTH_MASK) | flags; NewExtent = Extent; + Extent = NULL; AdPrint(("Alloc->Not (1) NewExtent = Extent = %x\n", NewExtent)); } else if(l < BOffs) { @@ -2211,15 +2212,17 @@ UDFMarkAllocatedAsNotXXX( if(Deallocate) UDFMarkSpaceAsXXX(Vcb, (-1), TmpExtInf.Mapping, AS_DISCARDED); // mark as free + ExtInfo->Modified = TRUE; + ExtInfo->Mapping = NewExtent; + + AdPrint(("Alloc->Not: ExtInfo %x, Extent %x\n", ExtInfo, ExtInfo->Mapping)); + if(Extent) { AdPrint(("Alloc->Not kill %x\n", Extent)); MyFreePool__(Extent); } else { AdPrint(("Alloc->Not keep %x\n", Extent)); } - ExtInfo->Modified = TRUE; - ExtInfo->Mapping = NewExtent; - AdPrint(("Alloc->Not: ExtInfo %x, Extent %x\n", ExtInfo, ExtInfo->Mapping)); return STATUS_SUCCESS; } // end UDFMarkAllocatedAsNotXXX()

5 years, 1 month

[reactos] 01/04: [UDFS] Don't access OldInIcb after being freed CORE-11199

by Victor Martinez

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4805f0cd73a28451c1346… commit 4805f0cd73a28451c134625653cc3e1bb5911fb3 Author: Victor Martinez <vicmarcal(a)gmail.com> AuthorDate: Sat Aug 17 15:52:19 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Aug 17 16:49:11 2019 +0300 [UDFS] Don't access OldInIcb after being freed CORE-11199 --- drivers/filesystems/udfs/udf_info/udf_info.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/udfs/udf_info/udf_info.cpp b/drivers/filesystems/udfs/udf_info/udf_info.cpp index 38576beab29..6778cf78fb2 100644 --- a/drivers/filesystems/udfs/udf_info/udf_info.cpp +++ b/drivers/filesystems/udfs/udf_info/udf_info.cpp @@ -1719,8 +1719,8 @@ UDFWriteFile__( } } if(OldInIcb) { - MyFreePool__(OldInIcb); UDFWriteExtent(Vcb, &(Dloc->DataLoc), 0, (uint32)OldLen, FALSE, OldInIcb, &_WrittenBytes); + MyFreePool__(OldInIcb); } if((int64)OldLen != Dloc->DataLoc.Length) { // restore file size

5 years, 1 month

[reactos] 01/01: [DESK] Change the property "Screensaver" page on text change

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcf18826a50fc555886f6… commit dcf18826a50fc555886f6cd8cea9b66683e5146b Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Aug 4 11:21:28 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 15:36:47 2019 +0200 [DESK] Change the property "Screensaver" page on text change If the user takes action on the edit box control of "Screensaver" dialog page, enable the "Apply" property button. CORE-16280 --- dll/cpl/desk/screensaver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/cpl/desk/screensaver.c b/dll/cpl/desk/screensaver.c index 1a10456843a..02c05c9b650 100644 --- a/dll/cpl/desk/screensaver.c +++ b/dll/cpl/desk/screensaver.c @@ -747,7 +747,8 @@ ScreenSaverPageProc(HWND hwndDlg, case IDC_SCREENS_TIMEDELAY: { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + if (command == EN_CHANGE) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; }

5 years, 1 month

[reactos] 01/01: [UDFS] Fix uninitialized variable CORE-11216

by Victor Martinez

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d97e49091df1745564a8c… commit d97e49091df1745564a8c536c9af930371620e70 Author: Victor Martinez <vicmarcal(a)gmail.com> AuthorDate: Sat Aug 17 15:43:24 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Aug 17 15:43:24 2019 +0300 [UDFS] Fix uninitialized variable CORE-11216 --- drivers/filesystems/udfs/Include/Sys_spec_lib.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp b/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp index 0c21ff93890..540c3db0336 100644 --- a/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp +++ b/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp @@ -239,7 +239,7 @@ UDFFileDirInfoToNT( UNICODE_STRING DosName; PEXTENDED_FILE_ENTRY ExFileEntry; USHORT Ident; - BOOLEAN ReadSizes; + BOOLEAN ReadSizes = FALSE; NTSTATUS status; PtrUDFNTRequiredFCB NtReqFcb;

5 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019