Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

by chorns＠svn.reactos.com

Remove old makefiles Deleted: trunk/reactos/apps/Makefile Deleted: trunk/reactos/apps/testsets/Makefile Deleted: trunk/reactos/apps/testsets/loadlib/makefile Deleted: trunk/reactos/apps/testsets/msvcrt/fileio/makefile Deleted: trunk/reactos/apps/utils/binpatch/Makefile Deleted: trunk/reactos/apps/utils/cat/makefile Deleted: trunk/reactos/apps/utils/driver/load/makefile Deleted: trunk/reactos/apps/utils/driver/unload/makefile Deleted: trunk/reactos/apps/utils/infinst/makefile Deleted: trunk/reactos/apps/utils/net/ftp/makefile Deleted: trunk/reactos/apps/utils/net/roshttpd/makefile Deleted: trunk/reactos/apps/utils/net/tracert/makefile Deleted: trunk/reactos/apps/utils/nts2w32err/makefile Deleted: trunk/reactos/apps/utils/objdir/makefile Deleted: trunk/reactos/apps/utils/partinfo/makefile Deleted: trunk/reactos/apps/utils/patchnv4/Makefile Deleted: trunk/reactos/apps/utils/pesum/makefile Deleted: trunk/reactos/apps/utils/pice/loader/makefile Deleted: trunk/reactos/apps/utils/pice/makefile Deleted: trunk/reactos/apps/utils/pice/module/makefile Deleted: trunk/reactos/apps/utils/pnpdump/makefile Deleted: trunk/reactos/apps/utils/ps/makefile Deleted: trunk/reactos/apps/utils/sc/makefile Deleted: trunk/reactos/apps/utils/shutdown/Makefile Deleted: trunk/reactos/apps/utils/stats/Makefile Deleted: trunk/reactos/apps/utils/theme/dump/Makefile Deleted: trunk/reactos/apps/utils/tickcount/makefile Deleted: trunk/reactos/apps/utils/winetest/makefile Deleted: trunk/reactos/boot/freeldr/Makefile Deleted: trunk/reactos/boot/freeldr/fdebug/Makefile Deleted: trunk/reactos/boot/freeldr/install/Makefile Deleted: trunk/reactos/boot/freeldr/tools/Makefile Deleted: trunk/reactos/drivers/Makefile Deleted: trunk/reactos/drivers/bus/Makefile Deleted: trunk/reactos/drivers/bus/serenum/makefile Deleted: trunk/reactos/drivers/dd/Makefile Deleted: trunk/reactos/drivers/dd/green/makefile Deleted: trunk/reactos/drivers/dd/test/makefile Deleted: trunk/reactos/drivers/fs/Makefile Deleted: trunk/reactos/drivers/fs/ext2/makefile Deleted: trunk/reactos/drivers/fs/minix/Makefile Deleted: trunk/reactos/drivers/fs/ntfs/linux-ntfs/Makefile Deleted: trunk/reactos/drivers/fs/template/makefile Deleted: trunk/reactos/drivers/input/Makefile Deleted: trunk/reactos/drivers/input/kbdclass/makefile Deleted: trunk/reactos/drivers/lib/Makefile Deleted: trunk/reactos/drivers/lib/undis/makefile Deleted: trunk/reactos/drivers/net/Makefile Deleted: trunk/reactos/drivers/net/dd/Makefile Deleted: trunk/reactos/drivers/net/lan/makefile Deleted: trunk/reactos/drivers/net/tcpip/datalink/Makefile Deleted: trunk/reactos/drivers/net/tcpip/tcpip/Makefile Deleted: trunk/reactos/drivers/net/tcpip/tests/Makefile Deleted: trunk/reactos/drivers/net/tditest/makefile Deleted: trunk/reactos/drivers/net/tditest/tditest/Makefile Deleted: trunk/reactos/drivers/storage/Makefile Deleted: trunk/reactos/drivers/test/csqtest/Makefile Deleted: trunk/reactos/drivers/usb/Makefile Deleted: trunk/reactos/drivers/usb/cromwell/Makefile Deleted: trunk/reactos/drivers/usb/cromwell/sys/Makefile Deleted: trunk/reactos/drivers/video/makefile Deleted: trunk/reactos/lib/advapi32/winetests/makefile Deleted: trunk/reactos/lib/comctl32/winetests/makefile Deleted: trunk/reactos/lib/cpl/Makefile Deleted: trunk/reactos/lib/cpl/cplsample/Makefile Deleted: trunk/reactos/lib/cpl/liccpa/Makefile Deleted: trunk/reactos/lib/d3d8thk/Makefile Deleted: trunk/reactos/lib/ddraw/Makefile Deleted: trunk/reactos/lib/devmgr/Makefile Deleted: trunk/reactos/lib/dhcpcapi/makefile Deleted: trunk/reactos/lib/freetype/builds/amiga/makefile Deleted: trunk/reactos/lib/fslib/Makefile Deleted: trunk/reactos/lib/gdiplus/tests/Makefile Deleted: trunk/reactos/lib/hid/Makefile Deleted: trunk/reactos/lib/icmp/makefile Deleted: trunk/reactos/lib/iprtprio/makefile Deleted: trunk/reactos/lib/kjs/docs/Makefile Deleted: trunk/reactos/lib/kjs/examples/Makefile Deleted: trunk/reactos/lib/kjs/jsas/Makefile Deleted: trunk/reactos/lib/kjs/jsc/Makefile Deleted: trunk/reactos/lib/kjs/jsc/tests/Makefile Deleted: trunk/reactos/lib/kjs/jsdas/Makefile Deleted: trunk/reactos/lib/kjs/jswrap/Makefile Deleted: trunk/reactos/lib/kjs/micros/Makefile Deleted: trunk/reactos/lib/kjs/projects/Makefile Deleted: trunk/reactos/lib/kjs/src/Makefile Deleted: trunk/reactos/lib/lsasrv/makefile Deleted: trunk/reactos/lib/msvcrt/winetests/Makefile Deleted: trunk/reactos/lib/odbc32/makefile Deleted: trunk/reactos/lib/oledlg/makefile Deleted: trunk/reactos/lib/packet/makefile Deleted: trunk/reactos/lib/psapi/tests/Makefile Deleted: trunk/reactos/lib/rosky/Makefile Deleted: trunk/reactos/lib/rosky/libsky/Makefile Deleted: trunk/reactos/lib/rosky/libskygi/Makefile Deleted: trunk/reactos/lib/shellext/Makefile Deleted: trunk/reactos/lib/shellext/slayer/Makefile Deleted: trunk/reactos/lib/tgetopt/Makefile Deleted: trunk/reactos/lib/version/winetests/Makefile Deleted: trunk/reactos/lib/wdmguid/makefile [truncated at 100 lines; 27 more skipped] _____ Deleted: trunk/reactos/apps/Makefile --- trunk/reactos/apps/Makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/Makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,13 +0,0 @@ -# $Id$ -# -# ReactOS apps and tools makefile to generate Doxygen documentation -# - - -docu: - doxygen Doxyfile - -.PHONY: docu - - -# EOF _____ Deleted: trunk/reactos/apps/testsets/Makefile --- trunk/reactos/apps/testsets/Makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/testsets/Makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,162 +0,0 @@ -# -# ReactOS system testsets makefile -# - -PATH_TO_TOP = ../.. - -include $(PATH_TO_TOP)/rules.mak - - -# Testset applications -TEST_SETS = loadlib - -TEST_KERNEL32 = - -TEST_MSVCRT = - -TEST_COM = - -TEST_SEH = - -TEST_REGRESSIONS = - -all: $(TEST_SETS) $(TEST_KERNEL32) $(TEST_MSVCRT) $(TEST_COM) $(TEST_SEH) $(TEST_REGRESSIONS) - -depends: - -implib: $(TEST_SETS:%=%_implib) \ - $(TEST_KERNEL32:%=%_implib) \ - $(TEST_MSVCRT:%=%_implib) \ - $(TEST_COM:%=%_implib) \ - $(TEST_SEH:%=%_implib) \ - $(TEST_REGRESSIONS:%=%_implib) - -clean: $(TEST_SETS:%=%_clean) \ - $(TEST_KERNEL32:%=%_clean) \ - $(TEST_MSVCRT:%=%_clean) \ - $(TEST_COM:%=%_clean) \ - $(TEST_SEH:%=%_clean) \ - $(TEST_REGRESSIONS:%=%_clean) - -install: $(TEST_SETS:%=%_install) \ - $(TEST_KERNEL32:%=%_install) \ - $(TEST_MSVCRT:%=%_install) \ - $(TEST_COM:%=%_install) \ - $(TEST_SEH:%=%_install) \ - $(TEST_REGRESSIONS:%=%_install) - -.PHONY: all depends implib clean install - - -# -# Testset Applications -# -$(TEST_SETS): %: - $(MAKE) -C $* - -$(TEST_SETS:%=%_implib): %_implib: - $(MAKE) -C $* implib - -$(TEST_SETS:%=%_clean): %_clean: - $(MAKE) -C $* clean - -$(TEST_SETS:%=%_install): %_install: - $(MAKE) -C $* install - -.PHONY: $(TEST_SETS) $(TEST_SETS:%=%_implib) $(TEST_SETS:%=%_clean) $(TEST_SETS:%=%_install) - - -# -# Kernel32 Test Applications -# -$(TEST_KERNEL32): %: - $(MAKE) -C kernel32/$* - -$(TEST_KERNEL32:%=%_implib): %_implib: - $(MAKE) -C kernel32/$* implib - -$(TEST_KERNEL32:%=%_clean): %_clean: - $(MAKE) -C kernel32/$* clean - -$(TEST_KERNEL32:%=%_install): %_install: - $(MAKE) -C kernel32/$* install - -.PHONY: $(TEST_KERNEL32) $(TEST_KERNEL32:%=%_implib) $(TEST_KERNEL32:%=%_clean) $(TEST_KERNEL32:%=%_install) - - -# -# msvcrt Test Applications -# -$(TEST_MSVCRT): %: - $(MAKE) -C msvcrt/$* - -$(TEST_MSVCRT:%=%_implib): %_implib: - $(MAKE) -C msvcrt/$* implib - -$(TEST_MSVCRT:%=%_clean): %_clean: - $(MAKE) -C msvcrt/$* clean - -$(TEST_MSVCRT:%=%_install): %_install: - $(MAKE) -C msvcrt/$* install - -.PHONY: $(TEST_MSVCRT) $(TEST_MSVCRT:%=%_implib) $(TEST_MSVCRT:%=%_clean) $(TEST_MSVCRT:%=%_install) - - -# -# COM Test Applications -# -$(TEST_COM): %: - $(MAKE) -C com/$* - -$(TEST_COM:%=%_implib): %_implib: - $(MAKE) -C com/$* implib - -$(TEST_COM:%=%_clean): %_clean: - $(MAKE) -C com/$* clean - -$(TEST_COM:%=%_install): %_install: - $(MAKE) -C com/$* install - -.PHONY: $(TEST_COM) $(TEST_COM:%=%_implib) $(TEST_COM:%=%_clean) $(TEST_COM:%=%_install) - - -# -# SEH Test Applications -# -$(TEST_SEH): %: - $(MAKE) -C seh/$* - -$(TEST_SEH:%=%_implib): %_implib: - $(MAKE) -C seh/$* implib - -$(TEST_SEH:%=%_clean): %_clean: - $(MAKE) -C seh/$* clean - -$(TEST_SEH:%=%_install): %_install: - $(MAKE) -C seh/$* install - -.PHONY: $(TEST_SEH) $(TEST_SEH:%=%_implib) $(TEST_SEH:%=%_clean) $(TEST_SEH:%=%_install) - - -# -# Regression Test Applications -# -$(TEST_REGRESSIONS): %: - $(MAKE) -C regres/$* - -$(TEST_REGRESSIONS:%=%_implib): %_implib: - $(MAKE) -C regres/$* implib - -$(TEST_REGRESSIONS:%=%_clean): %_clean: - $(MAKE) -C regres/$* clean - -$(TEST_REGRESSIONS:%=%_install): %_install: - $(MAKE) -C regres/$* install - -.PHONY: $(TEST_REGRESSIONS) $(TEST_REGRESSIONS:%=%_implib) $(TEST_REGRESSIONS:%=%_clean) $(TEST_REGRESSIONS:%=%_install) - - -etags: - find . -name "*.[ch]" -print | etags --language=c - - -# EOF _____ Deleted: trunk/reactos/apps/testsets/loadlib/makefile --- trunk/reactos/apps/testsets/loadlib/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/testsets/loadlib/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,24 +0,0 @@ -# -# $Id: makefile,v 1.0 - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = loadlib - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE - -TARGET_SDKLIBS = kernel32.a ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/testsets/msvcrt/fileio/makefile --- trunk/reactos/apps/testsets/msvcrt/fileio/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/testsets/msvcrt/fileio/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,27 +0,0 @@ -# -# $Id: makefile,v 1.0 - -PATH_TO_TOP = ../../../.. - -TEST_ROOT = $(PATH_TO_TOP)/apps/testsets/test - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = fileio - -#TARGET_CFLAGS = -I$(TEST_ROOT) -DDBG -DUNICODE -D_UNICODE -TARGET_CFLAGS = -I$(TEST_ROOT) -DDBG - -TARGET_SDKLIBS = ntdll.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o wfileio.o main.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/binpatch/Makefile --- trunk/reactos/apps/utils/binpatch/Makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/binpatch/Makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = binpatch - -TARGET_SDKLIBS = - -TARGET_OBJECTS = patch.o - -TARGET_CFLAGS += -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/cat/makefile --- trunk/reactos/apps/utils/cat/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/cat/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,21 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = cat - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/driver/load/makefile --- trunk/reactos/apps/utils/driver/load/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/driver/load/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = load - -TARGET_CFLAGS = -DUNICODE -D_UNICODE - -TARGET_SDKLIBS = ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/driver/unload/makefile --- trunk/reactos/apps/utils/driver/unload/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/driver/unload/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = unload - -TARGET_CFLAGS = -DUNICODE -D_UNICODE - -TARGET_SDKLIBS = ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/infinst/makefile --- trunk/reactos/apps/utils/infinst/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/infinst/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = infinst - -TARGET_SDKLIBS = comdlg32.a setupapi.a - -TARGET_OBJECTS = infinst.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/net/ftp/makefile --- trunk/reactos/apps/utils/net/ftp/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/net/ftp/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ..\..\..\.. -DEFAULT = ftp -include $(TOP)/proxy.mak _____ Deleted: trunk/reactos/apps/utils/net/roshttpd/makefile --- trunk/reactos/apps/utils/net/roshttpd/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/net/roshttpd/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,31 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../../.. - -TARGET_PATH = common - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = roshttpd - -TARGET_CPPFLAGS = -I./include -DUNICODE -D_UNICODE -DDBG -D__USE_W32API -Wno-deprecated - -TARGET_GCCLIBS = stdc++ - -TARGET_SDKLIBS = kernel32.a ws2_32.a user32.a - -MAIN_OBJECTS = roshttpd.o config.o error.o http.o httpd.o - -COMMON_OBJECTS = common/list.o common/socket.o common/thread.o - -TARGET_OBJECTS = $(MAIN_OBJECTS) $(COMMON_OBJECTS) - -TARGET_CLEAN = common/*.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/net/tracert/makefile --- trunk/reactos/apps/utils/net/tracert/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/net/tracert/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,20 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = tracert - -TARGET_INSTALLDIR = system32 - -TARGET_SDKLIBS = ws2_32.a iphlpapi.a ntdll.a - -TARGET_OBJECTS = \ -$(TARGET_NAME).o - -TARGET_GCCLIBS = - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/apps/utils/nts2w32err/makefile --- trunk/reactos/apps/utils/nts2w32err/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/nts2w32err/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,23 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = nts2w32err - -TARGET_SDKLIBS = ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/objdir/makefile --- trunk/reactos/apps/utils/objdir/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/objdir/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,23 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = objdir - -TARGET_SDKLIBS = ntdll.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/partinfo/makefile --- trunk/reactos/apps/utils/partinfo/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/partinfo/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,23 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = partinfo - -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -Wno-format - -TARGET_SDKLIBS = ntdll.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/patchnv4/Makefile --- trunk/reactos/apps/utils/patchnv4/Makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/patchnv4/Makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = patchnv4 - -TARGET_SDKLIBS = - -TARGET_OBJECTS = patchnv4.o - -TARGET_CFLAGS += -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/pesum/makefile --- trunk/reactos/apps/utils/pesum/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/pesum/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,20 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = pesum - - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/pice/loader/makefile --- trunk/reactos/apps/utils/pice/loader/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/pice/loader/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,37 +0,0 @@ -#CC = gcc -#CFLAGS := -g -Wall -fomit-frame-pointer -O2 -#LDFLAGS := -dynamic -#-lncurses - -#OBJS = main.o terminal.o -# - -#loader: $(OBJS) -# $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - -#clean: -# @echo deleting all intermediate files -# @rm $(OBJS) loader -f -# make - - -PATH_TO_TOP = ../../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = loader - -TARGET_CFLAGS = -g -fomit-frame-pointer - -TARGET_SDKLIBS = - -TARGET_OBJECTS = main.o terminal.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - _____ Deleted: trunk/reactos/apps/utils/pice/makefile --- trunk/reactos/apps/utils/pice/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/pice/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,17 +0,0 @@ -# $Id$ - -all: - $(MAKE) -C loader - $(MAKE) -C module - -implib: - $(MAKE) -C loader implib - $(MAKE) -C module implib - -clean: - $(MAKE) -C loader clean - $(MAKE) -C module clean - -install: - $(MAKE) -C loader install - $(MAKE) -C module install _____ Deleted: trunk/reactos/apps/utils/pice/module/makefile --- trunk/reactos/apps/utils/pice/module/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/pice/module/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,35 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = driver - -TARGET_NAME = pice -TARGET_CFLAGS := -g -I../../../../ntoskrnl/include -DDEBUG -TARGET_SDK_LIBS := - -TARGET_OBJECTS = \ - hardware.o \ - dblflt.o \ - debug.o \ - disassembler.o \ - gpfault.o \ - bp.o \ - hercules.o \ - hooks.o \ - init.o \ - output.o \ - parse.o \ - patch.o \ - pgflt.o \ - privateice.o \ - serial.o \ - shell.o \ - symbols.o \ - syscall.o \ - trace.o \ - vga.o \ - vga_utils.o \ - utils.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/apps/utils/pnpdump/makefile --- trunk/reactos/apps/utils/pnpdump/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/pnpdump/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,23 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = pnpdump - -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror - -TARGET_SDKLIBS = ntdll.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/ps/makefile --- trunk/reactos/apps/utils/ps/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/ps/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,23 +0,0 @@ -# - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = ps - -TARGET_CFLAGS = -D__USE_W32API -DANONYMOUSUNIONS -Werror -Wall - -TARGET_SDKLIBS = ntdll.a kernel32.a user32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/sc/makefile --- trunk/reactos/apps/utils/sc/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/sc/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,26 +0,0 @@ -# -# $Id: makefile,v 1.0 - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_INSTALLDIR = system32 - -TARGET_NAME = sc - -TARGET_CFLAGS = -D__USE_W32API -DDBG -Werror -Wall - -TARGET_SDKLIBS = kernel32.a ntdll.a advapi32.a - -TARGET_OBJECTS = command.o config.o main.o query.o setup.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/shutdown/Makefile --- trunk/reactos/apps/utils/shutdown/Makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/shutdown/Makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,25 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_INSTALLDIR = system32 - -TARGET_NAME = shutdown - -TARGET_SDKLIBS = kernel32.a user32.a - -TARGET_OBJECTS = shutdown.o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -D_WIN32_WINNT=0x0501 - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/stats/Makefile --- trunk/reactos/apps/utils/stats/Makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/stats/Makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,23 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = stats - -TARGET_SDKLIBS = kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/theme/dump/Makefile --- trunk/reactos/apps/utils/theme/dump/Makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/theme/dump/Makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,19 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = themedump - -TARGET_SDKLIBS = kernel32.a uxtheme.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/tickcount/makefile --- trunk/reactos/apps/utils/tickcount/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/tickcount/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = tickcount - -TARGET_SDKLIBS = kernel32.a - -TARGET_OBJECTS = tickcount.o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/apps/utils/winetest/makefile --- trunk/reactos/apps/utils/winetest/makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/apps/utils/winetest/makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,23 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = winetest - -TARGET_SDKLIBS = comctl32.a comdlg32.a ws2_32.a - -TARGET_OBJECTS = \ - main.o \ - send.o \ - util.o \ - gui.o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/reactos/boot/freeldr/Makefile --- trunk/reactos/boot/freeldr/Makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/boot/freeldr/Makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,54 +0,0 @@ -# -# FreeLoader -# Copyright (C) 1999, 2000, 2001 Brian Palmer <brianp(a)sginet.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = ../.. - -include rules.mak -include $(PATH_TO_TOP)/config - -all: - $(MAKE) -C tools - $(MAKE) -C bootsect - $(MAKE) -C freeldr - $(MAKE) -C install - $(MAKE) -C fdebug - -test: - -clean: - $(MAKE) -C bootsect clean - $(MAKE) -C freeldr clean - $(MAKE) -C install clean - $(MAKE) -C fdebug clean - $(MAKE) -C tools clean - -bootcd: -ifeq ($(ARCH),i386) - $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin - $(CP) bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin - $(CP) bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin - $(CP) bootsect/fat.bin ${BOOTCD_DIR}/loader/fat.bin - $(CP) bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin - $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin - $(CP) freeldr/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys - $(CP) freeldr/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys -endif - -.PHONY : clean - _____ Deleted: trunk/reactos/boot/freeldr/fdebug/Makefile --- trunk/reactos/boot/freeldr/fdebug/Makefile 2005-06-05 15:59:18 UTC (rev 15808) +++ trunk/reactos/boot/freeldr/fdebug/Makefile 2005-06-05 16:32:33 UTC (rev 15809) @@ -1,52 +0,0 @@ -# -# FreeLoader -# Copyright (C) 1999 - 2003 Brian Palmer <brianp(a)sginet.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = ../../.. - -include ../rules.mak - -FLAGS = -Wall - -OBJS = rs232.o fdebug.o fdebug.res - [truncated at 1000 lines; 6587 more skipped]

