Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[cfinck] 39550: - Update the tools to the versions of RosBE-Windows 1.4 - Add general multi-architecture support to RosBE-Unix This includes moving all architecture-dependent stuff into an "i386" directory. Additional target architectures can now be easily added with extra RosBE-Unix packages. - Make most of the environment variable names compatible to RosBE-Windows - Add "rosbelibrary.sh" for avoiding duplicated code in several scripts - Implemented the "charch" and "chdefdir" commands from Ros

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Feb 11 08:37:48 2009 New Revision: 39550 URL: http://svn.reactos.org/svn/reactos?rev=39550&view=rev Log: - Update the tools to the versions of RosBE-Windows 1.4 - Add general multi-architecture support to RosBE-Unix This includes moving all architecture-dependent stuff into an "i386" directory. Additional target architectures can now be easily added with extra RosBE-Unix packages. - Make most of the environment variable names compatible to RosBE-Windows - Add "rosbelibrary.sh" for avoiding duplicated code in several scripts - Implemented the "charch" and "chdefdir" commands from RosBE-Windows - Change the default installation path to /usr/local/RosBE, provide an update option for the old path - Compile and name "make" without the mingw32 target, that tool isn't target-dependent - Strip debugging symbols from the bundled tools in .c files right away Added: trunk/tools/RosBE/RosBE-Unix/scripts/charch.sh (with props) trunk/tools/RosBE/RosBE-Unix/scripts/chdefdir.sh (with props) trunk/tools/RosBE/RosBE-Unix/scripts/i386/ trunk/tools/RosBE/RosBE-Unix/scripts/i386/clean.sh (with props) trunk/tools/RosBE/RosBE-Unix/scripts/i386/version.sh (with props) trunk/tools/RosBE/RosBE-Unix/scripts/rosbelibrary.sh (with props) Modified: trunk/tools/RosBE/RosBE-Unix/README trunk/tools/RosBE/RosBE-Unix/README.odt trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/scripts/RosBE-rc trunk/tools/RosBE/RosBE-Unix/scripts/RosBE.sh trunk/tools/RosBE/RosBE-Unix/scripts/basedir.sh trunk/tools/RosBE/RosBE-Unix/scripts/build-multi.sh trunk/tools/RosBE/RosBE-Unix/scripts/build-shared.sh trunk/tools/RosBE/RosBE-Unix/scripts/build.sh trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh trunk/tools/RosBE/RosBE-Unix/scripts/help.sh trunk/tools/RosBE/RosBE-Unix/scripts/scut.sh trunk/tools/RosBE/RosBE-Unix/scripts/version.sh Modified: trunk/tools/RosBE/RosBE-Unix/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/README?rev=… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/README [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/README [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,5 +1,6 @@ ReactOS Build Environment - Version 1.1 for Unix-based operating systems + Version 1.4 for Unix-based operating systems + Base package and i386 build tools by Colin Finck (mail(a)colinfinck.de) Introduction @@ -73,13 +74,16 @@ your used operating system: 1. Open a Terminal window and type "su" to become "root" user. + NOTE: Becoming a root user is only required for installing RosBE into the + default directory ("/usr/local/RosBE"). If you want to install it into a + personal directory, you don't need superuser privileges. 2. Call the "RosBE-Builder.sh" script in the directory of the unpacked RosBE files. 3. Follow the directions on the screen until the script ends with "Finished successfully!" 4. Type "exit" to switch back to your normal user account. Then call the "createshortcut.sh" script in the installation directory (usually this - is "/usr/RosBE"). + is "/usr/local/RosBE"). 5. Follow the directions on the screen to create a shortcut for the Build Environment. @@ -92,12 +96,14 @@ This version of RosBE for Unix-based operating systems uses the following components: - * GNU Binutils v2.18.50-20071015 (snapshot) + * GNU Binutils v2.19.51-20090127 (snapshot) + compiled for i386-pc-mingw32 patched with: - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/binutils-2.18.…) * GCC, The GNU Compiler Collection v4.1.3-20071015 (snapshot) + compiled for i386-pc-mingw32 patched with: - GCC-v4.1-r129382-prerelease-w3seek.patch (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…) @@ -109,24 +115,20 @@ NOTE: This GCC version only supports C and C++ * Make 20071219 (CVS version) - * MinGW-Runtime 3.13 - * NASM, The Netwide assembler v2.00 + * MinGW-Runtime 3.15.2 + * NASM, The Netwide assembler v2.05.01 * W32api 3.10 Tested Operating Systems ------------------------- - Although the Build Environment is designed to work on all Unix-based -operating systems, it was only tested under the following systems: - - * Debian GNU/Linux 4.0 - * Fedora 8 - * FreeBSD 6.2 - * Mac OS X 10.5 - * openSUSE 10.2 - * Ubuntu 7.04 and 7.10 - -You should be able to compile the build tools on both i386 (32-bit) and + The Build Environment was designed to work on all Unix-based operating +systems. Nevertheless, it is impossible to test it on all possible systems out +there. + The current primary development and test system is Ubuntu 8.10. But users +also reported that it works well under other Linux systems such as Fedora or +openSUSE and Unix derivates like FreeBSD or Mac OS X. + You should be able to compile the build tools on both i386 (32-bit) and x86_64 (64-bit) systems. Modified: trunk/tools/RosBE/RosBE-Unix/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/README.odt?… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/RosBE-Build… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,15 +1,16 @@ #!/bin/bash # -# RosBE-Builder -# Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> +# ReactOS Build Environment for Unix-based Operating Systems - Basic Builder Tool +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # partially based on the BuildMingwCross script (http://www.mingw.org/MinGWiki/index.php/BuildMingwCross) # # Released under GNU GPL v2 or any later version. # Constants -ROSBE_VERSION="1.1" -KNOWN_ROSBE_VERSIONS="0.3.6 1.1" -DEFAULT_INSTALL_DIR="/usr/RosBE" +ROSBE_VERSION="1.4" +TARGET_ARCH="i386" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4" +DEFAULT_INSTALL_DIR="/usr/local/RosBE" NEEDED_TOOLS="bison flex gcc g++ grep makeinfo" # GNU Make has a special check # Get the absolute path to the script directory @@ -17,78 +18,12 @@ SCRIPTDIR="$PWD" SOURCEDIR="$SCRIPTDIR/sources" -# Functions -boldmsg() -{ - echo -e "\e[1m$1\e[0m" -} - -greenmsg() -{ - echo -e "\e[32m$1\e[0m" -} - -redmsg() -{ - echo -e "\e[31m$1\e[0m" -} - -checkrun() -{ - if [ $? -ne 0 ]; then - redmsg "FAILED" - - if [ "$1" = "" ]; then - echo "If you did not do something wrong, please contact the ReactOS Team." - else - echo "Please take a look at the log file \"$SCRIPTDIR/$1.log\"" - echo "If you did not do something wrong, please save the log file and contact the ReactOS Team." - fi - - echo "Aborted!" - exit 1 - else - greenmsg "OK" - - if [ "$1" != "" ]; then - rm "$SCRIPTDIR/$1.log" - fi - fi -} - -showchoice() -{ - default_value="$1" - valid_choices="$2" - - breakloop=false - choice="" - - while true; do - read -p "Your choice [$default_value]: " choice - - if [ "$choice" = "" ]; then - choice="$default_value" - break - fi - - for valid_choice in $valid_choices; do - if [ "$choice" = "$valid_choice" ]; then - breakloop=true - break - fi - done - - if $breakloop; then - break - fi - done -} +source "$SCRIPTDIR/scripts/rosbelibrary.sh" echo "*******************************************************************************" echo "* ReactOS Build Environment for Unix-based Operating Systems *" -echo "* Builder Tool *" +echo "* Basic Builder Tool *" echo "* by Colin Finck <mail(a)colinfinck.de> *" echo "* *" echo "* Version $ROSBE_VERSION *" @@ -98,82 +33,21 @@ echo "This script compiles and installs a complete Build Environment for building ReactOS." echo -# Check if we're running as root -if [ ! "`whoami`" = "root" ]; then - boldmsg "User is not \"root\"" - - echo "The default installation path for the Build Environment is \"$DEFAULT_INSTALL_DIR\"." - echo "Therefore it is recommended to run this script as the \"root\" user. Otherwise you probably cannot create the necessary directories." - echo "An alternative is to specify another installation directory at the installation process." - echo "Do you really want to continue? (yes/no)" - read -p "[no] " answer - - if [ "$answer" = "yes" ]; then - echo - else - exit 1 - fi -fi - -# Test if the script directory is writeable -if [ ! -w "$SCRIPTDIR" ]; then - redmsg "The script directory \"$SCRIPTDIR\" is not writeable, aborted!" - exit 1 -fi - -# Test if the script directory contains spaces -case "$SCRIPTDIR" in -*" "*) - redmsg "The script directory \"$SCRIPTDIR\" contains spaces!" - redmsg "Therefore some build tools cannot be compiled properly." - echo - redmsg "Please move \"$SCRIPTDIR\" to a directory, which does not contain spaces." - - exit 1;; -esac - -# Check if all necessary tools exist -boldmsg "Checking for the needed tools..." - -toolmissing=false -for tool in $NEEDED_TOOLS; do - echo -n "Checking for $tool... " - - if which "$tool" >& /dev/null; then - greenmsg "OK" - else - redmsg "MISSING" - toolmissing=true - fi -done - -# Special check for GNU Make -# For example FreeBSD's "make" is not GNU Make, so we have to define a variable -echo -n "Checking for GNU Make... " - -if make -v 2>&1 | grep "GNU Make" >& /dev/null; then - makecmd="make" - greenmsg "OK" -elif gmake -v 2>&1 | grep "GNU Make" >& /dev/null; then - makecmd="gmake" - greenmsg "OK" -else - redmsg "MISSING" - toolmissing=true -fi - -if $toolmissing; then - echo "At least one needed tool is missing, aborted!" - exit 1 -fi - -echo +setup_check_requirements # Select the installation directory boldmsg "Installation Directory" echo "In which directory do you want to install it?" echo "Enter the path to the directory here or simply press ENTER to install it into the default directory." + +# RosBE-Unix 1.4 switched from /usr/RosBE to /usr/local/RosBE, show a message for the people who might want to update +if [ -f "/usr/RosBE/RosBE-Version" ]; then + echo + redmsg "Warning: " "-n" + echo "The default installation path /usr/RosBE was changed to /usr/local/RosBE starting with version 1.4." + echo "If you want to update a previous installation, enter /usr/RosBE here." +fi createdir=false installdir="" @@ -300,6 +174,24 @@ process_make=true process_nasm=true process_scut=true + ;; + + "1.1") + # Updated components from 1.1 to 1.4 + process_binutils=true + process_mingwruntime=true + process_nasm=true + + # Reorganize the existing files + mkdir -p "$installdir/$TARGET_ARCH/bin" + mv "$installdir/bin/mingw32-"* "$installdir/$TARGET_ARCH/bin" + mv "$installdir/$TARGET_ARCH/bin/mingw32-make" "$installdir/bin/make" + mv "$installdir/bin/nasm" "$installdir/$TARGET_ARCH/bin/nasm" + mv "$installdir/bin/ndisasm" "$installdir/$TARGET_ARCH/bin/ndisasm" + mv "$installdir/include" "$installdir/$TARGET_ARCH/include" + mv "$installdir/lib" "$installdir/$TARGET_ARCH/lib" + mv "$installdir/libexec" "$installdir/$TARGET_ARCH/libexec" + mv "$installdir/mingw32" "$installdir/$TARGET_ARCH/mingw32" ;; esac fi @@ -319,7 +211,7 @@ if $createdir; then if ! mkdir -p "$installdir"; then redmsg "Could not create \"$installdir\", aborted!" - exit 1 + return 1 fi fi fi @@ -327,39 +219,38 @@ # Test if the installation directory is writeable if [ ! -w "$installdir" ]; then redmsg "Installation directory \"$installdir\" is not writeable, aborted!" - exit 1 + return 1 fi # # Build the tools # boldmsg "Building..." -PATH="$installdir/bin:$PATH" -mkdir -p "$installdir/bin" >& /dev/null -mkdir -p "$installdir/mingw32" >& /dev/null +mkdir "$installdir/bin" >& /dev/null +mkdir -p "$installdir/$TARGET_ARCH/mingw32" >& /dev/null # cpucount if $process_cpucount; then echo -n "Compiling cpucount... " - gcc -o "$installdir/bin/cpucount" "$SCRIPTDIR/tools/cpucount.c" - checkrun + gcc -s -o "$installdir/bin/cpucount" "$SCRIPTDIR/tools/cpucount.c" + setup_check_run fi CPUCOUNT=`$installdir/bin/cpucount -x1` -cd "$installdir/mingw32" +cd "$installdir/$TARGET_ARCH/mingw32" # mingw-runtime if $process_mingwruntime; then echo -n "Extracting mingw-runtime... " tar -xjf "$SOURCEDIR/mingw-runtime.tar.bz2" >& "$SCRIPTDIR/tar.log" - checkrun "tar" + setup_check_run "tar" fi # w32api if $process_w32api; then echo -n "Extracting w32api... " tar -xjf "$SOURCEDIR/w32api.tar.bz2" >& "$SCRIPTDIR/tar.log" - checkrun "tar" + setup_check_run "tar" fi cd "$SOURCEDIR" @@ -371,28 +262,28 @@ echo -n "Extracting binutils... " tar -xjf "binutils.tar.bz2" >& "$SCRIPTDIR/tar.log" - checkrun "tar" + setup_check_run "tar" echo -n "Configuring binutils... " mkdir "binutils-build" cd "binutils-build" - ../binutils/configure --prefix="$installdir" --target=mingw32 --disable-nls --with-gcc \ + ../binutils/configure --prefix="$installdir/$TARGET_ARCH" --target=mingw32 --disable-nls --with-gcc \ --with-gnu-as --with-gnu-ld --disable-shared >& "$SCRIPTDIR/configure.log" - checkrun "configure" + setup_check_run "configure" echo -n "Building binutils... " $makecmd -j $CPUCOUNT CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" - checkrun "make" + setup_check_run "make" echo -n "Installing binutils... " $makecmd install >& "$SCRIPTDIR/make.log" - checkrun "make" + setup_check_run "make" echo -n "Cleaning up binutils... " cd "$SOURCEDIR" rm -rf "binutils-build" rm -rf "binutils" - checkrun + setup_check_run fi # gcc @@ -402,31 +293,31 @@ echo -n "Extracting gcc... " tar -xjf "gcc.tar.bz2" >& "$SCRIPTDIR/tar.log" - checkrun "tar" + setup_check_run "tar" echo -n "Configuring gcc... " mkdir "gcc-build" cd "gcc-build" - ../gcc/configure --prefix="$installdir" --target=mingw32 \ - --with-headers="$installdir/mingw32/include"--with-gcc --with-gnu-ld \ + ../gcc/configure --prefix="$installdir/$TARGET_ARCH" --target=mingw32 \ + --with-headers="$installdir/$TARGET_ARCH/mingw32/include"--with-gcc --with-gnu-ld \ --with-gnu-as --enable-languages=c,c++ --enable-checking=release \ --enable-threads=win32 --disable-win32-registry --disable-nls \ --disable-shared >& "$SCRIPTDIR/configure.log" - checkrun "configure" + setup_check_run "configure" echo -n "Building gcc... " $makecmd -j $CPUCOUNT CFLAGS="-O2" CXXFLAGS="-O2" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" - checkrun "make" + setup_check_run "make" echo -n "Installing gcc... " $makecmd install >& "$SCRIPTDIR/make.log" - checkrun "make" + setup_check_run "make" echo -n "Cleaning up gcc... " cd "$SOURCEDIR" rm -rf "gcc-build" rm -rf "gcc" - checkrun + setup_check_run fi # make @@ -436,30 +327,29 @@ echo -n "Extracting make... " tar -xjf "make.tar.bz2" >& "$SCRIPTDIR/tar.log" - checkrun "tar" + setup_check_run "tar" echo -n "Configuring make... " mkdir "make-build" cd "make-build" - ../make/configure --prefix="$installdir" --target=mingw32 \ - --disable-dependency-tracking --disable-nls \ - --enable-case-insensitive-file-system --disable-job-server --disable-rpath \ - --program-prefix=mingw32- >& "$SCRIPTDIR/configure.log" - checkrun "configure" + ../make/configure --prefix="$installdir" --disable-dependency-tracking \ + --disable-nls --enable-case-insensitive-file-system + --disable-job-server --disable-rpath >& "$SCRIPTDIR/configure.log" + setup_check_run "configure" echo -n "Building make... " $makecmd -j $CPUCOUNT CFLAGS="-s -O2 -mms-bitfields" >& "$SCRIPTDIR/make.log" - checkrun "make" + setup_check_run "make" echo -n "Installing make... " $makecmd install >& "$SCRIPTDIR/make.log" - checkrun "make" + setup_check_run "make" echo -n "Cleaning up make... " cd "$SOURCEDIR" rm -rf "make-build" rm -rf "make" - checkrun + setup_check_run fi # nasm @@ -468,64 +358,75 @@ echo -n "Extracting nasm... " tar -xjf "nasm.tar.bz2" >& "$SCRIPTDIR/tar.log" - checkrun "tar" + setup_check_run "tar" echo -n "Configuring nasm... " cd "nasm" - ./configure --prefix="$installdir" --target=mingw32 >& "$SCRIPTDIR/configure.log" - checkrun "configure" + ./configure --prefix="$installdir/$TARGET_ARCH" >& "$SCRIPTDIR/configure.log" + setup_check_run "configure" echo -n "Building nasm... " $makecmd -j $CPUCOUNT >& "$SCRIPTDIR/make.log" - checkrun "make" + setup_check_run "make" echo -n "Installing nasm... " $makecmd install >& "$SCRIPTDIR/make.log" - checkrun "make" + setup_check_run "make" echo -n "Cleaning up nasm... " cd "$SOURCEDIR" rm -rf "nasm" - checkrun + setup_check_run fi # Final actions echo boldmsg "Final actions" + +if [ "$installdir" = "/usr/RosBE" ] && $update; then + # Changed default installation directory starting with RosBE-Unix 1.4 + echo "Do you want to move /usr/RosBE to /usr/local/RosBE? (yes/no)" + read -p "[yes] " answer + + if [ "$answer" = "" ] || [ "$answer" = "yes" ]; then + mv "/usr/RosBE" "/usr/local/RosBE" + installdir="/usr/local/RosBE" + fi +fi if $process_buildtime; then echo -n "Compiling buildtime... " - gcc -o "$installdir/bin/buildtime" "$SCRIPTDIR/tools/buildtime.c" - checkrun + gcc -s -o "$installdir/bin/buildtime" "$SCRIPTDIR/tools/buildtime.c" + setup_check_run fi if $process_scut; then echo -n "Compiling scut..." - gcc -o "$installdir/bin/scut" "$SCRIPTDIR/tools/scut.c" - checkrun + gcc -s -o "$installdir/bin/scut" "$SCRIPTDIR/tools/scut.c" + setup_check_run fi echo -n "Removing unneeded files... " -rm -rf "$installdir/mingw32/sys-include" -rm -rf "$installdir/info" -rm -rf "$installdir/man" -rm -rf "$installdir/share" -checkrun +rm -rf "$installdir/$TARGET_ARCH/mingw32/sys-include" +rm -rf "$installdir/$TARGET_ARCH/info" +rm -rf "$installdir/$TARGET_ARCH/man" +rm -rf "$installdir/$TARGET_ARCH/share" +setup_check_run echo -n "Removing debugging symbols... " -ls "$installdir"/bin/* "$installdir"/mingw32/bin/* | grep -v "gccbug" | +ls "$installdir/$TARGET_ARCH/bin/"* "$installdir/$TARGET_ARCH/mingw32/bin/"* | grep -v "gccbug" | while read file; do strip "$file" done -checkrun +setup_check_run echo -n "Copying scripts... " -cp "$SCRIPTDIR"/scripts/* "$installdir" -checkrun +cp -R "$SCRIPTDIR/scripts/"* "$installdir" +setup_check_run echo -n "Writing version... " echo "$ROSBE_VERSION" > "$installdir/RosBE-Version" -checkrun +setup_check_run echo # Finish @@ -539,7 +440,10 @@ echo "If you just want to start the Build Environment without using a shortcut, execute the" echo "following command:" echo -echo " $installdir/RosBE.sh <path/to/your/ReactOS/source/directory> [optional color code]" -echo - -exit 0 +echo " $installdir/RosBE.sh [source directory] [color code] [architecture]" +echo +echo "All parameters for that script are optional." +echo + +return 0 + Modified: trunk/tools/RosBE/RosBE-Unix/scripts/RosBE-rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/RosBE-rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/RosBE-rc [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,17 +1,18 @@ # Set path -PATH="$_ROSSCRIPTDIR/bin:$PATH" +source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh" +set_path_variable # Set aliases -alias basedir="source $_ROSSCRIPTDIR/basedir.sh" -alias clean="$_ROSSCRIPTDIR/clean.sh" -alias help="$_ROSSCRIPTDIR/help.sh" -alias make="$_ROSSCRIPTDIR/build.sh" -alias makex="$_ROSSCRIPTDIR/build-multi.sh" -alias scut="source $_ROSSCRIPTDIR/scut.sh" -alias version="$_ROSSCRIPTDIR/version.sh" - -# Display the available commands -source "$_ROSSCRIPTDIR/help.sh" +alias basedir="source $_ROSBE_ROSSCRIPTDIR/basedir.sh" +alias charch="source $_ROSBE_ROSSCRIPTDIR/charch.sh" +alias chdefdir="source $_ROSBE_ROSSCRIPTDIR/chdefdir.sh" +alias clean="$_ROSBE_ROSSCRIPTDIR/clean.sh" +alias help="$_ROSBE_ROSSCRIPTDIR/help.sh" +alias make="$_ROSBE_ROSSCRIPTDIR/build.sh" +alias makex="$_ROSBE_ROSSCRIPTDIR/build-multi.sh" +alias scut="source $_ROSBE_ROSSCRIPTDIR/scut.sh" +alias version="$_ROSBE_ROSSCRIPTDIR/version.sh" # Change the current directory to the ReactOS source directory basedir + Modified: trunk/tools/RosBE/RosBE-Unix/scripts/RosBE.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/RosBE.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/RosBE.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -2,18 +2,25 @@ # # Script for initializing RosBE # Part of RosBE for Unix-based Operating Systems -# Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. +# Save the ReactOS source directory +if [ "$1" = "" ]; then + _ROSBE_ROSSOURCEDIR="$PWD" +else + _ROSBE_ROSSOURCEDIR="$1" +fi + +export _ROSBE_ROSSOURCEDIR + # Get the absolute path to the script directory cd `dirname $0` -_ROSSCRIPTDIR="$PWD" -export _ROSSCRIPTDIR +export _ROSBE_ROSSCRIPTDIR="$PWD" -# Save the ReactOS source directory -_ROSSOURCEDIR="$1" -export _ROSSOURCEDIR +# Save the current PATH variable +export _ROSBE_OLDPATH="$PATH" # Make sure that some important variables are clean export HOST= @@ -23,11 +30,22 @@ # Read the RosBE version # The file "RosBE-Version" has been created by the RosBE-Builder.sh script -ROSBE_VERSION=`cat "$_ROSSCRIPTDIR/RosBE-Version"` +export _ROSBE_VERSION=`cat "$_ROSBE_ROSSCRIPTDIR/RosBE-Version"` # Set the text color if [ "$2" != "" ]; then echo -e "\e[$2m" +fi + +# Set the architecture to build for +source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh" + +if [ "$3" = "" ]; then + # No architecture specified, fall back to i386 without any message + export _ROSBE_ARCH="i386" +else + # Try to set the architecture to the one specified + change_architecture $3 fi # Display banner @@ -35,7 +53,12 @@ echo "* ReactOS Build Environment for Unix-based Operating Systems *" echo "* by Colin Finck <mail(a)colinfinck.de> *" echo "* *" -echo "* Version $ROSBE_VERSION *" +echo "* Version $_ROSBE_VERSION *" echo "*******************************************************************************" +echo +echo "For a list of all included commands, type: \"help\"" +echo "-------------------------------------------------" +echo -bash --rcfile "$_ROSSCRIPTDIR/RosBE-rc" +bash --rcfile "$_ROSBE_ROSSCRIPTDIR/RosBE-rc" + Modified: trunk/tools/RosBE/RosBE-Unix/scripts/basedir.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/bas… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/basedir.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/basedir.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,10 +1,11 @@ #!/bin/bash # -# Script for changing the current directory to $_ROSSOURCEDIR +# Script for changing the current directory to $_ROSBE_ROSSOURCEDIR # Part of RosBE for Unix-based Operating Systems -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. -# An alias just to "cd $_ROSSOURCEDIR" won't work as bash only expands when executing the shell and then never again -cd "$_ROSSOURCEDIR" +# An alias just to "cd $_ROSBE_ROSSOURCEDIR" won't work as bash only expands when executing the shell and then never again +cd "$_ROSBE_ROSSOURCEDIR" + Modified: trunk/tools/RosBE/RosBE-Unix/scripts/build-multi.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/build-multi.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/build-multi.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -2,11 +2,12 @@ # # Detects the CPU cores in your system and builds ReactOS with this number of threads # Part of RosBE for Unix-based Operating Systems -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. -source "$_ROSSCRIPTDIR/build-shared.sh" +source "$_ROSBE_ROSSCRIPTDIR/build-shared.sh" CPUCOUNT=`cpucount -x1` -buildtime mingw32-make -j $CPUCOUNT $* +buildtime make -j $CPUCOUNT $* + Modified: trunk/tools/RosBE/RosBE-Unix/scripts/build-shared.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/build-shared.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/build-shared.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,13 +1,13 @@ # Shared functions for build.sh and build-multi.sh -# Part of Generic RosBE -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Part of RosBE for Unix-based Operating Systems +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. # Check if config.template.rbuild is newer than config.rbuild # If it is then abort the build and inform the user. -if [ -f "$_ROSSOURCEDIR/config.rbuild" ]; then - if [ "$_ROSSOURCEDIR/config.template.rbuild" -nt "$_ROSSOURCEDIR/config.rbuild" ]; then +if [ -f "$_ROSBE_ROSSOURCEDIR/config.rbuild" ]; then + if [ "$_ROSBE_ROSSOURCEDIR/config.template.rbuild" -nt "$_ROSBE_ROSSOURCEDIR/config.rbuild" ]; then echo echo "*** config.template.rbuild is newer than config.rbuild ***" echo "*** aborting build. Please check for changes and ***" @@ -16,3 +16,4 @@ exit 1 fi fi + Modified: trunk/tools/RosBE/RosBE-Unix/scripts/build.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/build.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/build.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -2,10 +2,11 @@ # # Builds ReactOS with one thread # Part of RosBE for Unix-based Operating Systems -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. -source "$_ROSSCRIPTDIR/build-shared.sh" +source "$_ROSBE_ROSSCRIPTDIR/build-shared.sh" -buildtime mingw32-make $* +buildtime make $* + Added: trunk/tools/RosBE/RosBE-Unix/scripts/charch.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/charch.sh (added) +++ trunk/tools/RosBE/RosBE-Unix/scripts/charch.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,0 +1,25 @@ +#!/bin/bash +# +# Change the current target build tools to an architecture to build for +# Part of RosBE for Unix-based Operating Systems +# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# +# Released under GNU GPL v2 or any later version. + +if [ "$1" = "" ]; then + echo "charch: Changes the architecture to build for." + echo "The appropriate build tools for this architecture need to be installed by a" + echo "RosBE-Unix package." + echo + echo "Syntax: charch <architecture>" + return 0 +fi + +# Change the architecture +source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh" +change_architecture $1 +set_path_variable + +# Display tool versions +source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/version.sh" + Propchange: trunk/tools/RosBE/RosBE-Unix/scripts/charch.sh ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Unix/scripts/chdefdir.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/chdefdir.sh (added) +++ trunk/tools/RosBE/RosBE-Unix/scripts/chdefdir.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,0 +1,18 @@ +#!/bin/bash +# +# Change the ReactOS source directory for the current session +# Part of RosBE for Unix-based Operating Systems +# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# +# Released under GNU GPL v2 or any later version. + +if [ "$1" = "" ]; then + echo "chdefdir: Change the ReactOS source directory for the current RosBE session" + echo + echo "Syntax: chdefdir <directory>" + return 0 +fi + +export _ROSBE_ROSSOURCEDIR="$1" +basedir + Propchange: trunk/tools/RosBE/RosBE-Unix/scripts/chdefdir.sh ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -2,23 +2,11 @@ # # Script for cleaning the ReactOS source directory # Part of RosBE for Unix-based Operating Systems -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. -pushd "$_ROSSOURCEDIR" >& /dev/null +pushd "$_ROSBE_ROSSOURCEDIR" >& /dev/null +source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/clean.sh" +popd >& /dev/null -if [ -d "obj-i386" ]; then - echo "Cleaning ReactOS source directory..." - - rm -rf "obj-i386" - rm -rf "output-i386" - rm -rf "reactos." - rm -f "makefile.auto" - - echo "Done cleaning ReactOS source directory." -else - echo "There is nothing to clean." -fi - -popd >& /dev/null Modified: trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/cre… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -2,27 +2,19 @@ # # Script for creating shortcuts # Part of RosBE for Unix-based Operating Systems -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. # Constants DEFAULT_SHORTCUT_DIR="$HOME/Desktop" -# Functions -greenmsg() -{ - echo -e "\e[32m$1\e[0m" -} - -boldmsg() -{ - echo -e "\e[1m$1\e[0m" -} - # Get the absolute path to the script directory cd `dirname $0` SCRIPTDIR="$PWD" + +source "$SCRIPTDIR/rosbelibrary.sh" + # Read the RosBE version # The file "RosBE-Version" has been created by the RosBE-Builder.sh script @@ -85,3 +77,4 @@ echo "Terminal=true" >> "$shortcut" greenmsg "OK" + Modified: trunk/tools/RosBE/RosBE-Unix/scripts/help.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/help.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/help.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -2,23 +2,28 @@ # # Script for displaying the help # Part of RosBE for Unix-based Operating Systems -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. echo echo "Available Commands:" -echo " make [OPTIONS] - make, without options does a standard build of" -echo " ReactOS. OPTIONS are the standard ReactOS build" -echo " options, i.e. bootcd." -echo " makex [OPTIONS] - Same as 'make' but automatically determines the" -echo " number of CPUs in the system and uses -j with" -echo " the appropriate number." -echo " basedir - Switch back to the ReactOS source directory." -echo " clean - Fully clean the ReactOS source directory." -echo " help - Display the available commands." -echo " scut [OPTIONS] - List, add, edit, remove, switch and default to" -echo " shortcutted ReactOS source directories." -echo " version - Show information about the tool versions." +echo " make [OPTIONS] - make, without options does a standard build of" +echo " ReactOS. OPTIONS are the standard ReactOS build" +echo " options, i.e. bootcd." +echo " makex [OPTIONS] - Same as 'make' but automatically determines the" +echo " number of CPUs in the system and uses -j with" +echo " the appropriate number." +echo " basedir - Switch back to the ReactOS source directory." +echo " charch [OPTIONS] - Change the Architecture to build ReactOS for" +echo " for the current RosBE session." +echo " chdefdir [OPTIONS] - Change the ReactOS source directory for the" +echo " current RosBE session." +echo " clean - Fully clean the ReactOS source directory." +echo " help - Display the available commands." +echo " scut [OPTIONS] - List, add, edit, remove, switch and default to" +echo " shortcutted ReactOS source directories." +echo " version - Show information about the tool versions." echo + Added: trunk/tools/RosBE/RosBE-Unix/scripts/i386/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/i38… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/i386/clean.sh (added) +++ trunk/tools/RosBE/RosBE-Unix/scripts/i386/clean.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,0 +1,19 @@ +# Clean i386 source directories +# Part of RosBE for Unix-based Operating Systems +# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# +# Released under GNU GPL v2 or any later version. + +if [ -d "obj-i386" ]; then + echo "Cleaning ReactOS i386 source directory..." + + rm -rf "obj-i386" + rm -rf "output-i386" + rm -rf "reactos." + rm -f "makefile.auto" + + echo "Done cleaning ReactOS i386 source directory." +else + echo "ERROR: There is no i386 compiler output to clean." +fi + Propchange: trunk/tools/RosBE/RosBE-Unix/scripts/i386/clean.sh ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Unix/scripts/i386/version.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/i38… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/i386/version.sh (added) +++ trunk/tools/RosBE/RosBE-Unix/scripts/i386/version.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,0 +1,10 @@ +# Show the i386 tool versions +# Part of RosBE for Unix-based Operating Systems +# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# +# Released under GNU GPL v2 or any later version. + +mingw32-gcc -v 2>&1 | grep "gcc version" +nasm -v +mingw32-ld -v + Propchange: trunk/tools/RosBE/RosBE-Unix/scripts/i386/version.sh ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Unix/scripts/rosbelibrary.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/rosbelibrary.sh (added) +++ trunk/tools/RosBE/RosBE-Unix/scripts/rosbelibrary.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,0 +1,188 @@ +# Shared functions for RosBE-Unix components +# Part of RosBE for Unix-based Operating Systems +# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# +# Released under GNU GPL v2 or any later version. + +# Print a message in a bold font +# Parameter 1: The message +# Parameter 2: Optional additional parameters for "echo" +boldmsg() +{ + echo -e $2 "\e[1m$1\e[0m" +} + +# Print a message in green color +# Parameter 1: The message +# Parameter 2: Optional additional parameters for "echo" +greenmsg() +{ + echo -e $2 "\e[32m$1\e[0m" +} + +# Print a message in red color +# Parameter 1: The message +# Parameter 2: Optional additional parameters for "echo" +redmsg() +{ + echo -e $2 "\e[31m$1\e[0m" +} + +# Allow a choice between several options +# If a valid choice was done, the result is stored in $choice +# Parameter 1 - The default value +# Parameter 2 - All possible values +showchoice() +{ + default_value="$1" + valid_choices="$2" + + breakloop=false + choice="" + + while true; do + read -p "Your choice [$default_value]: " choice + + if [ "$choice" = "" ]; then + choice="$default_value" + break + fi + + for valid_choice in $valid_choices; do + if [ "$choice" = "$valid_choice" ]; then + breakloop=true + break + fi + done + + if $breakloop; then + break + fi + done +} + +# Change the _ROSBE_ARCH variable appropriately +change_architecture() +{ + new_arch="$1" + + if [ -f "$_ROSBE_ROSSCRIPTDIR/$new_arch/version.sh" ]; then + # Architecture parameter seems valid + _ROSBE_ARCH="$new_arch" + else + echo "Unsupported architecture specified, falling back to i386!" + echo + _ROSBE_ARCH="i386" + fi + + export _ROSBE_ARCH +} + +# Set the PATH variable properly for the specified architecture +set_path_variable() +{ + # Set the PATH + PATH="$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/bin:$_ROSBE_ROSSCRIPTDIR/bin:$_ROSBE_OLDPATH" +} + +# Check for several requirements, which need to be met in order to run the installation script properly +setup_check_requirements() +{ + # Check whether we're running as root + if [ ! "`whoami`" = "root" ]; then + boldmsg "User is not \"root\"" + + echo "The default installation path for the Build Environment is \"$DEFAULT_INSTALL_DIR\"." + echo "Therefore it is recommended to run this script as the \"root\" user. Otherwise you probably cannot create the necessary directories." + echo "An alternative is to specify another installation directory at the installation process." + echo "Do you really want to continue? (yes/no)" + read -p "[no] " answer + + if [ "$answer" = "yes" ]; then + echo + else + exit 1 + fi + fi + + # Test if the script directory is writeable + if [ ! -w "$SCRIPTDIR" ]; then + redmsg "The script directory \"$SCRIPTDIR\" is not writeable, aborted!" + exit 1 + fi + + # Test if the script directory contains spaces + case "$SCRIPTDIR" in + *" "*) + redmsg "The script directory \"$SCRIPTDIR\" contains spaces!" + redmsg "Therefore some build tools cannot be compiled properly." + echo + redmsg "Please move \"$SCRIPTDIR\" to a directory, which does not contain spaces." + + exit 1;; + esac + + # Check if all necessary tools exist + boldmsg "Checking for the needed tools..." + + toolmissing=false + for tool in $NEEDED_TOOLS; do + echo -n "Checking for $tool... " + + if which "$tool" >& /dev/null; then + greenmsg "OK" + else + redmsg "MISSING" + toolmissing=true + fi + done + + # Special check for GNU Make + # For example FreeBSD's "make" is not GNU Make, so we have to define a variable + echo -n "Checking for GNU Make... " + + if make -v 2>&1 | grep "GNU Make" >& /dev/null; then + makecmd="make" + greenmsg "OK" + elif gmake -v 2>&1 | grep "GNU Make" >& /dev/null; then + makecmd="gmake" + greenmsg "OK" + else + redmsg "MISSING" + toolmissing=true + fi + + if $toolmissing; then + echo "At least one needed tool is missing, aborted!" + exit 1 + fi + + echo +} + +# Check whether the previous command finished with errorlevel 0 +# If it did so, print a green "OK" and delete the debug logfile for the command. +# If that wasn't the case, print a red "FAILED" and give information about the debug logfile. +setup_check_run() +{ + if [ $? -ne 0 ]; then + redmsg "FAILED" + + if [ "$1" = "" ]; then + echo "If you did not do something wrong, please contact the ReactOS Team." + else + echo "Please take a look at the log file \"$SCRIPTDIR/$1.log\"" + echo "If you did not do something wrong, please save the log file and contact the ReactOS Team." + fi + + echo "Aborted!" + exit 1 + else + greenmsg "OK" + + if [ "$1" != "" ]; then + rm "$SCRIPTDIR/$1.log" + fi + fi +} + Propchange: trunk/tools/RosBE/RosBE-Unix/scripts/rosbelibrary.sh ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Unix/scripts/scut.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/scut.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/scut.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -2,24 +2,25 @@ # # Script for launching scut and changing the current directory appropriately # Part of RosBE for Unix-based Operating Systems -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. case "$1" in add|rem|edit|def|list|/?|-h|--help) # It's an scut parameter, which can just be passed to the program - "$_ROSSCRIPTDIR/bin/scut" $* + "$_ROSBE_ROSSCRIPTDIR/bin/scut" $* ;; *) # It's probably the name of a shortcut - _ROSSOURCEDIR=`"$_ROSSCRIPTDIR/bin/scut" $*` + _ROSBE_ROSSOURCEDIR=`"$_ROSBE_ROSSCRIPTDIR/bin/scut" $*` - if [ "$_ROSSOURCEDIR" != "Default" ] && [ -d "$_ROSSOURCEDIR" ]; then - export _ROSSOURCEDIR + if [ "$_ROSBE_ROSSOURCEDIR" != "Default" ] && [ -d "$_ROSBE_ROSSOURCEDIR" ]; then + export _ROSBE_ROSSOURCEDIR basedir fi ;; esac + Modified: trunk/tools/RosBE/RosBE-Unix/scripts/version.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/ver… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/version.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/version.sh [iso-8859-1] Wed Feb 11 08:37:48 2009 @@ -1,20 +1,16 @@ #!/bin/bash # -# Build with +# Show the tool versions # Part of RosBE for Unix-based Operating Systems -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. # Display RosBE version -ROSBE_VERSION=`cat "$_ROSSCRIPTDIR/RosBE-Version"` - echo "This is the ReactOS Build Environment for Unix-based Operating Systems" -echo "Version $ROSBE_VERSION, containing the following components:" +echo "Version $_ROSBE_VERSION, currently running with these components:" echo # Display tool versions -mingw32-gcc -v 2>&1 | grep "gcc version" -nasm -v -mingw32-ld -v -mingw32-make -v | grep "GNU Make" +source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/version.sh" +

