revert cache manager rewrite branch

svn path=/branches/cache_manager_rewrite/; revision=21275

reactos/.hgeol

@@ -1,31 +0,0 @@
-[patterns]
-**.txt = native
-**.cmake = native
-**.asm = native
-**.S = native
-**.cxx = native
-**.cpp = native
-**.hpp = native
-**.hxx = native
-**.c = native
-**.h = native
-**.py = native
-**.rc = native
-**.html = native
-**.bat = native
-**.cmd = native
-**.mak = native
-**makefile = native
-**.manifest = native
-**.properties = native
-**.dsp = native
-**.sln = native
-**.vcproj = native
-**.gen = native
-**.bmp = BIN
-**.cur = BIN
-**.ico = BIN
-**.jpg = BIN
-**.png = BIN
-tgzsrc = LF
-scripts/ba = LF

reactos/CMakeLists.txt

@@ -1,235 +0,0 @@
-
-cmake_minimum_required(VERSION 2.6)
-
-if(POLICY CMP0017)
-    # Shadow cmake provided modules
-    cmake_policy(SET CMP0017 OLD)
-endif()
-
-project(REACTOS)
-
-# Versioning
-include(include/reactos/version.cmake)
-
-# Don't escape preprocessor definition values added via add_definitions
-cmake_policy(SET CMP0005 OLD)
-cmake_policy(SET CMP0002 NEW)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
-set(CMAKE_SHARED_LIBRARY_PREFIX "")
-set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
-set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
-set(CMAKE_COLOR_MAKEFILE OFF)
-#set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
-
-if(NOT ARCH)
-    set(ARCH i386)
-endif()
-string(TOLOWER ${ARCH} ARCH)
-
-# Compile options
-if(ARCH MATCHES i386)
-    include(cmake/config.cmake)
-elseif(ARCH MATCHES amd64)
-    include(cmake/config-amd64.cmake)
-elseif(ARCH MATCHES arm)
-    include(cmake/config-arm.cmake)
-endif()
-
-# Compiler flags handling
-include(cmake/compilerflags.cmake)
-
-add_definitions(-D__REACTOS__ -D__ROS_CMAKE__)
-
-if(NOT CMAKE_CROSSCOMPILING)
-
-    add_definitions(-DTARGET_${ARCH})
-
-    if(MSVC)
-        if(ARCH MATCHES i386)
-            add_definitions(/DWIN32 /D_WINDOWS)
-        endif()
-        add_definitions(/Dinline=__inline)
-    else()
-        add_compile_flags("-fshort-wchar -Wno-multichar")
-    endif()
-
-    include_directories(include/host)
-
-    add_subdirectory(tools)
-    add_subdirectory(lib)
-
-    if(NOT MSVC)
-        export(TARGETS widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
-    else()
-        export(TARGETS gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
-    endif()
-
-else()
-
-    # adjust the default behaviour of the FIND_XXX() commands:
-    # search headers and libraries in the target environment, search
-    # programs in the host environment
-    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
-    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
-
-    #useful stuff!
-    include(CMakeParseArguments)
-    
-    # this is needed as well
-    link_directories(${REACTOS_SOURCE_DIR}/importlibs)
-    
-    if(ENABLE_CCACHE)
-        set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
-        set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
-    endif()
-
-    # Do some cleanup
-    file(REMOVE
-        ${REACTOS_BINARY_DIR}/dependencies.graphml
-        ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt
-        ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt
-        ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt
-        ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt
-        ${REACTOS_BINARY_DIR}/boot/ros_cab.txt
-        ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt)
-
-    if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR)
-        set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build)
-    endif()
-
-    set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
-    include(${IMPORT_EXECUTABLES})
-
-    if(DBG)
-        add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE)
-    endif()
-
-    if(KDBG)
-        add_definitions(-DKDBG=1)
-    endif()
-
-    if(_WINKD_)
-        add_definitions(-D_WINKD_=1)
-    endif()
-
-    # Version Options
-    add_definitions(-DWINVER=0x502
-                    -D_WIN32_IE=0x600
-                    -D_WIN32_WINNT=0x502
-                    -D_WIN32_WINDOWS=0x502
-                    -D_SETUPAPI_VER=0x502)
-
-    # Arch Options
-    if(ARCH MATCHES i386)
-        add_definitions(-D_M_IX86 -D_X86_ -D__i386__)
-    elseif(ARCH MATCHES amd64)
-        add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64)
-    elseif(ARCH MATCHES arm)
-        # _M_ARM is already defined by toolchain
-        add_definitions(-D_ARM_ -D__arm__)
-    endif()
-
-    # Other
-    if(ARCH MATCHES i386)
-        add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T)
-    elseif(ARCH MATCHES amd64)
-        add_definitions(-DUSE_COMPILER_EXCEPTIONS -DNO_UNDERSCORE_PREFIX)
-    elseif(ARCH MATCHES arm)
-        add_definitions(-DUSE_COMPILER_EXCEPTIONS)
-    endif()
-    
-    # Activate support for assembly source files
-    enable_language(ASM)
-
-    # Activate language support for resource files
-    enable_language(RC)
-
-    # Localization definitions
-    include(cmake/localization.cmake)
-    set(I18N_DEFS "")
-    # This will set I18N_DEFS for later use
-    set_i18n_language(${I18N_LANG})
-
-    # Compiler specific definitions and macros
-    if(MSVC)
-        include(cmake/msvc.cmake)
-    else()
-        include(cmake/gcc.cmake)
-    endif()
-
-    # Generic macros
-    include(cmake/CMakeMacros.cmake)
-
-    # IDL macros for widl/midl
-    include(cmake/idl-support.cmake)
-
-    if(MSVC AND USE_WDK_HEADERS)
-        include_directories(
-            include
-            $ENV{SDK_INC_PATH}
-            include/dxsdk
-            ${REACTOS_BINARY_DIR}/include
-            ${REACTOS_BINARY_DIR}/include/dxsdk
-            ${REACTOS_BINARY_DIR}/include/psdk
-            ${REACTOS_BINARY_DIR}/include/reactos
-            $ENV{CRT_INC_PATH}
-            $ENV{DDK_INC_PATH}
-            include/ndk
-            include/reactos
-            include/reactos/libs)
-    else()
-        include_directories(
-            include
-            include/psdk
-            include/dxsdk
-            ${REACTOS_BINARY_DIR}/include
-            ${REACTOS_BINARY_DIR}/include/dxsdk
-            ${REACTOS_BINARY_DIR}/include/psdk
-            ${REACTOS_BINARY_DIR}/include/reactos
-            include/crt
-            include/ddk
-            include/ndk
-            include/reactos
-            include/reactos/libs)
-    endif()
-    
-
-    if(ARCH MATCHES arm)
-        include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm)
-    endif()
-
-    if(MSVC)
-        include_directories(include/crt/msc)
-    else()
-        include_directories(include/crt/mingw32)
-    endif()
-
-    add_dependency_header()
-
-    add_subdirectory(include/psdk)
-    add_subdirectory(include/dxsdk)
-    add_subdirectory(include/reactos/wine)
-    add_subdirectory(include/reactos/mc)
-    add_subdirectory(include/asm)
-
-    include(cmake/baseaddress.cmake)
-
-    #begin with boot so reactos_cab target is defined before all other modules
-    add_subdirectory(boot)
-    add_subdirectory(base)
-    add_subdirectory(dll)
-    add_subdirectory(drivers)
-    add_subdirectory(hal)
-    add_subdirectory(lib)
-    add_subdirectory(media)
-    add_subdirectory(modules)
-    add_subdirectory(ntoskrnl)
-    add_subdirectory(subsystems)
-
-    file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
-
-    add_dependency_footer()
-endif()

reactos/COPYING

@@ -1,12 +1,13 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +16,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +56,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +111,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +169,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +226,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +256,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +278,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +292,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 19yy  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,16 +304,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) 19yy name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.

reactos/COPYING.ARM

@@ -1,23 +0,0 @@
-Copyright 2008 ReactOS Portable Systems Group. All rights reserved. 
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided
-that the following conditions are met: 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and
-   the following disclaimer. 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
-   and the following disclaimer in the documentation and/or other materials provided with the 
-   distribution. 
-
-THIS SOFTWARE IS PROVIDED BY THE REACTOS PORTABLE SYSTEMS GROUP ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REACTOS PORTABLE SYSTEMS GROUP
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those of the authors and
-should not be interpreted as representing official policies, either expressed or implied, of the ReactOS
-Project.

reactos/COPYING.LIB

@@ -1,504 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

reactos/COPYING3

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

reactos/COPYING3.LIB

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

reactos/CREDITS

@@ -1,81 +1,79 @@
-ReactOS is available thanks to the work of:
+ReactOS is available thanks to the work of
 
-Aleksey Bragin <aleksey at reactos org>
-Alex Ionescu <alex.ionescu@reactos.org>
-Andrew Greenwood <lists@silverblade.co.uk>
-Andrew Munger <waxdragon@gmail.com>
-Arindam Das
-Art Yerkes <ayerkes@speakeasy.net>
-Ariadne
-Brandon Turner <turnerb7@msu.edu>
-Brian Palmer <brianp@sginet.com>
-Cameron M. Gutman <cgutman@reactos.org>
-Casper S. Hornstrup <chorns@users.sourceforge.net>
-Christoph von Wittich <christoph_vw@reactos.org>
-Daniel Reimer <reimer.daniel@freenet.de>
-David Welch <welch@cwcom.net>
-Dmitry Chapyshev <dmitry@reactos.org>
 Emanuele Aliberti <ea@iol.it>
-Eric Kohl
-Eugene Ingerman <geneing@myrealbox.com>
-Filip Navara <xnavara@volny.cz>
-Frederik Leemans
-Ge van Geldorp <ge@gse.nl>
-Ged Murphy <gedmurphy@reactos.org>
-Gregor Brunmar <gregor brunmar at home se>
-Gregor Schneider <grschneider@gmail.com>
-Guido de Jong
-Gunnar Andre' Dalsnes <hardon@online.no>
-Hans Kremer
-Hartmut Birr <hartmut.birr@gmx.de>
-Hernan Ochoa
-Herve Poussineau <hpoussin@reactos.com>
-Iwan Fatahi <i_fatahi@hotmail.com>
-James Tabor <james.tabor@reactos.org> <jimtabor.rosdev@gmail.com> <jamestabor_rosdev@yahoo.com>
-Jason Eager
-Jason Filby <jasonfilby@yahoo.com>
-Jason Weiler
-Jean Michault
-Jeffrey Morlan <mrnobo1024@yahoo.com> 
-Jim Noeth
-Johannes Anderwald <johannes.anderwald@student.tugraz.at> 
-Jonathan Wilson <jonwil@tpgi.com.au>
-Jurgen van Gael <jurgen.vangael@student.kuleuven.ac.be>
-KJK::Hyperion <noog@libero.it>
-Klemens R. Friedl <klemens_friedl@gmx.net>
-Maarten Bosma <maarten.paul@bosma.de>
-Magnus Olsen <magnus@greatlord.com>
-Mark Tempel <mtempel@visi.com>
-Mark Weaver <mark@npsl.co.uk>
-Martin Fuchs <martin-fuchs@gmx.net>
-Marty Dill <mdill@uvic.ca>
-Matthias Kupfer <mkupfer@reactos.org>
-Matt Pyne
-Mike Nordell <"tamlin">
-Nathan Woods <npwoods@mess.org>
-Pablo Borobia <pborobia@gmail.com>
-Paolo Pantaleo <paolopan@freemail.it>
-Peter Ward <dralnix@gmail.com>
-Pierre Schweitzer <pschweitzer@reactos.org>
-Phillip Susi <phreak@iag.net>
-Rafal Harabien <rafalh@reactos.org>
-Rex Jolliff <rex@lvcablemodem.com>
-Richard Campbell <betam4x@gmail.com>
 Robert Bergkvist <fragdance@hotmail.com>
+Hartmut Birr <hartmut.birr@gmx.de>
+Aleksey Bragin <aleksey@studiocerebral.com>
+Richard Campbell <betam4x@gmail.com>
+Gunnar Andre' Dalsnes <hardon@online.no>
+Arindam Das
+Boudewijn Dekker <ariadne@xs4all.nl>
 Robert Dickenson <robd@reactos.org>
-Royce Mitchell III <royce3@ev1.net>
-Samuel Serapi<70>n <samdwise51@gmail.com>
-Saveliy Tretiakov <saveliyt@mail.ru>
-Stefan Ginsberg <stefan__100__@hotmail.com>
-Steven Edwards <winehacker@gmail.com>
-Thomas Weidenmueller <w3seek@users.sourceforge.net>
-Timo Kreuzer <timo.kreuzer@reactos.org>
+Marty Dill <mdill@uvic.ca>
+Jason Eager
+Steven Edwards <steven_ed4153@yahoo.com>
+Iwan Fatahi <i_fatahi@hotmail.com>
+Jason Filby <jasonfilby@yahoo.com>
+Martin Fuchs <martin-fuchs@gmx.net>
+Jurgen van Gael <jurgen.vangael@student.kuleuven.ac.be>
+Ge van Geldorp <ge@gse.nl>
+Andrew Greenwood <lists@silverblade.co.uk>
+Casper S. Hornstrup <chorns@users.sourceforge.net>
+KJK::Hyperion <noog@libero.it>
+Eugene Ingerman <geneing@myrealbox.com>
+Rex Jolliff <rex@lvcablemodem.com>
+Guido de Jong
 Victor Kirhenshtein <sauros@iname.com>
+Eric Kohl <ekohl@rz-online.de>
+Hans Kremer
+Frederik Leemans
+Jean Michault
+Royce Mitchell III <royce3@ev1.net>
+Filip Navara <xnavara@volny.cz>
+Jim Noeth
+Mike Nordell ("tamlin")
+Hernan Ochoa
+Brian Palmer <brianp@sginet.com>
+Paolo Pantaleo <paolopan@freemail.it>
+Matt Pyne
+Phillip Susi <phreak@iag.net>
+James B. Tabor <jimtabor@adsl-64-217-116-74.dsl.hstntx.swbell.net>
+Mark Tempel <mtempel@visi.com>
 Vizzini <vizzini@plasmic.com>
-
+Mark Weaver <mark@npsl.co.uk>
+Thomas Weidenmueller <w3seek@users.sourceforge.net>
+Jason Weiler
+David Welch <welch@cwcom.net>
+Jonathan Wilson <jonwil@tpgi.com.au>
+Art Yerkes <ayerkes@speakeasy.net>
+Magnus Olsen (magnus@greatlord.com)
 
 Graphic Design from
 