19 years, 5 months

[chorns] 15808: Generate proxy makefiles in output tree.

by chorns＠svn.reactos.com

Generate proxy makefiles in output tree. Modified: trunk/reactos/Makefile Modified: trunk/reactos/tools/rbuild/XML.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp Modified: trunk/reactos/tools/rbuild/configuration.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-06-05 15:50:55 UTC (rev 15807) +++ trunk/reactos/Makefile 2005-06-05 15:59:18 UTC (rev 15808) @@ -54,6 +54,7 @@ # -c Clean as you go. Delete generated files as soon as they are not needed anymore. # -d Disable automatic dependencies. # -mi Let make handle creation of install directories. Rbuild will not generate the directories. +# -ps Generate proxy makefiles in source tree instead of the output tree. .PHONY: all .PHONY: clean _____ Modified: trunk/reactos/tools/rbuild/XML.h --- trunk/reactos/tools/rbuild/XML.h 2005-06-05 15:50:55 UTC (rev 15807) +++ trunk/reactos/tools/rbuild/XML.h 2005-06-05 15:59:18 UTC (rev 15808) @@ -5,6 +5,8 @@ class XMLElement; +extern std::string working_directory; + void InitWorkingDirectory(); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-06-05 15:50:55 UTC (rev 15807) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-06-05 15:59:18 UTC (rev 15808) @@ -645,12 +645,22 @@ printf ( "done\n" ); } +string +MingwBackend::GetProxyMakefileTree () const +{ + if ( configuration.GenerateProxyMakefilesInSourceTree ) + return ""; + else + return Environment::GetOutputPath (); +} + void MingwBackend::GenerateProxyMakefiles () { printf ( "Generating proxy makefiles..." ); ProxyMakefile proxyMakefile ( ProjectNode ); - proxyMakefile.GenerateProxyMakefiles ( configuration.Verbose ); + proxyMakefile.GenerateProxyMakefiles ( configuration.Verbose, + GetProxyMakefileTree () ); printf ( "done\n" ); } @@ -929,8 +939,8 @@ NormalizeFilename ( module.GetPath () ), outputDirectory ); OutputInstallTarget ( sourceFilename, - module.installName, - module.installBase ); + module.installName, + module.installBase ); } } } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-06-05 15:50:55 UTC (rev 15807) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-06-05 15:59:18 UTC (rev 15808) @@ -83,6 +83,7 @@ std::string GetBin2ResExecutable (); void UnpackWineResources (); void GenerateTestSupportCode (); + std::string GetProxyMakefileTree () const; void GenerateProxyMakefiles (); void CheckAutomaticDependencies (); bool IncludeDirectoryTarget ( const std::string& directory ) const; @@ -122,12 +123,15 @@ public: ProxyMakefile ( const Project& project ); ~ProxyMakefile (); - void GenerateProxyMakefiles ( bool verbose ); + void GenerateProxyMakefiles ( bool verbose, + std::string outputTree ); private: std::string GeneratePathToParentDirectory ( int numberOfParentDirectories ); std::string GetPathToTopDirectory ( Module& module ); + bool GenerateProxyMakefile ( Module& module ); void GenerateProxyMakefileForModule ( Module& module, - bool verbose ); + bool verbose, + std::string outputTree ); const Project& project; }; _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp --- trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp 2005-06-05 15:50:55 UTC (rev 15807) +++ trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp 2005-06-05 15:59:18 UTC (rev 15808) @@ -15,13 +15,26 @@ { } +bool +ProxyMakefile::GenerateProxyMakefile ( Module& module ) +{ + return module.GenerateInOutputTree (); +} + void -ProxyMakefile::GenerateProxyMakefiles ( bool verbose ) +ProxyMakefile::GenerateProxyMakefiles ( bool verbose, + string outputTree ) { for ( size_t i = 0; i < project.modules.size (); i++ ) { - GenerateProxyMakefileForModule ( *project.modules[i], - verbose ); + Module& module = *project.modules[i]; + if ( !module.enabled ) + continue; + if ( !GenerateProxyMakefile ( module ) ) + continue; + GenerateProxyMakefileForModule ( module, + verbose, + outputTree ); } } @@ -53,7 +66,8 @@ void ProxyMakefile::GenerateProxyMakefileForModule ( Module& module, - bool verbose ) + bool verbose, + string outputTree ) { char* buf; char* s; @@ -64,8 +78,20 @@ module.name.c_str () ); } - string proxyMakefile = NormalizeFilename ( module.GetBasePath () + SSEP "makefile" ); - string pathToTopDirectory = GetPathToTopDirectory ( module ); + string base; + string pathToTopDirectory; + if ( outputTree.length () > 0 ) + { + base = outputTree + SSEP + module.GetBasePath (); + Path path; + pathToTopDirectory = working_directory; + } + else + { + base = module.GetBasePath (); + pathToTopDirectory = GetPathToTopDirectory ( module ); + } + string proxyMakefile = NormalizeFilename ( base + SSEP "makefile" ); string defaultTarget = module.name; buf = (char*) malloc ( 10*1024 ); _____ Modified: trunk/reactos/tools/rbuild/configuration.cpp --- trunk/reactos/tools/rbuild/configuration.cpp 2005-06-05 15:50:55 UTC (rev 15807) +++ trunk/reactos/tools/rbuild/configuration.cpp 2005-06-05 15:59:18 UTC (rev 15808) @@ -9,6 +9,7 @@ CleanAsYouGo = false; AutomaticDependencies = true; MakeHandlesInstallDirectories = false; + GenerateProxyMakefilesInSourceTree = false; } Configuration::~Configuration () _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-06-05 15:50:55 UTC (rev 15807) +++ trunk/reactos/tools/rbuild/module.cpp 2005-06-05 15:59:18 UTC (rev 15808) @@ -667,6 +667,36 @@ __LINE__ ); } +bool +Module::GenerateInOutputTree () const +{ + switch ( type ) + { + case Kernel: + case KernelModeDLL: + case NativeDLL: + case Win32DLL: + case KernelModeDriver: + case NativeCUI: + case Win32CUI: + case Test: + case Win32GUI: + case BuildTool: + case BootLoader: + case BootSector: + case Iso: + case LiveIso: + return true; + case StaticLibrary: + case ObjectLibrary: + case RpcServer: + case RpcClient: + return false; + } + throw InvalidOperationException ( __FILE__, + __LINE__ ); +} + string Module::GetTargetName () const { _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-06-05 15:50:55 UTC (rev 15807) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-06-05 15:59:18 UTC (rev 15808) @@ -37,6 +37,22 @@ } bool +ParseProxyMakefileSwitch ( char switchChar2 ) +{ + switch ( switchChar2 ) + { + case 's': + configuration.GenerateProxyMakefilesInSourceTree = true; + break; + default: + printf ( "Unknown switch -p%c", + switchChar2 ); + return false; + } + return true; +} + +bool ParseSwitch ( int argc, char** argv, int index ) { char switchChar = strlen ( argv[index] ) > 1 ? argv[index][1] : ' '; @@ -57,6 +73,8 @@ break; case 'm': return ParseMakeSwitch ( switchChar2 ); + case 'p': + return ParseProxyMakefileSwitch ( switchChar2 ); default: printf ( "Unknown switch -%c", switchChar ); @@ -98,6 +116,7 @@ printf ( " -d Disable automatic dependencies.\n" ); printf ( " -rfile.xml Name of the root xml file. Default is ReactOS.xml.\n" ); printf ( " -mi Let make handle creation of install directories. Rbuild will not generate the directories.\n" ); + printf ( " -ps Generate proxy makefiles in source tree instead of the output tree.\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); printf ( " mingw MinGW\n" ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-06-05 15:50:55 UTC (rev 15807) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-06-05 15:59:18 UTC (rev 15808) @@ -77,6 +77,7 @@ bool CleanAsYouGo; bool AutomaticDependencies; bool MakeHandlesInstallDirectories; + bool GenerateProxyMakefilesInSourceTree; }; class Environment @@ -222,6 +223,7 @@ const XMLAttribute& attribute ); bool HasImportLibrary () const; bool IsDLL () const; + bool GenerateInOutputTree () const; std::string GetTargetName () const; std::string GetDependencyPath () const; std::string GetBasePath () const;