15 years, 10 months

[cwittich] 39549: dbghelp: Fix bad call to free() instead of pdb_free(). Eric Pouech <eric dot pouech at orange dot fr>

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 11 08:17:26 2009 New Revision: 39549 URL: http://svn.reactos.org/svn/reactos?rev=39549&view=rev Log: dbghelp: Fix bad call to free() instead of pdb_free(). Eric Pouech <eric dot pouech at orange dot fr> Modified: trunk/reactos/dll/win32/dbghelp/msc.c Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] Wed Feb 11 08:17:26 2009 @@ -2477,7 +2477,7 @@ else { WARN("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)files_image); - free(files_image); + pdb_free(files_image); files_image = NULL; } }

15 years, 10 months

[dchapyshev] 39548: - Add params checking. It fixes Autoruns (9.38) crashes

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 11 07:54:29 2009 New Revision: 39548 URL: http://svn.reactos.org/svn/reactos?rev=39548&view=rev Log: - Add params checking. It fixes Autoruns (9.38) crashes Modified: trunk/reactos/dll/win32/kernel32/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Wed Feb 11 07:54:29 2009 @@ -914,19 +914,23 @@ BufferU.Length = wcslen(BufferU.Buffer) * sizeof(WCHAR); /* convert ansi (or oem) string to unicode */ if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString (&Buffer, - &BufferU, - FALSE); + Status = RtlUnicodeStringToAnsiString(&Buffer, + &BufferU, + FALSE); else - RtlUnicodeStringToOemString (&Buffer, - &BufferU, - FALSE); - /* nul-terminate ascii string */ - Buffer.Buffer[BufferU.Length / sizeof(WCHAR)] = '\0'; - - if (NULL != lpFilePart && BufferU.Length != 0) + Status = RtlUnicodeStringToOemString(&Buffer, + &BufferU, + FALSE); + + if (NT_SUCCESS(Status) && Buffer.Buffer) { + /* nul-terminate ascii string */ + Buffer.Buffer[BufferU.Length / sizeof(WCHAR)] = '\0'; + + if (NULL != lpFilePart && BufferU.Length != 0) + { *lpFilePart = strrchr (lpBuffer, '\\') + 1; + } } }