-Mindflyer <mf@mufunyo.net> 
-Tango Desktop Project <http://tango-project.org>
-Everaldo <http://everaldo.com>
+Everaldo (http://everaldo.com) for Explorer icons
+
+Source and inspiration from
+
+WINE (http://www.winehq.com)
+WinFree (http://www.stack.nl/~onno/win32/)
+Linux (http://www.kernel.org)
+XFree86 (http://www.xfree86.org/)
+
+References (Rex's at least)
+
+Baker, Art. The Windows NT Device Driver Book. Prentice Hall, 1997.
+Borate, Dabak & Phadke. Undocumented Windows NT. M&T Books, 1999.
+Brain, Marshall. Win32 System Services. Prentice Hall, 1996.
+Cant, Chris. Writing Windows WDM Device Drivers. R&D Books, 1999.
+Canton & Sanchez. IBM Microcomputers: A Programmer's Handbook. McGraw Hill, 1990.
+Davis & Wallace. Windows Undocumented File Formats. R&D Books, 1997.
+Mason & Viscarola. Windows NT Device Driver Development. Macmillan, 1999.
+Mitchell, Stan. Inside the Windows 95 File System. O'Reilly, 1997.
+Murray, James D. Windows NT Event Logging. O'Reilly, 1998.
+Nagar, Rajeev. Windows NT File System Internals. O'Reilly, 1997.
+Osbourne, Sandra. Windows NT Registry: A Settings Reference. New Riders, 1998.
+Pietrek, Matt. Windows 95 System Programming Secrets. IDG, 1995.
+Richter, Jeffery. Advanced Windows, 3rd ed. Microsoft, 1997.
+Simon, Richard J. Windows NT Win32 API Superbible. Waite Group, 1996.
+Solomon, David A. Inside Windows NT, 2nd Ed. Microsoft, 1998.
+"The NT Insider." Open Systems Resources, 1999-2000.

reactos/INSTALL

@@ -2,21 +2,21 @@
 
 To build the system you need either mingw32 installed on Windows or a mingw32
 cross compiler running on unix. You may obtain MinGW binaries that build
-ReactOS from http://www.reactos.org/. 
+ReactOS from http://www.reactos.com. 
 
 
 2. Building ReactOS
 
 2.1 Building the binaries
 
-To build ReactOS run 'make' (without the quotes) if you are building on Linux
+To build ReactOS run 'make' (wihout the quotes) if you are building on Linux
 or 'mingw32-make' if you are building on Windows (or ReactOS) from the top
-directory. If you are using RosBE, follow on-screen instructions.
+directory.
 
 
 2.2 Building a bootable CD image
 
-To build a bootable CD image run 'make bootcd' (without the quotes) if you are
+To build a bootable CD image run 'make bootcd' (wihout the quotes) if you are
 building on Linux or 'mingw32-make bootcd' if you are building on Windows (or
 ReactOS) from the top directory. This will create a CD image with a filename,
 ReactOS.iso, in the top directory.
@@ -71,10 +71,8 @@ contents. Then burn the CD image, boot from it, and follow instructions.
 5. Help
 
 If you run into problems or have suggestions for making ReactOS better, please
-visit the address below. Mailing lists are available for a variety of topics, 
-bugs should be submitted to bugzilla and general chat takes place in the forums, 
-or #reactos on freenode
+visit the address below and subscribe to one or more of the mailing lists.
 
-http://www.reactos.org/
+http://www.reactos.com/en/content/view/full/66
 
 ReactOS Development Team

reactos/LGPL.txt

@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+

reactos/Makefile

@@ -0,0 +1,354 @@
+# Well-known targets:
+#
+#    all (default target)
+#        This target builds all of ReactOS.
+#
+#    module
+#        These targets builds a single module. Replace module with the name of
+#        the module you want to build.
+#
+#    bootcd
+#        This target builds an ISO (ReactOS.iso) from which ReactOS can be booted
+#        and installed.
+#
+#    livecd
+#        This target builds an ISO (ReactOS-Live.iso) from which ReactOS can be
+#        booted, but not installed.
+#
+#    install
+#        This target installs all of ReactOS to a location specified by the
+#        ROS_INSTALL environment variable.
+#
+#    module_install
+#        These targets installs a single module to a location specified by the
+#        ROS_INSTALL environment variable. Replace module with the name of the
+#        module you want to install.
+#
+#    clean
+#        This target cleans (deletes) all files that are generated when building
+#        ReactOS.
+#
+#    module_clean
+#        These targets cleans (deletes) files that are generated when building a
+#        single module. Replace module with the name of the module you want to
+#        clean.
+#
+#    depends
+#        This target does a complete dependency check of the ReactOS codebase.
+#        This can require several minutes to complete. If you only need to check
+#        dependencies for a single or few modules then you can use the
+#        module_depends targets instead. This target can also repair a damaged or
+#        missing makefile.auto if needed.
+#
+#    module_depends
+#        These targets do a dependency check of individual modules. Replace module
+#        with the name of the module for which you want to check dependencies.
+#        This is faster than the depends target which does a complete dependency
+#        check of the ReactOS codebase.
+#
+#
+# Accepted environment variables:
+#
+#    ROS_PREFIX
+#        This variable specifies the prefix of the MinGW installation. On Windows
+#        a prefix is usually not needed, but on linux it is usually "mingw32". If
+#        not present and no executable named "gcc" can be found, then the prefix is
+#        assumed to be "mingw32". If your gcc is named i386-mingw32-gcc then set
+#        ROS_PREFIX to i386-mingw32. Don't include the dash (-) before gcc.
+#
+#    ROS_INTERMEDIATE
+#        This variable controls where to put intermediate files. Intermediate
+#        files are generated files that are needed to generate the final
+#        output files. Examples of intermediate files include *.o, *.a, and
+#        *.coff. N.B. Don't put a path separator at the end. The variable
+#        defaults to .\obj-i386.
+#
+#    ROS_OUTPUT
+#        This variable controls where to put output files. Output files are
+#        generated files that makes up the result of the build process.
+#        Examples of output files include *.exe, *.dll, and *.sys. N.B. Don't
+#        put a path separator at the end. The variable defaults to .\output-i386.
+#
+#    ROS_TEMPORARY
+#        This variable controls where to put temporary files. Temporary files
+#        are (usually small) generated files that are needed to generate the
+#        intermediate or final output files. Examples of temporary files include
+#        *.rci (preprocessed .rc files for wrc), *.tmp, and *.exp. N.B. Don't put
+#        a path separator at the end. The variable defaults to the current
+#        directory.
+#
+#    ROS_INSTALL
+#        This variable controls where to install output files to when using
+#        'make install'. N.B. Don't put a path separator at the end. The variable
+#        defaults to .\reactos.
+#
+#    ROS_BUILDMAP
+#        This variable controls if map files are to be generated for executable
+#        output files. Map files have the extension .map. The value can be either
+#        full (to build map files with assembly code), yes (to build map files
+#        without source code) or no (to not build any map files). The variable
+#        defaults to no.
+#
+#    ROS_BUILDNOSTRIP
+#        This variable controls if non-symbol-stripped versions are to be built
+#        of executable output files. Non-symbol-stripped executable output files
+#        have .nostrip added to the filename just before the extension. The value
+#        can be either yes (to build non-symbol-stripped versions of executable
+#        output files) or no (to not build non-symbol-stripped versions of
+#        executable output files). The variable defaults to no.
+#
+#    ROS_RBUILDFLAGS
+#        Pass parameters to rbuild.
+#            -v           Be verbose.
+#            -c           Clean as you go. Delete generated files as soon as they are not needed anymore.
+#            -dd          Disable automatic dependencies.
+#            -dm{module}  Check only automatic dependencies for this module.
+#            -mi          Let make handle creation of install directories. Rbuild will not generate the directories.
+#            -ps          Generate proxy makefiles in source tree instead of the output tree.
+
+.PHONY: all
+.PHONY: clean
+all: makefile.auto
+
+
+.SUFFIXES:
+
+ifeq ($(HOST),)
+ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
+HOST=mingw32-windows
+else
+HOST=mingw32-linux
+endif
+endif
+
+# Default to half-verbose mode
+ifeq ($(VERBOSE),no)
+  Q = @
+  HALFVERBOSEECHO = no
+  BUILDNO_QUIET = -q
+else
+ifeq ($(VERBOSE),full)
+  Q =
+  HALFVERBOSEECHO = no
+  BUILDNO_QUIET =
+else
+  Q = @
+  HALFVERBOSEECHO = yes
+  BUILDNO_QUIET = -q
+endif
+endif
+ifeq ($(HOST),mingw32-linux)
+  QUOTE = "
+else
+  QUOTE =
+endif
+ifeq ($(HALFVERBOSEECHO),yes)
+  ECHO_CP      =@echo $(QUOTE)[COPY]     $@$(QUOTE)
+  ECHO_MKDIR   =@echo $(QUOTE)[MKDIR]    $@$(QUOTE)
+  ECHO_BUILDNO =@echo $(QUOTE)[BUILDNO]  $@$(QUOTE)
+  ECHO_INVOKE  =@echo $(QUOTE)[INVOKE]   $<$(QUOTE)
+  ECHO_PCH     =@echo $(QUOTE)[PCH]      $@$(QUOTE)
+  ECHO_CC      =@echo $(QUOTE)[CC]       $<$(QUOTE)
+  ECHO_GAS     =@echo $(QUOTE)[GAS]      $<$(QUOTE)
+  ECHO_NASM    =@echo $(QUOTE)[NASM]     $<$(QUOTE)
+  ECHO_AR      =@echo $(QUOTE)[AR]       $@$(QUOTE)
+  ECHO_WINEBLD =@echo $(QUOTE)[WINEBLD]  $@$(QUOTE)
+  ECHO_WRC     =@echo $(QUOTE)[WRC]      $@$(QUOTE)
+  ECHO_WIDL    =@echo $(QUOTE)[WIDL]     $@$(QUOTE)
+  ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES]  $<$(QUOTE)
+  ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL]  $@$(QUOTE)
+  ECHO_LD      =@echo $(QUOTE)[LD]       $@$(QUOTE)
+  ECHO_NM      =@echo $(QUOTE)[NM]       $@$(QUOTE)
+  ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP]  $@$(QUOTE)
+  ECHO_RBUILD  =@echo $(QUOTE)[RBUILD]   $@$(QUOTE)
+  ECHO_RSYM    =@echo $(QUOTE)[RSYM]     $@$(QUOTE)
+  ECHO_WMC     =@echo $(QUOTE)[WMC]      $@$(QUOTE)
+  ECHO_NCI     =@echo $(QUOTE)[NCI]      $@$(QUOTE)
+  ECHO_CABMAN  =@echo $(QUOTE)[CABMAN]   $<$(QUOTE)
+  ECHO_CDMAKE  =@echo $(QUOTE)[CDMAKE]   $@$(QUOTE)
+  ECHO_MKHIVE  =@echo $(QUOTE)[MKHIVE]   $@$(QUOTE)
+  ECHO_REGTESTS=@echo $(QUOTE)[REGTESTS] $@$(QUOTE)
+  ECHO_TEST    =@echo $(QUOTE)[TEST]     $@$(QUOTE)
+  ECHO_GENDIB  =@echo $(QUOTE)[GENDIB]   $@$(QUOTE)
+else
+  ECHO_CP      =
+  ECHO_MKDIR   =
+  ECHO_BUILDNO =
+  ECHO_INVOKE  =
+  ECHO_PCH     =
+  ECHO_CC      =
+  ECHO_GAS     =
+  ECHO_NASM    =
+  ECHO_AR      =
+  ECHO_WINEBLD =
+  ECHO_WRC     =
+  ECHO_WIDL    =
+  ECHO_BIN2RES =
+  ECHO_DLLTOOL =
+  ECHO_LD      =
+  ECHO_NM      =
+  ECHO_OBJDUMP =
+  ECHO_RBUILD  =
+  ECHO_RSYM    =
+  ECHO_WMC     =
+  ECHO_NCI     =
+  ECHO_CABMAN  =
+  ECHO_CDMAKE  =
+  ECHO_MKHIVE  =
+  ECHO_REGTESTS=
+  ECHO_TEST    =
+  ECHO_GENDIB  =
+endif
+
+
+host_gcc = $(Q)gcc
+host_gpp = $(Q)g++
+host_ld = $(Q)ld
+host_ar = $(Q)ar
+host_objcopy = $(Q)objcopy
+ifeq ($(HOST),mingw32-linux)
+	EXEPREFIX = ./
+	EXEPOSTFIX =
+	SEP = /
+	mkdir = -$(Q)mkdir -p
+	gcc = $(Q)$(PREFIX)-gcc
+	gpp = $(Q)$(PREFIX)-g++
+	ld = $(Q)$(PREFIX)-ld
+	nm = $(Q)$(PREFIX)-nm
+	objdump = $(Q)$(PREFIX)-objdump
+	ar = $(Q)$(PREFIX)-ar
+	objcopy = $(Q)$(PREFIX)-objcopy
+	dlltool = $(Q)$(PREFIX)-dlltool
+	windres = $(Q)$(PREFIX)-windres
+	rm = $(Q)rm -f
+	cp = $(Q)cp
+	NUL = /dev/null
+else # mingw32-windows
+	EXEPREFIX =
+	EXEPOSTFIX = .exe
+	ROS_EMPTY =
+	SEP = \$(ROS_EMPTY)
+	mkdir = -$(Q)mkdir
+	gcc = $(Q)gcc
+	gpp = $(Q)g++
+	ld = $(Q)ld
+	nm = $(Q)nm
+	objdump = $(Q)objdump
+	ar = $(Q)ar
+	objcopy = $(Q)objcopy
+	dlltool = $(Q)dlltool
+	windres = $(Q)windres
+	rm = $(Q)del /f /q
+	cp = $(Q)copy /y
+	NUL = NUL
+endif
+
+ifneq ($(ROS_INTERMEDIATE),)
+  INTERMEDIATE := $(ROS_INTERMEDIATE)
+else
+  INTERMEDIATE := obj-i386
+endif
+INTERMEDIATE_ := $(INTERMEDIATE)$(SEP)
+
+ifneq ($(ROS_OUTPUT),)
+  OUTPUT := $(ROS_OUTPUT)
+else
+  OUTPUT := output-i386
+endif
+OUTPUT_ := $(OUTPUT)$(SEP)
+
+ifneq ($(ROS_TEMPORARY),)
+  TEMPORARY := $(ROS_TEMPORARY)
+else
+  TEMPORARY :=
+endif
+TEMPORARY_ := $(TEMPORARY)$(SEP)
+
+ifneq ($(ROS_INSTALL),)
+  INSTALL := $(ROS_INSTALL)
+else
+  INSTALL := reactos
+endif
+INSTALL_ := $(INSTALL)$(SEP)
+
+$(INTERMEDIATE):
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(OUTPUT):
+	${mkdir} $@
+endif
+
+
+NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc
+KERNEL32_MC = lib$(SEP)kernel32$(SEP)kernel32.mc
+BUILDNO_H = include$(SEP)reactos$(SEP)buildno.h
+BUGCODES_H = include$(SEP)reactos$(SEP)bugcodes.h
+BUGCODES_RC = ntoskrnl$(SEP)bugcodes.rc
+ERRCODES_H = include$(SEP)reactos$(SEP)errcodes.h
+ERRCODES_RC = lib$(SEP)kernel32$(SEP)errcodes.rc
+
+include lib/lib.mak
+include tools/tools.mak
+include boot/freeldr/bootsect/bootsect.mak
+-include makefile.auto
+
+PREAUTO := \
+	$(BIN2C_TARGET) \
+	$(BIN2RES_TARGET) \
+	$(BUILDNO_H) \
+	$(BUGCODES_H) \
+	$(BUGCODES_RC) \
+	$(ERRCODES_H) \
+	$(ERRCODES_RC) \
+	$(NCI_SERVICE_FILES) \
+	$(GENDIB_DIB_FILES)
+
+makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw
+
+.PHONY: msvc
+msvc: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) msvc
+
+$(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC)
+	$(ECHO_WMC)
+	$(Q)$(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC)
+
+$(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC)
+	$(ECHO_WMC)
+	$(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC)
+
+.PHONY: msvc6
+msvc6: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc
+
+.PHONY: msvc7
+msvc7: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc
+
+.PHONY: msvc71
+msvc71: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc
+
+.PHONY: msvc8
+msvc8: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc
+
+.PHONY: makefile_auto_clean
+makefile_auto_clean:
+	-@$(rm) makefile.auto $(PREAUTO) 2>$(NUL)
+
+.PHONY: clean
+clean: makefile_auto_clean
+
+.PHONY: depends
+depends:
+	@-$(rm) makefile.auto
+	@$(MAKE) $(filter-out depends, $(MAKECMDGOALS))

reactos/PreLoad.cmake

@@ -1,10 +0,0 @@
-
-# small trick to get the real source directory at this stage
-STRING(REPLACE "/PreLoad.cmake" "" REACTOS_HOME_DIR ${CMAKE_CURRENT_LIST_FILE})
-
-#message("/PreLoad.cmake ... ${REACTOS_HOME_DIR}")
-
-SET(CMAKE_MODULE_PATH "${REACTOS_HOME_DIR}/cmake" CACHE INTERNAL "")
-
-#message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")
-

reactos/README

@@ -1,6 +1,6 @@
 ========================
-ReactOS Version 0.3.x
-Updated Dec 16, 2006
+ReactOS Version 0.2.x
+Updated June 23rd, 2004
 ========================
 
 1. What is ReactOS?
@@ -8,13 +8,12 @@ Updated Dec 16, 2006
    ReactOS is an Open Source effort to develop a quality operating system
 that is compatible with Windows NT applications and drivers.
 
-   The ReactOS project, although currently focused on Windows XP/2003
-drivers compatibility, is always keeping an eye toward compatibility with
-older version of Windows NT family ( NT 4.0, 2000 (NT 5.0)) and new
-Windows NT releases (Vista, etc). Applications (Win32 API) compatibility
-focus is Windows XP.
+   The ReactOS project, although currently focused on Windows NT 4.0
+compatibility, is always keeping an eye towards compatibility with
+future Windows NT releases, that is, Windows 2000 (NT 5.0) and
+Windows XP (NT 5.1).
 
-More information is available at http://www.reactos.org/.
+More information is available at http://www.reactos.com.
 
 2. Building ReactOS
 
@@ -22,8 +21,8 @@ See the INSTALL file for more details.
 
 3. More information
 
-See the media\doc subdirectory for some sparse notes.
+See the doc subdirectory for some sparse notes
 
 4. Who is responsible
 
-See the CREDITS file.
+See the CREDITS file

reactos/ReactOS.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<xi:include href="config.xml">
+		<xi:fallback>
+			<xi:include href="config.template.xml" />
+		</xi:fallback>
+	</xi:include>
+
+	<xi:include href="baseaddress.xml" />
+
+	<define name="_M_IX86" />
+	<if property="MP" value="1">
+		<define name="CONFIG_SMP" value="1" />
+	</if>
+	<if property="DBG" value="1">
+		<define name="DBG" value="1" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	<if property="DBG" value="0">
+		<compilerflag>-Os</compilerflag>
+		<compilerflag>-Wno-strict-aliasing</compilerflag>
+		<compilerflag>-ftracer</compilerflag>
+		<compilerflag>-momit-leaf-frame-pointer</compilerflag>
+		<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+	</if>
+	<if property="KDBG" value="1">
+		<define name="KDBG" value="1" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	<compilerflag>-Wpointer-arith</compilerflag>
+
+	<include>include</include>
+	<include>include/reactos</include>
+	<include>include/libs</include>
+	<include>include/drivers</include>
+	<include>include/subsys</include>
+	<include>w32api/include</include>
+	<include>w32api/include/ddk</include>
+
+	<directory name="apps">
+		<xi:include href="apps/directory.xml" />
+	</directory>
+	<directory name="boot">
+		<xi:include href="boot/boot.xml" />
+	</directory>
+	<directory name="bootdata">
+		<xi:include href="bootdata/bootdata.xml" />
+	</directory>
+	<directory name="drivers">
+		<xi:include href="drivers/directory.xml" />
+	</directory>
+	<directory name="hal">
+		<xi:include href="hal/directory.xml" />
+	</directory>
+	<directory name="include">
+		<xi:include href="include/directory.xml" />
+	</directory>
+	<directory name="lib">
+		<xi:include href="lib/directory.xml" />
+	</directory>
+	<directory name="media">
+		<xi:include href="media/directory.xml" />
+	</directory>
+	<directory name="modules">
+		<xi:include href="modules/directory.xml" />
+	</directory>
+	<directory name="ntoskrnl">
+		<xi:include href="ntoskrnl/ntoskrnl.xml" />
+	</directory>
+	<directory name="regtests">
+		<xi:include href="regtests/directory.xml" />
+	</directory>
+	<directory name="services">
+		<xi:include href="services/directory.xml" />
+	</directory>
+	<directory name="subsys">
+		<xi:include href="subsys/directory.xml" />
+	</directory>
+</project>

reactos/apistatus.lst

@@ -1,30 +1,33 @@
 ; Format:
 ;   COMPONENT_NAME PATH_TO_COMPONENT_SOURCES
-; COMPONENT_NAME            - Name of the module. Eg. kernel32.
-; PATH_TO_COMPONENT_SOURCES - Relative path to sources (relative to where rgenstat is run from).
-
-advapi32 ../reactos/dll/win32/advapi32
-crtdll ../reactos/dll/win32/crtdll
-gdi32 ../reactos/dll/win32/gdi32
-gdiplus ../reactos/dll/win32/gdiplus
-iphlpapi ../reactos/dll/win32/iphlpapi
-kernel32 ../reactos/dll/win32/kernel32
-msvcrt ../reactos/dll/win32/msvcrt
-rasapi32 ../reactos/dll/win32/rasapi32
-rasdlg ../reactos/dll/win32/rasdlg
-rasman ../reactos/dll/win32/rasman
-rpcrt4 ../reactos/dll/win32/rpcrt4
-secur32 ../reactos/dll/win32/secur32
-snmpapi ../reactos/dll/win32/snmpapi
-user32 ../reactos/dll/win32/user32
-version ../reactos/dll/win32/version
-winspool ../reactos/dll/win32/winspool
-ws2_32 ../reactos/dll/win32/ws2_32
-wsock32 ../reactos/dll/win32/wsock32
-videoprt ../reactos/drivers/video/videoprt
-ndis ../reactos/drivers/network/ndis
-tdi ../reactos/drivers/network/tdi
-scsiport ../reactos/drivers/storage/scsiport
-ntoskrnl ../reactos/ntoskrnl
-rtl ../reactos/lib/rtl
-win32k ../reactos/subsystems/win32/win32k
+; COMPONENT_NAME            - Name of the component. Eg. kernel32.dll.
+; PATH_TO_COMPONENT_SOURCES - Relative path to sources (relative to
+;                             where rgenstat is run from).
+advapi32.dll reactos/lib/advapi32
+crtdll.dll reactos/lib/crtdll
+gdi32.dll reactos/lib/gdi32
+gdiplus.dll reactos/lib/gdiplus
+iphlpapi.dll reactos/lib/iphlpapi
+kernel32.dll reactos/lib/kernel32
+lz32.dll reactos/lib/lzexpand
+msvcrt.dll reactos/lib/msvcrt
+ole32.dll reactos/lib/ole32
+oleaut32.dll reactos/lib/oleaut32
+rpcrt4.dll reactos/lib/rpcrt4
+secur32.dll reactos/lib/secur32
+shell32.dll reactos/lib/shell32
+snmpapi.dll reactos/lib/snmpapi
+user32.dll reactos/lib/user32
+version.dll reactos/lib/version
+winmm.dll reactos/lib/winmm
+winspool.dll reactos/lib/winspool
+ws2_32.dll reactos/lib/ws2_32
+wsock32.dll reactos/lib/wsock32
+videoprt.dll reactos/drivers/video/videoprt
+ndis.sys reactos/drivers/net/ndis
+tdi.sys reactos/drivers/net/tdi
+class2.sys reactos/drivers/storage/class2
+scsiport.sys reactos/drivers/storage/scsiport
+ntoskrnl.exe reactos/ntoskrnl
+ntoskrnl.exe reactos/lib/rtl
+win32k.sys reactos/subsys/win32k

reactos/apps/Doxyfile

@@ -0,0 +1,207 @@
+# Doxyfile 1.3.5
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = "ReactOS Apps & Tools"
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = doxy-doc
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = YES
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        = ..
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = YES
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = NO
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = YES
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = YES
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = . \
+                         ../tools
+FILE_PATTERNS          = *.c \
+                         *.h
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = YES
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = YES
+INLINE_SOURCES         = YES
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = NO
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = YES
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
+TREEVIEW_WIDTH         = 200
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = YES
+RTF_HYPERLINKS         = YES
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = NO
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = ../include
+INCLUDE_FILE_PATTERNS  = *.h
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = NO
+HAVE_DOT               = YES
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = YES
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = YES

reactos/apps/directory.xml

@@ -0,0 +1,3 @@
+<directory name="utils">
+	<xi:include href="utils/directory.xml" />
+</directory>

reactos/apps/testsets/loadlib/loadlib.c

@@ -1,5 +1,5 @@
 /*
- *  ReactOS test program -
+ *  ReactOS test program - 
  *
  *  loadlib.c
  *
@@ -91,7 +91,7 @@ const char* appName(const char* argv0)
     const char* name;
 
     name = (const char*)strrchr(argv0, '\\');
-    if (name != NULL)
+    if (name != NULL) 
         return name + 1;
     return argv0;
 }

reactos/apps/testsets/loadlib/loadlib.h

@@ -1,5 +1,5 @@
 /*
- *  ReactOS test program -
+ *  ReactOS test program - 
  *
  *  loadlib.h
  *

reactos/apps/testsets/msvcrt/fileio/_tfileio.c

@@ -1,5 +1,5 @@
 /*
- *  ReactOS test program -
+ *  ReactOS test program - 
  *
  *  _tfileio.c
  *
@@ -31,8 +31,8 @@
 #define _tfopen      _wfopen
 #define _tunlink     _wunlink
 #define _TEOF        WEOF
-#define _gettchar    getwchar
-#define _puttchar    putwchar
+#define _gettchar    getwchar 
+#define _puttchar    putwchar  
 #define _THEX_FORMAT _T("0x%04x ")
 #else /*UNICODE*/
 #define _tfopen      fopen

reactos/apps/testsets/msvcrt/fileio/fileio.c

@@ -1,5 +1,5 @@
 /*
- *  ReactOS test program -
+ *  ReactOS test program - 
  *
  *  _fileio.c
  *

reactos/apps/testsets/msvcrt/fileio/main.c

@@ -0,0 +1,124 @@
+/*
+ *  ReactOS test program - 
+ *
+ *  main.c
+ *
+ *  Copyright (C) 2002  Robert Dickenson <robd@reactos.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <tchar.h>
+#include <wchar.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "main.h"
+
+
+#define VERSION 1
+
+#ifdef UNICODE
+#define TARGET  "UNICODE"
+#else
+#define TARGET  "MBCS"
+#endif
+
+BOOL verbose_flagged = 0;
+BOOL status_flagged = 0;
+
+int usage(char* argv0)
+{
+    printf("USAGE: %s test_id [unicode]|[ansi] [clean]|[status][verbose]\n", argv0);
+    printf("\tWhere test_id is one of:\n");
+    printf("\t0 - (default) regression mode, run tests 1-4 displaying failures only\n");
+    printf("\t1 - Write DOS style eol data to file in text mode (text.dos)\n");
+    printf("\t2 - Write NIX style eol data to file in binary mode (binary.dos)\n");
+    printf("\t3 - Write DOS style eol data to file in text mode (text.nix)\n");
+    printf("\t4 - Write NIX style eol data to file in binary mode (binary.nix)\n");
+    printf("\t5 - Echo console line input\n");
+    printf("\t6 - Dump console line input in hex format\n");
+    printf("\t7 - The source code is your friend\n");
+    printf("\t[unicode] - perform tests using UNICODE versions of library functions\n");
+    printf("\t[ansi] - perform tests using ANSI versions of library functions\n");
+    printf("\t    If neither unicode or ansi is specified build default is used\n");
+    printf("\t[clean] - delete all temporary test output files\n");
+    printf("\t[status] - enable extra status display while running\n");
+    printf("\t[verbose] - enable verbose output when running\n");
+    return 0;
+}
+
+int __cdecl main(int argc, char* argv[])
+{
+    int test_num = 0;
+    int version = 0;
+    int result = 0;
+    int i = 0;
+
+    printf("%s test application - build %03d (default: %s)\n", argv[0], VERSION, TARGET);
+    if (argc < 2) {
+        return usage(argv[0]);
+    }
+    for (i = 1; i < argc; i++) {
+        if (strstr(argv[i], "ansi") || strstr(argv[i], "ANSI")) {
+            version = 1;
+        } else if (strstr(argv[i], "unicode") || strstr(argv[i], "UNICODE")) {
+            version = 2;
+        } else if (strstr(argv[i], "clean") || strstr(argv[i], "CLEAN")) {
+            test_num = -1;
+        } else if (strstr(argv[i], "verbose") || strstr(argv[i], "VERBOSE")) {
+            verbose_flagged = 1;
+        } else if (strstr(argv[i], "status") || strstr(argv[i], "STATUS")) {
+            status_flagged = 1;
+        } else {
+            test_num = atoi(argv[1]);
+            //if (test_num < 0
+        }
+    }
+    for (i = test_num; i <= test_num; i++) {
+        if (!test_num) {
+            test_num = 4;
+            i = 1;
+        }
+        switch (version) {
+        case 1:
+            result = run_ansi_tests(i);
+            break;
+        case 2:
+            result = run_unicode_tests(i);
+            break;
+        default:
+            result = run_ansi_tests(i);
+            result = run_unicode_tests(i);
+            break;
+        }
+    }
+    printf("finished\n");
+    return result;
+}
+
+#ifndef __GNUC__
+
+char* args[] = { "fileio.exe", "0", "unicode", "verbose"};
+
+int __cdecl mainCRTStartup(void)
+{
+    main(2, args);
+    return 0;
+}
+
+#endif /*__GNUC__*/

reactos/apps/testsets/msvcrt/fileio/main.h

@@ -0,0 +1,42 @@
+/*
+ *  ReactOS test program - 
+ *
+ *  main.h
+ *
+ *  Copyright (C) 2002  Robert Dickenson <robd@reactos.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __MAIN_H__
+#define __MAIN_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+int app_main(int argc, char* argv[]);
+DWORD GetInput(char* Buffer, int buflen);
+
+int test_ansi_files(int test_num);
+int test_unicode_files(int test_num);
+
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif // __MAIN_H__

reactos/apps/testsets/msvcrt/fileio/wfileio.c

@@ -1,5 +1,5 @@
 /*
- *  ReactOS test program -
+ *  ReactOS test program - 
  *
  *  wfileio.c
  *

reactos/apps/utils/binpatch/patch.c

@@ -0,0 +1,615 @@
+#include <conio.h>
+#include <io.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+/** DEFINES *******************************************************************/
+
+#define PATCH_BUFFER_SIZE           4096    /* Maximum size of a patch */
+#define PATCH_BUFFER_MAGIC          "\xde\xad\xbe\xef MaGiC MaRk "
+#define SIZEOF_PATCH_BUFFER_MAGIC   (sizeof (PATCH_BUFFER_MAGIC) - 1)
+
+/** TYPES *********************************************************************/
+
+typedef struct _PatchedByte
+{
+   int            offset;    /*!< File offset of the patched byte. */
+   unsigned char  expected;  /*!< Expected (original) value of the byte. */
+   unsigned char  patched;   /*!< Patched (new) value for the byte. */
+} PatchedByte;
+
+typedef struct _PatchedFile
+{
+   const char  *name;        /*!< Name of the file to be patched. */
+   int          fileSize;    /*!< Size of the file in bytes. */
+   int          patchCount;  /*!< Number of patches for the file. */
+   PatchedByte *patches;     /*!< Patches for the file. */
+} PatchedFile;
+
+typedef struct _Patch
+{
+   const char   *name;       /*!< Name of the patch. */
+   int           fileCount;  /*!< Number of files in the patch. */
+   PatchedFile  *files;      /*!< Files for the patch. */
+} Patch;
+
+/** FUNCTION PROTOTYPES *******************************************************/
+
+static void printUsage();
+
+/** GLOBALS *******************************************************************/
+
+static Patch m_patch = { NULL, 0, NULL };
+static int m_argc = 0;
+static char **m_argv = NULL;
+
+/* patch buffer where we put the patch info into */
+static unsigned char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] =
+   PATCH_BUFFER_MAGIC;
+
+/** HELPER FUNCTIONS **********************************************************/
+
+static void *
+loadFile(const char *fileName, int *fileSize_)
+{
+   FILE *f;
+   struct stat sb;
+   int fileSize;
+   void *p;
+   
+   /* Open the file */
+   f = fopen(fileName, "rb");
+   if (f == NULL)
+   {
+      printf("Couldn't open file %s for reading!\n", fileName);
+      return NULL;
+   }
+   
+   /* Get file size */
+   if (fstat(fileno(f), &sb) < 0)
+   {
+      fclose(f);
+      printf("Couldn't get size of file %s!\n", fileName);
+      return NULL;
+   }
+   fileSize = sb.st_size;
+   
+   /* Load file */
+   p = malloc(fileSize);
+   if (p == NULL)
+   {
+      fclose(f);
+      printf("Couldn't allocate %d bytes for file %s!\n", fileSize, fileName);
+      return NULL;
+   }
+   
+   if (fread(p, fileSize, 1, f) != 1)
+   {
+      fclose(f);
+      free(p);
+      printf("Couldn't read file %s into memory!\n", fileName);
+      return NULL;
+   }
+   
+   /* Close file */
+   fclose(f);
+   
+   *fileSize_ = fileSize;
+   return p;
+}
+
+
+static int
+saveFile(const char *fileName, void *file, int fileSize)
+{
+   FILE *f;
+
+   /* Open the file */
+   f = fopen(fileName, "wb");
+   if (f == NULL)
+   {
+      printf("Couldn't open file %s for writing!\n", fileName);
+      return -1;
+   }
+
+   /* Write file */
+   if (fwrite(file, fileSize, 1, f) != 1)
+   {
+      fclose(f);
+      printf("Couldn't write file %s!\n", fileName);
+      return -1;
+   }
+
+   /* Close file */
+   fclose(f);
+   return 0;
+}
+
+
+static int
+compareFiles(
+   PatchedFile *patchedFile,
+   const char *originalFileName)
+{
+   const char *patchedFileName = patchedFile->name;
+   unsigned char *origChunk, *patchedChunk;
+   int origSize, patchedSize, i, patchCount;
+   PatchedByte *patches = NULL;
+   int patchesArrayCount = 0;
+   
+   /* Load both files */
+   origChunk = loadFile(originalFileName, &origSize);
+   if (origChunk == NULL)
+      return -1;
+   patchedChunk = loadFile(patchedFileName, &patchedSize);
+   if (patchedChunk == NULL)
+   {
+      free(origChunk);
+      return -1;
+   }
+   if (origSize != patchedSize)
+   {
+      free(origChunk);
+      free(patchedChunk);
+      printf("File size of %s and %s differs (%d != %d)\n",
+             originalFileName, patchedFileName,
+             origSize, patchedSize);
+      return -1;
+   }
+   
+   /* Compare the files and record any differences */
+   printf("Comparing %s to %s", originalFileName, patchedFileName);
+   for (i = 0, patchCount = 0; i < origSize; i++)
+   {
+      if (origChunk[i] != patchedChunk[i])
+      {
+         patchCount++;
+         
+         /* Resize patches array if needed */
+         if (patchesArrayCount < patchCount)
+         {
+            PatchedByte *newPatches;
+            newPatches = realloc(patches, patchCount * sizeof (PatchedByte));
+            if (newPatches == NULL)
+            {
+              if (patches != NULL)
+                free(patches);
+              free(origChunk);
+              free(patchedChunk);
+              printf("\nOut of memory (tried to allocated %d bytes)\n",
+                     patchCount * sizeof (PatchedByte));
+              return -1;
+            }
+            patches = newPatches;
+         }
+         
+         /* Fill in patch info */
+         patches[patchCount - 1].offset = i;
+         patches[patchCount - 1].expected = origChunk[i];
+         patches[patchCount - 1].patched = patchedChunk[i];
+      }
+      if ((i % (origSize / 40)) == 0)
+         printf(".");
+   }
+   printf(" %d changed bytes found.\n", patchCount);
+   
+   /* Unload the files */
+   free(origChunk);
+   free(patchedChunk);
+   
+   /* Save patch info */
+   patchedFile->fileSize = patchedSize;
+   patchedFile->patchCount = patchCount;
+   patchedFile->patches = patches;
+   
+   return 0;
+}
+
+
+static int
+outputPatch(const char *outputFileName)
+{
+   unsigned char *patchExe, *patchBuffer;
+   int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset;
+   Patch *patch;
+   PatchedFile *files;
+   
+   printf("Putting patch into %s...\n", outputFileName);
+   
+   /* Calculate size of the patch */
+   patchSize = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount;
+   stringSize = strlen(m_patch.name) + 1;
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      stringSize += strlen(m_patch.files[i].name) + 1;
+      patchSize += sizeof (PatchedByte) * m_patch.files[i].patchCount;
+   }
+   if ((stringSize + patchSize) > PATCH_BUFFER_SIZE)
+   {
+      printf("Patch is too big - %d bytes maximum, %d bytes needed\n",
+             PATCH_BUFFER_SIZE, stringSize + patchSize);
+      return -1;
+   }
+
+   /* Load patch.exe file into memory... */
+   patchExe = loadFile(m_argv[0], &patchExeSize);
+   if (patchExe == NULL)
+   {
+      return -1;
+   }
+   
+   /* Try to find the magic mark for the patch buffer */
+   for (i = 0; i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC); i++)
+   {
+      if (memcmp(patchExe + i, m_patchBuffer, SIZEOF_PATCH_BUFFER_MAGIC) == 0)
+      {
+         patchBuffer = patchExe + i + SIZEOF_PATCH_BUFFER_MAGIC;
+         
+         break;
+      }
+   }
+   if (!(i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC)))
+   {
+      free(patchExe);
+      printf("Couldn't find patch buffer magic in file %s - this shouldn't happen!!!\n", m_argv[0]);
+      return -1;
+   }
+   
+   /* Pack patch together and replace string pointers by offsets */
+   patch = (Patch *)patchBuffer;
+   files = (PatchedFile *)(patchBuffer + sizeof (Patch));
+   patchOffset = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount;
+   stringOffset = patchSize;
+   
+   patch->fileCount = m_patch.fileCount;
+   patch->files = (PatchedFile *)sizeof (Patch);
+
+   patch->name = (const char *)stringOffset;
+   strcpy(patchBuffer + stringOffset, m_patch.name);
+   stringOffset += strlen(m_patch.name) + 1;
+   
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      files[i].fileSize = m_patch.files[i].fileSize;
+      files[i].patchCount = m_patch.files[i].patchCount;
+      
+      files[i].name = (const char *)stringOffset;
+      strcpy(patchBuffer + stringOffset, m_patch.files[i].name);
+      stringOffset += strlen(m_patch.files[i].name) + 1;
+      
+      size = files[i].patchCount * sizeof (PatchedByte);
+      files[i].patches = (PatchedByte *)patchOffset;
+      memcpy(patchBuffer + patchOffset, m_patch.files[i].patches, size);
+      patchOffset += size;
+   }
+   size = patchSize + stringSize;
+   memset(patchBuffer + size, 0, PATCH_BUFFER_SIZE - size);
+
+   /* Save file */
+   if (saveFile(outputFileName, patchExe, patchExeSize) < 0)
+   {
+      free(patchExe);
+      return -1;
+   }
+   free(patchExe);
+
+   printf("Patch saved!\n");
+   return 0;
+}
+
+
+static int
+loadPatch()
+{
+   char *p;
+   Patch *patch;
+   int i;
+   
+   p = m_patchBuffer + SIZEOF_PATCH_BUFFER_MAGIC;
+   patch = (Patch *)p;
+   
+   if (patch->name == NULL)
+   {
+      return -1;
+   }
+   
+   m_patch.name = p + (int)patch->name;
+   m_patch.fileCount = patch->fileCount;
+   m_patch.files = (PatchedFile *)(p + (int)patch->files);
+
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      m_patch.files[i].name = p + (int)m_patch.files[i].name;
+      m_patch.files[i].patches = (PatchedByte *)(p + (int)m_patch.files[i].patches);
+   }
+   
+   printf("Patch %s loaded...\n", m_patch.name);
+   return 0;
+}
+
+
+/** MAIN FUNCTIONS ************************************************************/
+
+static int
+createPatch()
+{
+   int i, status;
+   const char *outputFileName;
+
+   /* Check argument count */
+   if (m_argc < 6 || (m_argc % 2) != 0)
+   {
+      printUsage();
+      return -1;
+   }
+
+   outputFileName = m_argv[3];
+   m_patch.name = m_argv[2];
+
+   /* Allocate PatchedFiles array */
+   m_patch.fileCount = (m_argc - 4) / 2;
+   m_patch.files = malloc(m_patch.fileCount * sizeof (PatchedFile));
+   if (m_patch.files == NULL)
+   {
+      printf("Out of memory!\n");
+      return -1;
+   }
+   memset(m_patch.files, 0, m_patch.fileCount * sizeof (PatchedFile));
+
+   /* Compare original to patched files and fill m_patch.files array */
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      m_patch.files[i].name = m_argv[4 + (i * 2) + 1];
+      status = compareFiles(m_patch.files + i, m_argv[4 + (i * 2) + 0]);
+      if (status < 0)
+      {
+         for (i = 0; i < m_patch.fileCount; i++)
+         {
+            if (m_patch.files[i].patches != NULL)
+               free(m_patch.files[i].patches);
+         }
+         free(m_patch.files);
+         m_patch.files = NULL;
+         m_patch.fileCount = 0;
+         return status;
+      }
+   }
+   
+   /* Output patch */
+   return outputPatch(outputFileName);
+}
+
+
+static int
+applyPatch()
+{
+   int c, i, j, fileSize, makeBackup;
+   unsigned char *file;
+   char *p;
+   const char *fileName;
+   char buffer[MAX_PATH];
+   
+
+   if (m_argc > 1 && strcmp(m_argv[1], "-d") != 0)
+   {
+      printUsage();
+      return -1;
+   }
+
+   /* Load patch */
+   if (loadPatch() < 0)
+   {
+      printf("This executable doesn't contain a patch, use -c to create one.\n");
+      return -1;
+   }
+
+   if (m_argc > 1)
+   {
+      /* Dump patch */
+      printf("Patch name: %s\n", m_patch.name);
+      printf("File count: %d\n", m_patch.fileCount);
+      for (i = 0; i < m_patch.fileCount; i++)
+      {
+         printf("----------------------\n"
+                "File name:   %s\n"
+                "File size:   %d bytes\n",
+                m_patch.files[i].name, m_patch.files[i].fileSize);
+         printf("Patch count: %d\n", m_patch.files[i].patchCount);
+         for (j = 0; j < m_patch.files[i].patchCount; j++)
+         {
+            printf("  Offset 0x%x   0x%02x -> 0x%02x\n",
+                   m_patch.files[i].patches[j].offset,
+                   m_patch.files[i].patches[j].expected,
+                   m_patch.files[i].patches[j].patched);
+         }
+      }
+   }
+   else
+   {
+      /* Apply patch */
+      printf("Applying patch...\n");
+      for (i = 0; i < m_patch.fileCount; i++)
+      {
+         /* Load original file */
+         fileName = m_patch.files[i].name;
+applyPatch_retry_file:
+         file = loadFile(fileName, &fileSize);
+         if (file == NULL)
+         {
+            printf("File %s not found! ", fileName);
+applyPatch_file_open_error:
+            printf("(S)kip, (R)etry, (A)bort, (M)anually enter filename");
+            do
+            {
+               c = getch();
+            }
+            while (c != 's' && c != 'r' && c != 'a' && c != 'm');
+            printf("\n");
+            if (c == 's')
+            {
+               continue;
+            }
+            else if (c == 'r')
+            {
+               goto applyPatch_retry_file;
+            }
+            else if (c == 'a')
+            {
+               return 0;
+            }
+            else if (c == 'm')
+            {
+               if (fgets(buffer, sizeof (buffer), stdin) == NULL)
+               {
+                  printf("fgets() failed!\n");
+                  return -1;
+               }
+               p = strchr(buffer, '\r');
+               if (p != NULL)
+                  *p = '\0';
+               p = strchr(buffer, '\n');
+               if (p != NULL)
+                  *p = '\0';
+
+               fileName = buffer;
+               goto applyPatch_retry_file;
+            }
+         }
+
+         /* Check file size */
+         if (fileSize != m_patch.files[i].fileSize)
+         {
+            free(file);
+            printf("File %s has unexpected filesize of %d bytes (%d bytes expected)\n",
+                   fileName, fileSize, m_patch.files[i].fileSize);
+            if (fileName != m_patch.files[i].name) /* manually entered filename */
+            {
+               goto applyPatch_file_open_error;
+            }
+            return -1;
+         }
+         
+         /* Ask for backup */
+         printf("Do you want to make a backup of %s? (Y)es, (N)o, (A)bort", fileName);
+         do
+         {
+            c = getch();
+         }
+         while (c != 'y' && c != 'n' && c != 'a');
+         printf("\n");
+         if (c == 'y')
+         {
+            char buffer[MAX_PATH];
+            snprintf(buffer, MAX_PATH, "%s.bak", fileName);
+            buffer[MAX_PATH-1] = '\0';
+            makeBackup = 1;
+            if (access(buffer, 0) >= 0) /* file exists */
+            {
+               printf("File %s already exists, overwrite? (Y)es, (N)o, (A)bort", buffer);
+               do
+               {
+                  c = getch();
+               }
+               while (c != 'y' && c != 'n' && c != 'a');
+               printf("\n");
+               if (c == 'n')
+                  makeBackup = 0;
+               else if (c == 'a')
+               {
+                  free(file);
+                  return 0;
+               }
+            }
+            if (makeBackup && saveFile(buffer, file, fileSize) < 0)
+            {
+               free(file);
+               return -1;
+            }
+         }
+         else if (c == 'a')
+         {
+            free(file);
+            return 0;
+         }
+         
+         /* Patch file */
+         for (j = 0; j < m_patch.files[i].patchCount; j++)
+         {
+            int offset = m_patch.files[i].patches[j].offset;
+            if (file[offset] != m_patch.files[i].patches[j].expected)
+            {
+               printf("Unexpected value in file %s at offset 0x%x: expected = 0x%02x, found = 0x%02x\n",
+                      fileName, offset, m_patch.files[i].patches[j].expected, file[offset]);
+               free(file);
+               return -1;
+            }
+            file[offset] = m_patch.files[i].patches[j].patched;
+         }
+         
+         /* Save file */
+         if (saveFile(fileName, file, fileSize) < 0)
+         {
+            free(file);
+            return -1;
+         }
+         free(file);
+      }
+      
+      printf("Patch applied sucessfully!\n");
+   }
+
+   return 0;
+}
+
+
+static void
+printUsage()
+{
+   printf("Usage:\n"
+          "%s -c     - Create patch\n"
+          "%s -d     - Dump patch\n"
+          "%s        - Apply patch\n"
+          "\n"
+          "A patch can be created like this:\n"
+          "%s -c \"patch name\" output.exe file1.orig file1.patched[ file2.orig file2.patched[ ...]]\n",
+          m_argv[0], m_argv[0], m_argv[0], m_argv[0]);
+}
+
+
+int
+main(
+   int argc,
+   char *argv[])
+{
+   m_argc = argc;
+   m_argv = argv;
+
+   if (argc >= 2 && (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0))
+   {
+      printUsage();
+      return 0;
+   }
+   else if (argc >= 2 && argv[1][0] == '-')
+   {
+      if (strcmp(argv[1], "-c") == 0)
+      {
+         return createPatch();
+      }
+      else if (strcmp(argv[1], "-d") == 0)
+      {
+         return applyPatch();
+      }
+      else
+      {
+         printf("Unknown option: %s\n"
+                "Use -h for help.\n",
+                argv[1]);
+         return -1;
+      }
+   }
+   
+   return applyPatch();
+}
+