19 years, 5 months

[jimtabor] 15807: Adding symbolic link to USBFDO.

by jimtabor＠svn.reactos.com

Adding symbolic link to USBFDO. Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-06-05 14:03:55 UTC (rev 15806) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-06-05 15:50:55 UTC (rev 15807) @@ -37,6 +37,8 @@ NTSTATUS Status; WCHAR DeviceBuffer[20]; UNICODE_STRING DeviceName; + WCHAR LinkDeviceBuffer[20]; + UNICODE_STRING LinkDeviceName; POHCI_DRIVER_EXTENSION DriverExtension; POHCI_DEVICE_EXTENSION DeviceExtension; ULONG Size, DeviceNumber; @@ -62,7 +64,7 @@ // Create a unicode device name DeviceNumber = 0; //TODO: Allocate new device number every time - swprintf(DeviceBuffer, L"\\Device\\USBPDO-%lu", DeviceNumber); + swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); RtlInitUnicodeString(&DeviceName, DeviceBuffer); Status = IoCreateDevice(DriverObject, @@ -93,6 +95,16 @@ DeviceExtension->FunctionalDeviceObject = fdo; DeviceExtension->DriverExtension = DriverExtension; + swprintf(LinkDeviceBuffer, L"\\??\\HCD%lu", DeviceNumber); + RtlInitUnicodeString(&LinkDeviceName, LinkDeviceBuffer); + Status = IoCreateSymbolicLink(&LinkDeviceName, &DeviceName); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateSymbolicLink call failed with status 0x%08x\n", Status); + return Status; + } + /* Get bus number from the upper level bus driver. */ Size = sizeof(ULONG); /* Status = IoGetDeviceProperty(

