Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

by chorns＠svn.reactos.com

Add stub GNU makefile Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml Modified: branches/xmlbuildsystem/reactos/tools/Makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/tools.xml Modified: branches/xmlbuildsystem/reactos/tools/wmc/makefile Deleted: branches/xmlbuildsystem/reactos/tools/wmc/wmc.xml _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-02-12 14:34:39 UTC (rev 13505) +++ branches/xmlbuildsystem/reactos/Makefile 2005-02-12 15:11:48 UTC (rev 13506) @@ -1,1079 +1,48 @@ -# -# 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 +default: Makefile.auto -# 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 - -# Keyboard layout libraries -DLLS_KBD = kbdda kbddv 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 msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ - packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi 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 - -# 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 regedt32 regsvr32 \ - reporterror services setup taskmgr userinit usetup welcome vmwinst \ - winlogon regedit winefile notepad reactos - -# System services -# rpcss eventlog -SYS_SVC = rpcss eventlog - -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 - -# 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 iface_additional - -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) $(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 iface_additional_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 iface/native - -iface_native_implib: - -iface_native_test: - -iface_native_clean: - $(MAKE) --silent -C iface/native clean - -iface_native_install: - -iface_native_bootcd: - -iface_additional: - $(MAKE) --silent -C iface/addsys - -iface_additional_implib: - -iface_additional_test: - -iface_additional_clean: - $(MAKE) --silent -C iface/addsys clean - -iface_additional_install: - -iface_additional_bootcd: - -.PHONY: iface_native iface_native_implib iface_native_test iface_native_clean \ - iface_native_install iface_native_bootcd iface_additional \ - iface_additional_implib iface_additional_test iface_additional_clean \ - iface_additional_install iface_additional_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 - - -# -# 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 ($(MP),1) -halx86: halx86/mp -else -halx86: halx86/up +ifneq ($(ROS_INTERMEDIATE),) +$(ROS_INTERMEDIATE): + ${nmkdir} $(ROS_INTERMEDIATE) endif -$(HALS): %: $(IMPLIB) - $(MAKE) -C hal/$* +Makefile.auto: rmkdir buildno wmc rbuild + tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw +# $(MAKE) $(MAKECMDGOALS) -$(HALS:%=%_implib): %_implib: dk - $(MAKE) --silent -C hal/$* implib +init:: \ + include$(SEP)reactos$(SEP)bugcodes.h \ + ntoskrnl$(SEP)bugcodes.rc \ + include$(SEP)reactos$(SEP)errcodes.h \ + lib$(SEP)kernel32$(SEP)errcodes.rc -$(HALS:%=%_test): %_test: - $(MAKE) -C hal/$* test +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 -$(HALS:%=%_clean): %_clean: - $(MAKE) -C hal/$* clean +include$(SEP)reactos$(SEP)errcodes.h lib$(SEP)kernel32$(SEP)errcodes.rc: 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 -$(HALS:%=%_install): %_install: - $(MAKE) -C hal/$* install +include tools/Makefile +include tools/rbuild/makefile -$(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) [truncated at 1000 lines; 730 more skipped]

20 years, 3 months

[ea] 13505: SM - Sorry, I forgot silence dbg messages!

by ea＠svn.reactos.com

SM - Sorry, I forgot silence dbg messages! Modified: trunk/reactos/subsys/smss/init.c Modified: trunk/reactos/subsys/smss/initdosdev.c Modified: trunk/reactos/subsys/smss/initenv.c Modified: trunk/reactos/subsys/smss/initheap.c Modified: trunk/reactos/subsys/smss/initmv.c Modified: trunk/reactos/subsys/smss/initobdir.c Modified: trunk/reactos/subsys/smss/initpage.c Modified: trunk/reactos/subsys/smss/initreg.c Modified: trunk/reactos/subsys/smss/initrun.c Modified: trunk/reactos/subsys/smss/initss.c Modified: trunk/reactos/subsys/smss/initwkdll.c Modified: trunk/reactos/subsys/smss/smss.c _____ Modified: trunk/reactos/subsys/smss/init.c --- trunk/reactos/subsys/smss/init.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/init.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -27,7 +27,7 @@ #include "smss.h" #include <rosrtl/string.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/smss/initdosdev.c --- trunk/reactos/subsys/smss/initdosdev.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initdosdev.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -26,7 +26,7 @@ #include "smss.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> static NTSTATUS STDCALL _____ Modified: trunk/reactos/subsys/smss/initenv.c --- trunk/reactos/subsys/smss/initenv.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initenv.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -26,7 +26,7 @@ #include "smss.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS */ _____ Modified: trunk/reactos/subsys/smss/initheap.c --- trunk/reactos/subsys/smss/initheap.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initheap.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -26,7 +26,7 @@ #include "smss.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> HANDLE SmpHeap = NULL; _____ Modified: trunk/reactos/subsys/smss/initmv.c --- trunk/reactos/subsys/smss/initmv.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initmv.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -26,7 +26,7 @@ #include "smss.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> NTSTATUS _____ Modified: trunk/reactos/subsys/smss/initobdir.c --- trunk/reactos/subsys/smss/initobdir.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initobdir.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -27,7 +27,7 @@ #include "smss.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> static NTSTATUS STDCALL _____ Modified: trunk/reactos/subsys/smss/initpage.c --- trunk/reactos/subsys/smss/initpage.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initpage.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -27,7 +27,7 @@ #include <rosrtl/string.h> #include <wchar.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> static NTSTATUS STDCALL _____ Modified: trunk/reactos/subsys/smss/initreg.c --- trunk/reactos/subsys/smss/initreg.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initreg.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -26,7 +26,7 @@ #include "smss.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> NTSTATUS _____ Modified: trunk/reactos/subsys/smss/initrun.c --- trunk/reactos/subsys/smss/initrun.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initrun.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -26,7 +26,7 @@ #include "smss.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> HANDLE Children[2] = {0, 0}; /* csrss, winlogon */ _____ Modified: trunk/reactos/subsys/smss/initss.c --- trunk/reactos/subsys/smss/initss.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initss.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -28,7 +28,7 @@ #include "smss.h" #include <rosrtl/string.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* TODO: this file should be totally rewritten _____ Modified: trunk/reactos/subsys/smss/initwkdll.c --- trunk/reactos/subsys/smss/initwkdll.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/initwkdll.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -26,7 +26,7 @@ #include "smss.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> static NTSTATUS STDCALL _____ Modified: trunk/reactos/subsys/smss/smss.c --- trunk/reactos/subsys/smss/smss.c 2005-02-12 14:33:41 UTC (rev 13504) +++ trunk/reactos/subsys/smss/smss.c 2005-02-12 14:34:39 UTC (rev 13505) @@ -24,7 +24,6 @@ * -------------------------------------------------------------------- */ #include "smss.h" -//#include <ntdll/rtl.h> #include <rosrtl/string.h> #define NDEBUG

20 years, 3 months

[ea] 13504: PSX: posixw32: some work for compatibility with future SM

by ea＠svn.reactos.com