15 years, 10 months

[janderwald] 39547: - Use ZwCreateFile to get the file handle - Ignore failure of device interface registration. Atm registering device interface fails due the device node has zero length. Needs more investigation - Fix resource file constants

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 11 03:54:47 2009 New Revision: 39547 URL: http://svn.reactos.org/svn/reactos?rev=39547&view=rev Log: - Use ZwCreateFile to get the file handle - Ignore failure of device interface registration. Atm registering device interface fails due the device node has zero length. Needs more investigation - Fix resource file constants Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rc Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Wed Feb 11 03:54:47 2009 @@ -43,10 +43,9 @@ UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\sysaudio"); SYSAUDIODEVEXT *DeviceExtension; - DPRINT1("SysAudio_Pnp called\n"); - - IrpStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT1("SysAudio_Pnp called for func %x\n", IrpStack->MinorFunction); DeviceExtension = (SYSAUDIODEVEXT*)DeviceObject->DeviceExtension; @@ -86,9 +85,11 @@ /* a new device has arrived */ PFILE_OBJECT FileObject = NULL; - PDEVICE_OBJECT DeviceObject = NULL; UNICODE_STRING DeviceName; PKSAUDIO_DEVICE_ENTRY DeviceEntry; + HANDLE NodeHandle; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; DeviceEntry = ExAllocatePool(NonPagedPool, sizeof(KSAUDIO_DEVICE_ENTRY)); if (!DeviceEntry) @@ -106,24 +107,44 @@ RtlInitUnicodeString(&DeviceName, Event->SymbolicLinkName->Buffer); #endif - Status = IoGetDeviceObjectPointer(&DeviceName, - FILE_READ_DATA | FILE_WRITE_DATA, - &FileObject, - &DeviceObject); + InitializeObjectAttributes(&ObjectAttributes, &DeviceName, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = ZwCreateFile(&NodeHandle, + GENERIC_READ | GENERIC_WRITE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + 0, + FILE_OPEN, + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + if (!NT_SUCCESS(Status)) { + DPRINT1("ZwCreateFile failed with %x\n", Status); ExFreePool(DeviceEntry); return Status; } - DeviceEntry->DeviceObject = DeviceObject; + Status = ObReferenceObjectByHandle(NodeHandle, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + ZwClose(NodeHandle); + ExFreePool(DeviceEntry); + DPRINT1("ObReferenceObjectByHandle failed with %x\n", Status); + return Status; + } + + DeviceEntry->Handle = NodeHandle; DeviceEntry->FileObject = FileObject; InsertTailList(&DeviceExtension->KsAudioDeviceList, &DeviceEntry->Entry); DeviceExtension->NumberOfKsAudioDevices++; - DPRINT1("Successfully opened audio device\n"); + DPRINT1("Successfully opened audio device handle %p file object %p device object %p\n", NodeHandle, FileObject, FileObject->DeviceObject); return Status; } else if (IsEqualGUIDAligned(&Event->Event, @@ -256,28 +277,34 @@ #endif Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, NULL, &SymbolicLink); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_MIDIOUT_DEVICE interface\n"); - return Status; - } - RtlFreeUnicodeString(&SymbolicLink); + if (NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&SymbolicLink); + } + else + { + DPRINT1("Failed to register KSCATEGORY_PREFERRED_MIDIOUT_DEVICE interface Status %x\n", Status); + } Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_PREFERRED_WAVEIN_DEVICE, NULL, &SymbolicLink); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEIN_DEVICE interface\n"); - return Status; - } - RtlFreeUnicodeString(&SymbolicLink); + if (NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&SymbolicLink); + } + else + { + DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEIN_DEVICE interface Status %x\n", Status); + } Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, NULL, &SymbolicLink); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEOUT_DEVICE interface\n"); - return Status; - } - RtlFreeUnicodeString(&SymbolicLink); + if (NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&SymbolicLink); + } + else + { + DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEOUT_DEVICE interface Status %x\n", Status); + } /* set io flags */ DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; @@ -286,11 +313,9 @@ } } - - DPRINT("Device SysAudio_AddDevice result %x\n", Status); - return Status; + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Wed Feb 11 03:54:47 2009 @@ -4,7 +4,7 @@ typedef struct { LIST_ENTRY Entry; - PDEVICE_OBJECT DeviceObject; + HANDLE Handle; PFILE_OBJECT FileObject; UNICODE_STRING DeviceName; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rc [iso-8859-1] Wed Feb 11 03:54:47 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "System audio graph builder\0" -#define REACTOS_STR_INTERNAL_NAME "portcls\0" -#define REACTOS_STR_ORIGINAL_FILENAME "portcls.sys\0" +#define REACTOS_STR_FILE_DESCRIPTION "System Audio Graph Builder\0" +#define REACTOS_STR_INTERNAL_NAME "sysaudio\0" +#define REACTOS_STR_ORIGINAL_FILENAME "sysaudio.sys\0" #include <reactos/version.rc>