reactos/apps/utils/directory.xml

@@ -0,0 +1,11 @@
+<group>
+<directory name="net">
+	<xi:include href="net/directory.xml" />
+</directory>
+<directory name="rosperf">
+	<xi:include href="rosperf/rosperf.xml" />
+</directory>
+<directory name="ps">
+	<xi:include href="ps/ps.xml" />
+</directory>
+</group>

reactos/apps/utils/driver/load/load.c

@@ -0,0 +1,32 @@
+/*
+ * Load a device driver
+ */
+#include <windows.h>
+#include <ntos/zw.h>
+
+int
+main(int argc, char *argv[])
+{
+   NTSTATUS Status;
+   UNICODE_STRING ServiceName;
+
+   if (argc != 2)
+   {
+      printf("Usage: load <ServiceName>\n");
+      return 0;
+   }
+   ServiceName.Length = (strlen(argv[1]) + 52) * sizeof(WCHAR);
+   ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL));
+   wsprintf(ServiceName.Buffer,
+      L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S",
+      argv[1]);
+   wprintf(L"%s %d %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer));
+   Status = NtLoadDriver(&ServiceName);
+   free(ServiceName.Buffer);
+   if (!NT_SUCCESS(Status))
+   {
+      printf("Failed: %X\n", Status);
+      return 1;
+   }
+   return 0;
+}

reactos/apps/utils/driver/unload/unload.c

@@ -0,0 +1,32 @@
+/*
+ * Unload a device driver
+ */
+#include <windows.h>
+#include <ntos/zw.h>
+
+int
+main(int argc, char *argv[])
+{
+   NTSTATUS Status;
+   UNICODE_STRING ServiceName;
+
+   if (argc != 2)
+   {
+      printf("Usage: unload <ServiceName>\n");
+      return 0;
+   }
+   ServiceName.Length = (strlen(argv[1]) + 52) * sizeof(WCHAR);
+   ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL));
+   wsprintf(ServiceName.Buffer,
+      L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S",
+      argv[1]);
+   wprintf(L"%s %d %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer));
+   Status = NtUnloadDriver(&ServiceName);
+   free(ServiceName.Buffer);
+   if (!NT_SUCCESS(Status))
+   {
+      printf("Failed: %X\n", Status);
+      return 1;
+   }
+   return 0;
+}

reactos/apps/utils/dumprecbin/dumprecbin.c

@@ -0,0 +1,733 @@
+/* 
+ *
+ *  dumprecbin - dumps a recycle bin database
+ *
+ *  Copyright (c) 2005 by Thomas Weidenmueller <w3seek@reactos.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO: - Support for Vista recycle bins (read the DeleteInfo NTFS streams, also NT 5.x)
+ *       - Support for INFO databases (win95)
+ */
+#include <windows.h>
+#include <winternl.h>
+#include <sddl.h>
+#include <ntsecapi.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <tchar.h>
+
+#ifndef NT_SUCCESS
+#define NT_SUCCESS(status) ((LONG)(status) >= 0)
+#endif
+
+typedef struct _RECYCLE_BIN
+{
+    struct _RECYCLE_BIN *Next;
+    PSID Sid;
+    WCHAR User[255];
+    WCHAR Path[MAX_PATH + 1];
+} RECYCLE_BIN, *PRECYCLE_BIN;
+
+typedef enum
+{
+    ivUnknown = 0,
+    ivINFO2
+} INFO_VERSION, *PINFO_VERSION;
+
+typedef struct _INFO2_HEADER
+{
+    DWORD Version;
+    DWORD Zero1;
+    DWORD Zero2;
+    DWORD RecordSize;
+} INFO2_HEADER, *PINFO2_HEADER;
+
+typedef struct _INFO2_RECORD
+{
+    DWORD Unknown;
+    CHAR AnsiFileName[MAX_PATH];
+    DWORD RecordNumber;
+    DWORD DriveLetter;
+    FILETIME DeletionTime;
+    DWORD DeletedPhysicalSize;
+    WCHAR FileName[MAX_PATH - 2];
+} INFO2_RECORD, *PINFO2_RECORD;
+
+static HANDLE
+OpenAndMapInfoDatabase(IN LPTSTR szFileName,
+                       OUT PVOID *MappingBasePtr,
+                       OUT PLARGE_INTEGER FileSize)
+{
+    HANDLE hFile, hMapping = INVALID_HANDLE_VALUE;
+
+    hFile = CreateFile(szFileName,
+                       FILE_READ_DATA,
+                       FILE_SHARE_READ,
+                       NULL,
+                       OPEN_EXISTING,
+                       FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM,
+                       NULL);
+    if (hFile != INVALID_HANDLE_VALUE)
+    {
+        if (GetFileSizeEx(hFile,
+                          FileSize) &&
+            FileSize->QuadPart >= 0xF)
+        {
+            hMapping = CreateFileMapping(hFile,
+                                         NULL,
+                                         PAGE_READONLY,
+                                         0,
+                                         0,
+                                         NULL);
+            if (hMapping == NULL ||
+                !(*MappingBasePtr = MapViewOfFile(hMapping,
+                                                  FILE_MAP_READ,
+                                                  0,
+                                                  0,
+                                                  0)))
+            {
+                if (hMapping != NULL)
+                {
+                    CloseHandle(hMapping);
+                }
+                hMapping = INVALID_HANDLE_VALUE;
+            }
+        }
+        CloseHandle(hFile);
+    }
+    
+    return hMapping;
+}
+
+static VOID
+UnmapAndCloseDatabase(IN HANDLE hMapping,
+                      IN PVOID MappingBasePtr)
+{
+    UnmapViewOfFile(MappingBasePtr);
+    CloseHandle(hMapping);
+}
+
+static INFO_VERSION
+DetectDatabaseVersion(PVOID Header)
+{
+    PINFO2_HEADER Info2 = (PINFO2_HEADER)Header;
+    INFO_VERSION Version = ivUnknown;
+
+    if (Info2->Version == 5 &&
+        Info2->Zero1 == 0 &&
+        Info2->Zero2 == 0 &&
+        Info2->RecordSize == 0x320)
+    {
+        Version = ivINFO2;
+    }
+    
+    return Version;
+}
+
+static BOOL
+IsValidRecycleBin(IN LPTSTR szPath)
+{
+    TCHAR szFile[MAX_PATH + 1];
+    TCHAR szClsId[48];
+    INFO_VERSION DbVersion = ivUnknown;
+    
+    _stprintf(szFile,
+              _T("%s\\desktop.ini"),
+              szPath);
+
+    /* check if directory contains a valid desktop.ini for the recycle bin */
+    if (GetPrivateProfileString(TEXT(".ShellClassInfo"),
+                                TEXT("CLSID"),
+                                NULL,
+                                szClsId,
+                                sizeof(szClsId) / sizeof(szClsId[0]),
+                                szFile) &&
+        !_tcsicmp(_T("{645FF040-5081-101B-9F08-00AA002F954E}"),
+                  szClsId))
+    {
+        HANDLE hDb;
+        LARGE_INTEGER FileSize;
+        PVOID pDbBase = NULL;
+
+        /* open the database and check the signature */
+        _stprintf(szFile,
+                  _T("%s\\INFO2"),
+                  szPath);
+        hDb = OpenAndMapInfoDatabase(szFile,
+                                     &pDbBase,
+                                     &FileSize);
+        if (hDb != INVALID_HANDLE_VALUE)
+        {
+            DbVersion = DetectDatabaseVersion(pDbBase);
+            UnmapAndCloseDatabase(hDb,
+                                  pDbBase);
+        }
+    }
+
+    return DbVersion != ivUnknown;
+}
+
+static BOOL
+OpenLocalLSAPolicyHandle(IN ACCESS_MASK DesiredAccess,
+                         OUT PLSA_HANDLE PolicyHandle)
+{
+    LSA_OBJECT_ATTRIBUTES LsaObjectAttributes = {0};
+    NTSTATUS Status;
+
+    Status = LsaOpenPolicy(NULL,
+                           &LsaObjectAttributes,
+                           DesiredAccess,
+                           PolicyHandle);
+    if (!NT_SUCCESS(Status))
+    {
+        SetLastError(LsaNtStatusToWinError(Status));
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+static BOOL
+ConvertSIDToAccountName(IN PSID Sid,
+                        OUT LPWSTR User)
+{
+    DWORD AccountNameLen = 0;
+    DWORD DomainNameLen = 0;
+    SID_NAME_USE NameUse;
+    DWORD Error = ERROR_SUCCESS;
+    LPWSTR AccountName, DomainName;
+    BOOL Ret = FALSE;
+
+    if (!LookupAccountSidW(NULL,
+                           Sid,
+                           NULL,
+                           &AccountNameLen,
+                           NULL,
+                           &DomainNameLen,
+                           &NameUse))
+    {
+        Error = GetLastError();
+        if (Error == ERROR_NONE_MAPPED ||
+            Error != ERROR_INSUFFICIENT_BUFFER)
+        {
+            /* some unexpected error occured! */
+            goto ConvertSID;
+        }
+    }
+    
+    AccountName = (LPWSTR)HeapAlloc(GetProcessHeap(),
+                                    0,
+                                    (AccountNameLen + DomainNameLen) * sizeof(WCHAR));
+    if (AccountName != NULL)
+    {
+        LSA_HANDLE PolicyHandle;
+        DomainName = AccountName + AccountNameLen;
+        
+        if (!LookupAccountSidW(NULL,
+                               Sid,
+                               AccountName,
+                               &AccountNameLen,
+                               DomainName,
+                               &DomainNameLen,
+                               &NameUse))
+        {
+            goto BailFreeAccountName;
+        }
+        
+        wcscpy(User,
+               AccountName);
+        Ret = TRUE;
+        
+        if (OpenLocalLSAPolicyHandle(POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION,
+                                     &PolicyHandle))
+        {
+            PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain;
+            PLSA_TRANSLATED_NAME Names;
+            PLSA_TRUST_INFORMATION Domain;
+            PLSA_UNICODE_STRING DomainName;
+            PPOLICY_ACCOUNT_DOMAIN_INFO PolicyAccountDomainInfo = NULL;
+            NTSTATUS Status;
+            
+            Status = LsaLookupSids(PolicyHandle,
+                                   1,
+                                   &Sid,
+                                   &ReferencedDomain,
+                                   &Names);
+            if (NT_SUCCESS(Status))
+            {
+                if (ReferencedDomain != NULL &&
+                    Names->DomainIndex >= 0)
+                {
+                    Domain = &ReferencedDomain->Domains[Names->DomainIndex];
+                    DomainName = &Domain->Name;
+                }
+                else
+                {
+                    Domain = NULL;
+                    DomainName = NULL;
+                }
+                
+                switch (Names->Use)
+                {
+                    case SidTypeAlias:
+                        if (Domain != NULL)
+                        {
+                            /* query the domain name for BUILTIN accounts */
+                            Status = LsaQueryInformationPolicy(PolicyHandle,
+                                                               PolicyAccountDomainInformation,
+                                                               (PVOID*)&PolicyAccountDomainInfo);
+                            if (NT_SUCCESS(Status))
+                            {
+                                DomainName = &PolicyAccountDomainInfo->DomainName;
+                            }
+                        }
+                        /* fall through */
+
+                    case SidTypeUser:
+                    {
+                        if (Domain != NULL)
+                        {
+                            WCHAR *s;
+
+                            /* NOTE: LSA_UNICODE_STRINGs are not always NULL-terminated! */
+
+                            wcscpy(User,
+                                   AccountName);
+                            wcscat(User,
+                                   L" (");
+                            s = User + wcslen(User);
+                            CopyMemory(s,
+                                       DomainName->Buffer,
+                                       DomainName->Length);
+                            s += DomainName->Length / sizeof(WCHAR);
+                            *(s++) = L'\\';
+                            CopyMemory(s,
+                                       Names->Name.Buffer,
+                                       Names->Name.Length);
+                            s += Names->Name.Length / sizeof(WCHAR);
+                            *(s++) = L')';
+                            *s = L'\0';
+                        }
+                        break;
+                    }
+
+                    case SidTypeWellKnownGroup:
+                    {
+                        break;
+                    }
+
+                    default:
+                    {
+                        _ftprintf(stderr,
+                                  _T("Unhandled SID type: 0x%x\n"),
+                                  Names->Use);
+                        break;
+                    }
+                }
+
+                if (PolicyAccountDomainInfo != NULL)
+                {
+                    LsaFreeMemory(PolicyAccountDomainInfo);
+                }
+
+                LsaFreeMemory(ReferencedDomain);
+                LsaFreeMemory(Names);
+            }
+
+            LsaClose(PolicyHandle);
+            
+            if (!NT_SUCCESS(Status))
+            {
+                Ret = FALSE;
+                goto BailFreeAccountName;
+            }
+        }
+        else
+        {
+BailFreeAccountName:
+            HeapFree(GetProcessHeap(),
+                     0,
+                     AccountName);
+            goto ConvertSID;
+        }
+    }
+    
+ConvertSID:
+    if (!Ret)
+    {
+        LPWSTR StrSid;
+        Ret = ConvertSidToStringSidW(Sid,
+                                     &StrSid);
+        if (Ret)
+        {
+            wcscpy(User,
+                   StrSid);
+            LocalFree((HLOCAL)StrSid);
+        }
+    }
+
+    return Ret;
+}
+
+static VOID
+FreeRecycleBinsList(IN OUT PRECYCLE_BIN *RecycleBinsListHead)
+{
+    PRECYCLE_BIN CurrentBin, NextBin;
+
+    CurrentBin = *RecycleBinsListHead;
+    while (CurrentBin != NULL)
+    {
+        NextBin = CurrentBin->Next;
+        LocalFree((HLOCAL)CurrentBin->Sid);
+        HeapFree(GetProcessHeap(),
+                 0,
+                 CurrentBin);
+        CurrentBin = NextBin;
+    }
+
+    *RecycleBinsListHead = NULL;
+}
+
+static BOOL
+LocateRecycleBins(IN LPWSTR szDrive,
+                  OUT PRECYCLE_BIN *RecycleBinsListHead)
+{
+    TCHAR szRecBinPath[MAX_PATH + 1];
+    HANDLE FindResult;
+    WIN32_FIND_DATA FindData;
+    PRECYCLE_BIN NewBin;
+    BOOL Ret = FALSE;
+    
+    FreeRecycleBinsList(RecycleBinsListHead);
+    
+    /*
+     * search for recycle bins on volumes that support file security (NTFS)
+     */
+    _stprintf(szRecBinPath,
+              _T("%lS\\RECYCLER\\*"),
+              szDrive);
+    FindResult = FindFirstFile(szRecBinPath,
+                               &FindData);
+    if (FindResult != INVALID_HANDLE_VALUE)
+    {
+        do
+        {
+            if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY &&
+                _tcscmp(FindData.cFileName,
+                        _T("..")) &&
+                _tcscmp(FindData.cFileName,
+                        _T(".")))
+            {
+                PSID Sid;
+                
+                if (ConvertStringSidToSid(FindData.cFileName,
+                                          &Sid))
+                {
+                    _stprintf(szRecBinPath,
+                              _T("%s\\RECYCLER\\%s"),
+                              szDrive,
+                              FindData.cFileName);
+                    if (IsValidRecycleBin(szRecBinPath))
+                    {
+                        NewBin = (PRECYCLE_BIN)HeapAlloc(GetProcessHeap(),
+                                                         HEAP_ZERO_MEMORY,
+                                                         sizeof(RECYCLE_BIN));
+                        if (NewBin != NULL)
+                        {
+                            _tcscpy(NewBin->Path,
+                                    szRecBinPath);
+
+                            /* convert the SID to an account name */
+                            ConvertSIDToAccountName(Sid,
+                                                    NewBin->User);
+
+                            /* append the recycle bin */
+                            *RecycleBinsListHead = NewBin;
+                            RecycleBinsListHead = &NewBin->Next;
+                            
+                            Ret = TRUE;
+                        }
+                        else
+                            goto ContinueFreeSid;
+                    }
+                    else
+                    {
+ContinueFreeSid:
+                        LocalFree((HLOCAL)Sid);
+                    }
+                }
+            }
+        } while (FindNextFile(FindResult,
+                              &FindData));
+
+        FindClose(FindResult);
+    }
+    
+    /*
+     * search for recycle bins on volumes that don't support file security (FAT)
+     */
+    _stprintf(szRecBinPath,
+              _T("%s\\Recycled"),
+              szDrive);
+    FindResult = FindFirstFile(szRecBinPath,
+                               &FindData);
+    if (FindResult != INVALID_HANDLE_VALUE)
+    {
+        if (IsValidRecycleBin(szRecBinPath))
+        {
+            SID_IDENTIFIER_AUTHORITY WorldSia = {SECURITY_WORLD_SID_AUTHORITY};
+            PSID EveryoneSid;
+            
+            /* create an Everyone SID */
+            if (AllocateAndInitializeSid(&WorldSia,
+                                         1,
+                                         SECURITY_WORLD_RID,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         &EveryoneSid))
+            {
+                NewBin = (PRECYCLE_BIN)HeapAlloc(GetProcessHeap(),
+                                                 HEAP_ZERO_MEMORY,
+                                                 sizeof(RECYCLE_BIN));
+                if (NewBin != NULL)
+                {
+                    _tcscpy(NewBin->Path,
+                            szRecBinPath);
+
+                    /* convert the SID to an account name */
+                    ConvertSIDToAccountName(EveryoneSid,
+                                            NewBin->User);
+
+                    /* append the recycle bin */
+                    *RecycleBinsListHead = NewBin;
+                    RecycleBinsListHead = &NewBin->Next;
+
+                    Ret = TRUE;
+                }
+                else
+                    FreeSid(EveryoneSid);
+            }
+        }
+        FindClose(FindResult);
+    }
+
+    return Ret;
+}
+
+static VOID
+DiskFileNameFromRecord(OUT LPTSTR szShortFileName,
+                       IN DWORD RecordNumber,
+                       IN WCHAR cDriveLetter,
+                       IN LPWSTR szFileName)
+{
+    LPWSTR FileExt;
+    
+    FileExt = wcsrchr(szFileName,
+                      L'.');
+    if (FileExt != NULL)
+    {
+        _stprintf(szShortFileName,
+                  _T("D%lC%d%lS"),
+                  cDriveLetter,
+                  RecordNumber,
+                  FileExt);
+    }
+    else
+    {
+        _stprintf(szShortFileName,
+                  _T("D%lC%d"),
+                  cDriveLetter,
+                  RecordNumber);
+    }
+}
+
+static BOOL
+DumpRecycleBin(IN PRECYCLE_BIN RecycleBin)
+{
+    WCHAR szFile[MAX_PATH + 1];
+    HANDLE hDb;
+    LARGE_INTEGER FileSize;
+    PVOID pDbBase = NULL;
+    INFO_VERSION Version = ivUnknown;
+
+    _tprintf(_T("Dumping recycle bin of \"%lS\":\n"),
+             RecycleBin->User);
+    _tprintf(_T("Directory: %lS\n\n"),
+             RecycleBin->Path);
+
+    _stprintf(szFile,
+              _T("%s\\INFO2"),
+              RecycleBin->Path);
+    hDb = OpenAndMapInfoDatabase(szFile,
+                                 &pDbBase,
+                                 &FileSize);
+    if (hDb != INVALID_HANDLE_VALUE)
+    {
+        Version = DetectDatabaseVersion(pDbBase);
+
+        /* dump the INFO2 database */
+        switch (Version)
+        {
+            case ivINFO2:
+            {
+                DWORD nRecords;
+                PINFO2_HEADER Info2Header = (PINFO2_HEADER)pDbBase;
+                PINFO2_RECORD Info2 = (PINFO2_RECORD)(Info2Header + 1);
+                int i = 0;
+
+                nRecords = (FileSize.QuadPart - sizeof(INFO2_HEADER)) / Info2Header->RecordSize;
+                
+                while (nRecords != 0)
+                {
+                    /* if the first character of the AnsiFileName is zero, the record
+                       is considered deleted */
+                    if (Info2->AnsiFileName[0] != '\0')
+                    {
+                        _tprintf(_T(" [%d] Record: #%d \"%lS\"\n"),
+                                 ++i,
+                                 Info2->RecordNumber,
+                                 Info2->FileName);
+
+                        DiskFileNameFromRecord(szFile,
+                                               Info2->RecordNumber,
+                                               (WCHAR)Info2->DriveLetter + L'a',
+                                               Info2->FileName);
+                        _tprintf(_T("      Name on disk: \"%s\"\n"),
+                                 szFile);
+                        _tprintf(_T("      Deleted size on disk: %d KB\n"),
+                                 Info2->DeletedPhysicalSize / 1024);
+                    }
+                    nRecords--;
+                    Info2++;
+                }
+                
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        UnmapAndCloseDatabase(hDb,
+                              pDbBase);
+    }
+
+    return FALSE;
+}
+
+static BOOL
+SelectRecycleBin(IN LPWSTR szDrive)
+{
+    BOOL Ret;
+    PRECYCLE_BIN RecycleBinsList = NULL;
+    
+    Ret = LocateRecycleBins(szDrive,
+                            &RecycleBinsList);
+    if (Ret)
+    {
+        if (RecycleBinsList->Next != NULL)
+        {
+            PRECYCLE_BIN CurrentBin = RecycleBinsList;
+            int n = 0, i = 0;
+
+            /* if there are multiple recycle bins ask the user which one to dump */
+            _tprintf(_T("There are several recycle bins on this drive. Select one:\n"));
+            
+            while (CurrentBin != NULL)
+            {
+                _tprintf(_T("  [%d] %lS\n"),
+                         ++i,
+                         CurrentBin->User);
+                CurrentBin = CurrentBin->Next;
+                n++;
+            }
+
+            _tprintf(_T("Enter the number: "));
+DisplayPrompt:
+            _tscanf(_T("%d"),
+                    &i);
+            if (i > n || i < 1)
+            {
+                _tprintf(_T("Please enter a number between 1 and %d: "),
+                         n);
+                goto DisplayPrompt;
+            }
+            
+            /* walk to the selected recycle bin */
+            CurrentBin = RecycleBinsList;
+            while (CurrentBin != NULL && i != 1)
+            {
+                CurrentBin = CurrentBin->Next;
+                i--;
+            }
+            
+            /* dump it */
+            Ret = DumpRecycleBin(CurrentBin);
+        }
+        else
+        {
+            /* dump the first (and only) recycle bin */
+            Ret = DumpRecycleBin(RecycleBinsList);
+        }
+    }
+    else
+    {
+        _ftprintf(stderr,
+                  _T("No recycle bins on this volume!\n"));
+    }
+    
+    FreeRecycleBinsList(&RecycleBinsList);
+
+    return Ret;
+}
+
+static VOID
+PrintHelp(VOID)
+{
+    _ftprintf(stderr,
+              _T("Usage: dumprecbin C:\n"));
+}
+
+int
+main(int argc,
+     char *argv[])
+{
+    if (argc != 2 ||
+        strlen(argv[1]) != 2 || argv[1][1] != ':' ||
+        toupper(argv[1][0]) < 'A' || toupper(argv[1][0]) > 'Z')
+    {
+        PrintHelp();
+        return 1;
+    }
+    else
+    {
+        WCHAR szDrive[3];
+        _stprintf(szDrive,
+                  _T("%lC:"),
+                  argv[1][0]);
+
+        if (!SelectRecycleBin(szDrive))
+            return 1;
+        else
+            return 0;
+    }
+}
+

reactos/apps/utils/dumprecbin/dumprecbin.xml

@@ -0,0 +1,13 @@
+<module name="dumprecbin" type="win32cui" installbase="bin" installname="dumprecbin.exe">
+	<include base="dumprecbin">.</include>
+	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="_WIN32_IE">0x0500</define>
+	<define name="_WIN32_WINNT">0x0600</define>
+	<define name="WINVER">0x0600</define>
+	<library>advapi32</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
+	<file>dumprecbin.c</file>
+</module>

reactos/apps/utils/net/arp/arp.c

@@ -0,0 +1,602 @@
+/*
+ *  ReactOS Win32 Applications
+ *  Copyright (C) 2005 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS arp utility
+ * FILE:        apps/utils/net/arp/arp.c
+ * PURPOSE:     view and manipulate the ARP cache
+ * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
+ * REVISIONS:
+ *   GM 27/06/05 Created
+ *
+ */
+
+#include <windows.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <tchar.h>
+#include <string.h>
+#include <ctype.h>
+#include <winsock2.h>
+#include <iphlpapi.h>
+
+#define WIN32_LEAN_AND_MEAN
+#define UNICODE
+#define _UNICODE
+
+/*
+ * Globals
+ */
+const char SEPERATOR = '-';
+int _CRT_glob = 0; // stop * from listing dir files in arp -d *
+
+
+/*
+ * function declerations
+ */
+DWORD DoFormatMessage(DWORD ErrorCode);
+INT PrintEntries(PMIB_IPNETROW pIpAddRow);
+INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr);
+INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr);
+INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr);
+VOID Usage(VOID);
+
+
+/*
+ * convert error code into meaningful message
+ */
+DWORD DoFormatMessage(DWORD ErrorCode)
+{
+    LPVOID lpMsgBuf;
+    DWORD RetVal;
+    /* double brackets to silence the assignment warning message */
+    if ((RetVal = FormatMessage(
+            FORMAT_MESSAGE_ALLOCATE_BUFFER |
+            FORMAT_MESSAGE_FROM_SYSTEM |
+            FORMAT_MESSAGE_IGNORE_INSERTS,
+            NULL,
+            ErrorCode,
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
+            (LPTSTR) &lpMsgBuf,
+            0,
+            NULL ))) {
+        _tprintf(_T("%s"), (LPTSTR)lpMsgBuf);
+
+        LocalFree(lpMsgBuf);
+        /* return number of TCHAR's stored in output buffer
+         * excluding '\0' - as FormatMessage does*/
+        return RetVal;
+    }
+    else
+        return 0;
+}
+
+
+
+/*
+ *
+ * Takes an ARP entry and prints the IP address,
+ * the MAC address and the entry type to screen
+ *
+ */
+INT PrintEntries(PMIB_IPNETROW pIpAddRow)
+{
+    IN_ADDR inaddr;
+    TCHAR cMacAddr[20];
+
+    /* print IP addresses */
+    inaddr.S_un.S_addr = pIpAddRow->dwAddr;
+    _tprintf(_T("  %-22s"), inet_ntoa(inaddr));
+
+    /* print MAC address */
+    _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"),
+        pIpAddRow->bPhysAddr[0],
+        pIpAddRow->bPhysAddr[1],
+        pIpAddRow->bPhysAddr[2],
+        pIpAddRow->bPhysAddr[3],
+        pIpAddRow->bPhysAddr[4],
+        pIpAddRow->bPhysAddr[5]);
+    _tprintf(_T("%-22s"), cMacAddr);
+
+    /* print cache type */
+    switch (pIpAddRow->dwType)
+    {
+        case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n"));
+                                      break;
+        case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n"));
+                                      break;
+        case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n"));
+                                      break;
+        case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n"));
+                                      break;
+    }
+    return EXIT_SUCCESS;
+}
+
+
+/*
+ *
+ * Takes optional parameters of an internet address and interface address.
+ * Retrieve all entries in the ARP cache. If an internet address is
+ * specified, display the ARP entry relating to that address. If an
+ * interface address is specified, display all entries relating to
+ * that interface.
+ *
+ */
+/* FIXME: allow user to specify an interface address, via pszIfAddr */
+INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
+{
+    INT iRet;
+    UINT i, k;
+    PMIB_IPNETTABLE pIpNetTable;
+    PMIB_IPADDRTABLE pIpAddrTable;
+    ULONG ulSize = 0;
+    struct in_addr inaddr, inaddr2;
+    DWORD dwSize = 0;
+    PTCHAR pszIpAddr;
+    TCHAR szIntIpAddr[20];
+
+    /* Return required buffer size */
+    GetIpNetTable(NULL, &ulSize, 0);
+
+    /* allocate memory for ARP address table */
+    pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE));
+    ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
+
+    /* get Arp address table */
+    if (pIpNetTable != NULL)
+        GetIpNetTable(pIpNetTable, &ulSize, TRUE);
+    else
+    {
+        _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
+        free(pIpNetTable);
+        exit(EXIT_FAILURE);
+    }
+
+    /* check there are entries in the table */
+    if (pIpNetTable->dwNumEntries == 0)
+    {
+        _tprintf(_T("No ARP entires found\n"));
+        free(pIpNetTable);
+        exit(EXIT_FAILURE);
+    }
+
+
+
+    /* try doing this in the way it's done above, it's clearer */
+    /* Retrieve the interface-to-ip address mapping
+     * table to get the IP address for adapter */
+    pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+    GetIpAddrTable(pIpAddrTable, &dwSize, 0);   // NULL ?
+
+
+    pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+    //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable));
+
+    if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR)
+    {
+        _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
+        _tprintf(_T("error: %d\n"), WSAGetLastError());
+    }
+
+
+    for (k=0; k < pIpAddrTable->dwNumEntries; k++)
+    {
+        if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex)
+        {
+            //printf("debug print: pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex);
+            inaddr2.s_addr = pIpAddrTable->table[k].dwAddr;
+            pszIpAddr = inet_ntoa(inaddr2);
+            strcpy(szIntIpAddr, pszIpAddr);
+        }
+    }
+
+
+    /* print header, including interface IP address and index number */
+    _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex);
+    _tprintf(_T("  Internet Address      Physical Address      Type\n"));
+
+    /* go through all ARP entries */
+    for (i=0; i < pIpNetTable->dwNumEntries; i++)
+    {
+
+        /* if the user has supplied their own internet addesss *
+         * only print the arp entry which matches that */
+        if (pszInetAddr)
+        {
+            inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr;
+            pszIpAddr = inet_ntoa(inaddr);
+
+            /* check if it matches, print it */
+            if (strcmp(pszIpAddr, pszInetAddr) == 0)
+                PrintEntries(&pIpNetTable->table[i]);
+        }
+        else
+            /* if an address is not supplied, print all entries */
+            PrintEntries(&pIpNetTable->table[i]);
+    }
+
+    free(pIpNetTable);
+    free(pIpAddrTable);
+
+    return EXIT_SUCCESS;
+}
+
+
+/*
+ *
+ * Takes an internet address, a MAC address and an optional interface
+ * address as arguments and checks their validity.
+ * Fill out an MIB_IPNETROW structure and insert the data into the
+ * ARP cache as a static entry.
+ *
+ */
+INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
+{
+    PMIB_IPNETROW pAddHost;
+    PMIB_IPADDRTABLE pIpAddrTable;
+    PMIB_IPNETTABLE pIpNetTable;
+    DWORD dwIpAddr = 0;
+    DWORD dwSize = 0;
+    ULONG ulSize = 0;
+    INT iRet, i, val;
+    TCHAR c;
+
+    /* error checking */
+
+    /* check IP address */
+    if (pszInetAddr != NULL)
+    {
+        if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE)
+        {
+            _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr);
+            exit(EXIT_FAILURE);
+        }
+    }
+    else
+    {
+        Usage();
+        exit(EXIT_FAILURE);
+    }
+
+    /* check MAC address */
+    if (strlen(pszEthAddr) != 17)
+    {
+        _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr);
+        exit(EXIT_FAILURE);
+    }
+    for (i=0; i<17; i++)
+    {
+        if (pszEthAddr[i] == SEPERATOR)
+            continue;
+
+        if (!isxdigit(pszEthAddr[i]))
+        {
+            _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr);
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    /* We need the IpNetTable to get the adapter index */
+    /* Return required buffer size */
+    GetIpNetTable(NULL, &ulSize, 0);
+    /* allocate memory for ARP address table */
+    pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE));
+    ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
+    /* get Arp address table */
+    if (pIpNetTable != NULL)
+        GetIpNetTable(pIpNetTable, &ulSize, TRUE);
+    else
+    {
+        _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
+        free(pIpNetTable);
+        return -1;
+    }
+
+
+    /* reserve memory on heap and zero */
+    pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW));
+    ZeroMemory(pAddHost, sizeof(MIB_IPNETROW));
+
+    /* set dwIndex field to the index of a local IP address to
+     * indicate the network on which the ARP entry applies */
+    if (pszIfAddr)
+        sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex);
+    else
+    {
+        /* map the IP to the index */
+        pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+        GetIpAddrTable(pIpAddrTable, &dwSize, 0);
+
+        pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+
+        if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR)
+        {
+            _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
+            _tprintf(_T("error: %d\n"), WSAGetLastError());
+        }
+        //printf("debug print: pIpNetTable->table[0].dwIndex = %lx\n", pIpNetTable->table[0].dwIndex);
+        /* needs testing. I get the correct index on my machine, but need others
+         * to test their card index.  Any problems and we can use GetAdaptersInfo instead */
+        pAddHost->dwIndex = pIpNetTable->table[0].dwIndex;
+
+        free(pIpAddrTable);
+    }
+
+    /* Set MAC address to 6 bytes (typical) */
+    pAddHost->dwPhysAddrLen = 6;
+
+
+    /* Encode bPhysAddr into correct byte array */
+    for (i=0; i<6; i++)
+    {
+        val =0;
+        c = toupper(pszEthAddr[i*3]);
+        c = c - (isdigit(c) ? '0' : ('A' - 10));
+        val += c;
+        val = (val << 4);
+        c = toupper(pszEthAddr[i*3 + 1]);
+        c = c - (isdigit(c) ? '0' : ('A' - 10));
+        val += c;
+        pAddHost->bPhysAddr[i] = val;
+    }
+
+
+    /* copy converted IP address */
+    pAddHost->dwAddr = dwIpAddr;
+
+
+    /* set type to static */
+    pAddHost->dwType = MIB_IPNET_TYPE_STATIC;
+
+
+    /* Add the ARP entry */
+    if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR)
+    {
+        DoFormatMessage(iRet);
+        free(pAddHost);
+        exit(EXIT_FAILURE);
+    }
+
+    free(pAddHost);
+
+    return EXIT_SUCCESS;
+}
+
+
+/*
+ *
+ * Takes an internet address and an optional interface address as
+ * arguments and checks their validity.
+ * Add the interface number and IP to an MIB_IPNETROW structure
+ * and remove the entry from the ARP cache.
+ *
+ */
+INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
+{
+    PMIB_IPNETROW pDelHost;
+    PMIB_IPADDRTABLE pIpAddrTable;
+    PMIB_IPNETTABLE pIpNetTable;
+    ULONG ulSize = 0;
+    DWORD dwIpAddr = 0;
+    DWORD dwSize = 0;
+    INT iRet;
+    BOOL bFlushTable = FALSE;
+
+    /* error checking */
+
+    /* check IP address */
+    if (pszInetAddr != NULL)
+    {
+        /* if wildcard is given, set flag to delete all hosts */
+        if (strncmp(pszInetAddr, "*", 1) == 0)
+            bFlushTable = TRUE;
+        else if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE)
+        {
+            _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr);
+            exit(EXIT_FAILURE);
+        }
+    }
+    else
+    {
+        Usage();
+        exit(EXIT_FAILURE);
+    }
+
+    /* We need the IpNetTable to get the adapter index */
+    /* Return required buffer size */
+    GetIpNetTable(NULL, &ulSize, 0);
+    /* allocate memory for ARP address table */
+    pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE));
+    ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
+    /* get Arp address table */
+    if (pIpNetTable != NULL)
+        GetIpNetTable(pIpNetTable, &ulSize, TRUE);
+    else
+    {
+        _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
+        free(pIpNetTable);
+        return -1;
+    }
+
+
+     pIpAddrTable = (MIB_IPADDRTABLE*) malloc(sizeof(MIB_IPADDRTABLE));
+     pDelHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW));
+     ZeroMemory(pIpAddrTable, sizeof(MIB_IPADDRTABLE));
+     ZeroMemory(pDelHost, sizeof(MIB_IPNETROW));
+    /* set dwIndex field to the index of a local IP address to
+     * indicate the network on which the ARP entry applies */
+    if (pszIfAddr)
+        sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex);
+    else
+    {
+        /* map the IP to the index */
+        if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER)
+            pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+
+        if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR)
+        {
+            _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
+            _tprintf(_T("error: %d\n"), WSAGetLastError());
+        }
+        /* needs testing. I get the correct index on my machine, but need others
+         * to test their card index. Any problems and we can use GetAdaptersInfo instead */
+        pDelHost->dwIndex = pIpNetTable->table[0].dwIndex;
+    }
+
+    if (bFlushTable == TRUE)
+    {
+        /* delete arp cache */
+        if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR)
+        {
+            DoFormatMessage(iRet);
+            free(pIpAddrTable);
+            free(pDelHost);
+            return EXIT_FAILURE;
+        }
+        else
+        {
+            free(pIpAddrTable);
+            free(pDelHost);
+            return EXIT_SUCCESS;
+        }
+    }
+    else
+        /* copy converted IP address */
+        pDelHost->dwAddr = dwIpAddr;
+
+    /* Add the ARP entry */
+    if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR)
+    {
+
+        DoFormatMessage(iRet);
+        free(pIpAddrTable);
+        free(pDelHost);
+        exit(EXIT_FAILURE);
+    }
+
+    free(pIpAddrTable);
+    free(pDelHost);
+
+    return EXIT_SUCCESS;
+}
+
+
+
+/*
+ *
+ * print program usage to screen
+ *
+ */
+VOID Usage(VOID)
+{
+    _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n"
+                "address resolution protocol (ARP).\n"
+                "\n"
+                "ARP -s inet_addr eth_addr [if_addr]\n"
+                "ARP -d inet_addr [if_addr]\n"
+                "ARP -a [inet_addr] [-N if_addr]\n"
+                "\n"
+                "  -a            Displays current ARP entries by interrogating the current\n"
+                "                protocol data.  If inet_addr is specified, the IP and Physical\n"
+                "                addresses for only the specified computer are displayed.  If\n"
+                "                more than one network interface uses ARP, entries for each ARP\n"
+                "                table are displayed.\n"
+                "  -g            Same as -a.\n"
+                "  inet_addr     Specifies an internet address.\n"
+                "  -N if_addr    Displays the ARP entries for the network interface specified\n"
+                "                by if_addr.\n"
+                "  -d            Deletes the host specified by inet_addr. inet_addr may be\n"
+                "                wildcarded with * to delete all hosts.\n"
+                "  -s            Adds the host and associates the Internet address inet_addr\n"
+                "                with the Physical address eth_addr.  The Physical address is\n"
+                "                given as 6 hexadecimal bytes separated by hyphens. The entry\n"
+                "                is permanent.\n"
+                "  eth_addr      Specifies a physical address.\n"
+                "  if_addr       If present, this specifies the Internet address of the\n"
+                "                interface whose address translation table should be modified.\n"
+                "                If not present, the first applicable interface will be used.\n"
+                "Example:\n"
+                "  > arp -s 157.55.85.212   00-aa-00-62-c6-09  .... Adds a static entry.\n"
+                "  > arp -a                                    .... Displays the arp table.\n\n"));
+}
+
+
+
+/*
+ *
+ * Program entry.
+ * Parse command line and call the required function
+ *
+ */
+INT main(int argc, char* argv[])
+{
+    if ((argc < 2) || (argc > 5))
+    {
+       Usage();
+       return EXIT_FAILURE;
+    }
+
+    if (argv[1][0] == '-')
+    {
+        switch (argv[1][1])
+        {
+           case 'a': /* fall through */
+           case 'g':
+                     if (argc == 2)
+                         DisplayArpEntries(NULL, NULL);
+                     else if (argc == 3)
+                         DisplayArpEntries(argv[2], NULL);
+                     else if ((argc == 4) && ((strcmp(argv[2], "-N")) == 0))
+                         DisplayArpEntries(NULL, argv[3]);
+                     else if ((argc == 5) && ((strcmp(argv[3], "-N")) == 0))
+                         DisplayArpEntries(argv[2], argv[4]);
+                     else
+                         Usage();
+                         return EXIT_FAILURE;
+                     break;
+           case 'd': if (argc == 3)
+                         Deletehost(argv[2], NULL);
+                     else if (argc == 4)
+                         Deletehost(argv[2], argv[3]);
+                     else
+                         Usage();
+                         return EXIT_FAILURE;
+                     break;
+           case 's': if (argc == 4)
+                         Addhost(argv[2], argv[3], NULL);
+                     else if (argc == 5)
+                         Addhost(argv[2], argv[3], argv[4]);
+                     else
+                         Usage();
+                         return EXIT_FAILURE;
+                     break;
+           default:
+              Usage();
+              return EXIT_FAILURE;
+        }
+    }
+    else
+        Usage();
+
+    return EXIT_SUCCESS;
+} /*
+warning: suggest parentheses around assignment used as truth value
+warning: char format, void arg (arg 2)*/