PSX: posixw32: some work for compatibility with future SM Modified: trunk/posix/apps/posixw32/Makefile Modified: trunk/posix/apps/posixw32/posixw32.c Modified: trunk/posix/apps/posixw32/posixw32.rc _____ Modified: trunk/posix/apps/posixw32/Makefile --- trunk/posix/apps/posixw32/Makefile 2005-02-12 12:42:10 UTC (rev 13503) +++ trunk/posix/apps/posixw32/Makefile 2005-02-12 14:33:41 UTC (rev 13504) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 2003/01/05 18:27:19 robd Exp $ +# $Id$ # # Win32 Terminal Emulator for the POSIX+ subsystem. # @@ -15,7 +15,7 @@ TARGET_CFLAGS = -I$(PATH_TO_TOP_PSX)/include -TARGET_SDKLIBS = ntdll.a kernel32.a +TARGET_SDKLIBS = ntdll.a smdll.a kernel32.a TARGET_OBJECTS = \ $(TARGET_NAME).o \ _____ Modified: trunk/posix/apps/posixw32/posixw32.c --- trunk/posix/apps/posixw32/posixw32.c 2005-02-12 12:42:10 UTC (rev 13503) +++ trunk/posix/apps/posixw32/posixw32.c 2005-02-12 14:33:41 UTC (rev 13504) @@ -1,4 +1,4 @@ -/* $Id: posixw32.c,v 1.4 2003/08/28 20:01:23 ea Exp $ +/* $Id$ * * PROJECT : ReactOS Operating System / POSIX+ Environment Subsystem * DESCRIPTION: POSIXW32 - A DEC VT-100 terminal emulator for the PSX subsystem @@ -39,6 +39,7 @@ #define NTOS_MODE_USER #include <ntos.h> +#include <sm/helper.h> #include <psx/lpcproto.h> #include "vt100.h" @@ -53,7 +54,8 @@ #ifdef NDEBUG #define TRACE #else -#define TRACE OutputDebugString(__FUNCTION__) +//#define TRACE OutputDebugString(__FUNCTION__) +#define TRACE vtprintf("%s\n",__FUNCTION__) #endif /*** GLOBALS *********************************************************/ @@ -347,7 +349,31 @@ } return Status; } +/********************************************************************** + * RunPsxSs/0 + * + * DESCRIPTION + * This function is called only when initializing the session + * with PSXSS fails. We assume that it failed because the + * subsystem, being optional, is not running, therefore we + * ask the SM to start it up. + */ +PRIVATE NTSTATUS RunPsxSs(VOID) +{ + NTSTATUS Status; + HANDLE SmApiPort; + UNICODE_STRING Program; + RtlInitUnicodeString (& Program, L"POSIX"); + Status = SmConnectApiPort (NULL, 0, 0, & SmApiPort); + if(!NT_SUCCESS(Status)) + { + return Status; + } + Status = SmExecuteProgram (SmApiPort, & Program); + NtClose (SmApiPort); + return Status; +} /********************************************************************** * CreateTerminalToPsxChannel/0 PRIVATE * @@ -360,6 +386,7 @@ ULONG ConnectDataLength = sizeof ConnectData; SECURITY_QUALITY_OF_SERVICE Sqos; NTSTATUS Status; + LONG Count = 2; TRACE; @@ -374,22 +401,32 @@ * Try connecting to \POSIX+\SessionPort. */ RtlInitUnicodeString (& Session.ServerPort.Name, Session.ServerPort.NameBuffer); - OutputDebugStringW(Session.ServerPort.Name.Buffer); - Status = NtConnectPort ( - & Session.ServerPort.Handle, - & Session.ServerPort.Name, - & Sqos, - NULL, - NULL, - 0, - & ConnectData, - & ConnectDataLength - ); - if (STATUS_SUCCESS != Status) + while (Count--) { - vtprintf ("%s: %s: NtConnectPort failed with %08x\n", - MyName, __FUNCTION__, Status); - return Status; + OutputDebugStringW(Session.ServerPort.Name.Buffer); + Status = NtConnectPort ( + & Session.ServerPort.Handle, + & Session.ServerPort.Name, + & Sqos, + NULL, + NULL, + 0, + & ConnectData, + & ConnectDataLength + ); + if (STATUS_SUCCESS != Status) + { + if(Count) + { + vtprintf("%s: %s: asking SM to start PSXSS...\n",MyName,__FUNCTION__); + RunPsxSs(); + continue; + } + vtprintf ("%s: %s: NtConnectPort failed with %08x\n", + MyName, __FUNCTION__, Status); + return Status; + } + break; } Session.Identifier = ConnectData.PortIdentifier; return STATUS_SUCCESS; @@ -399,9 +436,9 @@ * InitializeSsIoChannel PRIVATE * * DESCRIPTION - * Create our objects in the system name space - * (CreateSessionObjects) and then connect to the session port - * (CreateControChannel). + * Connect to the session port (CreateControChannel) of the PSX + * subsystem. If that succeeds, create our objects in the system + * name space (CreateSessionObjects). */ PRIVATE NTSTATUS STDCALL InitializeSsIoChannel (VOID) { @@ -411,18 +448,18 @@ TRACE; - Status = CreateSessionObjects (Pid); + Status = CreateTerminalToPsxChannel (); if (STATUS_SUCCESS != Status) { - vtprintf ("%s: %s: CreateSessionObjects failed with %08x\n", - MyName, __FUNCTION__, Status); + vtprintf ("%s: %s: CreateTerminalToPsxChannel failed with %08x\n", + MyName, __FUNCTION__, Status); return Status; } - Status = CreateTerminalToPsxChannel (); + Status = CreateSessionObjects (Pid); if (STATUS_SUCCESS != Status) { - vtprintf ("%s: %s: CreateTerminalToPsxChannel failed with %08x\n", - MyName, __FUNCTION__, Status); + vtprintf ("%s: %s: CreateSessionObjects failed with %08x\n", + MyName, __FUNCTION__, Status); return Status; } return STATUS_SUCCESS; _____ Modified: trunk/posix/apps/posixw32/posixw32.rc --- trunk/posix/apps/posixw32/posixw32.rc 2005-02-12 12:42:10 UTC (rev 13503) +++ trunk/posix/apps/posixw32/posixw32.rc 2005-02-12 14:33:41 UTC (rev 13504) @@ -1,12 +1,6 @@ -/* $Id: posixw32.rc,v 1.5 2004/10/31 20:11:09 ea Exp $ */ -#include <defines.h> -#include <reactos/resource.h> - -#include <windows.h> - -#define REACTOS_STR_FILE_DESCRIPTION "W32 Terminal Emulator for POSIX+\0" +/* $Id$ */ +#define REACTOS_STR_FILE_DESCRIPTION "W32 Terminal Emulator for POSIX+ LPC pseudo tty\0" #define REACTOS_STR_INTERNAL_NAME "posixw32\0" #define REACTOS_STR_ORIGINAL_FILENAME "posixw32.exe\0" #include <reactos/version.rc> - /* EOF */

20 years, 3 months

[ekohl] 13503: - Implement RtlGetLastNtStatus, RtlGetLastWin32Error, RtlRestoreLastWin32Error, RtlSetLastWin32Error and RtlSetLastWin32ErrorAndNtStatusFromNtStatus.

by ekohl＠svn.reactos.com

- Implement RtlGetLastNtStatus, RtlGetLastWin32Error, RtlRestoreLastWin32Error, RtlSetLastWin32Error and RtlSetLastWin32ErrorAndNtStatusFromNtStatus. Modified: trunk/reactos/include/ntos/rtl.h Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/rtl/error.c _____ Modified: trunk/reactos/include/ntos/rtl.h --- trunk/reactos/include/ntos/rtl.h 2005-02-12 11:47:03 UTC (rev 13502) +++ trunk/reactos/include/ntos/rtl.h 2005-02-12 12:42:10 UTC (rev 13503) @@ -1320,6 +1320,12 @@ PBOOLEAN GroupDefaulted); NTSTATUS STDCALL +RtlGetLastNtStatus(VOID); + +ULONG STDCALL +RtlGetLastWin32Error(VOID); + +NTSTATUS STDCALL RtlGetNextRange (IN OUT PRTL_RANGE_LIST_ITERATOR Iterator, OUT PRTL_RANGE *Range, IN BOOLEAN MoveForwards); @@ -2218,6 +2224,9 @@ VOID STDCALL RtlResetRtlTranslations (IN PNLSTABLEINFO NlsTable); +VOID STDCALL +RtlRestoreLastWin32Error(IN ULONG Error); + /* * VOID * RtlRetrieveUlong ( @@ -2287,6 +2296,11 @@ VOID STDCALL RtlSetAllBits (IN PRTL_BITMAP BitMapHeader); +NTSTATUS STDCALL +RtlSetAttributesSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN SECURITY_DESCRIPTOR_CONTROL Control, + OUT PULONG Revision); + VOID STDCALL RtlSetBit ( @@ -2319,6 +2333,18 @@ BOOLEAN GroupDefaulted); NTSTATUS STDCALL +RtlSetInformationAcl (PACL Acl, + PVOID Information, + ULONG InformationLength, + ACL_INFORMATION_CLASS InformationClass); + +VOID STDCALL +RtlSetLastWin32Error(IN ULONG Error); + +VOID STDCALL +RtlSetLastWin32ErrorAndNtStatusFromNtStatus(IN NTSTATUS Status); + +NTSTATUS STDCALL RtlSetOwnerSecurityDescriptor (PSECURITY_DESCRIPTOR SecurityDescriptor, PSID Owner, BOOLEAN OwnerDefaulted); @@ -2334,12 +2360,6 @@ PUCHAR RMControl); NTSTATUS STDCALL -RtlSetInformationAcl (PACL Acl, - PVOID Information, - ULONG InformationLength, - ACL_INFORMATION_CLASS InformationClass); - -NTSTATUS STDCALL RtlSetTimeZoneInformation (IN OUT PTIME_ZONE_INFORMATION TimeZoneInformation); ULONG STDCALL _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-12 11:47:03 UTC (rev 13502) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-12 12:42:10 UTC (rev 13503) @@ -453,6 +453,8 @@ RtlGetFirstRange@12 RtlGetFullPathName_U@16 RtlGetGroupSecurityDescriptor@12 +RtlGetLastNtStatus@0 +RtlGetLastWin32Error@0 RtlGetLongestNtPathLength@0 RtlGetNextRange@12 RtlGetNtGlobalFlags@0 @@ -577,6 +579,7 @@ RtlReleaseResource@4 ;RtlRemoteCall RtlResetRtlTranslations@4 +RtlRestoreLastWin32Error@4=RtlSetLastWin32Error@4 RtlRunDecodeUnicodeString@8 RtlRunEncodeUnicodeString@8 RtlSecondsSince1970ToTime@8 @@ -593,6 +596,8 @@ RtlSetEnvironmentVariable@12 RtlSetGroupSecurityDescriptor@12 RtlSetInformationAcl@16 +RtlSetLastWin32Error@4 +RtlSetLastWin32ErrorAndNtStatusFromNtStatus@4 RtlSetOwnerSecurityDescriptor@12 RtlSetSaclSecurityDescriptor@16 RtlSetSecurityDescriptorRMControl@8 _____ Modified: trunk/reactos/lib/rtl/error.c --- trunk/reactos/lib/rtl/error.c 2005-02-12 11:47:03 UTC (rev 13502) +++ trunk/reactos/lib/rtl/error.c 2005-02-12 12:42:10 UTC (rev 13503) @@ -991,4 +991,44 @@ return -1; /* generic POSIX error */ } + +/* + * @implemented + */ +NTSTATUS STDCALL +RtlGetLastNtStatus(VOID) +{ + return NtCurrentTeb()->LastStatusValue; +} + + +/* + * @implemented + */ +ULONG STDCALL +RtlGetLastWin32Error(VOID) +{ + return NtCurrentTeb()->LastErrorValue; +} + + +/* + * @implemented + */ +VOID STDCALL +RtlSetLastWin32Error(IN ULONG Error) +{ + NtCurrentTeb()->LastErrorValue = Error; +} + + +/* + * @implemented + */ +VOID STDCALL +RtlSetLastWin32ErrorAndNtStatusFromNtStatus(IN NTSTATUS Status) +{ + NtCurrentTeb()->LastErrorValue = RtlNtStatusToDosError(Status); +} + /* EOF */

20 years, 3 months

[weiden] 13502: The structure layout of self-relative security descriptors may be different from absolute security descriptors depending on the platform. Self-relative security descriptors always use 32 bit offsets while absolute security descriptors use pointers which could be 64 bits.

by weiden＠svn.reactos.com

