Ros-diffs

ros-diffs@reactos.org

81390 discussions

[royce] 14265: eliminate rmkdir and generate directory dependencies the right way.
by royce＠svn.reactos.com 22 Mar '05

22 Mar '05

eliminate rmkdir and generate directory dependencies the right way. treat ROS_TEMPORARY, ROS_INTERMEDIATE, and ROS_OUTPUT as potential different directories. major refactor of mingw backend to simplify things, and fix some output bugs, as well as reduce makefile.auto size a bit. create all macros before we start writing rules ( create all target macros before any other ), this fixes bug with macros being empty because they're used before they're defined Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-22 07:25:53 UTC (rev 14265) @@ -100,7 +100,7 @@ EXEPREFIX = ./ EXEPOSTFIX = SEP = / - nmkdir = -$(Q)mkdir -p + mkdir = -$(Q)mkdir -p gcc = $(Q)mingw32-gcc gpp = $(Q)mingw32-g++ ld = $(Q)mingw32-ld @@ -116,7 +116,7 @@ EXEPOSTFIX = .exe ROS_EMPTY = SEP = \$(ROS_EMPTY) - nmkdir = -$(Q)mkdir + mkdir = -$(Q)mkdir gcc = $(Q)gcc gpp = $(Q)g++ ld = $(Q)ld @@ -130,28 +130,26 @@ endif ifneq ($(ROS_INTERMEDIATE),) - INTERMEDIATE = .$(SEP)$(ROS_INTERMEDIATE)$(SEP) - INTERMEDIATE_NO_SLASH := $(ROS_INTERMEDIATE) + INTERMEDIATE := $(ROS_INTERMEDIATE) else - INTERMEDIATE = obj-i386$(SEP) - INTERMEDIATE_NO_SLASH = obj-i386 + INTERMEDIATE := obj-i386 endif +INTERMEDIATE_ := $(INTERMEDIATE)$(SEP) ifneq ($(ROS_OUTPUT),) - OUTPUT = $(ROS_OUTPUT)$(SEP) - OUTPUT_NO_SLASH = $(ROS_OUTPUT) + OUTPUT := $(ROS_OUTPUT) else - OUTPUT = obj-i386$(SEP) - OUTPUT_NO_SLASH = obj-i386 + OUTPUT := obj-i386 endif +OUTPUT_ := $(OUTPUT)$(SEP) -mkdir = -$(Q)$(INTERMEDIATE)rmkdir -EXISTS = .exists -INTERMEDIATE_EXISTS = $(INTERMEDIATE)$(EXISTS) +$(INTERMEDIATE): + ${mkdir} $@ -$(INTERMEDIATE_EXISTS): - -${nmkdir} $(INTERMEDIATE_NO_SLASH) 2>$(NUL) >$(NUL) - @echo . > $@ +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(OUTPUT): + ${mkdir} $@ +endif NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc KERNEL32_MC = lib$(SEP)kernel32$(SEP)kernel32.mc @@ -161,6 +159,7 @@ ERRCODES_H = include$(SEP)reactos$(SEP)errcodes.h ERRCODES_RC = lib$(SEP)kernel32$(SEP)errcodes.rc +include lib/lib.mak include tools/tools.mak -include makefile.auto _____ Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak --- branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak 2005-03-22 07:25:53 UTC (rev 14265) @@ -1,29 +1,31 @@ -ZLIB_BASE = lib$(SEP)zlib +ZLIB_BASE = $(LIB_BASE_)zlib +ZLIB_BASE_ = $(ZLIB_BASE)$(SEP) -ZLIB_BASE_DIR = $(INTERMEDIATE)$(ZLIB_BASE) +ZLIB_INT = $(INTERMEDIATE_)$(ZLIB_BASE) +ZLIB_OUT = $(OUTPUT_)$(ZLIB_BASE) - -#$(ZLIB_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) +#$(ZLIB_INT): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) # ${mkdir} $(INTERMEDIATE)$(ZLIB_BASE) ZLIB_HOST_TARGET = \ - $(INTERMEDIATE)$(ZLIB_BASE)$(SEP)zlib.host.a + $(ZLIB_OUT)$(SEP)zlib.host.a -ZLIB_HOST_SOURCES = \ - $(ZLIB_BASE)$(SEP)adler32.c \ - $(ZLIB_BASE)$(SEP)compress.c \ - $(ZLIB_BASE)$(SEP)crc32.c \ - $(ZLIB_BASE)$(SEP)gzio.c \ - $(ZLIB_BASE)$(SEP)uncompr.c \ - $(ZLIB_BASE)$(SEP)deflate.c \ - $(ZLIB_BASE)$(SEP)trees.c \ - $(ZLIB_BASE)$(SEP)zutil.c \ - $(ZLIB_BASE)$(SEP)inflate.c \ - $(ZLIB_BASE)$(SEP)infblock.c \ - $(ZLIB_BASE)$(SEP)inftrees.c \ - $(ZLIB_BASE)$(SEP)infcodes.c \ - $(ZLIB_BASE)$(SEP)infutil.c \ - $(ZLIB_BASE)$(SEP)inffast.c +ZLIB_HOST_SOURCES = $(addprefix $(ZLIB_BASE_), \ + adler32.c \ + compress.c \ + crc32.c \ + gzio.c \ + uncompr.c \ + deflate.c \ + trees.c \ + zutil.c \ + inflate.c \ + infblock.c \ + inftrees.c \ + infcodes.c \ + infutil.c \ + inffast.c \ + ) ZLIB_HOST_OBJECTS = \ $(ZLIB_HOST_SOURCES:.c=.o) @@ -34,9 +36,9 @@ .PHONY: zlib_host zlib_host: $(ZLIB_HOST_TARGET) -$(ZLIB_HOST_TARGET): $(ZLIB_HOST_BASE_DIR) $(ZLIB_HOST_OBJECTS) +$(ZLIB_HOST_TARGET): $(ZLIB_HOST_OBJECTS) $(ZLIB_OUT) $(ECHO_AR) - $(host_ar) -r $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) + $(host_ar) -r $@ $(ZLIB_HOST_OBJECTS) $(ZLIB_HOST_OBJECTS): %.o : %.c $(ZLIB_BASE_DIR) $(ECHO_CC) _____ Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak --- branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-03-22 07:25:53 UTC (rev 14265) @@ -1,35 +1,44 @@ -BIN2RES_BASE = $(TOOLS_BASE)$(SEP)bin2res +BIN2RES_BASE = $(TOOLS_BASE_)bin2res +BIN2RES_BASE_ = $(BIN2RES_BASE)$(SEP) +BIN2RES_INT = $(INTERMEDIATE_)$(BIN2RES_BASE) +BIN2RES_INT_ = $(BIN2RES_INT)$(SEP) +BIN2RES_OUT = $(OUTPUT_)$(BIN2RES_BASE) +BIN2RES_OUT_ = $(BIN2RES_OUT)$(SEP) -BIN2RES_BASE_DIR = $(INTERMEDIATE)$(BIN2RES_BASE) -BIN2RES_BASE_DIR_EXISTS = $(BIN2RES_BASE_DIR)$(SEP)$(EXISTS) +$(BIN2RES_INT): $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ -$(BIN2RES_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXISTS) - ${mkdir} $(BIN2RES_BASE_DIR) - @echo . >$(BIN2RES_BASE_DIR_EXISTS) +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(BIN2RES_OUT): $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif BIN2RES_TARGET = \ - $(BIN2RES_BASE_DIR)$(SEP)bin2res$(EXEPOSTFIX) + $(EXEPREFIX)$(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) -BIN2RES_SOURCES = \ - $(BIN2RES_BASE)$(SEP)bin2res.c \ - $(BIN2RES_BASE)$(SEP)mkstemps.c +BIN2RES_SOURCES = $(addprefix $(BIN2RES_BASE_), \ + bin2res.c \ + mkstemps.c \ + ) BIN2RES_OBJECTS = \ - $(BIN2RES_SOURCES:.c=.o) + $addprefix ( $(INTERMEDIATE_), $(BIN2RES_SOURCES:.c=.o) ) BIN2RES_HOST_CFLAGS = -Iinclude/wine -D__REACTOS__ -g -Werror -Wall BIN2RES_HOST_LFLAGS = -g -$(BIN2RES_TARGET): $(BIN2RES_OBJECTS) +$(BIN2RES_TARGET): $(BIN2RES_OBJECTS) $(BIN2RES_OUT) $(ECHO_LD) ${host_gcc} $(BIN2RES_OBJECTS) $(BIN2RES_HOST_LFLAGS) -o $@ -$(BIN2RES_BASE_DIR)$(SEP)bin2res.o: $(BIN2RES_BASE)$(SEP)bin2res.c $(BIN2RES_BASE_DIR_EXISTS) +$(BIN2RES_INT_)bin2res.o: $(BIN2RES_BASE_)bin2res.c $(BIN2RES_INT) $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ -$(BIN2RES_BASE_DIR)$(SEP)mkstemps.o: $(BIN2RES_BASE)$(SEP)mkstemps.c $(BIN2RES_BASE_DIR_EXISTS) +$(BIN2RES_INT_)mkstemps.o: $(BIN2RES_BASE_)mkstemps.c $(BIN2RES_INT) $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak --- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-22 07:25:53 UTC (rev 14265) @@ -1,46 +1,54 @@ -BUILDNO_BASE = $(TOOLS_BASE)$(SEP)buildno +BUILDNO_BASE = $(TOOLS_BASE_)buildno +BUILDNO_BASE_ = $(BUILDNO_BASE)$(SEP) +BUILDNO_INT = $(INTERMEDIATE_)$(BUILDNO_BASE) +BUILDNO_INT_ = $(BUILDNO_INT)$(SEP) +BUILDNO_OUT = $(OUTPUT_)$(BUILDNO_BASE) +BUILDNO_OUT_ = $(BUILDNO_OUT)$(SEP) -BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE) -BUILDNO_BASE_DIR_EXISTS = $(BUILDNO_BASE_DIR)$(SEP)$(EXISTS) +$(BUILDNO_INT): $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ -$(BUILDNO_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXISTS) +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(BUILDNO_OUT): $(TOOLS_OUT) $(ECHO_MKDIR) - ${mkdir} $(BUILDNO_BASE_DIR) - @echo. > $@ + ${mkdir} $@ +endif BUILDNO_TARGET = \ - $(BUILDNO_BASE_DIR)$(SEP)buildno$(EXEPOSTFIX) + $(EXEPREFIX)$(BUILDNO_OUT_)buildno$(EXEPOSTFIX) -BUILDNO_SOURCES = \ - $(BUILDNO_BASE)$(SEP)buildno.cpp \ - $(BUILDNO_BASE)$(SEP)exception.cpp \ - $(BUILDNO_BASE)$(SEP)ssprintf.cpp \ - $(BUILDNO_BASE)$(SEP)XML.cpp +BUILDNO_SOURCES = $(addprefix $(BUILDNO_BASE_), \ + buildno.cpp \ + exception.cpp \ + ssprintf.cpp \ + XML.cpp \ + ) BUILDNO_OBJECTS = \ - $(addprefix $(INTERMEDIATE), $(BUILDNO_SOURCES:.cpp=.o)) + $(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o)) BUILDNO_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall BUILDNO_HOST_LFLAGS = -g -$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) +$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) $(BUILDNO_OUT) $(ECHO_LD) - ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_LFLAGS) -o $(BUILDNO_TARGET) + ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_LFLAGS) -o $@ -$(BUILDNO_BASE_DIR)$(SEP)buildno.o: $(BUILDNO_BASE)$(SEP)buildno.cpp $(BUILDNO_BASE_DIR_EXISTS) +$(BUILDNO_INT_)buildno.o: $(BUILDNO_BASE_)buildno.cpp $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -$(BUILDNO_BASE_DIR)$(SEP)exception.o: $(BUILDNO_BASE)$(SEP)exception.cpp $(BUILDNO_BASE_DIR_EXISTS) +$(BUILDNO_INT_)exception.o: $(BUILDNO_BASE_)exception.cpp $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -$(BUILDNO_BASE_DIR)$(SEP)ssprintf.o: $(BUILDNO_BASE)$(SEP)ssprintf.cpp $(BUILDNO_BASE_DIR_EXISTS) +$(BUILDNO_INT_)ssprintf.o: $(BUILDNO_BASE_)ssprintf.cpp $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -$(BUILDNO_BASE_DIR)$(SEP)XML.o: $(BUILDNO_BASE)$(SEP)XML.cpp $(BUILDNO_BASE_DIR_EXISTS) +$(BUILDNO_INT_)XML.o: $(BUILDNO_BASE_)XML.cpp $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-22 07:25:53 UTC (rev 14265) @@ -1,51 +1,64 @@ -CABMAN_BASE = tools$(SEP)cabman +CABMAN_BASE = $(TOOLS_BASE_)cabman +CABMAN_BASE_ = $(CABMAN_BASE)$(SEP) +CABMAN_INT = $(INTERMEDIATE_)$(CABMAN_BASE) +CABMAN_INT_ = $(CABMAN_INT)$(SEP) +CABMAN_OUT = $(OUTPUT_)$(CABMAN_BASE) +CABMAN_OUT_ = $(CABMAN_OUT)$(SEP) -CABMAN_BASE_DIR = $(INTERMEDIATE)$(CABMAN_BASE) +$(CABMAN_INT): $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ -$(CABMAN_BASE_DIR): $(RMKDIR_TARGET) - ${mkdir} $(INTERMEDIATE)$(CABMAN_BASE) +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(CABMAN_OUT): $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif CABMAN_TARGET = \ - $(CABMAN_BASE_DIR)$(SEP)cabman$(EXEPOSTFIX) + $(EXEPREFIX)$(CABMAN_OUT_)cabman$(EXEPOSTFIX) -CABMAN_SOURCES = \ - $(CABMAN_BASE)$(SEP)cabinet.cxx \ - $(CABMAN_BASE)$(SEP)dfp.cxx \ - $(CABMAN_BASE)$(SEP)main.cxx \ - $(CABMAN_BASE)$(SEP)mszip.cxx \ - $(CABMAN_BASE)$(SEP)raw.cxx +CABMAN_SOURCES = $(addprefix $(CABMAN_INT_), \ + cabinet.cxx \ + dfp.cxx \ + main.cxx \ + mszip.cxx \ + raw.cxx \ + ) CABMAN_OBJECTS = \ - $(addprefix $(INTERMEDIATE), $(CABMAN_SOURCES:.cxx=.o)) + $(addprefix $(INTERMEDIATE_), $(CABMAN_SOURCES:.cxx=.o)) CABMAN_HOST_CFLAGS = -Iinclude/reactos -Ilib/zlib -g -Werror -Wall -CABMAN_HOST_LFLAGS = -g $(ZLIB_HOST_TARGET) +CABMAN_HOST_LIBS = $(ZLIB_HOST_TARGET) +CABMAN_HOST_LFLAGS = -g $(CABMAN_HOST_LIBS) + .PHONY: cabman cabman: $(CABMAN_TARGET) -$(CABMAN_TARGET): $(CABMAN_OBJECTS) $(ZLIB_HOST_TARGET) +$(CABMAN_TARGET): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) $(CABMAN_OUT) $(ECHO_LD) ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@ -$(CABMAN_BASE_DIR)$(SEP)cabinet.o: $(CABMAN_BASE)$(SEP)cabinet.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_BASE_DIR)$(SEP)dfp.o: $(CABMAN_BASE)$(SEP)dfp.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_BASE_DIR)$(SEP)main.o: $(CABMAN_BASE)$(SEP)main.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_BASE_DIR)$(SEP)mszip.o: $(CABMAN_BASE)$(SEP)mszip.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_BASE_DIR)$(SEP)raw.o: $(CABMAN_BASE)$(SEP)raw.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak --- branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-22 07:25:53 UTC (rev 14265) @@ -1,22 +1,30 @@ -CDMAKE_BASE = $(TOOLS_BASE)$(SEP)cdmake +CDMAKE_BASE = $(TOOLS_BASE_)cdmake +CDMAKE_BASE_ = $(CDMAKE_BASE)$(SEP) +CDMAKE_INT = $(INTERMEDIATE_)$(CDMAKE_BASE) +CDMAKE_INT_ = $(CDMAKE_INT)$(SEP) +CDMAKE_OUT = $(OUTPUT_)$(CDMAKE_BASE) +CDMAKE_OUT_ = $(CDMAKE_OUT)$(SEP) -CDMAKE_BASE_DIR = $(INTERMEDIATE)$(CDMAKE_BASE) -CDMAKE_BASE_DIR_EXISTS = $(CDMAKE_BASE_DIR)$(SEP)$(EXISTS) +$(CDMAKE_INT): $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ -$(CDMAKE_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXISTS) +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(CDMAKE_OUT): $(TOOLS_OUT) $(ECHO_MKDIR) - ${mkdir} $(CDMAKE_BASE_DIR) - @echo . >$@ + ${mkdir} $@ +endif CDMAKE_TARGET = \ - $(CDMAKE_BASE_DIR)$(SEP)cdmake$(EXEPOSTFIX) + $(EXEPREFIX)$(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) -CDMAKE_SOURCES = \ - $(CDMAKE_BASE)$(SEP)cdmake.c \ - $(CDMAKE_BASE)$(SEP)llmosrt.c +CDMAKE_SOURCES = $(addprefix $(CDMAKE_BASE_), \ + cdmake.c \ + llmosrt.c \ + ) CDMAKE_OBJECTS = \ - $(addprefix $(INTERMEDIATE), $(CDMAKE_SOURCES:.c=.o)) + $(addprefix $(INTERMEDIATE_), $(CDMAKE_SOURCES:.c=.o)) CDMAKE_HOST_CFLAGS = -Iinclude -g -Werror -Wall @@ -25,15 +33,15 @@ .PHONY: cdmake cdmake: $(CDMAKE_TARGET) -$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) +$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) $(CDMAKE_OUT) $(ECHO_LD) ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $@ -$(CDMAKE_BASE_DIR)$(SEP)cdmake.o: $(CDMAKE_BASE)$(SEP)cdmake.c $(CDMAKE_BASE_DIR_EXISTS) +$(CDMAKE_INT_)cdmake.o: $(CDMAKE_BASE_)cdmake.c $(CDMAKE_INT) $(ECHO_CC) ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ -$(CDMAKE_BASE_DIR)$(SEP)llmosrt.o: $(CDMAKE_BASE)$(SEP)llmosrt.c $(CDMAKE_BASE_DIR_EXISTS) +$(CDMAKE_INT_)llmosrt.o: $(CDMAKE_BASE_)llmosrt.c $(CDMAKE_INT) $(ECHO_CC) ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak --- branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-22 07:25:53 UTC (rev 14265) @@ -1,30 +1,38 @@ -NCI_BASE = $(TOOLS_BASE)$(SEP)nci +NCI_BASE = $(TOOLS_BASE_)nci +NCI_BASE_ = $(NCI_BASE)$(SEP) +NCI_INT = $(INTERMEDIATE_)$(NCI_BASE) +NCI_INT_ = $(NCI_INT)$(SEP) +NCI_OUT = $(OUTPUT_)$(NCI_BASE) +NCI_OUT_ = $(NCI_OUT)$(SEP) -NCI_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE) -NCI_BASE_DIR_EXISTS = $(NCI_BASE_DIR)$(SEP)$(EXISTS) +$(NCI_INT): $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ -$(NCI_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXIST) - ${mkdir} $(NCI_BASE_DIR) - @echo . > $@ +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(NCI_OUT): $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif NCI_TARGET = \ - $(NCI_BASE_DIR)$(SEP)nci$(EXEPOSTFIX) + $(EXEPREFIX)$(NCI_OUT_)nci$(EXEPOSTFIX) NCI_SOURCES = \ - $(NCI_BASE)$(SEP)ncitool.c + $(NCI_BASE_)ncitool.c NCI_OBJECTS = \ - $(addprefix $(INTERMEDIATE), $(NCI_SOURCES:.c=.o)) + $(addprefix $(INTERMEDIATE_), $(NCI_SOURCES:.c=.o)) NCI_HOST_CFLAGS = -Iinclude -g -Werror -Wall NCI_HOST_LFLAGS = -g -$(NCI_TARGET): $(NCI_OBJECTS) +$(NCI_TARGET): $(NCI_OBJECTS) $(NCI_OUT) $(ECHO_LD) - ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_CFLAGS) -o $(NCI_TARGET) + ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_LFLAGS) -o $@ -$(NCI_BASE_DIR)$(SEP)ncitool.o: $(NCI_BASE)$(SEP)ncitool.c $(NCI_BASE_DIR_EXISTS) +$(NCI_INT_)ncitool.o: $(NCI_BASE_)ncitool.c $(NCI_INT) $(ECHO_CC) ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ @@ -34,13 +42,13 @@ clean: nci_clean # WIN32K.SYS -WIN32K_SVC_DB = $(NCI_BASE)$(SEP)w32ksvc.db +WIN32K_SVC_DB = $(NCI_BASE_)w32ksvc.db WIN32K_SERVICE_TABLE = subsys$(SEP)win32k$(SEP)main$(SEP)svctab.c WIN32K_GDI_STUBS = lib$(SEP)gdi32$(SEP)misc$(SEP)win32k.S WIN32K_USER_STUBS = lib$(SEP)user32$(SEP)misc$(SEP)win32k.S # NTOSKRNL.EXE -KERNEL_SVC_DB = $(NCI_BASE)$(SEP)sysfuncs.lst +KERNEL_SVC_DB = $(NCI_BASE_)sysfuncs.lst KERNEL_SERVICE_TABLE = include$(SEP)ntdll$(SEP)napi.h NTDLL_STUBS = lib$(SEP)ntdll$(SEP)napi.S KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)zw.S _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-22 07:25:53 UTC (rev 14265) @@ -3,13 +3,76 @@ #include "mingw.h" #include <assert.h> +#include "modulehandler.h" using std::string; using std::vector; using std::set; +using std::map; typedef set<string> set_string; +typedef map<string,Directory*> directory_map; +class Directory +{ +public: + string name; + directory_map subdirs; + Directory ( const string& name ); + void Add ( const char* subdir ); + void CreateRule ( FILE* f, const string& parent ); +}; + +Directory::Directory ( const string& name_ ) + : name(name_) +{ +} + +void Directory::Add ( const char* subdir ) +{ + const char* p = strpbrk ( subdir, "/\\" ); + if ( !p ) + p = subdir + strlen(subdir); + string s ( subdir, p-subdir ); + if ( subdirs.find(s) == subdirs.end() ) + subdirs[s] = new Directory(s); + if ( *p && *++p ) + subdirs[s]->Add ( p ); +} + +void +Directory::CreateRule ( FILE* f, const string& parent ) +{ + string path; + + if ( parent.size() ) + { + fprintf ( f, + "%s%c%s: %s\n", + parent.c_str (), + CSEP, + name.c_str (), + parent.c_str () ); + + fprintf ( f, + "\t$(ECHO_MKDIR)\n" ); + + fprintf ( f, + "\t${mkdir} $@\n" ); + + path = parent + SSEP + name; + } + else + path = name; + + for ( directory_map::iterator i = subdirs.begin(); + i != subdirs.end(); + ++i ) + { + i->second->CreateRule ( f, path ); + } +} + static class MingwFactory : public Backend::Factory { public: @@ -22,33 +85,82 @@ MingwBackend::MingwBackend ( Project& project ) - : Backend ( project ) + : Backend ( project ), + int_directories ( new Directory("$(INTERMEDIATE)") ), + out_directories ( new Directory("$(OUTPUT)") ) { } -void -MingwBackend::CreateDirectoryTargetIfNotYetCreated ( const string& directory ) +MingwBackend::~MingwBackend() { - directories.insert ( directory ); + delete int_directories; + delete out_directories; } +string +MingwBackend::AddDirectoryTarget ( const string& directory, bool out ) +{ + const char* dir_name = "$(INTERMEDIATE)"; + Directory* dir = int_directories; + if ( out ) + { + dir_name = "$(OUTPUT)"; + dir = out_directories; + } + dir->Add ( directory.c_str() ); + return dir_name; +} void MingwBackend::Process () { + size_t i; + DetectPCHSupport(); CreateMakefile (); GenerateHeader (); GenerateGlobalVariables (); - GenerateAllTarget (); - GenerateInitTarget (); GenerateXmlBuildFilesMacro(); - for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) + + vector<MingwModuleHandler*> v; + + for ( i = 0; i < ProjectNode.modules.size (); i++ ) { Module& module = *ProjectNode.modules[i]; - ProcessModule ( module ); + MingwModuleHandler* h = MingwModuleHandler::InstanciateHandler ( + module, + this ); + if ( module.host == HostDefault ) + { + module.host = h->DefaultHost(); + assert ( module.host != HostDefault ); + } + v.push_back ( h ); } + + size_t iend = v.size (); + + for ( i = 0; i < iend; i++ ) + v[i]->GenerateTargetMacro(); + fprintf ( fMakefile, "\n" ); + + GenerateAllTarget ( v ); + GenerateInitTarget (); + + for ( i = 0; i < iend; i++ ) + v[i]->GenerateOtherMacros(); + + for ( i = 0; i < iend; i++ ) + { + MingwModuleHandler& h = *v[i]; + h.GeneratePreconditionDependencies (); + h.Process (); + h.GenerateInvocations (); + h.GenerateCleanTarget (); + delete v[i]; + } + GenerateDirectoryTargets (); CheckAutomaticDependencies (); CloseMakefile (); @@ -60,6 +172,7 @@ fMakefile = fopen ( ProjectNode.makefile.c_str (), "w" ); if ( !fMakefile ) throw AccessDeniedException ( ProjectNode.makefile ); + MingwModuleHandler::SetBackend ( this ); MingwModuleHandler::SetMakefile ( fMakefile ); MingwModuleHandler::SetUsePch ( use_pch ); } @@ -129,7 +242,7 @@ if ( data.includes.size() || data.defines.size() ) { GenerateProjectCFlagsMacro ( assignmentOperation, - data ); + data ); } for ( i = 0; i < data.ifs.size(); i++ ) @@ -171,15 +284,6 @@ void MingwBackend::GenerateGlobalVariables () const { -#define TOOL_PREFIX "$(Q)$(INTERMEDIATE)tools" SSEP - fprintf ( fMakefile, "winebuild = " TOOL_PREFIX "winebuild" SSEP "winebuild" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "bin2res = " TOOL_PREFIX "bin2res" SSEP "bin2res" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "cabman = " TOOL_PREFIX "cabman" SSEP "cabman" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "cdmake = " TOOL_PREFIX "cdmake" SSEP "cdmake" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "regtests = " TOOL_PREFIX "regtests" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "rsym = " TOOL_PREFIX "rsym" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "wrc = " TOOL_PREFIX "wrc" SSEP "wrc" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); @@ -202,20 +306,21 @@ } void -MingwBackend::GenerateAllTarget () const +MingwBackend::GenerateAllTarget ( const vector<MingwModuleHandler*>& handlers ) const { fprintf ( fMakefile, "all:" ); int wrap_count = 0; - for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) + size_t iend = handlers.size (); + for ( size_t i = 0; i < iend; i++ ) { - Module& module = *ProjectNode.modules[i]; + const Module& module = handlers[i]->module; if ( IncludeInAllTarget ( module ) ) { if ( wrap_count++ == 5 ) fprintf ( fMakefile, " \\\n\t\t" ), wrap_count = 0; fprintf ( fMakefile, " %s", - FixupTargetFilename ( module.GetPath () ).c_str () ); + GetTargetMacro(module).c_str () ); } } fprintf ( fMakefile, "\n\t\n\n" ); @@ -244,8 +349,7 @@ fprintf ( fMakefile, "INIT = %s\n", GetBuildToolDependencies ().c_str () ); - fprintf ( fMakefile, - "\n" ); + fprintf ( fMakefile, "\n" ); } void @@ -272,8 +376,7 @@ xmlbuildFilenames.c_str ()); if ( i == ProjectNode.xmlbuildfiles.size () - 1 ) { - fprintf ( fMakefile, - "\n" ); + fprintf ( fMakefile, "\n" ); } else { @@ -285,8 +388,7 @@ } numberOfExistingFiles++; } - fprintf ( fMakefile, - "\n" ); + fprintf ( fMakefile, "\n" ); } void @@ -297,27 +399,10 @@ automaticDependency.CheckAutomaticDependencies (); } -void -MingwBackend::ProcessModule ( Module& module ) -{ - MingwModuleHandler* h = MingwModuleHandler::InstanciateHandler ( - module.node.location, - module.type, - this ); - MingwModuleHandler::string_list clean_files; - if ( module.host == HostDefault ) - { - module.host = h->DefaultHost(); - assert ( module.host != HostDefault ); - } - h->Process ( module, clean_files ); - h->GenerateCleanTarget ( module, clean_files ); -} - bool MingwBackend::IncludeDirectoryTarget ( const string& directory ) const { - if ( directory == "$(INTERMEDIATE)tools") + if ( directory == "$(INTERMEDIATE)" SSEP "tools") return false; else return true; @@ -326,7 +411,15 @@ void MingwBackend::GenerateDirectoryTargets () { - if ( directories.size () == 0 ) + // TODO FIXME - write new directory creation + for ( int i = 0; i < 2; i++ ) + { + Directory& d = *(!i ? int_directories : out_directories); + if ( i ) fprintf ( fMakefile, "ifneq ($(INTERMEDIATE),$(OUTPUT))\n" ); + d.CreateRule ( fMakefile, "" ); + if ( i ) fprintf ( fMakefile, "endif\n" ); + } + /*if ( directories.size () == 0 ) return; set_string::iterator i; @@ -345,13 +438,13 @@ } } - directories.clear (); + directories.clear ();*/ } string FixupTargetFilename ( const string& targetFilename ) { - return string("$(INTERMEDIATE)") + NormalizeFilename ( targetFilename ); + return NormalizeFilename ( targetFilename ); } void _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-22 07:25:53 UTC (rev 14265) @@ -2,17 +2,18 @@ #define MINGW_H #include "../backend.h" -#include "modulehandler.h" +class Directory; +class MingwModuleHandler; + class MingwBackend : public Backend { public: MingwBackend ( Project& project ); - virtual ~MingwBackend () { }; + virtual ~MingwBackend (); virtual void Process (); - void CreateDirectoryTargetIfNotYetCreated ( const std::string& directory ); + std::string AddDirectoryTarget ( const std::string& directory, bool out ); private: - void ProcessModule ( Module& module ); void CreateMakefile (); void CloseMakefile () const; void GenerateHeader () const; @@ -24,16 +25,16 @@ void GenerateDirectoryTargets (); void GenerateGlobalVariables () const; bool IncludeInAllTarget ( const Module& module ) const; - void GenerateAllTarget () const; + void GenerateAllTarget ( const std::vector<MingwModuleHandler*>& handlers ) const; std::string GetBuildToolDependencies () const; void GenerateInitTarget () const; void GenerateXmlBuildFilesMacro() const; void CheckAutomaticDependencies (); bool IncludeDirectoryTarget ( const std::string& directory ) const; void DetectPCHSupport(); - std::set<std::string> directories; FILE* fMakefile; bool use_pch; + Directory *int_directories, *out_directories; }; std::string FixupTargetFilename ( const std::string& targetFilename ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-22 03:06:03 UTC (rev 14264) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-22 07:25:53 UTC (rev 14265) @@ -10,29 +10,15 @@ #define CLEAN_FILE(f) clean_files.push_back ( f ); /*if ( module.name == "crt" ) printf ( "%s(%i): clean: %s\n", __FILE__, __LINE__, f.c_str() )*/ +static string ros_temp = "$(ROS_TEMPORARY)"; +MingwBackend* +MingwModuleHandler::backend = NULL; FILE* MingwModuleHandler::fMakefile = NULL; bool MingwModuleHandler::use_pch = false; string -ReplaceExtension ( const string& filename, - const string& newExtension ) -{ - size_t index = filename.find_last_of ( '/' ); - if ( index == string::npos ) - index = 0; - size_t index2 = filename.find_last_of ( '\\' ); - if ( index2 != string::npos && index2 > index ) - index = index2; - string tmp = filename.substr( index /*, filename.size() - index*/ ); - size_t ext_index = tmp.find_last_of( '.' ); - if ( ext_index != string::npos ) - return filename.substr ( 0, index + ext_index ) + newExtension; - return filename + newExtension; -} - -string PrefixFilename ( const string& filename, const string& prefix ) @@ -54,7 +40,8 @@ return out; } -string v2s ( const vector<string>& v, int wrap_at ) +string +v2s ( const string_list& v, int wrap_at ) { if ( !v.size() ) return ""; @@ -73,88 +60,144 @@ return s; } -MingwModuleHandler::MingwModuleHandler ( ModuleType moduletype, - MingwBackend* backend_ ) - : backend ( backend_ ) +string +GetTargetMacro ( const Module& module, bool with_dollar ) { + string s ( module.name ); + strupr ( &s[0] ); + s += "_TARGET"; + if ( with_dollar ) + return ssprintf ( "$(%s)", s.c_str() ); + return s; } +MingwModuleHandler::MingwModuleHandler ( + const Module& module_ ) + + : module(module_) +{ +} + MingwModuleHandler::~MingwModuleHandler() { } -const string & -MingwModuleHandler::PassThruCacheDirectory ( const string &file ) +/*static*/ void +MingwModuleHandler::SetBackend ( MingwBackend* backend_ ) { - backend->CreateDirectoryTargetIfNotYetCreated ( GetDirectory ( file ) ); - return file; + backend = backend_; } -void +/*static*/ void MingwModuleHandler::SetMakefile ( FILE* f ) { fMakefile = f; } -void +/*static*/ void MingwModuleHandler::SetUsePch ( bool b ) { use_pch = b; } -MingwModuleHandler* -MingwModuleHandler::InstanciateHandler ( const string& location, - ModuleType moduletype, - MingwBackend* backend ) +/*static*/ string +MingwModuleHandler::PassThruCacheDirectory ( + const string &file, bool out ) { + string dir ( GetDirectory ( file ) ); + return backend->AddDirectoryTarget ( dir, out ) + SSEP + file; +} + +/*static*/ string +MingwModuleHandler::GetTargetFilename ( + const Module& module, + string_list* pclean_files ) +{ + string target = PassThruCacheDirectory ( + FixupTargetFilename ( module.GetPath () ), + true ); + if ( pclean_files ) + { + string_list& clean_files = *pclean_files; + CLEAN_FILE ( target ); + } + return target; +} [truncated at 1000 lines; 4465 more skipped]