reactos/apps/utils/net/arp/arp.xml

@@ -0,0 +1,11 @@
+<module name="arp" type="win32cui" installbase="system32" installname="arp.exe">
+	<include base="arp">.</include>
+	<define name="__USE_W32API" />
+	<library>kernel32</library>
+	<library>iphlpapi</library>
+	<library>ws2_32</library>
+	<library>shlwapi</library>
+	<file>arp.c</file>
+	<file>arp.rc</file>
+</module>
+

reactos/apps/utils/net/directory.xml

@@ -0,0 +1,30 @@
+<directory name="arp">
+    <xi:include href="arp/arp.xml" />
+</directory>
+<directory name="finger">
+    <xi:include href="finger/finger.xml" />
+</directory>
+<directory name="ftp">
+    <xi:include href="ftp/ftp.xml" />
+</directory>
+<directory name="ipconfig">
+    <xi:include href="ipconfig/ipconfig.xml" />
+</directory>
+<directory name="netstat">
+    <xi:include href="netstat/netstat.xml" />
+</directory>
+<directory name="ping">
+    <xi:include href="ping/ping.xml" />
+</directory>
+<directory name="route">
+    <xi:include href="route/route.xml" />
+</directory>
+<directory name="telnet">
+    <xi:include href="telnet/telnet.xml" />
+</directory>
+<directory name="tracert">
+    <xi:include href="tracert/tracert.xml" />
+</directory>
+<directory name="whois">
+    <xi:include href="whois/whois.xml" />
+</directory>

reactos/apps/utils/net/finger/finger.c

@@ -54,7 +54,18 @@
  * mail info, and .plan/.project files.
  */
 
-#include "precomp.h"
+#include <winsock2.h>
+#include "err.h"
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "unistd.h"
+
+#include "various.h"
+#include "getopt.h"
 
 char *__progname;
 
@@ -112,15 +123,15 @@ main(int argc, char **argv)
 static void
 userlist(int argc, char **argv)
 {
-	int *used = NULL;
+	int *used;
 	char **ap, **nargv, **np, **p;
 	WORD wVersionRequested;
 	WSADATA wsaData;
 	int iErr;
 
 
-	if ((nargv = (char**) malloc((argc+1) * sizeof(char *))) == NULL ||
-	    (used = (int*) calloc(argc, sizeof(int))) == NULL)
+	if ((nargv = malloc((argc+1) * sizeof(char *))) == NULL ||
+	    (used = calloc(argc, sizeof(int))) == NULL)
 		err(1, NULL);
 
 	/* Pull out all network requests into nargv. */
@@ -156,8 +167,6 @@ userlist(int argc, char **argv)
 
 	/* Bring down winsock */
 	WSACleanup();
-	free(nargv);
-	free(used);
 	exit(0);
 }
 

reactos/apps/utils/net/finger/finger.xml

@@ -0,0 +1,12 @@
+<module name="finger" type="win32cui" installbase="system32" installname="finger.exe">
+	<include base="finger">.</include>
+	<define name="__USE_W32API" />
+	<define name="__USE_W32_SOCKETS" />
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<file>finger.c</file>
+	<file>err.c</file>
+	<file>getopt.c</file>
+	<file>net.c</file>
+	<file>finger.rc</file>
+</module>

reactos/apps/utils/net/finger/getopt.c

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1987 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Fri Jun 13 10:39:00 1997, tfelix@fred.net:
+ *     Ported to Win32, changed index/rindex to strchr/strrchr
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)getopt.c	4.13 (Berkeley) 2/23/91";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "getopt.h"
+
+/*
+ * get option letter from argument vector
+ */
+int	opterr = 1,		/* if error message should be printed */
+	optind = 1,		/* index into parent argv vector */
+	optopt;			/* character checked for validity */
+char	*optarg;		/* argument associated with option */
+
+#define	BADCH	(int)'?'
+#define	EMSG	""
+
+int
+getopt(int nargc, char * const *nargv, const char *ostr)
+{
+	static char *place = EMSG;		/* option letter processing */
+	register char *oli;			/* option letter list index */
+	char *p;
+
+	if (!*place) {				/* update scanning pointer */
+		if (optind >= nargc || *(place = nargv[optind]) != '-') {
+			place = EMSG;
+			return(EOF);
+		}
+		if (place[1] && *++place == '-') {	/* found "--" */
+			++optind;
+			place = EMSG;
+			return(EOF);
+		}
+	}					/* option letter okay? */
+	if ((optopt = (int)*place++) == (int)':' ||
+	    !(oli = strchr(ostr, optopt))) {
+		/*
+		 * if the user didn't specify '-' as an option,
+		 * assume it means EOF.
+		 */
+		if (optopt == (int)'-')
+			return(EOF);
+		if (!*place)
+			++optind;
+		if (opterr) {
+			if (!(p = strrchr(*nargv, '/')))
+				p = *nargv;
+			else
+				++p;
+			(void)fprintf(stderr, "%s: illegal option -- %c\n",
+			    p, optopt);
+		}
+		return(BADCH);
+	}
+	if (*++oli != ':') {			/* don't need argument */
+		optarg = NULL;
+		if (!*place)
+			++optind;
+	}
+	else {					/* need an argument */
+		if (*place)			/* no white space */
+			optarg = place;
+		else if (nargc <= ++optind) {	/* no arg */
+			place = EMSG;
+			if (!(p = strrchr(*nargv, '/')))
+				p = *nargv;
+			else
+				++p;
+			if (opterr)
+				(void)fprintf(stderr,
+				    "%s: option requires an argument -- %c\n",
+				    p, optopt);
+			return(BADCH);
+		}
+	 	else				/* white space */
+			optarg = nargv[optind];
+		place = EMSG;
+		++optind;
+	}
+	return(optopt);				/* dump back option letter */
+}

reactos/apps/utils/net/finger/getopt.h

@@ -0,0 +1,7 @@
+/* getopt.h */
+
+extern char *optarg;
+extern int optind;
+
+int
+getopt(int nargc, char * const *nargv, const char *ostr);

reactos/apps/utils/net/finger/net.c

@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Tony Nardo of the Johns Hopkins University/Applied Physics Lab.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/types.h>
+#include <winsock2.h>
+#include "unistd.h"
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "various.h"
+
+void
+netfinger(char *name)
+{
+	extern int lflag;
+	char c, lastc;
+	struct in_addr defaddr;
+	struct hostent *hp, def;
+	struct servent *sp;
+	struct sockaddr_in sin;
+	SOCKET s;
+	char *alist[1], *host;
+
+	/* If this is a local request */
+	if (!(host = rindex(name, '@')))
+		return;
+
+	*host++ = '\0';
+	if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != (unsigned long)-1) {
+		def.h_name = host;
+		def.h_addr_list = alist;
+		def.h_addr = (char *)&defaddr;
+		def.h_length = sizeof(struct in_addr);
+		def.h_addrtype = AF_INET;
+		def.h_aliases = 0;
+		hp = &def;
+	} else if (!(hp = gethostbyname(host))) {
+		(void)fprintf(stderr,
+		    "finger: unknown host: %s\n", host);
+		return;
+	}
+	if (!(sp = getservbyname("finger", "tcp"))) {
+		(void)fprintf(stderr, "finger: tcp/finger: unknown service\n");
+		return;
+	}
+	sin.sin_family = hp->h_addrtype;
+	bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length);
+	sin.sin_port = sp->s_port;
+	if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) == INVALID_SOCKET) {
+		perror("finger: socket");
+		return;
+	}
+
+	/* have network connection; identify the host connected with */
+	(void)printf("[%s]\n", hp->h_name);
+	if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+		fprintf(stderr, "finger: connect rc = %d", WSAGetLastError());
+		(void)close(s);
+		return;
+	}
+
+	/* -l flag for remote fingerd  */
+	if (lflag)
+		send(s, "/W ", 3, 0);
+	/* send the name followed by <CR><LF> */
+	send(s, name, strlen(name), 0);
+	send(s, "\r\n", 2, 0);
+
+	/*
+	 * Read from the remote system; once we're connected, we assume some
+	 * data.  If none arrives, we hang until the user interrupts.
+	 *
+	 * If we see a <CR> or a <CR> with the high bit set, treat it as
+	 * a newline; if followed by a newline character, only output one
+	 * newline.
+	 *
+	 * Otherwise, all high bits are stripped; if it isn't printable and
+	 * it isn't a space, we can simply set the 7th bit.  Every ASCII
+	 * character with bit 7 set is printable.
+	 */
+	lastc = 0;
+	while (recv(s, &c, 1, 0) == 1) {
+		c &= 0x7f;
+		if (c == 0x0d) {
+			if (lastc == '\r')	/* ^M^M - skip dupes */
+				continue;
+			c = '\n';
+			lastc = '\r';
+		} else {
+			if (!isprint(c) && !isspace(c))
+				c |= 0x40;
+			if (lastc != '\r' || c != '\n')
+				lastc = c;
+			else {
+				lastc = '\n';
+				continue;
+			}
+		}
+		putchar(c);
+	}
+	if (lastc != '\n')
+		putchar('\n');
+	putchar('\n');
+}

reactos/apps/utils/net/finger/various.h

@@ -0,0 +1,36 @@
+// Various things you need when porting BSD and GNU utilities to
+// Win32.
+
+#ifndef VARIOUS_H
+#define VARIOUS_H
+
+
+typedef float f4byte_t;
+typedef double f8byte_t;
+typedef long uid_t;  // SunOS 5.5
+
+#define __P(x) x
+
+/* utmp.h */
+#define UT_LINESIZE 8
+#define UT_HOSTSIZE 16
+
+/* stat.h */
+#define  S_ISREG(mode)   (((mode)&0xF000) == 0x8000)
+#define  S_ISDIR(mode)   (((mode)&0xF000) == 0x4000)
+
+#undef MIN //take care of windows default
+#undef MAX //take care of windows default
+#define MIN(a, b) ((a) <= (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
+#define bcopy(s1, s2, n)  memmove(s2, s1, n)
+#define bcmp(s1, s2, n)  (memcmp(s1, s2, n) != 0)
+#define bzero(s, n)  memset(s, 0, n)
+
+#define index(s, c)  strchr(s, c)
+#define rindex(s, c)  strrchr(s, c)
+
+void netfinger(char *);
+
+#endif

reactos/apps/utils/net/ftp/cmdtab.c

@@ -19,7 +19,7 @@
 static char sccsid[] = "@(#)cmdtab.c	5.9 (Berkeley) 3/21/89";
 #endif /* not lint */
 
-#include "precomp.h"
+#include "ftp_var.h"
 
 /*
  * User FTP -- Command Tables.

reactos/apps/utils/net/ftp/domacro.c

@@ -19,15 +19,21 @@
 static char sccsid[] = "@(#)domacro.c	1.6 (Berkeley) 2/28/89";
 #endif /* not lint */
 
-#include "precomp.h"
+#include "ftp_var.h"
+#include "prototypes.h"
+
+#include <signal.h>
+#include <stdio.h>
 //#include <errno.h>
+#include <ctype.h>
 //#include <sys/ttychars.h>
 
-void domacro(int argc, const char *argv[])
+void domacro(argc, argv)
+	int argc;
+	char *argv[];
 {
-	int i, j;
-	const char *cp1;
-    char *cp2;
+	register int i, j;
+	register char *cp1, *cp2;
 	int count = 2, loopflg = 0;
 	char line2[200];
 	struct cmd *getcmd(), *c;

reactos/apps/utils/net/ftp/fake.c

@@ -0,0 +1,341 @@
+#include <stdio.h>
+#include <time.h>
+#include <winsock.h>
+#include "fake.h"
+#include "prototypes.h"
+
+#define MAX_ASCII 100
+
+int checkRecv(SOCKET s);
+
+int checkRecv(SOCKET s)
+{
+   int testVal;
+   fd_set sSet;
+   struct timeval timeout;
+   timeout.tv_sec = 60;
+
+   FD_ZERO(&sSet);
+
+   FD_SET(s, &sSet);
+
+   testVal = select(0, &sSet, NULL, NULL, &timeout);
+
+   if (testVal == SOCKET_ERROR)
+      fprintf(stderr, "Socket Error");
+
+   return testVal;
+}
+
+void blkfree(char **av0)
+{
+	register char **av = av0;
+
+	while (*av)
+		free(*av++);
+}
+
+char **glob(register char *v)
+{
+   return NULL;
+}
+
+int sleep(int time)
+{
+   return time;
+}
+
+int herror(char *string)
+{
+   return 0;
+}
+
+#if 0
+int gettimeofday(struct timeval *timenow,
+				 struct timezone *zone)
+{
+	time_t t;
+
+	t = clock();
+
+	timenow->tv_usec = t;
+	timenow->tv_sec = t / CLK_TCK;
+
+	return 0;
+}
+
+int fgetcSocket(int s)
+{
+   int c;
+   char buffer[10];
+
+//   checkRecv(s);
+
+   c = recv(s, buffer, 1, 0);
+
+#ifdef DEBUG_IN
+   printf("%c", buffer[0]);
+#endif
+
+   if (c == INVALID_SOCKET)
+      return c;
+
+   if (c == 0)
+      return EOF;
+
+   return buffer[0];
+}
+
+#else
+
+int fgetcSocket(int s)
+{
+   static int index = 0;
+   static int total = 0;
+   static char buffer[4096];
+
+   if (index == total)
+     {
+       index = 0;
+       total = recv(s, buffer, sizeof(buffer), 0);
+
+       if (total == SOCKET_ERROR)
+	 {
+	   total = 0;
+	   return ERROR;
+	 }
+
+       if (total == 0)
+	 return EOF;
+     }
+   return buffer[index++];
+}
+
+#endif
+
+char *fprintfSocket(int s, char *format, ...)
+{
+   va_list argptr;
+   char buffer[10009];
+
+   va_start(argptr, format);
+   vsprintf(buffer, format, argptr);
+   va_end(argptr);
+
+   send(s, buffer, strlen(buffer), 0);
+
+   return NULL;
+}
+
+char *fputsSocket(char *format, int s)
+{
+   send(s, format, strlen(format), 0);
+
+   return NULL;
+}
+
+int fputcSocket(int s, char putChar)
+{
+   char buffer[2];
+
+   buffer[0] = putChar;
+   buffer[1] = '\0';
+
+   if(SOCKET_ERROR==send(s, buffer, 1, 0)) {
+	   int iret=WSAGetLastError ();
+	   fprintf(stdout,"fputcSocket: %d\n",iret);
+	   return 0;
+   }
+   else {
+	return putChar;
+   }
+}
+int fputSocket(int s, char *buffer, int len)
+{
+	int iret;
+	while(len) {
+		if(SOCKET_ERROR==(iret=send(s, buffer, len, 0)))
+		{
+			iret=WSAGetLastError ();
+			fprintf(stdout,"fputcSocket: %d\n",iret);
+			return 0;
+		}
+		else {
+			return len-=iret;
+		}
+	}
+	return 0;
+}
+
+char *fgetsSocket(int s, char *string)
+{
+   char buffer[2] = {0};
+   int i, count;
+
+   for (i = 0, count = 1; count != 0 && buffer[0] != '\n'; i++)
+   {
+      checkRecv(s);
+
+      count = recv(s, buffer, 1, 0);
+
+      if (count == SOCKET_ERROR)
+      {
+	 printf("Error in fgetssocket");
+	 return NULL;
+      }
+
+      if (count == 1)
+      {
+	 string[i] = buffer[0];
+
+	 if (i == MAX_ASCII - 3)
+	 {
+	    count = 0;
+	    string[++i] = '\n';
+	    string[++i] = '\0';
+	 }
+      }
+      else
+      {
+	 if (i == 0)
+	    return NULL;
+	 else
+	 {
+	    string[i] = '\n';
+	    string[i + 1] = '\0'; // This is risky
+	    return string;
+	 }
+
+      }
+
+   }
+   string[i] = '\0';
+
+#ifdef DEBUG_IN
+   printf("%s", string);
+#endif
+   return string;
+}
+
+
+#if 0
+char *getpass(const char *prompt)
+{
+   static char string[64];
+
+   printf("%s", prompt);
+
+   gets(string);
+
+   return string;
+}
+#endif
+char *getpass (const char * prompt)
+{
+  static char input[256];
+  HANDLE in;
+  HANDLE err;
+  DWORD    count;
+
+  in = GetStdHandle (STD_INPUT_HANDLE);
+  err = GetStdHandle (STD_ERROR_HANDLE);
+
+  if (in == INVALID_HANDLE_VALUE || err == INVALID_HANDLE_VALUE)
+    return NULL;
+
+  if (WriteFile (err, prompt, strlen (prompt), &count, NULL))
+    {
+      int istty = (GetFileType (in) == FILE_TYPE_CHAR);
+      DWORD old_flags;
+      int rc;
+
+      if (istty)
+	{
+	  if (GetConsoleMode (in, &old_flags))
+	    SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
+	  else
+	    istty = 0;
+	}
+      /* Need to read line one byte at time to avoid blocking, if not a
+         tty, so always do it this way.  */
+      count = 0;
+      while (1)
+	{
+	  DWORD  dummy;
+	  char   one_char;
+
+	  rc = ReadFile (in, &one_char, 1, &dummy, NULL);
+	  if (rc == 0)
+	    break;
+	  if (one_char == '\r')
+	    {
+	      /* CR is always followed by LF if reading from tty.  */
+	      if (istty)
+		continue;
+	      else
+		break;
+	    }
+	  if (one_char == '\n')
+	    break;
+	  /* Silently truncate password string if overly long.  */
+	  if (count < sizeof (input) - 1)
+	    input[count++] = one_char;
+	}
+      input[count] = '\0';
+
+      WriteFile (err, "\r\n", 2, &count, NULL);
+      if (istty)
+	SetConsoleMode (in, old_flags);
+      if (rc)
+	return input;
+    }
+
+  return NULL;
+}
+
+#if 0
+// Stubbed out here. Should be changed in Source code...
+int access(const char *filename, int accessmethod)
+{
+   return 0;
+}
+#endif
+
+#ifndef __GNUC__
+#define EPOCHFILETIME (116444736000000000i64)
+#else
+#define EPOCHFILETIME (116444736000000000LL)
+#endif
+
+int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+    FILETIME        ft;
+    LARGE_INTEGER   li;
+    __int64         t;
+    static int      tzflag;
+
+    if (tv)
+    {
+        GetSystemTimeAsFileTime(&ft);
+        //li.LowPart  = ft.dwLowDateTime;
+        //li.HighPart = ft.dwHighDateTime;
+        t  = li.QuadPart;       /* In 100-nanosecond intervals */
+        t -= EPOCHFILETIME;     /* Offset to the Epoch time */
+        t /= 10;                /* In microseconds */
+        tv->tv_sec  = (long)(t / 1000000);
+        tv->tv_usec = (long)(t % 1000000);
+    }
+
+    if (tz)
+    {
+        if (!tzflag)
+        {
+            _tzset();
+            tzflag++;
+        }
+        tz->tz_minuteswest = _timezone / 60;
+        tz->tz_dsttime = _daylight;
+    }
+
+    return 0;
+}

reactos/apps/utils/net/ftp/fake.h

@@ -0,0 +1,17 @@
+#define bcopy(s,d,l) memcpy((d),(s),(l))
+#define bzero(cp,l) memset((cp),0,(l))
+
+#define rindex strrchr
+#define index strchr
+
+#define getwd getcwd
+
+#define strcasecmp strcmp
+#define strncasecmp strnicmp
+
+struct timezone {
+    int tz_minuteswest; /* minutes W of Greenwich */
+    int tz_dsttime;     /* type of dst correction */
+};
+
+int gettimeofday(struct timeval *tv, struct timezone *tz);

reactos/apps/utils/net/ftp/ftp.mak

