Merge 13159:13510 from trunk
authorCasper Hornstrup <chorns@users.sourceforge.net>
Tue, 15 Feb 2005 21:24:19 +0000 (21:24 +0000)
committerCasper Hornstrup <chorns@users.sourceforge.net>
Tue, 15 Feb 2005 21:24:19 +0000 (21:24 +0000)
svn path=/branches/xmlbuildsystem/; revision=13590

117 files changed:
1  2 
reactos/Makefile
reactos/ReactOS.xml
reactos/apps/utils/net/directory.xml
reactos/apps/utils/net/ftp/ftp.xml
reactos/apps/utils/net/route/route.xml
reactos/boot/freeldr/freeldr/freeldr.xml
reactos/boot/freeldr/freeldr/freeldr_base.xml
reactos/boot/freeldr/freeldr/freeldr_base64k.xml
reactos/boot/freeldr/freeldr/freeldr_main.xml
reactos/boot/freeldr/freeldr/freeldr_startup.xml
reactos/drivers/fs/vfat/vfatfs.xml
reactos/drivers/net/tcpip/tcpip/main.c
reactos/drivers/video/videoprt/videoprt.xml
reactos/include/funcs.h
reactos/lib/cpl/desk/desk.xml
reactos/lib/crt/crt.xml
reactos/lib/crt/ctype/isalnum.c
reactos/lib/crt/ctype/isascii.c
reactos/lib/crt/ctype/iscntrl.c
reactos/lib/crt/ctype/isctype.c
reactos/lib/crt/ctype/isgraph.c
reactos/lib/crt/ctype/isprint.c
reactos/lib/crt/ctype/ispunct.c
reactos/lib/crt/ctype/isupper.c
reactos/lib/crt/stdio/sprintf.c
reactos/lib/crt/stdio/sscanf.c
reactos/lib/crt/stdio/vsprintf.c
reactos/lib/crtdll/crtdll.def
reactos/lib/crtdll/crtdll.xml
reactos/lib/directory.xml
reactos/lib/gdi32/gdi32.xml
reactos/lib/kbdes/kbdes.xml
reactos/lib/kernel32/misc/dllmain.c
reactos/lib/msimg32/msimg32.xml
reactos/lib/msvcrt/dllmain.c
reactos/lib/msvcrt/msvcrt.def
reactos/lib/msvcrt/msvcrt.xml
reactos/lib/ntdll/ntdll.xml
reactos/lib/ntdll/rtl/intrlck.c
reactos/lib/ole32/ole32.xml
reactos/lib/psapi/psapi.xml
reactos/lib/rossym/rossym.xml
reactos/lib/rtl/rtl.xml
reactos/lib/setupapi/setupapi.xml
reactos/lib/smdll/smdll.xml
reactos/lib/user32/user32.xml
reactos/ntoskrnl/cc/cacheman.c
reactos/ntoskrnl/cc/fs.c
reactos/ntoskrnl/cc/mdl.c
reactos/ntoskrnl/dbg/dbgctrl.c
reactos/ntoskrnl/dbg/errinfo.c
reactos/ntoskrnl/dbg/i386/i386-dis.c
reactos/ntoskrnl/dbg/kdb_keyboard.c
reactos/ntoskrnl/dbg/kdb_serial.c
reactos/ntoskrnl/dbg/user.c
reactos/ntoskrnl/ex/btree.c
reactos/ntoskrnl/ex/hashtab.c
reactos/ntoskrnl/ex/init.c
reactos/ntoskrnl/ex/napi.c
reactos/ntoskrnl/ex/rundown.c
reactos/ntoskrnl/ex/stree.c
reactos/ntoskrnl/ex/synch.c
reactos/ntoskrnl/ex/util.c
reactos/ntoskrnl/io/cleanup.c
reactos/ntoskrnl/io/deviface.c
reactos/ntoskrnl/io/flush.c
reactos/ntoskrnl/io/irq.c
reactos/ntoskrnl/io/lock.c
reactos/ntoskrnl/io/mailslot.c
reactos/ntoskrnl/io/npipe.c
reactos/ntoskrnl/io/pnpnotify.c
reactos/ntoskrnl/io/pnpreport.c
reactos/ntoskrnl/io/remlock.c
reactos/ntoskrnl/io/timer.c
reactos/ntoskrnl/io/wdm.c
reactos/ntoskrnl/kd/kdebug.c
reactos/ntoskrnl/ke/apc.c
reactos/ntoskrnl/ke/error.c
reactos/ntoskrnl/ke/event.c
reactos/ntoskrnl/ke/i386/bios.c
reactos/ntoskrnl/ke/i386/brkpoint.c
reactos/ntoskrnl/ke/i386/fpu.c
reactos/ntoskrnl/ke/i386/gdt.c
reactos/ntoskrnl/ke/i386/idt.c
reactos/ntoskrnl/ke/i386/ldt.c
reactos/ntoskrnl/ke/i386/thread.c
reactos/ntoskrnl/ke/i386/v86m.c
reactos/ntoskrnl/ke/kqueue.c
reactos/ntoskrnl/ldr/userldr.c
reactos/ntoskrnl/mkconfig.c
reactos/ntoskrnl/mm/elf32.c
reactos/ntoskrnl/mm/elf64.c
reactos/ntoskrnl/mm/i386/pfault.c
reactos/ntoskrnl/mm/paging.c
reactos/ntoskrnl/mm/physical.c
reactos/ntoskrnl/mm/verifier.c
reactos/ntoskrnl/ntoskrnl.xml
reactos/ntoskrnl/ob/security.c
reactos/ntoskrnl/ps/idle.c
reactos/ntoskrnl/ps/job.c
reactos/ntoskrnl/rtl/libsupp.c
reactos/ntoskrnl/rtl/string.c
reactos/ntoskrnl/rtl/strtok.c
reactos/ntoskrnl/se/lsa.c
reactos/ntoskrnl/tests/setup.c
reactos/ntoskrnl/tests/tests/VirtualMemory.c
reactos/services/directory.xml
reactos/services/umpnpmgr/umpnpmgr.xml
reactos/subsys/smss/smss.xml
reactos/subsys/win32k/main/dllmain.c
reactos/subsys/win32k/win32k.xml
reactos/tools/Makefile
reactos/tools/cabman/dfp.cxx
reactos/tools/cabman/dfp.h
reactos/tools/nci/makefile
reactos/tools/rbuild/makefile
reactos/tools/wmc/makefile

 -# $Id$
 -#
 -# Global makefile
 -#
 -
 -PATH_TO_TOP = .
 -
 -include $(PATH_TO_TOP)/rules.mak
 -include $(PATH_TO_TOP)/config
 -
 -#
 -# Define to build ReactOS external targets
 -#
 -ifeq ($(ROS_BUILD_EXT),)
 -ROS_BUILD_EXT = no
 -else
 -ROS_BUILD_EXT = yes
 +ifeq ($(HOST),mingw32-linux)
 +      EXEPOSTFIX =
 +      SEP = /
 +      host_gcc = gcc
 +      host_gpp = g++
 +      nmkdir = mkdir -p
 +else # mingw32-windows
 +      EXEPOSTFIX = .exe
 +      SEP = \$(EMPTY_VAR)
 +      host_gcc = gcc
 +      host_gpp = g++
 +      nmkdir = mkdir
  endif
  
 -ifneq ($(MINIMALDEPENDENCIES),no)
 -IMPLIB =
 -else
 -IMPLIB = implib
 -endif
 -
 -# Boot loaders
 -BOOT_LOADERS = freeldr
 -
 -# Required to run the system
 -COMPONENTS = ntoskrnl
 -
 -# Hardware Abstraction Layers
 -# halx86
 -HALS = halx86/up halx86/mp
 -
 -# Bus drivers
 -# acpi isapnp pci
 -BUS = acpi isapnp pci
 -
 -# Filesystem libraries
 -# vfatlib
 -LIB_FSLIB = vfatlib
 -
 -# Static libraries
 -LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids crt rossym wdmguid
 -
 -# Keyboard layout libraries
 -DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdse kbduk kbdus
 -
 -# Control Panels
 -DLLS_CPL = cpl
 -
 -# Shell extensions
 -DLLS_SHELLEXT = shellext
 -
 -# User mode libraries
 -# libpcap packet epsapi
 -DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \
 -      gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \
 -      msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \
 -      packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smdll snmpapi syssetup \
 -      twain unicode user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \
 -      urlmon shdocvw dinput dinput8 dxdiagn devenum dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT)
 -
 -SUBSYS = smss win32k csrss ntvdm
 -
 -#
 -# Select the server(s) you want to build
 -#
 -#SERVERS = posix linux os2
 -SERVERS = win32
 +default: Makefile.auto
  
 -# Driver support libraries
 -#bzip2 zlib oskittcp
 -DRIVERS_LIB = bzip2 oskittcp ip csq
 -
 -# Kernel mode device drivers
 -# Obsolete: ide
 -# beep blue floppy null parallel ramdrv serenum serial
 -DEVICE_DRIVERS = beep blue debugout null serial bootvid
 -
 -# Kernel mode input drivers
 -INPUT_DRIVERS = keyboard mouclass psaux sermouse
 -
 -# Kernel mode file system drivers
 -# cdfs ext2 fs_rec ms np vfat
 -FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs
 -
 -# Kernel mode networking drivers
 -# afd ndis npf tcpip tdi wshtcpip
 -NET_DRIVERS = afd ndis npf tcpip tdi wshtcpip
 -
 -# Kernel mode networking device drivers
 -# ne2000 pcnet
 -NET_DEVICE_DRIVERS = ne2000 pcnet
 -
 -# Kernel mode storage drivers
 -# atapi cdrom class2 disk scsiport
 -STORAGE_DRIVERS = atapi cdrom class2 disk floppy scsiport diskdump
 -
 -# System applications
 -# autochk cmd format services setup usetup welcome winlogon msiexec 
 -SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regedt32 regsvr32 \
 -  reporterror services setup taskmgr userinit usetup welcome vmwinst \
 -  winlogon regedit winefile notepad reactos
 -
 -# System services
 -SYS_SVC = rpcss eventlog umpnpmgr
 -
 -APPS = testsets utils
 -
 -
 -# External modules and (sub)systems for ReactOS
 -# rosapps posix os2 (requires c++) java (non-existant)
 -EXTERNALS = rosapps
 -
 -ifeq ($(ROS_BUILD_EXT),yes)
 -EXT_MODULES = $(EXTERNALS)
 +ifneq ($(ROS_INTERMEDIATE),)
 +$(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE)
  else
 -EXT_MODULES =
 +$(ROS_INTERMEDIATE)tools:
  endif
 +      ${nmkdir} $(ROS_INTERMEDIATE)tools
  
 -KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
 -      $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS USB_DRIVERS
 -
 -# Regression tests
 -REGTESTS = regtests
 -
 -all: bootstrap $(BOOT_LOADERS) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) \
 -     $(DLLS) $(SUBSYS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS) $(EXT_MODULES)
 -
 -bootstrap: dk implib iface_native
 -
 -depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends) msvcrt_depends $(DLLS:%=%_depends) \
 -         $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
 -         $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends)
 -
 -implib: hallib $(LIB_STATIC) $(LIB_FSLIB) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) \
 -        $(BUS:%=%_implib) $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) \
 -        msvcrt_implib $(DLLS:%=%_implib) $(KERNEL_DRIVERS:%=%_implib) \
 -        $(SUBSYS:%=%_implib) $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \
 -        $(EXT_MODULES:%=%_implib) $(REGTESTS:%=%_implib)
 -
 -test: $(BOOT_LOADERS:%=%_test) $(COMPONENTS:%=%_test) $(HALS:%=%_test) $(BUS:%=%_test) \
 -          $(LIB_STATIC:%=%_test) $(LIB_FSLIB:%=%_test) msvcrt_test $(DLLS:%=%_test) \
 -          $(KERNEL_DRIVERS:%=%_test) $(SUBSYS:%=%_test) \
 -          $(SYS_SVC:%=%_test) $(EXT_MODULES:%=%_test)
 -
 -clean: tools dk_clean iface_native_clean hallib_clean \
 -       $(BOOT_LOADERS:%=%_clean) $(HALS:%=%_clean) $(COMPONENTS:%=%_clean) \
 -       $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) \
 -       msvcrt_clean $(DLLS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) \
 -       $(SUBSYS:%=%_clean) $(SYS_APPS:%=%_clean) $(SYS_SVC:%=%_clean) \
 -       $(NET_APPS:%=%_clean) $(APPS:%=%_clean) $(EXT_MODULES:%=%_clean) \
 -       $(REGTESTS:%=%_clean) clean_after tools_clean
 -
 -clean_after:
 -      $(HALFVERBOSEECHO) [RM]      /include/roscfg.h
 -      $(RM) $(PATH_TO_TOP)/include/roscfg.h
 -
 -fastinstall: tools install_dirs install_before $(COMPONENTS:%=%_install) $(HALS:%=%_install) \
 -         $(BUS:%=%_install) $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_install) \
 -         msvcrt_install $(DLLS:%=%_install) $(KERNEL_DRIVERS:%=%_install) \
 -         $(SUBSYS:%=%_install) $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \
 -         $(APPS:%=%_install) $(EXT_MODULES:%=%_install) $(REGTESTS:%=%_install)
 -install: fastinstall registry
 -
 -FREELDR_DIR = boot/freeldr
 -
 -bootcd_directory_layout:
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)
 -      $(RMKDIR) $(BOOTCD_DIR)
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/bootdisk
 -      $(RMKDIR) $(BOOTCD_DIR)/bootdisk
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/loader
 -      $(RMKDIR) $(BOOTCD_DIR)/loader
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/reactos
 -      $(RMKDIR) $(BOOTCD_DIR)/reactos
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(BOOTCD_DIR)/reactos/system32
 -      $(RMKDIR) $(BOOTCD_DIR)/reactos/system32
 -
 -bootcd_bootstrap_files: $(BOOT_LOADERS:%=%_bootcd) $(COMPONENTS:%=%_bootcd) \
 -      $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) $(LIB_STATIC:%=%_bootcd) \
 -      $(LIB_FSLIB:%=%_bootcd) msvcrt_bootcd $(DLLS:%=%_bootcd) \
 -      $(KERNEL_DRIVERS:%=%_bootcd) $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd)
 -
 -bootcd_install_before:
 -      $(HALFVERBOSEECHO) [RLINE]   bootdata/autorun.inf to $(BOOTCD_DIR)/autorun.inf
 -      $(RLINE) bootdata/autorun.inf $(BOOTCD_DIR)/autorun.inf
 -      $(HALFVERBOSEECHO) [RLINE]   bootdata/readme.txt to $(BOOTCD_DIR)/readme.txt
 -      $(RLINE) bootdata/readme.txt $(BOOTCD_DIR)/readme.txt
 -      $(HALFVERBOSEECHO) [RLINE]   bootdata/hivecls.inf to $(BOOTCD_DIR)/reactos/hivecls.inf
 -      $(RLINE) bootdata/hivecls.inf $(BOOTCD_DIR)/reactos/hivecls.inf
 -      $(HALFVERBOSEECHO) [RLINE]   bootdata/hivedef.inf to $(BOOTCD_DIR)/reactos/hivedef.inf
 -      $(RLINE) bootdata/hivedef.inf $(BOOTCD_DIR)/reactos/hivedef.inf
 -      $(HALFVERBOSEECHO) [RLINE]   bootdata/hivesft.inf to $(BOOTCD_DIR)/reactos/hivesft.inf
 -      $(RLINE) bootdata/hivesft.inf $(BOOTCD_DIR)/reactos/hivesft.inf
 -      $(HALFVERBOSEECHO) [RLINE]   bootdata/hivesys.inf to $(BOOTCD_DIR)/reactos/hivesys.inf
 -      $(RLINE) bootdata/hivesys.inf $(BOOTCD_DIR)/reactos/hivesys.inf
 -      $(HALFVERBOSEECHO) [RLINE]   bootdata/txtsetup.sif to $(BOOTCD_DIR)/reactos/txtsetup.sif
 -      $(RLINE) bootdata/txtsetup.sif $(BOOTCD_DIR)/reactos/txtsetup.sif
 -      $(HALFVERBOSEECHO) [COPY]    bootdata/icon.ico to $(BOOTCD_DIR)/icon.ico
 -      $(CP) bootdata/icon.ico $(BOOTCD_DIR)/icon.ico
 -      $(HALFVERBOSEECHO) [COPY]    subsys/system/welcome/welcome.exe  to $(BOOTCD_DIR)/reactos/welcome.exe
 -      $(CP) subsys/system/welcome/welcome.exe $(BOOTCD_DIR)/reactos/welcome.exe
 -      $(HALFVERBOSEECHO) [COPY]    subsys/system/reactos/reactos.exe  to $(BOOTCD_DIR)/reactos/reactos.exe
 -      $(CP) subsys/system/reactos/reactos.exe $(BOOTCD_DIR)/reactos/reactos.exe
 -      $(HALFVERBOSEECHO) [COPY]    media/nls/c_1252.nls to $(BOOTCD_DIR)/reactos/c_1252.nls
 -      $(CP) media/nls/c_1252.nls $(BOOTCD_DIR)/reactos/c_1252.nls
 -      $(HALFVERBOSEECHO) [COPY]    media/nls/c_437.nls to $(BOOTCD_DIR)/reactos/c_437.nls
 -      $(CP) media/nls/c_437.nls $(BOOTCD_DIR)/reactos/c_437.nls
 -      $(HALFVERBOSEECHO) [COPY]    media/nls/l_intl.nls to $(BOOTCD_DIR)/reactos/l_intl.nls
 -      $(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls
 -      $(HALFVERBOSEECHO) [COPY]    media/drivers/etc/services to $(BOOTCD_DIR)/reactos/services
 -      $(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services
 -
 -bootcd_basic: bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
 -
 -bootcd_makecd:
 -      $(CABMAN) /C bootdata/packages/reactos.dff /L $(BOOTCD_DIR)/reactos /I
 -      $(CABMAN) /C bootdata/packages/reactos.dff /RC $(BOOTCD_DIR)/reactos/reactos.inf /L $(BOOTCD_DIR)/reactos /N
 -      - $(RM) $(BOOTCD_DIR)/reactos/reactos.inf
 -      $(HALFVERBOSEECHO) [CDMAKE]  ReactOS.iso
 -      $(CDMAKE) -v -m -b $(BOOTCD_DIR)/../isoboot.bin $(BOOTCD_DIR) REACTOS ReactOS.iso
 -
 -ubootcd_unattend:
 -      $(HALFVERBOSEECHO) [COPY]    bootdata/unattend.inf to $(BOOTCD_DIR)/reactos/unattend.inf
 -      $(CP) bootdata/unattend.inf $(BOOTCD_DIR)/reactos/unattend.inf
 -
 -livecd_directory_layout:
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)
 -      $(RMKDIR) $(LIVECD_DIR)
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/loader
 -      $(RMKDIR) $(LIVECD_DIR)/loader
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/reactos
 -      $(RMKDIR) $(LIVECD_DIR)/reactos
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/Profiles/All\ Users/Desktop
 -      $(RMKDIR) $(LIVECD_DIR)/Profiles/All\ Users/Desktop
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/Profiles/Default\ User/Desktop
 -      $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/Desktop
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents
 -      $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents
 -      $(HALFVERBOSEECHO) [COPY]    ${FREELDR_DIR}/bootsect/isoboot.bin to ${LIVECD_DIR}/../isoboot.bin
 -      $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${LIVECD_DIR}/../isoboot.bin
 -      $(HALFVERBOSEECHO) [COPY]    ${FREELDR_DIR}/freeldr/freeldr.sys to ${LIVECD_DIR}/loader/setupldr.sys
 -      $(CP) ${FREELDR_DIR}/freeldr/freeldr.sys ${LIVECD_DIR}/loader/setupldr.sys
 -      $(HALFVERBOSEECHO) [RLINE]   bootdata/livecd.ini to $(LIVECD_DIR)/freeldr.ini
 -      $(RLINE) bootdata/livecd.ini $(LIVECD_DIR)/freeldr.ini
 -
 -livecd_bootstrap_files:
 -      $(MAKE) LIVECD_INSTALL=yes fastinstall
 -
 -livecd_install_before:
 -      $(MKHIVE) bootdata $(LIVECD_DIR)/reactos/system32/config bootdata/livecd.inf bootdata/hiveinst.inf
 -
 -livecd_basic: livecd_directory_layout livecd_bootstrap_files livecd_install_before
 -
 -livecd_makecd:
 -      $(HALFVERBOSEECHO) [CDMAKE]  roslive.iso
 -      $(CDMAKE) -m -j -b $(LIVECD_DIR)/../isoboot.bin $(LIVECD_DIR) REACTOS roslive.iso
 -
 -bootcd: bootcd_basic bootcd_makecd
 -
 -ubootcd: bootcd_basic ubootcd_unattend bootcd_makecd
 -
 -livecd: livecd_basic livecd_makecd
 -
 -registry: tools
 -      $(MKHIVE) bootdata $(INSTALL_DIR)/system32/config bootdata/hiveinst.inf
 -
 -.PHONY: all bootstrap depends implib test clean clean_before install bootcd_directory_layout \
 -bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd ubootcd_unattend bootcd
 -
 -
 -#
 -# Boot Loaders
 -#
 -$(BOOT_LOADERS): %:
 -      $(MAKE) -C boot/$*
 -
 -$(BOOT_LOADERS:%=%_test): %_test:
 -      $(MAKE) -C boot/$* test
 -
 -$(BOOT_LOADERS:%=%_clean): %_clean:
 -      $(MAKE) -C boot/$* clean
 -
 -$(BOOT_LOADERS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C boot/$* bootcd
 -
 -.PHONY: $(BOOT_LOADERS) $(BOOT_LOADERS:%=%_test) $(BOOT_LOADERS:%=%_clean) \
 -        $(BOOT_LOADERS:%=%_bootcd)
 -
 -$(COMPONENTS): dk
 -
 -#
 -# System Applications
 -#
 -$(SYS_APPS): %: $(IMPLIB)
 -      $(MAKE) -C subsys/system/$*
 -
 -$(SYS_APPS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C subsys/system/$* implib
 -
 -$(SYS_APPS:%=%_test): %_test:
 -      $(MAKE) -C subsys/system/$* test
 -
 -$(SYS_APPS:%=%_clean): %_clean:
 -      $(MAKE) -C subsys/system/$* clean
 -
 -$(SYS_APPS:%=%_install): %_install:
 -      $(MAKE) -C subsys/system/$* install
 -
 -$(SYS_APPS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C subsys/system/$* bootcd
 -
 -.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_test) \
 -  $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_bootcd)
 -
 -#
 -# System Services
 -#
 -$(SYS_SVC): %: $(IMPLIB)
 -      $(MAKE) -C services/$*
 -
 -$(SYS_SVC:%=%_depends): %_depends:
 -      $(MAKE) -C services/$* depends
 -
 -$(SYS_SVC:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C services/$* implib
 -
 -$(SYS_SVC:%=%_test): %_test:
 -      $(MAKE) -C services/$* test
 -
 -$(SYS_SVC:%=%_clean): %_clean:
 -      $(MAKE) -C services/$* clean
 -
 -$(SYS_SVC:%=%_install): %_install:
 -      $(MAKE) -C services/$* install
 -
 -.PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) \
 -  $(SYS_SVC:%=%_test) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install)
 -
 -
 -#
 -# Applications
 -#
 -#
 -# Extra (optional system) Applications
 -#
 -$(APPS): %: $(IMPLIB)
 -      $(MAKE) -C apps/$*
 -
 -# Not needed
 -# $(APPS:%=%_implib): %_implib: dk
 -#     $(MAKE) --silent -C apps/$* implib
 -
 -$(APPS:%=%_test): %_test:
 -      $(MAKE) -C apps/$* test
 -
 -$(APPS:%=%_clean): %_clean:
 -      $(MAKE) -C apps/$* clean
 -
 -$(APPS:%=%_install): %_install:
 -      $(MAKE) -C apps/$* install
 -
 -.PHONY: $(APPS) $(APPS:%=%_test) $(APPS:%=%_clean) $(APPS:%=%_install)
 -
 -
 -#
 -# External ports and subsystem personalities
 -#
 -$(EXTERNALS): %:
 -      $(MAKE) -C $(ROOT_PATH)/$*
 -
 -$(EXTERNALS:%=%_depends): %_depends:
 -      $(MAKE) -C $(ROOT_PATH)/$* depends
 -
 -$(EXTERNALS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C $(ROOT_PATH)/$* implib
 -
 -$(EXTERNALS:%=%_clean): %_clean:
 -      $(MAKE) -C $(ROOT_PATH)/$* clean
 -
 -$(EXTERNALS:%=%_install): %_install:
 -      $(MAKE) -C $(ROOT_PATH)/$* install
 -
 -.PHONY: $(EXTERNALS) $(EXTERNALS:%=%_depends) $(EXTERNALS:%=%_implib) $(EXTERNALS:%=%_clean) $(EXTERNALS:%=%_install)
 -
 -
 -#
 -# Tools
 -#
 -tools:
 -      $(MAKE) --silent -C tools
 -
 -tools_implib:
 -      
 -
 -tools_test:
 -      
 -
 -tools_clean:
 -      $(MAKE) -C tools clean
 -
 -tools_install:
 -
 -.PHONY: tools tools_implib tools_test tools_clean tools_install
 -
 -
 -#
 -# Developer Kits
 -#
 -dk: tools
 -      @$(RMKDIR) $(DK_PATH)
 -      @$(RMKDIR) $(DDK_PATH)
 -      @$(RMKDIR) $(DDK_PATH_LIB)
 -      @$(RMKDIR) $(DDK_PATH_INC)
 -      @$(RMKDIR) $(SDK_PATH)
 -      @$(RMKDIR) $(SDK_PATH_LIB)
 -      @$(RMKDIR) $(SDK_PATH_INC)
 -      @$(RMKDIR) $(XDK_PATH)
 -      @$(RMKDIR) $(XDK_PATH_LIB)
 -#     @$(RMKDIR) $(XDK_PATH_INC)
 -
 -dk_implib:
 -
 -# WARNING! Be very sure that there are no important files
 -#          in these directories before cleaning them!!!
 -dk_clean:
 -      $(HALFVERBOSEECHO) [RM]      $(DDK_PATH_LIB)/*.a
 -      $(RM) $(DDK_PATH_LIB)/*.a
 -#     $(HALFVERBOSEECHO) [RM]      $(DDK_PATH_INC)/*.h
 -#     $(RM) $(DDK_PATH_INC)/*.h
 -      $(HALFVERBOSEECHO) [RMDIR]   $(DDK_PATH_LIB)
 -      $(RMDIR) $(DDK_PATH_LIB)
 -#     $(HALFVERBOSEECHO) [RMDIR]   $(DDK_PATH_INC)
 -#     $(RMDIR) $(DDK_PATH_INC)
 -      $(HALFVERBOSEECHO) [RM]      $(SDK_PATH_LIB)/*.a
 -      $(RM) $(SDK_PATH_LIB)/*.a
 -#     $(HALFVERBOSEECHO) [RM]      $(SDK_PATH_INC)/*.h
 -#     $(RM) $(SDK_PATH_INC)/*.h
 -      $(HALFVERBOSEECHO) [RMDIR]   $(SDK_PATH_LIB)
 -      $(RMDIR) $(SDK_PATH_LIB)
 -#     $(HALFVERBOSEECHO) [RMDIR]   $(SDK_PATH_INC)
 -#     $(RMDIR) $(SDK_PATH_INC)
 -      $(HALFVERBOSEECHO) [RM]      $(XDK_PATH_LIB)/*.a
 -      $(RM) $(XDK_PATH_LIB)/*.a
 -#     $(HALFVERBOSEECHO) [RM]      $(XDK_PATH_INC)/*.h
 -#     $(RM) $(XDK_PATH_INC)/*.h
 -      $(HALFVERBOSEECHO) [RMDIR]   $(XDK_PATH_LIB)
 -      $(RMDIR) $(XDK_PATH_LIB)
 -#     $(HALFVERBOSEECHO) [RMDIR]   $(XDK_PATH_INC)
 -#     $(RMDIR) $(XDK_PATH_INC)
 -
 -dk_install:
 -
 -.PHONY: dk dk_implib dk_clean dk_install
 -
 -
 -#
 -# Interfaces
 -#
 -iface_native:
 -      $(MAKE) --silent -C tools/nci
 -
 -iface_native_implib:
 -      
 -iface_native_test:
 -      
 -iface_native_clean:
 -      $(MAKE) --silent -C tools/nci clean
 -
 -iface_native_install:
 -
 -iface_native_bootcd:
 -
 -.PHONY: iface_native iface_native_implib iface_native_test iface_native_clean \
 -        iface_native_install iface_native_bootcd
 -
 -
 -#
 -# Bus driver rules
 -#
 -$(BUS): %: $(IMPLIB)
 -      $(MAKE) -C drivers/bus/$*
 -
 -$(BUS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C drivers/bus/$* implib
 -
 -$(BUS:%=%_test): %_test:
 -      $(MAKE) -C drivers/bus/$* test
 -
 -$(BUS:%=%_clean): %_clean:
 -      $(MAKE) -C drivers/bus/$* clean
 -
 -$(BUS:%=%_install): %_install:
 -      $(MAKE) -C drivers/bus/$* install
 -
 -$(BUS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C drivers/bus/$* bootcd
 -
 -.PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \
 -        $(BUS:%=%_install) $(BUS:%=%_bootcd)
 -
 -
 -#
 -# Driver support libraries rules
 -#
 -$(DRIVERS_LIB): %: $(IMPLIB)
 -      $(MAKE) -C drivers/lib/$*
 -
 -$(DRIVERS_LIB:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C drivers/lib/$* implib
 -
 -$(DRIVERS_LIB:%=%_test): %_test:
 -      $(MAKE) -C drivers/lib/$* test
 -
 -$(DRIVERS_LIB:%=%_clean): %_clean:
 -      $(MAKE) -C drivers/lib/$* clean
 -
 -$(DRIVERS_LIB:%=%_install): %_install:
 -      $(MAKE) -C drivers/lib/$* install
 -
 -$(DRIVERS_LIB:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C drivers/lib/$* bootcd
 -
 -.PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_test) \
 -        $(DRIVERS_LIB:%=%_clean) $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_bootcd)
 -
 -
 -#
 -# Device driver rules
 -#
 -$(DEVICE_DRIVERS): %: $(IMPLIB)
 -      $(MAKE) -C drivers/dd/$*
 -
 -$(DEVICE_DRIVERS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C drivers/dd/$* implib
 -
 -$(DEVICE_DRIVERS:%=%_test): %_test:
 -      $(MAKE) -C drivers/dd/$* test
 -
 -$(DEVICE_DRIVERS:%=%_clean): %_clean:
 -      $(MAKE) -C drivers/dd/$* clean
 -
 -$(DEVICE_DRIVERS:%=%_install): %_install:
 -      $(MAKE) -C drivers/dd/$* install
 -
 -$(DEVICE_DRIVERS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C drivers/dd/$* bootcd
 -
 -.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_test) \
 -        $(DEVICE_DRIVERS:%=%_clean) $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_bootcd)
 -
 -
 -#
 -# Video device driver rules
 -#
 -VIDEO_DRIVERS: $(IMPLIB)
 -      $(MAKE) -C drivers/video
 -
 -VIDEO_DRIVERS_implib: dk
 -      $(MAKE) --silent -C drivers/video implib
 -
 -VIDEO_DRIVERS_test:
 -      $(MAKE) -C drivers/video test
 -
 -VIDEO_DRIVERS_clean:
 -      $(MAKE) -C drivers/video clean
 -
 -VIDEO_DRIVERS_install:
 -      $(MAKE) -C drivers/video install
 -
 -VIDEO_DRIVERS_bootcd:
 -      $(MAKE) -C drivers/video bootcd
 -
 -.PHONY: VIDEO_DRIVERS VIDEO_DRIVERS_implib VIDEO_DRIVERS_test\
 -        VIDEO_DRIVERS_clean VIDEO_DRIVERS_install VIDEO_DRIVERS_bootcd
 -
 -#
 -# USB device driver rules
 -#
 -USB_DRIVERS: $(IMPLIB)
 -      $(MAKE) -C drivers/usb
 -
 -USB_DRIVERS_implib: dk
 -      $(MAKE) --silent -C drivers/usb implib
 -
 -USB_DRIVERS_test:
 -      $(MAKE) -C drivers/usb test
 -
 -USB_DRIVERS_clean:
 -      $(MAKE) -C drivers/usb clean
 -
 -USB_DRIVERS_install:
 -      $(MAKE) -C drivers/usb install
 -
 -USB_DRIVERS_bootcd:
 -      $(MAKE) -C drivers/usb bootcd
 -
 -.PHONY: USB_DRIVERS USB_DRIVERS_implib USB_DRIVERS_test\
 -        USB_DRIVERS_clean USB_DRIVERS_install USB_DRIVERS_bootcd
 -
 -
 -#
 -# Input driver rules
 -#
 -$(INPUT_DRIVERS): %: $(IMPLIB)
 -      $(MAKE) -C drivers/input/$*
 -
 -$(INPUT_DRIVERS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C drivers/input/$* implib
 -
 -$(INPUT_DRIVERS:%=%_test): %_test:
 -      $(MAKE) -C drivers/input/$* test
 -
 -$(INPUT_DRIVERS:%=%_clean): %_clean:
 -      $(MAKE) -C drivers/input/$* clean
 -
 -$(INPUT_DRIVERS:%=%_install): %_install:
 -      $(MAKE) -C drivers/input/$* install
 -
 -$(INPUT_DRIVERS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C drivers/input/$* bootcd
 -
 -.PHONY: $(INPUT_DRIVERS) $(INPUT_DRIVERS:%=%_implib) $(INPUT_DRIVERS:%=%_test) \
 -        $(INPUT_DRIVERS:%=%_clean) $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_bootcd)
 -
 -#
 -# Filesystem driver rules
 -#
 -$(FS_DRIVERS): %: $(IMPLIB)
 -      $(MAKE) -C drivers/fs/$*
 -
 -$(FS_DRIVERS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C drivers/fs/$* implib
 -
 -$(FS_DRIVERS:%=%_test): %_test:
 -      $(MAKE) -C drivers/fs/$* test
 -
 -$(FS_DRIVERS:%=%_clean): %_clean:
 -      $(MAKE) -C drivers/fs/$* clean
 -
 -$(FS_DRIVERS:%=%_install): %_install:
 -      $(MAKE) -C drivers/fs/$* install
 -
 -$(FS_DRIVERS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C drivers/fs/$* bootcd
 -
 -.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_implib) $(FS_DRIVERS:%=%_test) \
 -        $(FS_DRIVERS:%=%_clean) $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_bootcd)
 -
 -
 -#
 -# Network driver rules
 -#
 -$(NET_DRIVERS): %: $(IMPLIB)
 -      $(MAKE) -C drivers/net/$*
 -
 -$(NET_DRIVERS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C drivers/net/$* implib
 -
 -$(NET_DRIVERS:%=%_test): %_test:
 -      $(MAKE) -C drivers/net/$* test
 -
 -$(NET_DRIVERS:%=%_clean): %_clean:
 -      $(MAKE) -C drivers/net/$* clean
 -
 -$(NET_DRIVERS:%=%_install): %_install:
 -      $(MAKE) -C drivers/net/$* install
 -
 -$(NET_DRIVERS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C drivers/net/$* bootcd
 -
 -.PHONY: $(NET_DRIVERS) $(NET_DRIVERS:%=%_implib) $(NET_DRIVERS:%=%_test) \
 -        $(NET_DRIVERS:%=%_clean) $(NET_DRIVERS:%=%_install) $(NET_DRIVERS:%=%_bootcd)
 -
 -
 -#
 -# Network device driver rules
 -#
 -$(NET_DEVICE_DRIVERS): %: $(IMPLIB)
 -      $(MAKE) -C drivers/net/dd/$*
 -
 -$(NET_DEVICE_DRIVERS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C drivers/net/dd/$* implib
 -
 -$(NET_DEVICE_DRIVERS:%=%_test): %_test:
 -      $(MAKE) -C drivers/net/dd/$* test
 -
 -$(NET_DEVICE_DRIVERS:%=%_clean): %_clean:
 -      $(MAKE) -C drivers/net/dd/$* clean
 -
 -$(NET_DEVICE_DRIVERS:%=%_install): %_install:
 -      $(MAKE) -C drivers/net/dd/$* install
 -
 -$(NET_DEVICE_DRIVERS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C drivers/net/dd/$* bootcd
 -
 -.PHONY: $(NET_DEVICE_DRIVERS) $(NET_DEVICE_DRIVERS:%=%_clean) \
 -        $(NET_DEVICE_DRIVERS:%=%_implib) $(NET_DEVICE_DRIVERS:%=%_test) \
 -        $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_bootcd)
 -
 -
 -#
 -# storage driver rules
 -#
 -$(STORAGE_DRIVERS): %: $(IMPLIB)
 -      $(MAKE) -C drivers/storage/$*
 -
 -$(STORAGE_DRIVERS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C drivers/storage/$* implib
 -
 -$(STORAGE_DRIVERS:%=%_test): %_test:
 -      $(MAKE) -C drivers/storage/$* test
 -
 -$(STORAGE_DRIVERS:%=%_clean): %_clean:
 -      $(MAKE) -C drivers/storage/$* clean
 -
 -$(STORAGE_DRIVERS:%=%_install): %_install:
 -      $(MAKE) -C drivers/storage/$* install
 -
 -$(STORAGE_DRIVERS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C drivers/storage/$* bootcd
 -
 -.PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) \
 -        $(STORAGE_DRIVERS:%=%_implib) $(STORAGE_DRIVERS:%=%_test) \
 -        $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_bootcd)
 -
 -
 -#
 -# Required system components
 -#
 -ntoskrnl: bootstrap
 -      $(MAKE) -C ntoskrnl
 -
 -ntoskrnl_implib: dk
 -      $(MAKE) --silent -C ntoskrnl implib
 -
 -ntoskrnl_test:
 -      $(MAKE) -C ntoskrnl test
 -
 -ntoskrnl_clean:
 -      $(MAKE) -C ntoskrnl clean
 -
 -ntoskrnl_install:
 -      $(MAKE) -C ntoskrnl install
 -
 -ntoskrnl_bootcd:
 -      $(MAKE) -C ntoskrnl bootcd
 -
 -.PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_test \
 -        ntoskrnl_clean ntoskrnl_install ntoskrnl_bootcd
 -
 -
 -#
 -# Hardware Abstraction Layer import library
 -#
 -hallib: $(PATH_TO_TOP)/include/roscfg.h ntoskrnl_implib
 -      $(MAKE) --silent -C hal/hal
 -
 -hallib_implib: dk ntoskrnl_implib
 -      $(MAKE) --silent -C hal/hal implib
 -
 -hallib_test:
 -      $(MAKE) -C hal/hal test
 -
 -hallib_clean:
 -      $(MAKE) -C hal/hal clean
 -
 -hallib_install:
 -      $(MAKE) -C hal/hal install
 -
 -hallib_bootcd:
 -      $(MAKE) -C hal/hal bootcd
 -
 -.PHONY: hallib hallib_implib hallib_test hallib_clean \
 -        hallib_install hallib_bootcd
 -
 -
 -#
 -# Hardware Abstraction Layers
 -#
 -ifeq ($(CONFIG_SMP),1)
 -halx86: halx86/mp
 -else
 -halx86: halx86/up
 +ifneq ($(ROS_INTERMEDIATE),)
 +$(ROS_INTERMEDIATE):
 +      ${nmkdir} $(ROS_INTERMEDIATE)
  endif
  
- Makefile.auto: rmkdir buildno wmc rbuild
 -$(HALS): %: $(IMPLIB)
 -      $(MAKE) -C hal/$*
 -
 -$(HALS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C hal/$* implib
 -
 -$(HALS:%=%_test): %_test:
 -      $(MAKE) -C hal/$* test
 -
 -$(HALS:%=%_clean): %_clean:
 -      $(MAKE) -C hal/$* clean
 -
 -$(HALS:%=%_install): %_install:
 -      $(MAKE) -C hal/$* install
 -
 -$(HALS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C hal/$* bootcd
 -
 -.PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_test) \
 -        $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_bootcd)
 -
 -
 -#
 -# File system libraries
 -#
 -$(LIB_FSLIB): %: dk
 -      $(MAKE) -C lib/fslib/$*
 -
 -$(LIB_FSLIB:%=%_depends): %_depends:
 -      $(MAKE) -C lib/fslib/$* depends
 -
 -$(LIB_FSLIB:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C lib/fslib/$* implib
 -
 -$(LIB_FSLIB:%=%_test): %_test:
 -      $(MAKE) -C lib/fslib/$* test
 -
 -$(LIB_FSLIB:%=%_clean): %_clean:
 -      $(MAKE) -C lib/fslib/$* clean
 -
 -$(LIB_FSLIB:%=%_install): %_install:
 -      $(MAKE) -C lib/fslib/$* install
 -
 -$(LIB_FSLIB:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C lib/fslib/$* bootcd
 -
 -.PHONY: $(LIB_FSLIB) $(LIB_FSLIB:%=%_depends) $(LIB_FSLIB:%=%_implib) \
 -        $(LIB_FSLIB:%=%_test) $(LIB_FSLIB:%=%_clean) \
 -        $(LIB_FSLIB:%=%_install) $(LIB_FSLIB:%=%_bootcd)
 -
 -
 -#
 -# Static libraries
 -#
 -$(LIB_STATIC): %: dk
 -      $(MAKE) --silent -C lib/$*
 -
 -$(LIB_STATIC:%=%_depends): %_depends:
 -      $(MAKE) -C lib/string depends
 -
 -$(LIB_STATIC:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C lib/$* implib
 -
 -$(LIB_STATIC:%=%_test): %_test:
 -      $(MAKE) -C lib/$* test
 -
 -$(LIB_STATIC:%=%_clean): %_clean:
 -      $(MAKE) -C lib/$* clean
 -
 -$(LIB_STATIC:%=%_install): %_install:
 -      $(MAKE) -C lib/$* install
 -
 -$(LIB_STATIC:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C lib/$* bootcd
 -
 -.PHONY: $(LIB_STATIC) $(LIB_STATIC:%=%_depends) $(LIB_STATIC:%=%_implib) \
 -        $(LIB_STATIC:%=%_test) $(LIB_STATIC:%=%_clean) \
 -        $(LIB_STATIC:%=%_install) $(LIB_STATIC:%=%_bootcd)
 -
 -
 -#
 -# MSVCRT is seperate since CRTDLL depend on this
 -#
 -msvcrt: $(IMPLIB)
 -      $(MAKE) -C lib/msvcrt
 -
 -msvcrt_depends:
 -      $(MAKE) -C lib/msvcrt depends
 -
 -msvcrt_implib: dk
 -      $(MAKE) --silent -C lib/msvcrt implib
 -
 -msvcrt_test:
 -      $(MAKE) -C lib/msvcrt test
 -
 -msvcrt_clean:
 -      $(MAKE) -C lib/msvcrt clean
 -
 -msvcrt_install:
 -      $(MAKE) -C lib/msvcrt install
 -
 -msvcrt_bootcd:
 -      $(MAKE) -C lib/msvcrt bootcd
 -
 -.PHONY: msvcrt msvcrt_depends msvcrt_implib msvcrt_test \
 -        msvcrt_clean msvcrt_install msvcrt_bootcd
 -
 -
 -#
 -# DLLs
 -#
 -$(DLLS): %: $(IMPLIB) msvcrt
 -      $(MAKE) -C lib/$*
 -
 -$(DLLS:%=%_depends): %_depends:
 -      $(MAKE) -C lib/$* depends
 -
 -$(DLLS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C lib/$* implib
 -
 -$(DLLS:%=%_test): %_test:
 -      $(MAKE) -C lib/$* test
 -
 -$(DLLS:%=%_clean): %_clean:
 -      $(MAKE) -C lib/$* clean
 -
 -$(DLLS:%=%_install): %_install:
 -      $(MAKE) -C lib/$* install
 -
 -$(DLLS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C lib/$* bootcd
 -
 -.PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(DLLS:%=%_test) \
 -        $(DLLS:%=%_clean) $(DLLS:%=%_install) $(DLLS:%=%_bootcd)
 -
 -
 -#
 -# Subsystem support modules
 -#
 -$(SUBSYS): %: $(IMPLIB)
 -      $(MAKE) -C subsys/$*
 -
 -$(SUBSYS:%=%_depends): %_depends:
 -      $(MAKE) -C subsys/$* depends
 -
 -$(SUBSYS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C subsys/$* implib
 -
 -$(SUBSYS:%=%_test): %_test:
 -      $(MAKE) -C subsys/$* test
 -
 -$(SUBSYS:%=%_clean): %_clean:
 -      $(MAKE) -C subsys/$* clean
 -
 -$(SUBSYS:%=%_install): %_install:
 -      $(MAKE) -C subsys/$* install
 -
 -$(SUBSYS:%=%_bootcd): %_bootcd:
 -      $(MAKE) -C subsys/$* bootcd
 -
 -.PHONY: $(SUBSYS) $(SUBSYS:%=%_depends) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_test) \
 -        $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) $(SUBSYS:%=%_bootcd)
 -
 -#
 -# Regression testsuite
 -#
 -
 -$(REGTESTS): %: $(IMPLIB)
 -      $(MAKE) --silent -C regtests
 -
 -$(REGTESTS:%=%_implib): %_implib: dk
 -      $(MAKE) --silent -C regtests implib
 -
 -$(REGTESTS:%=%_clean): %_clean:
 -      $(MAKE) -C regtests clean
 -
 -$(REGTESTS:%=%_install): %_install:
 -      $(MAKE) -C regtests install
 -
 -.PHONY: $(REGTESTS) $(REGTESTS:%=%_depends) $(SUBSYS:%=%_clean) $(REGTESTS:%=%_install)
 -
 -
 -#
 -# Create an installation
 -#
 -
 -install_clean:
 -      $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/system32/drivers/*.*
 -      $(RM) $(INSTALL_DIR)/system32/drivers/*.*
 -      $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/system32/config/*.*
 -      $(RM) $(INSTALL_DIR)/system32/config/*.*
 -      $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/system32/*.*
 -      $(RM) $(INSTALL_DIR)/system32/*.*
 -      $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/symbols/*.*
 -      $(RM) $(INSTALL_DIR)/symbols/*.*
 -      $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/media/fonts/*.*
 -      $(RM) $(INSTALL_DIR)/media/fonts/*.*
 -      $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/media/*.*
 -      $(RM) $(INSTALL_DIR)/media/*.*
 -      $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/inf/*.*
 -      $(RM) $(INSTALL_DIR)/inf/*.*
 -      $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/bin/*.*
 -      $(RM) $(INSTALL_DIR)/bin/*.*
 -      $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/system32/drivers
 -      $(RMDIR) $(INSTALL_DIR)/system32/drivers
 -      $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/system32/config
 -      $(RMDIR) $(INSTALL_DIR)/system32/config
 -      $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/system32
 -      $(RMDIR) $(INSTALL_DIR)/system32
 -      $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/symbols
 -      $(RMDIR) $(INSTALL_DIR)/symbols
 -      $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/media/fonts
 -      $(RMDIR) $(INSTALL_DIR)/media/fonts
 -      $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/media
 -      $(RMDIR) $(INSTALL_DIR)/media
 -      $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/inf
 -      $(RMDIR) $(INSTALL_DIR)/inf
 -      $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/bin
 -      $(RMDIR) $(INSTALL_DIR)/bin
 -      $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)
 -      $(RMDIR) $(INSTALL_DIR)
 -
 -install_dirs:
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)
 -      $(RMKDIR) $(INSTALL_DIR)
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/bin
 -      $(RMKDIR) $(INSTALL_DIR)/bin
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/inf
 -      $(RMKDIR) $(INSTALL_DIR)/inf
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/media
 -      $(RMKDIR) $(INSTALL_DIR)/media
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/media/fonts
 -      $(RMKDIR) $(INSTALL_DIR)/media/fonts
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/symbols
 -      $(RMKDIR) $(INSTALL_DIR)/symbols
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32
 -      $(RMKDIR) $(INSTALL_DIR)/system32
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32/config
 -      $(RMKDIR) $(INSTALL_DIR)/system32/config
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32/drivers
 -      $(RMKDIR) $(INSTALL_DIR)/system32/drivers
 -      $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32/drivers/etc
 -      $(RMKDIR) $(INSTALL_DIR)/system32/drivers/etc
 -
 -install_before:
 -      $(HALFVERBOSEECHO) [INSTALL] media/inf to $(INSTALL_DIR)/inf
 -      $(CP) media/inf $(INSTALL_DIR)/inf
 -      $(HALFVERBOSEECHO) [INSTALL] media/fonts to $(INSTALL_DIR)/media/fonts
 -      $(CP) media/fonts $(INSTALL_DIR)/media/fonts
 -      $(HALFVERBOSEECHO) [INSTALL] media/nls to $(INSTALL_DIR)/system32
 -      $(CP) media/nls $(INSTALL_DIR)/system32
 -      $(HALFVERBOSEECHO) [INSTALL] media/nls/c_1252.nls to $(INSTALL_DIR)/system32/ansi.nls
 -      $(CP) media/nls/c_1252.nls $(INSTALL_DIR)/system32/ansi.nls
 -      $(HALFVERBOSEECHO) [INSTALL] media/nls/c_437.nls to $(INSTALL_DIR)/system32/oem.nls
 -      $(CP) media/nls/c_437.nls $(INSTALL_DIR)/system32/oem.nls
 -      $(HALFVERBOSEECHO) [INSTALL] media/nls/l_intl.nls to $(INSTALL_DIR)/system32/casemap.nls
 -      $(CP) media/nls/l_intl.nls $(INSTALL_DIR)/system32/casemap.nls
 -      $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/services to $(INSTALL_DIR)/system32/drivers/etc/services
 -      $(CP) media/drivers/etc/services $(INSTALL_DIR)/system32/drivers/etc/services
 -
 -.PHONY: install_clean install_dirs install_before
 -
 -
 -etags:
 -      find . -name "*.[ch]" -print | etags --language=c -
 -
 -
 -docu:
 -      echo generating ReactOS NTOSKRNL documentation ...
 -      $(MAKE) -C ntoskrnl docu
 -
 -      echo generating ReactOS drivers documentation ...
 -      $(MAKE) -C drivers docu
 -
 -      echo generating ReactOS NTDLL documentation ...
 -      $(MAKE) -C lib/ntdll docu
 -
 -      echo generating ReactOS Freetype documentation ...
 -      $(MAKE) -C lib/freetype docu
 -
 -      echo generating ReactOS libs documentation ...
 -      $(MAKE) -C lib docu
 -
 -      echo generating ReactOS WIN32K documentation ...
 -      $(MAKE) -C subsys/win32k docu
 -
 -      echo generating ReactOS apps+tools documentation ...
 -      $(MAKE) -C apps docu
++include tools/Makefile
++-include Makefile.auto
 -      echo generating ReactOS explorer documentation ...
 -      $(MAKE) -C subsys/system/explorer full-docu
++Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(RBUILD_TARGET)
 +      tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw
- #     $(MAKE) $(MAKECMDGOALS)
++      $(MAKE) $(MAKECMDGOALS)
  
- init:: \
 -      echo generating remaining ReactOS documentation ...
 -      doxygen Doxyfile
++init: \
 +      include$(SEP)reactos$(SEP)bugcodes.h \
 +      ntoskrnl$(SEP)bugcodes.rc \
 +      include$(SEP)reactos$(SEP)errcodes.h \
 +      lib$(SEP)kernel32$(SEP)errcodes.rc
  
- include$(SEP)reactos$(SEP)bugcodes.h ntoskrnl$(SEP)bugcodes.rc: ntoskrnl$(SEP)ntoskrnl.mc
-       $(WMC_TARGET) -H include$(SEP)reactos$(SEP)bugcodes.h -o ntoskrnl$(SEP)bugcodes.rc bugcodes$(SEP)ntoskrnl.mc
 -.PHONY: docu
++include$(SEP)reactos$(SEP)bugcodes.h ntoskrnl$(SEP)bugcodes.rc: $(WMC_TARGET) ntoskrnl$(SEP)ntoskrnl.mc
++      $(WMC_TARGET) -H include$(SEP)reactos$(SEP)bugcodes.h -o ntoskrnl$(SEP)bugcodes.rc ntoskrnl$(SEP)ntoskrnl.mc
  
- include$(SEP)reactos$(SEP)errcodes.h lib$(SEP)kernel32$(SEP)errcodes.rc: lib$(SEP)kernel32$(SEP)kernel32.mc
 -include $(TOOLS_PATH)/config.mk
++include$(SEP)reactos$(SEP)errcodes.h lib$(SEP)kernel32$(SEP)errcodes.rc: $(WMC_TARGET) lib$(SEP)kernel32$(SEP)kernel32.mc
 +      $(WMC_TARGET) -H include$(SEP)reactos$(SEP)errcodes.h -o lib$(SEP)kernel32$(SEP)errcodes.rc lib$(SEP)kernel32$(SEP)kernel32.mc
- include tools/Makefile
- include tools/rbuild/makefile
- #-include Makefile.auto
index 019f3a9,0000000..954593c
mode 100644,000000..100644
--- /dev/null
@@@ -1,62 -1,0 +1,54 @@@
-       <directory name="iface">\r
-               <directory name="addsys">\r
-                       <xi:include href="iface/addsys/addsys.xml" />\r
-               </directory>\r
-               <directory name="native">\r
-                       <xi:include href="iface/native/genntdll.xml" />\r
-               </directory>\r
-       </directory>\r
 +<?xml version="1.0"?>\r
 +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">\r
 +<project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">\r
 +      <xi:include href="config.xml">\r
 +              <xi:fallback>\r
 +                      <xi:include href="config.template.xml" />\r
 +              </xi:fallback>\r
 +      </xi:include>\r
 +\r
 +      <define name="_M_IX86" />\r
 +      <if property="DBG" value="1">\r
 +              <define name="DBG" value="1" />\r
 +              <property name="DBG_OR_KDBG" value="true" />\r
 +      </if>\r
 +      <if property="KDBG" value="1">\r
 +              <define name="KDBG" value="1" />\r
 +              <property name="DBG_OR_KDBG" value="true" />\r
 +      </if>\r
 +\r
 +      <include>include</include>\r
 +      <include>w32api/include</include>\r
 +      <include>w32api/include/ddk</include>\r
 +\r
 +      <directory name="apps">\r
 +              <xi:include href="apps/directory.xml" />\r
 +      </directory>\r
 +      <directory name="boot">\r
 +              <xi:include href="boot/boot.xml" />\r
 +      </directory>\r
 +      <directory name="drivers">\r
 +              <xi:include href="drivers/directory.xml" />\r
 +      </directory>\r
 +      <directory name="tools">\r
 +              <xi:include href="tools/tools.xml" />\r
 +      </directory>\r
 +      <directory name="hal">\r
 +              <xi:include href="hal/directory.xml" />\r
 +      </directory>\r
 +      <directory name="lib">\r
 +              <xi:include href="lib/directory.xml" />\r
 +      </directory>\r
 +      <directory name="ntoskrnl">\r
 +              <xi:include href="ntoskrnl/ntoskrnl.xml" />\r
 +      </directory>\r
 +      <directory name="services">\r
 +              <xi:include href="services/directory.xml" />\r
 +      </directory>\r
 +      <directory name="subsys">\r
 +              <xi:include href="subsys/directory.xml" />\r
 +      </directory>\r
 +\r
 +      <module name="bootcd" type="iso">\r
 +      </module>\r
 +</project>\r
index 57b9d6a,0000000..a0b6320
mode 100644,000000..100644
--- /dev/null
@@@ -1,21 -1,0 +1,27 @@@
 +<directory name="arp">\r
 +      <xi:include href="arp/arp.xml" />\r
 +</directory>\r
 +<directory name="finger">\r
 +      <xi:include href="finger/finger.xml" />\r
 +</directory>\r
++<directory name="ftp">\r
++      <xi:include href="ftp/ftp.xml" />\r
++</directory>\r
 +<directory name="ipconfig">\r
 +      <xi:include href="ipconfig/ipconfig.xml" />\r
 +</directory>\r
 +<directory name="netstat">\r
 +      <xi:include href="netstat/netstat.xml" />\r
 +</directory>\r
 +<directory name="ping">\r
 +      <xi:include href="ping/ping.xml" />\r
 +</directory>\r
++<directory name="route">\r
++      <xi:include href="route/route.xml" />\r
++</directory>\r
 +<directory name="telnet">\r
 +      <xi:include href="telnet/telnet.xml" />\r
 +</directory>\r
 +<directory name="whois">\r
 +      <xi:include href="whois/whois.xml" />\r
 +</directory>\r
index 0000000,0000000..c5a07d3
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,15 @@@
++<module name="ftp" type="win32cui">\r
++      <include base="ftp">.</include>\r
++      <define name="__USE_W32API" />\r
++      <library>kernel32</library>\r
++      <library>ws2_32</library>\r
++      <library>iphlpapi</library>\r
++      <file>cmds.c</file>\r
++      <file>cmdtab.c</file>\r
++      <file>domacro.c</file>\r
++      <file>fake.c</file>\r
++      <file>ftp.c</file>\r
++      <file>main.c</file>\r
++      <file>ruserpass.c</file>\r
++      <file>ftp.rc</file>\r
++</module>\r
index 0000000,0000000..c1a435e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,8 @@@
++<module name="route" type="win32cui">\r
++      <include base="route">.</include>\r
++      <library>kernel32</library>\r
++      <library>ws2_32</library>\r
++      <library>iphlpapi</library>\r
++      <file>route.c</file>\r
++      <file>route.rc</file>\r
++</module>\r
index 563d99d,0000000..eaa46f3
mode 100644,000000..100644
--- /dev/null
@@@ -1,6 -1,0 +1,7 @@@
 +<module name="freeldr" type="bootloader">\r
 +      <library>freeldr_startup</library>\r
 +      <library>freeldr_base64k</library>\r
 +      <library>freeldr_base</library>\r
 +      <library>freeldr_main</library>\r
++      <library>rossym</library>\r
 +</module>\r
index 3024356,0000000..f08569e
mode 100644,000000..100644
--- /dev/null
@@@ -1,108 -1,0 +1,109 @@@
-       <compilerflag>-nostdinc</compilerflag>\r
 +<module name="freeldr_base" type="objectlibrary">\r
 +      <include base="freeldr_base">include</include>\r
 +      <include base="freeldr_base">cache</include>\r
++      <include base="ntoskrnl">include</include>\r
++      <define name="__USE_W32API" />\r
 +      <compilerflag>-nostdlib</compilerflag>\r
 +      <compilerflag>-ffreestanding</compilerflag>\r
 +      <compilerflag>-fno-builtin</compilerflag>\r
 +      <compilerflag>-fno-inline</compilerflag>\r
 +      <compilerflag>-fno-zero-initialized-in-bss</compilerflag>\r
 +      <compilerflag>-Os</compilerflag>\r
 +      <directory name="arch">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>_alloca.S</file>\r
 +                              <file>archmach.c</file>\r
 +                              <file>hardware.c</file>\r
 +                              <file>hwacpi.c</file>\r
 +                              <file>hwapm.c</file>\r
 +                              <file>hwcpu.c</file>\r
 +                              <file>hwpci.c</file>\r
 +                              <file>i386disk.c</file>\r
 +                              <file>i386rtl.c</file>\r
 +                              <file>i386vid.c</file>\r
 +                              <file>machpc.c</file>\r
 +                              <file>machxbox.c</file>\r
 +                              <file>pccons.c</file>\r
 +                              <file>pcdisk.c</file>\r
 +                              <file>pcmem.c</file>\r
 +                              <file>pcrtc.c</file>\r
 +                              <file>pcvideo.c</file>\r
 +                              <file>portio.c</file>\r
 +                              <file>xboxcons.c</file>\r
 +                              <file>xboxdisk.c</file>\r
 +                              <file>xboxfont.c</file>\r
 +                              <file>xboxhw.c</file>\r
 +                              <file>xboxmem.c</file>\r
 +                              <file>xboxrtc.c</file>\r
 +                              <file>xboxvideo.c</file>\r
 +                      </directory>\r
 +              </if>\r
 +      </directory>\r
 +      <directory name="cache">\r
 +              <file>blocklist.c</file>\r
 +              <file>cache.c</file>\r
 +      </directory>\r
 +      <directory name="comm">\r
 +              <file>rs232.c</file>\r
 +      </directory>\r
 +      <directory name="disk">\r
 +              <file>disk.c</file>\r
 +              <file>partition.c</file>\r
 +      </directory>\r
 +      <directory name="fs">\r
 +              <file>ext2.c</file>\r
 +              <file>fat.c</file>\r
 +              <file>fs.c</file>\r
 +              <file>fsrec.c</file>\r
 +              <file>iso.c</file>\r
 +              <file>ntfs.c</file>\r
 +      </directory>\r
 +      <directory name="inifile">\r
 +              <file>ini_init.c</file>\r
 +              <file>inifile.c</file>\r
 +              <file>parse.c</file>\r
 +      </directory>\r
 +      <directory name="math">\r
 +              <file>libgcc2.c</file>\r
 +      </directory>\r
 +      <directory name="mm">\r
 +              <file>meminit.c</file>\r
 +              <file>mm.c</file>\r
 +      </directory>\r
 +      <directory name="reactos">\r
 +              <file>arcname.c</file>\r
 +              <file>binhive.c</file>\r
 +              <file>reactos.c</file>\r
 +              <file>registry.c</file>\r
 +      </directory>\r
 +      <directory name="rtl">\r
 +              <file>list.c</file>\r
 +              <file>memcmp.c</file>\r
 +              <file>memcpy.c</file>\r
 +              <file>memmove.c</file>\r
 +              <file>memset.c</file>\r
 +              <file>print.c</file>\r
 +              <file>stdlib.c</file>\r
 +              <file>string.c</file>\r
 +      </directory>\r
 +      <directory name="ui">\r
 +              <file>gui.c</file>\r
 +              <file>tui.c</file>\r
 +              <file>tuimenu.c</file>\r
 +              <file>ui.c</file>\r
 +      </directory>\r
 +      <directory name="video">\r
 +              <file>bank.c</file>\r
 +              <file>fade.c</file>\r
 +              <file>palette.c</file>\r
 +              <file>pixel.c</file>\r
 +              <file>video.c</file>\r
 +      </directory>\r
 +      <file>freeldr.c</file>\r
 +      <file>debug.c</file>\r
 +      <file>multiboot.c</file>\r
 +      <file>version.c</file>\r
 +      <file>cmdline.c</file>\r
 +      <file>machine.c</file>\r
 +</module>\r
index d783e49,0000000..a170dd6
mode 100644,000000..100644
--- /dev/null
@@@ -1,25 -1,0 +1,26 @@@
-       <compilerflag>-nostdinc</compilerflag>\r
 +<module name="freeldr_base64k" type="objectlibrary">\r
 +      <include base="freeldr_base64k">include</include>\r
++      <include base="ntoskrnl">include</include>\r
++      <define name="__USE_W32API" />\r
 +      <compilerflag>-nostdlib</compilerflag>\r
 +      <compilerflag>-ffreestanding</compilerflag>\r
 +      <compilerflag>-fno-builtin</compilerflag>\r
 +      <compilerflag>-fno-inline</compilerflag>\r
 +      <compilerflag>-fno-zero-initialized-in-bss</compilerflag>\r
 +      <compilerflag>-Os</compilerflag>\r
 +      <directory name="arch">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>boot.S</file>\r
 +                              <file>drvmap.S</file>\r
 +                              <file>i386cpu.S</file>\r
 +                              <file>i386idt.S</file>\r
 +                              <file>i386pnp.S</file>\r
 +                              <file>i386trap.S</file>\r
 +                              <file>int386.S</file>\r
 +                              <file>linux.S</file>\r
 +                              <file>mb.S</file>\r
 +                      </directory>\r
 +              </if>\r
 +      </directory>\r
 +</module>\r
index 9c8dd4c,0000000..820e4a6
mode 100644,000000..100644
--- /dev/null
@@@ -1,20 -1,0 +1,21 @@@
-       <compilerflag>-nostdinc</compilerflag>\r
 +<module name="freeldr_main" type="objectlibrary">\r
 +      <include base="freeldr_main">include</include>\r
++      <include base="ntoskrnl">include</include>\r
++      <define name="__USE_W32API" />\r
 +      <compilerflag>-nostdlib</compilerflag>\r
 +      <compilerflag>-ffreestanding</compilerflag>\r
 +      <compilerflag>-fno-builtin</compilerflag>\r
 +      <compilerflag>-fno-inline</compilerflag>\r
 +      <compilerflag>-fno-zero-initialized-in-bss</compilerflag>\r
 +      <compilerflag>-Os</compilerflag>\r
 +      <directory name="inffile">\r
 +              <file>inffile.c</file>\r
 +      </directory>\r
 +      <file>bootmgr.c</file>\r
 +      <file>drivemap.c</file>\r
 +      <file>miscboot.c</file>\r
 +      <file>options.c</file>\r
 +      <file>linuxboot.c</file>\r
 +      <file>oslist.c</file>\r
 +      <file>custom.c</file>\r
 +</module>\r
index 238d487,0000000..d69984c
mode 100644,000000..100644
--- /dev/null
@@@ -1,17 -1,0 +1,18 @@@
-       <compilerflag>-nostdinc</compilerflag>\r
 +<module name="freeldr_startup" type="objectlibrary">\r
 +      <include base="freeldr_startup">include</include>\r
++      <include base="ntoskrnl">include</include>\r
++      <define name="__USE_W32API" />\r
 +      <compilerflag>-nostdlib</compilerflag>\r
 +      <compilerflag>-ffreestanding</compilerflag>\r
 +      <compilerflag>-fno-builtin</compilerflag>\r
 +      <compilerflag>-fno-inline</compilerflag>\r
 +      <compilerflag>-fno-zero-initialized-in-bss</compilerflag>\r
 +      <directory name="arch">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file first="true">fathelp.asm</file>\r
 +                              <file>arch.S</file>\r
 +                      </directory>\r
 +              </if>\r
 +      </directory>\r
 +</module>\r
index 7d7549e,0000000..3d1ce7c
mode 100644,000000..100644
--- /dev/null
@@@ -1,25 -1,0 +1,27 @@@
 +<module name="vfatfs" type="kernelmodedriver">\r
 +      <include base="vfatfs">.</include>\r
++      <define name="__USE_W32API" />\r
 +      <library>ntoskrnl</library>\r
 +      <library>hal</library>\r
 +      <file>blockdev.c</file>\r
 +      <file>cleanup.c</file>\r
 +      <file>close.c</file>\r
 +      <file>create.c</file>\r
 +      <file>dir.c</file>\r
 +      <file>direntry.c</file>\r
 +      <file>dirwr.c</file>\r
 +      <file>ea.c</file>\r
 +      <file>fat.c</file>\r
++      <file>fastio.c</file>\r
 +      <file>fcb.c</file>\r
 +      <file>finfo.c</file>\r
 +      <file>flush.c</file>\r
 +      <file>fsctl.c</file>\r
 +      <file>iface.c</file>\r
 +      <file>misc.c</file>\r
 +      <file>rw.c</file>\r
 +      <file>shutdown.c</file>\r
 +      <file>string.c</file>\r
 +      <file>volume.c</file>\r
 +      <file>vfatfs.rc</file>\r
 +</module>\r
index 9fcc6cd,0000000..2870d89
mode 100644,000000..100644
--- /dev/null
@@@ -1,19 -1,0 +1,21 @@@
 +<module name="videoprt" type="kernelmodedriver">\r
 +      <importlibrary definition="videoprt.def" />\r
 +      <include base="videoprt">.</include>\r
 +      <include base="ntoskrnl">include</include>\r
 +      <define name="__USE_W32API" />\r
 +      <library>ntoskrnl</library>\r
 +      <library>hal</library>\r
++      <file>agp.c</file>\r
++      <file>ddc.c</file>\r
 +      <file>dispatch.c</file>\r
 +      <file>dma.c</file>\r
 +      <file>event.c</file>\r
 +      <file>int10.c</file>\r
 +      <file>interrupt.c</file>\r
 +      <file>resource.c</file>\r
 +      <file>services.c</file>\r
 +      <file>spinlock.c</file>\r
 +      <file>timer.c</file>\r
 +      <file>videoprt.c</file>\r
 +      <file>videoprt.rc</file>\r
 +</module>\r
@@@ -4603,7 -4601,7 +4601,7 @@@ AccessCheck
            LPBOOL  AccessStatus
            );
  
--#ifndef __NTDRIVER__
++#if !defined(__NTDRIVER__)
  LONG
  STDCALL
  InterlockedIncrement(
index a984a82,0000000..bf3faf4
mode 100644,000000..100644
--- /dev/null
@@@ -1,15 -1,0 +1,22 @@@
-       <file>desk.rc</file>\r
 +<module name="desk" type="win32dll" extension=".cpl">\r
 +      <importlibrary definition="desk.def" />\r
 +      <include base="desk">.</include>\r
 +      <define name="UNICODE" />\r
 +      <define name="_UNICODE" />\r
 +      <define name="__REACTOS__" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="_WIN32_IE">0x600</define>\r
 +      <define name="_WIN32_WINNT">0x501</define>\r
 +      <library>kernel32</library>\r
 +      <library>user32</library>\r
++      <library>advapi32</library>\r
++      <library>gdi32</library>\r
 +      <library>comctl32</library>\r
++      <library>comdlg32</library>\r
 +      <file>desk.c</file>\r
++      <file>background.c</file>\r
++      <file>screensaver.c</file>\r
++      <file>appearance.c</file>\r
++      <file>settings.c</file>\r
++      <file>dibitmap.c</file>\r
 +</module>\r
index 0000000,0000000..672e3e8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,386 @@@
++<module name="crt" type="staticlibrary">\r
++      <include base="crt">.</include>\r
++      <define name="_DISABLE_TIDENTS" />\r
++      <define name="__USE_W32API" />\r
++      <define name="_WIN32_IE">0x600</define>\r
++      <define name="_WIN32_WINNT">0x501</define>\r
++      <define name="__REACTOS__" />\r
++      <define name="USE_MSVCRT_PREFIX" />\r
++      <define name="_MSVCRT_LIB_" />\r
++      <define name="_MT" />\r
++      <directory name="conio">\r
++              <file>cgets.c</file>\r
++              <file>cprintf.c</file>\r
++              <file>cputs.c</file>\r
++              <file>cscanf.c</file>\r
++              <file>getch.c</file>\r
++              <file>getche.c</file>\r
++              <file>kbhit.c</file>\r
++              <file>putch.c</file>\r
++              <file>ungetch.c</file>\r
++      </directory>\r
++      <directory name="ctype">\r
++              <file>ctype.c</file>\r
++              <file>isascii.c</file>\r
++              <file>iscntrl.c</file>\r
++              <file>isgraph.c</file>\r
++              <file>isprint.c</file>\r
++              <file>ispunct.c</file>\r
++              <file>isupper.c</file>\r
++              <file>isctype.c</file>\r
++      </directory>\r
++      <directory name="direct">\r
++              <file>chdir.c</file>\r
++              <file>chdrive.c</file>\r
++              <file>getcwd.c</file>\r
++              <file>getdcwd.c</file>\r
++              <file>getdfree.c</file>\r
++              <file>getdrive.c</file>\r
++              <file>mkdir.c</file>\r
++              <file>rmdir.c</file>\r
++              <file>wchdir.c</file>\r
++              <file>wgetcwd.c</file>\r
++              <file>wgetdcwd.c</file>\r
++              <file>wmkdir.c</file>\r
++              <file>wrmdir.c</file>\r
++      </directory>\r
++      <directory name="except">\r
++              <file>abnorter.c</file>\r
++              <file>exhand2.c</file>\r
++              <file>matherr.c</file>\r
++              <file>unwind.c</file>\r
++      </directory>\r
++      <directory name="float">\r
++              <file>chgsign.c</file>\r
++              <file>clearfp.c</file>\r
++              <file>cntrlfp.c</file>\r
++              <file>copysign.c</file>\r
++              <file>fpclass.c</file>\r
++              <file>fpecode.c</file>\r
++              <file>fpreset.c</file>\r
++              <file>isnan.c</file>\r
++              <file>logb.c</file>\r
++              <file>nafter.c</file>\r
++              <file>scalb.c</file>\r
++              <file>statfp.c</file>\r
++      </directory>\r
++      <directory name="io">\r
++              <file>access.c</file>\r
++              <file>chmod.c</file>\r
++              <file>chsize.c</file>\r
++              <file>close.c</file>\r
++              <file>commit.c</file>\r
++              <file>create.c</file>\r
++              <file>dup.c</file>\r
++              <file>dup2.c</file>\r
++              <file>eof.c</file>\r
++              <file>filelen.c</file>\r
++              <file>fileleni.c</file>\r
++              <file>find.c</file>\r
++              <file>fmode.c</file>\r
++              <file>isatty.c</file>\r
++              <file>locking.c</file>\r
++              <file>lseek.c</file>\r
++              <file>lseeki64.c</file>\r
++              <file>mktemp.c</file>\r
++              <file>open.c</file>\r
++              <file>pipe.c</file>\r
++              <file>read.c</file>\r
++              <file>setmode.c</file>\r
++              <file>sopen.c</file>\r
++          <file>stubs.c</file>\r
++              <file>tell.c</file>\r
++              <file>telli64.c</file>\r
++              <file>umask.c</file>\r
++              <file>unlink.c</file>\r
++              <file>utime.c</file>\r
++              <file>waccess.c</file>\r
++              <file>wchmod.c</file>\r
++              <file>wcreate.c</file>\r
++              <file>wfind.c</file>\r
++              <file>wmktemp.c</file>\r
++              <file>wopen.c</file>\r
++              <file>write.c</file>\r
++              <file>wunlink.c</file>\r
++              <file>wutime.c</file>\r
++      </directory>\r
++      <directory name="locale">\r
++              <file>locale.c</file>\r
++      </directory>\r
++      <directory name="math">\r
++              <file>acos.c</file>\r
++              <file>adjust.c</file>\r
++              <file>asin.c</file>\r
++              <file>atan2.c</file>\r
++              <file>cabs.c</file>\r
++              <file>cosh.c</file>\r
++              <file>exp.c</file>\r
++              <file>fmod.c</file>\r
++              <file>frexp.c</file>\r
++              <file>huge_val.c</file>\r
++              <file>hypot.c</file>\r
++              <file>j0_y0.c</file>\r
++              <file>j1_y1.c</file>\r
++              <file>jn_yn.c</file>\r
++              <file>ldexp.c</file>\r
++              <file>log10.c</file>\r
++              <file>modf.c</file>\r
++              <file>pow.c</file>\r
++              <file>sinh.c</file>\r
++              <file>stubs.c</file>\r
++              <file>tanh.c</file>\r
++      </directory>\r
++      <directory name="mbstring">\r
++              <file>hanzen.c</file>\r
++              <file>ischira.c</file>\r
++              <file>iskana.c</file>\r
++              <file>iskmoji.c</file>\r
++              <file>iskpun.c</file>\r
++              <file>islead.c</file>\r
++              <file>islwr.c</file>\r
++              <file>ismbal.c</file>\r
++              <file>ismbaln.c</file>\r
++              <file>ismbc.c</file>\r
++              <file>ismbgra.c</file>\r
++              <file>ismbkaln.c</file>\r
++              <file>ismblead.c</file>\r
++              <file>ismbpri.c</file>\r
++              <file>ismbpun.c</file>\r
++              <file>ismbtrl.c</file>\r
++              <file>isuppr.c</file>\r
++              <file>jistojms.c</file>\r
++              <file>jmstojis.c</file>\r
++              <file>mbbtype.c</file>\r
++              <file>mbccpy.c</file>\r
++              <file>mbclen.c</file>\r
++              <file>mbscat.c</file>\r
++              <file>mbschr.c</file>\r
++              <file>mbscmp.c</file>\r
++              <file>mbscoll.c</file>\r
++              <file>mbscpy.c</file>\r
++              <file>mbscspn.c</file>\r
++              <file>mbsdec.c</file>\r
++              <file>mbsdup.c</file>\r
++              <file>mbsicmp.c</file>\r
++              <file>mbsicoll.c</file>\r
++              <file>mbsinc.c</file>\r
++              <file>mbslen.c</file>\r
++              <file>mbslwr.c</file>\r
++              <file>mbsncat.c</file>\r
++              <file>mbsnccnt.c</file>\r
++              <file>mbsncmp.c</file>\r
++              <file>mbsncoll.c</file>\r
++              <file>mbsncpy.c</file>\r
++              <file>mbsnextc.c</file>\r
++              <file>mbsnicmp.c</file>\r
++              <file>mbsnicoll.c</file>\r
++              <file>mbsninc.c</file>\r
++              <file>mbsnset.c</file>\r
++              <file>mbspbrk.c</file>\r
++              <file>mbsrchr.c</file>\r
++              <file>mbsrev.c</file>\r
++              <file>mbsset.c</file>\r
++              <file>mbsspn.c</file>\r
++              <file>mbsspnp.c</file>\r
++              <file>mbsstr.c</file>\r
++              <file>mbstok.c</file>\r
++              <file>mbstrlen.c</file>\r
++              <file>mbsupr.c</file>\r
++      </directory>\r
++      <directory name="misc">\r
++              <file>amsg.c</file>\r
++              <file>assert.c</file>\r
++              <file>crtmain.c</file>\r
++              <file>environ.c</file>\r
++              <file>getargs.c</file>\r
++              <file>initterm.c</file>\r
++              <file>lock.c</file>\r
++              <file>purecall.c</file>\r
++              <file>stubs.c</file>\r
++              <file>tls.c</file>\r
++      </directory>\r
++      <directory name="process">\r
++              <file>_cwait.c</file>\r
++              <file>_system.c</file>\r
++              <file>dll.c</file>\r
++              <file>process.c</file>\r
++              <file>procid.c</file>\r
++              <file>thread.c</file>\r
++              <file>threadid.c</file>\r
++              <file>threadx.c</file>\r
++      </directory>\r
++      <directory name="search">\r
++              <file>lfind.c</file>\r
++              <file>lsearch.c</file>\r
++      </directory>\r
++      <directory name="setjmp">\r
++              <directory name="i386">\r
++                      <file>setjmp.s</file>\r
++              </directory>\r
++      </directory>\r
++      <directory name="signal">\r
++              <file>signal.c</file>\r
++              <file>xcptinfo.c</file>\r
++      </directory>\r
++      <directory name="stdio">\r
++              <file>allocfil.c</file>\r
++              <file>clearerr.c</file>\r
++              <file>fclose.c</file>\r
++              <file>fdopen.c</file>\r
++              <file>feof.c</file>\r
++              <file>ferror.c</file>\r
++              <file>fflush.c</file>\r
++              <file>fgetc.c</file>\r
++              <file>fgetchar.c</file>\r
++              <file>fgetpos.c</file>\r
++              <file>fgets.c</file>\r
++              <file>fgetws.c</file>\r
++              <file>filbuf.c</file>\r
++              <file>fileno.c</file>\r
++              <file>flsbuf.c</file>\r
++              <file>fopen.c</file>\r
++              <file>fprintf.c</file>\r
++              <file>fputc.c</file>\r
++              <file>fputchar.c</file>\r
++              <file>fputs.c</file>\r
++              <file>fread.c</file>\r
++              <file>freopen.c</file>\r
++              <file>fscanf.c</file>\r
++              <file>fseek.c</file>\r
++              <file>fsetpos.c</file>\r
++              <file>fsopen.c</file>\r
++              <file>ftell.c</file>\r
++              <file>fwalk.c</file>\r
++              <file>fwrite.c</file>\r
++              <file>getc.c</file>\r
++              <file>getchar.c</file>\r
++              <file>gets.c</file>\r
++              <file>getw.c</file>\r
++              <file>perror.c</file>\r
++              <file>popen.c</file>\r
++              <file>printf.c</file>\r
++              <file>putc.c</file>\r
++              <file>putchar.c</file>\r
++              <file>puts.c</file>\r
++              <file>putw.c</file>\r
++              <file>remove.c</file>\r
++              <file>rename.c</file>\r
++              <file>rewind.c</file>\r
++              <file>rmtmp.c</file>\r
++              <file>scanf.c</file>\r
++              <file>setbuf.c</file>\r
++              <file>setvbuf.c</file>\r
++              <file>sprintf.c</file>\r
++              <file>sscanf.c</file>\r
++              <file>stdhnd.c</file>\r
++              <file>tempnam.c</file>\r
++              <file>tmpfile.c</file>\r
++              <file>tmpnam.c</file>\r
++              <file>ungetc.c</file>\r
++              <file>vfprintf.c</file>\r
++              <file>vfscanf.c</file>\r
++              <file>vfwprint.c</file>\r
++              <file>vprintf.c</file>\r
++              <file>vscanf.c</file>\r
++              <file>vsprintf.c</file>\r
++              <file>vsscanf.c</file>\r
++              <file>wfdopen.c</file>\r
++              <file>wrename.c</file>\r
++              <file>wtempnam.c</file>\r
++              <file>wtmpnam.c</file>\r
++      </directory>\r
++      <directory name="stdlib">\r
++              <file>_exit.c</file>\r
++              <file>abort.c</file>\r
++              <file>atexit.c</file>\r
++              <file>atof.c</file>\r
++              <file>div.c</file>\r
++              <file>ecvt.c</file>\r
++              <file>ecvtbuf.c</file>\r
++              <file>errno.c</file>\r
++              <file>fcvt.c</file>\r
++              <file>fcvtbuf.c</file>\r
++              <file>fullpath.c</file>\r
++              <file>gcvt.c</file>\r
++              <file>getenv.c</file>\r
++              <file>ldiv.c</file>\r
++              <file>makepath.c</file>\r
++              <file>malloc.c</file>\r
++              <file>mbtowc.c</file>\r
++              <file>obsol.c</file>\r
++              <file>putenv.c</file>\r
++              <file>rand.c</file>\r
++              <file>rot.c</file>\r
++              <file>senv.c</file>\r
++              <file>strtod.c</file>\r
++              <file>strtoul.c</file>\r
++              <file>swab.c</file>\r
++              <file>wcstod.c</file>\r
++              <file>wcstombs.c</file>\r
++              <file>wctomb.c</file>\r
++              <file>wfulpath.c</file>\r
++              <file>wputenv.c</file>\r
++              <file>wsenv.c</file>\r
++              <file>wsplitp.c</file>\r
++              <file>wmakpath.c</file>\r
++      </directory>\r
++      <directory name="string">\r
++              <file>lasttok.c</file>\r
++              <file>strcoll.c</file>\r
++              <file>strdup.c</file>\r
++              <file>strerror.c</file>\r
++              <file>strncoll.c</file>\r
++              <file>strpbrk.c</file>\r
++              <file>strrev.c</file>\r
++              <file>strset.c</file>\r
++              <file>strstr.c</file>\r
++              <file>strtok.c</file>\r
++              <file>strupr.c</file>\r
++              <file>strxfrm.c</file>\r
++      </directory>\r
++      <directory name="sys_stat">\r
++              <file>fstat.c</file>\r
++              <file>fstati64.c</file>\r
++              <file>futime.c</file>\r
++              <file>stat.c</file>\r
++              <file>wstat.c</file>\r
++              <file>systime.c</file>\r
++      </directory>\r
++      <directory name="time">\r
++              <file>clock.c</file>\r
++              <file>ctime.c</file>\r
++              <file>difftime.c</file>\r
++              <file>ftime.c</file>\r
++              <file>strdate.c</file>\r
++              <file>strftime.c</file>\r
++              <file>strtime.c</file>\r
++              <file>time.c</file>\r
++              <file>tz_vars.c</file>\r
++              <file>wctime.c</file>\r
++              <file>wstrdate.c</file>\r
++              <file>wstrtime.c</file>\r
++      </directory>\r
++      <directory name="wstring">\r
++              <file>wcscoll.c</file>\r
++              <file>wcscspn.c</file>\r
++              <file>wcsdup.c</file>\r
++              <file>wcsicmp.c</file>\r
++              <file>wcslwr.c</file>\r
++              <file>wcsnicmp.c</file>\r
++              <file>wcspbrk.c</file>\r
++              <file>wcsrev.c</file>\r
++              <file>wcsset.c</file>\r
++              <file>wcsspn.c</file>\r
++              <file>wcsstr.c</file>\r
++              <file>wcstok.c</file>\r
++              <file>wcsupr.c</file>\r
++              <file>wcsxfrm.c</file>\r
++              <file>wlasttok.c</file>\r
++      </directory>\r
++      <directory name="wine">\r
++              <file>cpp.c</file>\r
++              <file>cppexcept.c</file>\r
++              <file>heap.c</file>\r
++              <file>thread.c</file>\r
++      </directory>\r
++</module>\r
index 0000000,4aa7670..57130bc
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,29 +1,20 @@@
 -#undef isalnum
 -/*
 - * @implemented
 - */
 -int isalnum(int c)
 -{
 -    return _isctype(c, _ALPHA | _DIGIT);
 -}
 -
+ /*
+  * COPYRIGHT:   See COPYING in the top level directory
+  * PROJECT:     ReactOS system libraries
+  * FILE:        lib/msvcrt/ctype/isalnum.c
+  * PURPOSE:     Test for a alpha numeric character
+  * PROGRAMER:   Boudewijn Dekker
+  * UPDATE HISTORY:
+  *              28/12/98: Created
+  */
+ #include <msvcrt/ctype.h>
+ #undef iswalnum
+ /*
+  * @implemented
+  */
+ int iswalnum(wint_t c)
+ {
+     return iswctype(c, _ALPHA | _DIGIT);
+ }
Simple merge
index 0000000,c7e64b8..59d75f7
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,27 +1,19 @@@
 -#undef iscntrl
 -/*
 - * @implemented
 - */
 -int iscntrl(int c)
 -{
 -    return _isctype(c, _CONTROL);
 -}
+ /*
+  * COPYRIGHT:        See COPYING in the top level directory
+  * PROJECT:          ReactOS kernel
+  * FILE:             msvcrt/ctype/iscntrl.c
+  * PURPOSE:          C Runtime
+  * PROGRAMMER:       Copyright (C) 1995 DJ Delorie
+  */
+ #include <msvcrt/ctype.h>
+ #undef iswcntrl
+ /*
+  * @implemented
+  */
+ int iswcntrl(wint_t c)
+ {
+     return iswctype(c, _CONTROL);
+ }
index 0000000,7542a60..9b0c668
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,60 +1,52 @@@
 -/*
 - * @implemented
 - */
 -int iswctype(wint_t wc, wctype_t wctypeFlags)
 -{
 -   return (_pwctype[(unsigned char)(wc & 0xFF)] & wctypeFlags);
 -}
 -
+ /*
+  * COPYRIGHT:        See COPYING in the top level directory
+  * PROJECT:          ReactOS kernel
+  * FILE:             msvcrt/ctype/isctype.c
+  * PURPOSE:          C Runtime
+  * PROGRAMMER:       Copyright (C) 1995 DJ Delorie
+  */
+  
+ #include <msvcrt/ctype.h>
+ extern unsigned short _ctype[];
+ unsigned short *_pctype = _ctype + 1;
+ unsigned short *_pwctype = _ctype + 1;
+ /*
+  * @implemented
+  */
+ unsigned short **__p__pctype(void)
+ {
+    return &_pctype;
+ }
+ /*
+  * @implemented
+  */
+ unsigned short **__p__pwctype(void)
+ {
+    return &_pwctype;
+ }
+ /*
+  * @implemented
+  */
+ int _isctype(unsigned int c, int ctypeFlags)
+ {
+    return (_pctype[(unsigned char)(c & 0xFF)] & ctypeFlags);
+ }
+ /*
+  * obsolete
+  *
+  * @implemented
+  */
+ int is_wctype(wint_t wc, wctype_t wctypeFlags)
+ {
+    return (_pwctype[(unsigned char)(wc & 0xFF)] & wctypeFlags);
+ }
+ /* EOF */
index 0000000,9b61480..a62ef34
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,27 +1,18 @@@
 -#undef isgraph
 -/*
 - * @implemented
 - */
 -int isgraph(int c)
 -{
 -  return _isctype(c,_PUNCT | _ALPHA | _DIGIT);
 -}
 -
+ /*
+  * COPYRIGHT:        See COPYING in the top level directory
+  * PROJECT:          ReactOS kernel
+  * FILE:             msvcrt/ctype/isgraph.c
+  * PURPOSE:          C Runtime
+  * PROGRAMMER:       Copyright (C) 1995 DJ Delorie
+  */
+ #include <msvcrt/ctype.h>
+ #undef iswgraph
+ /*
+  * @implemented
+  */
+ int iswgraph(wint_t c)
+ {
+   return iswctype(c,_PUNCT | _ALPHA | _DIGIT);
+ }
index 0000000,1f23424..8eca3b5
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,26 +1,17 @@@
 -#undef isprint
 -/*
 - * @implemented
 - */
 -int isprint(int c)
 -{
 -  return _isctype(c,_BLANK | _PUNCT | _ALPHA | _DIGIT);
 -}
 -
+ /*
+  * COPYRIGHT:        See COPYING in the top level directory
+  * PROJECT:          ReactOS kernel
+  * FILE:             msvcrt/ctype/isprint.c
+  * PURPOSE:          C Runtime
+  * PROGRAMMER:       Copyright (C) 1995 DJ Delorie
+  */
+ #include <msvcrt/ctype.h>
+ /*
+  * @implemented
+  */
+ int iswprint(wint_t c)
+ {
+   return iswctype((unsigned short)c,_BLANK | _PUNCT | _ALPHA | _DIGIT);
+ }
index 0000000,51fe12e..ae55fb0
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,27 +1,18 @@@
 -#undef ispunct
 -/*
 - * @implemented
 - */
 -int ispunct(int c)
 -{
 -    return _isctype(c, _PUNCT);
 -}
 -
+ /*
+  * COPYRIGHT:        See COPYING in the top level directory
+  * PROJECT:          ReactOS kernel
+  * FILE:             msvcrt/ctype/ispunct.c
+  * PURPOSE:          C Runtime
+  * PROGRAMMER:       Copyright (C) 1995 DJ Delorie
+  */
+ #include <msvcrt/ctype.h>
+ #undef iswpunct
+ /*
+  * @implemented
+  */
+ int iswpunct(wint_t c)
+ {
+     return iswctype(c, _PUNCT);
+ }
index 0000000,6e09025..187956c
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,26 +1,17 @@@
 -#undef isupper
 -/*
 - * @implemented
 - */
 -int isupper(int c)
 -{
 -    return _isctype(c, _UPPER);
 -}
 -
+ /*
+  * COPYRIGHT:        See COPYING in the top level directory
+  * PROJECT:          ReactOS kernel
+  * FILE:             msvcrt/ctype/isupper.c
+  * PURPOSE:          C Runtime
+  * PROGRAMMER:       Copyright (C) 1995 DJ Delorie
+  */
+ #include <msvcrt/ctype.h>
+ /*
+  * @implemented
+  */
+ int iswupper(wint_t c)
+ {
+     return iswctype(c, _UPPER);
+ }
index 0000000,6a020ae..944b3aa
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,96 +1,96 @@@
 -sprintf(char *str, const char *fmt, ...)
+ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
+ /* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ The GNU C 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
+ Library General Public License for more details.
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB.  If
+ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+ Cambridge, MA 02139, USA.  */
+ #include <msvcrt/stdarg.h>
+ #include <msvcrt/stdio.h>
+ #include <msvcrt/wchar.h>
+ #include <limits.h>
+ #include <msvcrt/internal/file.h>
+ #undef sprintf
+ #undef wsprintf
+ /*
+  * @implemented
+  */
+ int
 -swprintf(wchar_t *str, const wchar_t *fmt, ...)
++crt_sprintf(char *str, const char *fmt, ...)
+ {
+   va_list arg;
+   int done;
+   va_start (arg, fmt);
+   done = vsprintf (str, fmt, arg);
+   va_end (arg);
+   return done;
+ }
+ /*
+  * @implemented
+  */
+ int
 -_snprintf (char *s, size_t maxlen,const char *format, ...)
++crt_swprintf(wchar_t *str, const wchar_t *fmt, ...)
+ {
+   va_list arg;
+   int done;
+   va_start (arg, fmt);
+   done = vswprintf (str, fmt, arg);
+   va_end (arg);
+   return done;
+ }
+ /* Write formatted output into S, according to the format
+    string FORMAT, writing no more than MAXLEN characters.  */
+ /* VARARGS3 */
+ /*
+  * @implemented
+  */
+ int
 -_snwprintf (wchar_t *s, size_t maxlen,const wchar_t *format, ...)
++crt__snprintf (char *s, size_t maxlen,const char *format, ...)
+ {
+   va_list arg;
+   int done;
+   va_start (arg, format);
+   done = _vsnprintf (s, maxlen, format, arg);
+   va_end (arg);
+   return done;
+ }
+ /*
+  * @implemented
+  */
+ int
++crt__snwprintf (wchar_t *s, size_t maxlen,const wchar_t *format, ...)
+ {
+   va_list arg;
+   int done;
+   va_start (arg, format);
+   done = _vsnwprintf (s, maxlen, format, arg);
+   va_end (arg);
+   return done;
+ }
index 0000000,7868add..408f0c3
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,71 +1,70 @@@
 -/*
 - * @implemented
 - */
 -int sscanf (const char *s,const char *format, ...)
+ /* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    The GNU C Library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+    The GNU C 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
+    Library General Public License for more details.
+    You should have received a copy of the GNU Library General Public
+    License along with the GNU C Library; see the file COPYING.LIB.  If not,
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.  */
+ #include <msvcrt/stdarg.h>
+ #include <msvcrt/stdio.h>
+ #include <msvcrt/wchar.h>
+ #include <msvcrt/alloc.h>
+ #include <msvcrt/internal/stdio.h>
+ /* Read formatted input from S, according to the format string FORMAT.  */
+ /* VARARGS2 */
 -int swscanf(const wchar_t *str, const wchar_t *fmt, ...)
++int
++crt_sscanf (const char *s,const char *format, ...)
+ {
+   va_list arg;
+   int done;
+   va_start (arg, format);
+   done = __vsscanf (s, format, arg);
+   va_end (arg);
+   return done;
+ }
+ /*
+  * @implemented
+  */
++int
++swscanf(const wchar_t *str, const wchar_t *fmt, ...)
+ {
+   va_list arg;
+   int done;
+   char *f , *s;
+   int i,len = wcslen(fmt);
+   f = malloc(len+1);
+   for(i=0;i<len;i++)
+     f[i] = fmt[i];
+   f[i] = 0;
+   len = wcslen(str);
+   s = alloca(len+1);
+   for(i=0;i<len;i++)
+     s[i] = str[i];
+   s[i] = 0;
+   va_start (arg, fmt);
+   done = __vsscanf (s, f, arg);
+   va_end (arg);
+   free(f);
+   return done;
+ }
index 0000000,9209bb1..628761e
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,80 +1,71 @@@
 -/*
 - * @implemented
 - */
+ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
+ #include <msvcrt/stdio.h>
+ #include <msvcrt/stdarg.h>
+ #include <limits.h>
+ #include <msvcrt/internal/file.h>
 -vsprintf(char *str, const char *fmt, va_list ap)
+ int
 -/*
 - * @implemented
 - */
++crt_vsprintf(char *str, const char *fmt, va_list ap)
+ {
+   FILE f;
+   int len;
+   f._flag = _IOWRT|_IOSTRG|_IOBINARY;
+   f._ptr = str;
+   f._cnt = INT_MAX;
+   f._file = -1;
+   len = vfprintf(&f,fmt, ap);
+   *f._ptr = 0;
+   return len;
+ }
+ /*
+  * @implemented
+  */
+ int
+ vswprintf(wchar_t *str, const wchar_t *fmt, va_list ap)
+ {
+   FILE f;
+   int len;
+   f._flag = _IOWRT|_IOSTRG|_IOBINARY;
+   f._ptr = (char*)str;
+   f._cnt = INT_MAX;
+   f._file = -1;
+   len = vfwprintf(&f,fmt, ap);
+   *(wchar_t*)f._ptr = 0;
+   return len;
+ }
 -_vsnprintf(char *str, size_t maxlen, const char *fmt, va_list ap)
+ int
 -/*
 - * @implemented
 - */
++crt__vsnprintf(char *str, size_t maxlen, const char *fmt, va_list ap)
+ {
+   FILE f;
+   int len;
+   f._flag = _IOWRT|_IOSTRG|_IOBINARY;
+   f._ptr = str;
+   f._cnt = maxlen;
+   f._file = -1;
+   len = vfprintf(&f,fmt, ap);
+   // what if the buffer is full ??
+   *f._ptr = 0;
+   return len;
+ }
 -_vsnwprintf(wchar_t *str, size_t maxlen, const wchar_t *fmt, va_list ap)
+ int
++crt__vsnwprintf(wchar_t *str, size_t maxlen, const wchar_t *fmt, va_list ap)
+ {
+   FILE f;
+   int len;
+   f._flag = _IOWRT|_IOSTRG|_IOBINARY;
+   f._ptr = (char*)str;
+   f._cnt = maxlen;
+   f._file = -1;
+   len = vfwprintf(&f,fmt, ap);
+   // what if the buffer is full ??
+   *(wchar_t*)f._ptr = 0;
+   return len;
+ }
@@@ -69,10 -69,10 +69,10 @@@ __argv_dll=__argv DAT
  __dllonexit
  __doserrno
  __fpecode
--__isascii
++__isascii=NTDLL.__isascii
  __iscsym=NTDLL.__iscsym
  __iscsymf=NTDLL.__iscsymf
- __mb_cur_max_dll
+ __mb_cur_max_dll=__mb_cur_max DATA
  __pxcptinfoptrs
  __threadhandle
  __threadid
@@@ -309,8 -309,8 +309,8 @@@ _setjm
  _setmode
  _setsystime
  _sleep
--_snprintf
--_snwprintf
++_snprintf=crt__snprintf
++_snwprintf=crt__snwprintf
  _sopen
  _spawnl
  _spawnle
@@@ -320,8 -320,8 +320,8 @@@ _spawn
  _spawnve
  _spawnvp
  _spawnvpe
--_splitpath
- _stat
++_splitpath=NTDLL._splitpath
+ _stat=CRTDLL__stat
  _statusfp
  _strcmpi=NTDLL._strcmpi
  _strdate
@@@ -359,8 -359,8 +359,8 @@@ _ungetc
  _unlink
  _unloaddll
  _utime
--_vsnprintf
--_vsnwprintf
++_vsnprintf=crt__vsnprintf
++_vsnwprintf=crt__vsnwprintf
  _wcsdup
  _wcsicmp
  _wcsicoll
@@@ -380,29 -380,29 +380,29 @@@ _y
  _y1
  _yn
  abort
--abs
++abs=NTDLL.abs
  acos
  asctime
  asin
--atan
++atan=NTDLL.atan
  atan2
  atexit
  atof
--atoi
--atol
--bsearch
++atoi=NTDLL.atoi
++atol=NTDLL.atol
++bsearch=NTDLL.bsearch
  calloc
--ceil
++ceil=NTDLL.ceil
  clearerr
  clock
--cos
++cos=NTDLL.cos
  cosh
  ctime
  difftime
  div
  exit
  exp
--fabs
++fabs=NTDLL.fabs
  fclose
  feof
  ferror
@@@ -411,7 -411,7 +411,7 @@@ fget
  fgetpos
  fgets
  fgetwc
--floor
++floor=NTDLL.floor
  fmod
  fopen
  fprintf
@@@ -435,42 -435,42 +435,42 @@@ geten
  gets
  gmtime
  is_wctype
--isalnum
++isalnum=NTDLL.isalnum
  isalpha=NTDLL.isalpha
--iscntrl
++iscntrl=NTDLL.iscntrl
  isdigit=NTDLL.isdigit
--isgraph
++isgraph=NTDLL.isgraph
  isleadbyte
  islower=NTDLL.islower
--isprint
--ispunct
++isprint=NTDLL.isprint
++ispunct=NTDLL.ispunct
  isspace=NTDLL.isspace
--isupper
++isupper=NTDLL.isupper
  iswalnum
  iswalpha=NTDLL.iswalpha
  iswascii
  iswcntrl
--iswctype
--iswdigit
++iswctype=NTDLL.iswctype
++iswdigit=NTDLL.iswdigit
  iswgraph
--iswlower
++iswlower=NTDLL.iswlower
  iswprint
  iswpunct
  iswspace=NTDLL.iswspace
  iswupper
--iswxdigit
++iswxdigit=NTDLL.iswxdigit
  isxdigit=NTDLL.isxdigit
--labs
++labs=NTDLL.labs
  ldexp
  ldiv
  localeconv
  localtime
--log
++log=NTDLL.log
  log10
  longjmp
  malloc
  mblen
--mbstowcs
++mbstowcs=NTDLL.mbstowcs
  mbtowc
  memchr=NTDLL.memchr
  memcmp=NTDLL.memcmp
@@@ -485,7 -485,7 +485,7 @@@ print
  putc
  putchar
  puts
--qsort
++qsort=NTDLL.qsort
  raise
  rand
  realloc
@@@ -497,15 -497,15 +497,15 @@@ setbu
  setlocale
  setvbuf
  signal
--sin
++sin=NTDLL.sin
  sinh
--sprintf
--sqrt
++sprintf=crt_sprintf
++sqrt=NTDLL.sqrt
  srand
--sscanf
++sscanf=crt_sscanf
  strcat
  strchr
--strcmp
++strcmp=NTDLL.strcmp
  strcoll
  strcpy
  strcspn
@@@ -521,27 -521,27 +521,27 @@@ strsp
  strstr=NTDLL.strstr
  strtod
  strtok
--strtol
++strtol=NTDLL.strtol
  strtoul
  strxfrm
--swprintf
++swprintf=crt_swprintf
  swscanf
  system
--tan
++tan=NTDLL.tan
  tanh
  time
  tmpfile
  tmpnam
  tolower=NTDLL.tolower
  toupper=NTDLL.toupper
--towlower
--towupper
++towlower=NTDLL.towlower
++towupper=NTDLL.towupper
  ungetc
  ungetwc
  vfprintf
  vfwprintf
  vprintf
--vsprintf
++vsprintf=crt_vsprintf
  vswprintf
  vwprintf
  wcscat
@@@ -561,9 -561,9 +561,9 @@@ wcssp
  wcsstr
  wcstod
  wcstok
--wcstol
++wcstol=NTDLL.wcstol
  wcstombs
--wcstoul
++wcstoul=NTDLL.wcstoul
  wcsxfrm
  wctomb
  wprintf
index ff573f5,0000000..31accdf
mode 100644,000000..100644
--- /dev/null
@@@ -1,151 -1,0 +1,19 @@@
-       <directory name="ctype">\r
-               <file>isctype.c</file>\r
-       </directory>\r
-       <directory name="except">\r
-               <file>abnorter.c</file>\r
-               <file>exhand2.c</file>\r
-               <file>matherr.c</file>\r
-               <file>unwind.c</file>\r
-       </directory>\r
-       <directory name="io">\r
-               <file>create.c</file>\r
-               <file>dup.c</file>\r
-               <file>eof.c</file>\r
-               <file>find.c</file>\r
-               <file>fmode.c</file>\r
-               <file>lseek.c</file>\r
-               <file>open.c</file>\r
-               <file>pipe.c</file>\r
-               <file>read.c</file>\r
-               <file>unlink.c</file>\r
-               <file>write.c</file>\r
-       </directory>\r
-       <directory name="math">\r
-               <file>acosh.c</file>\r
-               <file>asinh.c</file>\r
-               <file>atanh.c</file>\r
-               <file>ceil.c</file>\r
-               <file>floor.c</file>\r
-               <file>huge_val.c</file>\r
-       </directory>\r
-       <directory name="malloc">\r
-               <file>expand.c</file>\r
-               <file>heap.c</file>\r
-       </directory>\r
-       <directory name="misc">\r
-               <file>amsg.c</file>\r
-               <file>debug.c</file>\r
-               <file>dllmain.c</file>\r
-               <file>GetArgs.c</file>\r
-               <file>purecall.c</file>\r
-               <file>setnew.c</file>\r
-       </directory>\r
-       <directory name="process">\r
-               <file>_cwait.c</file>\r
-               <file>_system.c</file>\r
-               <file>spawnl.c</file>\r
-               <file>spawnlp.c</file>\r
-               <file>spawnlpe.c</file>\r
-               <file>spawnvp.c</file>\r
-               <file>spawnv.c</file>\r
-               <file>spawnve.c</file>\r
-               <file>spawnle.c</file>\r
-               <file>execl.c</file>\r
-               <file>execlp.c</file>\r
-               <file>execlpe.c</file>\r
-               <file>execvpe.c</file>\r
-               <file>execvp.c</file>\r
-               <file>execv.c</file>\r
-               <file>execle.c</file>\r
-               <file>execve.c</file>\r
-               <file>thread.c</file>\r
-       </directory>\r
-       <directory name="signal">\r
-               <file>xcptfil.c</file>\r
-               <file>xcptinfo.c</file>\r
-       </directory>\r
-       <directory name="stdio">\r
-               <file>getenv.c</file>\r
-               <file>ferror.c</file>\r
-               <file>fflush.c</file>\r
-               <file>fgetchar.c</file>\r
-               <file>fgets.c</file>\r
-               <file>filbuf.c</file>\r
-               <file>fileno.c</file>\r
-               <file>fopen.c</file>\r
-               <file>fputchar.c</file>\r
-               <file>fputs.c</file>\r
-               <file>fread.c</file>\r
-               <file>freopen.c</file>\r
-               <file>fscanf.c</file>\r
-               <file>frlist.c</file>\r
-               <file>fsopen.c</file>\r
-               <file>ftell.c</file>\r
-               <file>fwrite.c</file>\r
-               <file>getc.c</file>\r
-               <file>getchar.c</file>\r
-               <file>gets.c</file>\r
-               <file>getw.c</file>\r
-               <file>popen.c</file>\r
-               <file>printf.c</file>\r
-               <file>putc.c</file>\r
-               <file>putchar.c</file>\r
-               <file>puts.c</file>\r
-               <file>remove.c</file>\r
-               <file>setbuffe.c</file>\r
-               <file>setlineb.c</file>\r
-               <file>stdiohk.c</file>\r
-       </directory>\r
-       <directory name="stdlib">\r
-               <file>errno.c</file>\r
-               <file>fullpath.c</file>\r
-               <file>itow.c</file>\r
-               <file>malloc.c</file>\r
-               <file>mbstowcs.c</file>\r
-               <file>putenv.c</file>\r
-               <file>rand.c</file>\r
-               <file>wcstomb.c</file>\r
-       </directory>\r
-       <directory name="string">\r
-               <file>lasttok.c</file>\r
-               <file>strerror.c</file>\r
-       </directory>\r
-       <directory name="sys_stat">\r
-               <file>fstat.c</file>\r
-               <file>ftime.c</file>\r
-               <file>systime.c</file>\r
-               <file>stat.c</file>\r
-       </directory>\r
-       <directory name="tchar">\r
-               <file>strdec.c</file>\r
-               <file>strinc.c</file>\r
-               <file>strninc.c</file>\r
-               <file>strncnt.c</file>\r
-               <file>strnextc.c</file>\r
-               <file>strspnp.c</file>\r
-       </directory>\r
-       <directory name="time">\r
-               <file>tz_vars.c</file>\r
-       </directory>\r
-       <directory name="wchar">\r
-               <file>wlasttok.c</file>\r
-               <file>wcscoll.c</file>\r
-       </directory>\r
 +<module name="crtdll" type="win32dll" mangledsymbols="true">\r
 +      <linkerflag>-nostartfiles</linkerflag>\r
 +      <linkerflag>-lgcc</linkerflag>\r
 +      <importlibrary definition="crtdll.def" />\r
 +      <include base="crtdll">.</include>\r
 +      <define name="_DISABLE_TIDENTS" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="_WIN32_IE">0x600</define>\r
 +      <define name="_WIN32_WINNT">0x501</define>\r
 +      <define name="__REACTOS__" />\r
 +      <define name="USE_MSVCRT_PREFIX" />\r
 +      <define name="_MSVCRT_LIB_" />\r
 +      <library>string</library>\r
 +      <library>kernel32</library>\r
 +      <library>ntdll</library>\r
 +      <library>crt</library>\r
++      <file>dllmain.c</file>\r
 +      <file>crtdll.rc</file>\r
 +</module>\r
index 89e3be5,0000000..c082b12
mode 100644,000000..100644
--- /dev/null
@@@ -1,262 -1,0 +1,273 @@@
-       <xi:include href="msvcrt/crt.xml" />\r
 +<directory name="acledit">\r
 +      <xi:include href="acledit/acledit.xml" />\r
 +</directory>\r
 +<directory name="aclui">\r
 +      <xi:include href="aclui/aclui.xml" />\r
 +</directory>\r
 +<directory name="adns">\r
 +      <xi:include href="adns/adns.xml" />\r
 +</directory>\r
 +<directory name="advapi32">\r
 +      <xi:include href="advapi32/advapi32.xml" />\r
 +</directory>\r
 +<directory name="advpack">\r
 +      <xi:include href="advpack/advpack.xml" />\r
 +</directory>\r
 +<directory name="cabinet">\r
 +      <xi:include href="cabinet/cabinet.xml" />\r
 +</directory>\r
 +<directory name="cards">\r
 +      <xi:include href="cards/cards.xml" />\r
 +</directory>\r
 +<directory name="comctl32">\r
 +      <xi:include href="comctl32/comctl32.xml" />\r
 +</directory>\r
 +<directory name="comdlg32">\r
 +      <xi:include href="comdlg32/comdlg32.xml" />\r
 +</directory>\r
 +<directory name="cpl">\r
 +      <xi:include href="cpl/directory.xml" />\r
 +</directory>\r
++<directory name="crt">\r
++      <xi:include href="crt/crt.xml" />\r
++</directory>\r
 +<directory name="crtdll">\r
 +      <xi:include href="crtdll/crtdll.xml" />\r
 +</directory>\r
 +<directory name="dbghelp">\r
 +      <xi:include href="dbghelp/dbghelp.xml" />\r
 +</directory>\r
 +<directory name="devenum">\r
 +      <xi:include href="devenum/devenum.xml" />\r
 +</directory>\r
 +<directory name="dinput">\r
 +      <xi:include href="dinput/dinput.xml" />\r
 +</directory>\r
 +<directory name="dinput8">\r
 +      <xi:include href="dinput8/dinput8.xml" />\r
 +</directory>\r
 +<directory name="dnsapi">\r
 +      <xi:include href="dnsapi/dnsapi.xml" />\r
 +</directory>\r
 +<directory name="dsound">\r
 +      <xi:include href="dsound/dsound.xml" />\r
 +</directory>\r
 +<directory name="dxdiagn">\r
 +      <xi:include href="dxdiagn/dxdiagn.xml" />\r
 +</directory>\r
 +<directory name="dxguid">\r
 +      <xi:include href="dxguid/dxguid.xml" />\r
 +</directory>\r
 +<directory name="epsapi">\r
 +      <xi:include href="epsapi/epsapi.xml" />\r
 +</directory>\r
 +<directory name="expat">\r
 +      <xi:include href="expat/expat.xml" />\r
 +</directory>\r
 +<directory name="fmifs">\r
 +      <xi:include href="fmifs/fmifs.xml" />\r
 +</directory>\r
 +<directory name="freetype">\r
 +      <xi:include href="freetype/freetype.xml" />\r
 +</directory>\r
 +<directory name="fslib">\r
 +      <xi:include href="fslib/directory.xml" />\r
 +</directory>\r
 +<directory name="gdi32">\r
 +      <xi:include href="gdi32/gdi32.xml" />\r
 +</directory>\r
 +<directory name="gdiplus">\r
 +      <xi:include href="gdiplus/gdiplus.xml" />\r
 +</directory>\r
 +<directory name="glu32">\r
 +      <xi:include href="glu32/glu32.xml" />\r
 +</directory>\r
 +<directory name="imagehlp">\r
 +      <xi:include href="imagehlp/imagehlp.xml" />\r
 +</directory>\r
 +<directory name="imm32">\r
 +      <xi:include href="imm32/imm32.xml" />\r
 +</directory>\r
 +<directory name="iphlpapi">\r
 +      <xi:include href="iphlpapi/iphlpapi.xml" />\r
 +</directory>\r
 +<directory name="kbdda">\r
 +      <xi:include href="kbdda/kbdda.xml" />\r
 +</directory>\r
 +<directory name="kbddv">\r
 +      <xi:include href="kbddv/kbddv.xml" />\r
 +</directory>\r
++<directory name="kbdes">\r
++      <xi:include href="kbdes/kbdes.xml" />\r
++</directory>\r
 +<directory name="kbdfr">\r
 +      <xi:include href="kbdfr/kbdfr.xml" />\r
 +</directory>\r
 +<directory name="kbdgr">\r
 +      <xi:include href="kbdgr/kbdgr.xml" />\r
 +</directory>\r
 +<directory name="kbdse">\r
 +      <xi:include href="kbdse/kbdse.xml" />\r
 +</directory>\r
 +<directory name="kbduk">\r
 +      <xi:include href="kbduk/kbduk.xml" />\r
 +</directory>\r
 +<directory name="kbdus">\r
 +      <xi:include href="kbdus/kbdus.xml" />\r
 +</directory>\r
 +<directory name="kernel32">\r
 +      <xi:include href="kernel32/kernel32.xml" />\r
 +</directory>\r
 +<directory name="kjs">\r
 +      <xi:include href="kjs/kjs.xml" />\r
 +</directory>\r
 +<directory name="libwine">\r
 +      <xi:include href="libwine/libwine.xml" />\r
 +</directory>\r
 +<directory name="lzexpand">\r
 +      <xi:include href="lzexpand/lz32.xml" />\r
 +</directory>\r
 +<directory name="mesa32">\r
 +      <xi:include href="mesa32/mesa32.xml" />\r
 +</directory>\r
 +<directory name="midimap">\r
 +      <xi:include href="midimap/midimap.xml" />\r
 +</directory>\r
 +<directory name="mmdrv">\r
 +      <xi:include href="mmdrv/mmdrv.xml" />\r
 +</directory>\r
 +<directory name="mpr">\r
 +      <xi:include href="mpr/mpr.xml" />\r
 +</directory>\r
 +<directory name="msafd">\r
 +      <xi:include href="msafd/msafd.xml" />\r
 +</directory>\r
 +<directory name="msgina">\r
 +      <xi:include href="msgina/msgina.xml" />\r
 +</directory>\r
 +<directory name="msimg32">\r
 +      <xi:include href="msimg32/msimg32.xml" />\r
 +</directory>\r
 +<directory name="msvcrt">\r
 +      <xi:include href="msvcrt/msvcrt.xml" />\r
 +</directory>\r
 +<directory name="msvcrt20">\r
 +      <xi:include href="msvcrt20/msvcrt20.xml" />\r
 +</directory>\r
 +<directory name="netapi32">\r
 +      <xi:include href="netapi32/netapi32.xml" />\r
 +</directory>\r
 +<directory name="ntdll">\r
 +      <xi:include href="ntdll/ntdll.xml" />\r
 +</directory>\r
 +<directory name="ole32">\r
 +      <xi:include href="ole32/ole32.xml" />\r
 +</directory>\r
 +<directory name="oleaut32">\r
 +      <xi:include href="oleaut32/oleaut32.xml" />\r
 +</directory>\r
 +<directory name="olepro32">\r
 +      <xi:include href="olepro32/olepro32.xml" />\r
 +</directory>\r
 +<directory name="opengl32">\r
 +      <xi:include href="opengl32/opengl32.xml" />\r
 +</directory>\r
 +<directory name="psapi">\r
 +      <xi:include href="psapi/psapi.xml" />\r
 +</directory>\r
 +<directory name="pseh">\r
 +      <xi:include href="pseh/pseh.xml" />\r
 +</directory>\r
 +<directory name="richedit">\r
 +      <xi:include href="richedit/riched32.xml" />\r
 +</directory>\r
 +<directory name="rosrtl">\r
 +      <xi:include href="rosrtl/rosrtl.xml" />\r
 +</directory>\r
++<directory name="rossym">\r
++      <xi:include href="rossym/rossym.xml" />\r
++</directory>\r
 +<directory name="rpcrt4">\r
 +      <xi:include href="rpcrt4/rpcrt4.xml" />\r
 +</directory>\r
 +<directory name="rtl">\r
 +      <xi:include href="rtl/rtl.xml" />\r
 +</directory>\r
 +<directory name="samlib">\r
 +      <xi:include href="samlib/samlib.xml" />\r
 +</directory>\r
 +<directory name="secur32">\r
 +      <xi:include href="secur32/secur32.xml" />\r
 +</directory>\r
 +<directory name="setupapi">\r
 +      <xi:include href="setupapi/setupapi.xml" />\r
 +</directory>\r
 +<directory name="shdocvw">\r
 +      <xi:include href="shdocvw/shdocvw.xml" />\r
 +</directory>\r
 +<directory name="shell32">\r
 +      <xi:include href="shell32/shell32.xml" />\r
 +</directory>\r
 +<directory name="shlwapi">\r
 +      <xi:include href="shlwapi/shlwapi.xml" />\r
 +</directory>\r
 +<directory name="snmpapi">\r
 +      <xi:include href="snmpapi/snmpapi.xml" />\r
 +</directory>\r
++<directory name="smdll">\r
++      <xi:include href="smdll/smdll.xml" />\r
++</directory>\r
 +<directory name="string">\r
 +      <xi:include href="string/string.xml" />\r
 +</directory>\r
 +<directory name="strmiids">\r
 +      <xi:include href="strmiids/strmiids.xml" />\r
 +</directory>\r
 +<directory name="syssetup">\r
 +      <xi:include href="syssetup/syssetup.xml" />\r
 +</directory>\r
 +<directory name="twain">\r
 +      <xi:include href="twain/twain_32.xml" />\r
 +</directory>\r
 +<directory name="unicode">\r
 +      <xi:include href="unicode/unicode.xml" />\r
 +</directory>\r
 +<directory name="urlmon">\r
 +      <xi:include href="urlmon/urlmon.xml" />\r
 +</directory>\r
 +<directory name="user32">\r
 +      <xi:include href="user32/user32.xml" />\r
 +</directory>\r
 +<directory name="userenv">\r
 +      <xi:include href="userenv/userenv.xml" />\r
 +</directory>\r
 +<directory name="uuid">\r
 +      <xi:include href="uuid/uuid.xml" />\r
 +</directory>\r
 +<directory name="version">\r
 +      <xi:include href="version/version.xml" />\r
 +</directory>\r
 +<directory name="wininet">\r
 +      <xi:include href="wininet/wininet.xml" />\r
 +</directory>\r
 +<directory name="winmm">\r
 +      <xi:include href="winmm/winmm.xml" />\r
 +</directory>\r
 +<directory name="winspool">\r
 +      <xi:include href="winspool/winspool.xml" />\r
 +</directory>\r
 +<directory name="ws2_32">\r
 +      <xi:include href="ws2_32/ws2_32.xml" />\r
 +</directory>\r
 +<directory name="ws2help">\r
 +      <xi:include href="ws2help/ws2help.xml" />\r
 +</directory>\r
 +<directory name="wshirda">\r
 +      <xi:include href="wshirda/wshirda.xml" />\r
 +</directory>\r
 +<directory name="wsock32">\r
 +      <xi:include href="wsock32/wsock32.xml" />\r
 +</directory>\r
 +<directory name="zlib">\r
 +      <xi:include href="zlib/zlib.xml" />\r
 +</directory>\r
index 9c03079,0000000..fd058e7
mode 100644,000000..100644
--- /dev/null
@@@ -1,36 -1,0 +1,35 @@@
-       <dependency>addsys</dependency>\r
 +<module name="gdi32" type="win32dll">\r
-               <file>win32k.c</file>\r
 +      <importlibrary definition="gdi32.def" />\r
 +      <include base="gdi32">include</include>\r
 +      <define name="_DISABLE_TIDENTS" />\r
 +      <define name="UNICODE" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="WINVER">0x0600</define>\r
 +      <define name="_WIN32_WINNT">0x0501</define>\r
 +      <library>ntdll</library>\r
 +      <library>rosrtl</library>\r
 +      <library>kernel32</library>\r
 +      <library>advapi32</library>\r
 +      <directory name="main">\r
 +              <file>dllmain.c</file>\r
 +      </directory>\r
 +      <directory name="misc">\r
 +              <file>heap.c</file>\r
 +              <file>misc.c</file>\r
 +              <file>stubs.c</file>\r
 +              <file>stubsa.c</file>\r
 +              <file>stubsw.c</file>\r
++              <file>win32k.S</file>\r
 +              <file>wingl.c</file>\r
 +      </directory>\r
 +      <directory name="objects">\r
 +              <file>bitblt.c</file>\r
 +              <file>dc.c</file>\r
 +              <file>font.c</file>\r
 +              <file>linedda.c</file>\r
 +              <file>metafile.c</file>\r
 +              <file>region.c</file>\r
 +              <file>text.c</file>\r
 +      </directory>\r
 +      <file>gdi32.rc</file>\r
 +</module>\r
index 0000000,0000000..fe5f463
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,7 @@@
++<module name="kbdes" type="kernelmodedll" entrypoint="0">\r
++      <importlibrary definition="kbdes.def" />\r
++      <include base="ntoskrnl">include</include>\r
++      <define name="_DISABLE_TIDENTS" />\r
++      <file>kbdes.c</file>\r
++      <file>kbdes.rc</file>\r
++</module>\r
Simple merge
index 0000000,0000000..0e22827
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,11 @@@
++<module name="msimg32" type="win32dll">\r
++      <importlibrary definition="msimg32.spec.def" />\r
++      <include base="msimg32">.</include>\r
++      <include base="msimg32">include</include>\r
++      <define name="__REACTOS__" />\r
++      <library>ntdll</library>\r
++      <library>kernel32</library>\r
++      <library>gdi32</library>\r
++      <file>msimg32_main.c</file>\r
++      <file>msimg32.spec</file>\r
++</module>\r
index 0000000,091f5eb..23134c9
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,140 +1,141 @@@
+ /* $Id$
+  *
+  * dllmain.c
+  *
+  * ReactOS MSVCRT.DLL Compatibility Library
+  *
+  *  THIS SOFTWARE IS NOT COPYRIGHTED
+  *
+  *  This source code is offered for use in the public domain. You may
+  *  use, modify or distribute it freely.
+  *
+  *  This code is distributed in the hope that it will be useful but
+  *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
+  *  DISCLAMED. This includes but is not limited to warrenties of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  *
+  * $Revision: 1.24 $
+  * $Author$
+  * $Date$
+  *
+  */
+ #include "precomp.h"
+ #include <msvcrt/internal/tls.h>
+ #include <msvcrt/stdlib.h>
+ #include <msvcrt/wine/msvcrt.h>
+ #define NDEBUG
+ #include <msvcrt/msvcrtdbg.h>
+ /* EXTERNAL PROTOTYPES ********************************************************/
+ //void __fileno_init(void);
+ extern BOOL __fileno_init(void);
+ extern int BlockEnvToEnvironA(void);
+ extern int BlockEnvToEnvironW(void);
+ extern void FreeEnvironment(char **environment);
+ extern unsigned int _osver;
+ extern unsigned int _winminor;
+ extern unsigned int _winmajor;
+ extern unsigned int _winver;
+ extern char* _acmdln;        /* pointer to ascii command line */
+ extern wchar_t* _wcmdln;     /* pointer to wide character command line */
+ #undef _environ
+ extern char** _environ;      /* pointer to environment block */
+ extern char** __initenv;     /* pointer to initial environment block */
+ extern wchar_t** _wenviron;  /* pointer to environment block */
+ extern wchar_t** __winitenv; /* pointer to initial environment block */
+ /* LIBRARY GLOBAL VARIABLES ***************************************************/
+ HANDLE hHeap = NULL;        /* handle for heap */
+ /* LIBRARY ENTRY POINT ********************************************************/
+ BOOL
+ STDCALL
+ DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved)
+ {
++      DbgPrint("DllMain");
+     switch (dwReason)
+     {
+     case DLL_PROCESS_ATTACH://1
+         /* initialize version info */
+         DPRINT("Attach %d\n", nAttachCount);
+         _osver = GetVersion();
+         _winmajor = (_osver >> 8) & 0xFF;
+         _winminor = _osver & 0xFF;
+         _winver = (_winmajor << 8) + _winminor;
+         _osver = (_osver >> 16) & 0xFFFF;
+         hHeap = HeapCreate(0, 100000, 0);
+         if (hHeap == NULL)
+             return FALSE;
+         if (!__fileno_init()) 
+             return FALSE;
+         /* create tls stuff */
+         if (!CreateThreadData())
+             return FALSE;
+         if (BlockEnvToEnvironA() < 0)
+             return FALSE;
+         if (BlockEnvToEnvironW() < 0)
+         {
+             FreeEnvironment((char**)_wenviron);
+             return FALSE;
+         }
+         _acmdln = _strdup(GetCommandLineA());
+         _wcmdln = _wcsdup(GetCommandLineW());
+         /* FIXME: more initializations... */
+         /* FIXME: Initialization of the WINE code */
+         msvcrt_init_mt_locks();
+         DPRINT("Attach done\n");
+         break;
+     case DLL_THREAD_ATTACH://2
+         break;
+     case DLL_THREAD_DETACH://4
+         FreeThreadData(NULL);
+         break;
+     case DLL_PROCESS_DETACH://0
+         DPRINT("Detach %d\n", nAttachCount);
+         /* FIXME: more cleanup... */
+         _fcloseall();
+         /* destroy tls stuff */
+         DestroyThreadData();
+       if (__winitenv && __winitenv != _wenviron)
+             FreeEnvironment((char**)__winitenv);
+         if (_wenviron)
+             FreeEnvironment((char**)_wenviron);
+       if (__initenv && __initenv != _environ)
+             FreeEnvironment(__initenv);
+         if (_environ)
+             FreeEnvironment(_environ);
+         /* destroy heap */
+         HeapDestroy(hHeap);
+         DPRINT("Detach done\n");
+         break;
+     }
+     return TRUE;
+ }
+ /* EOF */
@@@ -116,9 -116,9 +116,9 @@@ __doserrn
  __fpecode
  __getmainargs
  __initenv DATA
 -__isascii
 -__iscsym
 -__iscsymf
 +__isascii=NTDLL.__isascii
- __iscsym
- __iscsymf
++__iscsym=NTDLL.__iscsym
++__iscsymf=NTDLL.__iscsymf
  __lc_codepage
  __lc_collate_cp
  __lc_handle
@@@ -160,8 -160,8 +160,8 @@@ __setlc_active DAT
  __setusermatherr
  __threadhandle
  __threadid
--__toascii
- __unDName
++__toascii=NTDLL.__toascii
;__unDName
  ;__unDNameEx
  __unguarded_readlc_active DATA
  __wargv
@@@ -205,7 -205,7 +205,7 @@@ _aexit_rt
  _amsg_exit
  _assert
  ;_atodbl
--_atoi64
++_atoi64=NTDLL._atoi64
  ;_atoldbl
  _beep
  _beginthread
@@@ -325,8 -325,8 +325,8 @@@ _heapse
  ;_heapused
  _heapwalk
  _hypot
--_i64toa
--_i64tow
++_i64toa=NTDLL._i64toa
++_i64tow=NTDLL._i64tow
  _initterm
  ;_inp
  ;_inpd
@@@ -364,8 -364,8 +364,8 @@@ _ismbcuppe
  _ismbslead
  _ismbstrail
  _isnan
--_itoa
--_itow
++_itoa=NTDLL._itoa
++_itow=NTDLL._itow
  _j0
  _j1
  _jn
@@@ -382,7 -382,7 +382,7 @@@ _lrot
  _lsearch
  _lseek
  _lseeki64
--_ltoa
++_ltoa=NTDLL._ltoa
  _ltow
  _makepath
  _mbbtombc
@@@ -441,7 -441,7 +441,7 @@@ _mbsto
  _mbstrlen
  _mbsupr
  _memccpy
--_memicmp
++_memicmp=NTDLL._memicmp
  _mkdir
  _mktemp
  ;_mktime64
@@@ -491,12 -491,12 +491,12 @@@ _setjmp
  ;_setmaxstdio
  _setmbcp
  _setmode
;_setsystime
+ _setsystime
  _sleep
- _snprintf=msvcrt__snprintf
 -_snprintf
++_snprintf=crt__snprintf
  ;_snscanf
  ;_snwscanf
- _snwprintf=msvcrt__snwprintf
 -_snwprintf
++_snwprintf=crt__snwprintf
  _sopen
  _spawnl
  _spawnle
@@@ -506,7 -506,7 +506,7 @@@ _spawn
  _spawnve
  _spawnvp
  _spawnvpe
--_splitpath
++_splitpath=NTDLL._splitpath
  _stat
  ;_stat64
  _stati64
@@@ -515,11 -515,11 +515,11 @@@ _strcmp
  _strdate
  _strdup
  _strerror
--_stricmp
++_stricmp=NTDLL.stricmp
  _stricoll
--_strlwr
++_strlwr=NTDLL._strlwr
  _strncoll
--_strnicmp
++_strnicmp=NTDLL.strnicmp
  _strnicoll
  _strnset
  _strrev
@@@ -536,14 -536,14 +536,14 @@@ _telli6
  _tempnam
  ;_time64
  _timezone DATA
--_tolower
--_toupper
++_tolower=NTDLL._tolower
++_toupper=NTDLL._toupper
  _tzname DATA
  _tzset
--_ui64toa
--_ui64tow
--_ultoa
--_ultow
++_ui64toa=NTDLL._i64toa
++_ui64tow=NTDLL._i64tow
++_ultoa=NTDLL._ultoa
++_ultow=NTDLL._ultow
  _umask
  _ungetch
  ;_ungetwch
@@@ -554,8 -554,8 +554,8 @@@ _utim
  ;_utime64
  ;_vscprintf
  ;_vscwprintf
- _vsnprintf=msvcrt__vsnprintf
- _vsnwprintf=msvcrt__vsnwprintf
 -_vsnprintf
 -_vsnwprintf
++_vsnprintf=crt__vsnprintf
++_vsnwprintf=crt__vsnwprintf
  _waccess
  _wasctime
  _wchdir
@@@ -637,8 -637,8 +637,8 @@@ _wstrtim
  _wtempnam
  _wtmpnam
  ;_wtof
--_wtoi
--_wtoi64
++_wtoi=NTDLL._wtoi
++_wtoi64=NTDLL._wtoi64
  _wtol
  _wunlink
  _wutime
@@@ -647,29 -647,29 +647,29 @@@ _y
  _y1
  _yn
  abort
--abs
++abs=NTDLL.abs
  acos
  asctime
  asin
--atan
++atan=NTDLL.atan
  atan2
  atexit
  atof
--atoi
--atol
--bsearch
++atoi=NTDLL.atoi
++atol=NTDLL.atol
++bsearch=NTDLL.bsearch
  calloc
--ceil
++ceil=NTDLL.ceil
  clearerr
  clock
--cos
++cos=NTDLL.cos
  cosh
  ctime
  difftime
  div
  exit
  exp
--fabs
++fabs=NTDLL.fabs
  fclose
  feof
  ferror
@@@ -679,7 -679,7 +679,7 @@@ fgetpo
  fgets
  fgetwc
  fgetws
--floor
++floor=NTDLL.floor
  fmod
  fopen
  fprintf
@@@ -706,42 -706,42 +706,42 @@@ getw
  getwchar
  gmtime
  is_wctype
 -isalnum
 -isalpha
 -iscntrl
 -isdigit
 -isgraph
 +isalnum=NTDLL.isalnum
- isalpha
++isalpha=NTDLL.isalpha
 +iscntrl=NTDLL.iscntrl
- isdigit
++isdigit=NTDLL.isdigit
 +isgraph=NTDLL.isgraph
  isleadbyte
--islower
 -isprint
 -ispunct
 -isspace
 -isupper
++islower=NTDLL.islower
 +isprint=NTDLL.isprint
 +ispunct=NTDLL.ispunct
- isspace
++isspace=NTDLL.isspace
 +isupper=NTDLL.isupper
  iswalnum
--iswalpha
++iswalpha=NTDLL.iswalpha
  iswascii
  iswcntrl
--iswctype
--iswdigit
++iswctype=NTDLL.iswctype
++iswdigit=NTDLL.iswdigit
  iswgraph
--iswlower
++iswlower=NTDLL.iswlower
  iswprint
  iswpunct
--iswspace
++iswspace=NTDLL.iswspace
  iswupper
--iswxdigit
--isxdigit
--labs
++iswxdigit=NTDLL.iswxdigit
++isxdigit=NTDLL.isxdigit
++labs=NTDLL.labs
  ldexp
  ldiv
  localeconv
  localtime
--log
++log=NTDLL.log
  log10
  longjmp
  malloc
  mblen
--mbstowcs
++mbstowcs=NTDLL.mbstowcs
  mbtowc
  memchr
  memcmp
@@@ -758,7 -758,7 +758,7 @@@ putcha
  puts
  putwc
  putwchar
--qsort
++qsort=NTDLL.qsort
  raise
  rand
  realloc
@@@ -770,15 -770,15 +770,15 @@@ setbu
  setlocale
  setvbuf
  signal
--sin
++sin=NTDLL.sin
  sinh
- sprintf=msvcrt_sprintf
 -sprintf
--sqrt
++sprintf=crt_sprintf
++sqrt=NTDLL.sqrt
  srand
- sscanf=msvcrt_sscanf
 -sscanf
++sscanf=crt_sscanf
  strcat
  strchr
--strcmp
++strcmp=NTDLL.strcmp
  strcoll
  strcpy
  strcspn
@@@ -794,27 -794,27 +794,27 @@@ strsp
  strstr
  strtod
  strtok
--strtol
++strtol=NTDLL.strtol
  strtoul
  strxfrm
- swprintf=msvcrt_swprintf
 -swprintf
++swprintf=crt_swprintf
  swscanf
  system
--tan
++tan=NTDLL.tan
  tanh
  time
  tmpfile
  tmpnam
  tolower
--toupper
--towlower
--towupper
++toupper=NTDLL.toupper
++towlower=NTDLL.towlower
++towupper=NTDLL.towupper
  ungetc
  ungetwc
  vfprintf
  vfwprintf
  vprintf
- vsprintf=msvcrt_vsprintf
 -vsprintf
++vsprintf=crt_vsprintf
  vswprintf
  vwprintf
  wcscat
@@@ -834,9 -834,9 +834,9 @@@ wcssp
  wcsstr
  wcstod
  wcstok
--wcstol
++wcstol=NTDLL.wcstol
  wcstombs
--wcstoul
++wcstoul=NTDLL.wcstoul
  wcsxfrm
  wctomb
  wprintf
index f7fd8d0,0000000..a9bfbdc
mode 100644,000000..100644
--- /dev/null
@@@ -1,200 -1,0 +1,22 @@@
-       <directory name="ctype">\r
-               <file>isalpha.c</file>\r
-               <file>iscsym.c</file>\r
-               <file>isctype.c</file>\r
-               <file>isdigit.c</file>\r
-               <file>islower.c</file>\r
-               <file>isspace.c</file>\r
-               <file>isxdigit.c</file>\r
-               <file>toascii.c</file>\r
-               <file>tolower.c</file>\r
-               <file>toupper.c</file>\r
-       </directory>\r
-       <directory name="direct">\r
-               <file>wchdir.c</file>\r
-               <file>wgetcwd.c</file>\r
-               <file>wgetdcwd.c</file>\r
-               <file>wmkdir.c</file>\r
-               <file>wrmdir.c</file>\r
-       </directory>\r
-       <directory name="except">\r
-               <file>abnorter.c</file>\r
-               <file>exhand2.c</file>\r
-               <file>matherr.c</file>\r
-               <file>seh.s</file>\r
-               <file>unwind.c</file>\r
-               <file>xcptfil.c</file>\r
-       </directory>\r
-       <directory name="io">\r
-               <file>create.c</file>\r
-               <file>dup.c</file>\r
-               <file>eof.c</file>\r
-               <file>fileleni.c</file>\r
-               <file>find.c</file>\r
-               <file>fmode.c</file>\r
-               <file>lseek.c</file>\r
-               <file>lseeki64.c</file>\r
-               <file>open.c</file>\r
-               <file>pipe.c</file>\r
-               <file>read.c</file>\r
-               <file>stubs.c</file>\r
-               <file>telli64.c</file>\r
-               <file>unlink.c</file>\r
-               <file>waccess.c</file>\r
-               <file>wchmod.c</file>\r
-               <file>wcreate.c</file>\r
-               <file>wfind.c</file>\r
-               <file>wmktemp.c</file>\r
-               <file>wopen.c</file>\r
-               <file>wunlink.c</file>\r
-               <file>wutime.c</file>\r
-       </directory>\r
-       <directory name="math">\r
-               <file>adjust.c</file>\r
-               <file>ceil.c</file>\r
-               <file>floor.c</file>\r
-               <file>huge_val.c</file>\r
-               <file>math.c</file>\r
-       </directory>\r
-       <directory name="misc">\r
-               <file>crtmain.c</file>\r
-               <file>dllmain.c</file>\r
-               <file>getargs.c</file>\r
-               <file>lock.c</file>\r
-               <file>purecall.c</file>\r
-               <file>stubs.c</file>\r
-               <file>tls.c</file>\r
-       </directory>\r
-       <directory name="process">\r
-               <file>_cwait.c</file>\r
-               <file>_system.c</file>\r
-               <file>process.c</file>\r
-               <file>thread.c</file>\r
-               <file>threadx.c</file>\r
-       </directory>\r
-       <directory name="stdio">\r
-               <file>ferror.c</file>\r
-               <file>fflush.c</file>\r
-               <file>fgetchar.c</file>\r
-               <file>fgets.c</file>\r
-               <file>fgetws.c</file>\r
-               <file>filbuf.c</file>\r
-               <file>fileno.c</file>\r
-               <file>fopen.c</file>\r
-               <file>fputchar.c</file>\r
-               <file>fputs.c</file>\r
-               <file>fread.c</file>\r
-               <file>freopen.c</file>\r
-               <file>fscanf.c</file>\r
-               <file>fsopen.c</file>\r
-               <file>ftell.c</file>\r
-               <file>fwrite.c</file>\r
-               <file>getc.c</file>\r
-               <file>getchar.c</file>\r
-               <file>gets.c</file>\r
-               <file>perror.c</file>\r
-               <file>popen.c</file>\r
-               <file>printf.c</file>\r
-               <file>putc.c</file>\r
-               <file>putchar.c</file>\r
-               <file>puts.c</file>\r
-               <file>remove.c</file>\r
-               <file>wfdopen.c</file>\r
-               <file>wrename.c</file>\r
-               <file>wtempnam.c</file>\r
-               <file>wtmpnam.c</file>\r
-       </directory>\r
-       <directory name="stdlib">\r
-               <file>atoi64.c</file>\r
-               <file>atold.c</file>\r
-               <file>errno.c</file>\r
-               <file>fullpath.c</file>\r
-               <file>getenv.c</file>\r
-               <file>itow.c</file>\r
-               <file>malloc.c</file>\r
-               <file>mbstowcs.c</file>\r
-               <file>mbtowc.c</file>\r
-               <file>putenv.c</file>\r
-               <file>qsort.c</file>\r
-               <file>rand.c</file>\r
-               <file>strtold.c</file>\r
-               <file>strtoll.c</file>\r
-               <file>strtoull.c</file>\r
-               <file>wcstol.c</file>\r
-               <file>wcstomb.c</file>\r
-               <file>wcstombs.c</file>\r
-               <file>wcstoul.c</file>\r
-               <file>wctomb.c</file>\r
-               <file>wfulpath.c</file>\r
-               <file>witoa.c</file>\r
-               <file>witow.c</file>\r
-               <file>wmakpath.c</file>\r
-               <file>wputenv.c</file>\r
-               <file>wsenv.c</file>\r
-               <file>wsplitp.c</file>\r
-               <file>wtoi.c</file>\r
-               <file>wtoi64.c</file>\r
-       </directory>\r
-       <directory name="string">\r
-               <file>memicmp.c</file>\r
-               <file>strerror.c</file>\r
-               <file>stricmp.c</file>\r
-               <file>strlwr.c</file>\r
-               <file>strncoll.c</file>\r
-               <file>strnicmp.c</file>\r
-               <file>strpbrk.c</file>\r
-               <file>strstr.c</file>\r
-               <file>strupr.c</file>\r
-       </directory>\r
-       <directory name="sys_stat">\r
-               <file>fstat.c</file>\r
-               <file>fstati64.c</file>\r
-               <file>stat.c</file>\r
-               <file>wstat.c</file>\r
-       </directory>\r
-       <directory name="time">\r
-               <file>ftime.c</file>\r
-               <file>tz_vars.c</file>\r
-               <file>wctime.c</file>\r
-               <file>wstrdate.c</file>\r
-               <file>wstrtime.c</file>\r
-       </directory>\r
-       <directory name="wine">\r
-               <file>cpp.c</file>\r
-               <file>cppexcept.c</file>\r
-               <file>heap.c</file>\r
-               <file>thread.c</file>\r
-       </directory>\r
-       <directory name="wstring">\r
-               <file>wcscoll.c</file>\r
-               <file>wcscspn.c</file>\r
-               <file>wcsicmp.c</file>\r
-               <file>wcslwr.c</file>\r
-               <file>wcsnicmp.c</file>\r
-               <file>wcspbrk.c</file>\r
-               <file>wcsspn.c</file>\r
-               <file>wcsstr.c</file>\r
-               <file>wcsupr.c</file>\r
-               <file>wlasttok.c</file>\r
-       </directory>\r
 +<module name="msvcrt" type="win32dll" mangledsymbols="true">\r
 +      <linkerflag>-nostartfiles</linkerflag>\r
 +      <linkerflag>--enable-stdcall-fixup</linkerflag>\r
 +      <linkerflag>-lgcc</linkerflag>\r
 +      <importlibrary definition="msvcrt.def" />\r
 +      <include base="msvcrt">.</include>\r
 +      <define name="_DISABLE_TIDENTS" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="_WIN32_IE">0x600</define>\r
 +      <define name="_WIN32_WINNT">0x501</define>\r
 +      <define name="__REACTOS__" />\r
 +      <define name="USE_MSVCRT_PREFIX" />\r
 +      <define name="_MSVCRT_LIB_" />\r
 +      <define name="_MT" />\r
 +      <library>wine</library>\r
 +      <library>string</library>\r
 +      <library>kernel32</library>\r
 +      <library>ntdll</library>\r
 +      <library>crt</library>\r
++      <file>dllmain.c</file>\r
 +      <file>msvcrt.rc</file>\r
 +</module>\r
index 3a6ddf1,0000000..d6b6727
mode 100644,000000..100644
--- /dev/null
@@@ -1,112 -1,0 +1,109 @@@
-       <dependency>genntdll</dependency>\r
 +<module name="ntdll" type="nativedll">\r
-                       <file>except.s</file>\r
 +      <importlibrary definition="def/ntdll.def" />\r
 +      <define name="__NTDLL__" />\r
 +      <define name="_DISABLE_TIDENTS" />\r
 +      <library>rosrtl</library>\r
 +      <library>rtl</library>\r
 +      <library>string</library>\r
 +      <linkerflag>-lgcc</linkerflag>\r
 +      <directory name="csr">\r
 +              <file>capture.c</file>\r
 +              <file>lpc.c</file>\r
 +              <file>probe.c</file>\r
 +              <file>thread.c</file>\r
 +      </directory>\r
 +      <directory name="dbg">\r
 +              <file>brkpoint.c</file>\r
 +              <file>debug.c</file>\r
 +              <file>print.c</file>\r
 +      </directory>\r
 +      <directory name="ldr">\r
 +              <file>entry.S</file>\r
 +              <file>res.c</file>\r
 +              <file>startup.c</file>\r
 +              <file>utils.c</file>\r
 +      </directory>\r
 +      <directory name="main">\r
 +              <file>dllmain.c</file>\r
 +      </directory>\r
 +      <directory name="rtl">\r
 +              <directory name="i386">\r
 +                      <file>alldiv.s</file>\r
 +                      <file>allmul.s</file>\r
 +                      <file>allrem.s</file>\r
 +                      <file>allshl.s</file>\r
 +                      <file>allshr.s</file>\r
 +                      <file>aulldiv.s</file>\r
 +                      <file>aullrem.s</file>\r
 +                      <file>aullshr.s</file>\r
 +                      <file>chkstk.s</file>\r
-               <file>registry.c</file>\r
 +                      <file>exception.c</file>\r
 +                      <file>float.c</file>\r
 +                      <file>ftol.c</file>\r
 +              </directory>\r
 +              <file>access.c</file>\r
 +              <file>apc.c</file>\r
 +              <file>atom.c</file>\r
 +              <file>callback.c</file>\r
 +              <file>crc32.c</file>\r
 +              <file>critical.c</file>\r
 +              <file>dbgbuffer.c</file>\r
 +              <file>exception.c</file>\r
 +              <file>handle.c</file>\r
 +              <file>intrlck.c</file>\r
 +              <file>libsupp.c</file>\r
 +              <file>math.c</file>\r
 +              <file>message.c</file>\r
 +              <file>misc.c</file>\r
 +              <file>path.c</file>\r
 +              <file>ppb.c</file>\r
 +              <file>process.c</file>\r
 +              <file>propvar.c</file>\r
 +              <file>rangelist.c</file>\r
-       <file>napi.c</file>\r
 +              <file>resource.c</file>\r
 +              <file>teb.c</file>\r
 +              <file>thread.c</file>\r
 +              <file>timerqueue.c</file>\r
 +      </directory>\r
 +      <directory name="stdio">\r
 +              <file>sprintf.c</file>\r
 +              <file>sscanf.c</file>\r
 +              <file>swprintf.c</file>\r
 +      </directory>\r
 +      <directory name="stdlib">\r
 +              <file>abs.c</file>\r
 +              <file>atoi64.c</file>\r
 +              <file>atoi.c</file>\r
 +              <file>atol.c</file>\r
 +              <file>bsearch.c</file>\r
 +              <file>itoa.c</file>\r
 +              <file>itow.c</file>\r
 +              <file>labs.c</file>\r
 +              <file>lfind.c</file>\r
 +              <file>mbstowcs.c</file>\r
 +              <file>splitp.c</file>\r
 +              <file>strtol.c</file>\r
 +              <file>strtoul.c</file>\r
 +              <file>wcstol.c</file>\r
 +              <file>wcstombs.c</file>\r
 +              <file>wcstoul.c</file>\r
 +              <file>wtoi64.c</file>\r
 +              <file>wtoi.c</file>\r
 +              <file>wtol.c</file>\r
 +      </directory>\r
 +      <directory name="string">\r
 +              <file>ctype.c</file>\r
 +              <file>memicmp.c</file>\r
 +              <file>stricmp.c</file>\r
 +              <file>strlwr.c</file>\r
 +              <file>strnicmp.c</file>\r
 +              <file>strpbrk.c</file>\r
 +              <file>strstr.c</file>\r
 +              <file>strupr.c</file>\r
 +              <file>wstring.c</file>\r
 +      </directory>\r
 +      <directory name="def">\r
 +              <file>ntdll.rc</file>\r
 +      </directory>\r
++      <file>napi.S</file>\r
 +</module>\r
@@@ -116,12 -116,12 +116,11 @@@ InterlockedExchange(LPLONG target, LON
   * RETURNS
   *    Prior value of value pointed to by Destination
   */
--PVOID 
--STDCALL 
--InterlockedCompareExchange(
--          PVOID *Destination, 
--          PVOID Exchange,     
--            PVOID Comperand     ) 
++LONG
++STDCALL
++InterlockedCompareExchange(PLONG Destination,
++      LONG Exchange,
++      LONG Comperand)
  {     
        PVOID ret;
        __asm__ ( /* lock for SMP systems */
index 839df99,0000000..b534d0d
mode 100644,000000..100644
--- /dev/null
@@@ -1,51 -1,0 +1,52 @@@
 +<module name="ole32" type="win32dll">\r
 +      <dependency>winebuild</dependency>\r
 +      <importlibrary definition="ole32.spec.def" />\r
 +      <include base="ole32">.</include>\r
 +      <include base="ReactOS">include/wine</include>\r
 +      <define name="UNICODE" />\r
 +      <define name="_UNICODE" />\r
 +      <define name="__REACTOS__" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="_WIN32_IE">0x600</define>\r
 +      <define name="_WIN32_WINNT">0x501</define>\r
 +      <define name="WINVER">0x501</define>\r
 +      <library>wine</library>\r
 +      <library>uuid</library>\r
 +      <library>ntdll</library>\r
 +      <library>kernel32</library>\r
 +      <library>advapi32</library>\r
 +      <library>gdi32</library>\r
 +      <library>user32</library>\r
 +      <library>rpcrt4</library>\r
 +      <file>antimoniker.c</file>\r
 +      <file>bindctx.c</file>\r
 +      <file>clipboard.c</file>\r
 +      <file>compobj.c</file>\r
 +      <file>compositemoniker.c</file>\r
 +      <file>datacache.c</file>\r
 +      <file>defaulthandler.c</file>\r
 +      <file>errorinfo.c</file>\r
 +      <file>filemoniker.c</file>\r
 +      <file>ftmarshal.c</file>\r
 +      <file>git.c</file>\r
 +      <file>hglobalstream.c</file>\r
 +      <file>ifs.c</file>\r
 +      <file>itemmoniker.c</file>\r
 +      <file>marshal.c</file>\r
 +      <file>memlockbytes.c</file>\r
 +      <file>moniker.c</file>\r
 +      <file>ole2.c</file>\r
 +      <file>ole2stubs.c</file>\r
 +      <file>ole2impl.c</file>\r
 +      <file>ole32_main.c</file>\r
 +      <file>oleobj.c</file>\r
 +      <file>oleproxy.c</file>\r
 +      <file>regsvr.c</file>\r
 +      <file>rpc.c</file>\r
 +      <file>stg_bigblockfile.c</file>\r
 +      <file>stg_stream.c</file>\r
 +      <file>storage32.c</file>\r
++      <file>stubmanager.c</file>\r
 +      <file>ole32res.rc</file>\r
 +      <file>ole32.spec</file>\r
 +</module>\r
index 61f58ef,0000000..84f5630
mode 100644,000000..100644
--- /dev/null
@@@ -1,16 -1,0 +1,13 @@@
-       <library>epsapi</library>\r
-       <directory name="misc">\r
-               <file>dllmain.c</file>\r
-               <file>malloc.c</file>\r
-               <file>stubs.c</file>\r
-               <file>win32.c</file>\r
-       </directory>\r
 +<module name="psapi" type="win32dll">\r
 +      <importlibrary definition="psapi.def" />\r
 +      <include base="psapi">.</include>\r
 +      <include base="psapi">include</include>\r
 +      <define name="_DISABLE_TIDENTS" />\r
++      <library>epsapi</library>\r
++      <library>pseh</library>\r
 +      <library>ntdll</library>\r
 +      <library>kernel32</library>\r
++      <file>malloc.c</file>\r
++      <file>psapi.c</file>\r
 +      <file>psapi.rc</file>\r
 +</module>\r
index 0000000,0000000..bcb0bca
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,13 @@@
++<module name="rossym" type="staticlibrary">\r
++      <define name="__USE_W32API" />\r
++      <file>delete.c</file>\r
++      <file>find.c</file>\r
++      <file>fromfile.c</file>\r
++      <file>frommem.c</file>\r
++      <file>fromraw.c</file>\r
++      <file>getraw.c</file>\r
++      <file>init.c</file>\r
++      <file>initkm.c</file>\r
++      <file>initum.c</file>\r
++      <file>zwfile.c</file>\r
++</module>\r
index 65a56f4,0000000..147aa85
mode 100644,000000..100644
--- /dev/null
@@@ -1,34 -1,0 +1,35 @@@
 +<module name="rtl" type="staticlibrary">\r
 +      <directory name="i386">\r
 +              <file>except.s</file>\r
 +              <file>exception.c</file>\r
 +      </directory>\r
 +      <file>acl.c</file>\r
 +      <file>bit.c</file>\r
 +      <file>bitmap.c</file>\r
 +      <file>bootdata.c</file>\r
 +      <file>compress.c</file>\r
 +      <file>dos8dot3.c</file>\r
 +      <file>encode.c</file>\r
 +      <file>env.c</file>\r
 +      <file>error.c</file>\r
 +      <file>exception.c</file>\r
 +      <file>generictable.c</file>\r
 +      <file>heap.c</file>\r
 +      <file>image.c</file>\r
 +      <file>largeint.c</file>\r
 +      <file>luid.c</file>\r
 +      <file>mem.c</file>\r
 +      <file>network.c</file>\r
 +      <file>nls.c</file>\r
 +      <file>random.c</file>\r
++      <file>registry.c</file>\r
 +      <file>sd.c</file>\r
 +      <file>security.c</file>\r
 +      <file>sid.c</file>\r
 +      <file>splaytree.c</file>\r
 +      <file>time.c</file>\r
 +      <file>timezone.c</file>\r
 +      <file>unicode.c</file>\r
 +      <file>unicodeprefix.c</file>\r
 +      <file>version.c</file>\r
 +</module>\r
index bab6a00,0000000..7e0c2aa
mode 100644,000000..100644
--- /dev/null
@@@ -1,33 -1,0 +1,34 @@@
 +<module name="setupapi" type="win32dll">\r
 +      <dependency>winebuild</dependency>\r
 +      <importlibrary definition="setupapi.spec.def" />\r
 +      <include base="setupapi">.</include>\r
 +      <include base="ReactOS">include/wine</include>\r
 +      <define name="UNICODE" />\r
 +      <define name="_UNICODE" />\r
 +      <define name="__REACTOS__" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="_WIN32_IE">0x600</define>\r
 +      <define name="_WIN32_WINNT">0x501</define>\r
 +      <define name="WINVER">0x501</define>\r
 +      <define name="__WINESRC__" />\r
 +      <define name="_SETUPAPI_" />\r
 +      <library>wine</library>\r
 +      <library>wine_unicode</library>\r
 +      <library>ntdll</library>\r
 +      <library>kernel32</library>\r
 +      <library>advapi32</library>\r
 +      <library>user32</library>\r
 +      <library>rpcrt4</library>\r
 +      <library>version</library>\r
 +      <file>devinst.c</file>\r
 +      <file>dirid.c</file>\r
 +      <file>diskspace.c</file>\r
 +      <file>install.c</file>\r
++      <file>misc.c</file>\r
 +      <file>parser.c</file>\r
 +      <file>queue.c</file>\r
 +      <file>setupcab.c</file>\r
 +      <file>stubs.c</file>\r
 +      <file>setupapi.rc</file>\r
 +      <file>setupapi.spec</file>\r
 +</module>\r
index 0000000,0000000..9351233
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,11 @@@
++<module name="smdll" type="win32dll">\r
++      <importlibrary definition="smdll.def" />\r
++      <include base="smdll">.</include>\r
++      <define name="_DISABLE_TIDENTS" />\r
++      <library>ntdll</library>\r
++      <file>dllmain.c</file>\r
++      <file>connect.c</file>\r
++      <file>execpgm.c</file>\r
++      <file>compses.c</file>\r
++      <file>smdll.rc</file>\r
++</module>\r
index 80f88e8,0000000..50fe1c1
mode 100644,000000..100644
--- /dev/null
@@@ -1,76 -1,0 +1,75 @@@
-       <dependency>addsys</dependency>\r
 +<module name="user32" type="win32dll">\r
-               <file>win32k.c</file>\r
 +      <importlibrary definition="user32.def" />\r
 +      <include base="user32">.</include>\r
 +      <include base="user32">include</include>\r
 +      <define name="_DISABLE_TIDENTS" />\r
 +      <define name="UNICODE" />\r
 +      <define name="__REACTOS__" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="WINVER">0x0600</define>\r
 +      <define name="_WIN32_WINNT">0x0501</define>\r
 +      <library>wine</library>\r
 +      <library>ntdll</library>\r
 +      <library>gdi32</library>\r
 +      <library>rosrtl</library>\r
 +      <library>kernel32</library>\r
 +      <library>advapi32</library>\r
 +      <directory name="controls">\r
 +              <file>button.c</file>\r
 +              <file>combo.c</file>\r
 +              <file>edit.c</file>\r
 +              <file>icontitle.c</file>\r
 +              <file>listbox.c</file>\r
 +              <file>regcontrol.c</file>\r
 +              <file>scrollbar.c</file>\r
 +              <file>static.c</file>\r
 +      </directory>\r
 +      <directory name="misc">\r
 +              <file>dde.c</file>\r
 +              <file>ddeclient.c</file>\r
 +              <file>ddeserver.c</file>\r
 +              <file>desktop.c</file>\r
 +              <file>display.c</file>\r
 +              <file>dllmain.c</file>\r
 +              <file>exit.c</file>\r
 +              <file>exticon.c</file>\r
 +              <file>misc.c</file>\r
 +              <file>object.c</file>\r
 +              <file>resources.c</file>\r
 +              <file>strpool.c</file>\r
 +              <file>stubs.c</file>\r
 +              <file>timer.c</file>\r
++              <file>win32k.S</file>\r
 +              <file>winhelp.c</file>\r
 +              <file>winsta.c</file>\r
 +              <file>wsprintf.c</file>\r
 +      </directory>\r
 +      <directory name="windows">\r
 +              <file>accel.c</file>\r
 +              <file>bitmap.c</file>\r
 +              <file>caret.c</file>\r
 +              <file>class.c</file>\r
 +              <file>clipboard.c</file>\r
 +              <file>cursor.c</file>\r
 +              <file>dc.c</file>\r
 +              <file>defwnd.c</file>\r
 +              <file>dialog.c</file>\r
 +              <file>draw.c</file>\r
 +              <file>font.c</file>\r
 +              <file>hook.c</file>\r
 +              <file>icon.c</file>\r
 +              <file>input.c</file>\r
 +              <file>mdi.c</file>\r
 +              <file>menu.c</file>\r
 +              <file>message.c</file>\r
 +              <file>messagebox.c</file>\r
 +              <file>nonclient.c</file>\r
 +              <file>paint.c</file>\r
 +              <file>prop.c</file>\r
 +              <file>rect.c</file>\r
 +              <file>text.c</file>\r
 +              <file>window.c</file>\r
 +              <file>winpos.c</file>\r
 +      </directory>\r
 +      <file>user32.rc</file>\r
 +</module>\r
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 2000  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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/cc/cacheman.c
   * PURPOSE:         Cache manager
@@@ -1,4 -1,6 +1,6 @@@
- /* COPYRIGHT:       See COPYING in the top level directory
 -/* $Id:$
++/* $Id$
+  *
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/cc/fs.c
   * PURPOSE:         Implements cache managers functions useful for File Systems
@@@ -1,4 -1,6 +1,6 @@@
- /* COPYRIGHT:       See COPYING in the top level directory
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/cc/fs.c
   * PURPOSE:         Implements MDL Cache Manager Functions
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/dbg/dbgctrl.c
   * PURPOSE:         System debug control
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/dbg/errinfo.c
   * PURPOSE:         Print information descriptions of error messages
@@@ -1,3 -1,13 +1,13 @@@
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/dbg/i386/i386-dis.c
+  * PURPOSE:         No purpose listed.
+  *
+  * PROGRAMMERS:     No programmer listed.
+  */
  #include <stdarg.h>
  
  /* ReactOS compatibility stuff. */
@@@ -1,27 -1,12 +1,12 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
-  */
- /*
-  * PROJECT:          ReactOS kernel
-  * FILE:             ntoskrnl/dbg/kdb_keyboard.c
-  * PURPOSE:          Keyboard driver
-  * PROGRAMMER:       Victor Kirhenshtein (sauros@iname.com)
-  *                   Jason Filby (jasonfilby@yahoo.com)
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/dbg/kdb_keyboard.c
+  * PURPOSE:         Keyboard driver
+  * 
+  * PROGRAMMERS:     Victor Kirhenshtein (sauros@iname.com)
+  *                  Jason Filby (jasonfilby@yahoo.com)
   */
  
  /* INCLUDES ****************************************************************/
@@@ -1,30 -1,13 +1,13 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
-  */
- /*
-  * PROJECT:          ReactOS kernel
-  * FILE:             ntoskrnl/dbg/kdb_serial.c
-  * PURPOSE:          Serial driver
-  * PROGRAMMER:       Original:
-  *                   Victor Kirhenshtein (sauros@iname.com)
-  *                   Jason Filby (jasonfilby@yahoo.com)
-  *                   Modified:
-  *                   arty
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/dbg/kdb_serial.c
+  * PURPOSE:         Serial driver
+  * 
+  * PROGRAMMERS:     Victor Kirhenshtein (sauros@iname.com)
+  *                  Jason Filby (jasonfilby@yahoo.com)
+  *                  arty
   */
  
  /* INCLUDES ****************************************************************/
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/dbg/user.c
   * PURPOSE:         User mode debugging
@@@ -1,28 -1,11 +1,11 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998-2002 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            btree.c
+  * FILE:            ntoskrnl/ex/btree.c
   * PURPOSE:         Binary tree support
-  * PROGRAMMER:      Casper S. Hornstrup (chorns@users.sourceforge.net)
-  * UPDATE HISTORY:
-  *      15-03-2002  CSH  Created
+  * 
+  * PROGRAMMERS:     Casper S. Hornstrup (chorns@users.sourceforge.net)
   */
  
  #include <ntoskrnl.h>
@@@ -1,26 -1,14 +1,14 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998-2002 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            hashtab.c
+  * FILE:            ntoskrnl/ex/hashtab.c
   * PURPOSE:         Hash table support
-  * PROGRAMMER:      Casper S. Hornstrup (chorns@users.sourceforge.net)
+  * 
+  * PROGRAMMERS:     Casper S. Hornstrup (chorns@users.sourceforge.net)
+  */
+ /*
   * NOTES:           The hash function is from:
   *                  Bob Jenkins <bob_jenkins@burtleburtle.net>
   *                  http://burtleburtle.net/bob/hash/doobs.html
@@@ -1,29 -1,11 +1,11 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            kernel/ex/init.c
-  * PURPOSE:         executive initalization
-  * PROGRAMMER:      Eric Kohl (ekohl@abo.rhein-zeitung.de)
-  * PORTABILITY:     Checked.
-  * UPDATE HISTORY:
-  *                  Created 11/09/99
+  * FILE:            ntoskrnl/ex/init.c
+  * PURPOSE:         Executive initalization
+  * 
+  * PROGRAMMERS:     Eric Kohl (ekohl@abo.rhein-zeitung.de)
   */
  
  #include <ntoskrnl.h>
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/ex/napi.c
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998 - 2004 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/ex/rundown.c
   * PURPOSE:         Rundown Protection Functions
@@@ -1,26 -1,12 +1,12 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998-2002 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            stree.c
+  * FILE:            ntoskrnl/ex/stree.c
   * PURPOSE:         Splay tree support
-  * PROGRAMMER:      Casper S. Hornstrup (chorns@users.sourceforge.net)
+  * 
+  * PROGRAMMERS:     Casper S. Hornstrup (chorns@users.sourceforge.net)
+  * 
   * NOTES:           Based on a splay tree implementation by
   *                  Daniel Stenberg <Daniel.Stenberg@sth.frontec.se>
   *                  http://www.contactor.se/~dast/stuff/dsplay-1.2.tar.gz
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/ex/synch.c
   * PURPOSE:         Synchronization Functions (Pushlocks)
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/ex/misc.c
   * PURPOSE:         Executive Utility Functions
@@@ -1,11 -1,11 +1,11 @@@
- /*
-  * COPYRIGHT:      See COPYING in the top level directory
-  * PROJECT:        ReactOS kernel
-  * FILE:           ntoskrnl/io/cleanup.c
-  * PURPOSE:        IRP cleanup
-  * PROGRAMMER:     David Welch (welch@mcmail.com)
-  * UPDATE HISTORY:
-  *                 30/05/98: Created
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/io/cleanup.c
+  * PURPOSE:         IRP cleanup
+  *
+  * PROGRAMMERS:     David Welch (welch@mcmail.com)
   */
  
  /* INCLUDES ****************************************************************/
@@@ -1,12 -1,12 +1,12 @@@
- /*
-  * COPYRIGHT:      See COPYING in the top level directory
-  * PROJECT:        ReactOS kernel
-  * FILE:           ntoskrnl/io/pnpmgr/devintrf.c
-  * PURPOSE:        Device interface functions
-  * PROGRAMMER:     Filip Navara (xnavara@volny.cz)
-  *                 Matthew Brace (ismarc@austin.rr.com)
-  * UPDATE HISTORY:
-  *    22/09/2003 FiN Created
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/io/deviface.c
+  * PURPOSE:         Device interface functions
+  * 
+  * PROGRAMMERS:     Filip Navara (xnavara@volny.cz)
+  *                  Matthew Brace (ismarc@austin.rr.com)
   */
  
  /* INCLUDES ******************************************************************/
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/io/flush.c
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/io/irq.c
@@@ -1,11 -1,11 +1,11 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            ntoskrnl/ke/bug.c
-  * PURPOSE:         Graceful system shutdown if a bug is detected
-  * PROGRAMMER:      David Welch (welch@mcmail.com)
-  * UPDATE HISTORY:
-  *                  Created 22/05/98
+  * FILE:            ntoskrnl/io/lock.c
+  * PURPOSE:         No purpose listed.
+  * 
+  * PROGRAMMERS:     David Welch (welch@mcmail.com)
   */
  
  /* INCLUDES *****************************************************************/
@@@ -1,12 -1,11 +1,11 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            ntoskrnl/ke/bug.c
-  * PURPOSE:         Graceful system shutdown if a bug is detected
-  * PROGRAMMER:      David Welch (welch@mcmail.com)
-  * UPDATE HISTORY:
-  *                  Created 22/05/98
-                   Changed NtCreateMailslotFile
+  * FILE:            ntoskrnl/io/mailslot.c
+  * PURPOSE:         No purpose listed.
+  * 
+  * PROGRAMMERS:     David Welch (welch@mcmail.com)
   */
  
  /* INCLUDES *****************************************************************/
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/io/npipe.c
@@@ -1,11 -1,11 +1,11 @@@
- /*
-  * COPYRIGHT:      See COPYING in the top level directory
-  * PROJECT:        ReactOS kernel
-  * FILE:           ntoskrnl/io/pnpmgr/remlock.c
-  * PURPOSE:        Plug & Play notification functions
-  * PROGRAMMER:     Filip Navara (xnavara@volny.cz)
-  * UPDATE HISTORY:
-  *  22/09/2003 FiN Created
 -/* $Id:$
++/* $Id$
+  *
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/io/pnpnotify.c
+  * PURPOSE:         Plug & Play notification functions
+  * 
+  * PROGRAMMERS:     Filip Navara (xnavara@volny.cz)
   */
  
  /* INCLUDES ******************************************************************/
@@@ -1,11 -1,11 +1,11 @@@
- /*
-  * COPYRIGHT:      See COPYING in the top level directory
-  * PROJECT:        ReactOS kernel
-  * FILE:           ntoskrnl/io/pnpmgr/report.c
-  * PURPOSE:        Device Changes Reporting functions
-  * PROGRAMMER:     Filip Navara (xnavara@volny.cz)
-  * UPDATE HISTORY:
-  *  22/09/2003 FiN Created
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/io/pnpreport.c
+  * PURPOSE:         Device Changes Reporting functions
+  * 
+  * PROGRAMMERS:     Filip Navara (xnavara@volny.cz)
   */
  
  /* INCLUDES ******************************************************************/
@@@ -1,11 -1,11 +1,11 @@@
- /*
-  * COPYRIGHT:      See COPYING in the top level directory
-  * PROJECT:        ReactOS kernel
-  * FILE:           ntoskrnl/io/pnpmgr/remlock.c
-  * PURPOSE:        Remove Lock functions
-  * PROGRAMMER:     Filip Navara (xnavara@volny.cz)
-  * UPDATE HISTORY:
-  *  22/09/2003 FiN Created
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/io/remlock.c
+  * PURPOSE:         Remove Lock functions
+  * 
+  * PROGRAMMERS:     Filip Navara (xnavara@volny.cz)
   */
  
  /* INCLUDES ******************************************************************/
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/io/timer.c
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  *
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/io/wdm.c
@@@ -1,5 -1,5 +1,5 @@@
 -/* $Id:$
 +/* $Id$
-  *
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/kd/kdebug.c
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
 -/* $Id:$
++/* $Id$
   *
-  *  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 kernel
   * FILE:            ntoskrnl/ke/apc.c
   * PURPOSE:         NT Implementation of APCs
@@@ -1,12 -1,11 +1,11 @@@
- /* $Id $
 -/* $Id:$
++/* $Id$
   *
-  * COPYRIGHT:  See COPYING in the top directory
-  * PROJECT:    ReactOS kernel v0.0.2
-  * FILE:       ntoskrnl/ke/error.c
-  * PURPOSE:    Error reason setting/getting
-  * PROGRAMMER: David Welch
-  * UPDATE HISTORY:
-  *             16/4/98: Created
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/ke/error.c
+  * PURPOSE:         Error reason setting/getting
+  *
+  * PROGRAMMERS:     David Welch
   */
  
  /* INCLUDE *****************************************************************/
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  *
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/ke/event.c
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 2000  ReactOS Team
 -/* $Id:$
++/* $Id$
   *
-  *  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 kernel
   * FILE:            ntoskrnl/ke/i386/bios.c
   * PURPOSE:         Support for calling the BIOS in v86 mode
@@@ -1,26 -1,11 +1,11 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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.
-  */
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            ntoskrnl/dbg/brkpoints.c
+  * FILE:            ntoskrnl/ke/i386/brkpoint.c
   * PURPOSE:         Handles breakpoints
+  *
+  * PROGRAMMERS:     No programmer listed.
   */
  
  /* INCLUDES *****************************************************************/
@@@ -1,23 -1,6 +1,6 @@@
 -/* $Id:$
 +/* $Id$
   *
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 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 kernel
   * FILE:            ntoskrnl/ke/i386/fpu.c
   * PURPOSE:         Handles the FPU
@@@ -1,28 -1,11 +1,11 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 2000  ReactOS Team
 -/* $Id:$
++/* $Id$
   *
-  *  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 kernel
-  * FILE:            ntoskrnl/ke/gdt.c
+  * FILE:            ntoskrnl/ke/i386/gdt.c
   * PURPOSE:         GDT managment
-  * PROGRAMMER:      David Welch (welch@cwcom.net)
-  * UPDATE HISTORY:
-  *                  Created 22/05/98
+  * 
+  * PROGRAMMERS:     David Welch (welch@cwcom.net)
   */
  
  /* INCLUDES *****************************************************************/
@@@ -1,11 -1,11 +1,11 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            ntoskrnl/ke/idt.c
+  * FILE:            ntoskrnl/ke/i386/idt.c
   * PURPOSE:         IDT managment
-  * PROGRAMMER:      David Welch (welch@cwcom.net)
-  * UPDATE HISTORY:
-  *                  Created 22/05/98
+  * 
+  * PROGRAMMERS:     David Welch (welch@cwcom.net)
   */
  
  /* INCLUDES *****************************************************************/
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 2000  ReactOS Team
 -/* $Id:$
++/* $Id$
   *
-  *  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 kernel
   * FILE:            ntoskrnl/ke/i386/ldt.c
   * PURPOSE:         LDT managment
@@@ -1,28 -1,11 +1,11 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team
 -/* $Id:$
++/* $Id$
   *
-  *  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.
-  */
- /*
-  * PROJECT:              ReactOS kernel
-  * FILE:                 ntoskrnl/ke/i386/thread.c
-  * PURPOSE:              Architecture multitasking functions
-  * PROGRAMMER:           David Welch (welch@cwcom.net)
-  * REVISION HISTORY:
-  *             27/06/98: Created
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/ke/i386/thread.c
+  * PURPOSE:         Architecture multitasking functions
+  * 
+  * PROGRAMMERS:     David Welch (welch@cwcom.net)
   */
  
  /* INCLUDES ****************************************************************/
@@@ -1,22 -1,6 +1,6 @@@
- /*
-  *  ReactOS kernel
-  *  Copyright (C) 2000, 2001  ReactOS Team
 -/* $Id:$
++/* $Id$
   *
-  *  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 kernel
   * FILE:            ntoskrnl/ke/i386/v86m.c
   * PURPOSE:         Support for v86 mode
@@@ -1,11 -1,11 +1,11 @@@
- /*
-  * COPYRIGHT:            See COPYING in the top level directory
-  * PURPOSE:              ReactOS kernel
-  * FILE:                 ntoskrnl/ke/kqueue.c
-  * PURPOSE:              Implement device queues
-  * PROGRAMMER:           David Welch (welch@mcmail.com)
-  * REVISION HISTORY:
-  *               08/07/98: Created
 -/* $Id:$
++/* $Id$
+  *
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PURPOSE:         ReactOS kernel
+  * FILE:            ntoskrnl/ke/kqueue.c
+  * PURPOSE:         Implement device queues
+  * 
+  * PROGRAMMERS:     David Welch (welch@mcmail.com)
   */
  
  /* INCLUDES ****************************************************************/
@@@ -1,12 -1,12 +1,12 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            ntoskrnl/ldr/sysdll.c
+  * FILE:            ntoskrnl/ldr/userldr.c
   * PURPOSE:         Loaders for PE executables
+  * 
   * PROGRAMMERS:     Jean Michault
   *                  Rex Jolliff (rex@lvcablemodem.com)
-  * UPDATE HISTORY:
-  *   DW   26/01/00  Created
   */
  
  /* INCLUDES *****************************************************************/
@@@ -1,3 -1,13 +1,13 @@@
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/mkconfig.c
+  * PURPOSE:         No purpose listed.
+  *
+  * PROGRAMMERS:     No programmer listed.
+  */
  #include <string.h>
  #include <stdlib.h>
  #include <stdio.h>
@@@ -1,5 -1,15 +1,15 @@@
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/mm/elf32.c
+  * PURPOSE:         No purpose listed.
+  *
+  * PROGRAMMERS:     No programmer listed.
+  */
  #define __ELF_WORD_SIZE 32
- #include "elf.c"
+ #include "elf.inc.h"
  
  extern NTSTATUS NTAPI Elf64FmtCreateSection
  (
@@@ -1,2 -1,12 +1,12 @@@
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/mm/elf64.c
+  * PURPOSE:         No purpose listed.
+  *
+  * PROGRAMMERS:     No programmer listed.
+  */
  #define __ELF_WORD_SIZE 64
- #include "elf.c"
+ #include "elf.inc.h"
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  *
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/mm/i386/pfault.c
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  *
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/mm/paging.c
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/mm/physical.c
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  *
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/mm/verifier.c
index 0ed2474,0000000..9bf4b8f
mode 100644,000000..100644
--- /dev/null
@@@ -1,371 -1,0 +1,365 @@@
-       <dependency>genntdll</dependency>\r
 +<module name="ntoskrnl" type="kernel">\r
 +      <importlibrary definition="ntoskrnl.def" />\r
-                               <file first="true">multiboot.S</file>\r
 +      <define name="_SEH_NO_NATIVE_NLG" />\r
 +      <define name="_DISABLE_TIDENTS" />\r
 +      <define name="__NTOSKRNL__" />\r
 +      <define name="__3GB__" />\r
 +      <include base="kjs">include</include>\r
 +      <include base="ntoskrnl">include</include>\r
 +      <library>csq</library>\r
 +      <library>hal</library>\r
 +      <library>kjs</library>\r
 +      <library>pseh</library>\r
 +      <library>rosrtl</library>\r
 +      <library>rtl</library>\r
 +      <library>string</library>\r
 +      <directory name="ke">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
-               <file>rtlfunc.c</file>\r
++                              <file first="true">main.S</file>\r
 +                              <file>bios.c</file>\r
 +                              <file>brkpoint.c</file>\r
 +                              <file>bthread.S</file>\r
 +                              <file>exp.c</file>\r
 +                              <file>fpu.c</file>\r
 +                              <file>gdt.c</file>\r
 +                              <file>i386-mcount.S</file>\r
 +                              <file>idt.c</file>\r
 +                              <file>irq.c</file>\r
 +                              <file>irqhand.s</file>\r
 +                              <file>kernel.c</file>\r
 +                              <file>ldt.c</file>\r
 +                              <file>stkswitch.S</file>\r
 +                              <file>syscall.S</file>\r
 +                              <file>thread.c</file>\r
 +                              <file>tlbflush.S</file>\r
 +                              <file>trap.s</file>\r
 +                              <file>tskswitch.S</file>\r
 +                              <file>tss.c</file>\r
 +                              <file>usercall.c</file>\r
 +                              <file>usertrap.c</file>\r
 +                              <file>v86m.c</file>\r
 +                              <file>v86m_sup.S</file>\r
++                              <file>vdm.c</file>\r
 +                      </directory>\r
 +              </if>\r
++              <file>alert.c</file>\r
 +              <file>apc.c</file>\r
 +              <file>bug.c</file>\r
 +              <file>catch.c</file>\r
 +              <file>critical.c</file>\r
 +              <file>device.c</file>\r
 +              <file>dpc.c</file>\r
 +              <file>error.c</file>\r
 +              <file>event.c</file>\r
 +              <file>gmutex.c</file>\r
 +              <file>ipi.c</file>\r
 +              <file>kqueue.c</file>\r
 +              <file>kthread.c</file>\r
 +              <file>main.c</file>\r
 +              <file>mutex.c</file>\r
 +              <file>process.c</file>\r
 +              <file>profile.c</file>\r
 +              <file>queue.c</file>\r
 +              <file>sem.c</file>\r
 +              <file>spinlock.c</file>\r
 +              <file>timer.c</file>\r
 +              <file>wait.c</file>\r
 +      </directory>\r
 +      <directory name="cc">\r
 +              <file>cacheman.c</file>\r
 +              <file>copy.c</file>\r
 +              <file>fs.c</file>\r
 +              <file>mdl.c</file>\r
 +              <file>pin.c</file>\r
 +              <file>view.c</file>\r
 +      </directory>\r
 +      <directory name="cm">\r
 +              <file>import.c</file>\r
 +              <file>ntfunc.c</file>\r
 +              <file>regfile.c</file>\r
 +              <file>registry.c</file>\r
 +              <file>regobj.c</file>\r
-               <file>slab.c</file>\r
 +      </directory>\r
 +      <directory name="dbg">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <if property="KDBG" value="1">\r
 +                                      <group>\r
 +                                              <file>i386-dis.c</file>\r
 +                                              <file>kdb_help.S</file>\r
 +                                      </group>\r
 +                              </if>\r
 +                      </directory>\r
 +              </if>\r
 +              <if property="KDBG" value="1">\r
 +                      <file>kdb.c</file>\r
 +                      <file>kdb_keyboard.c</file>\r
 +                      <file>kdb_serial.c</file>\r
 +                      <file>rdebug.c</file>\r
 +                      <file>profile.c</file>\r
 +              </if>\r
 +              <if property="DBG_OR_KDBG" value="true">\r
 +                      <file>kdb_stabs.c</file>\r
 +                      <file>kdb_symbols.c</file>\r
 +              </if>\r
 +              <file>dbgctrl.c</file>\r
 +              <file>errinfo.c</file>\r
 +              <file>print.c</file>\r
 +              <file>user.c</file>\r
 +      </directory>\r
 +      <directory name="ex">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>interlck.c</file>\r
 +                      </directory>\r
 +              </if>\r
 +              <file>btree.c</file>\r
 +              <file>callback.c</file>\r
++              <file>event.c</file>\r
++              <file>evtpair.c</file>\r
 +              <file>fmutex.c</file>\r
 +              <file>hashtab.c</file>\r
 +              <file>init.c</file>\r
 +              <file>interlck.c</file>\r
 +              <file>list.c</file>\r
 +              <file>lookas.c</file>\r
++              <file>mutant.c</file>\r
 +              <file>napi.c</file>\r
 +              <file>power.c</file>\r
++              <file>profile.c</file>\r
 +              <file>resource.c</file>\r
 +              <file>rundown.c</file>\r
++              <file>sem.c</file>\r
 +              <file>stree.c</file>\r
 +              <file>synch.c</file>\r
 +              <file>sysinfo.c</file>\r
 +              <file>time.c</file>\r
++              <file>timer.c</file>\r
 +              <file>util.c</file>\r
 +              <file>uuid.c</file>\r
 +              <file>win32k.c</file>\r
 +              <file>work.c</file>\r
 +              <file>zone.c</file>\r
++              <file>zw.S</file>\r
 +      </directory>\r
 +      <directory name="fs">\r
 +              <file>dbcsname.c</file>\r
 +              <file>filelock.c</file>\r
 +              <file>mcb.c</file>\r
 +              <file>mdl.c</file>\r
 +              <file>name.c</file>\r
 +              <file>notify.c</file>\r
 +              <file>oplock.c</file>\r
 +              <file>pool.c</file>\r
 +              <file>tunnel.c</file>\r
 +              <file>unc.c</file>\r
 +              <file>util.c</file>\r
 +      </directory>\r
 +      <directory name="inbv">\r
 +              <file>inbv.c</file>\r
 +      </directory>\r
 +      <directory name="io">\r
 +              <file>adapter.c</file>\r
 +              <file>arcname.c</file>\r
 +              <file>bootlog.c</file>\r
 +              <file>buildirp.c</file>\r
 +              <file>cancel.c</file>\r
 +              <file>cleanup.c</file>\r
 +              <file>cntrller.c</file>\r
 +              <file>create.c</file>\r
 +              <file>device.c</file>\r
 +              <file>deviface.c</file>\r
 +              <file>dir.c</file>\r
 +              <file>driver.c</file>\r
++              <file>efi.c</file>\r
 +              <file>errlog.c</file>\r
 +              <file>error.c</file>\r
 +              <file>event.c</file>\r
 +              <file>file.c</file>\r
 +              <file>flush.c</file>\r
 +              <file>fs.c</file>\r
 +              <file>iocomp.c</file>\r
 +              <file>ioctrl.c</file>\r
 +              <file>iomgr.c</file>\r
 +              <file>iowork.c</file>\r
 +              <file>irp.c</file>\r
 +              <file>irq.c</file>\r
 +              <file>lock.c</file>\r
 +              <file>mailslot.c</file>\r
 +              <file>mdl.c</file>\r
 +              <file>npipe.c</file>\r
 +              <file>page.c</file>\r
 +              <file>parttab.c</file>\r
++              <file>plugplay.c</file>\r
 +              <file>pnpdma.c</file>\r
 +              <file>pnpmgr.c</file>\r
 +              <file>pnpnotify.c</file>\r
 +              <file>pnpreport.c</file>\r
 +              <file>pnproot.c</file>\r
 +              <file>process.c</file>\r
 +              <file>queue.c</file>\r
 +              <file>rawfs.c</file>\r
 +              <file>remlock.c</file>\r
 +              <file>resource.c</file>\r
 +              <file>rw.c</file>\r
 +              <file>share.c</file>\r
 +              <file>shutdown.c</file>\r
 +              <file>symlink.c</file>\r
 +              <file>timer.c</file>\r
 +              <file>vpb.c</file>\r
 +              <file>wdm.c</file>\r
 +              <file>wmi.c</file>\r
 +              <file>xhaldisp.c</file>\r
 +              <file>xhaldrv.c</file>\r
 +      </directory>\r
 +      <directory name="kd">\r
 +              <file>dlog.c</file>\r
 +              <file>gdbstub.c</file>\r
 +              <file>kdebug.c</file>\r
 +              <file>mda.c</file>\r
 +              <file>service.c</file>\r
 +      </directory>\r
 +      <directory name="ldr">\r
 +              <file>init.c</file>\r
 +              <file>loader.c</file>\r
 +              <file>resource.c</file>\r
 +              <file>rtl.c</file>\r
 +              <file>sysdll.c</file>\r
 +              <file>userldr.c</file>\r
 +      </directory>\r
 +      <directory name="lpc">\r
 +              <file>close.c</file>\r
 +              <file>complete.c</file>\r
 +              <file>connect.c</file>\r
 +              <file>create.c</file>\r
 +              <file>listen.c</file>\r
 +              <file>port.c</file>\r
 +              <file>query.c</file>\r
 +              <file>queue.c</file>\r
 +              <file>receive.c</file>\r
 +              <file>reply.c</file>\r
 +              <file>send.c</file>\r
 +      </directory>\r
 +      <directory name="mm">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>memsafe.s</file>\r
 +                              <file>page.c</file>\r
 +                              <file>pfault.c</file>\r
 +                      </directory>\r
 +              </if>\r
 +              <file>anonmem.c</file>\r
 +              <file>aspace.c</file>\r
 +              <file>balance.c</file>\r
 +              <file>cont.c</file>\r
 +              <file>drvlck.c</file>\r
 +              <file>elf32.c</file>\r
 +              <file>elf64.c</file>\r
 +              <file>freelist.c</file>\r
 +              <file>iospace.c</file>\r
 +              <file>kmap.c</file>\r
 +              <file>marea.c</file>\r
 +              <file>mdl.c</file>\r
 +              <file>mm.c</file>\r
 +              <file>mminit.c</file>\r
 +              <file>mpw.c</file>\r
 +              <file>ncache.c</file>\r
 +              <file>npool.c</file>\r
 +              <file>pagefile.c</file>\r
 +              <file>pageop.c</file>\r
 +              <file>pager.c</file>\r
 +              <file>pagfault.c</file>\r
 +              <file>paging.c</file>\r
 +              <file>pe.c</file>\r
 +              <file>physical.c</file>\r
 +              <file>pool.c</file>\r
 +              <file>ppool.c</file>\r
 +              <file>region.c</file>\r
 +              <file>rmap.c</file>\r
 +              <file>section.c</file>\r
-       <directory name="nt">\r
-               <file>channel.c</file>\r
-               <file>efi.c</file>\r
-               <file>evtpair.c</file>\r
-               <file>misc.c</file>\r
-               <file>mutant.c</file>\r
-               <file>nt.c</file>\r
-               <file>ntevent.c</file>\r
-               <file>ntsem.c</file>\r
-               <file>nttimer.c</file>\r
-               <file>plugplay.c</file>\r
-               <file>profile.c</file>\r
-               <file>vdm.c</file>\r
-               <file>zw.c</file>\r
-       </directory>\r
 +              <file>verifier.c</file>\r
 +              <file>virtual.c</file>\r
 +              <file>wset.c</file>\r
 +      </directory>\r
 +      <directory name="ob">\r
 +              <file>dirobj.c</file>\r
 +              <file>handle.c</file>\r
 +              <file>namespc.c</file>\r
 +              <file>ntobj.c</file>\r
 +              <file>object.c</file>\r
 +              <file>sdcache.c</file>\r
 +              <file>security.c</file>\r
 +              <file>symlink.c</file>\r
 +      </directory>\r
 +      <directory name="po">\r
 +              <file>power.c</file>\r
 +      </directory>\r
 +      <directory name="ps">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>continue.c</file>\r
 +                      </directory>\r
 +              </if>\r
 +              <file>cid.c</file>\r
 +              <file>create.c</file>\r
 +              <file>debug.c</file>\r
 +              <file>idle.c</file>\r
 +              <file>job.c</file>\r
 +              <file>kill.c</file>\r
 +              <file>locale.c</file>\r
 +              <file>process.c</file>\r
 +              <file>psmgr.c</file>\r
 +              <file>suspend.c</file>\r
 +              <file>thread.c</file>\r
 +              <file>tinfo.c</file>\r
 +              <file>w32call.c</file>\r
 +              <file>win32.c</file>\r
 +      </directory>\r
 +      <directory name="rtl">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>alldiv.s</file>\r
 +                              <file>allmul.s</file>\r
 +                              <file>allrem.s</file>\r
 +                              <file>allshl.s</file>\r
 +                              <file>allshr.s</file>\r
 +                              <file>aulldiv.s</file>\r
 +                              <file>aullrem.s</file>\r
 +                              <file>aullshr.s</file>\r
 +                              <file>exception.c</file>\r
 +                              <file>seh.s</file>\r
 +                      </directory>\r
 +              </if>\r
 +              <file>atom.c</file>\r
 +              <file>capture.c</file>\r
 +              <file>ctype.c</file>\r
 +              <file>handle.c</file>\r
 +              <file>libsupp.c</file>\r
 +              <file>message.c</file>\r
++              <file>misc.c</file>\r
 +              <file>nls.c</file>\r
 +              <file>purecall.c</file>\r
 +              <file>rangelist.c</file>\r
 +              <file>regio.c</file>\r
 +              <file>sprintf.c</file>\r
 +              <file>stdlib.c</file>\r
 +              <file>string.c</file>\r
 +              <file>strtok.c</file>\r
 +              <file>swprintf.c</file>\r
 +              <file>wstring.c</file>\r
 +      </directory>\r
 +      <directory name="se">\r
 +              <file>access.c</file>\r
 +              <file>acl.c</file>\r
 +              <file>audit.c</file>\r
 +              <file>lsa.c</file>\r
 +              <file>luid.c</file>\r
 +              <file>priv.c</file>\r
 +              <file>sd.c</file>\r
 +              <file>semgr.c</file>\r
 +              <file>sid.c</file>\r
 +              <file>token.c</file>\r
 +      </directory>\r
 +      <file>ntoskrnl.rc</file>\r
 +</module>\r
@@@ -1,11 -1,11 +1,11 @@@
- /*
-  * COPYRIGHT:         See COPYING in the top level directory
-  * PROJECT:           ReactOS kernel
-  * PURPOSE:           Security manager
-  * FILE:              ntoskrnl/ob/security.c
-  * PROGRAMER:         ?
-  * REVISION HISTORY:
-  *                 26/07/98: Added stubs for security functions
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/ob/security.c
+  * PURPOSE:         Security manager
+  * 
+  * PROGRAMERS:      No programmer listed.
   */
  
  /* INCLUDES *****************************************************************/
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/ps/idle.c
@@@ -1,11 -1,11 +1,11 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
-  * FILE:            ntoskrnl/ps/jobs.c
+  * FILE:            ntoskrnl/ps/job.c
   * PURPOSE:         Job Native Functions
-  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
-  * UPDATE HISTORY:
-  *                  Created 16/07/04
+  * 
+  * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
   */
  
  /* Note: Jobs are only supported on Win2K+ */
@@@ -1,11 -1,11 +1,11 @@@
- /*
 -/* $Id:$
++/* $Id$
   *
   * COPYRIGHT:       See COPYING in the top level directory
-  * PROJECT:         ReactOS system libraries
-  * FILE:            lib/ntoskrnl/rtl/libsup.c
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/rtl/libsupp.c
   * PURPOSE:         Rtl library support routines
-  * UPDATE HISTORY:
   *
+  * PROGRAMMERS:     No programmer listed.
   */
  
  /* INCLUDES ******************************************************************/
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/rtl/string.c
@@@ -1,4 -1,5 +1,5 @@@
- /*
 -/* $Id:$
++/* $Id$
+  * 
   * COPYRIGHT:       See COPYING in the top level directory
   * PROJECT:         ReactOS kernel
   * FILE:            ntoskrnl/rtl/strtok.c
@@@ -1,4 -1,11 +1,11 @@@
 -/* $Id:$
 +/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/se/lsa.c
+  * PURPOSE:         No purpose listed.
+  *
+  * PROGRAMMERS:     No programmer listed.
   */
  
  #include <ntoskrnl.h>
@@@ -1,3 -1,13 +1,13 @@@
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/tests/setup.c
+  * PURPOSE:         No purpose listed.
+  *
+  * PROGRAMMERS:     No programmer listed.
+  */
  #include <windows.h>
  #include "regtests.h"
  
@@@ -1,3 -1,13 +1,13 @@@
 -/* $Id:$
++/* $Id$
+  * 
+  * COPYRIGHT:       See COPYING in the top level directory
+  * PROJECT:         ReactOS kernel
+  * FILE:            ntoskrnl/tests/tests/VirtualMemory.c
+  * PURPOSE:         No purpose listed.
+  *
+  * PROGRAMMERS:     No programmer listed.
+  */
  #include <ntoskrnl.h>
  #include "regtests.h"
  
index 17f55c0,0000000..13d13cc
mode 100644,000000..100644
--- /dev/null
@@@ -1,6 -1,0 +1,9 @@@
 +<directory name="eventlog">\r
 +      <xi:include href="eventlog/eventlog.xml" />\r
 +</directory>\r
 +<directory name="rpcss">\r
 +      <xi:include href="rpcss/rpcss.xml" />\r
 +</directory>\r
++<directory name="umpnpmgr">\r
++      <xi:include href="umpnpmgr/umpnpmgr.xml" />\r
++</directory>\r
index 0000000,0000000..fbeeff1
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,10 @@@
++<module name="umpnpmgr" type="win32cui">\r
++      <include base="umpnpmgr">.</include>\r
++      <define name="__USE_W32API" />\r
++      <library>ntdll</library>\r
++      <library>kernel32</library>\r
++      <library>advapi32</library>\r
++      <library>rpcrt4</library>\r
++      <file>umpnpmgr.c</file>\r
++      <file>umpnpmgr.rc</file>\r
++</module>\r
index ebb5019,0000000..c71a071
mode 100644,000000..100644
--- /dev/null
@@@ -1,9 -1,0 +1,21 @@@
 +<module name="smss" type="nativecui">\r
 +      <include base="smss">.</include>\r
 +      <define name="_DISABLE_TIDENTS" />\r
 +      <library>ntdll</library>\r
++      <file>client.c</file>\r
++      <file>Debug.c</file>\r
 +      <file>init.c</file>\r
++      <file>initdosdev.c</file>\r
++      <file>initenv.c</file>\r
++      <file>initheap.c</file>\r
++      <file>initmv.c</file>\r
++      <file>initobdir.c</file>\r
++      <file>initpage.c</file>\r
++      <file>initreg.c</file>\r
++      <file>initrun.c</file>\r
++      <file>initss.c</file>\r
++      <file>initwkdll.c</file>\r
 +      <file>smapi.c</file>\r
 +      <file>smss.c</file>\r
 +      <file>smss.rc</file>\r
 +</module>\r
Simple merge
index caaa62e,0000000..3a8a6a1
mode 100644,000000..100644
--- /dev/null
@@@ -1,132 -1,0 +1,134 @@@
 +<module name="win32k" type="kernelmodedriver">\r
 +      <importlibrary definition="win32k.def" />\r
 +      <include base="win32k">.</include>\r
 +      <include base="win32k">include</include>\r
 +      <include base="ntoskrnl">include</include>\r
 +      <include base="freetype">include</include>\r
 +      <define name="UNICODE" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="_WIN32_WINNT">0x0501</define>\r
 +      <define name="WINVER">0x600</define>\r
 +      <define name="_WIN32K_" />\r
 +      <library>rosrtl</library>\r
 +      <library>ntoskrnl</library>\r
 +      <library>hal</library>\r
 +      <library>pseh</library>\r
 +      <library>freetype</library>\r
 +      <directory name="dib">\r
 +              <file>dib1bpp.c</file>\r
 +              <file>dib4bpp.c</file>\r
 +              <file>dib8bpp.c</file>\r
 +              <file>dib16bpp.c</file>\r
 +              <file>dib24bpp.c</file>\r
 +              <file>dib32bpp.c</file>\r
 +              <file>dib.c</file>\r
 +      </directory>\r
 +      <directory name="eng">\r
 +              <file>bitblt.c</file>\r
 +              <file>brush.c</file>\r
 +              <file>clip.c</file>\r
 +              <file>copybits.c</file>\r
 +              <file>debug.c</file>\r
 +              <file>device.c</file>\r
++              <file>driverobj.c</file>\r
 +              <file>error.c</file>\r
 +              <file>event.c</file>\r
 +              <file>float.c</file>\r
 +              <file>gradient.c</file>\r
 +              <file>lineto.c</file>\r
 +              <file>mem.c</file>\r
 +              <file>misc.c</file>\r
 +              <file>mouse.c</file>\r
 +              <file>paint.c</file>\r
 +              <file>palette.c</file>\r
 +              <file>perfcnt.c</file>\r
 +              <file>semaphor.c</file>\r
 +              <file>sort.c</file>\r
 +              <file>surface.c</file>\r
 +              <file>transblt.c</file>\r
++              <file>window.c</file>\r
 +              <file>xlate.c</file>\r
 +      </directory>\r
 +      <directory name="ldr">\r
 +              <file>loader.c</file>\r
 +      </directory>\r
 +      <directory name="main">\r
 +              <file>dllmain.c</file>\r
 +              <file>svctabm.c</file>\r
 +      </directory>\r
 +      <directory name="misc">\r
 +              <file>driver.c</file>\r
 +              <file>error.c</file>\r
 +              <file>math.c</file>\r
 +              <file>object.c</file>\r
 +      </directory>\r
 +      <directory name="ntddraw">\r
 +              <file>ddraw.c</file>\r
 +              <file>stubs.c</file>\r
 +      </directory>\r
 +      <directory name="ntuser">\r
 +              <file>accelerator.c</file>\r
 +              <file>callback.c</file>\r
 +              <file>caret.c</file>\r
 +              <file>class.c</file>\r
 +              <file>clipboard.c</file>\r
 +              <file>csr.c</file>\r
 +              <file>cursoricon.c</file>\r
 +              <file>desktop.c</file>\r
 +              <file>focus.c</file>\r
 +              <file>guicheck.c</file>\r
 +              <file>hook.c</file>\r
 +              <file>hotkey.c</file>\r
 +              <file>input.c</file>\r
 +              <file>keyboard.c</file>\r
 +              <file>menu.c</file>\r
 +              <file>message.c</file>\r
 +              <file>metric.c</file>\r
 +              <file>misc.c</file>\r
 +              <file>monitor.c</file>\r
 +              <file>msgqueue.c</file>\r
 +              <file>painting.c</file>\r
 +              <file>prop.c</file>\r
 +              <file>scrollbar.c</file>\r
 +              <file>stubs.c</file>\r
 +              <file>timer.c</file>\r
 +              <file>useratom.c</file>\r
 +              <file>vis.c</file>\r
 +              <file>windc.c</file>\r
 +              <file>window.c</file>\r
 +              <file>winpos.c</file>\r
 +              <file>winsta.c</file>\r
 +      </directory>\r
 +      <directory name="objects">\r
 +              <file>bezier.c</file>\r
 +              <file>bitmaps.c</file>\r
 +              <file>brush.c</file>\r
 +              <file>cliprgn.c</file>\r
 +              <file>color.c</file>\r
 +              <file>coord.c</file>\r
 +              <file>dc.c</file>\r
 +              <file>dib.c</file>\r
 +              <file>fillshap.c</file>\r
 +              <file>font.c</file>\r
 +              <file>gdiobj.c</file>\r
 +              <file>icm.c</file>\r
 +              <file>line.c</file>\r
 +              <file>metafile.c</file>\r
 +              <file>paint.c</file>\r
 +              <file>palette.c</file>\r
 +              <file>path.c</file>\r
 +              <file>pen.c</file>\r
 +              <file>polyfill.c</file>\r
 +              <file>print.c</file>\r
 +              <file>rect.c</file>\r
 +              <file>region.c</file>\r
 +              <file>stockobj.c</file>\r
 +              <file>text.c</file>\r
 +              <file>wingl.c</file>\r
 +      </directory>\r
 +      <directory name="stubs">\r
 +              <file>stubs.c</file>\r
 +              <file>xpstubs.c</file>\r
 +      </directory>\r
 +      <file>win32k.rc</file>\r
 +</module>\r
 -PATH_TO_TOP = ..
 -
 -include $(PATH_TO_TOP)/rules.mak
 -
 -CFLAGS += -Wall -Werror
 -
 -TOOLS = \
 -      buildno$(EXE_POSTFIX) \
 -      regtests$(EXE_POSTFIX) \
 -      rcopy$(EXE_POSTFIX) \
 -      rdel$(EXE_POSTFIX) \
 -      rline$(EXE_POSTFIX) \
 -      rmkdir$(EXE_POSTFIX) \
 -      rrmdir$(EXE_POSTFIX) \
 -      rsym$(EXE_POSTFIX) \
 -      rtouch$(EXE_POSTFIX) \
 -      mkflpimg$(EXE_POSTFIX) \
 -      depends$(EXE_POSTFIX)
 -
 -CLEAN_FILES = $(TOOLS)
 -
 -all: $(TOOLS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target \
 -      wine2ros_target pipetools_target winebuild_target bin2res_target
 -
 -buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h
 -      @$(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c
 -      @$(EXE_PREFIX)buildno$(EXE_POSTFIX)
 -
 -regtests$(EXE_POSTFIX): regtests.c
 -      @$(HOST_CC) $(CFLAGS) -o regtests$(EXE_POSTFIX) regtests.c
 -
 -ifeq ($(HOST),mingw32-linux)
 -rcopy$(EXE_POSTFIX): rcopy.c
 -      @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rcopy.c -o rcopy$(EXE_POSTFIX)
 -endif
 -ifeq ($(HOST),mingw32-windows)
 -rcopy$(EXE_POSTFIX): rcopy.c
 -      @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rcopy.c -o rcopy$(EXE_POSTFIX)
 -endif
 -
 -rdel$(EXE_POSTFIX): rdel.c
 -      @$(HOST_CC) $(CFLAGS) rdel.c -o rdel$(EXE_POSTFIX)
 -
 -ifeq ($(HOST),mingw32-linux)
 -rline$(EXE_POSTFIX): rline.c
 -      @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rline.c -o rline$(EXE_POSTFIX)
 -endif
 -ifeq ($(HOST),mingw32-windows)
 -rline$(EXE_POSTFIX): rmkdir.c
 -      @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rline.c -o rline$(EXE_POSTFIX)
 -endif
 -
 -ifeq ($(HOST),mingw32-linux)
 -rmkdir$(EXE_POSTFIX): rmkdir.c
 -      @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rmkdir.c -o rmkdir$(EXE_POSTFIX)
 -endif
 -ifeq ($(HOST),mingw32-windows)
 -rmkdir$(EXE_POSTFIX): rmkdir.c
 -      @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rmkdir.c -o rmkdir$(EXE_POSTFIX)
 -endif
 -
 -ifeq ($(HOST),mingw32-linux)
 -rrmdir$(EXE_POSTFIX): rrmdir.c
 -      @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rrmdir.c -o rrmdir$(EXE_POSTFIX)
 -endif
 -ifeq ($(HOST),mingw32-windows)
 -rrmdir$(EXE_POSTFIX): rrmdir.c
 -      @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rrmdir.c -o rrmdir$(EXE_POSTFIX)
 -endif
 -
 -ifeq ($(HOST),mingw32-linux)
 -rsym$(EXE_POSTFIX): rsym.c
 -      @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rsym.c -o rsym$(EXE_POSTFIX)
 -endif
 -ifeq ($(HOST),mingw32-windows)
 -rsym$(EXE_POSTFIX): rsym.c
 -      @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rsym.c -o rsym$(EXE_POSTFIX)
 -endif
 -
 -ifeq ($(HOST),mingw32-linux)
 -rtouch$(EXE_POSTFIX): rtouch.c
 -      @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rtouch.c -o rtouch$(EXE_POSTFIX)
 -endif
 -ifeq ($(HOST),mingw32-windows)
 -rtouch$(EXE_POSTFIX): rtouch.c
 -      @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rtouch.c -o rtouch$(EXE_POSTFIX)
 -endif
 -
 -ifeq ($(HOST),mingw32-linux)
 -mkflpimg$(EXE_POSTFIX): mkflpimg.c
 -      @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS mkflpimg.c -o mkflpimg$(EXE_POSTFIX)
 -endif
 -ifeq ($(HOST),mingw32-windows)
 -mkflpimg$(EXE_POSTFIX): mkflpimg.c
 -      @$(HOST_CC) $(CFLAGS) -DDOS_PATHS mkflpimg.c -o mkflpimg$(EXE_POSTFIX)
 -endif
 -
 -depends$(EXE_POSTFIX): depends.c
 -      @$(HOST_CC) $(CFLAGS) depends.c -o depends$(EXE_POSTFIX)
 -
 -zlib_target:
 -      $(MAKE) --silent -C ../lib/zlib -f Makefile.host
 -
 -wmc_target:
 -      $(MAKE) --silent -C wmc wmc$(EXE_POSTFIX)
 -
 -cabman_target:
 -      $(MAKE) --silent -C cabman cabman$(EXE_POSTFIX)
 -
 -cdmake_target:
 -      $(MAKE) --silent -C cdmake cdmake$(EXE_POSTFIX)
 -
 -mkhive_target:
 -      $(MAKE) --silent -C mkhive mkhive$(EXE_POSTFIX)
 -
 -rgenstat_target:
 -      $(MAKE) --silent -C rgenstat rgenstat$(EXE_POSTFIX)
 -
 -wine2ros_target:
 -      $(MAKE) --silent -C wine2ros wine2ros$(EXE_POSTFIX)
 -
 -pipetools_target:
 -ifeq ($(HOST),mingw32-windows)
 -      $(MAKE) --silent -C pipetools
 -endif
 -
 -winebuild_target:
 -      $(MAKE) --silent -C winebuild winebuild$(EXE_POSTFIX)
 -
 -bin2res_target:
 -      $(MAKE) --silent -C bin2res bin2res$(EXE_POSTFIX)
 -
 -.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target
 -
 -
 -ifeq ($(HOST),mingw32-linux)
 -clean:
 -      $(MAKE) --silent -C cabman clean
 -      $(MAKE) --silent -C cdmake clean
 -      $(MAKE) --silent -C mkhive clean
 -      $(MAKE) --silent -C wmc clean
 -      $(MAKE) --silent -C rgenstat clean
 -      $(MAKE) --silent -C wine2ros clean
 -      $(MAKE) --silent -C winebuild clean
 -      $(MAKE) --silent -C bin2res clean
 -      $(MAKE) --silent -C ../lib/zlib -f Makefile.host clean
 -      @rm ../include/reactos/buildno.h
 -      @rm mkconfig
 -      @rm $(TOOLS)
 -endif
 -ifeq ($(HOST),mingw32-windows)
 -clean:
 -      $(MAKE) --silent -C cabman clean
 -      $(MAKE) --silent -C cdmake clean
 -      $(MAKE) --silent -C mkhive clean
 -      $(MAKE) --silent -C wmc clean
 -      $(MAKE) --silent -C rgenstat clean
 -      $(MAKE) --silent -C pipetools clean
 -      $(MAKE) --silent -C wine2ros clean
 -      $(MAKE) --silent -C winebuild clean
 -      $(MAKE) --silent -C bin2res clean
 -      $(MAKE) --silent -C ../lib/zlib -f Makefile.host clean
 -      -@del ..\include\reactos\buildno.h
 -      -@del *$(EXE_POSTFIX)
 -endif
 -
 -.PHONY: all clean
 +RMKDIR_BASE = tools
 +
 +RMKDIR_TARGET = \
 +      $(ROS_INTERMEDIATE)$(RMKDIR_BASE)$(SEP)rmkdir$(EXEPOSTFIX)
 +
 +RMKDIR_SOURCES = \
 +      $(RMKDIR_BASE)$(SEP)rmkdir.c
 +
 +RMKDIR_OBJECTS = \
 +      $(RMKDIR_SOURCES:.c=.o)
 +
- RMKDIR_HOST_CXXFLAGS = -g -Werror -Wall
++RMKDIR_HOST_CFLAGS = -g -Werror -Wall
 +
 +RMKDIR_HOST_LFLAGS = -g
 +
 +$(RMKDIR_TARGET): $(RMKDIR_OBJECTS)
 +      ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET)
 +
 +$(RMKDIR_OBJECTS): %.o : %.c
-       ${host_gcc} $(RMKDIR_HOST_CXXFLAGS) -c $< -o $@
- .PHONY: rmkdir
- rmkdir: $(RMKDIR_TARGET)
-       -
++      ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@
 +
 +
 +
 +BUILDNO_BASE = tools
 +
 +BUILDNO_TARGET = \
 +      $(ROS_INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX)
 +
 +BUILDNO_SOURCES = \
 +      $(BUILDNO_BASE)$(SEP)buildno.c
 +
 +BUILDNO_OBJECTS = \
 +      $(BUILDNO_SOURCES:.c=.o)
 +
- BUILDNO_HOST_CXXFLAGS = -g -Werror -Wall
++BUILDNO_HOST_CFLAGS = -g -Werror -Wall
 +
 +BUILDNO_HOST_LFLAGS = -g
 +
 +$(BUILDNO_TARGET): $(BUILDNO_OBJECTS)
 +      ${host_gcc} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_LFLAGS) -o $(BUILDNO_TARGET)
 +
 +$(BUILDNO_OBJECTS): %.o : %.c
-       ${host_gcc} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@
++      ${host_gcc} $(BUILDNO_HOST_CFLAGS) -c $< -o $@
 +
 +include$(SEP)reactos$(SEP)buildno.h: $(BUILDNO_TARGET)
 +      $(EXEPREFIX)$(BUILDNO_TARGET) include$(SEP)reactos$(SEP)buildno.h
 +
- .PHONY: buildno
- buildno: $(BUILDNO_TARGET)
++include tools/nci/makefile
++include tools/rbuild/makefile
 +include tools/wmc/makefile
@@@ -1089,7 -1089,7 +1089,7 @@@ void CDFParser::SkipSpaces(
  }
  
  
--bool CDFParser::IsNextToken(TOKEN Token, bool NoSpaces)
++bool CDFParser::IsNextToken(DFP_TOKEN Token, bool NoSpaces)
  /*
   * FUNCTION: Checks if next token equals Token
   * ARGUMENTS:
@@@ -32,7 -32,7 +32,7 @@@ typedef enum 
      TokenPeriod,
      TokenBackslash,
      TokenEnd,
--} TOKEN;
++} DFP_TOKEN;
  
  
  typedef enum {
@@@ -86,7 -86,7 +86,7 @@@ private
      unsigned long PerformCommand();
      unsigned long PerformFileCopy();
      void SkipSpaces();
--    bool IsNextToken(TOKEN Token, bool NoSpaces);
++    bool IsNextToken(DFP_TOKEN Token, bool NoSpaces);
      bool ReadLine();
      void NextToken();
      /* Parsing */
      unsigned long CurrentLine;
      unsigned long CurrentChar;
      /* Token */
--    TOKEN CurrentToken;
++    DFP_TOKEN CurrentToken;
      unsigned long CurrentInteger;
      char CurrentString[256];
  
index 0000000,483ac4c..9f0123f
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,56 +1,51 @@@
 -# $Id: makefile 12852 2005-01-06 13:58:04Z mf $
 -#
 -# ReactOS Operating System
 -#
 -# Generate files for a kernel module that needs to add a service table.
 -#
 -PATH_TO_TOP = ../..
++NCI_BASE = tools$(SEP)nci
 -TARGETNAME = ncitool
++NCI_TARGET = \
++      $(ROS_INTERMEDIATE)$(NCI_BASE)$(SEP)nci$(EXEPOSTFIX)
 -# WIN32K.SYS
 -WIN32K_SVC_DB = w32ksvc.db
 -WIN32K_SERVICE_TABLE=../../subsys/win32k/main/svctab.c
 -WIN32K_GDI_STUBS=../../lib/gdi32/misc/win32k.S
 -WIN32K_USER_STUBS=../../lib/user32/misc/win32k.S
 -
 -# NTOSKRNL.EXE
 -KERNEL_SVC_DB = sysfuncs.lst
 -KERNEL_SERVICE_TABLE = ../../include/ntdll/napi.h
 -NTDLL_STUBS = ../../lib/ntdll/napi.S
 -KERNEL_STUBS = ../../ntoskrnl/ex/zw.S
++NCI_SOURCES = \
++      $(NCI_BASE)$(SEP)ncitool.c
 -SVC_FILES =  $(KERNEL_SERVICE_TABLE) $(WIN32K_SERVICE_TABLE) $(NTDLL_STUBS) $(KERNEL_STUBS) $(WIN32K_GDI_STUBS) $(WIN32K_USER_STUBS)
++NCI_OBJECTS = \
++      $(NCI_SOURCES:.c=.o)
 -CLEAN_FILES = $(TARGETNAME)$(EXE_POSTFIX) $(SVC_FILES)
++NCI_HOST_CFLAGS = -Iinclude -g -Werror -Wall
 -BASE_CFLAGS = -I../../include
++NCI_HOST_LFLAGS = -g
 -CFLAGS += -Wall -Werror
++$(NCI_TARGET): $(NCI_OBJECTS)
++      ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_CFLAGS) -o $(NCI_TARGET)
 -all: $(SVC_FILES)
++$(NCI_OBJECTS): %.o : %.c
++      ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@
 -$(TARGETNAME)$(EXE_POSTFIX): $(TARGETNAME).c
 -      $(HOST_CC) \
 -              $(CFLAGS) \
 -              -o $(TARGETNAME) \
 -              -O2 \
 -              $(TARGETNAME).c
++# WIN32K.SYS
++WIN32K_SVC_DB = $(NCI_BASE)$(SEP)w32ksvc.db
++WIN32K_SERVICE_TABLE = subsys$(SEP)win32k$(SEP)main$(SEP)svctab.c
++WIN32K_GDI_STUBS = lib$(SEP)gdi32$(SEP)misc$(SEP)win32k.S
++WIN32K_USER_STUBS = lib$(SEP)user32$(SEP)misc$(SEP)win32k.S
 -$(SVC_FILES): $(TARGETNAME)$(EXE_POSTFIX)
 -      @./$(TARGETNAME)$(EXE_POSTFIX) \
++# NTOSKRNL.EXE
++KERNEL_SVC_DB = $(NCI_BASE)$(SEP)sysfuncs.lst
++KERNEL_SERVICE_TABLE = include$(SEP)ntdll$(SEP)napi.h
++NTDLL_STUBS = lib$(SEP)ntdll$(SEP)napi.S
++KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)zw.S
++
++NCI_SERVICE_FILES = \
++      $(KERNEL_SERVICE_TABLE) \
++      $(WIN32K_SERVICE_TABLE) \
++      $(NTDLL_STUBS) \
++      $(KERNEL_STUBS) \
++      $(WIN32K_GDI_STUBS) \
++      $(WIN32K_USER_STUBS)
++
++$(NCI_SERVICE_FILES): $(NCI_TARGET)
++      @$(EXEPREFIX)$(NCI_TARGET) \
+               $(KERNEL_SVC_DB) \
+               $(WIN32K_SVC_DB) \
+               $(KERNEL_SERVICE_TABLE) \
+               $(WIN32K_SERVICE_TABLE) \
+               $(NTDLL_STUBS) \
+               $(KERNEL_STUBS) \
+               $(WIN32K_GDI_STUBS) \
+               $(WIN32K_USER_STUBS)
 -
 -clean:
 -      - $(RM) $(CLEAN_FILES)
 -      
 -.PHONY: all clean 
 -
 -include ../../rules.mak
index b789fe1,0000000..222c786
mode 100644,000000..100644
--- /dev/null
@@@ -1,107 -1,0 +1,102 @@@
- .PHONY: rbuild\r
\r
- rbuild: $(RBUILD_TARGET)\r
-       -\r
\r
 +RBUILD_BASE = tools$(SEP)rbuild\r
 +\r
 +RBUILD_TARGET = \\r
 +      $(ROS_INTERMEDIATE)$(RBUILD_BASE)$(SEP)rbuild$(EXEPOSTFIX)\r
 +\r
 +RBUILD_TEST_TARGET = \\r
 +      $(ROS_INTERMEDIATE)$(RBUILD_BASE)$(SEP)rbuild_test$(EXEPOSTFIX)\r
 +\r
 +RBUILD_BACKEND_MINGW_BASE_SOURCES = \\r
 +      backend$(SEP)mingw$(SEP)mingw.cpp \\r
 +      backend$(SEP)mingw$(SEP)modulehandler.cpp\r
 +\r
 +RBUILD_BACKEND_DEVCPP_BASE_SOURCES = \\r
 +      backend$(SEP)devcpp$(SEP)devcpp.cpp\r
 +\r
 +RBUILD_BACKEND_BASE_SOURCES = \\r
 +      $(RBUILD_BACKEND_MINGW_BASE_SOURCES) \\r
 +      $(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \\r
 +      backend$(SEP)backend.cpp\r
 +\r
 +RBUILD_BASE_SOURCES = \\r
 +      $(RBUILD_BACKEND_BASE_SOURCES) \\r
 +      automaticdependency.cpp \\r
 +      compilerflag.cpp \\r
 +      define.cpp \\r
 +      exception.cpp \\r
 +      include.cpp \\r
 +      linkerflag.cpp \\r
 +      module.cpp \\r
 +      project.cpp \\r
 +      ssprintf.cpp \\r
 +      XML.cpp\r
 +\r
 +RBUILD_COMMON_SOURCES = \\r
 +      $(addprefix $(RBUILD_BASE)$(SEP), $(RBUILD_BASE_SOURCES)) \\r
 +\r
 +RBUILD_SPECIAL_SOURCES = \\r
 +      $(RBUILD_BASE)$(SEP)rbuild.cpp\r
 +\r
 +RBUILD_SOURCES = \\r
 +      $(RBUILD_COMMON_SOURCES) \\r
 +      $(RBUILD_SPECIAL_SOURCES)\r
 +\r
 +RBUILD_COMMON_OBJECTS = \\r
 +      $(addprefix $(ROS_INTERMEDIATE), $(RBUILD_COMMON_SOURCES:.cpp=.o))\r
 +\r
 +RBUILD_SPECIAL_OBJECTS = \\r
 +      $(addprefix $(ROS_INTERMEDIATE), $(RBUILD_SPECIAL_SOURCES:.cpp=.o))\r
 +\r
 +RBUILD_OBJECTS = \\r
 +      $(RBUILD_COMMON_OBJECTS) \\r
 +      $(RBUILD_SPECIAL_OBJECTS)\r
 +\r
 +RBUILD_TESTS = \\r
 +      tests$(SEP)definetest.cpp \\r
 +      tests$(SEP)functiontest.cpp \\r
 +      tests$(SEP)iftest.cpp \\r
 +      tests$(SEP)includetest.cpp \\r
 +      tests$(SEP)invoketest.cpp \\r
 +      tests$(SEP)linkerflagtest.cpp \\r
 +      tests$(SEP)moduletest.cpp \\r
 +      tests$(SEP)projecttest.cpp \\r
 +      tests$(SEP)sourcefiletest.cpp\r
 +\r
 +RBUILD_TEST_SPECIAL_SOURCES = \\r
 +      $(addprefix $(RBUILD_BASE)$(SEP), $(RBUILD_TESTS)) \\r
 +      $(RBUILD_BASE)$(SEP)tests$(SEP)alltests.cpp\r
 +\r
 +RBUILD_TEST_SOURCES = \\r
 +      $(RBUILD_COMMON_SOURCES) \\r
 +      $(RBUILD_TEST_SPECIAL_SOURCES)\r
 +\r
 +RBUILD_TEST_SPECIAL_OBJECTS = \\r
 +      $(addprefix $(ROS_INTERMEDIATE), $(RBUILD_TEST_SPECIAL_SOURCES:.cpp=.o))\r
 +\r
 +RBUILD_TEST_OBJECTS = \\r
 +      $(RBUILD_COMMON_OBJECTS) \\r
 +      $(RBUILD_TEST_SPECIAL_OBJECTS)\r
 +\r
 +RBUILD_HOST_CXXFLAGS = -g -I$(RBUILD_BASE) -Werror -Wall\r
 +\r
 +RBUILD_HOST_LFLAGS = -g\r
 +\r
 +$(RBUILD_TARGET): $(RBUILD_OBJECTS)\r
 +      ${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $(RBUILD_TARGET)\r
 +\r
 +$(RBUILD_COMMON_OBJECTS): %.o: %.cpp\r
 +      ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@\r
 +\r
 +$(RBUILD_SPECIAL_OBJECTS): %.o: %.cpp\r
 +      ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@\r
 +\r
 +$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS)\r
 +      ${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $(RBUILD_TEST_TARGET)\r
 +\r
 +$(RBUILD_TEST_SPECIAL_OBJECTS): %.o: %.cpp\r
 +      ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@\r
 +\r
 +.PHONY: rbuild_test\r
 +\r
 +rbuild_test: $(RBUILD_TEST_TARGET)\r
 +      $(RBUILD_TEST_TARGET)\r
@@@ -1,32 -1,58 +1,27 @@@
 -#
 -#  ReactOS/Wine message compiler
 -#
 -PATH_TO_TOP = ../..
 +WMC_BASE = tools$(SEP)wmc
  
 -TARGET=wmc$(EXE_POSTFIX)
 +WMC_TARGET = \
 +      $(ROS_INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX)
  
 -all: $(TARGET)
 +WMC_SOURCES = \
 +      $(WMC_BASE)$(SEP)getopt.c \
 +      $(WMC_BASE)$(SEP)lang.c \
 +      $(WMC_BASE)$(SEP)mcl.c \
 +      $(WMC_BASE)$(SEP)utils.c \
 +      $(WMC_BASE)$(SEP)wmc.c \
 +      $(WMC_BASE)$(SEP)write.c \
 +      $(WMC_BASE)$(SEP)y_tab.c \
 +      $(WMC_BASE)$(SEP)misc.c
  
 -OBJECTS = getopt.o lang.o mcl.o utils.o wmc.o write.o y_tab.o misc.o
 +WMC_OBJECTS = \
 +      $(WMC_SOURCES:.c=.o)
  
 -CLEAN_FILES = *.o wmc$(EXE_POSTFIX)
 +WMC_HOST_CXXFLAGS = -I$(WMC_BASE) -g -Werror -Wall
  
 -wmc$(EXE_POSTFIX): $(OBJECTS)
 -      $(HOST_CC) $(OBJECTS) -g -o wmc$(EXE_POSTFIX)
 +WMC_HOST_LFLAGS = -g
  
 -HOST_CFLAGS = -I. -Werror -Wall
 +$(WMC_TARGET): $(WMC_OBJECTS)
 +      ${host_gcc} $(WMC_OBJECTS) $(WMC_HOST_LFLAGS) -o $(WMC_TARGET)
  
 -getopt.o: getopt.c
 -      $(HOST_CC) $(HOST_CFLAGS) -g -c getopt.c -o getopt.o
 -
 -lang.o: lang.c
 -      $(HOST_CC) $(HOST_CFLAGS) -g -c lang.c -o lang.o
 -
 -misc.o: misc.c
 -      $(HOST_CC) $(HOST_CFLAGS) -g -c misc.c -o misc.o
 -
 -mcl.o: mcl.c
 -      $(HOST_CC) $(HOST_CFLAGS) -g -c mcl.c -o mcl.o
 -
 -utils.o: utils.c
 -      $(HOST_CC) $(HOST_CFLAGS) -g -c utils.c -o utils.o
 -
 -wmc.o: wmc.c
 -      $(HOST_CC) $(HOST_CFLAGS) -g -c wmc.c -o wmc.o
 -
 -write.o: write.c
 -      $(HOST_CC) $(HOST_CFLAGS) -g -c write.c -o write.o
 -
 -y_tab.o: y_tab.c
 -      $(HOST_CC) $(HOST_CFLAGS) -g -c y_tab.c -o y_tab.o
 -
 -ifeq ($(HOST),mingw32-linux)
 -clean:
 -      rm -f *.o
 -      rm -f wmc$(EXE_POSTFIX)
 -endif
 -ifeq ($(HOST),mingw32-windows)
 -clean:
 -      -del *.o
 -      -del wmc$(EXE_POSTFIX)
 -endif
 -
 -.phony: clean
 -
 -include $(PATH_TO_TOP)/rules.mak
 -
 -# EOF
 +$(WMC_OBJECTS): %.o : %.c
 +      ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@
- .PHONY: wmc
- wmc: $(WMC_TARGET)
-       -