1 0

[ion] 14264: Fix really really big Mutex/APC bug. Killing GUI Threads from taskmanager should now work flawlessly, and gui apps should work better; the bug had probably tiny important impact in them
by ion＠svn.reactos.com 22 Mar '05

22 Mar '05

Fix really really big Mutex/APC bug. Killing GUI Threads from taskmanager should now work flawlessly, and gui apps should work better; the bug had probably tiny important impact in them Modified: trunk/reactos/ntoskrnl/ke/mutex.c _____ Modified: trunk/reactos/ntoskrnl/ke/mutex.c --- trunk/reactos/ntoskrnl/ke/mutex.c 2005-03-22 03:05:46 UTC (rev 14263) +++ trunk/reactos/ntoskrnl/ke/mutex.c 2005-03-22 03:06:03 UTC (rev 14264) @@ -162,10 +162,28 @@ /* Check if the signal state is only single */ if (Mutant->Header.SignalState == 1) { + /* Check if it's below 0 now */ if (PreviousState <= 0) { + /* Remove the mutant from the list */ DPRINT("Removing Mutant\n"); RemoveEntryList(&Mutant->MutantListEntry); + + /* Reenable APCs */ + DPRINT("Re-enabling APCs\n"); + CurrentThread->KernelApcDisable += Mutant->ApcDisable; + + /* Force an Interrupt if Apcs are pending */ + if (!IsListEmpty(&CurrentThread->ApcState.ApcListHead[KernelMode])) { + + /* Make sure they aren't disabled though */ + if (!CurrentThread->KernelApcDisable) { + + /* Request the Interrupt */ + DPRINT("Requesting APC Interupt\n"); + HalRequestSoftwareInterrupt(APC_LEVEL); + } + } } /* Remove the Owning Thread and wake it */

1 0

[weiden] 14263: forgot to remove debug messages
by weiden＠svn.reactos.com 22 Mar '05

22 Mar '05

forgot to remove debug messages Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-03-22 02:35:54 UTC (rev 14262) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-03-22 03:05:46 UTC (rev 14263) @@ -246,8 +246,8 @@ DPRINT("TerminationPort: %p\n", TerminationPort); } - /* Rundown Win32 Structures */DPRINT1("Terminating win32 thread 0x%x (proc 0x%x)\n", CurrentThread, CurrentThread->ThreadsProcess); - PsTerminateWin32Thread(CurrentThread);if (Last) {DPRINT1("Terminating win32 process 0x%x (thread 0x%x)\n", CurrentProcess, CurrentThread); } + /* Rundown Win32 Structures */ + PsTerminateWin32Thread(CurrentThread); if (Last) PsTerminateWin32Process(CurrentProcess); /* Cancel I/O for the thread. */ @@ -282,10 +282,10 @@ ExReleaseFastMutex(&CurrentProcess->TebLock); } - /* The last Thread shuts down the Process */if (Last) {DPRINT1("calling PspExitProcess\n");} + /* The last Thread shuts down the Process */ if (Last) PspExitProcess(CurrentProcess); - /* Unlock the Process */DPRINT1("Released process 0x%x lock by 0x%x\n", CurrentProcess, PsGetCurrentThread()); + /* Unlock the Process */ PsUnlockProcess(CurrentProcess); /* Rundown Timers */