@@ -0,0 +1,372 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on ftp.dsp
+!IF "$(CFG)" == ""
+CFG=ftp - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to ftp - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "ftp - Win32 Release" && "$(CFG)" != "ftp - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "ftp.mak" CFG="ftp - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "ftp - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ftp - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ftp.exe"
+
+!ELSE
+
+ALL : "$(OUTDIR)\ftp.exe"
+
+!ENDIF
+
+CLEAN :
+	-@erase "$(INTDIR)\cmds.obj"
+	-@erase "$(INTDIR)\cmdtab.obj"
+	-@erase "$(INTDIR)\domacro.obj"
+	-@erase "$(INTDIR)\fake.obj"
+	-@erase "$(INTDIR)\ftp.obj"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\ruserpass.obj"
+	-@erase "$(INTDIR)\vc*.idb"
+	-@erase "$(OUTDIR)\ftp.exe"
+	-@erase "$(OUTDIR)\ftp.pch"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" \
+ /D "HAVE_TIMEVAL" /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
+ /c
+CPP_OBJS=.\Release/
+CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
+ /pdb:"$(OUTDIR)\ftp.pdb" /machine:I386 /out:"$(OUTDIR)\ftp.exe"
+LINK32_OBJS= \
+	"$(INTDIR)\cmds.obj" \
+	"$(INTDIR)\cmdtab.obj" \
+	"$(INTDIR)\domacro.obj" \
+	"$(INTDIR)\fake.obj" \
+	"$(INTDIR)\ftp.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\ruserpass.obj"
+
+"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\ftp.exe
+InputPath=.\Release\ftp.exe
+SOURCE=$(InputPath)
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ftp.exe"
+
+!ELSE
+
+ALL : "$(OUTDIR)\ftp.exe"
+
+!ENDIF
+
+CLEAN :
+	-@erase "$(INTDIR)\cmds.obj"
+	-@erase "$(INTDIR)\cmdtab.obj"
+	-@erase "$(INTDIR)\domacro.obj"
+	-@erase "$(INTDIR)\fake.obj"
+	-@erase "$(INTDIR)\ftp.obj"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\ruserpass.obj"
+	-@erase "$(INTDIR)\vc*.idb"
+	-@erase "$(INTDIR)\vc*.pdb"
+	-@erase "$(OUTDIR)\ftp.exe"
+	-@erase "$(OUTDIR)\ftp.ilk"
+	-@erase "$(OUTDIR)\ftp.pdb"
+	-@erase "$(OUTDIR)\ftp.pch"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
+ /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_OBJS=.\Debug/
+CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes\
+ /pdb:"$(OUTDIR)\ftp.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ftp.exe"\
+ /pdbtype:sept
+LINK32_OBJS= \
+	"$(INTDIR)\cmds.obj" \
+	"$(INTDIR)\cmdtab.obj" \
+	"$(INTDIR)\domacro.obj" \
+	"$(INTDIR)\fake.obj" \
+	"$(INTDIR)\ftp.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\ruserpass.obj"
+
+"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\ftp.exe
+InputPath=.\Debug\ftp.exe
+SOURCE=$(InputPath)
+
+!ENDIF
+
+
+!IF "$(CFG)" == "ftp - Win32 Release" || "$(CFG)" == "ftp - Win32 Debug"
+SOURCE=.\cmds.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_CMDS_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\pathnames.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_CMDS_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\pathnames.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\cmdtab.c
+DEP_CPP_CMDTA=\
+	".\fake.h"\
+	".\ftp_var.h"\
+
+
+"$(INTDIR)\cmdtab.obj" : $(SOURCE) $(DEP_CPP_CMDTA) "$(INTDIR)"
+
+
+SOURCE=.\domacro.c
+DEP_CPP_DOMAC=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\domacro.obj" : $(SOURCE) $(DEP_CPP_DOMAC) "$(INTDIR)"
+
+
+SOURCE=.\fake.c
+DEP_CPP_FAKE_=\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\fake.obj" : $(SOURCE) $(DEP_CPP_FAKE_) "$(INTDIR)"
+
+
+SOURCE=.\ftp.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_FTP_C=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_FTP_C=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\main.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_MAIN_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_MAIN_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\ruserpass.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_RUSER=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_RUSER=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
+
+
+!ENDIF
+
+
+!ENDIF

reactos/apps/utils/net/ftp/ftp.mak.orig

@@ -0,0 +1,400 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on ftp.dsp
+!IF "$(CFG)" == ""
+CFG=ftp - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to ftp - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "ftp - Win32 Release" && "$(CFG)" != "ftp - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "ftp.mak" CFG="ftp - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "ftp - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ftp - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
+
+!ELSE
+
+ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
+
+!ENDIF
+
+CLEAN :
+	-@erase "$(INTDIR)\cmds.obj"
+	-@erase "$(INTDIR)\cmdtab.obj"
+	-@erase "$(INTDIR)\domacro.obj"
+	-@erase "$(INTDIR)\fake.obj"
+	-@erase "$(INTDIR)\ftp.obj"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\ruserpass.obj"
+	-@erase "$(INTDIR)\vc50.idb"
+	-@erase "$(OUTDIR)\ftp.exe"
+	-@erase "\emacs-19.34\bin\ftp.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "C:\emacs-19.34\nt\inc" /I\
+ "C:\emacs-19.34\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D\
+ "HAVE_TIMEVAL" /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
+ /c
+CPP_OBJS=.\Release/
+CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib /nologo /subsystem:console /incremental:no\
+ /pdb:"$(OUTDIR)\ftp.pdb" /machine:I386 /out:"$(OUTDIR)\ftp.exe"
+LINK32_OBJS= \
+	"$(INTDIR)\cmds.obj" \
+	"$(INTDIR)\cmdtab.obj" \
+	"$(INTDIR)\domacro.obj" \
+	"$(INTDIR)\fake.obj" \
+	"$(INTDIR)\ftp.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\ruserpass.obj" \
+	"d:\Program Files\DevStudio\VC\lib\WSOCK32.LIB"
+
+"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\ftp.exe
+InputPath=.\Release\ftp.exe
+SOURCE=$(InputPath)
+
+"\emacs-19.34\bin\ftp.exe"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+#	copy $(TargetPath) \emacs-19.34\bin
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
+
+!ELSE
+
+ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
+
+!ENDIF
+
+CLEAN :
+	-@erase "$(INTDIR)\cmds.obj"
+	-@erase "$(INTDIR)\cmdtab.obj"
+	-@erase "$(INTDIR)\domacro.obj"
+	-@erase "$(INTDIR)\fake.obj"
+	-@erase "$(INTDIR)\ftp.obj"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\ruserpass.obj"
+	-@erase "$(INTDIR)\vc50.idb"
+	-@erase "$(INTDIR)\vc50.pdb"
+	-@erase "$(OUTDIR)\ftp.exe"
+	-@erase "$(OUTDIR)\ftp.ilk"
+	-@erase "$(OUTDIR)\ftp.pdb"
+	-@erase "\emacs-19.34\bin\ftp.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "C:\emacs-19.34\nt\inc" /I\
+ "C:\emacs-19.34\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
+ /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_OBJS=.\Debug/
+CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib /nologo /subsystem:console /incremental:yes\
+ /pdb:"$(OUTDIR)\ftp.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ftp.exe"\
+ /pdbtype:sept
+LINK32_OBJS= \
+	"$(INTDIR)\cmds.obj" \
+	"$(INTDIR)\cmdtab.obj" \
+	"$(INTDIR)\domacro.obj" \
+	"$(INTDIR)\fake.obj" \
+	"$(INTDIR)\ftp.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\ruserpass.obj" \
+	"d:\Program Files\DevStudio\VC\lib\WSOCK32.LIB"
+
+"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\ftp.exe
+InputPath=.\Debug\ftp.exe
+SOURCE=$(InputPath)
+
+"\emacs-19.34\bin\ftp.exe"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+#	copy $(TargetPath) \emacs-19.34\bin
+
+!ENDIF
+
+
+!IF "$(CFG)" == "ftp - Win32 Release" || "$(CFG)" == "ftp - Win32 Debug"
+SOURCE=.\cmds.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_CMDS_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\pathnames.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_CMDS_=\
+	"..\..\..\emacs-19.34\nt\inc\netdb.h"\
+	"..\..\..\emacs-19.34\nt\inc\netinet\in.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\socket.h"\
+	"..\..\..\emacs-19.34\src\nt.h"\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\pathnames.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\cmdtab.c
+DEP_CPP_CMDTA=\
+	".\fake.h"\
+	".\ftp_var.h"\
+
+
+"$(INTDIR)\cmdtab.obj" : $(SOURCE) $(DEP_CPP_CMDTA) "$(INTDIR)"
+
+
+SOURCE=.\domacro.c
+DEP_CPP_DOMAC=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\domacro.obj" : $(SOURCE) $(DEP_CPP_DOMAC) "$(INTDIR)"
+
+
+SOURCE=.\fake.c
+DEP_CPP_FAKE_=\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\fake.obj" : $(SOURCE) $(DEP_CPP_FAKE_) "$(INTDIR)"
+
+
+SOURCE=.\ftp.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_FTP_C=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_FTP_C=\
+	"..\..\..\emacs-19.34\nt\inc\netdb.h"\
+	"..\..\..\emacs-19.34\nt\inc\netinet\in.h"\
+	"..\..\..\emacs-19.34\nt\inc\pwd.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\file.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\ioctl.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\param.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\socket.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\time.h"\
+	"..\..\..\emacs-19.34\src\nt.h"\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\main.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_MAIN_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_MAIN_=\
+	"..\..\..\emacs-19.34\nt\inc\netdb.h"\
+	"..\..\..\emacs-19.34\nt\inc\pwd.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\ioctl.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\socket.h"\
+	"..\..\..\emacs-19.34\src\nt.h"\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\ruserpass.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_RUSER=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_RUSER=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
+
+
+!ENDIF
+
+
+!ENDIF

reactos/apps/utils/net/ftp/ftp.xml

@@ -0,0 +1,16 @@
+<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" allowwarnings="true">
+	<include base="ftp">.</include>
+	<define name="__USE_W32API" />
+	<define name="lint" />
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<library>iphlpapi</library>
+	<file>cmds.c</file>
+	<file>cmdtab.c</file>
+	<file>domacro.c</file>
+	<file>fake.c</file>
+	<file>ftp.c</file>
+	<file>main.c</file>
+	<file>ruserpass.c</file>
+	<file>ftp.rc</file>
+</module>

reactos/apps/utils/net/ftp/ftp_var.h

@@ -2,7 +2,6 @@
 #include "fake.h"
 #include "prototypes.h"
 #include <setjmp.h>
-#include <time.h>
 
 //typedef void (*Sig_t)(int);
 
@@ -50,6 +49,11 @@
 #define	STRU_R		2
 #define	STRU_P		3
 
+#define SIGQUIT 1
+#define SIGPIPE 2
+#define SIGALRM 3
+
+
 #define	FORM_N		1
 #define	FORM_T		2
 #define	FORM_C		3
@@ -101,7 +105,7 @@ extern int	mapflag;		/* use mapin mapout templates on file names */
 extern int	code;			/* return/reply code for ftp command */
 extern int	crflag;			/* if 1, strip car. rets. on ascii gets */
 extern char	pasv[64];		/* passive port for proxy data connection */
-extern int	passivemode;		/* passive mode enabled */
+extern int  passivemode;    /* passive mode enabled */
 extern char	*altarg;		/* argv[1] with no shell-like preprocessing  */
 extern char	ntin[17];		/* input translation table */
 extern char	ntout[17];		/* output translation table */
@@ -126,8 +130,8 @@ extern char	*stringbase;		/* current scan point in line buffer */
 extern char	argbuf[200];		/* argument storage buffer */
 extern char	*argbase;		/* current storage point in arg buffer */
 extern int	margc;			/* count of arguments on input line */
-extern const char	*margv[20];	/* args parsed from input line */
-extern int	cpend;			/* flag: if != 0, then pending server reply */
+extern char	*margv[20];		/* args parsed from input line */
+extern int     cpend;                  /* flag: if != 0, then pending server reply */
 extern int	mflag;			/* flag: if != 0, then active multi command */
 
 extern int	options;		/* used during socket creation */
@@ -136,23 +140,23 @@ extern int	options;		/* used during socket creation */
  * Format of command table.
  */
 struct cmd {
-	const char	*c_name;	/* name of command */
-	const char	*c_help;	/* help string */
-	char	c_bell;			/* give bell when command completes */
-	char	c_conn;			/* must be connected to use command */
-	char	c_proxy;		/* proxy server may execute */
-	void	(*c_handler)(int argc, const char *argv[]);	/* function to call */
+	char	*c_name;	/* name of command */
+	char	*c_help;	/* help string */
+	char	c_bell;		/* give bell when command completes */
+	char	c_conn;		/* must be connected to use command */
+	char	c_proxy;	/* proxy server may execute */
+	void	(*c_handler)();	/* function to call */
 };
 
 struct macel {
-	char mac_name[9];		/* macro name */
-	char *mac_start;		/* start of macro in macbuf */
-	char *mac_end;			/* end of macro in macbuf */
+	char mac_name[9];	/* macro name */
+	char *mac_start;	/* start of macro in macbuf */
+	char *mac_end;		/* end of macro in macbuf */
 };
 
-extern int macnum;			/* number of defined macros */
-extern struct macel macros[16];
-extern char macbuf[4096];
+int macnum;			/* number of defined macros */
+struct macel macros[16];
+char macbuf[4096];
 
 #if	defined(__ANSI__) || defined(sparc)
 typedef void sig_t;

reactos/apps/utils/net/ftp/main.c

@@ -0,0 +1,598 @@
+/*
+ * Copyright (c) 1985, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1985, 1989 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)main.c	based on 5.13 (Berkeley) 3/14/89";
+#endif /* not lint */
+
+/*
+ * FTP User Program -- Command Interface.
+ */
+#if !defined(WIN32)
+#include <netdb.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <arpa/ftp.h>
+#include <errno.h>
+#include <pwd.h>
+#endif
+#include "ftp_var.h"
+#include "prototypes.h"
+#include <sys/types.h>
+
+#include <io.h>
+#include <fcntl.h>
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+
+#if defined(sun) && !defined(FD_SET)
+typedef int uid_t;
+#endif
+
+uid_t	getuid();
+void	intr();
+void	lostpeer();
+char	*getlogin();
+
+short   portnum;
+
+char     home[128];
+char	*globerr;
+int     autologin;
+
+
+
+/* Lot's of options... */
+/*
+ * Options and other state info.
+ */
+int	trace;			/* trace packets exchanged */
+int	hash;			/* print # for each buffer transferred */
+int	sendport;		/* use PORT cmd for each data connection */
+int	verbose;		/* print messages coming back from server */
+int	connected;		/* connected to server */
+int	fromatty;		/* input is from a terminal */
+int	interactive;		/* interactively prompt on m* cmds */
+int	debug;			/* debugging level */
+int	bell;			/* ring bell on cmd completion */
+int	doglob;			/* glob local file names */
+int	proxy;			/* proxy server connection active */
+int passivemode;
+int	proxflag;		/* proxy connection exists */
+int	sunique;		/* store files on server with unique name */
+int	runique;		/* store local files with unique name */
+int	mcase;			/* map upper to lower case for mget names */
+int	ntflag;			/* use ntin ntout tables for name translation */
+int	mapflag;		/* use mapin mapout templates on file names */
+int	code;			/* return/reply code for ftp command */
+int	crflag;			/* if 1, strip car. rets. on ascii gets */
+char	pasv[64];		/* passive port for proxy data connection */
+char	*altarg;		/* argv[1] with no shell-like preprocessing  */
+char	ntin[17];		/* input translation table */
+char	ntout[17];		/* output translation table */
+// #include <sys/param.h>
+char	mapin[MAXPATHLEN];	/* input map template */
+char	mapout[MAXPATHLEN];	/* output map template */
+char	typename[32];		/* name of file transfer type */
+int	type;			/* file transfer type */
+char	structname[32];		/* name of file transfer structure */
+int	stru;			/* file transfer structure */
+char	formname[32];		/* name of file transfer format */
+int	form;			/* file transfer format */
+char	modename[32];		/* name of file transfer mode */
+int	mode;			/* file transfer mode */
+char	bytename[32];		/* local byte size in ascii */
+int	bytesize;		/* local byte size in binary */
+
+jmp_buf	toplevel;		/* non-local goto stuff for cmd scanner */
+
+char	line[200];		/* input line buffer */
+char	*stringbase;		/* current scan point in line buffer */
+char	argbuf[200];		/* argument storage buffer */
+char	*argbase;		/* current storage point in arg buffer */
+int	margc;			/* count of arguments on input line */
+char	*margv[20];		/* args parsed from input line */
+int     cpend;                  /* flag: if != 0, then pending server reply */
+int	mflag;			/* flag: if != 0, then active multi command */
+
+int	options;		/* used during socket creation */
+
+static char *slurpstring();
+
+
+int main(int argc, char *argv[])
+{
+	register char *cp;
+	int top;
+#if 0
+	char homedir[MAXPATHLEN];
+#endif
+
+        int err;
+        WORD wVerReq;
+
+        WSADATA WSAData;
+        struct	servent *sp;		/* service spec for tcp/ftp */
+
+	/* Disable output buffering, for the benefit of Emacs.  */
+	//setbuf(stdout, NULL);
+
+        _fmode = O_BINARY; // This causes an error somewhere.
+
+        wVerReq = MAKEWORD(1,1);
+
+        err = WSAStartup(wVerReq, &WSAData);
+        if (err != 0)
+        {
+           fprintf(stderr, "Could not initialize Windows socket interface.");
+           exit(1);
+        }
+
+	sp = getservbyname("ftp", "tcp");
+	if (sp == 0) {
+		fprintf(stderr, "ftp: ftp/tcp: unknown service\n");
+		exit(1);
+	}
+
+        portnum = sp->s_port;
+
+
+	doglob = 1;
+	interactive = 1;
+	autologin = 1;
+	argc--, argv++;
+	while (argc > 0 && **argv == '-') {
+		for (cp = *argv + 1; *cp; cp++)
+			switch (*cp) {
+
+			case 'd':
+				options |= SO_DEBUG;
+				debug++;
+				break;
+
+			case 'v':
+				verbose++;
+				break;
+
+			case 't':
+				trace++;
+				break;
+
+			case 'i':
+				interactive = 0;
+				break;
+
+			case 'n':
+				autologin = 0;
+				break;
+
+			case 'g':
+				doglob = 0;
+				break;
+
+			default:
+				fprintf(stdout,
+				  "ftp: %c: unknown option\n", *cp);
+				exit(1);
+			}
+		argc--, argv++;
+	}
+//	fromatty = isatty(fileno(stdin));
+        fromatty = 1; // Strengthen this test
+	/*
+	 * Set up defaults for FTP.
+	 */
+	(void) strcpy(typename, "ascii"), type = TYPE_A;
+	(void) strcpy(formname, "non-print"), form = FORM_N;
+	(void) strcpy(modename, "stream"), mode = MODE_S;
+	(void) strcpy(structname, "file"), stru = STRU_F;
+	(void) strcpy(bytename, "8"), bytesize = 8;
+	if (fromatty)
+		verbose++;
+	cpend = 0;           /* no pending replies */
+	proxy = 0;	/* proxy not active */
+    passivemode = 1; /* passive mode *is* active */
+	crflag = 1;    /* strip c.r. on ascii gets */
+	/*
+	 * Set up the home directory in case we're globbing.
+	 */
+#if 0
+	cp = getlogin();
+	if (cp != NULL) {
+		pw = getpwnam(cp);
+	}
+	if (pw == NULL)
+		pw = getpwuid(getuid());
+	if (pw != NULL) {
+		home = homedir;
+		(void) strcpy(home, pw->pw_dir);
+	}
+#endif
+        strcpy(home, "C:/");
+	if (argc > 0) {
+		if (setjmp(toplevel))
+			exit(0);
+//		(void) signal(SIGINT, intr);
+//		(void) signal(SIGPIPE, lostpeer);
+		setpeer(argc + 1, argv - 1);
+	}
+	top = setjmp(toplevel) == 0;
+	if (top) {
+//		(void) signal(SIGINT, intr);
+//		(void) signal(SIGPIPE, lostpeer);
+	}
+	for (;;) {
+		cmdscanner(top);
+		top = 1;
+	}
+}
+
+void
+intr()
+{
+
+	longjmp(toplevel, 1);
+}
+
+void lostpeer(void)
+{
+   extern int cout;
+   extern int data;
+
+   if (connected) {
+      if (cout != (int) NULL) {
+         closesocket(cout);
+         cout = (int) NULL;
+      }
+      if (data >= 0) {
+         (void) shutdown(data, 1+1);
+         (void) close(data);
+         data = -1;
+      }
+      connected = 0;
+   }
+   pswitch(1);
+   if (connected) {
+      if (cout != (int)NULL) {
+						closesocket(cout);
+         cout = (int) NULL;
+      }
+      connected = 0;
+   }
+   proxflag = 0;
+   pswitch(0);
+}
+
+/*char *
+tail(filename)
+	char *filename;
+{
+	register char *s;
+
+	while (*filename) {
+		s = rindex(filename, '/');
+		if (s == NULL)
+			break;
+		if (s[1])
+			return (s + 1);
+		*s = '\0';
+	}
+	return (filename);
+}
+*/
+/*
+ * Command parser.
+ */
+void cmdscanner(top)
+	int top;
+{
+	register struct cmd *c;
+
+	if (!top)
+		(void) putchar('\n');
+	for (;;) {
+		(void) fflush(stdout);
+		if (fromatty) {
+			printf("ftp> ");
+			(void) fflush(stdout);
+		}
+		if (gets(line) == 0) {
+			if (feof(stdin) || ferror(stdin))
+				quit();
+			break;
+		}
+		if (line[0] == 0)
+			break;
+		makeargv();
+		if (margc == 0) {
+			continue;
+		}
+		c = getcmd(margv[0]);
+		if (c == (struct cmd *)-1) {
+			printf("?Ambiguous command\n");
+			continue;
+		}
+		if (c == 0) {
+			printf("?Invalid command\n");
+			continue;
+		}
+		if (c->c_conn && !connected) {
+			printf ("Not connected.\n");
+			continue;
+		}
+		(*c->c_handler)(margc, margv);
+		if (bell && c->c_bell)
+			(void) putchar('\007');
+		if (c->c_handler != help)
+			break;
+	}
+	(void) fflush(stdout);
+//	(void) signal(SIGINT, intr);
+//	(void) signal(SIGPIPE, lostpeer);
+}
+
+struct cmd *
+getcmd(name)
+	register char *name;
+{
+	extern struct cmd cmdtab[];
+	register char *p, *q;
+	register struct cmd *c, *found;
+	register int nmatches, longest;
+
+	longest = 0;
+	nmatches = 0;
+	found = 0;
+	for (c = cmdtab; (p = c->c_name); c++) {
+		for (q = name; *q == *p++; q++)
+			if (*q == 0)		/* exact match? */
+				return (c);
+		if (!*q) {			/* the name was a prefix */
+			if (q - name > longest) {
+				longest = q - name;
+				nmatches = 1;
+				found = c;
+			} else if (q - name == longest)
+				nmatches++;
+		}
+	}
+	if (nmatches > 1)
+		return ((struct cmd *)-1);
+	return (found);
+}
+
+/*
+ * Slice a string up into argc/argv.
+ */
+
+int slrflag;
+
+void makeargv()
+{
+	char **argp;
+
+	margc = 0;
+	argp = margv;
+	stringbase = line;		/* scan from first of buffer */
+	argbase = argbuf;		/* store from first of buffer */
+	slrflag = 0;
+	while ((*argp++ = slurpstring()))
+		margc++;
+}
+
+/*
+ * Parse string into argbuf;
+ * implemented with FSM to
+ * handle quoting and strings
+ */
+static char *
+slurpstring()
+{
+	int got_one = 0;
+	register char *sb = stringbase;
+	register char *ap = argbase;
+	char *tmp = argbase;		/* will return this if token found */
+
+	if (*sb == '!' || *sb == '$') {	/* recognize ! as a token for shell */
+		switch (slrflag) {	/* and $ as token for macro invoke */
+			case 0:
+				slrflag++;
+				stringbase++;
+				return ((*sb == '!') ? "!" : "$");
+				/* NOTREACHED */
+			case 1:
+				slrflag++;
+				altarg = stringbase;
+				break;
+			default:
+				break;
+		}
+	}
+
+S0:
+	switch (*sb) {
+
+	case '\0':
+		goto OUT1;
+
+	case ' ':
+	case '\t':
+		sb++; goto S0;
+
+	default:
+		switch (slrflag) {
+			case 0:
+				slrflag++;
+				break;
+			case 1:
+				slrflag++;
+				altarg = sb;
+				break;
+			default:
+				break;
+		}
+		goto S1;
+	}
+
+S1:
+	switch (*sb) {
+
+	case ' ':
+	case '\t':
+	case '\0':
+		goto OUT1;	/* end of token */
+
+	case '\\':
+		sb++; goto S2;	/* slurp next character */
+
+	case '"':
+		sb++; goto S3;	/* slurp quoted string */
+
+	default:
+		*ap++ = *sb++;	/* add character to token */
+		got_one = 1;
+		goto S1;
+	}
+
+S2:
+	switch (*sb) {
+
+	case '\0':
+		goto OUT1;
+
+	default:
+		*ap++ = *sb++;
+		got_one = 1;
+		goto S1;
+	}
+
+S3:
+	switch (*sb) {
+
+	case '\0':
+		goto OUT1;
+
+	case '"':
+		sb++; goto S1;
+
+	default:
+		*ap++ = *sb++;
+		got_one = 1;
+		goto S3;
+	}
+
+OUT1:
+	if (got_one)
+		*ap++ = '\0';
+	argbase = ap;			/* update storage pointer */
+	stringbase = sb;		/* update scan pointer */
+	if (got_one) {
+		return(tmp);
+	}
+	switch (slrflag) {
+		case 0:
+			slrflag++;
+			break;
+		case 1:
+			slrflag++;
+			altarg = (char *) 0;
+			break;
+		default:
+			break;
+	}
+	return((char *)0);
+}
+
+#define HELPINDENT (sizeof ("directory"))
+
+/*
+ * Help command.
+ * Call each command handler with argc == 0 and argv[0] == name.
+ */
+void help(argc, argv)
+	int argc;
+	char *argv[];
+{
+	extern struct cmd cmdtab[];
+	register struct cmd *c;
+
+	if (argc == 1) {
+		register int i, j, w, k;
+		int columns, width = 0, lines;
+		extern int NCMDS;
+
+		printf("Commands may be abbreviated.  Commands are:\n\n");
+		for (c = cmdtab; c < &cmdtab[NCMDS]; c++) {
+			int len = strlen(c->c_name);
+
+			if (len > width)
+				width = len;
+		}
+		width = (width + 8) &~ 7;
+		columns = 80 / width;
+		if (columns == 0)
+			columns = 1;
+		lines = (NCMDS + columns - 1) / columns;
+		for (i = 0; i < lines; i++) {
+			for (j = 0; j < columns; j++) {
+				c = cmdtab + j * lines + i;
+				if (c->c_name && (!proxy || c->c_proxy)) {
+					printf("%s", c->c_name);
+				}
+				else if (c->c_name) {
+					for (k=0; k < (int) strlen(c->c_name); k++) {
+						(void) putchar(' ');
+					}
+				}
+				if (c + lines >= &cmdtab[NCMDS]) {
+					printf("\n");
+					break;
+				}
+				w = strlen(c->c_name);
+				while (w < width) {
+					w = (w + 8) &~ 7;
+					(void) putchar('\t');
+				}
+			}
+		}
+		(void) fflush(stdout);
+		return;
+	}
+	while (--argc > 0) {
+		register char *arg;
+		arg = *++argv;
+		c = getcmd(arg);
+		if (c == (struct cmd *)-1)
+			printf("?Ambiguous help command %s\n", arg);
+		else if (c == (struct cmd *)0)
+			printf("?Invalid help command %s\n", arg);
+		else
+			printf("%-*s\t%s\n", HELPINDENT,
+				c->c_name, c->c_help);
+	}
+	(void) fflush(stdout);
+}

reactos/apps/utils/net/ftp/prototypes.h

@@ -0,0 +1,66 @@
+
+int fgetcSocket(int s);
+char *fputsSocket(char *format, int s);
+
+char *fprintfSocket(int s, char *format, ...);
+
+int fputcSocket(int s, char putChar);
+int fputSocket(int s, char *putChar, int len);
+char *fgetsSocket(int s, char *string);
+
+char *hookup();
+char **glob();
+int herror(char *s);
+
+int getreply(int expecteof);
+int ruserpass(char *host, char **aname, char **apass, char **aacct);
+char *getpass(const char *prompt);
+void makeargv(void);
+void domacro(int argc, char *argv[]);
+void proxtrans(char *cmd, char *local, char *remote);
+int null(void);
+int initconn(void);
+void disconnect(void);
+void ptransfer(char *direction, long bytes, struct timeval *t0, struct timeval *t1);
+void setascii(void);
+void setbinary(void);
+void setebcdic(void);
+void settenex(void);
+void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
+void setpassive(int argc, char *argv[]);
+void setpeer(int argc, char *argv[]);
+void cmdscanner(int top);
+void pswitch(int flag);
+void quit(void);
+int login(char *host);
+int command(char *fmt, ...);
+int globulize(char **cpp);
+void sendrequest(char *cmd, char *local, char *remote, int printnames);
+void recvrequest(char *cmd, char *local, char *remote, char *mode,
+                int printnames);
+int confirm(char *cmd, char *file);
+void blkfree(char **av0);
+int getit(int argc, char *argv[], int restartit, char *mode);
+int sleep(int time);
+
+char *tail();
+int errno;
+char *mktemp();
+void	setbell(), setdebug();
+void	setglob(), sethash(), setport();
+void	setprompt();
+void	settrace(), setverbose();
+void	settype(), setform(), setstruct();
+void	restart(), syst();
+void	cd(), lcd(), delete(), mdelete();
+void	ls(), mls(), get(), mget(), help(), append(), put(), mput(), reget();
+void	status();
+void	renamefile();
+void	quote(), rmthelp(), site();
+void	pwd(), makedir(), removedir(), setcr();
+void	account(), doproxy(), reset(), setcase(), setntrans(), setnmap();
+void	setsunique(), setrunique(), cdup(), macdef();
+void	sizecmd(), modtime(), newer(), rmtstatus();
+void	do_chmod(), do_umask(), idle();
+void	shell(), user(), fsetmode();
+struct cmd	*getcmd();

reactos/apps/utils/net/ftp/ruserpass.c

@@ -19,9 +19,19 @@
 static char sccsid[] = "@(#)ruserpass.c	5.1 (Berkeley) 3/1/89";
 #endif /* not lint */
 
-#include "precomp.h"
+#include <sys/types.h>
+#include <stdio.h>
 //#include <utmp.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include "ftp_var.h"
+#include "prototypes.h"
+#include <winsock.h>
 
+char	*renvlook(), *index(), *getenv(), *getpass(), *getlogin();
+void  *malloc();
+char	*strcpy();
 struct	utmp *getutmp();
 static	FILE *cfile;
 