15 years, 10 months

[janderwald] 39546: - Implement KsCreateTopologyNode, KsCreatePin

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 11 03:34:32 2009 New Revision: 39546 URL: http://svn.reactos.org/svn/reactos?rev=39546&view=rev Log: - Implement KsCreateTopologyNode, KsCreatePin Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Wed Feb 11 03:34:32 2009 @@ -7,7 +7,21 @@ IN ACCESS_MASK DesiredAccess, OUT PHANDLE ConnectionHandle) { - return STATUS_SUCCESS; + UINT ConnectSize = sizeof(KSPIN_CONNECT); + + PKSDATAFORMAT_WAVEFORMATEX Format = (PKSDATAFORMAT_WAVEFORMATEX)(Connect + 1); + if (Format->DataFormat.FormatSize == sizeof(KSDATAFORMAT) || + Format->DataFormat.FormatSize == sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEX)) + { + ConnectSize += Format->DataFormat.FormatSize; + } + + return KspCreateObjectType(FilterHandle, + L"{146F1A80-4791-11D0-A5D6-28DB04C10000}", + (PVOID)Connect, + ConnectSize, + DesiredAccess, + ConnectionHandle); } KSDDKAPI NTSTATUS NTAPI Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Wed Feb 11 03:34:32 2009 @@ -11,7 +11,15 @@ #define TAG_KSDEVICE TAG('K', 'S', 'E', 'D') #define TAG_KSOBJECT_TAG TAG('K', 'S', 'O', 'H') - +NTSTATUS +NTAPI +KspCreateObjectType( + IN HANDLE ParentHandle, + IN LPWSTR ObjectType, + PVOID CreateParameters, + UINT CreateParametersSize, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE NodeHandle); Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Wed Feb 11 03:34:32 2009 @@ -1,13 +1,65 @@ -#include <ntddk.h> -#include <debug.h> -#include <ks.h> +#include "priv.h" /* =============================================================== Topology Functions */ +NTSTATUS +NTAPI +KspCreateObjectType( + IN HANDLE ParentHandle, + IN LPWSTR ObjectType, + PVOID CreateParameters, + UINT CreateParametersSize, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE NodeHandle) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + + Name.Length = (wcslen(ObjectType) + 1) * sizeof(WCHAR) + CreateParametersSize; + Name.MaximumLength += sizeof(WCHAR); + Name.Buffer = ExAllocatePool(NonPagedPool, Name.MaximumLength); + + if (!Name.Buffer) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + wcscpy(Name.Buffer, ObjectType); + Name.Buffer[wcslen(ObjectType)] = '\\'; + + RtlMoveMemory(Name.Buffer + wcslen(ObjectType) +1, CreateParameters, CreateParametersSize); + + Name.Buffer[Name.Length / 2] = L'\0'; + + InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, ParentHandle, NULL); + + + Status = IoCreateFile(NodeHandle, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + 0, + FILE_OPEN, + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0, + CreateFileTypeNone, + NULL, + IO_NO_PARAMETER_CHECKING | IO_FORCE_ACCESS_CHECK); + + ExFreePool(Name.Buffer); + return Status; +} + + /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS NTAPI KsCreateTopologyNode( @@ -16,8 +68,12 @@ IN ACCESS_MASK DesiredAccess, OUT PHANDLE NodeHandle) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + return KspCreateObjectType(ParentHandle, + L"{0621061A-EE75-11D0-B915-00A0C9223196}", + (PVOID)NodeCreate, + sizeof(KSNODE_CREATE), + DesiredAccess, + NodeHandle); } /*