1 0

[weiden] 14262: silence obsolete debug message
by weiden＠svn.reactos.com 22 Mar '05

22 Mar '05

silence obsolete debug message Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-03-22 02:32:14 UTC (rev 14261) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-03-22 02:35:54 UTC (rev 14262) @@ -479,7 +479,6 @@ /* unlock and dereference the process so the threads can kill themselves */ PsUnlockProcess(Process); ObDereferenceObject(Process); - DPRINT1("Terminated foreign process 0x%x\n", Process); } return(STATUS_SUCCESS);

1 0

[weiden] 14261: fixed thread/process termination bugs that might have caused crashes. due to a apc bug gui threads terminating gui threads doesn't work. Alex is going to take care of it.
by weiden＠svn.reactos.com 22 Mar '05

22 Mar '05

fixed thread/process termination bugs that might have caused crashes. due to a apc bug gui threads terminating gui threads doesn't work. Alex is going to take care of it. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ps/create.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-03-21 23:37:02 UTC (rev 14260) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-03-22 02:32:14 UTC (rev 14261) @@ -658,7 +658,7 @@ NTSTATUS PsDeleteCidHandle(HANDLE CidHandle, POBJECT_TYPE ObjectType); PHANDLE_TABLE_ENTRY PsLookupCidHandle(HANDLE CidHandle, POBJECT_TYPE ObjectType, PVOID *Object); VOID PsUnlockCidHandle(PHANDLE_TABLE_ENTRY CidEntry); -NTSTATUS PsLockProcess(PEPROCESS Process, BOOL Timeout); +NTSTATUS PsLockProcess(PEPROCESS Process, BOOLEAN Timeout); VOID PsUnlockProcess(PEPROCESS Process); #define ETHREAD_TO_KTHREAD(pEThread) (&(pEThread)->Tcb) _____ Modified: trunk/reactos/ntoskrnl/ps/create.c --- trunk/reactos/ntoskrnl/ps/create.c 2005-03-21 23:37:02 UTC (rev 14260) +++ trunk/reactos/ntoskrnl/ps/create.c 2005-03-22 02:32:14 UTC (rev 14261) @@ -372,7 +372,22 @@ { return(Status); } + + Status = PsLockProcess(Process, FALSE); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(Process); + return(Status); + } + if(Process->ExitTime.QuadPart != 0) + { + PsUnlockProcess(Process); + return STATUS_PROCESS_IS_TERMINATING; + } + + PsUnlockProcess(Process); + Status = PsInitializeThread(Process, &Thread, ObjectAttributes, _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-03-21 23:37:02 UTC (rev 14260) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-03-22 02:32:14 UTC (rev 14261) @@ -103,11 +103,9 @@ if (!Thread->HasTerminated) { Thread->HasTerminated = TRUE; + /* Terminate it by APC */ PspTerminateThreadByPointer(Thread, ExitStatus); - - /* Unsuspend it */ - KeForceResumeThread(&Thread->Tcb); } } } @@ -181,7 +179,7 @@ PVOID TebBlock; PTERMINATION_PORT TerminationPort; - DPRINT("PsTerminateCurrentThread(ExitStatus %x)\n", ExitStatus); + DPRINT("PsTerminateCurrentThread(ExitStatus %x), Current: 0x%x\n", ExitStatus, PsGetCurrentThread()); /* Get the Current Thread and Process */ CurrentThread = PsGetCurrentThread(); @@ -202,6 +200,10 @@ /* Run Thread Notify Routines before we desintegrate the thread */ PspRunCreateThreadNotifyRoutines(CurrentThread, FALSE); + + /* Set the Exit Status and Exit Time */ + CurrentThread->ExitStatus = ExitStatus; + KeQuerySystemTime(&CurrentThread->ExitTime); /* Lock the Process before we modify its thread entries */ PsLockProcess(CurrentProcess, FALSE); @@ -213,8 +215,13 @@ /* Set the last Thread Exit Status */ CurrentProcess->LastThreadExitStatus = ExitStatus; - /* Unlock the Process */ - PsUnlockProcess(CurrentProcess); + if (Last) { + + /* Save the Exit Time if not already done by NtTerminateProcess. This + happens when the last thread just terminates without explicitly + terminating the process. */ + CurrentProcess->ExitTime = CurrentThread->ExitTime; + } /* Check if the process has a debug port */ if (CurrentProcess->DebugPort) { @@ -239,22 +246,15 @@ DPRINT("TerminationPort: %p\n", TerminationPort); } - /* Rundown Win32 Structures */ - PsTerminateWin32Thread(CurrentThread); + /* Rundown Win32 Structures */DPRINT1("Terminating win32 thread 0x%x (proc 0x%x)\n", CurrentThread, CurrentThread->ThreadsProcess); + PsTerminateWin32Thread(CurrentThread);if (Last) {DPRINT1("Terminating win32 process 0x%x (thread 0x%x)\n", CurrentProcess, CurrentThread); } if (Last) PsTerminateWin32Process(CurrentProcess); /* Cancel I/O for the thread. */ IoCancelThreadIo(CurrentThread); - /* Rundown Timers */ - ExTimerRundown(); - KeCancelTimer(&CurrentThread->Tcb.Timer); - /* Rundown Registry Notifications. TODO (refers to NtChangeNotify, not Cm callbacks) */ //CmNotifyRunDown(CurrentThread); - - /* Rundown Mutexes */ - KeRundownThread(); /* Free the TEB */ if(CurrentThread->Tcb.Teb) { @@ -282,19 +282,25 @@ ExReleaseFastMutex(&CurrentProcess->TebLock); } - /* Set the Exit Status and Exit Time */ - CurrentThread->ExitStatus = ExitStatus; - KeQuerySystemTime((PLARGE_INTEGER)&CurrentThread->ExitTime); - + /* The last Thread shuts down the Process */if (Last) {DPRINT1("calling PspExitProcess\n");} + if (Last) PspExitProcess(CurrentProcess); + + /* Unlock the Process */DPRINT1("Released process 0x%x lock by 0x%x\n", CurrentProcess, PsGetCurrentThread()); + PsUnlockProcess(CurrentProcess); + + /* Rundown Timers */ + ExTimerRundown(); + KeCancelTimer(&CurrentThread->Tcb.Timer); + /* If the Processor Control Block's NpxThread points to the current thread * unset it. */ InterlockedCompareExchangePointer(&KeGetCurrentPrcb()->NpxThread, NULL, (PKPROCESS)CurrentThread); - - /* The last Thread shuts down the Process */ - if (Last) PspExitProcess(CurrentProcess); + + /* Rundown Mutexes */ + KeRundownThread(); /* Terminate the Thread from the Scheduler */ KeTerminateThread(0); @@ -312,11 +318,16 @@ { NTSTATUS ExitStatus = (NTSTATUS)Apc->NormalContext; + DPRINT("PsExitSpecialApc called: 0x%x\n", PsGetCurrentThread()); + /* Free the APC */ ExFreePool(Apc); /* Terminate the Thread */ PspExitThread(ExitStatus); + + /* we should never reach this point! */ + KEBUGCHECK(0); } VOID @@ -330,6 +341,9 @@ */ DPRINT1("APC2\n"); PspExitThread((NTSTATUS)NormalContext); + + /* we should never reach this point! */ + KEBUGCHECK(0); } /* @@ -347,9 +361,12 @@ /* Check if we are already in the right context */ if (PsGetCurrentThread() == Thread) { - + /* Directly terminate the thread */ PspExitThread(ExitStatus); + + /* we should never reach this point! */ + KEBUGCHECK(0); } /* Allocate the APC */ @@ -388,12 +405,12 @@ RemoveEntryList(&Process->ProcessListEntry); ExReleaseFastMutex(&PspActiveProcessMutex); + /* close all handles associated with our process, this needs to be done + when the last thread still runs */ ObKillProcess(Process); + KeSetProcess(&Process->Pcb, IO_NO_INCREMENT); - - /* NOTE: This dereference corresponds to reference in NtTerminateProcess. */ - ObDereferenceObject(Process); - + return(STATUS_SUCCESS); } @@ -424,38 +441,47 @@ } PsLockProcess(Process, FALSE); - - if(Process->ExitTime.QuadPart) { - - DPRINT1("Process has an exit time!\n"); - KeLeaveCriticalRegion(); - return STATUS_PROCESS_IS_TERMINATING; + + if(Process->ExitTime.QuadPart != 0) + { + PsUnlockProcess(Process); + return STATUS_PROCESS_IS_TERMINATING; } /* Terminate all the Process's Threads */ PspTerminateProcessThreads(Process, ExitStatus); - - /* Save the Exit Time */ - KeQuerySystemTime(&Process->ExitTime); - - PsUnlockProcess(Process); /* Only master thread remains... kill it off */ if (PsGetCurrentThread()->ThreadsProcess == Process) { - /* - * NOTE: Dereferencing of the Process structure takes place in - * PspExitProcess. If we would do it here the Win32 Process - * information would be destroyed before the Win32 Destroy - * thread/process callback is called. - */ + /* set the exit time as we're about to release the process lock before + we kill ourselves to prevent threads outside of our process trying + to kill us */ + KeQuerySystemTime(&Process->ExitTime); + PsUnlockProcess(Process); + + /* we can safely dereference the process because the current thread + holds a reference to it until it gets reaped */ + ObDereferenceObject(Process); + + /* now the other threads get a chance to terminate, we don't wait but + just kill ourselves right now. The process will be run down when the + last thread terminates */ + PspExitThread(ExitStatus); - return(STATUS_SUCCESS); + + /* we should never reach this point! */ + KEBUGCHECK(0); } + else + { + /* unlock and dereference the process so the threads can kill themselves */ + PsUnlockProcess(Process); + ObDereferenceObject(Process); + DPRINT1("Terminated foreign process 0x%x\n", Process); + } - /* If we took this path instead, then do the same as above */ - ObDereferenceObject(Process); return(STATUS_SUCCESS); } @@ -498,17 +524,20 @@ /* Terminate it */ PspTerminateThreadByPointer(Thread, ExitStatus); - - /* Resume it */ - KeForceResumeThread(&Thread->Tcb); } } else { + + /* it's safe to dereference thread, there's at least the keep-alive + reference which will be removed by the thread reaper causing the + thread to be finally destroyed */ ObDereferenceObject(Thread); /* Terminate him, he's ours */ PspExitThread(ExitStatus); - /* We do never reach this point */ + + /* We do never reach this point */ + KEBUGCHECK(0); } /* Dereference the Thread and return */ @@ -534,6 +563,10 @@ /* Terminate it for real */ PspExitThread(ExitStatus); + + /* we should never reach this point! */ + KEBUGCHECK(0); + return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-03-21 23:37:02 UTC (rev 14260) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-03-22 02:32:14 UTC (rev 14261) @@ -1645,7 +1645,7 @@ } NTSTATUS -PsLockProcess(PEPROCESS Process, BOOL Timeout) +PsLockProcess(PEPROCESS Process, BOOLEAN Timeout) { ULONG Attempts = 0; PKTHREAD PrevLockOwner; @@ -1689,9 +1689,8 @@ } #endif KeLeaveCriticalRegion(); - + break; } - break; } else {