@@ -40,7 +50,7 @@ static	FILE *cfile;
 static char tokval[100];
 
 static struct toktab {
-	const char *tokstr;
+	char *tokstr;
 	int tval;
 } toktab[]= {
 	{"default",	DEFAULT},
@@ -56,13 +66,13 @@ static struct toktab {
 extern char *hostname;
 static int token(void);
 
-int ruserpass(const char *host, char **aname, char **apass, char **aacct)
+int ruserpass(char *host, char **aname, char **apass, char **aacct)
 {
-	const char *hdir, *mydomain;
-    char buf[BUFSIZ], *tmp;
-	char myname[MAXHOSTNAMELEN];
+	char *hdir, buf[BUFSIZ], *tmp;
+	char myname[MAXHOSTNAMELEN], *mydomain;
 	int t, i, c, usedefault = 0;
 	struct stat stb;
+	extern int errno;
 
 	hdir = getenv("HOME");
 	if (hdir == NULL)

reactos/apps/utils/net/ipconfig/ipconfig.c

@@ -0,0 +1,483 @@
+/* $Id: ipconfig.c
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Ipconfig utility
+ * FILE:            apps/utils/net/ipconfig/ipconfig.c
+ * PURPOSE:         Show and set network interface IP parameters
+ */ 
+/*
+ *  History:
+ *
+ *      15/8/2002 (Robert Dickenson <robd@reactos.org>)
+ *          Original version (PUBLIC DOMAIN and NO WARRANTY)
+ *
+ *      26/6/2005 (Tim Jobling <tjob800@yahoo.co.uk>)
+ *          Relicense to GPL. 
+ *          Display NodeType with meaningfull Human readable names.
+ *          Exclusively use TCHAR strings.
+ *          Display Physical Address, DHCP enabled state, IP Addresses/Netmasks,
+ *          Default Gateway, DHCP server and DHCP Lease times.
+ *          Parse command line options.
+ *          Default to only showing the IP/SM/DG is no options specified
+ *          Handel option: /All and /?
+ *          Display message about all unimplemented options.
+ *          Changed C++ style commenting to C style
+ *   
+*/ 
+ 
+#include <stdio.h>
+#include <windows.h>
+#include <tchar.h>
+#include <time.h>
+
+#include <iptypes.h>
+#include <ipexport.h>
+#include <iphlpapi.h>
+
+#ifdef _DEBUG
+#include "trace.h"
+#endif
+
+/* imported from iphlpapi.dll
+
+GetAdapterOrderMap
+GetInterfaceInfo
+GetIpStatsFromStack
+NhGetInterfaceNameFromGuid
+NhpAllocateAndGetInterfaceInfoFromStack
+
+ */
+
+static TCHAR* GetNodeTypeName(UINT nNodeType)
+{
+    switch (nNodeType) {
+    case 1:  return _T("Broadcast");
+    case 2:  return _T("Peer To Peer");
+    case 4:  return _T("Mixed");
+    case 8:  return _T("Hybrid");
+    default: return _T("unknown");
+    }
+}
+
+static TCHAR* GetInterfaceTypeName(UINT nInterfaceType)
+{
+    switch (nInterfaceType) {
+    case MIB_IF_TYPE_OTHER:     return _T("Other");
+    case MIB_IF_TYPE_ETHERNET:  return _T("Ethernet");
+    case MIB_IF_TYPE_TOKENRING: return _T("Token Ring");
+    case MIB_IF_TYPE_FDDI:      return _T("FDDI");
+    case MIB_IF_TYPE_PPP:       return _T("PPP");
+    case MIB_IF_TYPE_LOOPBACK:  return _T("Loopback");
+    case MIB_IF_TYPE_SLIP:      return _T("SLIP");
+    default: return _T("unknown");
+    }
+}
+
+static void PrintPhysicalAddr(PBYTE Addr, UINT len)
+{
+    UINT i=0;
+    for (i=0; i<len; i++)
+    {
+        _tprintf(_T("%02X"), Addr[i]);
+        if ((i+1)<len)
+            _tprintf(_T("-"));
+    }
+    _tprintf(_T("\n"));
+}
+
+static void ShowNetworkFixedInfo()
+{
+    FIXED_INFO* pFixedInfo = NULL;
+    ULONG OutBufLen = 0;
+    DWORD result;
+
+    result = GetNetworkParams(NULL, &OutBufLen);
+    if (result == ERROR_BUFFER_OVERFLOW) {
+        pFixedInfo = (FIXED_INFO*)malloc(OutBufLen);
+        if (!pFixedInfo) {
+            _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), OutBufLen);
+            return;
+        }
+    } else {
+        _tprintf(_T("ERROR: GetNetworkParams() failed to report required buffer size.\n"));
+        return;
+    }
+
+    result = GetNetworkParams(pFixedInfo, &OutBufLen);
+    if (result == ERROR_SUCCESS) {
+        IP_ADDR_STRING* pIPAddr;
+
+             _tprintf(_T("\tHostName. . . . . . . . . . . : %s\n"),  pFixedInfo->HostName);
+             _tprintf(_T("\tDomainName. . . . . . . . . . : %s\n"),  pFixedInfo->DomainName);
+
+             _tprintf(_T("\tDNS Servers . . . . . . . . . : %s\n"),  pFixedInfo->DnsServerList.IpAddress.String);
+             pIPAddr = pFixedInfo->DnsServerList.Next;
+             while (pIPAddr) {
+                 _tprintf(_T("\t\t\t\t      : %s\n"),  pIPAddr->IpAddress.String);
+                 pIPAddr = pIPAddr->Next;
+             }
+
+        _tprintf(_T("\tNodeType. . . . . . . . . . . : %d (%s)\n"), pFixedInfo->NodeType, GetNodeTypeName(pFixedInfo->NodeType));
+        _tprintf(_T("\tScopeId . . . . . . . . . . . : %s\n"),  pFixedInfo->ScopeId);
+        _tprintf(_T("\tEnableRouting . . . . . . . . : %s\n"), pFixedInfo->EnableRouting ? _T("yes") : _T("no"));
+        _tprintf(_T("\tEnableProxy . . . . . . . . . : %s\n"), pFixedInfo->EnableProxy ? _T("yes") : _T("no"));
+        _tprintf(_T("\tEnableDns . . . . . . . . . . : %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no"));
+        _tprintf(_T("\n"));
+/*        
+        _tprintf(_T("\n"),);
+        _tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters);
+
+      _tprintf(_T("\tConnection specific DNS suffix: %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no"));
+*/
+    } else {
+        switch (result) {
+        case ERROR_BUFFER_OVERFLOW:
+            _tprintf(_T("The buffer size indicated by the pOutBufLen parameter is too small to hold the adapter information. The pOutBufLen parameter points to the required size\n"));
+            break;
+        case ERROR_INVALID_PARAMETER:
+            _tprintf(_T("The pOutBufLen parameter is NULL, or the calling process does not have read/write access to the memory pointed to by pOutBufLen, or the calling process does not have write access to the memory pointed to by the pAdapterInfo parameter\n"));
+            break;
+        case ERROR_NO_DATA:
+            _tprintf(_T("No adapter information exists for the local computer\n"));
+            break;
+        case ERROR_NOT_SUPPORTED:
+            _tprintf(_T("This function is not supported on the operating system in use on the local system\n"));
+            break;
+        default:
+            _tprintf(_T("0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result);
+            break;
+        }
+    }
+}
+
+static void ShowNetworkInterfaces()
+{
+    IP_INTERFACE_INFO* pIfTable = NULL;
+    DWORD result;
+    DWORD dwNumIf;
+    DWORD dwOutBufLen = 0;
+
+    if ((result = GetNumberOfInterfaces(&dwNumIf)) != NO_ERROR) {
+        _tprintf(_T("GetNumberOfInterfaces() failed with code 0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result);
+        return;
+    } else {
+        _tprintf(_T("GetNumberOfInterfaces() returned %lu\n"), dwNumIf);
+    }
+
+    result = GetInterfaceInfo(pIfTable, &dwOutBufLen);
+/*
+    dwOutBufLen = sizeof(IP_INTERFACE_INFO) + dwNumIf * sizeof(IP_ADAPTER_INDEX_MAP);
+    _tprintf(_T("GetNumberOfInterfaces() returned %d, dwOutBufLen %d\n"), dwNumIf, dwOutBufLen);
+    _tprintf(_T("sizeof(IP_INTERFACE_INFO) %d, sizeof(IP_ADAPTER_INDEX_MAP) %d\n"), sizeof(IP_INTERFACE_INFO), sizeof(IP_ADAPTER_INDEX_MAP));
+*/
+    pIfTable = (IP_INTERFACE_INFO*)malloc(dwOutBufLen);
+    if (!pIfTable) {
+        _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), dwOutBufLen);
+        return;
+    }
+/*
+typedef struct _IP_ADAPTER_INDEX_MAP {
+  ULONG Index;                     // adapter index
+  WCHAR Name[MAX_ADAPTER_NAME];    // name of the adapter
+} IP_ADAPTER_INDEX_MAP, * PIP_ADAPTER_INDEX_MAP;
+
+typedef struct _IP_INTERFACE_INFO {
+  LONG NumAdapters;                 // number of adapters in array
+  IP_ADAPTER_INDEX_MAP Adapter[1];  // adapter indices and names
+} IP_INTERFACE_INFO,*PIP_INTERFACE_INFO;
+ */
+    result = GetInterfaceInfo(pIfTable, &dwOutBufLen);
+    if (result == NO_ERROR) {
+        INT i;
+        _tprintf(_T("GetInterfaceInfo() returned with %ld adaptor entries\n"), pIfTable->NumAdapters);
+        for (i = 0; i < pIfTable->NumAdapters; i++) {
+           wprintf(L"[%d] %s\n", i + 1, pIfTable->Adapter[i].Name);
+           /*wprintf(L"[%d] %s\n", pIfTable->Adapter[i].Index, pIfTable->Adapter[i].Name);*/
+
+/*HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NetBT\Parameters\Interfaces\Tcpip_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357}*/
+        }
+    } else {
+        switch (result) {
+        case ERROR_INVALID_PARAMETER:
+            _tprintf(_T("The dwOutBufLen parameter is NULL, or GetInterfaceInterface is unable to write to the memory pointed to by the dwOutBufLen parameter\n"));
+            break;
+        case ERROR_INSUFFICIENT_BUFFER:
+            _tprintf(_T("The buffer pointed to by the pIfTable parameter is not large enough. The required size is returned in the DWORD variable pointed to by the dwOutBufLen parameter\n"));
+            _tprintf(_T("\tdwOutBufLen: %lu\n"), dwOutBufLen);
+            break;
+        case ERROR_NOT_SUPPORTED:
+            _tprintf(_T("This function is not supported on the operating system in use on the local system\n"));
+            break;
+        default:
+            _tprintf(_T("0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result);
+            break;
+        }
+    }
+    free(pIfTable);
+}
+
+/*
+typedef struct _IP_ADAPTER_INFO {
+  struct _IP_ADAPTER_INFO* Next;
+  DWORD ComboIndex;
+  char AdapterName[MAX_ADAPTER_NAME_LENGTH + 4];
+1  char Description[MAX_ADAPTER_DESCRIPTION_LENGTH + 4];
+  UINT AddressLength;
+2  BYTE Address[MAX_ADAPTER_ADDRESS_LENGTH];
+  DWORD Index;
+  UINT Type;
+3  UINT DhcpEnabled;
+5  PIP_ADDR_STRING CurrentIpAddress;
+  IP_ADDR_STRING IpAddressList;
+7  IP_ADDR_STRING GatewayList;
+8  IP_ADDR_STRING DhcpServer;
+  BOOL HaveWins;
+  IP_ADDR_STRING PrimaryWinsServer;
+  IP_ADDR_STRING SecondaryWinsServer;
+a  time_t LeaseObtained;
+b  time_t LeaseExpires;
+} IP_ADAPTER_INFO, *PIP_ADAPTER_INFO;
+ */
+/*
+Ethernet adapter VMware Virtual Ethernet Adapter (Network Address Translation (NAT) for VMnet8):
+
+        Connection-specific DNS Suffix  . :
+1        Description . . . . . . . . . . . : VMware Virtual Ethernet Adapter (Network Address Translation (NAT) for VMnet8)
+2        Physical Address. . . . . . . . . : 00-50-56-C0-00-08
+3        DHCP Enabled. . . . . . . . . . . : Yes
+        Autoconfiguration Enabled . . . . : Yes
+5        IP Address. . . . . . . . . . . . : 192.168.136.1
+        Subnet Mask . . . . . . . . . . . : 255.255.255.0
+7        Default Gateway . . . . . . . . . :
+8        DHCP Server . . . . . . . . . . . : 192.168.136.254
+        DNS Servers . . . . . . . . . . . :
+a        Lease Obtained. . . . . . . . . . : Monday, 30 December 2002 5:56:53 PM
+b        Lease Expires . . . . . . . . . . : Monday, 30 December 2002 6:26:53 PM
+ */
+static void ShowAdapterInfo(BOOL ShowAll)
+{
+    IP_ADAPTER_INFO* pAdaptorInfo;
+    ULONG ulOutBufLen;
+    DWORD dwRetVal;
+    PIP_ADDR_STRING pIpAddrString;
+    struct tm *LeaseTime;
+
+
+    if (ShowAll)
+    {
+        _tprintf(_T("\nAdaptor Information\t\n"));
+    }
+
+    pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, sizeof(IP_ADAPTER_INFO));
+    ulOutBufLen = sizeof(IP_ADAPTER_INFO);
+
+    if (ERROR_BUFFER_OVERFLOW == GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen)) {
+        GlobalFree(pAdaptorInfo);
+        pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, ulOutBufLen);
+    }
+    if ((dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen))) {
+        _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: 0x%08lx\n"), dwRetVal);
+    } else {
+        while (pAdaptorInfo) {
+
+            /* print the type of interface before the Name of it */
+            _tprintf(_T("\n%s Adapter %s:\n\n"), GetInterfaceTypeName(pAdaptorInfo->Type), pAdaptorInfo->AdapterName);
+
+            if (ShowAll)
+            {
+                _tprintf(_T("\tDescription. . . . . . : %s\n"), pAdaptorInfo->Description);
+
+                /* print the Physical address to the screen*/
+                _tprintf(_T("\tPhysical Address . . . : "));
+                PrintPhysicalAddr(pAdaptorInfo->Address, pAdaptorInfo->AddressLength);
+
+                /* Now the DHCP state */
+                _tprintf(_T("\tDHCP Enabled . . . . . : %s\n"), pAdaptorInfo->DhcpEnabled ? _T("Yes") : _T("No"));
+            }
+            
+            /* IP Addresses/Netmasks, there may be more than one */
+            pIpAddrString = &pAdaptorInfo->IpAddressList;
+
+            do{
+                _tprintf(_T("\tIP Address . . . . . . : %s\n"), pIpAddrString->IpAddress.String);
+                _tprintf(_T("\tSubnet Mask. . . . . . : %s\n"), pIpAddrString->IpMask.String);
+                pIpAddrString = pIpAddrString->Next;
+            }while (pIpAddrString!=NULL);
+
+            /* Default Gateway */
+            pIpAddrString = &pAdaptorInfo->GatewayList;
+            _tprintf(_T("\tDefault Gateway. . . . : %s\n"), pIpAddrString->IpAddress.String);
+
+            /* Print some stuff that is only relevant it dhcp is enabled */
+            if((pAdaptorInfo->DhcpEnabled)&&(ShowAll))
+            {
+                /* Display the DHCP server address */
+                pIpAddrString = &pAdaptorInfo->DhcpServer;
+                _tprintf(_T("\tDHCP Server. . . . . . : %s\n"), pIpAddrString->IpAddress.String);
+
+                /* Display the Lease times*/
+                LeaseTime = localtime(&pAdaptorInfo->LeaseObtained);
+                _tprintf(_T("\tLease Obtained . . . . : %s"), asctime(LeaseTime));
+
+                LeaseTime = localtime(&pAdaptorInfo->LeaseExpires);
+                _tprintf(_T("\tLease Expieres . . . . : %s"), asctime(LeaseTime));
+
+            }
+
+            pAdaptorInfo = pAdaptorInfo->Next;
+        }
+    }
+}
+
+const TCHAR szUsage[] = { _T("USAGE:\n" \
+    "   ipconfig [/? | /all | /release [adapter] | /renew [adapter]\n" \
+    "            | /flushdns | /registerdns\n" \
+    "            | /showclassid adapter\n" \
+    "            | /showclassid adapter\n" \
+    "            | /setclassid adapter [classidtoset] ]\n" \
+    "\n" \
+    "adapter    Full name or pattern with '*' and '?' to 'match',\n" \
+    "           * matches any character, ? matches one character.\n" \
+    "   Options\n" \
+    "       /?           Display this help message.\n" \
+    "       /all         Display full configuration information.\n" \
+    "       /release     Release the IP address for the specified adapter.\n" \
+    "       /renew       Renew the IP address for the specified adapter.\n" \
+    "       /flushdns    Purges the DNS Resolver cache.\n" \
+    "       /registerdns Refreshes all DHCP leases and re-registers DNS names\n" \
+    "       /displaydns  Display the contents of the DNS Resolver Cache.\n" \
+    "       /showclassid Displays all the dhcp class IDs allowed for adapter.\n" \
+    "       /setclassid  Modifies the dhcp class id.\n" \
+    "\n" \
+    "The default is to display only the IP address, subnet mask and\n" \
+    "default gateway for each adapter bound to TCP/IP.\n")
+};
+/*
+    "\n" \
+    "For Release and Renew, if no adapter name is specified, then the IP address\n" \
+    "leases for all adapters bound to TCP/IP will be released or renewed.\n" \
+    "\n" \
+    "For SetClassID, if no class id is specified, then the classid is removed.\n" \
+    "\n" \
+    "Examples:\n" \
+    "    > ipconfig                       ... Show information.\n" \
+    "    > ipconfig /all                  ... Show detailed information\n" \
+    "    > ipconfig /renew                ... renew all adapaters\n" \
+    "    > ipconfig /renew EL*            ... renew adapters named EL....\n" \
+    "    > ipconfig /release *ELINK?21*   ... release all matching adapters,\n" \
+                                         eg. ELINK-21, myELELINKi21adapter.\n"
+ */
+
+static void usage(void)
+{
+    _fputts(szUsage, stderr);
+}
+
+
+int _tmain(int argc, TCHAR *argv[])
+{
+    BOOL DoUsage=FALSE;
+    BOOL DoAll=FALSE;
+    BOOL DoRelease=FALSE;
+    BOOL DoRenew=FALSE;
+    BOOL DoFlushdns=FALSE;
+    BOOL DoRegisterdns=FALSE;
+    BOOL DoDisplaydns=FALSE;
+    BOOL DoShowclassid=FALSE;
+    BOOL DoSetclassid=FALSE;  
+
+    _tprintf(_T("\nReactOS IP Configuration\n\n"));
+
+    /* 
+       Parse command line for options we have been given. 
+    */
+    if ( ((argc > 1))&&((argv[1][0]=='/')||(argv[1][0]=='-')) )
+    {
+        if( !_tcsicmp( &argv[1][1], _T("?") ))
+        {
+            DoUsage = TRUE;
+        }
+        else if( !_tcsnicmp( &argv[1][1], _T("ALL"), _tcslen(&argv[1][1]) ))
+        {
+           DoAll = TRUE;
+        } 
+        else if( !_tcsnicmp( &argv[1][1], _T("RELEASE"), _tcslen(&argv[1][1]) ))
+        {
+            DoRelease = TRUE; 
+        } 
+        else if( ! _tcsnicmp( &argv[1][1], _T("RENEW"), _tcslen(&argv[1][1]) ))
+        {
+            DoRenew = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("FLUSHDNS"), _tcslen(&argv[1][1]) ))
+        {
+            DoFlushdns = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("REGISTERDNS"), _tcslen(&argv[1][1]) ))
+        {
+            DoRegisterdns = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("DISPLAYDNS"), _tcslen(&argv[1][1]) ))
+        {
+            DoDisplaydns = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("SHOWCLASSID"), _tcslen(&argv[1][1]) ))
+        {
+            DoShowclassid = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("SETCLASSID"), _tcslen(&argv[1][1]) ))
+        {
+            DoSetclassid = TRUE;
+        }
+    }
+
+
+    switch (argc) 
+    {
+        case 1:  /* Default behaviour if options are given specified*/
+            ShowAdapterInfo(FALSE);
+            break;
+        case 2:  /* Process all the options that take no paramiters */
+            if ( DoUsage)
+                usage();
+            else if ( DoAll)
+            {
+                ShowNetworkFixedInfo();
+                ShowNetworkInterfaces();
+                ShowAdapterInfo(TRUE);
+            }
+            else if ( DoRelease)
+                printf("\nSorry /Release is not implemented yet\n");
+            else if ( DoRenew)
+                printf("\nSorry /Renew is not implemented yet\n");
+            else if ( DoFlushdns)
+                printf("\nSorry /Flushdns is not implemented yet\n");
+            else if ( DoRegisterdns)
+                printf("\nSorry /Registerdns is not implemented yet\n");
+            else if ( DoDisplaydns)
+                printf("\nSorry /Displaydns is not implemented yet\n");
+            else
+                usage();
+            break;
+        case 3: /* Process all the options that can have 1 paramiters */
+            if ( DoRelease)
+                printf("\nSorry /Release is not implemented yet\n");
+            else if ( DoRenew)
+                printf("\nSorry /Renew is not implemented yet\n");
+            else if ( DoShowclassid)
+                printf("\nSorry /Showclassid is not implemented yet\n");
+            else
+                usage();
+            break;
+        case 4:  /* Process all the options that can have 2 paramiters */
+            if ( DoSetclassid)
+                printf("\nSorry /Setclassid is not implemented yet\n");
+            else
+                usage();
+            break;
+        default:
+            usage();
+    }
+
+    return 0;
+}

reactos/apps/utils/net/ipconfig/ipconfig.rc

@@ -0,0 +1,6 @@
+/* $Id$ */
+
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS TCP/IPv4 Win32 ipconfig\0"
+#define REACTOS_STR_INTERNAL_NAME	"ipconfig\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ipconfig.exe\0"
+#include <reactos/version.rc>

reactos/apps/utils/net/ipconfig/ipconfig.xml

@@ -0,0 +1,10 @@
+<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" allowwarnings="true">
+	<include base="ipconfig">.</include>
+	<define name="__USE_W32API" />
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>iphlpapi</library>
+	<file>ipconfig.c</file>
+	<file>trace.c</file>
+	<file>ipconfig.rc</file>
+</module>

reactos/apps/utils/net/netstat/netstat.c

@@ -1,10 +1,34 @@
 /*
+ *  ReactOS Win32 Applications
+ *  Copyright (C) 2005 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS netstat utility
- * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        apps/utils/net/netstat/netstat.c
  * PURPOSE:     display IP stack statistics
- * COPYRIGHT:   Copyright 2005 Ged Murphy <gedmurphy@gmail.com>
+ * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
+ * REVISIONS:
+ *           Ged Murphy 19/09/05 Created
+ *              Some ideas/code taken from Rob Dickinson's original app
+ *
  */
+
 /*
  * TODO:
  * sort function return values.
@@ -14,10 +38,9 @@
  */
 
 #include <windows.h>
-#include <winsock2.h>
+#include <winsock.h>
 #include <tchar.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <iphlpapi.h>
 #include "netstat.h"
 
@@ -85,7 +108,7 @@ BOOL ParseCmdline(int argc, char* argv[])
 
     TCHAR Proto[5];
 
-    if ((argc == 1) || (_istdigit(*argv[1])))
+    if ((argc == 1) || (isdigit(*argv[1])))
         bNoOptions = TRUE;
 
     /* Parse command line for options we have been given. */
@@ -100,21 +123,23 @@ BOOL ParseCmdline(int argc, char* argv[])
                 switch (tolower(c))
                 {
                     case 'a' :
+                        //_tprintf(_T("got a\n"));
                         bDoShowAllCons = TRUE;
                         break;
-                    case 'b' :
-                        bDoShowProcName = TRUE;
-                        break;
                     case 'e' :
+                        //_tprintf(_T("got e\n"));
                         bDoShowEthStats = TRUE;
                         break;
                     case 'n' :
+                        //_tprintf(_T("got n\n"));
                         bDoShowNumbers = TRUE;
                         break;
                     case 's' :
+                        //_tprintf(_T("got s\n"));
                         bDoShowProtoStats = TRUE;
                         break;
                     case 'p' :
+                        //_tprintf(_T("got p\n"));
                         bDoShowProtoCons = TRUE;
 
                         strncpy(Proto, (++argv)[i], sizeof(Proto));
@@ -131,7 +156,7 @@ BOOL ParseCmdline(int argc, char* argv[])
                             Usage();
                             return EXIT_FAILURE;
                         }
-                        --i; /* move pointer back down to previous argv */
+                        (--argv)[i]; /* move pointer back down to previous argv */
                         break;
                     case 'r' :
                         bDoShowRouteTable = TRUE;
@@ -146,12 +171,10 @@ BOOL ParseCmdline(int argc, char* argv[])
                 }
             }
         }
-        else if (_istdigit(*argv[i]))
+        else if (isdigit(*argv[i]))
         {
-            if (_stscanf(argv[i], "%lu", &Interval) != EOF)
-                bLoopOutput = TRUE;
-            else
-                return EXIT_FAILURE;
+            _stscanf(argv[i], "%lu", &Interval);
+            bLoopOutput = TRUE;
         }
 //        else
 //        {
@@ -178,9 +201,9 @@ BOOL DisplayOutput()
 
     if (bDoShowRouteTable)
     {
-        /* mingw doesn't have lib for _tsystem */
         if (system("route print") == -1)
         {
+            //mingw doesn't have lib for _tsystem
             _tprintf(_T("cannot find 'route.exe'\n"));
             return EXIT_FAILURE;
         }
@@ -237,13 +260,12 @@ BOOL DisplayOutput()
         ShowUdpStatistics();
         return EXIT_SUCCESS;
     }
-    else
+    else //if (bDoShowAllCons)
     {
         _tprintf(_T("\nActive Connections\n"));
         _tprintf(_T("\n  Proto  Local Address          Foreign Address        State\n"));
         ShowTcpTable();
-		if (bDoShowAllCons)
-            ShowUdpTable();
+        ShowUdpTable();
     }
     return EXIT_SUCCESS;
 }
@@ -256,7 +278,7 @@ VOID ShowIpStatistics()
     PMIB_IPSTATS pIpStats;
     DWORD dwRetVal;
 
-    pIpStats = (MIB_IPSTATS*) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPSTATS));
+    pIpStats = (MIB_IPSTATS*) malloc(sizeof(MIB_IPSTATS));
 
     if ((dwRetVal = GetIpStatistics(pIpStats)) == NO_ERROR)
     {
@@ -281,8 +303,6 @@ VOID ShowIpStatistics()
     }
     else
         DoFormatMessage(dwRetVal);
-
-    HeapFree(GetProcessHeap(), 0, pIpStats);
 }
 
 VOID ShowIcmpStatistics()
@@ -290,7 +310,7 @@ VOID ShowIcmpStatistics()
     PMIB_ICMP pIcmpStats;
     DWORD dwRetVal;
 
-    pIcmpStats = (MIB_ICMP*) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_ICMP));
+    pIcmpStats = (MIB_ICMP*) malloc(sizeof(MIB_ICMP));
 
     if ((dwRetVal = GetIcmpStatistics(pIcmpStats)) == NO_ERROR)
     {
@@ -326,8 +346,6 @@ VOID ShowIcmpStatistics()
     else
         DoFormatMessage(dwRetVal);
 
-    HeapFree(GetProcessHeap(), 0, pIcmpStats);
-
 }
 
 VOID ShowTcpStatistics()
@@ -335,7 +353,7 @@ VOID ShowTcpStatistics()
     PMIB_TCPSTATS pTcpStats;
     DWORD dwRetVal;
 
-    pTcpStats = (MIB_TCPSTATS*) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_TCPSTATS));
+    pTcpStats = (MIB_TCPSTATS*) malloc(sizeof(MIB_TCPSTATS));
 
     if ((dwRetVal = GetTcpStatistics(pTcpStats)) == NO_ERROR)
     {
@@ -351,8 +369,6 @@ VOID ShowTcpStatistics()
     }
     else
         DoFormatMessage(dwRetVal);
-
-    HeapFree(GetProcessHeap(), 0, pTcpStats);
 }
 
 VOID ShowUdpStatistics()
@@ -360,7 +376,7 @@ VOID ShowUdpStatistics()
     PMIB_UDPSTATS pUdpStats;
     DWORD dwRetVal;
 
-    pUdpStats = (MIB_UDPSTATS*) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_UDPSTATS));
+    pUdpStats = (MIB_UDPSTATS*) malloc(sizeof(MIB_UDPSTATS));
 
     if ((dwRetVal = GetUdpStatistics(pUdpStats)) == NO_ERROR)
     {
@@ -372,8 +388,6 @@ VOID ShowUdpStatistics()
     }
     else
         DoFormatMessage(dwRetVal);
-
-    HeapFree(GetProcessHeap(), 0, pUdpStats);
 }
 
 VOID ShowEthernetStatistics()
@@ -382,12 +396,12 @@ VOID ShowEthernetStatistics()
     DWORD dwSize = 0;
     DWORD dwRetVal = 0;
 
-    pIfTable = (MIB_IFTABLE*) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IFTABLE));
+    pIfTable = (MIB_IFTABLE*) malloc(sizeof(MIB_IFTABLE));
 
     if (GetIfTable(pIfTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER)
     {
-        HeapFree(GetProcessHeap(), 0, pIfTable);
-        pIfTable = (MIB_IFTABLE*) HeapAlloc(GetProcessHeap(), 0, dwSize);
+        GlobalFree(pIfTable);
+        pIfTable = (MIB_IFTABLE*) malloc(dwSize);
 
         if ((dwRetVal = GetIfTable(pIfTable, &dwSize, 0)) == NO_ERROR)
         {
@@ -409,7 +423,6 @@ VOID ShowEthernetStatistics()
         else
             DoFormatMessage(dwRetVal);
     }
-    HeapFree(GetProcessHeap(), 0, pIfTable);
 }
 
 VOID ShowTcpTable()
@@ -423,24 +436,22 @@ VOID ShowTcpTable()
     CHAR Remote[ADDRESSLEN];
 
     /* Get the table of TCP endpoints */
-    dwSize = sizeof (MIB_TCPTABLE);
-    /* Should also work when we get new connections between 2 GetTcpTable()
-     * calls: */
-    do
-    {
-        tcpTable = (PMIB_TCPTABLE) HeapAlloc(GetProcessHeap(), 0, dwSize);
-        error = GetTcpTable(tcpTable, &dwSize, TRUE);
-        if ( error != NO_ERROR )
-            HeapFree(GetProcessHeap(), 0, tcpTable);
-    }
-    while  ( error == ERROR_INSUFFICIENT_BUFFER );
-
-    if (error != NO_ERROR)
+    dwSize = 0;
+    error = GetTcpTable(NULL, &dwSize, TRUE);
+    if (error != ERROR_INSUFFICIENT_BUFFER)
     {
         printf("Failed to snapshot TCP endpoints.\n");
         DoFormatMessage(error);
         exit(EXIT_FAILURE);
     }
+    tcpTable = (PMIB_TCPTABLE)malloc(dwSize);
+    error = GetTcpTable(tcpTable, &dwSize, TRUE );
+    if (error)
+    {
+        printf("Failed to snapshot TCP endpoints table.\n");
+        DoFormatMessage(error);
+        exit(EXIT_FAILURE);
+    }
 
     /* Dump the TCP table */
     for (i = 0; i < tcpTable->dwNumEntries; i++)
@@ -464,7 +475,6 @@ VOID ShowTcpTable()
             Host, Remote, TcpState[tcpTable->table[i].dwState]);
         }
     }