19 years, 5 months

[hbirr] 15806: Forgot this file.

by hbirr＠svn.reactos.com

Forgot this file. Make the bochs debug output in the very early boot phase available, if AUTO_ENABLE_BOCHS is defined. Modified: trunk/reactos/ntoskrnl/include/internal/kdbochs.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/kdbochs.h --- trunk/reactos/ntoskrnl/include/internal/kdbochs.h 2005-06-05 14:01:58 UTC (rev 15805) +++ trunk/reactos/ntoskrnl/include/internal/kdbochs.h 2005-06-05 14:03:55 UTC (rev 15806) @@ -14,5 +14,8 @@ STDCALL KdpBochsInit(struct _KD_DISPATCH_TABLE *DispatchTable, ULONG BootPhase); - +VOID +STDCALL +KdpBochsDebugPrint(IN PCH Message); + #endif /* __INCLUDE_INTERNAL_KD_BOCHS_H */

19 years, 5 months

[hbirr] 15805: Don't lock the kernel address space while solving faults from the paged pool.

by hbirr＠svn.reactos.com

Don't lock the kernel address space while solving faults from the paged pool. It is possible, that someone try to access memory from paged pool while the kernel address space is already locked. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/ppool.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-05 12:53:22 UTC (rev 15804) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-05 14:01:58 UTC (rev 15805) @@ -367,6 +367,9 @@ /* FUNCTIONS */ +VOID MmLockPagedPool(VOID); +VOID MmUnlockPagedPool(VOID); + /* aspace.c ******************************************************************/ VOID MmLockAddressSpace(PMADDRESS_SPACE AddressSpace); _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-06-05 12:53:22 UTC (rev 15804) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-06-05 14:01:58 UTC (rev 15805) @@ -364,6 +364,7 @@ PFN_TYPE Page; PEPROCESS CurrentProcess = PsGetCurrentProcess(); PMADDRESS_SPACE AddressSpace; + BOOLEAN PagedPool; DPRINT("MmProbeAndLockPages(Mdl %x)\n", Mdl); @@ -398,6 +399,7 @@ Mode = KernelMode; Mdl->Process = NULL; AddressSpace = MmGetKernelAddressSpace(); + PagedPool = Mdl->StartVa >= MmPagedPoolBase && Mdl->StartVa < MmPagedPoolBase + MmPagedPoolSize ? TRUE : FALSE; } else { @@ -405,14 +407,21 @@ Mode = UserMode; Mdl->Process = CurrentProcess; AddressSpace = &CurrentProcess->AddressSpace; + PagedPool = FALSE; } + if (PagedPool) + { + MmLockPagedPool(); + } + else + { + MmLockAddressSpace(AddressSpace); + } /* * Lock the pages */ - MmLockAddressSpace(AddressSpace); - for (i = 0; i < NrPages; i++) { PVOID Address; @@ -438,7 +447,14 @@ MmDereferencePage(Page); } } - MmUnlockAddressSpace(AddressSpace); + if (PagedPool) + { + MmUnlockPagedPool(); + } + else + { + MmUnlockAddressSpace(AddressSpace); + } ExRaiseStatus(STATUS_ACCESS_VIOLATION); } } @@ -462,7 +478,14 @@ MmDereferencePage(Page); } } - MmUnlockAddressSpace(AddressSpace); + if (PagedPool) + { + MmUnlockPagedPool(); + } + else + { + MmUnlockAddressSpace(AddressSpace); + } ExRaiseStatus(STATUS_ACCESS_VIOLATION); } } @@ -474,7 +497,14 @@ MmReferencePage(Page); } - MmUnlockAddressSpace(AddressSpace); + if (PagedPool) + { + MmUnlockPagedPool(); + } + else + { + MmUnlockAddressSpace(AddressSpace); + } Mdl->MdlFlags |= MDL_PAGES_LOCKED; } _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2005-06-05 12:53:22 UTC (rev 15804) +++ trunk/reactos/ntoskrnl/mm/mm.c 2005-06-05 14:01:58 UTC (rev 15805) @@ -215,6 +215,10 @@ DbgPrint("%s:%d\n",__FILE__,__LINE__); return(STATUS_UNSUCCESSFUL); } + if (Address >= (ULONG_PTR)MmPagedPoolBase && Address < (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize) + { + return STATUS_SUCCESS; + } AddressSpace = MmGetKernelAddressSpace(); } else @@ -285,9 +289,7 @@ Status = MmRequestPageMemoryConsumer(MC_PPOOL, FALSE, &AllocatedPage); if (!NT_SUCCESS(Status)) { - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - Status = MmRequestPageMemoryConsumer(MC_PPOOL, TRUE, &AllocatedPage); - MmLockAddressSpace(MmGetKernelAddressSpace()); + return Status; } Status = MmCreateVirtualMapping(NULL, @@ -311,6 +313,7 @@ NTSTATUS Status; BOOLEAN Locked = FromMdl; PFN_TYPE Pfn; + BOOLEAN PagedPool; DPRINT("MmNotPresentFault(Mode %d, Address %x)\n", Mode, Address); @@ -344,16 +347,25 @@ CPRINT("Address: %x\n", Address); return(STATUS_UNSUCCESSFUL); } + PagedPool = Address >= (ULONG_PTR)MmPagedPoolBase && Address < (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize ? TRUE : FALSE; AddressSpace = MmGetKernelAddressSpace(); } else { + PagedPool = FALSE; AddressSpace = &PsGetCurrentProcess()->AddressSpace; } if (!FromMdl) { - MmLockAddressSpace(AddressSpace); + if (PagedPool) + { + MmLockPagedPool(); + } + else + { + MmLockAddressSpace(AddressSpace); + } } /* @@ -361,56 +373,56 @@ */ do { - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)Address); - if (MemoryArea == NULL || MemoryArea->DeleteInProgress) + if (PagedPool) { - if (!FromMdl) - { - MmUnlockAddressSpace(AddressSpace); - } - return (STATUS_UNSUCCESSFUL); + Status = MmCommitPagedPoolAddress((PVOID)Address, Locked); } - - switch (MemoryArea->Type) + else { - case MEMORY_AREA_PAGED_POOL: + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)Address); + if (MemoryArea == NULL || MemoryArea->DeleteInProgress) + { + if (!FromMdl) { - Status = MmCommitPagedPoolAddress((PVOID)Address, Locked); - break; + MmUnlockAddressSpace(AddressSpace); } + return (STATUS_UNSUCCESSFUL); + } - case MEMORY_AREA_SYSTEM: - Status = STATUS_UNSUCCESSFUL; - break; + switch (MemoryArea->Type) + { + case MEMORY_AREA_SYSTEM: + Status = STATUS_UNSUCCESSFUL; + break; - case MEMORY_AREA_SECTION_VIEW: - Status = MmNotPresentFaultSectionView(AddressSpace, - MemoryArea, - (PVOID)Address, - Locked); - break; + case MEMORY_AREA_SECTION_VIEW: + Status = MmNotPresentFaultSectionView(AddressSpace, + MemoryArea, + (PVOID)Address, + Locked); + break; - case MEMORY_AREA_VIRTUAL_MEMORY: - case MEMORY_AREA_PEB_OR_TEB: - Status = MmNotPresentFaultVirtualMemory(AddressSpace, - MemoryArea, - (PVOID)Address, - Locked); - break; + case MEMORY_AREA_VIRTUAL_MEMORY: + case MEMORY_AREA_PEB_OR_TEB: + Status = MmNotPresentFaultVirtualMemory(AddressSpace, + MemoryArea, + (PVOID)Address, + Locked); + break; - case MEMORY_AREA_SHARED_DATA: - Pfn = MmSharedDataPagePhysicalAddress.QuadPart >> PAGE_SHIFT; - Status = - MmCreateVirtualMapping(PsGetCurrentProcess(), - (PVOID)PAGE_ROUND_DOWN(Address), - PAGE_READONLY, - &Pfn, - 1); - break; + case MEMORY_AREA_SHARED_DATA: + Pfn = MmSharedDataPagePhysicalAddress.QuadPart >> PAGE_SHIFT; + Status = MmCreateVirtualMapping(PsGetCurrentProcess(), + (PVOID)PAGE_ROUND_DOWN(Address), + PAGE_READONLY, + &Pfn, + 1); + break; - default: - Status = STATUS_UNSUCCESSFUL; - break; + default: + Status = STATUS_UNSUCCESSFUL; + break; + } } } while (Status == STATUS_MM_RESTART_OPERATION); @@ -418,7 +430,14 @@ DPRINT("Completed page fault handling\n"); if (!FromMdl) { - MmUnlockAddressSpace(AddressSpace); + if (PagedPool) + { + MmUnlockPagedPool(); + } + else + { + MmUnlockAddressSpace(AddressSpace); + } } return(Status); } _____ Modified: trunk/reactos/ntoskrnl/mm/ppool.c --- trunk/reactos/ntoskrnl/mm/ppool.c 2005-06-05 12:53:22 UTC (rev 15804) +++ trunk/reactos/ntoskrnl/mm/ppool.c 2005-06-05 14:01:58 UTC (rev 15805) @@ -41,11 +41,12 @@ ULONG MmPagedPoolSize; ULONG MmTotalPagedPoolQuota = 0; // TODO FIXME commented out until we use it static PR_POOL MmPagedPool = NULL; +static FAST_MUTEX MmPagedPoolLock; /* FUNCTIONS *****************************************************************/ VOID INIT_FUNCTION -MmInitializePagedPool() +MmInitializePagedPool(VOID) { /* * We are still at a high IRQL level at this point so explicitly commit @@ -60,8 +61,19 @@ PAGE_SIZE ); ExInitializeFastMutex(&MmPagedPool->Mutex); + ExInitializeFastMutex(&MmPagedPoolLock); } +VOID MmLockPagedPool(VOID) +{ + ExAcquireFastMutex(&MmPagedPoolLock); +} + +VOID MmUnlockPagedPool(VOID) +{ + ExReleaseFastMutex(&MmPagedPoolLock); +} + /********************************************************************** * NAME INTERNAL * ExAllocatePagedPoolWithTag@12