15 years, 10 months

[cwittich] 39545: fix MR_MID_NOT_FOUND error with mshtml in 2nd stage

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 11 03:26:31 2009 New Revision: 39545 URL: http://svn.reactos.org/svn/reactos?rev=39545&view=rev Log: fix MR_MID_NOT_FOUND error with mshtml in 2nd stage Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.pspec Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Wed Feb 11 03:26:31 2009 @@ -568,3 +568,14 @@ UNIMPLEMENTED; return FALSE; } + +/*********************************************************************** + * SetProcessDPIAware (USER32.@) + */ +BOOL WINAPI SetProcessDPIAware( VOID ) +{ + FIXME( "stub!\n"); + + return TRUE; +} + Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Wed Feb 11 03:26:31 2009 @@ -644,7 +644,7 @@ @ stdcall SetMessageQueue(long) @ stdcall SetParent(long long) NtUserSetParent @ stdcall SetProcessDefaultLayout(long) -@ stub SetProcessDPIAware +@ stdcall SetProcessDPIAware() @ stdcall SetProcessWindowStation(long) NtUserSetProcessWindowStation @ stdcall SetProgmanWindow (long) @ stdcall SetPropA(long str long)

15 years, 10 months

[tkreuzer] 39544: - Add an own fastinterlck.c for amd64 - Don't compile the generic interlocked functions - Implement ExQueryDepthSList and add it to exports - replace a bunch of #ifdefs with -arch=...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 10 18:38:42 2009 New Revision: 39544 URL: http://svn.reactos.org/svn/reactos?rev=39544&view=rev Log: - Add an own fastinterlck.c for amd64 - Don't compile the generic interlocked functions - Implement ExQueryDepthSList and add it to exports - replace a bunch of #ifdefs with -arch=... Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/ (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/fastinterlck.c (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Feb 10 18:38:42 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/fastinterlck.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/fastinterlck.c [iso-8859-1] Tue Feb 10 18:38:42 2009 @@ -1,0 +1,137 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/ex/fastinterlck.c + * PURPOSE: Portable Ex*Interlocked and REGISTER routines for amd64 + * PROGRAMMERS: ReactOS Portable Systems Group + * Timo Kreuzer + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#undef ExInterlockedAddLargeInteger +#undef ExInterlockedAddUlong +#undef ExInterlockedExtendZone +#undef ExInterlockedInsertHeadList +#undef ExInterlockedInsertTailList +#undef ExInterlockedPopEntryList +#undef ExInterlockedPushEntryList +#undef ExInterlockedRemoveHeadList +#undef ExpInterlockedFlushSList +#undef ExpInterlockedPopEntrySList +#undef ExpInterlockedPushEntrySList + +/* FUNCTIONS ******************************************************************/ + +LARGE_INTEGER +ExInterlockedAddLargeInteger(IN PLARGE_INTEGER Addend, + IN LARGE_INTEGER Increment, + IN PKSPIN_LOCK Lock) +{ + LARGE_INTEGER Int; + Int.QuadPart = _InterlockedExchangeAdd64(&Addend->QuadPart, + Increment.QuadPart); + return Int; +} + +ULONG +ExInterlockedAddUlong(IN PULONG Addend, + IN ULONG Increment, + PKSPIN_LOCK Lock) +{ + return (ULONG)_InterlockedExchangeAdd((PLONG)Addend, Increment); +} + +PLIST_ENTRY +ExInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead = ListEntry->Flink; + InsertHeadList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PLIST_ENTRY +ExInterlockedInsertTailList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead = ListEntry->Blink; + InsertTailList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PSINGLE_LIST_ENTRY +ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PSINGLE_LIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!ListHead->Next) OldHead = PopEntryList(ListHead); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PSINGLE_LIST_ENTRY +ExInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PSINGLE_LIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PSINGLE_LIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!ListHead->Next) OldHead = PushEntryList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PLIST_ENTRY +ExInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead = RemoveHeadList(ListHead); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PSLIST_ENTRY +ExpInterlockedFlushSList( + PSLIST_HEADER ListHead) +{ + UNIMPLEMENTED; + return NULL; +} + +PSLIST_ENTRY +ExpInterlockedPopEntrySList( + IN PSLIST_HEADER ListHead) +{ + UNIMPLEMENTED; + return NULL; +} + +PSLIST_ENTRY +ExpInterlockedPushEntrySList( + PSLIST_HEADER ListHead, + PSLIST_ENTRY ListEntry) +{ + UNIMPLEMENTED; + return NULL; +} Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/amd64/fastinterlck.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Tue Feb 10 18:38:42 2009 @@ -8,7 +8,7 @@ /* INCLUDES *******************************************************************/ -#if defined(_ARM_) || defined(_PPC_) || defined(_M_AMD64) || defined(NTOS_USE_GENERICS) +#if defined(_ARM_) || defined(_PPC_) || defined(NTOS_USE_GENERICS) #include <ntoskrnl.h> #define NDEBUG @@ -311,7 +311,6 @@ return Result; } -#ifndef _M_AMD64 VOID NTAPI READ_REGISTER_BUFFER_UCHAR(IN PUCHAR Register, @@ -455,6 +454,5 @@ *(volatile USHORT * const)Register = Value; KeFlushWriteBuffer(); } -#endif // !_M_AMD64 #endif Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] Tue Feb 10 18:38:42 2009 @@ -160,15 +160,6 @@ return STATUS_UNSUCCESSFUL; } -NTKERNELAPI -PSLIST_ENTRY -ExpInterlockedFlushSList( - PSLIST_HEADER ListHead) -{ - UNIMPLEMENTED; - return NULL; -} - NTSTATUS NTAPI KiCallUserMode( @@ -179,3 +170,10 @@ return STATUS_UNSUCCESSFUL; } +#undef ExQueryDepthSList +NTKERNELAPI +USHORT +ExQueryDepthSList(IN PSLIST_HEADER ListHead) +{ + return (USHORT)(ListHead->Alignment & 0xffff); +} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Feb 10 18:38:42 2009 @@ -197,6 +197,11 @@ <file>interlck_asm.S</file> <file>fastinterlck_asm.S</file> <file>ioport.S</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>fastinterlck.c</file> </directory> </if> <file>atom.c</file> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Tue Feb 10 18:38:42 2009 @@ -55,9 +55,7 @@ @ stdcall DbgPrompt(str ptr long) @ stdcall DbgQueryDebugFilterState(long long) @ stdcall DbgSetDebugFilterState(long long long) -#ifdef __x86_64__ -@ fastcall ExAcquireFastMutex(ptr) -#endif +@ fastcall -arch=x86_64 ExAcquireFastMutex(ptr) @ fastcall ExAcquireFastMutexUnsafe(ptr) @ stdcall ExAcquireResourceExclusiveLite(ptr long) @ stdcall ExAcquireResourceSharedLite(ptr long) @@ -134,6 +132,7 @@ @ stdcall ExIsResourceAcquiredSharedLite(ptr) @ stdcall ExLocalTimeToSystemTime(ptr ptr) @ stdcall ExNotifyCallback(ptr ptr ptr) +@ stdcall -arch=x86_64 ExQueryDepthSList(ptr) @ stdcall ExQueryPoolBlockSize(ptr ptr) @ stdcall ExQueueWorkItem(ptr long) @ stdcall ExRaiseAccessViolation() @@ -145,9 +144,7 @@ @ fastcall ExReInitializeRundownProtectionCacheAware(ptr) ExfReInitializeRundownProtectionCacheAware @ stdcall ExRegisterCallback(ptr ptr ptr) @ stdcall ExReinitializeResourceLite(ptr) -#ifdef __x86_64__ -@ fastcall ExReleaseFastMutex(ptr) -#endif +@ fastcall -arch=x86_64 ExReleaseFastMutex(ptr) @ fastcall ExReleaseFastMutexUnsafe(ptr) @ fastcall ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(ptr) @ fastcall ExReleaseResourceAndLeaveCriticalRegion(ptr) @@ -165,9 +162,7 @@ @ stdcall ExSizeOfRundownProtectionCacheAware() @ stdcall ExSystemExceptionFilter() @ stdcall ExSystemTimeToLocalTime(ptr ptr) -#ifdef __x86_64__ -@ fastcall ExTryToAcquireFastMutex(ptr) -#endif +@ fastcall -arch=x86_64 ExTryToAcquireFastMutex(ptr) @ stdcall ExUnregisterCallback(ptr) @ stdcall ExUuidCreate(ptr) @ stdcall ExVerifySuite(long) @@ -190,24 +185,18 @@ @ fastcall ExfReleasePushLockShared(ptr) @ fastcall ExfTryToWakePushLock(ptr) @ fastcall ExfUnblockPushLock(ptr ptr) -#ifdef __x86_64__ -@ stdcall ExpInterlockedFlushSList(ptr) -@ stdcall ExpInterlockedPopEntrySList(ptr ptr) -@ stdcall ExpInterlockedPushEntrySList(ptr ptr) -#endif -#ifdef _M_IX86 -@ fastcall Exfi386InterlockedDecrementLong(ptr) -@ fastcall Exfi386InterlockedExchangeUlong(ptr long) -@ fastcall Exfi386InterlockedIncrementLong(ptr) -@ stdcall Exi386InterlockedDecrementLong(ptr) -@ stdcall Exi386InterlockedExchangeUlong(ptr long long) -@ stdcall Exi386InterlockedIncrementLong(ptr) -#endif -#ifdef _M_IX86 -@ fastcall ExiAcquireFastMutex(ptr) ExAcquireFastMutex -@ fastcall ExiReleaseFastMutex(ptr) ExReleaseFastMutex -@ fastcall ExiTryToAcquireFastMutex(ptr) ExTryToAcquireFastMutex -#endif +@ stdcall -arch=x86_64 ExpInterlockedFlushSList(ptr) +@ stdcall -arch=x86_64 ExpInterlockedPopEntrySList(ptr ptr) +@ stdcall -arch=x86_64 ExpInterlockedPushEntrySList(ptr ptr) +@ fastcall -arch=i386 Exfi386InterlockedDecrementLong(ptr) +@ fastcall -arch=i386 Exfi386InterlockedExchangeUlong(ptr long) +@ fastcall -arch=i386 Exfi386InterlockedIncrementLong(ptr) +@ stdcall -arch=i386 Exi386InterlockedDecrementLong(ptr) +@ stdcall -arch=i386 Exi386InterlockedExchangeUlong(ptr long long) +@ stdcall -arch=i386 Exi386InterlockedIncrementLong(ptr) +@ fastcall -arch=i386 ExiAcquireFastMutex(ptr) ExAcquireFastMutex +@ fastcall -arch=i386 ExiReleaseFastMutex(ptr) ExReleaseFastMutex +@ fastcall -arch=i386 ExiTryToAcquireFastMutex(ptr) ExTryToAcquireFastMutex @ stdcall FsRtlAcquireFileExclusive(ptr) ;FsRtlAddBaseMcbEntry @ stdcall FsRtlAddLargeMcbEntry(ptr long long long long long long) @@ -566,12 +555,10 @@ @ stdcall KdPowerTransition(long) @ stdcall KdRefreshDebuggerNotPresent() @ stdcall KdSystemDebugControl(long ptr long ptr long ptr long) -#ifdef _M_IX86 -@ stdcall Ke386CallBios(long ptr) -@ stdcall Ke386IoSetAccessProcess(ptr long) -@ stdcall Ke386QueryIoAccessMap(long ptr) -@ stdcall Ke386SetIoAccessMap(long ptr) -#endif +@ stdcall -arch=i386 Ke386CallBios(long ptr) +@ stdcall -arch=i386 Ke386IoSetAccessProcess(ptr long) +@ stdcall -arch=i386 Ke386QueryIoAccessMap(long ptr) +@ stdcall -arch=i386 Ke386SetIoAccessMap(long ptr) @ fastcall KeAcquireGuardedMutex(ptr) @ fastcall KeAcquireGuardedMutexUnsafe(ptr) @ fastcall KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) @@ -579,9 +566,7 @@ @ stdcall KeAcquireInterruptSpinLock(ptr) @ stdcall KeAcquireSpinLockAtDpcLevel(ptr) @ fastcall KeAcquireSpinLockForDpc(ptr) -#ifdef __x86_64__ -@ stdcall KeAcquireSpinLockRaiseToDpc(ptr) -#endif +@ stdcall -arch=x86_64 KeAcquireSpinLockRaiseToDpc(ptr) @ stdcall KeAddSystemServiceTable(ptr ptr long ptr long) @ stdcall KeAreAllApcsDisabled() @ stdcall KeAreApcsDisabled() @@ -609,18 +594,16 @@ @ stdcall KeGetCurrentThread() @ stdcall KeGetPreviousMode() @ stdcall KeGetRecommendedSharedDataAlignment() -#ifdef _M_IX86 ;KeI386AbiosCall -@ stdcall KeI386AllocateGdtSelectors(ptr long) +@ stdcall -arch=i386 KeI386AllocateGdtSelectors(ptr long) ;KeI386Call16BitCStyleFunction ;KeI386Call16BitFunction -@ stdcall KeI386FlatToGdtSelector(long long long) +@ stdcall -arch=i386 KeI386FlatToGdtSelector(long long long) ;KeI386GetLid -@ extern KeI386MachineType -@ stdcall KeI386ReleaseGdtSelectors(ptr long) +@ extern -arch=i386 KeI386MachineType +@ stdcall -arch=i386 KeI386ReleaseGdtSelectors(ptr long) ;KeI386ReleaseLid ;KeI386SetGdtSelector -#endif @ stdcall KeInitializeApc(ptr ptr long ptr ptr ptr long ptr) @ stdcall KeInitializeCrashDumpHeader(long long ptr long ptr) @ stdcall KeInitializeDeviceQueue(ptr) @@ -741,27 +724,19 @@ @ stdcall KeWaitForSingleObject(ptr long long long ptr) @ fastcall KefAcquireSpinLockAtDpcLevel(ptr) @ fastcall KefReleaseSpinLockFromDpcLevel(ptr) -#ifdef _M_IX86 -@ stdcall Kei386EoiHelper() -#endif +@ stdcall -arch=i386 Kei386EoiHelper() @ fastcall KiAcquireSpinLock(ptr) @ extern KiBugCheckData @ stdcall KiCheckForKernelApcDelivery() ;KiCheckForSListAddress -#ifdef _M_IX86 -@ stdcall KiCoprocessorError() -#endif +@ stdcall -arch=i386 KiCoprocessorError() @ stdcall KiDeliverApc(long ptr ptr) -#ifdef _M_IX86 -@ stdcall KiDispatchInterrupt() -#endif +@ stdcall -arch=i386 KiDispatchInterrupt() @ extern KiEnableTimerWatchdog @ stdcall KiIpiServiceRoutine(ptr ptr) @ fastcall KiReleaseSpinLock(ptr) @ cdecl KiUnexpectedInterrupt() -#ifdef _M_IX86 -;Kii386SpinOnSpinLock -#endif +;-arch=i386 Kii386SpinOnSpinLock @ stdcall LdrAccessResource(ptr ptr ptr ptr) @ stdcall LdrEnumResources(ptr ptr long ptr ptr) @ stdcall LdrFindResourceDirectory_U(ptr ptr long ptr) @@ -1568,19 +1543,17 @@ #ifndef __x86_64 @ cdecl _abnormal_termination() #endif -#ifdef _M_IX86 -@ cdecl _alldiv() -@ cdecl _alldvrm() -@ cdecl _allmul() -@ cdecl _alloca_probe() -@ cdecl _allrem() -@ cdecl _allshl() -@ cdecl _allshr() -@ cdecl _aulldiv() -@ cdecl _aulldvrm() -@ cdecl _aullrem() -@ cdecl _aullshr() -#endif +@ cdecl -arch=i386 _alldiv() +@ cdecl -arch=i386 _alldvrm() +@ cdecl -arch=i386 _allmul() +@ cdecl -arch=i386 _alloca_probe() +@ cdecl -arch=i386 _allrem() +@ cdecl -arch=i386 _allshl() +@ cdecl -arch=i386 _allshr() +@ cdecl -arch=i386 _aulldiv() +@ cdecl -arch=i386 _aulldvrm() +@ cdecl -arch=i386 _aullrem() +@ cdecl -arch=i386 _aullshr() #ifndef __x86_64 @ cdecl _except_handler2() @ cdecl _except_handler3()