1 0

[hpoussin] 14260: Sylvain Petreolle <spetreolle@yahoo.fr>
by hpoussin＠svn.reactos.com 21 Mar '05

21 Mar '05

Sylvain Petreolle <spetreolle(a)yahoo.fr> - Translate sysdm.cpl into french - Fix misplaced icons and text boxes - Add default values into network identification Modified: trunk/reactos/lib/cpl/sysdm/de.rc Modified: trunk/reactos/lib/cpl/sysdm/en.rc Added: trunk/reactos/lib/cpl/sysdm/fr.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc _____ Modified: trunk/reactos/lib/cpl/sysdm/de.rc --- trunk/reactos/lib/cpl/sysdm/de.rc 2005-03-21 22:10:10 UTC (rev 14259) +++ trunk/reactos/lib/cpl/sysdm/de.rc 2005-03-21 23:37:02 UTC (rev 14260) @@ -25,10 +25,10 @@ BEGIN ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "Windows benutzt folgende Informationen im Sie im Netzwerk zu erkennen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - LTEXT "Vollstõndiger Computername:",-1,PROPSHEETPADDING,LABELLINE(4)-4,PROPSHEETWIDTH-(6*PROP SHEETPADDING)-ICONSIZE,LABELLINE(4)-4 - LTEXT "",IDC_COMPUTERNAME,120,LABELLINE(4)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDIN G)-ICONSIZE,LABELLINE(4)-5 - LTEXT "Arbeitsgruppe:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PRO PSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6 - LTEXT "",IDC_WORKGROUPDOMAIN_NAME,120,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(6)-6 + LTEXT "Vollstõndiger Computername:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LA BELLINE(4)-4 + LTEXT "(Default)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABEL LINE(4)-5 + LTEXT "Arbeitsgruppe:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17* PROPSHEETPADDING,LABELLINE(6)-6 + LTEXT "(leer)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING,LABELLINE(6)-6,60, LABELLINE(6)-6 LTEXT "Klicken Sie auf Netzwerkkennung um sich einer Domaine anzuschlie?en und einen lokalen Benutzer zu erstellen",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(8)+5 PUSHBUTTON "&Netzwerkkennung...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+ 4 LTEXT "Klicken Sie auf Eigenschaften, um den Computer umzubennen oder einer Domõne anzuschlie?en.",-1,PROPSHEETPADDING,LABELLINE(11) +2,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(12)+2 @@ -68,8 +68,8 @@ CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHO WSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABEL LINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTED GE PUSHBUTTON "L÷schen",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABEL LINE(1)+2 - PUSHBUTTON "Typ õndern...",IDC_USERPROFILE_CHANGE,95,LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "Kopieren zu...",IDC_USERPROFILE_COPY,180,LABELLINE(20),60,LABELLINE(1)+2 + PUSHBUTTON "Typ õndern...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60 ,LABELLINE(1)+2 + PUSHBUTTON "Kopieren zu...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING-60,LABELLINE (20),60,LABELLINE(1)+2 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -83,7 +83,7 @@ PUSHBUTTON "&Systemleistungseinstellungen...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHE ETPADDING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 GROUPBOX "Umgebungsvariablen",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-( 2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "?ber Umgebungvariablen wird festgelegt, wo bestimmte Informationen zu finden sind.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11) + LTEXT "?ber Umgebungvariablen wird festgelegt, wo bestimmte Informationen zu finden sind.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) PUSHBUTTON "&Umgebungsvariablen..",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING), LABELLINE(12)+2,(18*PROPSHEETPADDING),14 GROUPBOX "&Start und Wiederherstellung",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2 *PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON _____ Modified: trunk/reactos/lib/cpl/sysdm/en.rc --- trunk/reactos/lib/cpl/sysdm/en.rc 2005-03-21 22:10:10 UTC (rev 14259) +++ trunk/reactos/lib/cpl/sysdm/en.rc 2005-03-21 23:37:02 UTC (rev 14260) @@ -27,10 +27,10 @@ BEGIN ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "Windows uses the following information to identify your computer on the network.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - LTEXT "Full computer name:",-1,PROPSHEETPADDING,LABELLINE(4)-4,PROPSHEETWIDTH-(6*PROPSHEETPAD DING)-ICONSIZE,LABELLINE(4)-4 - LTEXT "",IDC_COMPUTERNAME,120,LABELLINE(4)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDIN G)-ICONSIZE,LABELLINE(4)-5 - LTEXT "Workgroup:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PROPSHE ETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6 - LTEXT "",IDC_WORKGROUPDOMAIN_NAME,120,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(6)-6 + LTEXT "Full computer name:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LABELLINE( 4)-4 + LTEXT "(Default)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABEL LINE(4)-5 + LTEXT "Workgroup:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROP SHEETPADDING,LABELLINE(6)-6 + LTEXT "(empty)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING,LABELLINE(6)-6,60 ,LABELLINE(6)-6 LTEXT "To use the Network Identfication Wizard to join a domain and create a local user, click Network ID.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADD ING)-ICONSIZE,LABELLINE(8)+5 PUSHBUTTON "&Network ID...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 LTEXT "To rename this computer or join a domain, click Properties.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PROP SHEETPADDING)-ICONSIZE,LABELLINE(12)+2 @@ -70,8 +70,8 @@ CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHO WSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABEL LINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTED GE PUSHBUTTON "Delete",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELL INE(1)+2 - PUSHBUTTON "Change Type...",IDC_USERPROFILE_CHANGE,95,LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "Copy To...",IDC_USERPROFILE_COPY,180,LABELLINE(20),60,LABELLINE(1)+2 + PUSHBUTTON "Change Type...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,L ABELLINE(1)+2 + PUSHBUTTON "Copy To...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING-60,LABELLINE (20),60,LABELLINE(1)+2 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -85,7 +85,7 @@ PUSHBUTTON "&Performance Options...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(5) +2,(18*PROPSHEETPADDING),14 GROUPBOX "Environment Variables",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Environment variables tell your computer where to find certain types of information.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11) + LTEXT "Environment variables tell your computer where to find certain types of information.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) PUSHBUTTON "&Environment Variables...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE( 12)+2,(18*PROPSHEETPADDING),14 GROUPBOX "&Startup and Recovery",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON _____ Added: trunk/reactos/lib/cpl/sysdm/fr.rc --- trunk/reactos/lib/cpl/sysdm/fr.rc 2005-03-21 22:10:10 UTC (rev 14259) +++ trunk/reactos/lib/cpl/sysdm/fr.rc 2005-03-21 23:37:02 UTC (rev 14260) @@ -0,0 +1,141 @@ +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT + +IDI_CPLSYSTEM ICON "resources/applet.ico" +IDI_DEVMGR ICON "resources/devmgr.ico" +RC_LICENSE RTDATA "resources/gpl.txt" + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "GÚnÚral" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "SystÞme d'exploitation",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLU MN-PROPSHEETPADDING,8 + LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3), PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Version " REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE( 4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + LTEXT "Ordinateur",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN- PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(7) ,PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(8),PROPSHEETWI DTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(9),PROPSH EETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(10),PROPSHE ETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING,LABELLINE(13),PROPSHEETWIDTH-(2*PROPSHE ETPADDING),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING,ES_LEFT|WS_TAB STOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY +END + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Identification rÚseau" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "ReactOS utilise les informations suivantes pour identifier votre ordinateur sur le rÚseau.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Nom complet de l'ordinateur:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LA BELLINE(4)-4 + LTEXT "(DÚfaut)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABELL INE(4)-5 + LTEXT "Domaine:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROPSH EETPADDING,LABELLINE(6)-6 + LTEXT "(vide)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING,LABELLINE(6)-6,60, LABELLINE(6)-6 + LTEXT "Pour utiliser l'Assistant RÚseau, afin de rejoindre un domaine ou crÚer un utilisateur local, cliquez sur Identification RÚseau.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(13*PROPSHEET PADDING)-ICONSIZE,LABELLINE(8)+5 + PUSHBUTTON "&Identification &rÚseau...",IDC_NETWORK_ID,170,LABELLINE(7)+5,80,LABELLINE(1)+4 + LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur PropriÚtÚs.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(13*PROP SHEETPADDING)-ICONSIZE,LABELLINE(12)+2 + PUSHBUTTON "&PropriÚtÚs...",IDC_NETWORK_PROPERTY,170,LABELLINE(11)+2,80,LABELLINE(1 )+4 +END + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "MatÚriel" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Assistant matÚriel",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "L'Assistant matÚriel vous aide Ó installer, dÚsinstaller, rÚparer, dÚbrancher, enlever et configurer votre matÚriel.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + PUSHBUTTON "Assistant &matÚriel...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(21*PROPSHEETPADDING),L ABELLINE(5)+2,(19*PROPSHEETPADDING),14 + + GROUPBOX "Gestionnaire de pÚriphÚriques",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(7)+2 + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Le Gestionnaire de pÚriphÚriques liste tous les pÚriphÚriques installÚs sur votre ordinateur. Utilisez le Gestionnaire de pÚriphÚriques pour modifier les propriÚtÚs de tout pÚriphÚrique.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "&Gestionnaire de pÚriphÚriques...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(21*PROPSHE ETPADDING),LABELLINE(13)+2,(19*PROPSHEETPADDING),14 + + GROUPBOX "Profils matÚriels",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHE ETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Les Profils matÚriels vous donnent un moyen de metttre en place et conserver diffÚrentes configurations matÚrielles.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETW IDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Profils &matÚriels...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(21*PROPSHEETPADDING) ,LABELLINE(20)+2,(19*PROPSHEETPADDING),14 +END + +IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Profils utilisateurs" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Les Profils utilisateurs contiennent les rÚglages bureau et d'autres informations associÚes Ó votre compte utilisateur. Un profil diffÚrent peut Ûtre crÚÚ sur chaque ordinateur que vous utilisez, ou vous pouvez choisir un profil nomade qui sera identique sur chaque ordinateur que vous utiliserez.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(5) + LTEXT "Profils sauvÚs sur cet ordinateur:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEE TPADDING)-ICONSIZE,LABELLINE(1) + CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHO WSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABEL LINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTED GE + + PUSHBUTTON "Effacer",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABEL LINE(1)+2 + PUSHBUTTON "Modifier le type...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,L ABELLINE(1)+2 + PUSHBUTTON "Copier vers...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING-60,LABELLI NE(20),60,LABELLINE(1)+2 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "AvancÚ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Performances",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Les options de performance controlent comment les applications utilisent la mÚmoire, ce qui affecte la vitesse de votre ordinateur.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Options Performances...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLI NE(5)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "Variables d'environnement",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PR OPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Les Variables d'environnement indiquent Ó votre ordinateur o¨ trouver certains types d'informations.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSH EETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Variables d'&environnement...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LAB ELLINE(12)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "&DÚmarrage et rÚcupÚration",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Les options de d&Úmarrage et de rÚcupÚration disent Ó votre ordinateur comment dÚmarrer et quoi faire en cas d'arrÛt d¹ Ó une erreur systÞme.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&DÚmarrage et rÚcupÚration...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLI NE(19)+2,(18*PROPSHEETPADDING),14 +END + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Variables d'environnement" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Variables utilisateur",-1,7,12,238,100 + LTEXT "&Variables:",-1,14,24,224,8 + CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_S HOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS _TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "&Nouveau...",IDC_USER_VARIABLE_NEW,80,90,50,14 + PUSHBUTTON "&Modifier...",IDC_USER_VARIABLE_EDIT,134,90,50,14 + PUSHBUTTON "&Effacer",IDC_USER_VARIABLE_DELETE,188,90,50,14 + + GROUPBOX "Variables systÞme",-1,7,116,238,100 + LTEXT "V&ariables:",-1,14,128,224,8 + CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS _SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL| WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "&Nouveau......",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 + PUSHBUTTON "&Modifier...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 + PUSHBUTTON "&Effacer",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 + + DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP + PUSHBUTTON "Annuler",IDCANCEL,195,224,50,14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 240, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Modifier la variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Nom de la variable:",-1,7,14,65,8 + EDITTEXT IDC_VARIABLE_NAME,85,12,145,12,ES_AUTOHSCROLL + LTEXT "&Valeur de la variable:",-1,7,32,70,8 + EDITTEXT IDC_VARIABLE_VALUE,85,30,145,12,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP + PUSHBUTTON "Annuler",IDCANCEL,170,50,50,14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "SystÞme" + IDS_CPLSYSTEMDESCRIPTION "Afficher les informations sur votre odrinateur et changer les paramÞtres du systÞme et du matÚriel." +END Property changes on: trunk/reactos/lib/cpl/sysdm/fr.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc --- trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-03-21 22:10:10 UTC (rev 14259) +++ trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-03-21 23:37:02 UTC (rev 14260) @@ -20,3 +20,4 @@ #include "en.rc" #include "de.rc" #include "dk.rc" +#include "fr.rc"