19 years, 5 months

[chorns] 15804: Document rbuild flags.

by chorns＠svn.reactos.com

Document rbuild flags. Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-06-05 12:20:07 UTC (rev 15803) +++ trunk/reactos/Makefile 2005-06-05 12:53:22 UTC (rev 15804) @@ -50,6 +50,10 @@ # # ROS_RBUILDFLAGS # Pass parameters to rbuild. +# -v Be verbose. +# -c Clean as you go. Delete generated files as soon as they are not needed anymore. +# -d Disable automatic dependencies. +# -mi Let make handle creation of install directories. Rbuild will not generate the directories. .PHONY: all .PHONY: clean

19 years, 5 months

[mf] 15803: refresh window content after context menu popups only if any command has been executed

by mf＠svn.reactos.com

refresh window content after context menu popups only if any command has been executed Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-05 12:08:39 UTC (rev 15802) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-05 12:20:07 UTC (rev 15803) @@ -4113,6 +4113,7 @@ static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParent, int cidl, LPCITEMIDLIST* apidl, int x, int y) { IContextMenu* pcm; + BOOL executed = FALSE; HRESULT hr = (*shell_folder->lpVtbl->GetUIObjectOf)(shell_folder, hwndParent, cidl, apidl, &IID_IContextMenu, NULL, (LPVOID*)&pcm); /* HRESULT hr = CDefFolderMenu_Create2(dir?dir->_pidl:DesktopFolder(), hwndParent, 1, &pidl, shell_folder, NULL, 0, NULL, &pcm); */ @@ -4131,19 +4132,20 @@ CtxMenu_reset(); if (idCmd) { - CMINVOKECOMMANDINFO cmi; + CMINVOKECOMMANDINFO cmi; - cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); - cmi.fMask = 0; - cmi.hwnd = hwndParent; - cmi.lpVerb = (LPCSTR)(INT_PTR)(idCmd - FCIDM_SHVIEWFIRST); - cmi.lpParameters = NULL; - cmi.lpDirectory = NULL; - cmi.nShow = SW_SHOWNORMAL; - cmi.dwHotKey = 0; - cmi.hIcon = 0; + cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); + cmi.fMask = 0; + cmi.hwnd = hwndParent; + cmi.lpVerb = (LPCSTR)(INT_PTR)(idCmd - FCIDM_SHVIEWFIRST); + cmi.lpParameters = NULL; + cmi.lpDirectory = NULL; + cmi.nShow = SW_SHOWNORMAL; + cmi.dwHotKey = 0; + cmi.hIcon = 0; - hr = (*pcm->lpVtbl->InvokeCommand)(pcm, &cmi); + hr = (*pcm->lpVtbl->InvokeCommand)(pcm, &cmi); + executed = TRUE; } } else CtxMenu_reset(); @@ -4152,7 +4154,7 @@ (*pcm->lpVtbl->Release)(pcm); } - return hr; + return FAILED(hr)? hr: executed? S_OK: S_FALSE; } @@ -4487,7 +4489,7 @@ /* get and use the parent folder to display correct context menu in all cases */ if (SUCCEEDED(SHBindToParent(pidl_abs, &IID_IShellFolder, (LPVOID*)&parentFolder, &pidlLast))) { - if (SUCCEEDED(ShellFolderContextMenu(parentFolder, hwnd, 1, &pidlLast, pt.x, pt.y))) + if (ShellFolderContextMenu(parentFolder, hwnd, 1, &pidlLast, pt.x, pt.y) == S_OK) refresh_child(child); (*parentFolder->lpVtbl->Release)(parentFolder);

19 years, 5 months

[chorns] 15802: Correct dependencies for 'make <module>_install'

by chorns＠svn.reactos.com

Correct dependencies for 'make <module>_install' Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-05 11:22:16 UTC (rev 15801) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-05 12:08:39 UTC (rev 15802) @@ -458,19 +458,13 @@ if ( module.installName.length () == 0 ) return; fprintf ( fMakefile, ".PHONY: %s_install\n", module.name.c_str() ); - fprintf ( fMakefile, "%s_install:\n", module.name.c_str() ); - string sourceFilename = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( module.GetPath () ), - backend->outputDirectory ); string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( module.installBase + SSEP + module.installName ), backend->installDirectory ); fprintf ( fMakefile, - "\t$(ECHO_CP)\n" ); - fprintf ( fMakefile, - "\t${cp} %s %s 1>$(NUL)\n", - sourceFilename.c_str (), - normalizedTargetFilename.c_str () ); + "%s_install: %s\n", + module.name.c_str (), + normalizedTargetFilename.c_str() ); } string