15 years, 10 months

[tkreuzer] 39543: Fix some hal function declarations

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 10 16:52:26 2009 New Revision: 39543 URL: http://svn.reactos.org/svn/reactos?rev=39543&view=rev Log: Fix some hal function declarations Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Tue Feb 10 16:52:26 2009 @@ -10457,7 +10457,7 @@ #if (NTDDI_VERSION >= NTDDI_WIN2K) //DECLSPEC_DEPRECATED_DDK -NTKERNELAPI +NTHALAPI BOOLEAN NTAPI IoFlushAdapterBuffers( @@ -10469,14 +10469,14 @@ IN BOOLEAN WriteToDevice); //DECLSPEC_DEPRECATED_DDK -NTKERNELAPI +NTHALAPI VOID NTAPI IoFreeAdapterChannel( IN PADAPTER_OBJECT AdapterObject); //DECLSPEC_DEPRECATED_DDK -NTKERNELAPI +NTHALAPI VOID NTAPI IoFreeMapRegisters( @@ -10485,7 +10485,7 @@ IN ULONG NumberOfMapRegisters); //DECLSPEC_DEPRECATED_DDK -NTKERNELAPI +NTHALAPI PHYSICAL_ADDRESS NTAPI IoMapTransfer(

15 years, 10 months

[janderwald] 39542: - Implement KsDefaultDispatchPnp, KsAcquireDeviceSecurityLock, KsReleaseDeviceSecurityLock, KsAddObjectCreateItemToDeviceHeader, KsAllocateDeviceHeader, KsAllocateObjectCreateItem, KsAllocateObjectHeader, KsSetMajorFunctionHandler, KsDispatchIrp, - Fix KsAddObjectCreateItemToObjectHeader prototype

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 10 16:29:29 2009 New Revision: 39542 URL: http://svn.reactos.org/svn/reactos?rev=39542&view=rev Log: - Implement KsDefaultDispatchPnp, KsAcquireDeviceSecurityLock, KsReleaseDeviceSecurityLock, KsAddObjectCreateItemToDeviceHeader, KsAllocateDeviceHeader, KsAllocateObjectCreateItem, KsAllocateObjectHeader, KsSetMajorFunctionHandler, KsDispatchIrp, - Fix KsAddObjectCreateItemToObjectHeader prototype Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kstypes.h trunk/reactos/drivers/ksfilter/ks/misc.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Tue Feb 10 16:29:29 2009 @@ -29,21 +29,6 @@ IN PDRIVER_CANCEL DriverCancel OPTIONAL) { UNIMPLEMENTED; -} - -/* - @unimplemented -*/ -KSDDKAPI NTSTATUS NTAPI -KsAddObjectCreateItemToDeviceHeader( - IN KSDEVICE_HEADER Header, - IN PDRIVER_DISPATCH Create, - IN PVOID Context, - IN PWCHAR ObjectClass, - IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; } /* @@ -61,29 +46,150 @@ return STATUS_UNSUCCESSFUL; } -/* - @unimplemented + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsAddObjectCreateItemToDeviceHeader( + IN KSDEVICE_HEADER DevHeader, + IN PDRIVER_DISPATCH Create, + IN PVOID Context, + IN PWCHAR ObjectClass, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + PKSIDEVICE_HEADER Header; + PKSOBJECT_CREATE_ITEM ItemList; + PKSIOBJECT_HEADER ObjectList; + + Header = (PKSIDEVICE_HEADER)DevHeader; + + if (!DevHeader) + return STATUS_INVALID_PARAMETER_1; + + if (!Create) + return STATUS_INVALID_PARAMETER_2; + + if (!ObjectClass) + return STATUS_INVALID_PARAMETER_4; + + if (Header->FreeIndex >= Header->MaxItems && Header->ItemsListProvided) + return STATUS_ALLOTTED_SPACE_EXCEEDED; + + if (Header->FreeIndex >= Header->MaxItems) + { + ItemList = ExAllocatePoolWithTag(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM) * (Header->MaxItems + 1), TAG('H','D','S','K')); + if (!ItemList) + return STATUS_INSUFFICIENT_RESOURCES; + + ObjectList = ExAllocatePoolWithTag(PagedPool, sizeof(KSIOBJECT_HEADER) * (Header->MaxItems + 1), TAG('H','D','S','K')); + if (!ObjectList) + { + ExFreePoolWithTag(ItemList, TAG('H','D','S','K')); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlMoveMemory(ItemList, Header->ItemsList, Header->MaxItems * sizeof(KSOBJECT_CREATE_ITEM)); + ExFreePoolWithTag(Header->ItemsList, TAG('H','D','S','K')); + + RtlMoveMemory(ObjectList, Header->ObjectList, Header->MaxItems * sizeof(KSIOBJECT_HEADER)); + ExFreePoolWithTag(Header->ObjectList, TAG('H','D','S','K')); + + Header->MaxItems++; + Header->ItemsList = ItemList; + } + + if (Header->FreeIndex < Header->MaxItems) + { + Header->ItemsList[Header->FreeIndex].Context = Context; + Header->ItemsList[Header->FreeIndex].Create = Create; + Header->ItemsList[Header->FreeIndex].Flags = 0; + RtlInitUnicodeString(&Header->ItemsList[Header->FreeIndex].ObjectClass, ObjectClass); + Header->ItemsList[Header->FreeIndex].SecurityDescriptor = SecurityDescriptor; + + Header->FreeIndex++; + return STATUS_SUCCESS; + } + + return STATUS_ALLOTTED_SPACE_EXCEEDED; +} + +/* + @implemented */ KSDDKAPI NTSTATUS NTAPI KsAllocateDeviceHeader( - OUT KSDEVICE_HEADER* Header, + OUT KSDEVICE_HEADER* OutHeader, IN ULONG ItemsCount, IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL) { - /* Allocates memory for the KSDEVICE_HEADER structure */ - - if ( ! Header ) + PKSIDEVICE_HEADER Header; + + if (!OutHeader) return STATUS_INVALID_PARAMETER; - Header = ExAllocatePoolWithTag(PagedPool, sizeof(KSDEVICE_HEADER), TAG('H','D','S','K')); - - if ( ! Header ) + Header = ExAllocatePoolWithTag(PagedPool, sizeof(KSIDEVICE_HEADER), TAG('H','D','S','K')); + + if (!Header) return STATUS_INSUFFICIENT_RESOURCES; - /* TODO: Actually do something with the header, perhaps? */ + RtlZeroMemory(Header, sizeof(KSIDEVICE_HEADER)); + + if (ItemsCount) + { + Header->ObjectList = ExAllocatePoolWithTag(PagedPool, sizeof(KSIOBJECT_HEADER) * ItemsCount, TAG('H','D','S','K')); + if (!Header->ObjectList) + { + ExFreePoolWithTag(Header, TAG('H','D','S','K')); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlZeroMemory(Header->ObjectList, sizeof(KSIOBJECT_HEADER) * ItemsCount); + } + + Header->MaxItems = ItemsCount; + Header->FreeIndex = 0; + Header->ItemsList = ItemsList; + Header->ItemsListProvided = (ItemsList != NULL) ? TRUE : FALSE; + + *OutHeader = Header; return STATUS_SUCCESS; } + +/* + @unimplemented + + http://www.osronline.com/DDKx/stream/ksfunc_3sc3.htm +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsAllocateObjectCreateItem( + IN KSDEVICE_HEADER DevHeader, + IN PKSOBJECT_CREATE_ITEM CreateItem, + IN BOOLEAN AllocateEntry, + IN PFNKSITEMFREECALLBACK ItemFreeCallback OPTIONAL) +{ + PKSIDEVICE_HEADER Header; + + Header = (PKSIDEVICE_HEADER)DevHeader; + + if (!DevHeader) + return STATUS_INVALID_PARAMETER_1; + + if (!CreateItem) + return STATUS_INVALID_PARAMETER_2; + + //FIXME + //handle ItemFreeCallback + // + + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + /* @unimplemented @@ -92,7 +198,7 @@ KsFreeDeviceHeader( IN KSDEVICE_HEADER Header) { - if ( ! Header ) + if (!Header) return; /* TODO: Free content first */ @@ -108,22 +214,6 @@ IN PIRP Irp, IN ULONG ExtraSize, OUT PVOID* ExtraBuffer) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - @unimplemented - - http://www.osronline.com/DDKx/stream/ksfunc_3sc3.htm -*/ -KSDDKAPI NTSTATUS NTAPI -KsAllocateObjectCreateItem( - IN KSDEVICE_HEADER Header, - IN PKSOBJECT_CREATE_ITEM CreateItem, - IN BOOLEAN AllocateEntry, - IN PFNKSITEMFREECALLBACK ItemFreeCallback OPTIONAL) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -139,7 +229,9 @@ http://www.osronline.com/DDKx/stream/ksfunc_0u2b.htm */ -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsAllocateObjectHeader( OUT KSOBJECT_HEADER *Header, IN ULONG ItemsCount, @@ -147,23 +239,23 @@ IN PIRP Irp, IN KSDISPATCH_TABLE* Table) { - PKSIOBJECT_HEADER ObjectHeader; - - ObjectHeader = ExAllocatePoolWithTag(PagedPool, sizeof(KSIOBJECT_HEADER), TAG_KSOBJECT_TAG); - if (!ObjectHeader) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlZeroMemory(ObjectHeader, sizeof(KSIOBJECT_HEADER)); - - RtlCopyMemory(&ObjectHeader->DispatchTable, Table, sizeof(KSDISPATCH_TABLE)); - ObjectHeader->CreateItem = ItemsList; - - //FIXME - // copy itemlist - - *Header = ObjectHeader; + PKSIDEVICE_HEADER DeviceHeader; + ULONG Index; + + if (!Header) + return STATUS_INVALID_PARAMETER_1; + + if (!Irp) + return STATUS_INVALID_PARAMETER_4; + + DeviceHeader = (PKSIDEVICE_HEADER)Irp->Tail.Overlay.DriverContext[3]; + Index = (ULONG)Irp->Tail.Overlay.DriverContext[2]; + + RtlCopyMemory(&DeviceHeader->ObjectList[Index].DispatchTable, Table, sizeof(KSDISPATCH_TABLE)); + DeviceHeader->ObjectList[Index].CreateItem = ItemsList; + DeviceHeader->ObjectList[Index].Initialized = TRUE; + + *Header = &DeviceHeader->ObjectList[Index]; return STATUS_SUCCESS; } @@ -270,26 +362,6 @@ @unimplemented */ KSDDKAPI NTSTATUS NTAPI -KsDispatchIrp( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - /* Calls a dispatch routine corresponding to the function code of the IRP */ - - /* - First we need to get the dispatch table. An opaque header is pointed to by - FsContext. The first element points to this table. This table is the key - to dispatching the IRP correctly. - */ - - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - @unimplemented -*/ -KSDDKAPI NTSTATUS NTAPI KsDispatchSpecificMethod( IN PIRP Irp, IN PFNKSHANDLER Handler) @@ -486,83 +558,188 @@ -/* - IRP handlers - NOT USED -*/ -#if 0 +NTAPI +NTSTATUS +KsCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PDEVICE_EXTENSION DeviceExtension; + PKSIDEVICE_HEADER DeviceHeader; + ULONG Index; + NTSTATUS Status; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceHeader = DeviceExtension->DeviceHeader; + + DPRINT1("KS / Create\n"); + + /* first call all create handlers */ + for(Index = 0; Index < DeviceHeader->FreeIndex; Index++) + { + KSCREATE_ITEM_IRP_STORAGE(Irp) = &DeviceHeader->ItemsList[Index]; + + Irp->Tail.Overlay.DriverContext[3] = (PVOID)DeviceHeader; + Irp->Tail.Overlay.DriverContext[2] = (PVOID)Index; + + DeviceHeader->ObjectList[Index].Initialized = FALSE; + Status = DeviceHeader->ItemsList[Index].Create(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + DeviceHeader->ObjectList[Index].Initialized = FALSE; + } + } + + + return STATUS_SUCCESS; +} + static NTAPI NTSTATUS -KsCreate( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT1("KS / Create\n"); - return STATUS_UNSUCCESSFUL; +KsClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PDEVICE_EXTENSION DeviceExtension; + PKSIDEVICE_HEADER DeviceHeader; + ULONG Index; + NTSTATUS Status; + + DPRINT1("KS / CLOSE\n"); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceHeader = DeviceExtension->DeviceHeader; + + for(Index = 0; Index < DeviceHeader->FreeIndex; Index++) + { + if (DeviceHeader->ObjectList[Index].Initialized) + { + Status = DeviceHeader->ObjectList->DispatchTable.Close(DeviceObject, Irp); + DeviceHeader->ObjectList[Index].Initialized = FALSE; + } + } + + return STATUS_SUCCESS; } static NTAPI NTSTATUS -KsClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT1("KS / Close\n"); - return STATUS_UNSUCCESSFUL; +KsDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PDEVICE_EXTENSION DeviceExtension; + PKSIDEVICE_HEADER DeviceHeader; + ULONG Index; + NTSTATUS Status; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceHeader = DeviceExtension->DeviceHeader; + + DPRINT1("KS / DeviceControl NumDevices %x\n", DeviceHeader->FreeIndex); + + for(Index = 0; Index < DeviceHeader->FreeIndex; Index++) + { + if (DeviceHeader->ObjectList[Index].Initialized) + { + DPRINT1("Calling DeviceIoControl\n"); + Status = DeviceHeader->ObjectList->DispatchTable.DeviceIoControl(DeviceObject, Irp); + } + } + + return STATUS_SUCCESS; } static NTAPI NTSTATUS -KsDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT1("KS / DeviceControl\n"); - return STATUS_UNSUCCESSFUL; +KsRead( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PDEVICE_EXTENSION DeviceExtension; + PKSIDEVICE_HEADER DeviceHeader; + ULONG Index; + NTSTATUS Status; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceHeader = DeviceExtension->DeviceHeader; + + DPRINT1("KS / Read\n"); + + for(Index = 0; Index < DeviceHeader->FreeIndex; Index++) + { + if (DeviceHeader->ObjectList[Index].Initialized) + { + Status = DeviceHeader->ObjectList->DispatchTable.Read(DeviceObject, Irp); + } + } + + return STATUS_SUCCESS; } static NTAPI NTSTATUS -KsRead( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT1("KS / Read\n"); - return STATUS_UNSUCCESSFUL; +KsWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PDEVICE_EXTENSION DeviceExtension; + PKSIDEVICE_HEADER DeviceHeader; + ULONG Index; + NTSTATUS Status; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceHeader = DeviceExtension->DeviceHeader; + + DPRINT1("KS / Write\n"); + + for(Index = 0; Index < DeviceHeader->FreeIndex; Index++) + { + if (DeviceHeader->ObjectList[Index].Initialized) + { + Status = DeviceHeader->ObjectList->DispatchTable.Write(DeviceObject, Irp); + } + } + return STATUS_SUCCESS; } static NTAPI NTSTATUS -KsWrite( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT1("KS / Write\n"); +KsFlushBuffers( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / FlushBuffers\n"); return STATUS_UNSUCCESSFUL; } static NTAPI NTSTATUS -KsFlushBuffers( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT1("KS / FlushBuffers\n"); +KsQuerySecurity( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / QuerySecurity\n"); return STATUS_UNSUCCESSFUL; } static NTAPI NTSTATUS -KsQuerySecurity( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT1("KS / QuerySecurity\n"); - return STATUS_UNSUCCESSFUL; -} - -static NTAPI -NTSTATUS KsSetSecurity( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -570,40 +747,9 @@ DPRINT1("KS / SetSecurity\n"); return STATUS_UNSUCCESSFUL; } -#endif - - -static NTAPI -NTSTATUS -KsInternalIrpDispatcher( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - - /* TODO - Nothing implemented really yet! */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - - DPRINT1("KS IRP dispatch function called with func %x\n", IoStack->MajorFunction); - - /* ks_dispatch_table is the first element in a structure pointed to by FsContext */ - - switch ( IoGetCurrentIrpStackLocation(Irp)->MajorFunction ) - { - case IRP_MJ_CREATE : -/* return ks_dispatch_table->Create(DeviceObject, Irp);*/ - - /* TODO ... */ - - default : - return STATUS_INVALID_PARAMETER; - }; -} - - -/* - @unimplemented + +/* + @implemented */ KSDDKAPI NTSTATUS NTAPI KsSetMajorFunctionHandler( @@ -619,23 +765,90 @@ switch ( MajorFunction ) { - case IRP_MJ_CREATE : - case IRP_MJ_CLOSE : - case IRP_MJ_DEVICE_CONTROL : - case IRP_MJ_READ : - case IRP_MJ_WRITE : + case IRP_MJ_CREATE: + DriverObject->MajorFunction[MajorFunction] = KsCreate; + break; + case IRP_MJ_CLOSE: + DriverObject->MajorFunction[MajorFunction] = KsClose; + break; + case IRP_MJ_DEVICE_CONTROL: + DriverObject->MajorFunction[MajorFunction] = KsDeviceControl; + break; + case IRP_MJ_READ: + DriverObject->MajorFunction[MajorFunction] = KsRead; + break; + case IRP_MJ_WRITE: + DriverObject->MajorFunction[MajorFunction] = KsWrite; + break; case IRP_MJ_FLUSH_BUFFERS : - case IRP_MJ_QUERY_SECURITY : - case IRP_MJ_SET_SECURITY : - DriverObject->MajorFunction[MajorFunction] = KsInternalIrpDispatcher; - break; - - default : + DriverObject->MajorFunction[MajorFunction] = KsFlushBuffers; + break; + case IRP_MJ_QUERY_SECURITY: + DriverObject->MajorFunction[MajorFunction] = KsQuerySecurity; + break; + case IRP_MJ_SET_SECURITY: + DriverObject->MajorFunction[MajorFunction] = KsSetSecurity; + break; + + default: return STATUS_INVALID_PARAMETER; /* is this right? */ }; return STATUS_SUCCESS; } + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsDispatchIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + + /* Calls a dispatch routine corresponding to the function code of the IRP */ + /* + First we need to get the dispatch table. An opaque header is pointed to by + FsContext. The first element points to this table. This table is the key + to dispatching the IRP correctly. + */ + + IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("KsDispatchIrp %x\n", IoStack->MajorFunction); + + switch (IoStack->MajorFunction) + { + case IRP_MJ_CREATE: + return KsCreate(DeviceObject, Irp); + case IRP_MJ_CLOSE: + return KsClose(DeviceObject, Irp); + break; + case IRP_MJ_DEVICE_CONTROL: + return KsDeviceControl(DeviceObject, Irp); + break; + case IRP_MJ_READ: + return KsRead(DeviceObject, Irp); + break; + case IRP_MJ_WRITE: + return KsWrite(DeviceObject, Irp); + break; + case IRP_MJ_FLUSH_BUFFERS: + return KsFlushBuffers(DeviceObject, Irp); + break; + case IRP_MJ_QUERY_SECURITY: + return KsQuerySecurity(DeviceObject, Irp); + break; + case IRP_MJ_SET_SECURITY: + return KsSetSecurity(DeviceObject, Irp); + break; + default: + return STATUS_INVALID_PARAMETER; /* is this right? */ + }; +} + /* @unimplemented Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Tue Feb 10 16:29:29 2009 @@ -7,11 +7,28 @@ LIST_ENTRY ListEntry; ACCESS_MASK AccessMask; PKSOBJECT_CREATE_ITEM CreateItem; + BOOL Initialized; }KSIOBJECT_HEADER, *PKSIOBJECT_HEADER; +typedef struct +{ + ULONG MaxItems; + ULONG FreeIndex; + PKSOBJECT_CREATE_ITEM ItemsList; + PKSIOBJECT_HEADER ObjectList; + UCHAR ItemsListProvided; + PDEVICE_OBJECT LowerDeviceObject; + + ERESOURCE SecurityLock; +}KSIDEVICE_HEADER, *PKSIDEVICE_HEADER; +typedef struct +{ + PKSIDEVICE_HEADER DeviceHeader; + +}DEVICE_EXTENSION, *PDEVICE_EXTENSION; Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Feb 10 16:29:29 2009 @@ -1,6 +1,4 @@ -#include <ntddk.h> -#include <debug.h> -#include <ks.h> +#include "priv.h" /* =============================================================== Misc. Helper Functions @@ -22,13 +20,42 @@ /* @unimplemented */ + KSDDKAPI NTSTATUS NTAPI KsDefaultDispatchPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status = STATUS_SUCCESS; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT1("KsDefaultDispatchPnp entered with func %x\n", IoStack->MinorFunction); + + switch(IoStack->MinorFunction) + { + case IRP_MN_QUERY_DEVICE_RELATIONS: + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; + case IRP_MN_REMOVE_DEVICE: + // FIXME + // destroy device header, detach device and delete device + case IRP_MN_START_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + return STATUS_SUCCESS; + default: + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + //Status = IoCallDriver(NULL /* PnpBaseObject */, Irp); + } + + return Status; } /* @@ -219,4 +246,43 @@ } - +/* + @implemented +*/ +KSDDKAPI +VOID +NTAPI +KsAcquireDeviceSecurityLock( + IN KSDEVICE_HEADER DevHeader, + IN BOOLEAN Exclusive) +{ + NTSTATUS Status; + PKSIDEVICE_HEADER Header = (PKSIDEVICE_HEADER)DevHeader; + + KeEnterCriticalRegion(); + + if (Exclusive) + { + Status = ExAcquireResourceExclusiveLite(&Header->SecurityLock, TRUE); + } + else + { + Status = ExAcquireResourceSharedLite(&Header->SecurityLock, TRUE); + } +} + +/* + @implemented +*/ +KSDDKAPI +VOID +NTAPI +KsReleaseDeviceSecurityLock( + IN KSDEVICE_HEADER DevHeader) +{ + PKSIDEVICE_HEADER Header = (PKSIDEVICE_HEADER)DevHeader; + + ExReleaseResourceLite(&Header->SecurityLock); + KeLeaveCriticalRegion(); +} +