1 0

[fireball] 14259: Nice "About Explorer" icon, by Mindflyer.
by fireball＠svn.reactos.com 21 Mar '05

21 Mar '05

Nice "About Explorer" icon, by Mindflyer. Modified: trunk/reactos/subsys/system/explorer/res/ros-big.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/ros-big.ico (Binary files differ)

1 0

[hpoussin] 14258: Change REG_MULTI_SZ entry values to readable form.
by hpoussin＠svn.reactos.com 21 Mar '05

21 Mar '05

Change REG_MULTI_SZ entry values to readable form. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-03-21 21:33:31 UTC (rev 14257) +++ trunk/reactos/bootdata/hivesys.inf 2005-03-21 22:07:06 UTC (rev 14258) @@ -257,10 +257,10 @@ ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys " -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00070001,50,00,6f,00,73,00,69,00,78,00, 00,00,4f,00,73,00,32,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix","Os2" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\os2ss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00070001,44,00,65,00,62,00,75,00,67,00, 00,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.ex e" ; 3Com 3c905 Driver

1 0

[navaraf] 14257: Move the process object dereference from NtTerminateProcess to PspExitProcess (comments inside).
by navaraf＠svn.reactos.com 21 Mar '05

21 Mar '05

Move the process object dereference from NtTerminateProcess to PspExitProcess (comments inside). Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-03-21 20:11:52 UTC (rev 14256) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-03-21 21:33:31 UTC (rev 14257) @@ -390,6 +390,10 @@ ObKillProcess(Process); KeSetProcess(&Process->Pcb, IO_NO_INCREMENT); + + /* NOTE: This dereference corresponds to reference in NtTerminateProcess. */ + ObDereferenceObject(Process); + return(STATUS_SUCCESS); } @@ -439,8 +443,13 @@ /* Only master thread remains... kill it off */ if (PsGetCurrentThread()->ThreadsProcess == Process) { - /* Unlock and dereference */ - ObDereferenceObject(Process); + /* + * NOTE: Dereferencing of the Process structure takes place in + * PspExitProcess. If we would do it here the Win32 Process + * information would be destroyed before the Win32 Destroy + * thread/process callback is called. + */ + PspExitThread(ExitStatus); return(STATUS_SUCCESS); }