19 years, 5 months

[chorns] 15801: * Support enabling/disabling modules depending on configuration.

by chorns＠svn.reactos.com

* Support enabling/disabling modules depending on configuration. * Enable halup for MP=0 configuration and halmp for MP=1 configuration. Modified: trunk/reactos/hal/halx86/mp/halmp.xml Modified: trunk/reactos/hal/halx86/up/halup.xml Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.txt _____ Modified: trunk/reactos/hal/halx86/mp/halmp.xml --- trunk/reactos/hal/halx86/mp/halmp.xml 2005-06-05 11:05:47 UTC (rev 15800) +++ trunk/reactos/hal/halx86/mp/halmp.xml 2005-06-05 11:22:16 UTC (rev 15801) @@ -1,4 +1,4 @@ -<module name="halmp" type="kernelmodedll"> +<module if="${MP}" name="halmp" type="kernelmodedll" installbase="system32" installname="hal.dll"> <importlibrary definition="../../hal/hal.def" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> _____ Modified: trunk/reactos/hal/halx86/up/halup.xml --- trunk/reactos/hal/halx86/up/halup.xml 2005-06-05 11:05:47 UTC (rev 15800) +++ trunk/reactos/hal/halx86/up/halup.xml 2005-06-05 11:22:16 UTC (rev 15801) @@ -1,4 +1,4 @@ -<module name="halup" type="kernelmodedll" installbase="system32" installname="hal.dll"> +<module ifnot="${MP}" name="halup" type="kernelmodedll" installbase="system32" installname="hal.dll"> <importlibrary definition="../../hal/hal.def" /> <bootstrap base="reactos" nameoncd="hal.dll" /> <include base="hal_generic">../include</include> _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-06-05 11:05:47 UTC (rev 15800) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-06-05 11:22:16 UTC (rev 15801) @@ -256,6 +256,8 @@ for ( i = 0; i < ProjectNode.modules.size (); i++ ) { Module& module = *ProjectNode.modules[i]; + if ( !module.enabled ) + continue; MingwModuleHandler* h = MingwModuleHandler::InstanciateHandler ( module, this ); @@ -547,6 +549,8 @@ for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { Module& module = *ProjectNode.modules[i]; + if ( !module.enabled ) + continue; if ( module.type == BuildTool ) { if ( dependencies.length () > 0 ) @@ -845,6 +849,8 @@ for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { const Module& module = *ProjectNode.modules[i]; + if ( !module.enabled ) + continue; if ( module.installName.length () > 0 ) { string targetFilenameNoFixup; @@ -915,6 +921,8 @@ for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { const Module& module = *ProjectNode.modules[i]; + if ( !module.enabled ) + continue; if ( module.installName.length () > 0 ) { string sourceFilename = MingwModuleHandler::PassThruCacheDirectory ( @@ -1004,6 +1012,8 @@ for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { const Module& module = *ProjectNode.modules[i]; + if ( !module.enabled ) + continue; if ( module.type == Test ) out.push_back ( module.name ); } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-05 11:05:47 UTC (rev 15800) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-05 11:22:16 UTC (rev 15801) @@ -2573,6 +2573,8 @@ for ( size_t i = 0; i < module.project.modules.size (); i++ ) { const Module& m = *module.project.modules[i]; + if ( !m.enabled ) + continue; if ( m.bootstrap != NULL ) { string sourceFilename = PassThruCacheDirectory ( @@ -2619,6 +2621,8 @@ for ( size_t i = 0; i < module.project.modules.size (); i++ ) { const Module& m = *module.project.modules[i]; + if ( !m.enabled ) + continue; if ( m.bootstrap != NULL ) { string targetDirectory ( bootcdDirectory + SSEP + m.bootstrap->base ); @@ -2664,6 +2668,8 @@ for ( size_t i = 0; i < module.project.modules.size (); i++ ) { const Module& m = *module.project.modules[i]; + if ( !m.enabled ) + continue; if ( m.bootstrap != NULL ) { string filename = PassThruCacheDirectory ( @@ -2795,6 +2801,8 @@ for ( size_t i = 0; i < module.project.modules.size (); i++ ) { const Module& m = *module.project.modules[i]; + if ( !m.enabled ) + continue; if ( m.installName.length () > 0 ) { string sourceFilename = MingwModuleHandler::PassThruCacheDirectory ( _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-06-05 11:05:47 UTC (rev 15800) +++ trunk/reactos/tools/rbuild/module.cpp 2005-06-05 11:22:16 UTC (rev 15801) @@ -99,6 +99,15 @@ return FixSeparator ( relativeNormalizedPath ); } +bool +GetBooleanValue ( const string& value ) +{ + if ( value == "1" ) + return true; + else + return false; +} + IfableData::~IfableData() { size_t i; @@ -153,11 +162,21 @@ __LINE__, "Module created with non-<module> node" ); - xmlbuildFile = Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename() ); + xmlbuildFile = Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename () ); path = FixSeparator ( modulePath ); - const XMLAttribute* att = moduleNode.GetAttribute ( "name", true ); + enabled = true; + + const XMLAttribute* att = moduleNode.GetAttribute ( "if", false ); + if ( att != NULL ) + enabled = GetBooleanValue ( project.ResolveProperties ( att->value ) ); + + att = moduleNode.GetAttribute ( "ifnot", false ); + if ( att != NULL ) + enabled = !GetBooleanValue ( project.ResolveProperties ( att->value ) ); + + att = moduleNode.GetAttribute ( "name", true ); assert(att); name = att->value; _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-06-05 11:05:47 UTC (rev 15800) +++ trunk/reactos/tools/rbuild/project.cpp 2005-06-05 11:22:16 UTC (rev 15801) @@ -85,10 +85,49 @@ return NULL; } +string +Project::ResolveNextProperty ( string& s ) const +{ + size_t i = s.find ( "${" ); + if ( i == string::npos ) + i = s.find ( "$(" ); + if ( i != string::npos ) + { + string endCharacter; + if ( s[i + 1] == '{' ) + endCharacter = "}"; + else + endCharacter = ")"; + size_t j = s.find ( endCharacter ); + if ( j != string::npos ) + { + int propertyNameLength = j - i - 2; + string propertyName = s.substr ( i + 2, propertyNameLength ); + const Property* property = LookupProperty ( propertyName ); + if ( property != NULL ) + return s.replace ( i, propertyNameLength + 3, property->value ); + } + } + return s; +} + +string +Project::ResolveProperties ( const string& s ) const +{ + string s2 = s; + string s3; + do + { + s3 = s2; + s2 = ResolveNextProperty ( s3 ); + } while ( s2 != s3 ); + return s2; +} + void Project::SetConfigurationOption ( char* s, - string name, - string* alternativeName ) + string name, + string* alternativeName ) { const Property* property = LookupProperty ( name ); if ( property != NULL && property->value.length () > 0 ) _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-06-05 11:05:47 UTC (rev 15800) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-06-05 11:22:16 UTC (rev 15801) @@ -134,7 +134,9 @@ Module* LocateModule ( const std::string& name ); const Module* LocateModule ( const std::string& name ) const; std::string GetProjectFilename () const; + std::string ResolveProperties ( const std::string& s ) const; private: + std::string ResolveNextProperty ( std::string& s ) const; const Property* LookupProperty ( const std::string& name ) const; void SetConfigurationOption ( char* s, std::string name, @@ -210,6 +212,7 @@ std::string installName; bool useWRC; bool enableWarnings; + bool enabled; Module ( const Project& project, const XMLElement& moduleNode, _____ Modified: trunk/reactos/tools/rbuild/rbuild.txt --- trunk/reactos/tools/rbuild/rbuild.txt 2005-06-05 11:05:47 UTC (rev 15800) +++ trunk/reactos/tools/rbuild/rbuild.txt 2005-06-05 11:22:16 UTC (rev 15801) @@ -107,11 +107,13 @@ There can be zero or more modules per xml build file. Syntax: - <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true"> + <module if="${MP}" ifnot="${MP}" name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true"> ... </module> Attributes: + if - If the value is 1, then the module is enabled, otherwise it is disabled. A disabled module is not processed. + ifnot - If the value is 1, then the module is disabled, otherwise it is enabled. A disabled module is not processed. name - Name of the module. Also the base name of the generated file if such file is generated for the particular module type. type - Type of module. See below for an explanation of module types. extension - Extension of the generated file if such file is generated for the particular module type.

19 years, 5 months

[gvg] 15800: Use standard debug macros

by gvg＠svn.reactos.com

Use standard debug macros Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-06-05 08:33:52 UTC (rev 15799) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-06-05 11:05:47 UTC (rev 15800) @@ -27,9 +27,11 @@ /* INCLUDES *******************************************************************/ -#define NDEBUG #include "vbemp.h" +#define NDEBUG +#include <debug.h> + /* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ VP_STATUS STDCALL @@ -78,11 +80,11 @@ static int VBESortModesCallback(PVBE_MODEINFO VbeModeInfoA, PVBE_MODEINFO VbeModeInfoB) { - DPRINT(("VBESortModesCallback: %dx%dx%d / %dx%dx%d\n", + DPRINT("VBESortModesCallback: %dx%dx%d / %dx%dx%d\n", VbeModeInfoA->XResolution, VbeModeInfoA->YResolution, VbeModeInfoA->BitsPerPixel, VbeModeInfoB->XResolution, VbeModeInfoB->YResolution, - VbeModeInfoB->BitsPerPixel)); + VbeModeInfoB->BitsPerPixel); /* * FIXME: Until some reasonable method for changing video modes will @@ -188,7 +190,7 @@ if (Status != NO_ERROR) { - DPRINT(("Failed to get Int 10 service functions (Status %x)\n", Status)); + DPRINT1("Failed to get Int 10 service functions (Status %x)\n", Status); return FALSE; } @@ -207,7 +209,7 @@ if (Status != NO_ERROR) { - DPRINT(("Failed to allocate virtual memory (Status %x)\n", Status)); + DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); return FALSE; } @@ -239,10 +241,10 @@ &VBEDeviceExtension->VbeInfo, sizeof(VBEDeviceExtension->VbeInfo)); - DPRINT(("VBE BIOS Present (%d.%d, %8ld Kb)\n", + DPRINT("VBE BIOS Present (%d.%d, %8ld Kb)\n", VBEDeviceExtension->VbeInfo.Version / 0x100, VBEDeviceExtension->VbeInfo.Version & 0xFF, - VBEDeviceExtension->VbeInfo.TotalMemory * 16)); + VBEDeviceExtension->VbeInfo.TotalMemory * 16); #ifdef VBE12_SUPPORT if (VBEDeviceExtension->VbeInfo.Version < 0x102) @@ -250,13 +252,13 @@ if (VBEDeviceExtension->VbeInfo.Version < 0x200) #endif { - DPRINT(("VBE BIOS present, but incompatible version.\n")); + DPRINT("VBE BIOS present, but incompatible version.\n"); return FALSE; } } else { - DPRINT(("No VBE BIOS found.\n")); + DPRINT("No VBE BIOS found.\n"); return FALSE; } @@ -357,7 +359,7 @@ if (SuitableModeCount == 0) { - DPRINT(("VBEMP: No video modes supported\n")); + DPRINT("VBEMP: No video modes supported\n"); return FALSE; } @@ -373,15 +375,15 @@ * Print the supported video modes when DBG is set. */ -#ifdef DBG +#if defined(DBG) && ! defined(NDEBUG) for (CurrentMode = 0; CurrentMode < SuitableModeCount; CurrentMode++) { - DPRINT(("%dx%dx%d\n", + DPRINT("%dx%dx%d\n", VBEDeviceExtension->ModeInfo[CurrentMode].XResolution, VBEDeviceExtension->ModeInfo[CurrentMode].YResolution, - VBEDeviceExtension->ModeInfo[CurrentMode].BitsPerPixel)); + VBEDeviceExtension->ModeInfo[CurrentMode].BitsPerPixel); } #endif @@ -731,7 +733,7 @@ } else { - DPRINT(("VBEMP: VBESetCurrentMode failed (%x)\n", BiosRegisters.Eax)); + DPRINT1("VBEMP: VBESetCurrentMode failed (%x)\n", BiosRegisters.Eax); DeviceExtension->CurrentMode = -1; } _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-06-05 08:33:52 UTC (rev 15799) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-06-05 11:05:47 UTC (rev 15800) @@ -31,12 +31,6 @@ #include <ddk/ntddvdeo.h> #include <ddk/ntapi.h> -#ifdef DBG -#define DPRINT(arg) DbgPrint arg; -#else -#define DPRINT(arg) -#endif - /* * Compile-time define to get VBE 1.2 support. The implementation * is far from complete now and so it's left undefined.

19 years, 5 months

← Newer
1
...
53
54
55
56
57
58
59
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005