15 years, 10 months

[janderwald] 39541: - Increase reference count on ISubdevice interface after successfully allocating the device header - Delegate Create Request to Ks - Implement KSDISPATCH_TABLE for IPortTopology - KSDEVICE_HEADER must be the first item in the device extension

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 10 16:17:33 2009 New Revision: 39541 URL: http://svn.reactos.org/svn/reactos?rev=39541&view=rev Log: - Increase reference count on ISubdevice interface after successfully allocating the device header - Delegate Create Request to Ks - Implement KSDISPATCH_TABLE for IPortTopology - KSDEVICE_HEADER must be the first item in the device extension Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Tue Feb 10 16:17:33 2009 @@ -12,6 +12,7 @@ #include "private.h" #include <devguid.h> #include <initguid.h> +#include <ksmedia.h> /* This is called from DriverEntry so that PortCls can take care of some @@ -199,58 +200,6 @@ return status; } -NTSTATUS -NTAPI -PciDriverDispatch( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - NTSTATUS Status; - - ISubdevice * SubDevice; - PPCLASS_DEVICE_EXTENSION DeviceExt; - SUBDEVICE_ENTRY * Entry; - KSDISPATCH_TABLE DispatchTable; - - DPRINT1("PortClsSysControl called\n"); - - SubDevice = (ISubdevice*)Irp->Tail.Overlay.DriverContext[3]; - DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (!SubDevice || !DeviceExt) - { - return STATUS_UNSUCCESSFUL; - } - - Entry = AllocateItem(NonPagedPool, sizeof(SUBDEVICE_ENTRY), TAG_PORTCLASS); - if (!Entry) - return STATUS_INSUFFICIENT_RESOURCES; - - /* initialize DispatchTable */ - RtlZeroMemory(&DispatchTable, sizeof(KSDISPATCH_TABLE)); - /* FIXME - * initialize DispatchTable pointer - * which call in turn ISubDevice - */ - - - Status = KsAllocateObjectHeader(&Entry->ObjectHeader, 1, NULL, Irp, &DispatchTable); - if (!NT_SUCCESS(Status)) - { - FreeItem(Entry, TAG_PORTCLASS); - return Status; - } - - - InsertTailList(&DeviceExt->SubDeviceList, &Entry->Entry); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; -} - NTSTATUS NTAPI PcRegisterSubdevice( IN PDEVICE_OBJECT DeviceObject, @@ -283,8 +232,7 @@ /* the provided port driver doesnt support ISubdevice */ return STATUS_INVALID_PARAMETER; } -#if KS_IMPLEMENTED - Status = KsAddObjectCreateItemToDeviceHeader(DeviceExt->KsDeviceHeader, PciDriverDispatch, (PVOID)SubDevice, Name, NULL); + Status = KsAddObjectCreateItemToDeviceHeader(DeviceExt->KsDeviceHeader, PcCreateItemDispatch, (PVOID)SubDevice, Name, NULL); if (!NT_SUCCESS(Status)) { /* failed to attach */ @@ -292,8 +240,7 @@ DPRINT1("KsAddObjectCreateItemToDeviceHeader failed with %x\n", Status); return Status; } -#endif - + SubDevice->lpVtbl->AddRef(SubDevice); Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &SubDeviceDescriptor); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Tue Feb 10 16:17:33 2009 @@ -49,13 +49,7 @@ { DPRINT1("PortClsCreate called\n"); - /* TODO */ - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; + return KsDispatchIrp(DeviceObject, Irp); } @@ -234,19 +228,8 @@ case IRP_MJ_SYSTEM_CONTROL : return PortClsSysControl(DeviceObject, Irp); - /* KS - TODO */ - -#if 0 - KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CLOSE); - KsSetMajorFunctionHandler(DriverObject, IRP_MJ_DEVICE_CONTROL); - KsSetMajorFunctionHandler(DriverObject, IRP_MJ_FLUSH_BUFFERS); - KsSetMajorFunctionHandler(DriverObject, IRP_MJ_QUERY_SECURITY); - KsSetMajorFunctionHandler(DriverObject, IRP_MJ_READ); - KsSetMajorFunctionHandler(DriverObject, IRP_MJ_SET_SECURITY); - KsSetMajorFunctionHandler(DriverObject, IRP_MJ_WRITE); -#endif - - default : + default: + DPRINT1("Unhandled function %x\n", IoStack->MajorFunction); break; }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Tue Feb 10 16:17:33 2009 @@ -434,6 +434,228 @@ NTSTATUS +NTAPI +ITopology_fnDeviceIoControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("ITopology_fnDeviceIoControl called\n"); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +ITopology_fnRead( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("ITopology_fnRead called\n"); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +ITopology_fnWrite( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("ITopology_fnWrite called\n"); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +ITopology_fnFlush( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("ITopology_fnFlush called\n"); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +ITopology_fnClose( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("ITopology_fnClose called\n"); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +ITopology_fnQuerySecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("ITopology_fnQuerySecurity called\n"); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +ITopology_fnSetSecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("ITopology_fnSetSecurity called\n"); + + return STATUS_SUCCESS; +} + +BOOLEAN +NTAPI +ITopology_fnFastDeviceIoControl( + PFILE_OBJECT FileObject, + BOOLEAN Wait, + PVOID InputBuffer, + ULONG InputBufferLength, + PVOID OutputBuffer, + ULONG OutputBufferLength, + ULONG IoControlCode, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("ITopology_fnFastDeviceIoControl called\n"); + + return TRUE; +} + + +BOOLEAN +NTAPI +ITopology_fnFastRead( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("ITopology_fnFastRead called\n"); + + return TRUE; + +} + +BOOLEAN +NTAPI +ITopology_fnFastWrite( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("ITopology_fnFastWrite called\n"); + + return TRUE; +} + +static KSDISPATCH_TABLE DispatchTable = +{ + ITopology_fnDeviceIoControl, + ITopology_fnRead, + ITopology_fnWrite, + ITopology_fnFlush, + ITopology_fnClose, + ITopology_fnQuerySecurity, + ITopology_fnSetSecurity, + ITopology_fnFastDeviceIoControl, + ITopology_fnFastRead, + ITopology_fnFastWrite, +}; + +NTSTATUS +NTAPI +PcCreateItemDispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_SUCCESS; + + ISubdevice * SubDevice; + PPCLASS_DEVICE_EXTENSION DeviceExt; + SUBDEVICE_ENTRY * Entry; + PKSOBJECT_CREATE_ITEM CreateItem; + + DPRINT1("PcCreateItemDispatch called\n"); + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + if (!CreateItem) + { + DPRINT1("PcCreateItemDispatch no CreateItem\n"); + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + + SubDevice = (ISubdevice*)CreateItem->Context; + DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (!SubDevice || !DeviceExt) + { + DPRINT1("PcCreateItemDispatch SubDevice %p DeviceExt %p\n", SubDevice, DeviceExt); + + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + + Entry = AllocateItem(NonPagedPool, sizeof(SUBDEVICE_ENTRY), TAG_PORTCLASS); + if (!Entry) + { + DPRINT1("PcCreateItemDispatch no memory\n"); + + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } +#if 0 + Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); + if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) + { + DPRINT1("PciCreateItemDispatch failed to reference device header\n"); + + FreeItem(Entry, TAG_PORTCLASS); + goto cleanup; + } +#endif + + Status = KsAllocateObjectHeader(&Entry->ObjectHeader, 0, NULL, Irp, &DispatchTable); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsAllocateObjectHeader failed with %x\n", Status); + //KsDereferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); + FreeItem(Entry, TAG_PORTCLASS); + return Status; + } + + InsertTailList(&DeviceExt->SubDeviceList, &Entry->Entry); + + +cleanup: + // Irp->IoStatus.Status = Status; + // Irp->IoStatus.Information = 0; + // IoCompleteRequest(Irp, IO_NO_INCREMENT); + + DPRINT1("PcCreateItemDispatch Status %x\n", Status); + return Status; +} + + + +NTSTATUS NewPortTopology( OUT PPORT* OutPort) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Tue Feb 10 16:17:33 2009 @@ -12,7 +12,6 @@ #define YDEBUG #include <debug.h> -#include <portcls.h> #include <dmusicks.h> #include "interfaces.h" @@ -118,10 +117,10 @@ typedef struct { + KSDEVICE_HEADER KsDeviceHeader; PDEVICE_OBJECT PhysicalDeviceObject; PDEVICE_OBJECT PrevDeviceObject; PCPFNSTARTDEVICE StartDevice; - KSDEVICE_HEADER KsDeviceHeader; IAdapterPowerManagement * AdapterPowerManagement; ULONG MaxSubDevices; KSOBJECT_CREATE_ITEM * CreateItems; @@ -178,4 +177,11 @@ IN KSEVENT_SET * EventSet, IN PPCFILTER_DESCRIPTOR FilterDescription); +NTSTATUS +NTAPI +PcCreateItemDispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + #endif

15 years, 10 months

← Newer
1
...
25
26
27
28
29
30
31
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009