-    HeapFree(GetProcessHeap(), 0, tcpTable);
 }
 
 
@@ -485,13 +495,12 @@ VOID ShowUdpTable()
         DoFormatMessage(error);
         exit(EXIT_FAILURE);
     }
-    udpTable = (PMIB_UDPTABLE) HeapAlloc(GetProcessHeap(), 0, dwSize);
+    udpTable = (PMIB_UDPTABLE)malloc(dwSize);
     error = GetUdpTable(udpTable, &dwSize, TRUE);
     if (error)
     {
         printf("Failed to snapshot UDP endpoints table.\n");
         DoFormatMessage(error);
-        HeapFree(GetProcessHeap(), 0, udpTable);
         exit(EXIT_FAILURE);
     }
 
@@ -505,10 +514,8 @@ VOID ShowUdpTable()
 
         sprintf(Host, "%s:%s", HostIp, HostPort);
 
-        _tprintf(_T("  %-6s %-22s %-22s\n"), _T("UDP"), Host,  _T("*:*"));
+        _tprintf(_T("  %-6s %-22s %-22s\n"), _T("UDP"), Host,  _T(":*:"));
     }
-
-    HeapFree(GetProcessHeap(), 0, udpTable);
 }
 
 
@@ -516,7 +523,7 @@ VOID ShowUdpTable()
  * Translate port numbers into their text equivalent if there is one
  */
 PCHAR
-GetPortName(UINT Port, PCSTR Proto, CHAR Name[], INT NameLen)
+GetPortName(UINT Port, PCHAR Proto, CHAR Name[], INT NameLen)
 {
     struct servent *pSrvent;
 
@@ -534,16 +541,18 @@ GetPortName(UINT Port, PCSTR Proto, CHAR Name[], INT NameLen)
 }
 
 
-/*
- * convert addresses into dotted decimal or hostname
- */
+//
+// GetIpHostName
+//
+// Translate IP addresses into their name-resolved form if possible.
+//
 PCHAR
 GetIpHostName(BOOL Local, UINT IpAddr, CHAR Name[], int NameLen)
 {
 //  struct hostent *phostent;
     UINT nIpAddr;
 
-    /* display dotted decimal */
+    // Does the user want raw numbers?
     nIpAddr = htonl(IpAddr);
     if (bDoShowNumbers) {
         sprintf(Name, "%d.%d.%d.%d",
@@ -554,9 +563,9 @@ GetIpHostName(BOOL Local, UINT IpAddr, CHAR Name[], int NameLen)
         return Name;
     }
 
-    Name[0] = _T('\0');
+    Name[0] = L'\0';
 
-    /* try to resolve the name */
+    // Try to translate to a name
     if (!IpAddr) {
         if (!Local) {
             sprintf(Name, "%d.%d.%d.%d",
@@ -565,15 +574,13 @@ GetIpHostName(BOOL Local, UINT IpAddr, CHAR Name[], int NameLen)
                 (nIpAddr >> 8) & 0xFF,
                 (nIpAddr) & 0xFF);
         } else {
-            if (gethostname(Name, NameLen) != 0)
-                DoFormatMessage(WSAGetLastError());
+            //gethostname(name, namelen);
         }
     } else if (IpAddr == 0x0100007f) {
         if (Local) {
-            if (gethostname(Name, NameLen) != 0)
-                DoFormatMessage(WSAGetLastError());
+            //gethostname(name, namelen);
         } else {
-            _tcsncpy(Name, _T("localhost"), 10);
+            strcpy(Name, "localhost");
         }
 //  } else if (phostent = gethostbyaddr((char*)&ipaddr, sizeof(nipaddr), PF_INET)) {
 //      strcpy(name, phostent->h_name);
@@ -589,7 +596,7 @@ GetIpHostName(BOOL Local, UINT IpAddr, CHAR Name[], int NameLen)
 
 VOID Usage()
 {
-    _tprintf(_T("\nDisplays current TCP/IP protocol statistics and network connections.\n\n"
+    _tprintf(_T("Displays current TCP/IP protocol statistics and network connections.\n\n"
     "NETSTAT [-a] [-e] [-n] [-s] [-p proto] [-r] [interval]\n\n"
     "  -a            Displays all connections and listening ports.\n"
     "  -e            Displays Ethernet statistics. May be combined with -s\n"
@@ -609,6 +616,7 @@ VOID Usage()
 
 
 
+
 /*
  *
  * Parse command line parameters and set any options
@@ -617,14 +625,6 @@ VOID Usage()
  */
 int main(int argc, char *argv[])
 {
-    WSADATA wsaData;
-
-    if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0)
-    {
-        _tprintf(_T("WSAStartup() failed : %d\n"), WSAGetLastError());
-        return -1;
-    }
-
     if (ParseCmdline(argc, argv))
         return -1;
 

reactos/apps/utils/net/netstat/netstat.h

@@ -7,7 +7,6 @@
 /* command line options */
 BOOL bNoOptions        = FALSE; // print default
 BOOL bDoShowAllCons    = FALSE; // -a
-BOOL bDoShowProcName   = FALSE; // -b
 BOOL bDoShowEthStats   = FALSE; // -e
 BOOL bDoShowNumbers    = FALSE; // -n
 BOOL bDoShowProtoCons  = FALSE; // -p
@@ -55,7 +54,7 @@ VOID ShowUdpStatistics(VOID);
 VOID ShowEthernetStatistics(VOID);
 VOID ShowTcpTable(VOID);
 VOID ShowUdpTable(VOID);
-PCHAR GetPortName(UINT Port, PCSTR Proto, CHAR Name[PORTNAMELEN], INT NameLen);
+PCHAR GetPortName(UINT Port, PCHAR Proto, CHAR Name[PORTNAMELEN], INT NameLen);
 PCHAR GetIpHostName(BOOL local, UINT ipaddr, CHAR name[HOSTNAMELEN], int namelen);
 VOID Usage(VOID);
 

reactos/apps/utils/net/netstat/netstat.xml

@@ -0,0 +1,13 @@
+<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" allowwarnings="true">
+    <include base="netstat">.</include>
+    <define name="__USE_W32API" />
+    <define name="_WIN32_IE">0x600</define>
+    <define name="_WIN32_WINNT">0x501</define>
+    <library>kernel32</library>
+    <library>user32</library>
+    <library>ws2_32</library>
+    <library>snmpapi</library>
+    <library>iphlpapi</library>
+    <file>netstat.c</file>
+    <file>netstat.rc</file>
+</module>

reactos/apps/utils/net/ping/ping.c

@@ -0,0 +1,631 @@
+/* $Id$
+ *
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS ping utility
+ * FILE:        apps/net/ping/ping.c
+ * PURPOSE:     Network test utility
+ * PROGRAMMERS: Casper S. Hornstrup (chorns@users.sourceforge.net)
+ * REVISIONS:
+ *   CSH  01/09/2000 Created
+ */
+//#include <windows.h>
+#include <winsock2.h>
+#include <tchar.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
+#ifndef _MSC_VER
+
+//#define DBG
+
+/* FIXME: Where should this be? */
+#ifdef CopyMemory
+#undef CopyMemory
+#endif
+#define CopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length);
+
+/* Should be in the header files somewhere (exported by ntdll.dll) */
+long atol(const char *str);
+
+#ifndef __int64
+typedef long long __int64;
+#endif
+
+char * _i64toa(__int64 value, char *string, int radix);
+
+#endif
+
+
+/* General ICMP constants */
+#define ICMP_MINSIZE		8		/* Minimum ICMP packet size */
+#define ICMP_MAXSIZE		65535	/* Maximum ICMP packet size */
+
+/* ICMP message types */
+#define ICMPMSG_ECHOREQUEST	8		/* ICMP ECHO request message */
+#define ICMPMSG_ECHOREPLY	0		/* ICMP ECHO reply message */
+
+#pragma pack(4)
+
+/* IPv4 header structure */
+typedef struct _IPv4_HEADER {
+	unsigned char	IHL:4;
+	unsigned char	Version:4;
+	unsigned char	TOS;
+	unsigned short	Length;
+	unsigned short	Id;
+	unsigned short	FragFlags;
+	unsigned char	TTL;
+	unsigned char	Protocol;
+	unsigned short	Checksum;
+	unsigned int	SrcAddress;
+	unsigned int	DstAddress;
+} IPv4_HEADER, *PIPv4_HEADER;
+
+/* ICMP echo request/reply header structure */
+typedef struct _ICMP_HEADER {
+	unsigned char	Type;
+	unsigned char	Code;
+	unsigned short	Checksum;
+	unsigned short	Id;
+	unsigned short	SeqNum;
+} ICMP_HEADER, *PICMP_HEADER;
+
+typedef struct _ICMP_ECHO_PACKET {
+	ICMP_HEADER   Icmp;
+	LARGE_INTEGER Timestamp;
+} ICMP_ECHO_PACKET, *PICMP_ECHO_PACKET;
+
+#pragma pack(1)
+
+BOOL                InvalidOption;
+BOOL                NeverStop;
+BOOL                ResolveAddresses;
+UINT                PingCount;
+UINT                DataSize;   /* ICMP echo request data size */
+BOOL                DontFragment;
+ULONG               TTLValue;
+ULONG               TOSValue;
+ULONG               Timeout;
+CHAR                TargetName[256];
+SOCKET              IcmpSock;
+SOCKADDR_IN         Target;
+LPSTR               TargetIP;
+FD_SET              Fds;
+TIMEVAL             Timeval;
+UINT                CurrentSeqNum;
+UINT                SentCount;
+UINT                LostCount;
+BOOL                MinRTTSet;
+LARGE_INTEGER       MinRTT;     /* Minimum round trip time in microseconds */
+LARGE_INTEGER       MaxRTT;
+LARGE_INTEGER       SumRTT;
+LARGE_INTEGER       AvgRTT;
+LARGE_INTEGER       TicksPerMs; /* Ticks per millisecond */
+LARGE_INTEGER       TicksPerUs; /* Ticks per microsecond */
+BOOL                UsePerformanceCounter;
+
+#ifdef DBG
+/* Display the contents of a buffer */
+static VOID DisplayBuffer(
+    PVOID Buffer,
+    DWORD Size)
+{
+    UINT i;
+    PCHAR p;
+
+    printf("Buffer (0x%p)  Size (0x%lX).\n", Buffer, Size);
+
+    p = (PCHAR)Buffer;
+    for (i = 0; i < Size; i++) {
+      if (i % 16 == 0) {
+        printf("\n");
+      }
+      printf("%02X ", (p[i]) & 0xFF);
+    }
+}
+#endif /* DBG */
+
+/* Display usage information on screen */
+static VOID Usage(VOID)
+{
+	printf("\nUsage: ping [-t] [-n count] [-l size] [-w timeout] destination-host\n\n");
+	printf("Options:\n");
+	printf("    -t             Ping the specified host until stopped.\n");
+	printf("                   To stop - type Control-C.\n");
+	printf("    -n count       Number of echo requests to send.\n");
+	printf("    -l size        Send buffer size.\n");
+	printf("    -w timeout     Timeout in milliseconds to wait for each reply.\n\n");
+}
+
+/* Reset configuration to default values */
+static VOID Reset(VOID)
+{
+    LARGE_INTEGER PerformanceCounterFrequency;
+
+    NeverStop             = FALSE;
+    ResolveAddresses      = FALSE;
+    PingCount             = 4;
+    DataSize              = 32;
+    DontFragment          = FALSE;
+    TTLValue              = 128;
+    TOSValue              = 0;
+    Timeout               = 1000;
+    UsePerformanceCounter = QueryPerformanceFrequency(&PerformanceCounterFrequency);
+
+    if (UsePerformanceCounter) {
+        /* Performance counters may return incorrect results on some multiprocessor
+           platforms so we restrict execution on the first processor. This may fail
+           on Windows NT so we fall back to GetCurrentTick() for timing */
+        if (SetThreadAffinityMask (GetCurrentThread(), 1) == 0) {
+            UsePerformanceCounter = FALSE;
+        }
+
+        /* Convert frequency to ticks per millisecond */
+        TicksPerMs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000;
+        /* And to ticks per microsecond */
+        TicksPerUs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000000;
+    }
+    if (!UsePerformanceCounter) {
+        /* 1 tick per millisecond for GetCurrentTick() */
+        TicksPerMs.QuadPart = 1;
+        /* GetCurrentTick() cannot handle microseconds */
+        TicksPerUs.QuadPart = 1;
+    }
+}
+
+/* Return ULONG in a string */
+static ULONG GetULONG(LPSTR String)
+{
+    UINT i, Length;
+    ULONG Value;
+
+    i = 0;
+    Length = strlen(String);
+    while ((i < Length) && ((String[i] < '0') || (String[i] > '9'))) i++;
+    if ((i >= Length) || ((String[i] < '0') || (String[i] > '9'))) {
+        InvalidOption = TRUE;
+        return 0;
+    }
+    Value = (ULONG)atol(&String[i]);
+
+    return Value;
+}
+
+/* Return ULONG in a string. Try next paramter if not successful */
+static ULONG GetULONG2(LPSTR String1, LPSTR String2, PINT i)
+{
+    ULONG Value;
+
+    Value = GetULONG(String1);
+    if (InvalidOption) {
+        InvalidOption = FALSE;
+        if (String2[0] != '-') {
+            Value = GetULONG(String2);
+            if (!InvalidOption)
+                *i += 1;
+        }
+    }
+
+    return Value;
+}
+
+/* Parse command line parameters */
+static BOOL ParseCmdline(int argc, char* argv[])
+{
+    INT i;
+    BOOL ShowUsage;
+    BOOL FoundTarget;
+//#if 1
+//    lstrcpy(TargetName, "127.0.0.1");
+//    PingCount = 1;
+//    return TRUE;
+//#endif
+    if (argc < 2) {
+        ShowUsage = TRUE;
+    } else {
+        ShowUsage = FALSE;
+    }
+    FoundTarget = FALSE;
+    InvalidOption = FALSE;
+
+    for (i = 1; i < argc; i++) {
+        if (argv[i][0] == '-') {
+            switch (argv[i][1]) {
+            case 't': NeverStop = TRUE; break;
+            case 'a': ResolveAddresses = TRUE; break;
+            case 'n': PingCount = GetULONG2(&argv[i][2], argv[i + 1], &i); break;
+            case 'l':
+                DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i);
+                if ((DataSize < 0) || (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET))) {
+                    printf("Bad value for option -l, valid range is from 0 to %d.\n",
+                        ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET));
+                    return FALSE;
+                }
+                break;
+            case 'f': DontFragment = TRUE; break;
+            case 'i': TTLValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break;
+            case 'v': TOSValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break;
+            case 'w': Timeout  = GetULONG2(&argv[i][2], argv[i + 1], &i); break;
+            default:
+                printf("Bad option %s.\n", argv[i]);
+                Usage();
+                return FALSE;
+            }
+            if (InvalidOption) {
+                printf("Bad option format %s.\n", argv[i]);
+                return FALSE;
+            }
+        } else {
+            if (FoundTarget) {
+                printf("Bad parameter %s.\n", argv[i]);
+                return FALSE;
+            } else {
+				lstrcpy(TargetName, argv[i]);
+                FoundTarget = TRUE;
+            }
+        }
+    }
+
+    if ((!ShowUsage) && (!FoundTarget)) {
+        printf("Name or IP address of destination host must be specified.\n");
+        return FALSE;
+    }
+
+    if (ShowUsage) {
+        Usage();
+        return FALSE;
+    }
+    return TRUE;
+}
+
+/* Calculate checksum of data */
+static WORD Checksum(PUSHORT data, UINT size)
+{
+    ULONG sum = 0;
+
+    while (size > 1) {
+        sum  += *data++;
+        size -= sizeof(USHORT);
+    }
+
+    if (size)
+        sum += *(UCHAR*)data;
+
+    sum = (sum >> 16) + (sum & 0xFFFF);
+    sum += (sum >> 16);
+
+    return (USHORT)(~sum);
+}
+
+/* Prepare to ping target */
+static BOOL Setup(VOID)
+{
+    WORD     wVersionRequested;
+    WSADATA  WsaData;
+    INT	     Status;
+    ULONG    Addr;
+    PHOSTENT phe;
+
+    wVersionRequested = MAKEWORD(2, 2);
+
+    Status = WSAStartup(wVersionRequested, &WsaData);
+    if (Status != 0) {
+        printf("Could not initialize winsock dll.\n");
+        return FALSE;
+    }
+
+    IcmpSock = WSASocket(AF_INET, SOCK_RAW, IPPROTO_ICMP, NULL, 0, 0);
+    if (IcmpSock == INVALID_SOCKET) {
+        printf("Could not create socket (#%d).\n", WSAGetLastError());
+        return FALSE;
+    }
+
+    ZeroMemory(&Target, sizeof(Target));
+    phe = NULL;
+    Addr = inet_addr(TargetName);
+    if (Addr == INADDR_NONE) {
+        phe = gethostbyname(TargetName);
+        if (phe == NULL) {
+            printf("Unknown host %s.\n", TargetName);
+            return FALSE;
+        }
+    }
+
+    if (phe != NULL) {
+        CopyMemory(&Target.sin_addr, phe->h_addr, phe->h_length);
+    } else {
+        Target.sin_addr.s_addr = Addr;
+    }
+
+    if (phe != NULL) {
+		Target.sin_family = phe->h_addrtype;
+    } else {
+        Target.sin_family = AF_INET;
+    }
+
+    TargetIP		= inet_ntoa(Target.sin_addr);
+    CurrentSeqNum	= 0;
+    SentCount		= 0;
+	LostCount		= 0;
+    MinRTT.QuadPart = 0;
+    MaxRTT.QuadPart = 0;
+    SumRTT.QuadPart = 0;
+    MinRTTSet       = FALSE;
+    return TRUE;
+}
+
+/* Close socket */
+static VOID Cleanup(VOID)
+{
+    if (IcmpSock != INVALID_SOCKET)
+        closesocket(IcmpSock);
+
+    WSACleanup();
+}
+
+static VOID QueryTime(PLARGE_INTEGER Time)
+{
+    if (UsePerformanceCounter) {
+        if (QueryPerformanceCounter(Time) == 0) {
+            /* This should not happen, but we fall
+               back to GetCurrentTick() if it does */
+            Time->u.LowPart  = (ULONG)GetTickCount();
+            Time->u.HighPart = 0;
+
+            /* 1 tick per millisecond for GetCurrentTick() */
+            TicksPerMs.QuadPart = 1;
+            /* GetCurrentTick() cannot handle microseconds */
+            TicksPerUs.QuadPart = 1;
+
+            UsePerformanceCounter = FALSE;
+        }
+    } else {
+        Time->u.LowPart  = (ULONG)GetTickCount();
+        Time->u.HighPart = 0;
+    }
+}
+
+static VOID TimeToMsString(LPSTR String, LARGE_INTEGER Time)
+{
+    CHAR          Convstr[40];
+    LARGE_INTEGER LargeTime;
+
+    LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart;
+
+    _i64toa(LargeTime.QuadPart, Convstr, 10);
+	strcpy(String, Convstr);
+    strcat(String, "ms");
+}
+
+/* Locate the ICMP data and print it. Returns TRUE if the packet was good,
+   FALSE if not */
+static BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
+{
+    PIPv4_HEADER      IpHeader;
+    PICMP_ECHO_PACKET Icmp;
+  	UINT              IphLength;
+    CHAR              Time[100];
+    LARGE_INTEGER     RelativeTime;
+    LARGE_INTEGER     LargeTime;
+    CHAR              Sign[1];
+
+    IpHeader = (PIPv4_HEADER)buffer;
+
+    IphLength = IpHeader->IHL * 4;
+
+    if (size  < IphLength + ICMP_MINSIZE) {
+#ifdef DBG
+        printf("Bad size (0x%X < 0x%X)\n", size, IphLength + ICMP_MINSIZE);
+#endif /* DBG */
+        return FALSE;
+    }
+
+    Icmp = (PICMP_ECHO_PACKET)(buffer + IphLength);
+
+    if (Icmp->Icmp.Type != ICMPMSG_ECHOREPLY) {
+#ifdef DBG
+        printf("Bad ICMP type (0x%X should be 0x%X)\n", Icmp->Icmp.Type, ICMPMSG_ECHOREPLY);
+#endif /* DBG */
+        return FALSE;
+    }
+
+    if (Icmp->Icmp.Id != (USHORT)GetCurrentProcessId()) {
+#ifdef DBG
+        printf("Bad ICMP id (0x%X should be 0x%X)\n", Icmp->Icmp.Id, (USHORT)GetCurrentProcessId());
+#endif /* DBG */
+        return FALSE;
+    }
+
+    QueryTime(&LargeTime);
+
+    RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart);
+
+    if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) {
+        strcpy(Sign, "<");
+        strcpy(Time, "1ms");
+    } else {
+        strcpy(Sign, "=");
+        TimeToMsString(Time, RelativeTime);
+    }
+
+
+    printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr),
+      size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL);
+    if (RelativeTime.QuadPart < MinRTT.QuadPart) {
+		  MinRTT.QuadPart = RelativeTime.QuadPart;
+      MinRTTSet = TRUE;
+    }
+	  if (RelativeTime.QuadPart > MaxRTT.QuadPart)
+	      MaxRTT.QuadPart = RelativeTime.QuadPart;
+    SumRTT.QuadPart += RelativeTime.QuadPart;
+
+	return TRUE;
+}
+
+/* Send and receive one ping */
+static BOOL Ping(VOID)
+{
+    INT                 Status;
+    SOCKADDR            From;
+    INT                 Length;
+    PVOID               Buffer;
+    UINT                Size;
+    PICMP_ECHO_PACKET   Packet;
+
+    /* Account for extra space for IP header when packet is received */
+    Size   = DataSize + 128;
+    Buffer = GlobalAlloc(0, Size);
+    if (!Buffer) {
+        printf("Not enough free resources available.\n");
+        return FALSE;
+    }
+
+    ZeroMemory(Buffer, Size);
+    Packet = (PICMP_ECHO_PACKET)Buffer;
+
+    /* Assemble ICMP echo request packet */
+    Packet->Icmp.Type     = ICMPMSG_ECHOREQUEST;
+    Packet->Icmp.Code     = 0;
+    Packet->Icmp.Id	      = (USHORT)GetCurrentProcessId();
+    Packet->Icmp.SeqNum   = (USHORT)CurrentSeqNum;
+    Packet->Icmp.Checksum = 0;
+
+    /* Timestamp is part of data area */
+    QueryTime(&Packet->Timestamp);
+
+    CopyMemory(Buffer, &Packet->Icmp, sizeof(ICMP_ECHO_PACKET) + DataSize);
+    /* Calculate checksum for ICMP header and data area */
+    Packet->Icmp.Checksum = Checksum((PUSHORT)&Packet->Icmp, sizeof(ICMP_ECHO_PACKET) + DataSize);
+
+    CurrentSeqNum++;
+
+	/* Send ICMP echo request */
+
+    FD_ZERO(&Fds);
+    FD_SET(IcmpSock, &Fds);
+    Timeval.tv_sec  = Timeout / 1000;
+    Timeval.tv_usec = Timeout % 1000;
+    Status = select(0, NULL, &Fds, NULL, &Timeval);
+    if ((Status != SOCKET_ERROR) && (Status != 0)) {
+
+#ifdef DBG
+        printf("Sending packet\n");
+        DisplayBuffer(Buffer, sizeof(ICMP_ECHO_PACKET) + DataSize);
+        printf("\n");
+#endif /* DBG */
+
+        Status = sendto(IcmpSock, Buffer, sizeof(ICMP_ECHO_PACKET) + DataSize,
+            0, (SOCKADDR*)&Target, sizeof(Target));
+        SentCount++;
+    }
+    if (Status == SOCKET_ERROR) {
+        if (WSAGetLastError() == WSAEHOSTUNREACH) {
+            printf("Destination host unreachable.\n");
+        } else {
+            printf("Could not transmit data (%d).\n", WSAGetLastError());
+        }
+        GlobalFree(Buffer);
+        return FALSE;
+    }
+
+    /* Expect to receive ICMP echo reply */
+    FD_ZERO(&Fds);
+    FD_SET(IcmpSock, &Fds);
+    Timeval.tv_sec  = Timeout / 1000;
+    Timeval.tv_usec = Timeout % 1000;
+
+    Status = select(0, &Fds, NULL, NULL, &Timeval);
+    if ((Status != SOCKET_ERROR) && (Status != 0)) {
+        Length = sizeof(From);
+        Status = recvfrom(IcmpSock, Buffer, Size, 0, &From, &Length);
+
+#ifdef DBG
+        printf("Received packet\n");
+        DisplayBuffer(Buffer, Status);
+        printf("\n");
+#endif /* DBG */
+    }
+    if (Status == SOCKET_ERROR) {
+        if (WSAGetLastError() != WSAETIMEDOUT) {
+            printf("Could not receive data (%d).\n", WSAGetLastError());
+            GlobalFree(Buffer);
+            return FALSE;
+        }
+        Status = 0;
+    }
+
+    if (Status == 0) {
+        printf("Request timed out.\n");
+        LostCount++;
+        GlobalFree(Buffer);
+        return TRUE;
+    }
+
+    if (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)) {
+        /* FIXME: Wait again as it could be another ICMP message type */
+        printf("Request timed out (incomplete datagram received).\n");
+        LostCount++;
+    }
+
+    GlobalFree(Buffer);
+    return TRUE;
+}
+
+
+/* Program entry point */
+int main(int argc, char* argv[])
+{
+    UINT Count;
+    CHAR MinTime[20];
+    CHAR MaxTime[20];
+    CHAR AvgTime[20];
+
+    Reset();
+
+    if ((ParseCmdline(argc, argv)) && (Setup())) {
+
+        printf("\nPinging %s [%s] with %d bytes of data:\n\n",
+            TargetName, TargetIP, DataSize);
+
+		Count = 0;
+		while ((NeverStop) || (Count < PingCount)) {
+			Ping();
+			Sleep(Timeout);
+			Count++;
+		};
+
+        Cleanup();
+
+		/* Calculate avarage round trip time */
+        if ((SentCount - LostCount) > 0) {
+            AvgRTT.QuadPart = SumRTT.QuadPart / (SentCount - LostCount);
+        } else {
+            AvgRTT.QuadPart = 0;
+        }
+
+        /* Calculate loss percent */
+        if (LostCount > 0) {
+            Count = (SentCount * 100) / LostCount;
+        } else {
+            Count = 0;
+        }
+
+        if (!MinRTTSet)
+            MinRTT = MaxRTT;
+
+        TimeToMsString(MinTime, MinRTT);
+        TimeToMsString(MaxTime, MaxRTT);
+        TimeToMsString(AvgTime, AvgRTT);
+
+        /* Print statistics */
+        printf("\nPing statistics for %s:\n", TargetIP);
+        printf("    Packets: Sent = %d, Received = %d, Lost = %d (%d%% loss),\n",
+            SentCount, SentCount - LostCount, LostCount, Count);
+        printf("Approximate round trip times in milli-seconds:\n");
+        printf("    Minimum = %s, Maximum = %s, Average = %s\n",
+            MinTime, MaxTime, AvgTime);
+    }
+	return 0;
+}
+
+/* EOF */

reactos/apps/utils/net/ping/ping.rc

@@ -0,0 +1,7 @@
+/* $Id$ */
+
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS TCP/IPv4 Win32 Ping\0"
+#define REACTOS_STR_INTERNAL_NAME	"ping\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ping.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT	"Casper S. Hornstrup (chorns@users.sourceforge.net)\0"
+#include <reactos/version.rc>

reactos/apps/utils/net/ping/ping.xml

@@ -0,0 +1,11 @@
+<module name="ping" type="win32cui" installbase="system32" installname="ping.exe">
+	<include base="ping">.</include>
+	<define name="__USE_W32API" />
+	<define name="__USE_W32_SOCKETS" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<file>ping.c</file>
+	<file>ping.rc</file>
+</module>

reactos/apps/utils/net/roshttpd/common/socket.cpp

@@ -7,9 +7,9 @@
  * REVISIONS:
  *   CSH  01/09/2000 Created
  */
-#include <socket.h>
 #include <string.h>
 #include <error.h>
+#include <socket.h>
 #include <iterator.h>
 
 // ***************************** CSocket *****************************
@@ -28,7 +28,7 @@ CSocket::CSocket()
     // Any address will do
     SockAddrIn.sin_addr.s_addr = INADDR_ANY;
 
-    // Convert to network ordering
+    // Convert to network ordering 
     SockAddrIn.sin_port = htons(0);
 }
 
@@ -48,7 +48,7 @@ VOID CSocket::SetSocket(SOCKET socket)
 {
 	Socket = socket;
 }
-
+	
 
 // Return socket address
 SOCKADDR_IN CSocket::GetSockAddrIn()
@@ -71,7 +71,7 @@ VOID CSocket::SetEvents(LONG lEvents)
 		if (Event == WSA_INVALID_EVENT)
 			throw ESocketOpen(TS("Unable to create event."));
 	}