The structure layout of self-relative security descriptors may be different from absolute security descriptors depending on the platform. Self-relative security descriptors always use 32 bit offsets while absolute security descriptors use pointers which could be 64 bits. Modified: trunk/reactos/include/ntos/rtl.h Modified: trunk/reactos/include/ntos/security.h Modified: trunk/reactos/lib/advapi32/sec/sec.c Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/include/ntos/rtl.h --- trunk/reactos/include/ntos/rtl.h 2005-02-12 09:17:51 UTC (rev 13501) +++ trunk/reactos/include/ntos/rtl.h 2005-02-12 11:47:03 UTC (rev 13502) @@ -521,7 +521,7 @@ NTSTATUS STDCALL RtlAbsoluteToSelfRelativeSD (PSECURITY_DESCRIPTOR AbsSD, - PSECURITY_DESCRIPTOR RelSD, + PSECURITY_DESCRIPTOR_RELATIVE RelSD, PULONG BufferLength); NTSTATUS STDCALL @@ -852,6 +852,10 @@ RtlCreateSecurityDescriptor (PSECURITY_DESCRIPTOR SecurityDescriptor, ULONG Revision); +NTSTATUS STDCALL +RtlCreateSecurityDescriptorRelative (PSECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, + ULONG Revision); + NTSTATUS STDCALL RtlCreateSystemVolumeInformationFolder( @@ -1999,7 +2003,7 @@ NTSTATUS STDCALL RtlMakeSelfRelativeSD (PSECURITY_DESCRIPTOR AbsSD, - PSECURITY_DESCRIPTOR RelSD, + PSECURITY_DESCRIPTOR_RELATIVE RelSD, PULONG BufferLength); VOID STDCALL @@ -2261,7 +2265,7 @@ PLARGE_INTEGER Time); NTSTATUS STDCALL -RtlSelfRelativeToAbsoluteSD (PSECURITY_DESCRIPTOR RelSD, +RtlSelfRelativeToAbsoluteSD (PSECURITY_DESCRIPTOR_RELATIVE RelSD, PSECURITY_DESCRIPTOR AbsSD, PULONG AbsSDSize, PACL Dacl, @@ -2276,7 +2280,7 @@ NTSTATUS STDCALL RtlSelfRelativeToAbsoluteSD2( - PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor, + PSECURITY_DESCRIPTOR_RELATIVE SelfRelativeSecurityDescriptor, PULONG BufferSize ); @@ -2659,7 +2663,7 @@ BOOLEAN STDCALL RtlValidRelativeSecurityDescriptor ( - IN PSECURITY_DESCRIPTOR SecurityDescriptorInput, + IN PSECURITY_DESCRIPTOR_RELATIVE SecurityDescriptorInput, IN ULONG SecurityDescriptorLength, IN SECURITY_INFORMATION RequiredInformation ); _____ Modified: trunk/reactos/include/ntos/security.h --- trunk/reactos/include/ntos/security.h 2005-02-12 09:17:51 UTC (rev 13501) +++ trunk/reactos/include/ntos/security.h 2005-02-12 11:47:03 UTC (rev 13502) @@ -283,6 +283,17 @@ PACL Dacl; } SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR; +typedef struct _SECURITY_DESCRIPTOR_RELATIVE +{ + UCHAR Revision; + UCHAR Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + ULONG Owner; + ULONG Group; + ULONG Sacl; + ULONG Dacl; +} SECURITY_DESCRIPTOR_RELATIVE, *PSECURITY_DESCRIPTOR_RELATIVE; + typedef struct _LUID_AND_ATTRIBUTES { LUID Luid; _____ Modified: trunk/reactos/lib/advapi32/sec/sec.c --- trunk/reactos/lib/advapi32/sec/sec.c 2005-02-12 09:17:51 UTC (rev 13501) +++ trunk/reactos/lib/advapi32/sec/sec.c 2005-02-12 11:47:03 UTC (rev 13502) @@ -258,7 +258,7 @@ { NTSTATUS Status; - Status = RtlSelfRelativeToAbsoluteSD (pSelfRelativeSecurityDescriptor, + Status = RtlSelfRelativeToAbsoluteSD ((PSECURITY_DESCRIPTOR_RELATIVE)pSelfRelativeSecurityDescriptor, pAbsoluteSecurityDescriptor, lpdwAbsoluteSecurityDescriptorSize, pDacl, @@ -293,7 +293,7 @@ NTSTATUS Status; Status = RtlAbsoluteToSelfRelativeSD (pAbsoluteSecurityDescriptor, - pSelfRelativeSecurityDescriptor, + (PSECURITY_DESCRIPTOR_RELATIVE)pSelfRelativeSecurityDescriptor, (PULONG)lpdwBufferLength); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/lib/rtl/sd.c --- trunk/reactos/lib/rtl/sd.c 2005-02-12 09:17:51 UTC (rev 13501) +++ trunk/reactos/lib/rtl/sd.c 2005-02-12 11:47:03 UTC (rev 13502) @@ -17,6 +17,95 @@ /* FUNCTIONS ***************************************************************/ + +static VOID +RtlpQuerySecurityDescriptorPointers(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + OUT PSID *Owner OPTIONAL, + OUT PSID *Group OPTIONAL, + OUT PACL *Sacl OPTIONAL, + OUT PACL *Dacl OPTIONAL) +{ + if (SecurityDescriptor->Control & SE_SELF_RELATIVE) + { + PSECURITY_DESCRIPTOR_RELATIVE RelSD = (PSECURITY_DESCRIPTOR_RELATIVE)SecurityDescriptor; + if(Owner != NULL) + { + *Owner = ((RelSD->Owner != 0) ? (PSID)((ULONG_PTR)RelSD + RelSD->Owner) : NULL); + } + if(Group != NULL) + { + *Group = ((RelSD->Group != 0) ? (PSID)((ULONG_PTR)RelSD + RelSD->Group) : NULL); + } + if(Sacl != NULL) + { + *Sacl = (((RelSD->Control & SE_SACL_PRESENT) && (RelSD->Sacl != 0)) ? + (PSID)((ULONG_PTR)RelSD + RelSD->Sacl) : NULL); + } + if(Dacl != NULL) + { + *Dacl = (((RelSD->Control & SE_DACL_PRESENT) && (RelSD->Dacl != 0)) ? + (PSID)((ULONG_PTR)RelSD + RelSD->Dacl) : NULL); + } + } + else + { + if(Owner != NULL) + { + *Owner = SecurityDescriptor->Owner; + } + if(Group != NULL) + { + *Group = SecurityDescriptor->Group; + } + if(Sacl != NULL) + { + *Sacl = ((SecurityDescriptor->Control & SE_SACL_PRESENT) ? SecurityDescriptor->Sacl : NULL); + } + if(Dacl != NULL) + { + *Dacl = ((SecurityDescriptor->Control & SE_DACL_PRESENT) ? SecurityDescriptor->Dacl : NULL); + } + } +} + +static VOID +RtlpQuerySecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, + PSID* Owner, + PULONG OwnerLength, + PSID* Group, + PULONG GroupLength, + PACL* Dacl, + PULONG DaclLength, + PACL* Sacl, + PULONG SaclLength) +{ + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, + Owner, + Group, + Sacl, + Dacl); + + if (Owner != NULL) + { + *OwnerLength = ((*Owner != NULL) ? ROUND_UP(RtlLengthSid(*Owner), 4) : 0); + } + + if (Group != NULL) + { + *GroupLength = ((*Group != NULL) ? ROUND_UP(RtlLengthSid(*Group), 4) : 0); + } + + if (Dacl != NULL) + { + *DaclLength = ((*Dacl != NULL) ? ROUND_UP((*Dacl)->AclSize, 4) : 0); + } + + if (Sacl != NULL) + { + *SaclLength = ((*Sacl != NULL) ? ROUND_UP((*Sacl)->AclSize, 4) : 0); + } +} + /* * @implemented */ @@ -41,54 +130,61 @@ } +NTSTATUS STDCALL +RtlCreateSecurityDescriptorRelative (PSECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, + ULONG Revision) +{ + if (Revision != SECURITY_DESCRIPTOR_REVISION1) + { + return STATUS_UNKNOWN_REVISION; + } + + SecurityDescriptor->Revision = Revision; + SecurityDescriptor->Sbz1 = 0; + SecurityDescriptor->Control = SE_SELF_RELATIVE; + SecurityDescriptor->Owner = 0; + SecurityDescriptor->Group = 0; + SecurityDescriptor->Sacl = 0; + SecurityDescriptor->Dacl = 0; + + return STATUS_SUCCESS; +} + + /* * @implemented */ ULONG STDCALL RtlLengthSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor) { + PSID Owner, Group; + PACL Sacl, Dacl; ULONG Length = sizeof(SECURITY_DESCRIPTOR); + + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, + &Owner, + &Group, + &Sacl, + &Dacl); - if (SecurityDescriptor->Owner != NULL) + if (Owner != NULL) { - PSID Owner = SecurityDescriptor->Owner; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - Owner = (PSID)((ULONG_PTR)Owner + (ULONG_PTR)SecurityDescriptor); - } - Length = Length + ROUND_UP(RtlLengthSid(Owner), 4); + Length += ROUND_UP(RtlLengthSid(Owner), 4); } - if (SecurityDescriptor->Group != NULL) + if (Group != NULL) { - PSID Group = SecurityDescriptor->Group; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - Group = (PSID)((ULONG_PTR)Group + (ULONG_PTR)SecurityDescriptor); - } - Length = Length + ROUND_UP(RtlLengthSid(Group), 4); + Length += ROUND_UP(RtlLengthSid(Group), 4); } - if (SecurityDescriptor->Control & SE_DACL_PRESENT && - SecurityDescriptor->Dacl != NULL) + if (Dacl != NULL) { - PACL Dacl = SecurityDescriptor->Dacl; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - Dacl = (PACL)((ULONG_PTR)Dacl + (ULONG_PTR)SecurityDescriptor); - } - Length = Length + ROUND_UP(Dacl->AclSize, 4); + Length += ROUND_UP(Dacl->AclSize, 4); } - if (SecurityDescriptor->Control & SE_SACL_PRESENT && - SecurityDescriptor->Sacl != NULL) + if (Sacl != NULL) { - PACL Sacl = SecurityDescriptor->Sacl; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - Sacl = (PACL)((ULONG_PTR)Sacl + (ULONG_PTR)SecurityDescriptor); - } - Length = Length + ROUND_UP(Sacl->AclSize, 4); + Length += ROUND_UP(Sacl->AclSize, 4); } return Length; @@ -116,27 +212,13 @@ } *DaclPresent = TRUE; - if (SecurityDescriptor->Dacl == NULL) - { - *Dacl = NULL; - } - else - { - *Dacl = SecurityDescriptor->Dacl; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - *Dacl = (PACL)((ULONG_PTR)*Dacl + (ULONG_PTR)SecurityDescriptor); - } - } + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, + NULL, + NULL, + NULL, + Dacl); - if (SecurityDescriptor->Control & SE_DACL_DEFAULTED) - { - *DaclDefaulted = TRUE; - } - else - { - *DaclDefaulted = FALSE; - } + *DaclDefaulted = ((SecurityDescriptor->Control & SE_DACL_DEFAULTED) ? TRUE : FALSE); return STATUS_SUCCESS; } @@ -186,69 +268,28 @@ BOOLEAN STDCALL RtlValidSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor) { + PSID Owner, Group; + PACL Sacl, Dacl; + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return FALSE; } + + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, + &Owner, + &Group, + &Sacl, + &Dacl); - if (SecurityDescriptor->Owner != NULL) + if ((Owner != NULL && !RtlValidSid(Owner)) || + (Group != NULL && !RtlValidSid(Group)) || + (Sacl != NULL && !RtlValidAcl(Sacl)) || + (Dacl != NULL && !RtlValidAcl(Dacl))) { - PSID Owner = SecurityDescriptor->Owner; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - Owner = (PSID)((ULONG_PTR)Owner + (ULONG_PTR)SecurityDescriptor); - } - - if (!RtlValidSid(Owner)) - { - return FALSE; - } + return FALSE; } - if (SecurityDescriptor->Group != NULL) - { - PSID Group = SecurityDescriptor->Group; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - Group = (PSID)((ULONG_PTR)Group + (ULONG_PTR)SecurityDescriptor); - } - - if (!RtlValidSid(Group)) - { - return FALSE; - } - } - - if (SecurityDescriptor->Control & SE_DACL_PRESENT && - SecurityDescriptor->Dacl != NULL) - { - PACL Dacl = SecurityDescriptor->Dacl; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - Dacl = (PACL)((ULONG_PTR)Dacl + (ULONG_PTR)SecurityDescriptor); - } - - if (!RtlValidAcl(Dacl)) - { - return FALSE; - } - } - - if (SecurityDescriptor->Control & SE_SACL_PRESENT && - SecurityDescriptor->Sacl != NULL) - { - PACL Sacl = SecurityDescriptor->Sacl; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - Sacl = (PACL)((ULONG_PTR)Sacl + (ULONG_PTR)SecurityDescriptor); - } - - if (!RtlValidAcl(Sacl)) - { - return FALSE; - } - } - return TRUE; } @@ -296,27 +337,13 @@ return STATUS_UNKNOWN_REVISION; } - if (SecurityDescriptor->Owner != NULL) - { - *Owner = SecurityDescriptor->Owner; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - *Owner = (PSID)((ULONG_PTR)*Owner + (ULONG_PTR)SecurityDescriptor); - } - } - else - { - *Owner = NULL; - } + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, + Owner, + NULL, + NULL, + NULL); - if (SecurityDescriptor->Control & SE_OWNER_DEFAULTED) - { - *OwnerDefaulted = TRUE; - } - else - { - *OwnerDefaulted = FALSE; - } + *OwnerDefaulted = ((SecurityDescriptor->Control & SE_OWNER_DEFAULTED) ? TRUE : FALSE); return STATUS_SUCCESS; } @@ -364,142 +391,25 @@ return STATUS_UNKNOWN_REVISION; } - if (SecurityDescriptor->Group != NULL) - { - *Group = SecurityDescriptor->Group; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - *Group = (PSID)((ULONG_PTR)*Group + (ULONG_PTR)SecurityDescriptor); - } - } - else - { - *Group = NULL; - } + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, + NULL, + Group, + NULL, + NULL); - if (SecurityDescriptor->Control & SE_GROUP_DEFAULTED) - { - *GroupDefaulted = TRUE; - } - else - { - *GroupDefaulted = FALSE; - } + *GroupDefaulted = ((SecurityDescriptor->Control & SE_GROUP_DEFAULTED) ? TRUE : FALSE); return STATUS_SUCCESS; } -static VOID -RtlpQuerySecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, - PSID* Owner, - PULONG OwnerLength, - PSID* Group, - PULONG GroupLength, - PACL* Dacl, - PULONG DaclLength, - PACL* Sacl, - PULONG SaclLength) -{ - if (SecurityDescriptor->Owner != NULL) - { - *Owner = SecurityDescriptor->Owner; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - *Owner = (PSID)((ULONG_PTR)*Owner + (ULONG_PTR)SecurityDescriptor); - } - } - else - { - *Owner = NULL; - } - - if (*Owner != NULL) - { - *OwnerLength = ROUND_UP(RtlLengthSid(*Owner), 4); - } - else - { - *OwnerLength = 0; - } - - if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && - SecurityDescriptor->Dacl != NULL) - { - *Dacl = SecurityDescriptor->Dacl; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - *Dacl = (PACL)((ULONG_PTR)*Dacl + (ULONG_PTR)SecurityDescriptor); - } - } - else - { - *Dacl = NULL; - } - - if (*Dacl != NULL) - { - *DaclLength = ROUND_UP((*Dacl)->AclSize, 4); - } - else - { - *DaclLength = 0; - } - - if (SecurityDescriptor->Group != NULL) - { - *Group = SecurityDescriptor->Group; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - *Group = (PSID)((ULONG_PTR)*Group + (ULONG_PTR)SecurityDescriptor); - } - } - else - { - *Group = NULL; - } - - if (*Group != NULL) - { - *GroupLength = ROUND_UP(RtlLengthSid(*Group), 4); - } - else - { - *GroupLength = 0; - } - - if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && - SecurityDescriptor->Sacl != NULL) - { - *Sacl = SecurityDescriptor->Sacl; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - *Sacl = (PACL)((ULONG_PTR)*Sacl + (ULONG_PTR)SecurityDescriptor); - } - } - else - { - *Sacl = NULL; - } - - if (*Sacl != NULL) - { - *SaclLength = ROUND_UP((*Sacl)->AclSize, 4); - } - else - { - *SaclLength = 0; - } -} - - /* * @implemented */ NTSTATUS STDCALL RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR AbsSD, - PSECURITY_DESCRIPTOR RelSD, - PULONG BufferLength) + PSECURITY_DESCRIPTOR_RELATIVE RelSD, + PULONG BufferLength) { PSID Owner; PSID Group; @@ -522,7 +432,7 @@ &Sacl, &SaclLength); - TotalLength = OwnerLength + GroupLength + SaclLength + DaclLength + sizeof(SECURITY_DESCRIPTOR); + TotalLength = sizeof(SECURITY_DESCRIPTOR_RELATIVE) + OwnerLength + GroupLength + SaclLength + DaclLength; if (*BufferLength < TotalLength) { return STATUS_BUFFER_TOO_SMALL; @@ -530,48 +440,48 @@ RtlZeroMemory(RelSD, TotalLength); - memmove(RelSD, - AbsSD, - sizeof(SECURITY_DESCRIPTOR)); - Current = (ULONG_PTR)RelSD + sizeof(SECURITY_DESCRIPTOR); + RelSD->Revision = AbsSD->Revision; + RelSD->Sbz1 = AbsSD->Sbz1; + RelSD->Control = AbsSD->Control | SE_SELF_RELATIVE; + + Current = (ULONG_PTR)(RelSD + 1); + if (SaclLength != 0) { - memmove((PVOID)Current, - Sacl, - SaclLength); - RelSD->Sacl = (PACL)((ULONG_PTR)Current - (ULONG_PTR)RelSD); + RtlCopyMemory((PVOID)Current, + Sacl, + SaclLength); + RelSD->Sacl = (ULONG)((ULONG_PTR)Current - (ULONG_PTR)RelSD); Current += SaclLength; } if (DaclLength != 0) { - memmove((PVOID)Current, - Dacl, - DaclLength); - RelSD->Dacl = (PACL)((ULONG_PTR)Current - (ULONG_PTR)RelSD); + RtlCopyMemory((PVOID)Current, + Dacl, + DaclLength); + RelSD->Dacl = (ULONG)((ULONG_PTR)Current - (ULONG_PTR)RelSD); Current += DaclLength; } if (OwnerLength != 0) { - memmove((PVOID)Current, - Owner, - OwnerLength); - RelSD->Owner = (PSID)((ULONG_PTR)Current - (ULONG_PTR)RelSD); + RtlCopyMemory((PVOID)Current, + Owner, + OwnerLength); + RelSD->Owner = (ULONG)((ULONG_PTR)Current - (ULONG_PTR)RelSD); Current += OwnerLength; } if (GroupLength != 0) { - memmove((PVOID)Current, - Group, - GroupLength); - RelSD->Group = (PSID)((ULONG_PTR)Current - (ULONG_PTR)RelSD); + RtlCopyMemory((PVOID)Current, + Group, + GroupLength); + RelSD->Group = (ULONG)((ULONG_PTR)Current - (ULONG_PTR)RelSD); } - RelSD->Control |= SE_SELF_RELATIVE; - return STATUS_SUCCESS; } @@ -581,7 +491,7 @@ */ NTSTATUS STDCALL RtlAbsoluteToSelfRelativeSD(PSECURITY_DESCRIPTOR AbsSD, - PSECURITY_DESCRIPTOR RelSD, + PSECURITY_DESCRIPTOR_RELATIVE RelSD, PULONG BufferLength) { if (AbsSD->Control & SE_SELF_RELATIVE) @@ -658,27 +568,13 @@ } *SaclPresent = TRUE; - if (SecurityDescriptor->Sacl == NULL) - { - *Sacl = NULL; - } - else - { - *Sacl = SecurityDescriptor->Sacl; - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - *Sacl = (PACL)((ULONG_PTR)*Sacl + (ULONG_PTR)SecurityDescriptor); - } - } + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, + NULL, + NULL, + Sacl, + NULL); - if (SecurityDescriptor->Control & SE_SACL_DEFAULTED) - { - *SaclDefaulted = TRUE; - } - else - { - *SaclDefaulted = FALSE; - } + *SaclDefaulted = ((SecurityDescriptor->Control & SE_SACL_DEFAULTED) ? TRUE : FALSE); return STATUS_SUCCESS; } @@ -726,7 +622,7 @@ * @implemented */ NTSTATUS STDCALL -RtlSelfRelativeToAbsoluteSD(PSECURITY_DESCRIPTOR RelSD, +RtlSelfRelativeToAbsoluteSD(PSECURITY_DESCRIPTOR_RELATIVE RelSD, PSECURITY_DESCRIPTOR AbsSD, PDWORD AbsSDSize, PACL Dacl, @@ -747,10 +643,17 @@ PACL pDacl; PACL pSacl; + if (RelSD->Revision != SECURITY_DESCRIPTOR_REVISION1) + { + return STATUS_UNKNOWN_REVISION; + } + if (!(RelSD->Control & SE_SELF_RELATIVE)) + { return STATUS_BAD_DESCRIPTOR_FORMAT; + } - RtlpQuerySecurityDescriptor (RelSD, + RtlpQuerySecurityDescriptor ((PSECURITY_DESCRIPTOR)RelSD, &pOwner, &OwnerLength, &pGroup, @@ -764,16 +667,18 @@ GroupLength > *GroupSize || DaclLength > *DaclSize || SaclLength > *SaclSize) + { return STATUS_BUFFER_TOO_SMALL; + } - memmove (Owner, pOwner, OwnerLength); - memmove (Group, pGroup, GroupLength); - memmove (Dacl, pDacl, DaclLength); - memmove (Sacl, pSacl, SaclLength); + RtlCopyMemory (Owner, pOwner, OwnerLength); + RtlCopyMemory (Group, pGroup, GroupLength); + RtlCopyMemory (Dacl, pDacl, DaclLength); + RtlCopyMemory (Sacl, pSacl, SaclLength); - memmove (AbsSD, RelSD, sizeof (SECURITY_DESCRIPTOR)); - - AbsSD->Control &= ~SE_SELF_RELATIVE; + AbsSD->Revision = RelSD->Revision; + AbsSD->Sbz1 = RelSD->Sbz1; + AbsSD->Control = RelSD->Control & ~SE_SELF_RELATIVE; AbsSD->Owner = Owner; AbsSD->Group = Group; AbsSD->Dacl = Dacl; @@ -792,7 +697,7 @@ * @unimplemented */ NTSTATUS STDCALL -RtlSelfRelativeToAbsoluteSD2(PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor, +RtlSelfRelativeToAbsoluteSD2(PSECURITY_DESCRIPTOR_RELATIVE SelfRelativeSecurityDescriptor, PULONG BufferSize) { UNIMPLEMENTED; @@ -804,18 +709,18 @@ * @implemented */ BOOLEAN STDCALL -RtlValidRelativeSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptorInput, +RtlValidRelativeSecurityDescriptor(IN PSECURITY_DESCRIPTOR_RELATIVE SecurityDescriptorInput, IN ULONG SecurityDescriptorLength, IN SECURITY_INFORMATION RequiredInformation) { - if (SecurityDescriptorLength < sizeof(SECURITY_DESCRIPTOR) || + if (SecurityDescriptorLength < sizeof(SECURITY_DESCRIPTOR_RELATIVE) || SecurityDescriptorInput->Revision != SECURITY_DESCRIPTOR_REVISION1 || !(SecurityDescriptorInput->Control & SE_SELF_RELATIVE)) { return FALSE; } - if (SecurityDescriptorInput->Owner != NULL) + if (SecurityDescriptorInput->Owner != 0) { PSID Owner = (PSID)((ULONG_PTR)SecurityDescriptorInput->Owner + (ULONG_PTR)SecurityDescriptorInput); if (!RtlValidSid(Owner)) @@ -828,7 +733,7 @@ return FALSE; } - if (SecurityDescriptorInput->Group != NULL) + if (SecurityDescriptorInput->Group != 0) { PSID Group = (PSID)((ULONG_PTR)SecurityDescriptorInput->Group + (ULONG_PTR)SecurityDescriptorInput); if (!RtlValidSid(Group)) @@ -843,7 +748,7 @@ if (SecurityDescriptorInput->Control & SE_DACL_PRESENT) { - if (SecurityDescriptorInput->Dacl != NULL && + if (SecurityDescriptorInput->Dacl != 0 && !RtlValidAcl((PACL)((ULONG_PTR)SecurityDescriptorInput->Dacl + (ULONG_PTR)SecurityDescriptorInput))) { return FALSE; @@ -856,7 +761,7 @@ if (SecurityDescriptorInput->Control & SE_SACL_PRESENT) { - if (SecurityDescriptorInput->Sacl != NULL && + if (SecurityDescriptorInput->Sacl != 0 && !RtlValidAcl((PACL)((ULONG_PTR)SecurityDescriptorInput->Sacl + (ULONG_PTR)SecurityDescriptorInput))) { return FALSE; _____ Modified: trunk/reactos/ntoskrnl/se/sd.c --- trunk/reactos/ntoskrnl/se/sd.c 2005-02-12 09:17:51 UTC (rev 13501) +++ trunk/reactos/ntoskrnl/se/sd.c 2005-02-12 11:47:03 UTC (rev 13502) @@ -126,7 +126,7 @@ ULONG OwnerSAC = 0, GroupSAC = 0; ULONG OwnerSize = 0, GroupSize = 0; ULONG SaclSize = 0, DaclSize = 0; - ULONG DescriptorSize = sizeof(SECURITY_DESCRIPTOR); + ULONG DescriptorSize = 0; NTSTATUS Status = STATUS_SUCCESS; if(OriginalSecurityDescriptor != NULL) @@ -135,12 +135,49 @@ { _SEH_TRY { + /* first only probe and copy until the control field of the descriptor + to determine whether it's a self-relative descriptor */ + DescriptorSize = (ULONG)((ULONG_PTR)&OriginalSecurityDescriptor->Control - + (ULONG_PTR)OriginalSecurityDescriptor) + + sizeof(OriginalSecurityDescriptor->Control); ProbeForRead(OriginalSecurityDescriptor, - sizeof(SECURITY_DESCRIPTOR), + DescriptorSize, sizeof(ULONG)); + if(OriginalSecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) + { + Status = STATUS_UNKNOWN_REVISION; + _SEH_LEAVE; + } + /* make a copy on the stack */ - DescriptorCopy = *OriginalSecurityDescriptor; + DescriptorCopy.Revision = OriginalSecurityDescriptor->Revision; + DescriptorCopy.Sbz1 = OriginalSecurityDescriptor->Sbz1; + DescriptorCopy.Control = OriginalSecurityDescriptor->Control; + DescriptorSize = ((DescriptorCopy.Control & SE_SELF_RELATIVE) ? + sizeof(SECURITY_DESCRIPTOR_RELATIVE) : sizeof(SECURITY_DESCRIPTOR)); + + /* probe and copy the entire security descriptor structure. The SIDs + and ACLs will be probed and copied later though */ + ProbeForRead(OriginalSecurityDescriptor, + DescriptorSize, + sizeof(ULONG)); + if(DescriptorCopy.Control & SE_SELF_RELATIVE) + { + PSECURITY_DESCRIPTOR_RELATIVE RelSD = (PSECURITY_DESCRIPTOR_RELATIVE)OriginalSecurityDescriptor; + + DescriptorCopy.Owner = (PSID)RelSD->Owner; + DescriptorCopy.Group = (PSID)RelSD->Group; + DescriptorCopy.Sacl = (PACL)RelSD->Sacl; + DescriptorCopy.Dacl = (PACL)RelSD->Dacl; + } + else + { + DescriptorCopy.Owner = OriginalSecurityDescriptor->Owner; + DescriptorCopy.Group = OriginalSecurityDescriptor->Group; + DescriptorCopy.Sacl = OriginalSecurityDescriptor->Sacl; + DescriptorCopy.Dacl = OriginalSecurityDescriptor->Dacl; + } } _SEH_HANDLE { @@ -165,15 +202,35 @@ } else { + if(OriginalSecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) + { + return STATUS_UNKNOWN_REVISION; + } + /* make a copy on the stack */ - DescriptorCopy = *OriginalSecurityDescriptor; + DescriptorCopy.Revision = OriginalSecurityDescriptor->Revision; + DescriptorCopy.Sbz1 = OriginalSecurityDescriptor->Sbz1; + DescriptorCopy.Control = OriginalSecurityDescriptor->Control; + DescriptorSize = ((DescriptorCopy.Control & SE_SELF_RELATIVE) ? + sizeof(SECURITY_DESCRIPTOR_RELATIVE) : sizeof(SECURITY_DESCRIPTOR)); + if(DescriptorCopy.Control & SE_SELF_RELATIVE) + { + PSECURITY_DESCRIPTOR_RELATIVE RelSD = (PSECURITY_DESCRIPTOR_RELATIVE)OriginalSecurityDescriptor; + + DescriptorCopy.Owner = (PSID)RelSD->Owner; + DescriptorCopy.Group = (PSID)RelSD->Group; + DescriptorCopy.Sacl = (PACL)RelSD->Sacl; + DescriptorCopy.Dacl = (PACL)RelSD->Dacl; + } + else + { + DescriptorCopy.Owner = OriginalSecurityDescriptor->Owner; + DescriptorCopy.Group = OriginalSecurityDescriptor->Group; + DescriptorCopy.Sacl = OriginalSecurityDescriptor->Sacl; + DescriptorCopy.Dacl = OriginalSecurityDescriptor->Dacl; + } } - if(DescriptorCopy.Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - if(DescriptorCopy.Control & SE_SELF_RELATIVE) { /* in case we're dealing with a self-relative descriptor, do a basic convert @@ -377,10 +434,11 @@ IN PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor OPTIONAL) { PSECURITY_DESCRIPTOR ObjectSd; - PSID Owner = 0; - PSID Group = 0; - PACL Dacl = 0; - PACL Sacl = 0; + PSECURITY_DESCRIPTOR_RELATIVE RelSD; + PSID Owner = NULL; + PSID Group = NULL; + PACL Dacl = NULL; + PACL Sacl = NULL; ULONG OwnerLength = 0; ULONG GroupLength = 0; ULONG DaclLength = 0; @@ -388,19 +446,20 @@ ULONG Control = 0; ULONG_PTR Current; ULONG SdLength; + + RelSD = (PSECURITY_DESCRIPTOR_RELATIVE)SecurityDescriptor; if (*ObjectsSecurityDescriptor == NULL) { - if (*Length < sizeof(SECURITY_DESCRIPTOR)) + if (*Length < sizeof(SECURITY_DESCRIPTOR_RELATIVE)) { - *Length = sizeof(SECURITY_DESCRIPTOR); + *Length = sizeof(SECURITY_DESCRIPTOR_RELATIVE); return STATUS_BUFFER_TOO_SMALL; } - *Length = sizeof(SECURITY_DESCRIPTOR); - RtlCreateSecurityDescriptor(SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); - SecurityDescriptor->Control |= SE_SELF_RELATIVE; + *Length = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + RtlCreateSecurityDescriptorRelative(RelSD, + SECURITY_DESCRIPTOR_REVISION); return STATUS_SUCCESS; } @@ -447,26 +506,26 @@ } SdLength = OwnerLength + GroupLength + DaclLength + - SaclLength + sizeof(SECURITY_DESCRIPTOR); - if (*Length < sizeof(SECURITY_DESCRIPTOR)) + SaclLength + sizeof(SECURITY_DESCRIPTOR_RELATIVE); + if (*Length < SdLength) { *Length = SdLength; return STATUS_BUFFER_TOO_SMALL; } /* Build the new security descrtiptor */ - RtlCreateSecurityDescriptor(SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); [truncated at 1000 lines; 124 more skipped]

20 years, 3 months

[gvg] 13501: Check subsystem

by gvg＠svn.reactos.com

Check subsystem Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-02-12 09:08:52 UTC (rev 13500) +++ trunk/reactos/lib/kernel32/process/create.c 2005-02-12 09:17:51 UTC (rev 13501) @@ -1023,6 +1023,7 @@ if (! NT_SUCCESS(Status)) { NtClose(hSection); + DPRINT("Unable to get SectionImageInformation, status 0x%x\n", Status); SetLastErrorByStatus(Status); return FALSE; } @@ -1030,10 +1031,20 @@ if (0 != (Sii.Characteristics & IMAGE_FILE_DLL)) { NtClose(hSection); + DPRINT("Can't execute a DLL\n"); SetLastError(ERROR_BAD_EXE_FORMAT); return FALSE; } + if (IMAGE_SUBSYSTEM_WINDOWS_GUI != Sii.Subsystem + && IMAGE_SUBSYSTEM_WINDOWS_CUI != Sii.Subsystem) + { + NtClose(hSection); + DPRINT("Invalid subsystem %d\n", Sii.Subsystem); + SetLastError(ERROR_CHILD_NOT_COMPLETE); + return FALSE; + } + /* * Initialize the process object attributes */

20 years, 3 months

[ea] 13500: SM - clean, simplify, make more readable

by ea＠svn.reactos.com

SM - clean, simplify, make more readable - split initialization in more files to make it more readable - cleaned up some code - simplified some code - documented some todos Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/debug.c Modified: trunk/reactos/subsys/smss/init.c Added: trunk/reactos/subsys/smss/initdosdev.c Added: trunk/reactos/subsys/smss/initenv.c Added: trunk/reactos/subsys/smss/initheap.c Added: trunk/reactos/subsys/smss/initmv.c Added: trunk/reactos/subsys/smss/initobdir.c Added: trunk/reactos/subsys/smss/initpage.c Added: trunk/reactos/subsys/smss/initreg.c Added: trunk/reactos/subsys/smss/initrun.c Added: trunk/reactos/subsys/smss/initss.c Added: trunk/reactos/subsys/smss/initwkdll.c Modified: trunk/reactos/subsys/smss/makefile Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smss.c Modified: trunk/reactos/subsys/smss/smss.h _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-02-12 03:53:19 UTC (rev 13499) +++ trunk/reactos/subsys/smss/client.c 2005-02-12 09:08:52 UTC (rev 13500) @@ -25,7 +25,6 @@ */ #define NTOS_MODE_USER #include <ntos.h> -#include <sm/api.h> #include "smss.h" /* Private ADT */ @@ -51,17 +50,40 @@ } SmpClientDirectory; /********************************************************************** - * SmpInitializeClientManagement/0 + * SmInitializeClientManagement/0 */ -VOID STDCALL -SmpInitializeClientManagement (VOID) +NTSTATUS +SmInitializeClientManagement (VOID) { RtlInitializeCriticalSection(& SmpClientDirectory.Lock); SmpClientDirectory.Count = 0; SmpClientDirectory.Client = NULL; + return STATUS_SUCCESS; } /********************************************************************** + * SmpLookupClient/1 + */ +PSM_CLIENT_DATA STDCALL +SmpLookupClient (USHORT SubsystemId) +{ + PSM_CLIENT_DATA Client = NULL; + + if (SmpClientDirectory.Count > 0) + { + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + Client = SmpClientDirectory.Client; + while (NULL != Client->Next) + { + if (SubsystemId == Client->SubsystemId) break; + Client = Client->Next; + } + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + } + return Client; +} + +/********************************************************************** * SmpCreateClient/1 */ NTSTATUS STDCALL @@ -70,6 +92,14 @@ PSM_CLIENT_DATA pClient = NULL; /* + * Check if a client for the ID already exist. + */ + if (SmpLookupClient(0)) //FIXME + { + DbgPrint("SMSS: %s: attempt to register again subsystem %d.\n",__FUNCTION__,0); + return STATUS_UNSUCCESSFUL; + } + /* * Allocate the storage for client data */ pClient = RtlAllocateHeap (SmpHeap, @@ -79,6 +109,8 @@ /* * Initialize the client data */ +// pClient->SubsystemId = Request->Subsystem; + pClient->Initialized = FALSE; // TODO /* * Insert the new descriptor in the _____ Modified: trunk/reactos/subsys/smss/debug.c --- trunk/reactos/subsys/smss/debug.c 2005-02-12 03:53:19 UTC (rev 13499) +++ trunk/reactos/subsys/smss/debug.c 2005-02-12 09:08:52 UTC (rev 13500) @@ -1,6 +1,6 @@ /* $Id: smss.c 12852 2005-01-06 13:58:04Z mf $ * - * client.c - Session Manager client Management + * debug.c - Session Manager debug messages switch and router * * ReactOS Operating System * @@ -36,8 +36,8 @@ /* FUNCTIONS *********************************************************/ -NTSTATUS STDCALL -SmpInitializeDbgSs (VOID) +NTSTATUS +SmInitializeDbgSs (VOID) { NTSTATUS Status; UNICODE_STRING UnicodeString; _____ Modified: trunk/reactos/subsys/smss/init.c --- trunk/reactos/subsys/smss/init.c 2005-02-12 03:53:19 UTC (rev 13499) +++ trunk/reactos/subsys/smss/init.c 2005-02-12 09:08:52 UTC (rev 13500) @@ -22,764 +22,22 @@ * MA 02139, USA. * * -------------------------------------------------------------------- - * - * 19990530 (Emanuele Aliberti) - * Compiled successfully with egcs 1.1.2 */ -/* INCLUDES *****************************************************************/ - -#include <ntos.h> -#include <ntdll/rtl.h> -#include <ntdll/ldr.h> -#include <rosrtl/string.h> -#include <sm/api.h> #include "smss.h" +#include <rosrtl/string.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> -/* GLOBALS ******************************************************************/ -HANDLE SmpHeap = NULL; - -PWSTR SmSystemEnvironment = NULL; - - /* FUNCTIONS ****************************************************************/ -static NTSTATUS STDCALL -SmObjectDirectoryQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeString; - HANDLE WindowsDirectory; - NTSTATUS Status = STATUS_SUCCESS; - -#ifndef NDEBUG - DbgPrint("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DbgPrint("ValueData '%S'\n", (PWSTR)ValueData); -#endif - if (ValueType != REG_SZ) - { - return(STATUS_SUCCESS); - } - - RtlInitUnicodeString(&UnicodeString, - (PWSTR)ValueData); - - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString, - 0, - NULL, - NULL); - - Status = ZwCreateDirectoryObject(&WindowsDirectory, - 0, - &ObjectAttributes); - - return(Status); -} - - static NTSTATUS -SmCreateObjectDirectories(VOID) +SmpSignalInitEvent(VOID) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; NTSTATUS Status; - - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"ObjectDirectories"; - QueryTable[0].QueryRoutine = SmObjectDirectoryQueryRoutine; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager", - QueryTable, - NULL, - NULL); - - return(Status); -} - - -static NTSTATUS STDCALL -SmDosDevicesQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING DeviceName; - UNICODE_STRING LinkName; - HANDLE LinkHandle; - WCHAR LinkBuffer[80]; - NTSTATUS Status; - - DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S'\n", (PWSTR)ValueData); - - if (ValueType != REG_SZ) - { - return(STATUS_SUCCESS); - } - - swprintf(LinkBuffer, - L"\\??\\%s", - ValueName); - RtlInitUnicodeString(&LinkName, - LinkBuffer); - RtlInitUnicodeString(&DeviceName, - (PWSTR)ValueData); - - DPRINT("SM: Linking %wZ --> %wZ\n", - &LinkName, - &DeviceName); - - /* create symbolic link */ - InitializeObjectAttributes(&ObjectAttributes, - &LinkName, - OBJ_PERMANENT, - NULL, - NULL); - Status = NtCreateSymbolicLinkObject(&LinkHandle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - &DeviceName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SmDosDevicesQueryRoutine: NtCreateSymbolicLink( %wZ --> %wZ ) failed!\n", - &LinkName, - &DeviceName); - } - NtClose(LinkHandle); - - return(Status); -} - - -static NTSTATUS -SmInitDosDevices(VOID) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; - - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].QueryRoutine = SmDosDevicesQueryRoutine; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager\\DOS Devices", - QueryTable, - NULL, - NULL); - return(Status); -} - - -static NTSTATUS STDCALL -SmRunBootAppsQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - PRTL_USER_PROCESS_PARAMETERS ProcessParameters; - RTL_PROCESS_INFO ProcessInfo; - UNICODE_STRING ImagePathString; - UNICODE_STRING CommandLineString; - WCHAR Description[256]; - WCHAR ImageName[256]; - WCHAR ImagePath[256]; - WCHAR CommandLine[256]; - PWSTR p1, p2; - ULONG len; - NTSTATUS Status; - - DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S'\n", (PWSTR)ValueData); - - if (ValueType != REG_SZ) - { - return(STATUS_SUCCESS); - } - - /* Extract the description */ - p1 = wcschr((PWSTR)ValueData, L' '); - len = p1 - (PWSTR)ValueData; - memcpy(Description,ValueData, len * sizeof(WCHAR)); - Description[len] = 0; - - /* Extract the image name */ - p1++; - p2 = wcschr(p1, L' '); - if (p2 != NULL) - len = p2 - p1; - else - len = wcslen(p1); - memcpy(ImageName, p1, len * sizeof(WCHAR)); - ImageName[len] = 0; - - /* Extract the command line */ - if (p2 == NULL) - { - CommandLine[0] = 0; - } - else - { - p2++; - wcscpy(CommandLine, p2); - } - - DPRINT("Running %S...\n", Description); - DPRINT("ImageName: '%S'\n", ImageName); - DPRINT("CommandLine: '%S'\n", CommandLine); - - /* initialize executable path */ - wcscpy(ImagePath, L"\\SystemRoot\\system32\\"); - wcscat(ImagePath, ImageName); - wcscat(ImagePath, L".exe"); - - RtlInitUnicodeString(&ImagePathString, - ImagePath); - - RtlInitUnicodeString(&CommandLineString, - CommandLine); - - RtlCreateProcessParameters(&ProcessParameters, - &ImagePathString, - NULL, - NULL, - &CommandLineString, - NULL, - NULL, - NULL, - NULL, - NULL); - - Status = RtlCreateUserProcess(&ImagePathString, - OBJ_CASE_INSENSITIVE, - ProcessParameters, - NULL, - NULL, - NULL, - FALSE, - NULL, - NULL, - &ProcessInfo); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Running %s failed (Status %lx)\n", Description, Status); - return(STATUS_SUCCESS); - } - - RtlDestroyProcessParameters(ProcessParameters); - - /* Wait for process termination */ - NtWaitForSingleObject(ProcessInfo.ProcessHandle, - FALSE, - NULL); - - NtClose(ProcessInfo.ThreadHandle); - NtClose(ProcessInfo.ProcessHandle); - - return(STATUS_SUCCESS); -} - - -/* - * Run native applications listed in the registry. - * - * Key: - * \Registry\Machine\SYSTEM\CurrentControlSet\Control\Session Manager - * - * Value (format: "<description> <executable> <command line>": - * BootExecute = "autocheck autochk *" - */ -static NTSTATUS -SmRunBootApps(VOID) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; - - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"BootExecute"; - QueryTable[0].QueryRoutine = SmRunBootAppsQueryRoutine; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager", - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SmRunBootApps: RtlQueryRegistryValues() failed! (Status %lx)\n", Status); - } - - return(Status); -} - - -static NTSTATUS -SmProcessFileRenameList(VOID) -{ - DPRINT("SmProcessFileRenameList() called\n"); - - /* FIXME: implement it! */ - - DPRINT("SmProcessFileRenameList() done\n"); - - return(STATUS_SUCCESS); -} - - -static NTSTATUS STDCALL -SmKnownDllsQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING ImageName; - HANDLE FileHandle; - HANDLE SectionHandle; - NTSTATUS Status; - - DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S' Context %p EntryContext %p\n", (PWSTR)ValueData, Context, EntryContext); - - /* Ignore the 'DllDirectory' value */ - if (!_wcsicmp(ValueName, L"DllDirectory")) - return STATUS_SUCCESS; - - /* Open the DLL image file */ - RtlInitUnicodeString(&ImageName, - ValueData); - InitializeObjectAttributes(&ObjectAttributes, - &ImageName, - OBJ_CASE_INSENSITIVE, - (HANDLE)Context, - NULL); - Status = NtOpenFile(&FileHandle, - SYNCHRONIZE | FILE_EXECUTE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); - return STATUS_SUCCESS; - } - - DPRINT("Opened file %wZ successfully\n", &ImageName); - - /* Check for valid image checksum */ - Status = LdrVerifyImageMatchesChecksum (FileHandle, - 0, - 0, - 0); - if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH) - { - /* Raise a hard error (crash the system/BSOD) */ - NtRaiseHardError (Status, - 0, - 0, - 0, - 0, - 0); - } - else if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to check the image checksum\n"); - - NtClose(SectionHandle); - NtClose(FileHandle); - - return STATUS_SUCCESS; - } - - InitializeObjectAttributes(&ObjectAttributes, - &ImageName, - OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, - (HANDLE)EntryContext, - NULL); - Status = NtCreateSection(&SectionHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes, - NULL, - PAGE_EXECUTE, - SEC_IMAGE, - FileHandle); - if (NT_SUCCESS(Status)) - { - DPRINT("Created section successfully\n"); - NtClose(SectionHandle); - } - - NtClose(FileHandle); - - return STATUS_SUCCESS; -} - - -static NTSTATUS -SmLoadKnownDlls(VOID) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING DllDosPath; - UNICODE_STRING DllNtPath; - UNICODE_STRING Name; - HANDLE ObjectDirHandle; - HANDLE FileDirHandle; - HANDLE SymlinkHandle; - NTSTATUS Status; - - DPRINT("SmLoadKnownDlls() called\n"); - - /* Create 'KnownDlls' object directory */ - RtlInitUnicodeString(&Name, - L"\\KnownDlls"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT | OBJ_CASE_INSENSITIVE | OBJ_OPENIF, - NULL, - NULL); - Status = NtCreateDirectoryObject(&ObjectDirHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateDirectoryObject() failed (Status %lx)\n", Status); - return Status; - } - - RtlInitUnicodeString(&DllDosPath, NULL); - - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"DllDirectory"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = &DllDosPath; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager\\KnownDlls", - QueryTable, - NULL, - SmSystemEnvironment); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); - return Status; - } - - DPRINT("DllDosPath: '%wZ'\n", &DllDosPath); - - if (!RtlDosPathNameToNtPathName_U(DllDosPath.Buffer, - &DllNtPath, - NULL, - NULL)) - { - DPRINT1("RtlDosPathNameToNtPathName_U() failed\n"); - return STATUS_OBJECT_NAME_INVALID; - } - - DPRINT("DllNtPath: '%wZ'\n", &DllNtPath); - - /* Open the dll path directory */ - InitializeObjectAttributes(&ObjectAttributes, - &DllNtPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&FileDirHandle, - SYNCHRONIZE | FILE_READ_DATA, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenFile(%wZ) failed (Status %lx)\n", &DllNtPath, Status); - return Status; - } - - /* Link 'KnownDllPath' the dll path directory */ - RtlInitUnicodeString(&Name, - L"KnownDllPath"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT | OBJ_CASE_INSENSITIVE | OBJ_OPENIF, - ObjectDirHandle, - NULL); - Status = NtCreateSymbolicLinkObject(&SymlinkHandle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - &DllDosPath); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateSymbolicLink() failed (Status %lx)\n", Status); - return Status; - } - - NtClose(SymlinkHandle); - - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].QueryRoutine = SmKnownDllsQueryRoutine; - QueryTable[0].EntryContext = ObjectDirHandle; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager\\KnownDlls", - QueryTable, - (PVOID)FileDirHandle, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); - } - - DPRINT("SmLoadKnownDlls() done\n"); - - return Status; -} - - -static NTSTATUS STDCALL -SmPagingFilesQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - UNICODE_STRING FileName; - LARGE_INTEGER InitialSize; - LARGE_INTEGER MaximumSize; - NTSTATUS Status; - LPWSTR p; - - DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S'\n", (PWSTR)ValueData); - - if (ValueType != REG_SZ) - { - return(STATUS_SUCCESS); - } - - /* - * Format: "<path>[ <initial_size>[ <maximum_size>]]" - */ - if ((p = wcschr(ValueData, ' ')) != NULL) - { - *p = L'\0'; - InitialSize.QuadPart = wcstoul(p + 1, &p, 0) * 256 * 4096; - if (*p == ' ') - { - MaximumSize.QuadPart = wcstoul(p + 1, NULL, 0) * 256 * 4096; - } - else - MaximumSize = InitialSize; - } - else - { - InitialSize.QuadPart = 50 * 4096; - MaximumSize.QuadPart = 80 * 4096; - } - - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)ValueData, - &FileName, - NULL, - NULL)) - { - return (STATUS_SUCCESS); - } - - DPRINT("SMSS: Created paging file %wZ with size %dKB\n", - &FileName, InitialSize.QuadPart / 1024); - Status = NtCreatePagingFile(&FileName, - &InitialSize, - &MaximumSize, - 0); - - RtlFreeUnicodeString(&FileName); - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -SmCreatePagingFiles(VOID) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; - - /* - * Disable paging file on MiniNT/Live CD. - */ - if (RtlCheckRegistryKey(RTL_REGISTRY_CONTROL, L"MiniNT") == STATUS_SUCCESS) - { - return STATUS_SUCCESS; - } - - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"PagingFiles"; - QueryTable[0].QueryRoutine = SmPagingFilesQueryRoutine; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager\\Memory Management", - QueryTable, - NULL, - NULL); - - return(Status); -} - - -static NTSTATUS STDCALL -SmEnvironmentQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - UNICODE_STRING EnvVariable; - UNICODE_STRING EnvValue; - - DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S'\n", (PWSTR)ValueData); - - if (ValueType != REG_SZ) - { - return(STATUS_SUCCESS); - } - - RtlInitUnicodeString(&EnvVariable, - ValueName); - RtlInitUnicodeString(&EnvValue, - (PWSTR)ValueData); - RtlSetEnvironmentVariable(Context, - &EnvVariable, - &EnvValue); - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -SmSetEnvironmentVariables(VOID) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - UNICODE_STRING EnvVariable; - UNICODE_STRING EnvValue; - WCHAR ValueBuffer[MAX_PATH]; - NTSTATUS Status; - - /* - * The following environment variables must be set prior to reading - * other variables from the registry. - * - * Variables (example): - * SystemRoot = "C:\reactos" - * SystemDrive = "C:" - */ - - /* Copy system root into value buffer */ - wcscpy(ValueBuffer, - SharedUserData->NtSystemRoot); - - /* Set SystemRoot = "C:\reactos" */ - RtlRosInitUnicodeStringFromLiteral(&EnvVariable, - L"SystemRoot"); - RtlInitUnicodeString(&EnvValue, - ValueBuffer); - RtlSetEnvironmentVariable(&SmSystemEnvironment, - &EnvVariable, - &EnvValue); - - /* Cut off trailing path */ - ValueBuffer[2] = 0; - - /* Set SystemDrive = "C:" */ - RtlRosInitUnicodeStringFromLiteral(&EnvVariable, - L"SystemDrive"); - RtlInitUnicodeString(&EnvValue, - ValueBuffer); - RtlSetEnvironmentVariable(&SmSystemEnvironment, - &EnvVariable, - &EnvValue); - - /* Read system environment from the registry. */ - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].QueryRoutine = SmEnvironmentQueryRoutine; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager\\Environment", - QueryTable, - &SmSystemEnvironment, - SmSystemEnvironment); - - return(Status); -} - - -static NTSTATUS -SmLoadSubsystems(VOID) -{ - SYSTEM_LOAD_AND_CALL_IMAGE ImageInfo; - NTSTATUS Status; - - /* Load kernel mode subsystem (aka win32k.sys) */ - RtlRosInitUnicodeStringFromLiteral(&ImageInfo.ModuleName, - L"\\SystemRoot\\system32\\win32k.sys"); - - Status = NtSetSystemInformation(SystemLoadAndCallImage, - &ImageInfo, - sizeof(SYSTEM_LOAD_AND_CALL_IMAGE)); - - DPRINT("SMSS: Loaded win32k.sys (Status %lx)\n", Status); -#if 0 - if (!NT_SUCCESS(Status)) - { - return(Status); - } -#endif - - /* FIXME: load more subsystems (csrss!) */ - - return(Status); -} - - -static VOID -SignalInitEvent() -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING UnicodeString; HANDLE ReactOSInitEvent; @@ -809,270 +67,59 @@ /* We don't really care if this fails */ DPRINT1("SM: Failed to open ReactOS init notification event\n"); } + return Status; } +typedef NTSTATUS (* SM_INIT_ROUTINE)(VOID); +struct { + BOOL Required; + SM_INIT_ROUTINE EntryPoint; + PCHAR ErrorMessage; +} InitRoutine [] = { + {TRUE, SmCreateHeap, "create private heap, aborting"}, + {TRUE, SmCreateObjectDirectories, "create object directories"}, + {TRUE, SmCreateApiPort, "create \\SmApiPort"}, + {TRUE, SmCreateEnvironment, "create the system environment"}, + {TRUE, SmSetEnvironmentVariables, "set system environment variables"}, + {TRUE, SmInitDosDevices, "create dos device links"}, + {TRUE, SmRunBootApplications, "run boot applications"}, + {TRUE, SmProcessFileRenameList, "process the file rename list"}, + {FALSE, SmLoadKnownDlls, "preload system DLLs"}, + {TRUE, SmCreatePagingFiles, "create paging files"}, + {TRUE, SmInitializeRegistry, "initialize the registry"}, + {FALSE, SmUpdateEnvironment, "update environment variables"}, + {TRUE, SmInitializeClientManagement, "initialize client management"}, + {TRUE, SmLoadSubsystems, "load subsystems"}, + {FALSE, SmpSignalInitEvent, "open ReactOS init notification event"}, + {TRUE, SmRunCsrss, "run csrss"}, + {TRUE, SmRunWinlogon, "run winlogon"}, + {TRUE, SmInitializeDbgSs, "initialize DbgSs"} +}; + NTSTATUS InitSessionManager(HANDLE Children[]) { + int i; NTSTATUS Status; - UNICODE_STRING UnicodeString; - OBJECT_ATTRIBUTES ObjectAttributes; - PRTL_USER_PROCESS_PARAMETERS ProcessParameters; - RTL_PROCESS_INFO ProcessInfo; - HANDLE CsrssInitEvent; - WCHAR UnicodeBuffer[MAX_PATH]; - /* Create our own heap */ - SmpHeap = RtlCreateHeap(HEAP_GROWABLE, - NULL, - 65536, - 65536, - NULL, - NULL); - if (NULL == SmpHeap) + for (i=0; i < (sizeof InitRoutine / sizeof InitRoutine[0]); i++) + { + Status = InitRoutine[i].EntryPoint(); + if(!NT_SUCCESS(Status)) { - DbgPrint("SMSS: %s: failed to create private heap, aborting\n",__FUNCTION__); - return STATUS_UNSUCCESSFUL; + DPRINT1("SM: %s: failed to %s (Status=%lx)\n", + __FUNCTION__, + InitRoutine[i].ErrorMessage, + Status); + if (InitRoutine[i].Required) + { + return(Status); + } } + } - /* Create object directories */ - Status = SmCreateObjectDirectories(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: Failed to create object directories (Status %lx)\n", Status); - return(Status); - } - - /* Create the \SmApiPort object (LPC) */ - Status = SmpCreateApiPort(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: Failed to create SmApiPort (Status %lx)\n", Status); - return(Status); - } - - /* Create the system environment */ - Status = RtlCreateEnvironment(FALSE, - &SmSystemEnvironment); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: Failed to create the system environment (Status %lx)\n", Status); - return(Status); - } - - /* Set environment variables */ - Status = SmSetEnvironmentVariables(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: Failed to set system environment variables (Status %lx)\n", Status); - return(Status); - } - - /* Define symbolic links to kernel devices (MS-DOS names) */ - Status = SmInitDosDevices(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: Failed to create dos device links (Status %lx)\n", Status); - return(Status); - } - - /* Run all programs in the boot execution list */ - Status = SmRunBootApps(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: Failed to run boot applications (Status %lx)\n", Status); - return(Status); - } - - /* Process the file rename list */ - Status = SmProcessFileRenameList(); - if (!NT_SUCCESS(Status)) [truncated at 1000 lines; 1722 more skipped]

20 years, 3 months

[arty] 13499: AddrWidenAddress: set type

by arty＠svn.reactos.com

AddrWidenAddress: set type NBFlushPackets: We already hold the table lock when calling this. Modified: trunk/reactos/drivers/lib/ip/network/address.c Modified: trunk/reactos/drivers/lib/ip/network/neighbor.c _____ Modified: trunk/reactos/drivers/lib/ip/network/address.c --- trunk/reactos/drivers/lib/ip/network/address.c 2005-02-11 22:49:44 UTC (rev 13498) +++ trunk/reactos/drivers/lib/ip/network/address.c 2005-02-12 03:53:19 UTC (rev 13499) @@ -86,6 +86,7 @@ VOID AddrWidenAddress( PIP_ADDRESS Network, PIP_ADDRESS Source, PIP_ADDRESS Netmask ) { if( Netmask->Type == IP_ADDRESS_V4 ) { + Network->Type = Netmask->Type; Network->Address.IPv4Address = Source->Address.IPv4Address & Netmask->Address.IPv4Address; } else { @@ -220,8 +221,10 @@ PIP_ADDRESS Address1, PIP_ADDRESS Address2) { - if (Address1->Type != Address2->Type) + if (Address1->Type != Address2->Type) { + DbgPrint("AddrIsEqual: Unequal Address Types\n"); return FALSE; + } switch (Address1->Type) { case IP_ADDRESS_V4: @@ -231,6 +234,10 @@ return (RtlCompareMemory(&Address1->Address, &Address2->Address, sizeof(IPv6_RAW_ADDRESS)) == sizeof(IPv6_RAW_ADDRESS)); break; + + default: + DbgPrint("AddrIsEqual: Bad address type\n"); + break; } return FALSE; _____ Modified: trunk/reactos/drivers/lib/ip/network/neighbor.c --- trunk/reactos/drivers/lib/ip/network/neighbor.c 2005-02-11 22:49:44 UTC (rev 13498) +++ trunk/reactos/drivers/lib/ip/network/neighbor.c 2005-02-12 03:53:19 UTC (rev 13499) @@ -52,19 +52,19 @@ } } +/* Must be called with table lock acquired */ VOID NBFlushPacketQueue( PNEIGHBOR_CACHE_ENTRY NCE, BOOL CallComplete, NTSTATUS ErrorCode ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet; - PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue, - &NCE->Table->Lock); - while( PacketEntry != NULL ) { + while( !IsListEmpty(&NCE->PacketQueue) ) { + PacketEntry = RemoveHeadList(&NCE->PacketQueue); Packet = CONTAINING_RECORD ( PacketEntry, NEIGHBOR_PACKET, Next ); - ASSERT_KM_POINTER(Packet); + ASSERT_KM_POINTER(Packet); TI_DbgPrint (MID_TRACE, @@ -72,16 +72,14 @@ PacketEntry, Packet->Packet)); if( CallComplete ) - { - ASSERT_KM_POINTER(Packet->Complete); + { + ASSERT_KM_POINTER(Packet->Complete); Packet->Complete( Packet->Context, Packet->Packet, NDIS_STATUS_REQUEST_ABORTED ); - } + } PoolFreeBuffer( Packet ); - PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue, - &NCE->Table->Lock); } }

20 years, 3 months

[robertk] 13498: made a copy

by robertk＠svn.reactos.com

made a copy Added: branches/ros-branch-0_2_5/reactos/ros-branch-0_2_5/ _____ Copied: branches/ros-branch-0_2_5/reactos/ros-branch-0_2_5 (from rev 13497, branches/ros-branch-0_2_5)

20 years, 3 months

[gvg] 13497: Be compatible with some of the crap apps out there

by gvg＠svn.reactos.com

Be compatible with some of the crap apps out there Modified: trunk/reactos/ntoskrnl/mm/pe.c _____ Modified: trunk/reactos/ntoskrnl/mm/pe.c --- trunk/reactos/ntoskrnl/mm/pe.c 2005-02-11 19:13:01 UTC (rev 13496) +++ trunk/reactos/ntoskrnl/mm/pe.c 2005-02-11 21:02:35 UTC (rev 13497) @@ -649,8 +649,11 @@ if(pishSectionHeaders[i].SizeOfRawData != 0) { /* validate the alignment */ +#if 0 /* Yes, this should be a multiple of FileAlignment, but there's + stuff out there that isn't. We can cope with that */ if(!IsAligned(pishSectionHeaders[i].SizeOfRawData, nFileAlignment)) DIE(("SizeOfRawData[%u] is not aligned\n", i)); +#endif if(!IsAligned(pishSectionHeaders[i].PointerToRawData, nFileAlignment)) DIE(("PointerToRawData[%u] is not aligned\n", i));

20 years, 3 months

← Newer
1
...
26
27
28
29
30
31
32
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005