1 0

[navaraf] 14256: - Advance the CurrentEntry pointer before terminating thread in PspTerminateProcessThreads.
by navaraf＠svn.reactos.com 21 Mar '05

21 Mar '05

- Advance the CurrentEntry pointer before terminating thread in PspTerminateProcessThreads. - Lock the process in NtTerminateProcess to prevent race conditions. Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-03-21 17:13:55 UTC (rev 14255) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-03-21 20:11:52 UTC (rev 14256) @@ -93,6 +93,9 @@ /* Get the Current Thread */ Thread = CONTAINING_RECORD(CurrentEntry, ETHREAD, ThreadListEntry); + /* Move to the Next Thread */ + CurrentEntry = CurrentEntry->Flink; + /* Make sure it's not the one we're in */ if (Thread != CurrentThread) { @@ -107,9 +110,6 @@ KeForceResumeThread(&Thread->Tcb); } } - - /* Move to the Next Thread */ - CurrentEntry = CurrentEntry->Flink; } } @@ -419,6 +419,8 @@ return(Status); } + PsLockProcess(Process, FALSE); + if(Process->ExitTime.QuadPart) { DPRINT1("Process has an exit time!\n"); @@ -431,6 +433,8 @@ /* Save the Exit Time */ KeQuerySystemTime(&Process->ExitTime); + + PsUnlockProcess(Process); /* Only master thread remains... kill it off */ if (PsGetCurrentThread()->ThreadsProcess == Process) {

1 0

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