-
+	
 	if (lEvents != Events) {
 		// Associate network events with socket
 		if (WSAEventSelect(Socket, Event, lEvents) == SOCKET_ERROR)
@@ -102,43 +102,43 @@ VOID CSocket::Close()
 // Constructor with serversocket as parameter
 CServerClientSocket::CServerClientSocket(LPCServerSocket lpServerSocket)
 {
-    ServerSocket = lpServerSocket;
+	ServerSocket = lpServerSocket;
 }
 
 // Transmit data to socket
-INT CServerClientSocket::Transmit( LPCSTR lpsBuffer, UINT nLength)
+INT CServerClientSocket::Transmit( LPSTR lpsBuffer, UINT nLength)
 {
     return send(Socket, lpsBuffer, nLength, 0);
 }
 
 // Send a string to socket
-INT CServerClientSocket::SendText( LPCSTR lpsText)
+INT CServerClientSocket::SendText( LPSTR lpsText)
 {
     static CHAR crlf[3] = {0x0D, 0x0A, 0x00};
-    INT nCount;
+	INT nCount;
 
     nCount = Transmit(lpsText, strlen(lpsText));
-    nCount += Transmit(crlf, strlen(crlf));
-    return nCount;
+	nCount += Transmit(crlf, strlen(crlf));
+	return nCount;
 }
 
 // Receive data from socket
 INT CServerClientSocket::Receive(LPSTR lpsBuffer, UINT nLength)
 {
-    return recv(Socket, lpsBuffer, nLength, 0);
+	return recv(Socket, lpsBuffer, nLength, 0);
 }
 
 // Process winsock messages if any
 VOID CServerClientSocket::MessageLoop()
 {
-    UINT nStatus;
+	UINT nStatus;
     WSANETWORKEVENTS NetworkEvents;
 
     nStatus = WSAWaitForMultipleEvents(1, &Event, FALSE, 0, FALSE);
     if ((nStatus == 0) && (WSAEnumNetworkEvents(Socket, Event, &NetworkEvents) != SOCKET_ERROR)) {
         if ((NetworkEvents.lNetworkEvents & FD_READ) != 0) {
 			OnRead();
-		}
+		} 
         if ((NetworkEvents.lNetworkEvents & FD_CLOSE) != 0) {
 			OnClose();
         }
@@ -165,7 +165,7 @@ CServerClientThread::~CServerClientThread()
 }
 
 
-// ************************** CServerSocket **************************
+// ************************** CServerSocket **************************	
 
 // Default constructor
 CServerSocket::CServerSocket()
@@ -183,8 +183,8 @@ CServerSocket::~CServerSocket()
 VOID CServerSocket::Open()
 {
 	assert(!Active);
-
-	// Convert to network ordering
+	
+	// Convert to network ordering 
 	SockAddrIn.sin_port = htons(Port);
 
 	if (Socket == INVALID_SOCKET) {
@@ -222,7 +222,7 @@ VOID CServerSocket::Close()
 			throw ESocketClose(TS("Unable to close socket event."));
 		Event = WSA_INVALID_EVENT;
 	}
-
+	
 	CIterator<LPCServerClientThread> *i = Connections.CreateIterator();
 
 	// Terminate and free all client threads
@@ -257,7 +257,7 @@ VOID CServerSocket::MessageLoop()
     WSANETWORKEVENTS NetworkEvents;
 	LPCServerClientSocket lpClient;
 	LPCServerClientThread lpThread;
-
+	
     nStatus = WSAWaitForMultipleEvents(1, &Event, FALSE, 0, FALSE);
     if ((nStatus == 0) && (WSAEnumNetworkEvents(Socket, Event, &NetworkEvents) != SOCKET_ERROR)) {
         if ((NetworkEvents.lNetworkEvents & FD_ACCEPT) != 0) {
@@ -322,13 +322,13 @@ VOID InitWinsock()
     WSADATA wsaData;
 
     wVersionRequested = MAKEWORD(2, 0);
-
+ 
     if (WSAStartup(wVersionRequested, &wsaData) != 0)
         // Return FALSE as we couldn't find a usable WinSock DLL
 		throw ESocketWinsock(TS("Unable to initialize winsock dll."));
-
+   
     /* Confirm that the WinSock DLL supports 2.0 */
-
+ 
     if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 0) {
         // We couldn't find a usable winsock dll
         WSACleanup();

reactos/apps/utils/net/roshttpd/config.cpp

@@ -42,7 +42,7 @@ void CConfig::Reset()
 void CConfig::Default()
 {
 	Clear();
-	MainBase = _wcsdup((LPWSTR)dcfgMainBase);
+	MainBase = (LPWSTR)_wcsdup(dcfgMainBase);
 	HttpBase = _strdup(dcfgHttpBase);
 
 	LPSTR lpsStr;

reactos/apps/utils/net/roshttpd/http.cpp

@@ -12,14 +12,14 @@
  *              - Implement more entity-header entries
  */
 #include <debug.h>
-#include <iostream>
+#include <iostream.h>
 #include <string.h>
 #include <http.h>
 
-CHAR MethodTable[NUMMETHODS][8] = {"OPTIONS", "GET", "HEAD", "POST", "PUT",
+CHAR MethodTable[NUMMETHODS][8] = {"OPTIONS", "GET", "HEAD", "POST", "PUT", 
     "DELETE", "TRACE"};
 
-CHAR GenerelTable[NUMGENERELS][18] = {"Cache-Control", "Connection", "Date", "Pragma",
+CHAR GenerelTable[NUMGENERELS][18] = {"Cache-Control", "Connection", "Date", "Pragma", 
     "Transfer-Encoding", "Upgrade", "Via"};
 
 CHAR RequestTable[NUMREQUESTS][20] = {"Accept", "Accept-Charset", "Accept-Encoding",
@@ -98,7 +98,7 @@ BOOL CHttpParser::ReadChar(LPSTR lpsStr)
 BOOL CHttpParser::PeekChar(LPSTR lpsStr)
 {
     UINT nFakeTail;
-
+    
     if (nTail == sizeof(sBuffer))
         nFakeTail = 0;
     else
@@ -117,10 +117,10 @@ BOOL CHttpParser::ReadString(LPSTR lpsStr, UINT nLength)
 {
     UINT i = 0;
     CHAR sTmp;
-
+    
     while (PeekChar(&sTmp)) {
         if (((sTmp >= 'A') && (sTmp <= 'Z')) || ((sTmp >= 'a') && (sTmp <= 'z')) ||
-            ((sTmp >= '0') && (sTmp <= '9')) || (sTmp == '-')) {
+            ((sTmp >= '0') && (sTmp <= '9')) || (sTmp == '-')) { 
             if (i >= (nLength - 1)) {
                 lpsStr[0] = 0;
                 return FALSE;
@@ -137,13 +137,13 @@ BOOL CHttpParser::ReadString(LPSTR lpsStr, UINT nLength)
     return FALSE;
 }
 
-// Read a string from buffer. Stop if SP or CR is found or when there are no more
+// Read a string from buffer. Stop if SP or CR is found or when there are no more 
 // characters
 BOOL CHttpParser::ReadSpecial(LPSTR lpsStr, UINT nLength)
 {
     UINT i = 0;
     CHAR sTmp;
-
+ 
     while (PeekChar(&sTmp) && (sTmp != ' ') && (sTmp != 13)) {
         if (i >= (nLength - 1)) {
             lpsStr[nLength - 1] = 0;
@@ -186,12 +186,15 @@ BOOL CHttpParser::ExpectCRLF()
     return (Expect(13) && Expect(10));
 }
 
-// Request = RequestLine | *( GenerelHeader | RequestHeader | EntityHeader )
+// Request = RequestLine | *( GenerelHeader | RequestHeader | EntityHeader ) 
 //           CRLF [ MessageBody ]
 BOOL CHttpParser::Parse()
 {
     BOOL bStatus;
 
+
+    CHAR ch;
+
     if (RequestLine()) {
         do {
             if (!ReadString(sHeader, sizeof(sHeader)))
@@ -217,10 +220,10 @@ BOOL CHttpParser::RequestLine()
 
     bUnknownMethod = FALSE;
 
-    // RFC 2068 states that servers SHOULD ignore any empty nine(s) received where a
+    // RFC 2068 states that servers SHOULD ignore any empty nine(s) received where a 
     // Request-Line is expected
     while (PeekChar(&sCh) && ((sCh == 13) || (sCh == 10)));
-
+    
     if (!ReadString(sMethod, sizeof(sMethod)))
         return FALSE;
 
@@ -248,7 +251,7 @@ BOOL CHttpParser::RequestLine()
     return FALSE;
 }
 
-// GenerelHeader = Cache-Control | Connection | Date | Pragma | Transfer-Encoding |
+// GenerelHeader = Cache-Control | Connection | Date | Pragma | Transfer-Encoding | 
 //                 Upgrade | Via
 BOOL CHttpParser::GenerelHeader()
 {
@@ -354,9 +357,9 @@ BOOL CHttpParser::EntityHeader()
     for (i = 0; i < NUMENTITIES; i++) {
         if (strcmp(EntityTable[i], sHeader) == 0) {
             switch (i) {
-                case 0:
+                case 0: 
                 default: {
-                    //cout << "<Entity-Header>: #" << i << endl;
+                    //cout << "<Entity-Header>: #" << i << endl; 
                     Expect(':');
                     Expect(' ');
                     Skip(13);

reactos/apps/utils/net/roshttpd/httpd.cpp

@@ -41,7 +41,7 @@ CHttpClient::CHttpClient(CServerSocket *serversocket)
 VOID CHttpClient::SplitUri(LPSTR lpsUri, LPSTR lpsHost, LPSTR lpsResource, LPSTR lpsParams)
 {
     LPSTR lpsPos;
-    LPSTR lpsStr;
+	LPSTR lpsStr;
     UINT i;
 
 	strcpy(lpsHost, "");
@@ -53,7 +53,7 @@ VOID CHttpClient::SplitUri(LPSTR lpsUri, LPSTR lpsHost, LPSTR lpsResource, LPSTR
         lpsStr = &lpsPos[3];
 	else
 		lpsStr = lpsUri;
-
+        
     lpsPos = strstr(lpsStr, "/");
     if (lpsPos != NULL) {
         strncat(lpsHost, lpsPos, lpsPos - lpsStr);
@@ -80,11 +80,11 @@ VOID CHttpClient::SplitUri(LPSTR lpsUri, LPSTR lpsHost, LPSTR lpsResource, LPSTR
 VOID CHttpClient::SplitResource(LPSTR lpsResource, LPSTR lpsPath, LPSTR lpsFilename, LPSTR lpsExtension)
 {
     INT i,len,fileptr,extptr;
-
+	
 	strcpy(lpsPath, "");
 	strcpy(lpsFilename, "");
 	strcpy(lpsExtension, "");
-
+	
 	len = strlen(lpsResource);
 	if (len != 0) {
 		if (lpsResource[len - 1] == '/') {
@@ -102,7 +102,7 @@ VOID CHttpClient::SplitResource(LPSTR lpsResource, LPSTR lpsPath, LPSTR lpsFilen
 				strncat(lpsPath, lpsResource, fileptr);
 			} else
 				fileptr = 1;
-
+			
 			// Get filename and possibly extension
 			if (extptr != 0) {
 				strncat(lpsFilename, &lpsResource[fileptr], extptr - fileptr);
@@ -118,7 +118,7 @@ VOID CHttpClient::SplitResource(LPSTR lpsResource, LPSTR lpsPath, LPSTR lpsFilen
 VOID CHttpClient::ProcessRequest()
 {
     CHAR sStr[255];
-    CHAR sHost[255];
+	CHAR sHost[255];
     CHAR sResource[255];
     CHAR sParams[255];
 
@@ -126,7 +126,7 @@ VOID CHttpClient::ProcessRequest()
     switch (Parser.nMethodNo) {
 		case hmGET: {
 			SplitUri(Parser.sUri, sHost, sResource, sParams);
-
+			
 			// Default resource?
 			if (strlen(sResource) == 0) {
 				CIterator<LPSTR> *i = pConfiguration->GetDefaultResources()->CreateIterator();
@@ -145,7 +145,7 @@ VOID CHttpClient::ProcessRequest()
 				}
 			}
 			strcpy(sStr, pConfiguration->GetHttpBase());
-			strcat(sStr, sResource);
+	        strcat(sStr, sResource);
 			SendFile(sStr);
 			break;
 		}
@@ -166,7 +166,7 @@ VOID CHttpClient::SendFile(LPSTR lpsFilename)
       unsigned long long Big;
         struct {
             DWORD Low;
-            DWORD High;
+            DWORD High; 
         } u;
     } nTotalBytes;
 	DWORD nBytesToRead;
@@ -175,16 +175,16 @@ VOID CHttpClient::SendFile(LPSTR lpsFilename)
 
 	// Try to open file
     hFile = CreateFileA(lpsFilename,
-        GENERIC_READ,               // Open for reading
-        FILE_SHARE_READ,            // Share for reading
-        NULL,                       // No security
-        OPEN_EXISTING,              // Existing file only
-        FILE_ATTRIBUTE_NORMAL,      // Normal file
-        NULL);                      // No attr. template
-    if (hFile == INVALID_HANDLE_VALUE) {
+        GENERIC_READ,               // Open for reading 
+        FILE_SHARE_READ,            // Share for reading 
+        NULL,                       // No security 
+        OPEN_EXISTING,              // Existing file only 
+        FILE_ATTRIBUTE_NORMAL,      // Normal file 
+        NULL);                      // No attr. template 
+    if (hFile == INVALID_HANDLE_VALUE) { 
         // File not found
         Report("404 Not Found", HttpMsg404);
-        return;
+        return; 
     }
     // Get file size
     nTotalBytes.u.Low = GetFileSize(hFile, &nTotalBytes.u.High);
@@ -212,7 +212,7 @@ VOID CHttpClient::SendFile(LPSTR lpsFilename)
 		return;
 	}
 
-    SendText("HTTP/1.1 200 OK");
+	SendText("HTTP/1.1 200 OK");
     SendText("Server: ROSHTTPD");
     SendText("MIME-version: 1.0");
     SendText("Content-Type: text/plain");
@@ -251,7 +251,7 @@ VOID CHttpClient::SendFile(LPSTR lpsFilename)
 		// We can't send an error message here as we are in the process of sending a file.
 		// We have to terminate the connection instead
 		Close();
-
+	
 	// Free allocated memory
 	free(lpsBuffer);
 
@@ -260,11 +260,11 @@ VOID CHttpClient::SendFile(LPSTR lpsFilename)
 }
 
 // Report something to client
-VOID CHttpClient::Report(LPCSTR lpsCode, LPSTR lpsStr)
+VOID CHttpClient::Report(LPSTR lpsCode, LPSTR lpsStr)
 {
     CHAR sTmp[128];
     CHAR sTmp2[16];
-
+	
     strcpy(sTmp, "HTTP/1.1 ");
     strcat(sTmp, lpsCode);
     SendText(sTmp);
@@ -407,9 +407,9 @@ BOOL CHttpDaemon::Start()
 	SetPort(pConfiguration->GetPort());
 
 	Open();
-
+	
 	State = hsRunning;
-
+	
     return TRUE;
 }
 
@@ -449,7 +449,7 @@ VOID CHttpDaemon::OnAccept(LPCServerClientThread lpThread)
 VOID CHttpDaemonThread::Execute()
 {
 	MSG Msg;
-
+	
 	try {
 		Daemon = NULL;
 		Daemon = new CHttpDaemon;

reactos/apps/utils/net/roshttpd/include/config.h

@@ -0,0 +1,49 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS HTTP Daemon
+ * FILE:        include/config.h
+ */
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <list.h>
+#include <httpd.h>
+
+// General constants
+#define APP_DESCRIPTION _T("ReactOS HTTP Daemon")
+
+// Default configuration
+#define dcfgDescription     _T("Default configuration")
+#define dcfgMainBase        _T("C:\\roshttpd\\")
+#define dcfgHttpBase        "C:\\roshttpd\\HttpBase\\"
+#define dcfgDefaultResource "index.html"
+#define dcfgDefaultPort     80
+
+class CConfig {
+public:
+	CConfig();
+	~CConfig();
+	VOID Default();
+	VOID Clear();
+	BOOL Load();
+	BOOL Save();
+	LPWSTR GetMainBase();
+	VOID SetMainBase(LPWSTR lpwsMainBase);
+	LPSTR GetHttpBase();
+	VOID SetHttpBase(LPSTR lpsHttpBase);
+	CList<LPSTR>* GetDefaultResources();
+    USHORT GetPort();
+    VOID SetPort(USHORT wPort);
+private:
+	VOID Reset();
+	LPWSTR MainBase;
+	LPSTR HttpBase;
+	CList<LPSTR> DefaultResources;
+    USHORT Port;
+};
+typedef CConfig* LPCConfig;
+
+extern LPCConfig pConfiguration;
+extern LPCHttpDaemonThread pDaemonThread;
+
+#endif /* __CONFIG_H */

reactos/apps/utils/net/roshttpd/include/debug.h

@@ -0,0 +1,17 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS HTTP Daemon
+ * FILE:        include/debug.h
+ */
+#ifndef __DEBUG_H
+#define __DEBUG_H
+
+#include <stdio.h>
+
+#ifdef DBG
+#define DPRINT(x...)    printf(x)
+#else
+#define DPRINT(x...)
+#endif
+
+#endif /* __DEBUG_H */

reactos/apps/utils/net/roshttpd/include/httpd.h

@@ -6,8 +6,8 @@
 #ifndef __HTTPD_H
 #define __HTTPD_H
 
-#include <socket.h>
 #include <thread.h>
+#include <socket.h>
 #include <http.h>
 
 #define HTTPD_START     WM_USER + 1
@@ -37,7 +37,7 @@ public:
 	void SplitResource(const LPSTR lpsResource, LPSTR lpsPath, LPSTR lpsFilename, LPSTR lpsExtension);
     void ProcessRequest();
     void SendFile(const LPSTR lpsFilename);
-    void Report(LPCSTR lpsCode, const LPSTR lpsStr);
+    void Report(const LPSTR lpsCode, const LPSTR lpsStr);
 private:
 	BOOL bStop;
 	LPSTR lpsBuffer;

reactos/apps/utils/net/roshttpd/include/iterator.h

@@ -11,8 +11,6 @@
 template <class Item>
 class CIterator {
 public:
-	virtual ~CIterator()
-	{}
 	virtual VOID First() = 0;
 	virtual VOID Next() = 0;
 	virtual BOOL IsDone() const = 0;

reactos/apps/utils/net/roshttpd/include/socket.h

@@ -0,0 +1,141 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS HTTP Daemon
+ * FILE:        include/socket.h
+ */
+#ifndef __SOCKET_H
+#define __SOCKET_H
+#include <msvcrt/stdio.h>
+#include <windows.h>
+#include <winsock2.h>
+#include <thread.h>
+#include <list.h>
+#include <exception>
+#include <assert.h>
+
+#define MAX_PENDING_CONNECTS 4      // The backlog allowed for listen()
+
+VOID InitWinsock();
+VOID DeinitWinsock();
+
+class CSocket;
+class CClientSocket;
+class CServerClientSocket;
+class CServerClientThread;
+class CServerSocket;
+
+typedef CSocket* LPCSocket;
+typedef CClientSocket* LPCClientSocket;
+typedef CServerClientSocket* LPCServerClientSocket;
+typedef CServerClientThread* LPCServerClientThread;
+typedef CServerSocket* LPCServerSocket;
+
+class ESocket {
+public:
+	ESocket() { Description = NULL; }
+	ESocket(LPTSTR description)  { Description = description; }
+	LPTSTR what()  { return Description; }
+protected:
+	LPTSTR Description;
+};
+
+class ESocketWinsock : public ESocket {
+public:
+	ESocketWinsock(LPTSTR description) { Description = description; }
+};
+
+class ESocketDll : public ESocket {
+public:
+	ESocketDll(LPTSTR description) { Description = description; }
+};
+
+class ESocketOpen : public ESocket {
+public:
+	ESocketOpen(LPTSTR description) { Description = description; }
+};
+
+class ESocketClose : public ESocket {
+public:
+	ESocketClose(LPTSTR description) { Description = description; }
+};
+
+class ESocketSend : public ESocket {
+public:
+	ESocketSend(LPTSTR description) { Description = description; }
+};
+
+class ESocketReceive : public ESocket {
+public:
+	ESocketReceive(LPTSTR description) { Description = description; }
+};
+
+
+class CSocket {
+public:
+	CSocket();
+	virtual ~CSocket();
+	virtual SOCKET GetSocket();
+	virtual VOID SetSocket(SOCKET socket);
+	virtual SOCKADDR_IN GetSockAddrIn();
+	virtual VOID SetSockAddrIn(SOCKADDR_IN sockaddrin);
+	virtual VOID SetEvents(LONG lEvents);
+	virtual LONG GetEvents();
+    virtual VOID SetPort( UINT nPort) {};
+	virtual VOID Open();
+	virtual VOID Close();
+	virtual INT Transmit( LPSTR lpsBuffer,  UINT nLength) { return 0; };
+	virtual INT Receive(LPSTR lpsBuffer,  UINT nLength) { return 0; };
+	virtual INT SendText( LPSTR lpsStr) { return 0; };
+protected:
+	SOCKET Socket;
+	SOCKADDR_IN SockAddrIn;
+	WSAEVENT Event;
+	UINT Port;
+	BOOL Active;
+private:
+	LONG Events;
+};
+
+class CServerClientSocket : public CSocket {
+public:
+	CServerClientSocket() {};
+	CServerClientSocket(LPCServerSocket lpServerSocket);
+	CServerSocket *GetServerSocket();
+	virtual INT Transmit( LPSTR lpsBuffer,  UINT nLength);
+	virtual INT Receive(LPSTR lpsBuffer,  UINT nLength);
+	virtual INT SendText( LPSTR lpsText);
+	virtual VOID MessageLoop();
+	virtual VOID OnRead() {};
+	//virtual VOID OnWrite() {};
+	virtual VOID OnClose() {};
+protected:
+	LPCServerSocket ServerSocket;
+};
+
+class CServerClientThread : public CThread {
+public:
+	CServerClientThread() {};
+	CServerClientThread(CServerClientSocket *socket);
+	virtual ~CServerClientThread();
+protected:
+	CServerClientSocket *ClientSocket;
+};
+
+class CServerSocket : public CSocket {
+public:
+	CServerSocket();
+	virtual ~CServerSocket();
+	virtual VOID SetPort( UINT nPort);
+	virtual VOID Open();
+	virtual VOID Close();
+	virtual LPCServerClientSocket OnGetSocket(LPCServerSocket lpServerSocket);
+	virtual LPCServerClientThread OnGetThread(LPCServerClientSocket lpSocket);
+	virtual VOID OnAccept( LPCServerClientThread lpThread) {};
+	virtual VOID MessageLoop();
+	VOID InsertClient(LPCServerClientThread lpClient);
+	VOID RemoveClient(LPCServerClientThread lpClient);
+protected:
+	CList<LPCServerClientThread> Connections;
+};
+
+#endif /* __SOCKET_H */

reactos/apps/utils/net/route/route.c

@@ -0,0 +1,308 @@
+/* Poor man's route
+ *
+ * Supported commands:
+ *
+ * "print"
+ * "add" target ["mask" mask] gw ["metric" metric]
+ * "delete" target gw
+ *
+ * Goals:
+ *
+ * Flexible, simple
+ */
+
+#include <stdio.h>
+#include <windows.h>
+#include <iphlpapi.h>
+#include <winsock2.h>
+#include <tchar.h>
+
+#define IPBUF 17
+#define IN_ADDR_OF(x) *((struct in_addr *)&(x))
+
+static int Usage()
+{
+    _ftprintf( stderr,
+               _T("route usage:\n"
+                  "route print\n"
+                  "  prints the route table\n"
+                  "route add <target> [mask <mask>] <gw> [metric <m>]\n"
+                  "  adds a route\n"
+                  "route delete <target> <gw>\n"
+                  "  deletes a route\n") );
+    return 1;
+}
+
+static int PrintRoutes()
+{
+    PMIB_IPFORWARDTABLE IpForwardTable = NULL;
+    PIP_ADAPTER_INFO pAdapterInfo;
+    ULONG Size = 0;
+    DWORD Error = 0;
+    ULONG adaptOutBufLen = sizeof(IP_ADAPTER_INFO);
+    TCHAR DefGate[16];
+    TCHAR Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF];
+    unsigned int i;
+
+    /* set required buffer size */
+    pAdapterInfo = (IP_ADAPTER_INFO *) malloc( adaptOutBufLen );
+    if (pAdapterInfo == NULL)
+    {
+        Error = ERROR_NOT_ENOUGH_MEMORY;
+        goto Error;
+    }
+    if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW)
+    {
+       free (pAdapterInfo);
+       pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen);
+       if (pAdapterInfo == NULL)
+       {
+           Error = ERROR_NOT_ENOUGH_MEMORY;
+           goto Error;
+       }
+    }
+
+    if( (GetIpForwardTable( NULL, &Size, TRUE )) == ERROR_INSUFFICIENT_BUFFER )
+    {
+        if (!(IpForwardTable = malloc( Size )))
+        {
+            free(pAdapterInfo);
+            Error = ERROR_NOT_ENOUGH_MEMORY;
+            goto Error;
+        }
+    }
+
+    if (((Error = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) == NO_ERROR) &&
+        ((Error = GetIpForwardTable(IpForwardTable, &Size, TRUE)) == NO_ERROR))
+    {
+        _stprintf(DefGate,
+#if UNICODE
+                  _T("%hs"),
+#else
+                  _T("%s"),
+#endif
+                  pAdapterInfo->GatewayList.IpAddress.String);
+        _tprintf(_T("===========================================================================\n"));
+        _tprintf(_T("Interface List\n"));
+        /* FIXME - sort by the index! */
+        while (pAdapterInfo)
+        {
+            _tprintf(_T("0x%lu ........................... "
+#if UNICODE
+                        "%hs\n"),
+#else
+                        "%s\n"),
+#endif
+                     pAdapterInfo->Index, pAdapterInfo->Description);
+            pAdapterInfo = pAdapterInfo->Next;
+        }
+        _tprintf(_T("===========================================================================\n"));
+
+        _tprintf(_T("===========================================================================\n"));
+        _tprintf(_T("Active Routes:\n"));
+        _tprintf( _T("%-27s%-17s%-14s%-11s%-10s\n"),
+                  _T("Network Destination"),
+                  _T("Netmask"),
+                  _T("Gateway"),
+                  _T("Interface"),
+                  _T("Metric") );
+        for( i = 0; i < IpForwardTable->dwNumEntries; i++ )
+        {
+            _stprintf( Destination,
+#if UNICODE
+                       _T("%hs"),
+#else
+                       _T("%s"),
+#endif
+                       inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardDest) ) );
+            _stprintf( Netmask,
+#if UNICODE
+                       _T("%hs"),
+#else
+                       _T("%s"),
+#endif
+                       inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardMask) ) );
+            _stprintf( Gateway,
+#if UNICODE
+                       _T("%hs"),
+#else
+                       _T("%s"),
+#endif
+                       inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardNextHop) ) );
+
+            _tprintf( _T("%17s%17s%17s%16ld%9ld\n"),
+                      Destination,
+                      Netmask,
+                      Gateway,
+                      IpForwardTable->table[i].dwForwardIfIndex,
+                      IpForwardTable->table[i].dwForwardMetric1 );
+        }
+        _tprintf(_T("Default Gateway:%18s\n"), DefGate);
+        _tprintf(_T("===========================================================================\n"));
+        _tprintf(_T("Persistent Routes:\n"));
+
+        free(IpForwardTable);
+        free(pAdapterInfo);
+
+        return ERROR_SUCCESS;
+    }
+    else
+    {
+Error:
+        _ftprintf( stderr, _T("Route enumerate failed\n") );
+        return Error;
+    }
+}
+
+static int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd,
+              int argc, TCHAR **argv ) {
+    int i;
+#if UNICODE
+    char addr[16];
+#endif
+
+    if( argc > 1 )
+    {
+#if UNICODE
+        sprintf( addr, "%ls", argv[0] );
+        RowToAdd->dwForwardDest = inet_addr( addr );
+#else
+        RowToAdd->dwForwardDest = inet_addr( argv[0] );
+#endif
+    }
+    else
+        return FALSE;
+    for( i = 1; i < argc; i++ )
+    {
+        if( !_tcscmp( argv[i], _T("mask") ) )
+        {
+            i++; if( i >= argc ) return FALSE;
+#if UNICODE
+            sprintf( addr, "%ls", argv[i] );
+            RowToAdd->dwForwardDest = inet_addr( addr );
+#else
+            RowToAdd->dwForwardMask = inet_addr( argv[i] );
+#endif
+        }
+        else if( !_tcscmp( argv[i], _T("metric") ) )
+        {
+            i++;
+            if( i >= argc )
+                return FALSE;
+            RowToAdd->dwForwardMetric1 = _ttoi( argv[i] );
+        }
+        else
+        {
+#if UNICODE
+            sprintf( addr, "%ls", argv[i] );
+            RowToAdd->dwForwardNextHop = inet_addr( addr );
+#else
+            RowToAdd->dwForwardNextHop = inet_addr( argv[i] );
+#endif
+        }
+    }
+
+    return TRUE;
+}
+
+static int add_route( int argc, TCHAR **argv ) {
+    MIB_IPFORWARDROW RowToAdd = { 0 };
+    DWORD Error;
+
+    if( argc < 2 || !convert_add_cmd_line( &RowToAdd, argc, argv ) )
+    {
+        _ftprintf( stderr,
+                   _T("route add usage:\n"
+                      "route add <target> [mask <mask>] <gw> [metric <m>]\n"
+                      "  Adds a route to the IP route table.\n"
+                      "  <target> is the network or host to add a route to.\n"
+                      "  <mask>   is the netmask to use (autodetected if unspecified)\n"
+                      "  <gw>     is the gateway to use to access the network\n"
+                      "  <m>      is the metric to use (lower is preferred)\n") );
+        return 1;
+    }
+
+    if( (Error = CreateIpForwardEntry( &RowToAdd )) == ERROR_SUCCESS )
+        return 0;
+
+    _ftprintf( stderr, _T("Route addition failed\n") );
+    return Error;
+}
+
+static int del_route( int argc, TCHAR **argv )
+{
+    MIB_IPFORWARDROW RowToDel = { 0 };
+    DWORD Error;
+
+    if( argc < 2 || !convert_add_cmd_line( &RowToDel, argc, argv ) )
+    {
+        _ftprintf( stderr,
+                    _T("route delete usage:\n"
+                       "route delete <target> <gw>\n"
+                       "  Removes a route from the IP route table.\n"
+                       "  <target> is the network or host to add a route to.\n"
+                       "  <gw>     is the gateway to remove the route from.\n") );
+        return 1;
+    }
+
+    if( (Error = DeleteIpForwardEntry( &RowToDel )) == ERROR_SUCCESS )
+        return 0;
+
+    _ftprintf( stderr, _T("Route addition failed\n") );
+    return Error;
+}
+
+#if defined(_UNICODE) && defined(__GNUC__)
+static
+#endif
+int _tmain( int argc, TCHAR **argv )
+{
+    if( argc < 2 )
+        return Usage();
+    else if ( !_tcscmp( argv[1], _T("print") ) )
+        return PrintRoutes();
+    else if( !_tcscmp( argv[1], _T("add") ) )
+        return add_route( argc-2, argv+2 );
+    else if( !_tcscmp( argv[1], _T("delete") ) )
+        return del_route( argc-2, argv+2 );
+    else
+        return Usage();
+}
+
+#if defined(_UNICODE) && defined(__GNUC__)
+/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */
+int main( int argc, char **argv )
+{
+    WCHAR **argvW;
+    int i, j, Ret = 1;
+
+    if ((argvW = malloc(argc * sizeof(WCHAR*))))
+    {
+        /* convert the arguments */
+        for (i = 0, j = 0; i < argc; i++)
+        {
+            if (!(argvW[i] = malloc((strlen(argv[i]) + 1) * sizeof(WCHAR))))
+            {
+                j++;
+            }
+            swprintf(argvW[i], L"%hs", argv[i]);
+        }
+        
+        if (j == 0)
+        {
+            /* no error converting the parameters, call wmain() */
+            Ret = wmain(argc, argvW);
+        }
+        
+        /* free the arguments */
+        for (i = 0; i < argc; i++)
+        {
+            if (argvW[i])
+                free(argvW[i]);
+        }
+        free(argvW);
+    }
+    
+    return Ret;
+}
+#endif

reactos/apps/utils/net/route/route.xml

@@ -0,0 +1,11 @@
+<module name="route" type="win32cui" installbase="system32" installname="route.exe">
+	<include base="route">.</include>
+	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<library>iphlpapi</library>
+	<file>route.c</file>
+	<file>route.rc</file>
+</module>