Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[navaraf] 13945: Alex Ionescu <ionucu@videotron.ca>

by navaraf＠svn.reactos.com

Alex Ionescu <ionucu(a)videotron.ca> Pass an ACPI flag from FreeLdr to the kernel and replace the usage of ACPI compile time option with it. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/config Modified: trunk/reactos/include/ntos/types.h Modified: trunk/reactos/ntoskrnl/include/internal/po.h Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/tools/config.mk _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-03-12 00:49:18 UTC (rev 13945) @@ -28,6 +28,7 @@ #include "../../reactos/registry.h" #include "hardware.h" +BOOLEAN AcpiPresent = FALSE; static BOOL FindAcpiBios(VOID) @@ -63,6 +64,7 @@ if (FindAcpiBios()) { + AcpiPresent = TRUE; /* Create new bus key */ sprintf(Buffer, "MultifunctionAdapter\\%u", *BusNumber); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h --- trunk/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-03-12 00:49:18 UTC (rev 13945) @@ -52,6 +52,7 @@ #define MB_INFO_FLAG_BOOT_LOADER_NAME 0x00000200 #define MB_INFO_FLAG_APM_TABLE 0x00000400 #define MB_INFO_FLAG_GRAPHICS_TABLE 0x00000800 +#define MB_INFO_FLAG_ACPI_TABLE 0x00001000 #ifndef ASM /* Do not include here in boot.S. */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-03-12 00:49:18 UTC (rev 13945) @@ -580,6 +580,7 @@ extern ULONG PageDirectoryStart; extern ULONG PageDirectoryEnd; + extern BOOLEAN AcpiPresent; // // Open the operating system section @@ -596,8 +597,9 @@ * Setup multiboot information structure */ LoaderBlock.Flags = MB_INFO_FLAG_MEM_SIZE | MB_INFO_FLAG_BOOT_DEVICE | MB_INFO_FLAG_COMMAND_LINE | MB_INFO_FLAG_MODULES; - LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; - LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; + if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE; + LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; + LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.BootDevice = 0xffffffff; LoaderBlock.CommandLine = (unsigned long)multiboot_kernel_cmdline; LoaderBlock.ModsCount = 0; _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/config 2005-03-12 00:49:18 UTC (rev 13945) @@ -38,11 +38,6 @@ CONFIG_SMP := 0 # -# Whether to compile for ACPI compliant systems -# -ACPI := 0 - -# # whether to use a 3GB User, 1GB Kernel memory map # 3GB := 0 _____ Modified: trunk/reactos/include/ntos/types.h --- trunk/reactos/include/ntos/types.h 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/include/ntos/types.h 2005-03-12 00:49:18 UTC (rev 13945) @@ -492,6 +492,7 @@ #define MB_FLAGS_BOOT_LOADER_NAME (0x200) #define MB_FLAGS_APM_TABLE (0x400) #define MB_FLAGS_GRAPHICS_TABLE (0x800) +#define MB_FLAGS_ACPI_TABLE (0x1000) typedef struct _LOADER_MODULE { _____ Modified: trunk/reactos/ntoskrnl/include/internal/po.h --- trunk/reactos/ntoskrnl/include/internal/po.h 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/ntoskrnl/include/internal/po.h 2005-03-12 00:49:18 UTC (rev 13945) @@ -18,7 +18,7 @@ extern PDEVICE_NODE PopSystemPowerDeviceNode; VOID -PoInit(VOID); +PoInit(PLOADER_PARAMETER_BLOCK LoaderBlock, BOOLEAN ForceAcpiDisable); NTSTATUS PopSetSystemPowerState( _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/ntoskrnl/io/device.c 2005-03-12 00:49:18 UTC (rev 13945) @@ -82,7 +82,6 @@ return Status; } -#ifdef ACPI if (Fdo->DeviceType == FILE_DEVICE_ACPI) { static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; @@ -94,7 +93,6 @@ SystemPowerDeviceNodeCreated = TRUE; } } -#endif /* ACPI */ if (Fdo->DeviceType == FILE_DEVICE_BUS_EXTENDER || Fdo->DeviceType == FILE_DEVICE_ACPI) _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-03-12 00:49:18 UTC (rev 13945) @@ -528,7 +528,7 @@ ExInit3(); KdInit1(); IoInit(); - PoInit(); + PoInit(&KeLoaderBlock, FALSE); CmInitializeRegistry(); MmInit3(); CcInit(); _____ Modified: trunk/reactos/ntoskrnl/po/power.c --- trunk/reactos/ntoskrnl/po/power.c 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/ntoskrnl/po/power.c 2005-03-12 00:49:18 UTC (rev 13945) @@ -12,8 +12,8 @@ #define NDEBUG #include <internal/debug.h> - PDEVICE_NODE PopSystemPowerDeviceNode = NULL; +BOOLEAN PopAcpiPresent = FALSE; /* * @implemented @@ -133,10 +133,7 @@ NTSTATUS PopSetSystemPowerState( SYSTEM_POWER_STATE PowerState) -{ - -#ifdef ACPI - +{ IO_STATUS_BLOCK IoStatusBlock; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION IrpSp; @@ -144,6 +141,8 @@ NTSTATUS Status; KEVENT Event; PIRP Irp; + + if (!PopAcpiPresent) return STATUS_NOT_IMPLEMENTED; Status = IopGetSystemPowerDeviceObject(&DeviceObject); if (!NT_SUCCESS(Status)) { @@ -190,15 +189,18 @@ ObDereferenceObject(Fdo); return Status; - -#endif /* ACPI */ - - return STATUS_NOT_IMPLEMENTED; } -VOID INIT_FUNCTION -PoInit(VOID) +VOID +INIT_FUNCTION +PoInit(PLOADER_PARAMETER_BLOCK LoaderBlock, + BOOLEAN ForceAcpiDisable) { + /* Set the ACPI State to False if it's been forced that way */ + if (ForceAcpiDisable) PopAcpiPresent = FALSE; + + /* Otherwise check the LoaderBlock's Flag */ + PopAcpiPresent = LoaderBlock->Flags & MB_FLAGS_ACPI_TABLE; } /* _____ Modified: trunk/reactos/tools/config.mk --- trunk/reactos/tools/config.mk 2005-03-12 00:23:38 UTC (rev 13944) +++ trunk/reactos/tools/config.mk 2005-03-12 00:49:18 UTC (rev 13945) @@ -19,10 +19,6 @@ CONFIG += CONFIG_SMP endif -ifeq ($(ACPI), 1) -CONFIG += ACPI -endif - $(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX): $(PATH_TO_TOP)/tools/mkconfig.c @$(HOST_CC) -g -o $(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX) $(PATH_TO_TOP)/tools/mkconfig.c

19 years, 9 months

[royce] 13944: rename more makefiles, preparation for local makefiles to work with xml build system

by royce＠svn.reactos.com

rename more makefiles, preparation for local makefiles to work with xml build system Modified: branches/xmlbuildsystem/reactos/proxy.mak Added: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak Deleted: branches/xmlbuildsystem/reactos/tools/buildno/makefile Added: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak Deleted: branches/xmlbuildsystem/reactos/tools/cdmake/makefile Deleted: branches/xmlbuildsystem/reactos/tools/nci/makefile Added: branches/xmlbuildsystem/reactos/tools/nci/nci.mak Deleted: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Added: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Deleted: branches/xmlbuildsystem/reactos/tools/unicode/makefile Added: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak Deleted: branches/xmlbuildsystem/reactos/tools/wmc/makefile Added: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak Deleted: branches/xmlbuildsystem/reactos/tools/wrc/makefile Added: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak _____ Modified: branches/xmlbuildsystem/reactos/proxy.mak --- branches/xmlbuildsystem/reactos/proxy.mak 2005-03-12 00:02:24 UTC (rev 13943) +++ branches/xmlbuildsystem/reactos/proxy.mak 2005-03-12 00:23:38 UTC (rev 13944) @@ -8,3 +8,5 @@ clean: @$(MAKE) -C $(TOP) $(DEFAULT)_clean + +$(DEFAULT)_clean: clean _____ Copied: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak (from rev 13938, branches/xmlbuildsystem/reactos/tools/buildno/makefile) --- branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-11 23:06:43 UTC (rev 13938) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-12 00:23:38 UTC (rev 13944) @@ -0,0 +1,44 @@ +BUILDNO_BASE = tools$(SEP)buildno + +BUILDNO_TARGET = \ + $(EXEPREFIX)$(BUILDNO_BASE)$(SEP)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_OBJECTS = \ + $(BUILDNO_SOURCES:.cpp=.o) + +BUILDNO_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall + +BUILDNO_HOST_LFLAGS = -g + +$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) + $(ECHO_LD) + ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_CFLAGS) -o $(BUILDNO_TARGET) + +$(BUILDNO_OBJECTS): %.o : %.cpp include$(SEP)reactos$(SEP)version.h + $(ECHO_CC) + ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ + +.PHONY: buildno_clean +buildno_clean: + -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) +clean: buildno_clean + +# BUILDNO_H is defined from the top-level makefile now... +#BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h + +.PHONY: buildno_h +buildno_h: $(BUILDNO_H) + +$(BUILDNO_H): $(BUILDNO_TARGET) + $(BUILDNO_TARGET) $(BUILDNO_H) + +.PHONY: buildno_h_clean +buildno_h_clean: + -@$(rm) $(BUILDNO_H) +clean: buildno_h_clean _____ Deleted: branches/xmlbuildsystem/reactos/tools/buildno/makefile --- branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-12 00:02:24 UTC (rev 13943) +++ branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-12 00:23:38 UTC (rev 13944) @@ -1,38 +0,0 @@ -BUILDNO_BASE = tools$(SEP)buildno - -BUILDNO_TARGET = \ - $(EXEPREFIX)$(BUILDNO_BASE)$(SEP)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_OBJECTS = \ - $(BUILDNO_SOURCES:.cpp=.o) - -BUILDNO_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall - -BUILDNO_HOST_LFLAGS = -g - -$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) - $(ECHO_LD) - ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_CFLAGS) -o $(BUILDNO_TARGET) - -$(BUILDNO_OBJECTS): %.o : %.cpp include$(SEP)reactos$(SEP)version.h - $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ - -.PHONY: buildno_clean -buildno_clean: - -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) - -# BUILDNO_H is defined from the top-level makefile now... -#BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h - -.PHONY: buildno_h -buildno_h: $(BUILDNO_H) - -$(BUILDNO_H): $(BUILDNO_TARGET) - $(BUILDNO_TARGET) $(BUILDNO_H) _____ Copied: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak (from rev 13915, branches/xmlbuildsystem/reactos/tools/cdmake/makefile) _____ Deleted: branches/xmlbuildsystem/reactos/tools/cdmake/makefile --- branches/xmlbuildsystem/reactos/tools/cdmake/makefile 2005-03-12 00:02:24 UTC (rev 13943) +++ branches/xmlbuildsystem/reactos/tools/cdmake/makefile 2005-03-12 00:23:38 UTC (rev 13944) @@ -1,28 +0,0 @@ -CDMAKE_BASE = tools$(SEP)cdmake - -CDMAKE_TARGET = \ - $(ROS_INTERMEDIATE)$(CDMAKE_BASE)$(SEP)cdmake$(EXEPOSTFIX) - -CDMAKE_SOURCES = \ - $(CDMAKE_BASE)$(SEP)cdmake.c \ - $(CDMAKE_BASE)$(SEP)llmosrt.c - -CDMAKE_OBJECTS = \ - $(CDMAKE_SOURCES:.c=.o) - -CDMAKE_HOST_CFLAGS = -Iinclude -g -Werror -Wall - -CDMAKE_HOST_LFLAGS = -g - -$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) - $(ECHO_LD) - ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_CFLAGS) -o $(CDMAKE_TARGET) - -$(CDMAKE_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@ - -.PHONY: cdmake_clean -cdmake_clean: - -@$(rm) $(CDMAKE_TARGET) $(CDMAKE_OBJECTS) 2>$(NUL) -clean: cdmake_clean _____ Deleted: branches/xmlbuildsystem/reactos/tools/nci/makefile --- branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-03-12 00:02:24 UTC (rev 13943) +++ branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-03-12 00:23:38 UTC (rev 13944) @@ -1,64 +0,0 @@ -NCI_BASE = tools$(SEP)nci - -NCI_TARGET = \ - $(ROS_INTERMEDIATE)$(NCI_BASE)$(SEP)nci$(EXEPOSTFIX) - -NCI_SOURCES = \ - $(NCI_BASE)$(SEP)ncitool.c - -NCI_OBJECTS = \ - $(NCI_SOURCES:.c=.o) - -NCI_HOST_CFLAGS = -Iinclude -g -Werror -Wall - -NCI_HOST_LFLAGS = -g - -$(NCI_TARGET): $(NCI_OBJECTS) - $(ECHO_LD) - ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_CFLAGS) -o $(NCI_TARGET) - -$(NCI_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ - -.PHONY: nci_clean -nci_clean: - -@$(rm) $(NCI_TARGET) $(NCI_OBJECTS) 2>$(NUL) -clean: nci_clean - -# WIN32K.SYS -WIN32K_SVC_DB = $(NCI_BASE)$(SEP)w32ksvc.db -WIN32K_SERVICE_TABLE = subsys$(SEP)win32k$(SEP)main$(SEP)svctab.c -WIN32K_GDI_STUBS = lib$(SEP)gdi32$(SEP)misc$(SEP)win32k.S -WIN32K_USER_STUBS = lib$(SEP)user32$(SEP)misc$(SEP)win32k.S - -# NTOSKRNL.EXE -KERNEL_SVC_DB = $(NCI_BASE)$(SEP)sysfuncs.lst -KERNEL_SERVICE_TABLE = include$(SEP)ntdll$(SEP)napi.h -NTDLL_STUBS = lib$(SEP)ntdll$(SEP)napi.S -KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)zw.S - -NCI_SERVICE_FILES = \ - $(KERNEL_SERVICE_TABLE) \ - $(WIN32K_SERVICE_TABLE) \ - $(NTDLL_STUBS) \ - $(KERNEL_STUBS) \ - $(WIN32K_GDI_STUBS) \ - $(WIN32K_USER_STUBS) - -$(NCI_SERVICE_FILES): $(NCI_TARGET) - $(ECHO_NCI) - $(Q)$(EXEPREFIX)$(NCI_TARGET) \ - $(KERNEL_SVC_DB) \ - $(WIN32K_SVC_DB) \ - $(KERNEL_SERVICE_TABLE) \ - $(WIN32K_SERVICE_TABLE) \ - $(NTDLL_STUBS) \ - $(KERNEL_STUBS) \ - $(WIN32K_GDI_STUBS) \ - $(WIN32K_USER_STUBS) - -.PHONY: nci_service_files_clean -nci_service_files_clean: - -@$(rm) $(NCI_SERVICE_FILES) 2>$(NUL) -clean: nci_service_files_clean _____ Copied: branches/xmlbuildsystem/reactos/tools/nci/nci.mak (from rev 13915, branches/xmlbuildsystem/reactos/tools/nci/makefile) _____ Deleted: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-12 00:02:24 UTC (rev 13943) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-12 00:23:38 UTC (rev 13944) @@ -1,116 +0,0 @@ -RBUILD_BASE = tools$(SEP)rbuild - -RBUILD_TARGET = \ - $(ROS_INTERMEDIATE)$(RBUILD_BASE)$(SEP)rbuild$(EXEPOSTFIX) - -RBUILD_TEST_TARGET = \ - $(ROS_INTERMEDIATE)$(RBUILD_BASE)$(SEP)rbuild_test$(EXEPOSTFIX) - -RBUILD_BACKEND_MINGW_BASE_SOURCES = \ - backend$(SEP)mingw$(SEP)mingw.cpp \ - backend$(SEP)mingw$(SEP)modulehandler.cpp - -RBUILD_BACKEND_DEVCPP_BASE_SOURCES = \ - backend$(SEP)devcpp$(SEP)devcpp.cpp - -RBUILD_BACKEND_BASE_SOURCES = \ - $(RBUILD_BACKEND_MINGW_BASE_SOURCES) \ - $(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \ - backend$(SEP)backend.cpp - -RBUILD_BASE_SOURCES = \ - $(RBUILD_BACKEND_BASE_SOURCES) \ - automaticdependency.cpp \ - bootstrap.cpp \ - cdfile.cpp \ - compilerflag.cpp \ - define.cpp \ - exception.cpp \ - include.cpp \ - linkerflag.cpp \ - module.cpp \ - project.cpp \ - ssprintf.cpp \ - XML.cpp - -RBUILD_COMMON_SOURCES = \ - $(addprefix $(RBUILD_BASE)$(SEP), $(RBUILD_BASE_SOURCES)) \ - -RBUILD_SPECIAL_SOURCES = \ - $(RBUILD_BASE)$(SEP)rbuild.cpp - -RBUILD_SOURCES = \ - $(RBUILD_COMMON_SOURCES) \ - $(RBUILD_SPECIAL_SOURCES) - -RBUILD_COMMON_OBJECTS = \ - $(addprefix $(ROS_INTERMEDIATE), $(RBUILD_COMMON_SOURCES:.cpp=.o)) - -RBUILD_SPECIAL_OBJECTS = \ - $(addprefix $(ROS_INTERMEDIATE), $(RBUILD_SPECIAL_SOURCES:.cpp=.o)) - -RBUILD_OBJECTS = \ - $(RBUILD_COMMON_OBJECTS) \ - $(RBUILD_SPECIAL_OBJECTS) - -RBUILD_TESTS = \ - tests$(SEP)definetest.cpp \ - tests$(SEP)functiontest.cpp \ - tests$(SEP)iftest.cpp \ - tests$(SEP)includetest.cpp \ - tests$(SEP)invoketest.cpp \ - tests$(SEP)linkerflagtest.cpp \ - tests$(SEP)moduletest.cpp \ - tests$(SEP)projecttest.cpp \ - tests$(SEP)sourcefiletest.cpp \ - tests$(SEP)cdfiletest.cpp - -RBUILD_TEST_SPECIAL_SOURCES = \ - $(addprefix $(RBUILD_BASE)$(SEP), $(RBUILD_TESTS)) \ - $(RBUILD_BASE)$(SEP)tests$(SEP)alltests.cpp - -RBUILD_TEST_SOURCES = \ - $(RBUILD_COMMON_SOURCES) \ - $(RBUILD_TEST_SPECIAL_SOURCES) - -RBUILD_TEST_SPECIAL_OBJECTS = \ - $(addprefix $(ROS_INTERMEDIATE), $(RBUILD_TEST_SPECIAL_SOURCES:.cpp=.o)) - -RBUILD_TEST_OBJECTS = \ - $(RBUILD_COMMON_OBJECTS) \ - $(RBUILD_TEST_SPECIAL_OBJECTS) - -RBUILD_HOST_CXXFLAGS = -g -I$(RBUILD_BASE) -Werror -Wall - -RBUILD_HOST_LFLAGS = -g - -$(RBUILD_TARGET): $(RBUILD_OBJECTS) - $(ECHO_LD) - ${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $(RBUILD_TARGET) - -$(RBUILD_COMMON_OBJECTS): %.o: %.cpp - $(ECHO_CC) - ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ - -$(RBUILD_SPECIAL_OBJECTS): %.o: %.cpp - $(ECHO_CC) - ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ - -$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) - $(ECHO_LD) - ${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $(RBUILD_TEST_TARGET) - -$(RBUILD_TEST_SPECIAL_OBJECTS): %.o: %.cpp - $(ECHO_CC) - ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ - -.PHONY: rbuild_test - -rbuild_test: $(RBUILD_TEST_TARGET) - $(ECHO_TEST) - $(Q)$(RBUILD_TEST_TARGET) - -.PHONY: rbuild_clean -rbuild_clean: - -@$(rm) $(RBUILD_TARGET) $(RBUILD_OBJECTS) $(RBUILD_TEST_TARGET) $(RBUILD_TEST_OBJECTS) 2>$(NUL) -clean: rbuild_clean _____ Copied: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak (from rev 13915, branches/xmlbuildsystem/reactos/tools/rbuild/makefile) _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-12 00:02:24 UTC (rev 13943) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-12 00:23:38 UTC (rev 13944) @@ -55,11 +55,11 @@ -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL) clean: rsym_clean -include tools/buildno/makefile -include tools/cdmake/makefile -include tools/nci/makefile -include tools/rbuild/makefile -include tools/unicode/makefile -include tools/wmc/makefile +include tools/buildno/buildno.mak +include tools/cdmake/cdmake.mak +include tools/nci/nci.mak +include tools/rbuild/rbuild.mak +include tools/unicode/unicode.mak +include tools/wmc/wmc.mak include tools/wpp/wpp.mak -include tools/wrc/makefile +include tools/wrc/wrc.mak _____ Deleted: branches/xmlbuildsystem/reactos/tools/unicode/makefile --- branches/xmlbuildsystem/reactos/tools/unicode/makefile 2005-03-12 00:02:24 UTC (rev 13943) +++ branches/xmlbuildsystem/reactos/tools/unicode/makefile 2005-03-12 00:23:38 UTC (rev 13944) @@ -1,100 +0,0 @@ -UNICODE_BASE = tools$(SEP)unicode - -UNICODE_TARGET = \ - $(ROS_INTERMEDIATE)$(UNICODE_BASE)$(SEP)libunicode.a - -UNICODE_CODEPAGES = \ - 037 \ - 424 \ - 437 \ - 500 \ - 737 \ - 775 \ - 850 \ - 852 \ - 855 \ - 856 \ - 857 \ - 860 \ - 861 \ - 862 \ - 863 \ - 864 \ - 865 \ - 866 \ - 869 \ - 874 \ - 875 \ - 878 \ - 932 \ - 936 \ - 949 \ - 950 \ - 1006 \ - 1026 \ - 1250 \ - 1251 \ - 1252 \ - 1253 \ - 1254 \ - 1255 \ - 1256 \ - 1257 \ - 1258 \ - 10000 \ - 10006 \ - 10007 \ - 10029 \ - 10079 \ - 10081 \ - 20866 \ - 20932 \ - 21866 \ - 28591 \ - 28592 \ - 28593 \ - 28594 \ - 28595 \ - 28596 \ - 28597 \ - 28598 \ - 28599 \ - 28600 \ - 28603 \ - 28604 \ - 28605 \ - 28606 - -UNICODE_SOURCES = \ - $(UNICODE_BASE)$(SEP)casemap.c \ - $(UNICODE_BASE)$(SEP)compose.c \ - $(UNICODE_BASE)$(SEP)cptable.c \ - $(UNICODE_BASE)$(SEP)mbtowc.c \ - $(UNICODE_BASE)$(SEP)string.c \ - $(UNICODE_BASE)$(SEP)wctomb.c \ - $(UNICODE_BASE)$(SEP)wctype.c \ - $(addprefix $(UNICODE_BASE)$(SEP), $(UNICODE_CODEPAGES:%=c_%.o)) - -UNICODE_OBJECTS = \ - $(UNICODE_SOURCES:.c=.o) - -UNICODE_HOST_CFLAGS = \ - -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ - -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -I$(UNICODE_BASE) -Iinclude/wine -Iw32api/include - -.PHONY: unicode -unicode: $(UNICODE_TARGET) - -$(UNICODE_TARGET): $(UNICODE_OBJECTS) - $(ECHO_AR) - ${host_ar} -rc $(UNICODE_TARGET) $(UNICODE_OBJECTS) - -$(UNICODE_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -.PHONY: unicode_clean -unicode_clean: - -@$(rm) $(UNICODE_TARGET) $(UNICODE_OBJECTS) 2>$(NUL) -clean: unicode_clean _____ Copied: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak (from rev 13915, branches/xmlbuildsystem/reactos/tools/unicode/makefile) _____ Deleted: branches/xmlbuildsystem/reactos/tools/wmc/makefile --- branches/xmlbuildsystem/reactos/tools/wmc/makefile 2005-03-12 00:02:24 UTC (rev 13943) +++ branches/xmlbuildsystem/reactos/tools/wmc/makefile 2005-03-12 00:23:38 UTC (rev 13944) @@ -1,34 +0,0 @@ -WMC_BASE = tools$(SEP)wmc - -WMC_TARGET = \ - $(ROS_INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX) - -WMC_SOURCES = \ - $(WMC_BASE)$(SEP)getopt.c \ - $(WMC_BASE)$(SEP)lang.c \ - $(WMC_BASE)$(SEP)mcl.c \ - $(WMC_BASE)$(SEP)utils.c \ - $(WMC_BASE)$(SEP)wmc.c \ - $(WMC_BASE)$(SEP)write.c \ - $(WMC_BASE)$(SEP)y_tab.c \ - $(WMC_BASE)$(SEP)misc.c - -WMC_OBJECTS = \ - $(WMC_SOURCES:.c=.o) - -WMC_HOST_CXXFLAGS = -I$(WMC_BASE) -g -Werror -Wall - -WMC_HOST_LFLAGS = -g - -$(WMC_TARGET): $(WMC_OBJECTS) - $(ECHO_LD) - ${host_gcc} $(WMC_OBJECTS) $(WMC_HOST_LFLAGS) -o $(WMC_TARGET) - -$(WMC_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ - -.PHONY: wmc_clean -wmc_clean: - -@$(rm) $(WMC_TARGET) $(WMC_OBJECTS) 2>$(NUL) -clean: wmc_clean _____ Copied: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak (from rev 13915, branches/xmlbuildsystem/reactos/tools/wmc/makefile) _____ Deleted: branches/xmlbuildsystem/reactos/tools/wrc/makefile --- branches/xmlbuildsystem/reactos/tools/wrc/makefile 2005-03-12 00:02:24 UTC (rev 13943) +++ branches/xmlbuildsystem/reactos/tools/wrc/makefile 2005-03-12 00:23:38 UTC (rev 13944) @@ -1,41 +0,0 @@ -WRC_BASE = tools$(SEP)wrc - -WRC_TARGET = \ - $(ROS_INTERMEDIATE)$(WRC_BASE)$(SEP)wrc$(EXEPOSTFIX) - -WRC_SOURCES = \ - $(WRC_BASE)$(SEP)dumpres.c \ - $(WRC_BASE)$(SEP)genres.c \ - $(WRC_BASE)$(SEP)newstruc.c \ - $(WRC_BASE)$(SEP)readres.c \ - $(WRC_BASE)$(SEP)translation.c \ - $(WRC_BASE)$(SEP)utils.c \ - $(WRC_BASE)$(SEP)wrc.c \ - $(WRC_BASE)$(SEP)writeres.c \ - $(WRC_BASE)$(SEP)y.tab.c \ - $(WRC_BASE)$(SEP)lex.yy.c \ - $(WRC_BASE)$(SEP)port$(SEP)mkstemps.o - -WRC_OBJECTS = \ - $(WRC_SOURCES:.c=.o) - -WRC_HOST_CFLAGS = -I$(WRC_BASE) -g -Werror -Wall \ - -D__USE_W32API -DWINE_UNICODE_API= \ - -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -I$(UNICODE_BASE) -I$(WPP_BASE) -I$(WRC_BASE) \ - -Iinclude/wine -Iinclude -Iw32api/include - -WRC_HOST_LFLAGS = -g - -$(WRC_TARGET): $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET) - $(ECHO_LD) - ${host_gcc} $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET) $(WRC_HOST_LFLAGS) -o $(WRC_TARGET) - -$(WRC_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -.PHONY: wrc_clean -wrc_clean: - -@$(rm) $(WRC_TARGET) $(WRC_OBJECTS) 2>$(NUL) -clean: wrc_clean _____ Copied: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak (from rev 13915, branches/xmlbuildsystem/reactos/tools/wrc/makefile)

19 years, 9 months

[arty] 13943: Changed sizeof(RemoteAddress) to sizeof(*RemoteAddress). Now address

by arty＠svn.reactos.com

Changed sizeof(RemoteAddress) to sizeof(*RemoteAddress). Now address returns work in accept. Modified: trunk/reactos/lib/msafd/misc/dllmain.c _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-03-11 23:56:02 UTC (rev 13942) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-03-12 00:02:24 UTC (rev 13943) @@ -1,3 +1,4 @@ + /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL @@ -861,12 +862,12 @@ /* Set up Address in SOCKADDR Format */ RtlCopyMemory (RemoteAddress, - &ListenReceiveData->Address.Address[0].AddressType, - sizeof(RemoteAddress)); + &ListenReceiveData->Address.Address[0].AddressType, + sizeof(*RemoteAddress)); /* Build Caller ID */ CallerID.buf = (PVOID)RemoteAddress; - CallerID.len = sizeof(RemoteAddress); + CallerID.len = sizeof(*RemoteAddress); /* Build Caller Data */ CallerData.buf = PendingData; @@ -985,7 +986,7 @@ if( SocketAddress ) { RtlCopyMemory (SocketAddress, &ListenReceiveData->Address.Address[0].AddressType, - sizeof(RemoteAddress)); + sizeof(*RemoteAddress)); if( *SocketAddressLength ) *SocketAddressLength = ListenReceiveData->Address.Address[0].AddressLength;

19 years, 9 months

[ion] 13942: Actual merge, sorry for the false alert. Merges with 13937.

by ion＠svn.reactos.com

Actual merge, sorry for the false alert. Merges with 13937. Modified: branches/alex_devel_branch/reactos/drivers/net/afd/afd/main.c Modified: branches/alex_devel_branch/reactos/drivers/net/afd/afd/read.c Modified: branches/alex_devel_branch/reactos/drivers/net/afd/include/afd.h Modified: branches/alex_devel_branch/reactos/include/win32k/text.h Added: branches/alex_devel_branch/reactos/lib/cpl/appwiz/Dk.rc Added: branches/alex_devel_branch/reactos/lib/cpl/appwiz/Ru.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/appwiz/appwiz.rc Added: branches/alex_devel_branch/reactos/lib/cpl/control/Dk.rc Added: branches/alex_devel_branch/reactos/lib/cpl/control/Ru.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/control/control.rc Added: branches/alex_devel_branch/reactos/lib/cpl/ncpa/dk.rc Added: branches/alex_devel_branch/reactos/lib/cpl/ncpa/en.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/ncpa/ncpa.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/sysdm/de.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/sysdm/en.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/sysdm/sysdm.rc Added: branches/alex_devel_branch/reactos/lib/cpl/timedate/Dk.rc Added: branches/alex_devel_branch/reactos/lib/cpl/timedate/Ru.rc Modified: branches/alex_devel_branch/reactos/lib/cpl/timedate/timedate.rc Modified: branches/alex_devel_branch/reactos/lib/kernel32/file/lock.c Modified: branches/alex_devel_branch/reactos/lib/msafd/misc/dllmain.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/device.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/keyboard.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/dib.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/text.c Modified: branches/alex_devel_branch/reactos/tools/Makefile Added: branches/alex_devel_branch/reactos/tools/tools-check.c Added: branches/alex_devel_branch/reactos/tools/tools-check.mak Modified: branches/alex_devel_branch/reactos/tools/unicode/Makefile Modified: branches/alex_devel_branch/reactos/tools/unicode/mbtowc.c Modified: branches/alex_devel_branch/reactos/tools/unicode/string.c Modified: branches/alex_devel_branch/reactos/tools/unicode/wctomb.c Modified: branches/alex_devel_branch/reactos/tools/widl/ChangeLog Modified: branches/alex_devel_branch/reactos/tools/widl/client.c Modified: branches/alex_devel_branch/reactos/tools/widl/header.c Modified: branches/alex_devel_branch/reactos/tools/widl/server.c Modified: branches/alex_devel_branch/reactos/tools/widl/widl.c Modified: branches/alex_devel_branch/reactos/tools/widl/widl.h Added: branches/alex_devel_branch/reactos/w32api/include/winres.h _____ Modified: branches/alex_devel_branch/reactos/drivers/net/afd/afd/main.c --- branches/alex_devel_branch/reactos/drivers/net/afd/afd/main.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/drivers/net/afd/afd/main.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -20,8 +20,8 @@ #ifdef DBG /* See debug.h for debug/trace constants */ -//DWORD DebugTraceLevel = DEBUG_ULTRA; -DWORD DebugTraceLevel = 0; +DWORD DebugTraceLevel = DEBUG_ULTRA; +//DWORD DebugTraceLevel = 0; #endif /* DBG */ _____ Modified: branches/alex_devel_branch/reactos/drivers/net/afd/afd/read.c --- branches/alex_devel_branch/reactos/drivers/net/afd/afd/read.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/drivers/net/afd/afd/read.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -26,8 +26,6 @@ #include "tdiconn.h" #include "debug.h" -static VOID ProcessClose( PAFD_FCB FCB ); - BOOLEAN CantReadMore( PAFD_FCB FCB ) { UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; @@ -106,7 +104,8 @@ if( Status == STATUS_SUCCESS ) { if( !FCB->ReceiveIrp.Iosb.Information ) { AFD_DbgPrint(MID_TRACE,("Looks like an EOF\n")); - ProcessClose( FCB ); + FCB->PollState |= AFD_EVENT_DISCONNECT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); } FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; } @@ -118,66 +117,40 @@ return STATUS_SUCCESS; } -static VOID ProcessClose( PAFD_FCB FCB ) { +NTSTATUS ReceiveActivity( PAFD_FCB FCB, PIRP Irp ) { PLIST_ENTRY NextIrpEntry; PIRP NextIrp; - - AFD_DbgPrint(MID_TRACE,("Socket shutdown from remote side\n")); - - /* Kill remaining recv irps */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%x)\n", - NextIrp, STATUS_END_OF_FILE)); - NextIrp->IoStatus.Status = STATUS_SUCCESS; - NextIrp->IoStatus.Information = 0; - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - - /* Handle closing signal */ - FCB->PollState |= AFD_EVENT_DISCONNECT | SOCKET_STATE_EOF_READ; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); -} - -NTSTATUS DDKAPI ReceiveComplete -( PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) { - NTSTATUS Status = Irp->IoStatus.Status; - PAFD_FCB FCB = (PAFD_FCB)Context; - PLIST_ENTRY NextIrpEntry; - PIRP NextIrp; PIO_STACK_LOCATION NextIrpSp; PAFD_RECV_INFO RecvReq; UINT TotalBytesCopied = 0; + NTSTATUS Status = STATUS_SUCCESS, RetStatus = STATUS_PENDING; - AFD_DbgPrint(MID_TRACE,("Called\n")); + AFD_DbgPrint(MID_TRACE,("%x %x\n", FCB, Irp)); - ASSERT_IRQL(APC_LEVEL); - - if( !SocketAcquireStateLock( FCB ) ) return Status; - - FCB->ReceiveIrp.InFlightRequest = NULL; - FCB->Recv.Content = Irp->IoStatus.Information; - FCB->Recv.BytesUsed = 0; - - if( FCB->State == SOCKET_STATE_CLOSED ) { - AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); - SocketStateUnlock( FCB ); - DestroySocket( FCB ); - return STATUS_SUCCESS; - } else if( FCB->State == SOCKET_STATE_LISTENING ) { - AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); - SocketStateUnlock( FCB ); - return STATUS_UNSUCCESSFUL; - } - - if( NT_SUCCESS(Irp->IoStatus.Status) && - Irp->IoStatus.Information ) { + if( CantReadMore( FCB ) ) { + /* Success here means that we got an EOF. Complete a pending read + * with zero bytes if we haven't yet overread, then kill the others. + */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + Status = NextIrp->IoStatus.Status = + FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; + NextIrp->IoStatus.Information = 0; + if( NextIrp == Irp ) RetStatus = Status; + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + FCB->Overread = TRUE; + } + } else { /* Kick the user that receive would be possible now */ /* XXX Not implemented yet */ @@ -214,31 +187,10 @@ RecvReq->BufferCount, FALSE ); NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = TotalBytesCopied; + if( NextIrp == Irp ) RetStatus = Status; IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } } - - Status = STATUS_SUCCESS; - } else { - /* Success here means that we got an EOF. Close all pending reads - * with EOF. Data won't have been available before. */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = 0; - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - ProcessClose( FCB ); } if( FCB->Recv.Content ) { @@ -248,10 +200,53 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); - SocketStateUnlock( FCB ); + AFD_DbgPrint(MID_TRACE,("RetStatus for irp %x is %x\n", Irp, RetStatus)); - if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; + return RetStatus; +} +NTSTATUS DDKAPI ReceiveComplete +( PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context ) { + NTSTATUS Status = Irp->IoStatus.Status; + PAFD_FCB FCB = (PAFD_FCB)Context; + + AFD_DbgPrint(MID_TRACE,("Called\n")); + + ASSERT_IRQL(APC_LEVEL); + + if( !SocketAcquireStateLock( FCB ) ) return Status; + + FCB->ReceiveIrp.InFlightRequest = NULL; + FCB->Recv.Content = Irp->IoStatus.Information; + FCB->Recv.BytesUsed = 0; + + if( FCB->State == SOCKET_STATE_CLOSED ) { + AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); + SocketStateUnlock( FCB ); + DestroySocket( FCB ); + return STATUS_SUCCESS; + } else if( FCB->State == SOCKET_STATE_LISTENING ) { + AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); + SocketStateUnlock( FCB ); + return STATUS_UNSUCCESSFUL; + } + + Status = FCB->ReceiveIrp.Iosb.Status; + + if( Irp->IoStatus.Status == STATUS_SUCCESS && + Irp->IoStatus.Information == 0 ) { + AFD_DbgPrint(MID_TRACE,("Looks like an EOF\n")); + FCB->PollState |= AFD_EVENT_DISCONNECT; + } + + ReceiveActivity( FCB, NULL ); + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + + SocketStateUnlock( FCB ); + AFD_DbgPrint(MID_TRACE,("Returned %x\n", Status)); return Status; @@ -274,7 +269,8 @@ FCB->State != SOCKET_STATE_CONNECTING ) { AFD_DbgPrint(MID_TRACE,("Called recv on wrong kind of socket (s%x)\n", FCB->State)); - return STATUS_UNSUCCESSFUL; + return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, + Irp, 0, NULL, FALSE ); } if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) @@ -291,57 +287,40 @@ return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL, FALSE ); + AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); + RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, NULL, NULL, TRUE, FALSE ); - /* Check if we're not closed down yet */ + Irp->IoStatus.Status = STATUS_PENDING; + Irp->IoStatus.Information = 0; - if( !CantReadMore(FCB) ) { - AFD_DbgPrint(MID_TRACE,("Not EOF yet\n")); - if( FCB->ReceiveIrp.InFlightRequest ) { - AFD_DbgPrint(MID_TRACE,("We're waiting on a previous irp\n")); - Status = STATUS_PENDING; - } else { - AFD_DbgPrint(MID_TRACE,("The buffer is likely not empty\n")); - Status = STATUS_SUCCESS; - } - } else { - if( FCB->PollState & SOCKET_STATE_EOF_READ ) - Status = STATUS_END_OF_FILE; - else - Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("EOF Happened already\n")); - FCB->Recv.Content = 0; - FCB->Recv.BytesUsed = 0; + InsertTailList( &FCB->PendingIrpList[FUNCTION_RECV], + &Irp->Tail.Overlay.ListEntry ); - ProcessClose( FCB ); + /************ From this point, the IRP is not ours ************/ - return UnlockAndMaybeComplete - ( FCB, Status, Irp, 0, NULL, FALSE); - } - - if( NT_SUCCESS(Status) ) { - AFD_DbgPrint(MID_TRACE,("TryToSatisfy\n")); - Status = TryToSatisfyRecvRequestFromBuffer - ( FCB, RecvReq, &TotalBytesCopied ); - } + Status = ReceiveActivity( FCB, Irp ); - if( Status != STATUS_PENDING || RecvReq->AfdFlags & AFD_IMMEDIATE ) { - if( Status == STATUS_PENDING ) { - AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); - Status = STATUS_CANT_WAIT; - TotalBytesCopied = 0; - } - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, FALSE ); - return UnlockAndMaybeComplete( FCB, Status, Irp, - TotalBytesCopied, NULL, TRUE ); - } else { + if( Status == STATUS_PENDING && RecvReq->AfdFlags & AFD_IMMEDIATE ) { + AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + Status = STATUS_CANT_WAIT; + TotalBytesCopied = 0; + RemoveEntryList( &Irp->Tail.Overlay.ListEntry ); + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, FALSE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, + TotalBytesCopied, NULL, TRUE ); + } else if( Status == STATUS_PENDING ) { AFD_DbgPrint(MID_TRACE,("Leaving read irp\n")); - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); + IoMarkIrpPending( Irp ); + } else { + AFD_DbgPrint(MID_TRACE,("Completed with status %x\n", Status)); } + + SocketStateUnlock( FCB ); + return Status; } _____ Modified: branches/alex_devel_branch/reactos/drivers/net/afd/include/afd.h --- branches/alex_devel_branch/reactos/drivers/net/afd/include/afd.h 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/drivers/net/afd/include/afd.h 2005-03-11 23:56:02 UTC (rev 13942) @@ -132,7 +132,7 @@ } AFD_STORED_DATAGRAM, *PAFD_STORED_DATAGRAM; typedef struct _AFD_FCB { - BOOLEAN Locked, Critical; + BOOLEAN Locked, Critical, Overread; UINT State, Flags; KIRQL OldIrql; UINT LockCount; _____ Modified: branches/alex_devel_branch/reactos/include/win32k/text.h --- branches/alex_devel_branch/reactos/include/win32k/text.h 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/include/win32k/text.h 2005-03-11 23:56:02 UTC (rev 13942) @@ -7,6 +7,7 @@ { LOGFONTW logfont; FONTOBJ *Font; + BOOLEAN Initialized; /* Don't reinitialize for each DC */ } TEXTOBJ, *PTEXTOBJ; /* Internal interface */ _____ Copied: branches/alex_devel_branch/reactos/lib/cpl/appwiz/Dk.rc (from rev 13936, trunk/reactos/lib/cpl/appwiz/Dk.rc) Property changes on: branches/alex_devel_branch/reactos/lib/cpl/appwiz/Dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: branches/alex_devel_branch/reactos/lib/cpl/appwiz/Ru.rc (from rev 13936, trunk/reactos/lib/cpl/appwiz/Ru.rc) _____ Modified: branches/alex_devel_branch/reactos/lib/cpl/appwiz/appwiz.rc --- branches/alex_devel_branch/reactos/lib/cpl/appwiz/appwiz.rc 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/lib/cpl/appwiz/appwiz.rc 2005-03-11 23:56:02 UTC (rev 13942) @@ -27,3 +27,6 @@ #include "En.rc" #include "De.rc" +#include "Dk.rc" +#include "Ru.rc" + _____ Copied: branches/alex_devel_branch/reactos/lib/cpl/control/Dk.rc (from rev 13936, trunk/reactos/lib/cpl/control/Dk.rc) Property changes on: branches/alex_devel_branch/reactos/lib/cpl/control/Dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: branches/alex_devel_branch/reactos/lib/cpl/control/Ru.rc (from rev 13936, trunk/reactos/lib/cpl/control/Ru.rc) _____ Modified: branches/alex_devel_branch/reactos/lib/cpl/control/control.rc --- branches/alex_devel_branch/reactos/lib/cpl/control/control.rc 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/lib/cpl/control/control.rc 2005-03-11 23:56:02 UTC (rev 13942) @@ -17,9 +17,7 @@ #include <../../../include/reactos/version.rc> #endif -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - //////////////////////////////////////////////////////////////////////// ///// // // Icon @@ -39,7 +37,5 @@ #include "En.rc" #include "De.rc" - - - - +#include "Dk.rc" +#include "Ru.rc" _____ Copied: branches/alex_devel_branch/reactos/lib/cpl/ncpa/dk.rc (from rev 13936, trunk/reactos/lib/cpl/ncpa/dk.rc) Property changes on: branches/alex_devel_branch/reactos/lib/cpl/ncpa/dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: branches/alex_devel_branch/reactos/lib/cpl/ncpa/en.rc (from rev 13936, trunk/reactos/lib/cpl/ncpa/en.rc) Property changes on: branches/alex_devel_branch/reactos/lib/cpl/ncpa/en.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: branches/alex_devel_branch/reactos/lib/cpl/ncpa/ncpa.rc --- branches/alex_devel_branch/reactos/lib/cpl/ncpa/ncpa.rc 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/lib/cpl/ncpa/ncpa.rc 2005-03-11 23:56:02 UTC (rev 13942) @@ -17,95 +17,10 @@ #include <reactos/version.rc> #endif -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_HORIZONTAL ICON "resources/HORIZ.ICO" IDI_VERTICAL ICON "resources/VERTIC.ICO" IDI_NETSTAT ICON "resources/NETCONN.ICO" -IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Network Adapters",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Add",IDC_ADD,9,100,60,14 - PUSHBUTTON "&Remove",IDC_REMOVE,72,100,60,14 - PUSHBUTTON "&Properties",IDC_PROPERTIES,179,100,60,14 -END - -IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Connect Using:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP - PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 - LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD - PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 - GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP -END - - -IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Connection", -1, 9, 8, 182, 58, BS_GROUPBOX - LTEXT "Status:", -1, 19, 20, 60, 8 - LTEXT "Duration:", -1, 19, 34, 60, 8 - LTEXT "Speed:", -1, 19, 48, 60, 8 - GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX - RTEXT "Sent", -1, 26, 90, 60, 8 - ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 - ICON IDI_NETSTAT, -1, 110, 85, 18, 20 - ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 - LTEXT "Received", -1, 149, 90, 37, 8 - LTEXT "Packets:", -1, 17, 115, 32, 8 - RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - ICON IDI_VERTICAL, -1, 110, 108, 18, 20 - RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Properties", IDC_PROPERTIES, 10, 150, 50, 14 - PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14 -END - -IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 -STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 228, 27 - CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 - GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX - CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 - LTEXT "IP address:", -1, 14, 75, 135, 8 - CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 - LTEXT "Subnet mask:", -1, 14, 90, 135, 8 - CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 - LTEXT "Default gateway:", -1, 14, 105, 135, 8 - CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 - CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 - GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX - CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 - LTEXT "Preferred DNS server:", -1, 14, 171, 135, 8 - CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 - LTEXT "Alternate DNS server:", -1, 14, 186, 135, 8 - CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 - PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP -} - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Network Properties" - IDS_CPLSYSTEMDESCRIPTION "Customizes network settings." -END +#include "en.rc" +#include "dk.rc" _____ Modified: branches/alex_devel_branch/reactos/lib/cpl/sysdm/de.rc --- branches/alex_devel_branch/reactos/lib/cpl/sysdm/de.rc 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/lib/cpl/sysdm/de.rc 2005-03-11 23:56:02 UTC (rev 13942) @@ -1,9 +1,5 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -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 "Allgemein" _____ Modified: branches/alex_devel_branch/reactos/lib/cpl/sysdm/en.rc --- branches/alex_devel_branch/reactos/lib/cpl/sysdm/en.rc 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/lib/cpl/sysdm/en.rc 2005-03-11 23:56:02 UTC (rev 13942) @@ -1,7 +1,5 @@ LANGUAGE LANG_ENGLISH, 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 _____ Modified: branches/alex_devel_branch/reactos/lib/cpl/sysdm/sysdm.rc --- branches/alex_devel_branch/reactos/lib/cpl/sysdm/sysdm.rc 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/lib/cpl/sysdm/sysdm.rc 2005-03-11 23:56:02 UTC (rev 13942) @@ -14,7 +14,9 @@ #define REACTOS_STR_ORIGINAL_FILENAME "sysdm.cpl\0" #include <reactos/version.rc> +IDI_CPLSYSTEM ICON "resources/applet.ico" +IDI_DEVMGR ICON "resources/devmgr.ico" #include "en.rc" #include "de.rc" - +#include "dk.rc" _____ Copied: branches/alex_devel_branch/reactos/lib/cpl/timedate/Dk.rc (from rev 13936, trunk/reactos/lib/cpl/timedate/Dk.rc) Property changes on: branches/alex_devel_branch/reactos/lib/cpl/timedate/Dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: branches/alex_devel_branch/reactos/lib/cpl/timedate/Ru.rc (from rev 13936, trunk/reactos/lib/cpl/timedate/Ru.rc) _____ Modified: branches/alex_devel_branch/reactos/lib/cpl/timedate/timedate.rc --- branches/alex_devel_branch/reactos/lib/cpl/timedate/timedate.rc 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/lib/cpl/timedate/timedate.rc 2005-03-11 23:56:02 UTC (rev 13942) @@ -19,5 +19,7 @@ #include "En.rc" #include "De.rc" +#include "Dk.rc" #include "Es.rc" #include "Fr.rc" +#include "Ru.rc" _____ Modified: branches/alex_devel_branch/reactos/lib/kernel32/file/lock.c --- branches/alex_devel_branch/reactos/lib/kernel32/file/lock.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/lib/kernel32/file/lock.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -39,6 +39,7 @@ Overlapped.Offset = dwFileOffsetLow; Overlapped.OffsetHigh = dwFileOffsetHigh; + Overlapped.hEvent = NULL; dwReserved = 0; return LockFileEx(hFile, LOCKFILE_FAIL_IMMEDIATELY|LOCKFILE_EXCLUSIVE_LOCK,dwReserved,nNumberOfBy tesToLockLow, nNumberOfBytesToLockHigh, &Overlapped ) ; @@ -57,7 +58,7 @@ DWORD dwReserved, DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh, - LPOVERLAPPED lpOverlapped + LPOVERLAPPED lpOverlapped /* required! */ ) { LARGE_INTEGER BytesToLock; @@ -66,7 +67,7 @@ NTSTATUS errCode; LARGE_INTEGER Offset; - if(dwReserved != 0) + if(dwReserved != 0 || lpOverlapped==NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -91,9 +92,9 @@ BytesToLock.u.HighPart = nNumberOfBytesToLockHigh; errCode = NtLockFile(hFile, + lpOverlapped->hEvent, NULL, NULL, - NULL, (PIO_STATUS_BLOCK)lpOverlapped, &Offset, &BytesToLock, @@ -124,13 +125,13 @@ DWORD nNumberOfBytesToUnlockHigh ) { - DWORD dwReserved; OVERLAPPED Overlapped; + DWORD dwReserved; Overlapped.Offset = dwFileOffsetLow; Overlapped.OffsetHigh = dwFileOffsetHigh; - dwReserved = 0; - return UnlockFileEx(hFile, dwReserved, nNumberOfBytesToUnlockLow, nNumberOfBytesToUnlockHigh, &Overlapped); - + dwReserved = 0; + + return UnlockFileEx(hFile, dwReserved, nNumberOfBytesToUnlockLow, nNumberOfBytesToUnlockHigh, &Overlapped); } @@ -144,23 +145,18 @@ DWORD dwReserved, DWORD nNumberOfBytesToUnLockLow, DWORD nNumberOfBytesToUnLockHigh, - LPOVERLAPPED lpOverlapped + LPOVERLAPPED lpOverlapped /* required! */ ) { LARGE_INTEGER BytesToUnLock; LARGE_INTEGER StartAddress; NTSTATUS errCode; - if(dwReserved != 0) + if(dwReserved != 0 || lpOverlapped == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if ( lpOverlapped == NULL ) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } BytesToUnLock.u.LowPart = nNumberOfBytesToUnLockLow; BytesToUnLock.u.HighPart = nNumberOfBytesToUnLockHigh; _____ Modified: branches/alex_devel_branch/reactos/lib/msafd/misc/dllmain.c --- branches/alex_devel_branch/reactos/lib/msafd/misc/dllmain.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/lib/msafd/misc/dllmain.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -1285,6 +1285,7 @@ RtlCopyMemory (Name->sa_data, SocketAddress->Address[0].Address, SocketAddress->Address[0].AddressLength); + *NameLength = 2 + SocketAddress->Address[0].AddressLength; HeapFree(GlobalHeap, 0, TdiAddress); return 0; } else { _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/device.c --- branches/alex_devel_branch/reactos/ntoskrnl/io/device.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/ntoskrnl/io/device.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -124,7 +124,7 @@ ObjectBody, Parent, RemainingPath); if (RemainingPath != NULL && wcschr(RemainingPath + 1, '\\') != NULL) - return STATUS_UNSUCCESSFUL; + return STATUS_OBJECT_PATH_NOT_FOUND; return STATUS_SUCCESS; } @@ -166,8 +166,11 @@ OUT PDEVICE_OBJECT *AttachedToDeviceObject ) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + /* FIXME: IoAttachDeviceToDeviceStackSafe must not call + * IoAttachDeviceToDeviceStack, but the other way around! */ + DPRINT1("IoAttachDeviceToDeviceStackSafe() badly implemented!\n"); + *AttachedToDeviceObject = IoAttachDeviceToDeviceStack(SourceDevice, TargetDevice); + return STATUS_SUCCESS; } /* _____ Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/keyboard.c --- branches/alex_devel_branch/reactos/subsys/win32k/ntuser/keyboard.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/subsys/win32k/ntuser/keyboard.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -216,7 +216,7 @@ PVK_TO_WCHAR_TABLE vtwTbl; PVK_TO_WCHARS10 vkPtr; size_t size_this_entry; - int nMod, shift; + int nMod; DWORD CapsMod = 0, CapsState = 0; CapsState = ModBits & ~MOD_BITS_MASK; @@ -228,8 +228,6 @@ { return FALSE; } - shift = keyLayout->pCharModifiers->ModNumber[ModBits]; - for (nMod = 0; keyLayout->pVkToWcharTable[nMod].nModifications; nMod++) { vtwTbl = &keyLayout->pVkToWcharTable[nMod]; @@ -239,9 +237,10 @@ { if( wVirtKey == (vkPtr->VirtualKey & 0xff) ) { - CapsMod = - shift | ((CapsState & CAPITAL_BIT) ? vkPtr->Attributes : 0); - + CapsMod = keyLayout->pCharModifiers->ModNumber + [ModBits ^ + ((CapsState & CAPITAL_BIT) ? vkPtr->Attributes : 0)]; + if( CapsMod > keyLayout->pVkToWcharTable[nMod].nModifications ) { DWORD MaxBit = 1; while( MaxBit < @@ -256,9 +255,9 @@ *pbLigature = vkPtr->wch[CapsMod] == WCH_LGTR; *pwcTranslatedChar = vkPtr->wch[CapsMod]; - DPRINT("%d %04x: CapsMod %08x CapsState %08x shift %08x Char %04x\n", + DPRINT("%d %04x: CapsMod %08x CapsState %08x Char %04x\n", nMod, wVirtKey, - CapsMod, CapsState, shift, *pwcTranslatedChar); + CapsMod, CapsState, *pwcTranslatedChar); if( *pbDead ) { @@ -269,7 +268,7 @@ DPRINT( "VK: %04x, ADDR: %08x\n", wVirtKey, (int)vkPtr ); return FALSE; } - *pwcTranslatedChar = vkPtr->wch[shift]; + *pwcTranslatedChar = vkPtr->wch[CapsMod]; } return TRUE; } _____ Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/dib.c --- branches/alex_devel_branch/reactos/subsys/win32k/objects/dib.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/subsys/win32k/objects/dib.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -883,8 +883,15 @@ if(bi->biBitCount == 4) { Entries = 16; } else if(bi->biBitCount == 8) { Entries = 256; } - bmp->ColorMap = ExAllocatePoolWithTag(PagedPool, sizeof(RGBQUAD)*Entries, TAG_COLORMAP); - RtlCopyMemory(bmp->ColorMap, bmi->bmiColors, sizeof(RGBQUAD)*Entries); + if (Entries) + { + bmp->ColorMap = ExAllocatePoolWithTag(PagedPool, sizeof(RGBQUAD)*Entries, TAG_COLORMAP); + RtlCopyMemory(bmp->ColorMap, bmi->bmiColors, sizeof(RGBQUAD)*Entries); + } + else + { + bmp->ColorMap = NULL; + } } // Clean up in case of errors _____ Modified: branches/alex_devel_branch/reactos/subsys/win32k/objects/text.c --- branches/alex_devel_branch/reactos/subsys/win32k/objects/text.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/subsys/win32k/objects/text.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -2971,6 +2971,12 @@ return STATUS_INVALID_HANDLE; } + if (TextObj->Initialized) + { + TEXTOBJ_UnlockText(FontHandle); + return STATUS_SUCCESS; + } + if (! RtlCreateUnicodeString(&FaceName, TextObj->logfont.lfFaceName)) { TEXTOBJ_UnlockText(FontHandle); @@ -3003,6 +3009,7 @@ } else { + TextObj->Initialized = TRUE; Status = STATUS_SUCCESS; } _____ Modified: branches/alex_devel_branch/reactos/tools/Makefile --- branches/alex_devel_branch/reactos/tools/Makefile 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/tools/Makefile 2005-03-11 23:56:02 UTC (rev 13942) @@ -18,12 +18,15 @@ LIBS = lib_unicode lib_wpp -CLEAN_FILES = $(TOOLS) +CLEAN_FILES = $(TOOLS) tools-check.tmp tools-check.h -all: $(TOOLS) $(LIBS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target \ +all: $(TOOLS) tools_check $(LIBS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target \ wine2ros_target pipetools_target winebuild_target bin2res_target wrc_target widl_target \ buildno_target +tools_check: + $(MAKE) -f tools-check.mak + regtests$(EXE_POSTFIX): regtests.c @$(HOST_CC) $(CFLAGS) -o regtests$(EXE_POSTFIX) regtests.c _____ Copied: branches/alex_devel_branch/reactos/tools/tools-check.c (from rev 13936, trunk/reactos/tools/tools-check.c) _____ Copied: branches/alex_devel_branch/reactos/tools/tools-check.mak (from rev 13936, trunk/reactos/tools/tools-check.mak) _____ Modified: branches/alex_devel_branch/reactos/tools/unicode/Makefile --- branches/alex_devel_branch/reactos/tools/unicode/Makefile 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/tools/unicode/Makefile 2005-03-11 23:56:02 UTC (rev 13942) @@ -8,7 +8,7 @@ TARGET_CFLAGS = -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -I$(PATH_TO_TOP)/include/wine + -I$(PATH_TO_TOP)/include/wine -Wall -Werror CODEPAGES = \ 037 \ _____ Modified: branches/alex_devel_branch/reactos/tools/unicode/mbtowc.c --- branches/alex_devel_branch/reactos/tools/unicode/mbtowc.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/tools/unicode/mbtowc.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -22,6 +22,8 @@ #include "wine/unicode.h" +typedef unsigned char uchar; + /* get the decomposition of a Unicode char */ int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen ) { @@ -256,25 +258,25 @@ { if (flags & MB_ERR_INVALID_CHARS) { - if (check_invalid_chars_sbcs( &table->sbcs, src, srclen )) return -2; + if (check_invalid_chars_sbcs( &table->sbcs, (const uchar*)src, srclen )) return -2; } if (!(flags & MB_COMPOSITE)) { if (!dstlen) return srclen; - return mbstowcs_sbcs( &table->sbcs, src, srclen, dst, dstlen ); + return mbstowcs_sbcs( &table->sbcs, (const uchar*)src, srclen, dst, dstlen ); } - return mbstowcs_sbcs_decompose( &table->sbcs, src, srclen, dst, dstlen ); + return mbstowcs_sbcs_decompose( &table->sbcs, (const uchar*)src, srclen, dst, dstlen ); } else /* mbcs */ { if (flags & MB_ERR_INVALID_CHARS) { - if (check_invalid_chars_dbcs( &table->dbcs, src, srclen )) return -2; + if (check_invalid_chars_dbcs( &table->dbcs, (const uchar*)src, srclen )) return -2; } if (!(flags & MB_COMPOSITE)) - return mbstowcs_dbcs( &table->dbcs, src, srclen, dst, dstlen ); + return mbstowcs_dbcs( &table->dbcs, (const uchar*)src, srclen, dst, dstlen ); else - return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen ); + return mbstowcs_dbcs_decompose( &table->dbcs, (const uchar*)src, srclen, dst, dstlen ); } } _____ Modified: branches/alex_devel_branch/reactos/tools/unicode/string.c --- branches/alex_devel_branch/reactos/tools/unicode/string.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/tools/unicode/string.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -20,6 +20,7 @@ #include <limits.h> #include <stdio.h> +#include <ctype.h> #include "wine/unicode.h" _____ Modified: branches/alex_devel_branch/reactos/tools/unicode/wctomb.c --- branches/alex_devel_branch/reactos/tools/unicode/wctomb.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/tools/unicode/wctomb.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -196,7 +196,7 @@ int tmp; WCHAR composed; - if (!defchar) defchar = &table_default; + if (!defchar) defchar = (const char*)&table_default; if (!used) used = &tmp; /* avoid checking on every char */ *used = 0; _____ Modified: branches/alex_devel_branch/reactos/tools/widl/ChangeLog --- branches/alex_devel_branch/reactos/tools/widl/ChangeLog 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/tools/widl/ChangeLog 2005-03-11 23:56:02 UTC (rev 13942) @@ -1,5 +1,16 @@ ChangeLog +2005-03-10 ekohl + + tools/widl/client.c + tools/widl/header.c + tools/widl/server.c + tools/widl/widl.c + tools/widl/widl.h + +Implement '-o' option. This is equivalent to MIDLs '/oldnames' option. + + 2005-03-06 ekohl tools/widl/client.c @@ -20,13 +31,13 @@ tools/widl/typelib.c Merge in Winehq changes to reduce noise. - + tools/widl/server.h tools/widl/client.h tools/widl/proxy.h -Deleted unneeded headers. - +Deleted unneeded headers. + 2005-02-26 ekohl tools/widl/server.c _____ Modified: branches/alex_devel_branch/reactos/tools/widl/client.c --- branches/alex_devel_branch/reactos/tools/widl/client.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/tools/widl/client.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -672,8 +672,12 @@ print_client("0,\n"); indent--; print_client("};\n"); - print_client("RPC_IF_HANDLE %s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", - iface->name, LOWORD(ver), HIWORD(ver), iface->name); + if (old_names) + print_client("RPC_IF_HANDLE %s_ClientIfHandle = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + iface->name, iface->name); + else + print_client("RPC_IF_HANDLE %s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + iface->name, LOWORD(ver), HIWORD(ver), iface->name); fprintf(client, "\n"); } _____ Modified: branches/alex_devel_branch/reactos/tools/widl/header.c --- branches/alex_devel_branch/reactos/tools/widl/header.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/tools/widl/header.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -851,8 +851,16 @@ { fprintf(header, "extern handle_t %s;\n", var); } - fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); - fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + if (old_names) + { + fprintf(header, "extern RPC_IF_HANDLE %s_ClientIfHandle;\n", iface->name); + fprintf(header, "extern RPC_IF_HANDLE %s_ServerIfHandle;\n", iface->name); + } + else + { + fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + } write_function_proto(iface); fprintf(header, "\n"); _____ Modified: branches/alex_devel_branch/reactos/tools/widl/server.c --- branches/alex_devel_branch/reactos/tools/widl/server.c 2005-03-11 23:38:59 UTC (rev 13941) +++ branches/alex_devel_branch/reactos/tools/widl/server.c 2005-03-11 23:56:02 UTC (rev 13942) @@ -677,8 +677,12 @@ print_server("0,\n"); indent--; print_server("};\n"); - print_server("RPC_IF_HANDLE %s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", - iface->name, LOWORD(ver), HIWORD(ver), iface->name); + if (old_names) + print_server("RPC_IF_HANDLE %s_ServerIfHandle = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + iface->name, iface->name); + else + print_server("RPC_IF_HANDLE %s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + iface->name, LOWORD(ver), HIWORD(ver), iface->name); fprintf(server, "\n"); } _____ Modified: branches/alex_devel_branch/reactos/tools/widl/widl.c [truncated at 1000 lines; 75 more skipped]

19 years, 9 months

[navaraf] 13941: Alex Ionescu <ionucu@videotron.ca>

by navaraf＠svn.reactos.com

Alex Ionescu <ionucu(a)videotron.ca> Relocate kernel if the /3GB switch is supplied in kernel parameters. Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c --- trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-03-11 23:13:03 UTC (rev 13940) +++ trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-03-11 23:38:59 UTC (rev 13941) @@ -164,9 +164,7 @@ /* Re-initalize EFLAGS */ Ke386EraseFlags(); - /* Get Kernel Base and Set MmSystemRangeStart */ - FrLdrGetKernelBase(); - + /* Get the PAE Mode */ FrLdrGetPaeMode(); /* Initialize the page directory */ @@ -531,6 +529,14 @@ ULONG_PTR TargetSection; ULONG SectionSize; LONG i; + PIMAGE_DATA_DIRECTORY RelocationDDir; + PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd; + ULONG Count; + ULONG_PTR Address, MaxAddress; + PUSHORT TypeOffset; + ULONG_PTR Delta; + PUSHORT ShortPtr; + PULONG LongPtr; /* Allocate 1024 bytes for PE Header */ ImageHeader = (PIMAGE_DOS_HEADER)MmAllocateMemory(1024); @@ -552,8 +558,9 @@ /* Now read the MZ header to get the offset to the PE Header */ NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)ImageHeader + ImageHeader->e_lfanew); - /* Save the Image Base */ - KernelBase = NtHeader->OptionalHeader.ImageBase; + /* Get Kernel Base */ + KernelBase = NtHeader->OptionalHeader.ImageBase; + FrLdrGetKernelBase(); /* Save Entrypoint */ KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); @@ -603,10 +610,65 @@ Section->Misc.VirtualSize - Section->SizeOfRawData); } } + + /* Get the Relocation Data Directory */ + RelocationDDir = &NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC] ; - /* Now relocate the file */ - /* FIXME: ADD RELOC CODE */ + /* Get the Relocation Section Start and End*/ + RelocationDir = (PIMAGE_BASE_RELOCATION)(KERNEL_BASE_PHYS + RelocationDDir->VirtualAddress); + RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size); + + /* Calculate Difference between Real Base and Compiled Base*/ + Delta = KernelBase - NtHeader->OptionalHeader.ImageBase;; + /* Determine how far we shoudl relocate */ + MaxAddress = KERNEL_BASE_PHYS + ImageSize; + + /* Relocate until we've processed all the blocks */ + while (RelocationDir < RelocationEnd && RelocationDir->SizeOfBlock > 0) { + + /* See how many Relocation Blocks we have */ + Count = (RelocationDir->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof(USHORT); + + /* Calculate the Address of this Directory */ + Address = KERNEL_BASE_PHYS + RelocationDir->VirtualAddress; + + /* Calculate the Offset of the Type */ + TypeOffset = (PUSHORT)(RelocationDir + 1); + + for (i = 0; i < Count; i++) { + + ShortPtr = (PUSHORT)(Address + (*TypeOffset & 0xFFF)); + + /* Don't relocate after the end of the loaded driver */ + if ((ULONG_PTR)ShortPtr >= MaxAddress) break; + + switch (*TypeOffset >> 12) { + + case IMAGE_REL_BASED_ABSOLUTE: + break; + + case IMAGE_REL_BASED_HIGH: + *ShortPtr += HIWORD(Delta); + break; + + case IMAGE_REL_BASED_LOW: + *ShortPtr += LOWORD(Delta); + break; + + case IMAGE_REL_BASED_HIGHLOW: + LongPtr = (PULONG)ShortPtr; + *LongPtr += Delta; + break; + } + + TypeOffset++; + } + + /* Move to the next Relocation Table */ + RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDir->SizeOfBlock); + } + /* Increase the next Load Base */ NextModuleBase = ROUND_UP(KERNEL_BASE_PHYS + ImageSize, PAGE_SIZE);

19 years, 9 months

[royce] 13940: fix case bug with wpp's makefile

by royce＠svn.reactos.com

fix case bug with wpp's makefile Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Deleted: branches/xmlbuildsystem/reactos/tools/wpp/Makefile Added: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-11 23:09:59 UTC (rev 13939) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-11 23:13:03 UTC (rev 13940) @@ -61,5 +61,5 @@ include tools/rbuild/makefile include tools/unicode/makefile include tools/wmc/makefile -include tools/wpp/makefile +include tools/wpp/wpp.mak include tools/wrc/makefile _____ Deleted: branches/xmlbuildsystem/reactos/tools/wpp/Makefile --- branches/xmlbuildsystem/reactos/tools/wpp/Makefile 2005-03-11 23:09:59 UTC (rev 13939) +++ branches/xmlbuildsystem/reactos/tools/wpp/Makefile 2005-03-11 23:13:03 UTC (rev 13940) @@ -1,28 +0,0 @@ -WPP_BASE = tools$(SEP)wpp - -WPP_TARGET = \ - $(ROS_INTERMEDIATE)$(WPP_BASE)$(SEP)libwpp.a - -WPP_SOURCES = \ - $(WPP_BASE)$(SEP)lex.yy.c \ - $(WPP_BASE)$(SEP)preproc.c \ - $(WPP_BASE)$(SEP)wpp.c \ - $(WPP_BASE)$(SEP)wpp.tab.c - -WPP_OBJECTS = \ - $(WPP_SOURCES:.c=.o) - -WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude -Iinclude/wine -g - -$(WPP_TARGET): $(WPP_OBJECTS) - $(ECHO_AR) - ${host_ar} -rc $(WPP_TARGET) $(WPP_OBJECTS) - -$(WPP_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ - -.PHONY: wpp_clean -wpp_clean: - -@$(rm) $(WPP_TARGET) $(WPP_OBJECTS) 2>$(NUL) -clean: wpp_clean _____ Copied: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak (from rev 13915, branches/xmlbuildsystem/reactos/tools/wpp/Makefile)

19 years, 9 months

[ion] 13939: Final merge with 13934

by ion＠svn.reactos.com

Final merge with 13934 Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/init.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/po.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/device.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/file.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/po/power.c _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/init.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/init.c 2005-03-11 23:06:43 UTC (rev 13938) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/init.c 2005-03-11 23:09:59 UTC (rev 13939) @@ -305,7 +305,10 @@ inline VOID STDCALL -ParseCommandLine(PULONG MaxMem, PBOOLEAN NoGuiBoot, PBOOLEAN BootLog) +ParseCommandLine(PULONG MaxMem, + PBOOLEAN NoGuiBoot, + PBOOLEAN BootLog, + PBOOLEAN ForceAcpiDisable) { PCHAR p1, p2; @@ -356,6 +359,10 @@ p2 += 7; *BootLog = TRUE; + } else if (!_strnicmp(p2, "NOACPI", 6)) { + + p2 += 6; + *ForceAcpiDisable = TRUE; } p1 = p2; @@ -375,6 +382,7 @@ BOOLEAN BootLog = FALSE; ULONG MaxMem = 0; BOOLEAN SetupBoot = TRUE; + BOOLEAN ForceAcpiDisable = FALSE; LARGE_INTEGER Timeout; HANDLE ProcessHandle; HANDLE ThreadHandle; @@ -396,7 +404,7 @@ NtEarlyInitVdm(); /* Parse Command Line Settings */ - ParseCommandLine(&MaxMem, &NoGuiBoot, &BootLog); + ParseCommandLine(&MaxMem, &NoGuiBoot, &BootLog, &ForceAcpiDisable); /* Initialize Kernel Memory Address Space */ MmInit1(FirstKrnlPhysAddr, @@ -507,7 +515,7 @@ IoInit(); /* TBD */ - PoInit(); + PoInit((PLOADER_PARAMETER_BLOCK)&KeLoaderBlock, ForceAcpiDisable); /* Initialize the Registry (Hives are NOT yet loaded!) */ CmInitializeRegistry(); _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/po.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/po.h 2005-03-11 23:06:43 UTC (rev 13938) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/po.h 2005-03-11 23:09:59 UTC (rev 13939) @@ -18,7 +18,7 @@ extern PDEVICE_NODE PopSystemPowerDeviceNode; VOID -PoInit(VOID); +PoInit(PLOADER_PARAMETER_BLOCK LoaderBlock, BOOLEAN ForceAcpiDisable); NTSTATUS PopSetSystemPowerState( _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/device.c --- branches/alex_devel_branch/reactos/ntoskrnl/io/device.c 2005-03-11 23:06:43 UTC (rev 13938) +++ branches/alex_devel_branch/reactos/ntoskrnl/io/device.c 2005-03-11 23:09:59 UTC (rev 13939) @@ -244,17 +244,41 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL -IoGetDiskDeviceObject( - IN PDEVICE_OBJECT FileSystemDeviceObject, - OUT PDEVICE_OBJECT *DiskDeviceObject - ) +IoGetDiskDeviceObject(IN PDEVICE_OBJECT FileSystemDeviceObject, + OUT PDEVICE_OBJECT *DiskDeviceObject) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +#if 0 + PDEVOBJ_EXTENSION DeviceExtension; + PVPB Vpb; + KIRQL OldIrql; + + /* Make sure there's a VPB */ + if (!FileSystemDeviceObject->Vpb) return STATUS_INVALID_PARAMETER; + + /* Acquire it */ + IoAcquireVpbSpinLock(&OldIrql); + + /* Get the Device Extension */ + DeviceExtension = FileSystemDeviceObject->DeviceObjectExtension; + + /* Make sure this one has a VPB too */ + Vpb = DeviceExtension->Vpb; + if (!Vpb) return STATUS_INVALID_PARAMETER; + + /* Make sure someone it's mounted */ + if ((!Vpb->ReferenceCount) || (Vpb->Flags & VPB_MOUNTED)) return STATUS_VOLUME_DISMOUNTED; + + /* Return the Disk Device Object */ + *DiskDeviceObject = Vpb->RealDevice; + + /* Release the lock */ + IoReleaseVpbSpinLock(OldIrql); +#endif + return STATUS_SUCCESS; } /* _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/file.c --- branches/alex_devel_branch/reactos/ntoskrnl/io/file.c 2005-03-11 23:06:43 UTC (rev 13938) +++ branches/alex_devel_branch/reactos/ntoskrnl/io/file.c 2005-03-11 23:09:59 UTC (rev 13939) @@ -265,16 +265,16 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN STDCALL -IoIsFileOriginRemote( - IN PFILE_OBJECT FileObject - ) +IoIsFileOriginRemote(IN PFILE_OBJECT FileObject) { - UNIMPLEMENTED; - return FALSE; +#if 0 + return (FileObject->Flags & FO_REMOTE_ORIGIN); +#endif + return FALSE; } /* _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/po/power.c --- branches/alex_devel_branch/reactos/ntoskrnl/po/power.c 2005-03-11 23:06:43 UTC (rev 13938) +++ branches/alex_devel_branch/reactos/ntoskrnl/po/power.c 2005-03-11 23:09:59 UTC (rev 13939) @@ -12,6 +12,7 @@ #define NDEBUG #include <internal/debug.h> +#define MB_INFO_FLAG_ACPI_TABLE 0x00001000 PDEVICE_NODE PopSystemPowerDeviceNode = NULL; BOOLEAN PopAcpiPresent = FALSE; @@ -191,9 +192,16 @@ return Status; } -VOID INIT_FUNCTION -PoInit(VOID) +VOID +INIT_FUNCTION +PoInit(PLOADER_PARAMETER_BLOCK LoaderBlock, + BOOLEAN ForceAcpiDisable) { + /* Set the ACPI State to False if it's been forced that way */ + if (ForceAcpiDisable) PopAcpiPresent = FALSE; + + /* Otherwise check the LoaderBlock's Flag */ + PopAcpiPresent = LoaderBlock->Flags & MB_INFO_FLAG_ACPI_TABLE; } /*

19 years, 9 months

[royce] 13938: remove obsoleted makefiles and config files, tools/Makefile -> tools/tools.mak, fix bugs in buildno's makefile.

by royce＠svn.reactos.com

remove obsoleted makefiles and config files, tools/Makefile -> tools/tools.mak, fix bugs in buildno's makefile. Deleted: branches/xmlbuildsystem/reactos/Jamfile Deleted: branches/xmlbuildsystem/reactos/Jamrules Modified: branches/xmlbuildsystem/reactos/Makefile Deleted: branches/xmlbuildsystem/reactos/baseaddress.cfg Deleted: branches/xmlbuildsystem/reactos/config Deleted: branches/xmlbuildsystem/reactos/rules.mak Deleted: branches/xmlbuildsystem/reactos/tools/Makefile Modified: branches/xmlbuildsystem/reactos/tools/buildno/makefile Deleted: branches/xmlbuildsystem/reactos/tools/config.mk Deleted: branches/xmlbuildsystem/reactos/tools/depend.mk Deleted: branches/xmlbuildsystem/reactos/tools/helper.mk Added: branches/xmlbuildsystem/reactos/tools/tools.mak _____ Deleted: branches/xmlbuildsystem/reactos/Jamfile --- branches/xmlbuildsystem/reactos/Jamfile 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/Jamfile 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,5 +0,0 @@ -# Main jamfile for ReactOS - -SubDir ROS_TOP ; - -SubInclude ROS_TOP Lib ; _____ Deleted: branches/xmlbuildsystem/reactos/Jamrules --- branches/xmlbuildsystem/reactos/Jamrules 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/Jamrules 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,54 +0,0 @@ -# customization for ReactOS goes here - -# The SharedLibrary and SharedLibraryFromObjects rules were -# borrowed from here: -# http://www.differentpla.net/~roger/devel/jam/tutorial/shared_lib/index.h tml - -SUFSHR = .dll ; -RM = rm ; # rm comes with MinGW, and the default del doesn't work in some cases - -rule SharedLibrary -{ - SharedLibraryFromObjects $(<) : $(>:S=$(SUFOBJ)) ; - Objects $(>) ; -} - -rule SharedLibraryFromObjects -{ - local _s _t ; - - # Add grist to file names - # Add suffix to dll - - _s = [ FGristFiles $(>) ] ; - _t = [ FAppendSuffix $(<) : $(SUFSHR) ] ; - - if $(_t) != $(<) - { - DEPENDS $(<) : $(_t) ; - NOTFILE $(<) ; - } - - # make compiled sources a dependency of target - - DEPENDS exe : $(_t) ; - DEPENDS $(_t) : $(_s) ; - MakeLocate $(_t) : $(LOCATE_TARGET) ; - - Clean clean : $(_t) ; - - Link $(_t) : $(_s) ; -} - -# nasm needs to know the output file first, or it doesn't -# recognize -I :( -actions As -{ - $(AS) -o $(<) $(ASFLAGS) -I$(HDRS) $(>) -} - -AS = nasm ; - -# why isn't DEFINES working? :( -#DEFINES += _M_IX86 ; -CCFLAGS += -D_M_IX86 ; _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-11 23:06:43 UTC (rev 13938) @@ -110,7 +110,7 @@ ERRCODES_H = .$(SEP)include$(SEP)reactos$(SEP)errcodes.h ERRCODES_RC = .$(SEP)lib$(SEP)kernel32$(SEP)errcodes.rc -include tools/Makefile +include tools/tools.mak -include makefile.auto PREAUTO := \ _____ Deleted: branches/xmlbuildsystem/reactos/baseaddress.cfg --- branches/xmlbuildsystem/reactos/baseaddress.cfg 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/baseaddress.cfg 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,96 +0,0 @@ -# $Id$ -# -# Please try to keep this up2date. Please clean up -# after yourself. - -# REACTOS - -TARGET_BASE_LIB_DINPUT8 =0x00400000 -TARGET_BASE_LIB_DXDIAGN =0x00400000 -TARGET_BASE_LIB_NOTIFYHOOK =0x08000000 -TARGET_BASE_LIB_SECURE32 =0x10000000 -TARGET_BASE_LIB_DEVENUM =0x35680000 -TARGET_BASE_LIB_DSOUND =0x50000000 -TARGET_BASE_LIB_GLU32 =0x50000000 -TARGET_BASE_LIB_OPENGL32 =0x50000000 -TARGET_BASE_LIB_EXT_SLAYER =0x5C7E0000 -TARGET_BASE_LIB_DINPUT =0x5F580000 -TARGET_BASE_LIB_CPL_TIMEDATE =0x64DA0000 -TARGET_BASE_LIB_CPL_SYSDM =0x64DD0000 -TARGET_BASE_LIB_CPL_NCPL =0x64EA0000 -TARGET_BASE_LIB_CPL_MAIN =0x64F40000 -TARGET_BASE_LIB_CPL_INTL =0x64FB0000 -TARGET_BASE_LIB_CPL_DESK =0x65080000 -TARGET_BASE_LIB_CPL_APPWIZ =0x65100000 -TARGET_BASE_LIB_CPL_ACCESS =0x65180000 -TARGET_BASE_LIB_HID =0x688F0000 -TARGET_BASE_PSX_LIB_PSXDLL =0x68eb0000 -TARGET_BASE_LIB_PSAPI =0x68f70000 -TARGET_BASE_LIB_MSIMG32 =0x69cc0000 -TARGET_BASE_LIB_NETPLWIZ =0x6a240000 -TARGET_BASE_LIB_UNICODE =0x6b200000 -TARGET_BASE_VGA_DISPLAY =0x70000000 -TARGET_BASE_LIB_CARDS =0x701a0000 -TARGET_BASE_LIB_WININET =0x70200000 -TARGET_BASE_LIB_ACLUI =0x71550000 -TARGET_BASE_LIB_SHDOCVW =0x71700000 -TARGET_BASE_LIB_MSWSOCK =0x71a30000 -TARGET_BASE_LIB_WSOCK32 =0x71ab0000 -TARGET_BASE_LIB_ACLEDIT =0x71b70000 -TARGET_BASE_LIB_NETAPI32 =0x71c00000 -TARGET_BASE_LIB_WINFAX =0x722C0000 -TARGET_BASE_LIB_DEVMGR =0x72a90000 -TARGET_BASE_LIB_WINSCARD =0x723D0000 -TARGET_BASE_LIB_COREDLL =0x73d80000 -TARGET_BASE_LIB_LZEXPAND =0x73d80000 -TARGET_BASE_LIB_USERENV =0x74850000 -TARGET_BASE_LIB_SYSSETUP =0x74a30000 -TARGET_BASE_LIB_OLEDLG =0x74d00000 -TARGET_BASE_LIB_SAMLIB =0x750C0000 -TARGET_BASE_LIB_CABINET =0x75120000 -TARGET_BASE_LIB_MSGINA =0x75970000 -TARGET_BASE_LIB_COMMCTRL =0x75e60000 -TARGET_BASE_LIB_IMM32 =0x75e60000 -TARGET_BASE_LIB_RPCRT4 =0x76000000 -TARGET_BASE_LIB_MIDIMAP =0x76600000 -TARGET_BASE_LIB_SHLWAPI =0x76120000 -TARGET_BASE_LIB_COMCTL32 =0x76160000 -TARGET_BASE_LIB_COMDLG32 =0x76200000 -TARGET_BASE_LIB_OLEAUT32 =0x76260000 -TARGET_BASE_LIB_D3D8THK =0x76340000 -TARGET_BASE_LIB_RICHEDIT =0x76340000 -TARGET_BASE_LIB_TWAIN_32 =0x76380000 -TARGET_BASE_LIB_LSASRV =0x76540000 -TARGET_BASE_LIB_MPR =0x76620000 -TARGET_BASE_LIB_ODBC32 =0x76660000 -TARGET_BASE_LIB_SETUPAPI =0x76660000 -TARGET_BASE_LIB_GDIPLUS =0x76a00000 -TARGET_BASE_LIB_IMAGEHLP =0x76c90000 -TARGET_BASE_LIB_FMIFS =0x76df0000 -TARGET_BASE_LIB_SHELL32 =0x77260000 -TARGET_BASE_LIB_IPHLPAPI =0x77300000 -TARGET_BASE_LIB_MSACM =0x77400000 -TARGET_BASE_LIB_MMDRV =0x77500000 -TARGET_BASE_LIB_CRTDLL =0x77630000 -TARGET_BASE_LIB_PACKET =0x77780000 -TARGET_BASE_LIB_W2_32 =0x77780000 -TARGET_BASE_LIB_MSAFD =0x777a0000 -TARGET_BASE_LIB_IPRTPRIO =0x777c0000 -TARGET_BASE_LIB_SNMPAPI =0x777c0000 -TARGET_BASE_LIB_WINMM =0x777c0000 -TARGET_BASE_LIB_WS2HELP =0x777c0000 -TARGET_BASE_LIB_WSHIRDA =0x777c0000 -TARGET_BASE_NET_WSHTCPIP =0x777c0000 -TARGET_BASE_LIB_WINSPOOL =0x77800000 -TARGET_BASE_LIB_OLE32 =0x77a50000 -TARGET_BASE_LIB_OLEPRO32 =0x77a50000 -TARGET_BASE_LIB_VERSION =0x77a90000 -TARGET_BASE_LIB_ADVAPI32 =0x77dc0000 -TARGET_BASE_LIB_USER32 =0x77e60000 -TARGET_BASE_LIB_GDI32 =0x77ed0000 -TARGET_BASE_LIB_DNSAPI =0x77f00000 -TARGET_BASE_LIB_MSVCRT =0x78000000 -TARGET_BASE_LIB_MSVCRT20 =0x78500000 -TARGET_BASE_LIB_EXPAT =0x79000000 -TARGET_BASE_LIB_KERNEL32 =0x7C800000 -TARGET_BASE_LIB_NTDLL =0x7C900000 _____ Deleted: branches/xmlbuildsystem/reactos/config --- branches/xmlbuildsystem/reactos/config 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/config 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,54 +0,0 @@ -# -# Architecture to build for -# -# Specify one of: i386 -# Possible values in the future: alpha,i386,m68k,mips,powerpc -ARCH := i386 - - -# -# Which cpu should reactos optimize for -# example : i486, i586, pentium, pentium2, pentium3, pentium4 -# athlon-xp, athlon-mp, k6-2, -# -# see gcc manual for more cpu names and which cpus it can -# be optimized for. -# - -OARCH := i486 - -# -# Whether to compile in the kernel debugger -# -KDBG := 0 - -# -# Whether to compile for debugging -# -DBG := 0 - -# -# Whether to compile with optimizations -# -OPTIMIZED := 0 - -# -# Whether to compile a multiprocessor or single processor version -# -CONFIG_SMP := 0 - -# -# Whether to compile for ACPI compliant systems -# -ACPI := 0 - -# -# whether to use a 3GB User, 1GB Kernel memory map -# -3GB := 0 - -# -# Which version of NDIS do we support up to? -# -#NDISVERSION=NDIS50 - _____ Deleted: branches/xmlbuildsystem/reactos/rules.mak --- branches/xmlbuildsystem/reactos/rules.mak 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/rules.mak 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,211 +0,0 @@ -# Default to half-verbose mode -ifeq ($(VERBOSE),no) - Q = @ - HALFVERBOSEECHO = @: - # Do not print "Entering directory ..." - export MAKEFLAGS += --no-print-directory - # Be silent - export MAKEFLAGS += --silent -else -ifeq ($(VERBOSE),yes) - Q = - HALFVERBOSEECHO = @: -else - Q = @ - # the following is a hack to get the target name for wine dlls - # it's disabled because it produces warnings about overriden rules for author.c - #ifeq ($(TARGET_TYPE),winedll) - # export TOOLS_PATH = $(PATH_TO_TOP)/tools - # -include Makefile.ros - #endif - ifeq ($(TARGET_NAME),) - HALFVERBOSEECHO = @echo - else - HALFVERBOSEECHO = @echo $(TARGET_NAME): - endif - # Do not print "Entering directory ..." - export MAKEFLAGS += --no-print-directory - # Be silent - export MAKEFLAGS += --silent -endif -endif - -export MAKE := @$(MAKE) - -ifeq ($(VERBOSE),no) -endif - -# Windows is default host environment -ifeq ($(HOST),) -export HOST = mingw32-windows -endif - -# Default to building map files which includes source and asm code -# Other options are: yes -ifeq ($(BUILD_MAP),) -export BUILD_MAP = full -endif - -# Default to dumping .sym files out of .nostrip files -ifeq ($(BUILD_SYM),) -export BUILD_SYM = yes -endif - -# Default to minimal dependencies, making components not -# depend on all import libraries -ifeq ($(MINIMALDEPENDENCIES),) -export MINIMALDEPENDENCIES = yes -endif - -# Default to no PCH support -ifeq ($(ROS_USE_PCH),) -export ROS_USE_PCH = no -endif - -# uncomment if you use bochs and it displays only 30 rows -# BOCHS_30ROWS = yes - -# -# Choose various options -# -ifeq ($(HOST),mingw32-linux) -export NASM_FORMAT = win32 -export PREFIX = mingw32- -export EXE_POSTFIX := -export EXE_PREFIX := ./ -export DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as -# -# Do not change NASM_CMD to NASM because older versions of -# nasm doesn't like an environment variable NASM -# -export NASM_CMD = nasm -export DOSCLI = -export FLOPPY_DIR = /mnt/floppy -export SEP := / -export PIPE := -endif - -ifeq ($(HOST),mingw32-windows) -export NASM_FORMAT = win32 -export PREFIX = -export EXE_PREFIX := -export EXE_POSTFIX := .exe -export DLLTOOL = $(Q)$(PREFIX)dlltool --as=$(PREFIX)as -# -# Do not change NASM_CMD to NASM because older versions of -# nasm doesn't like an environment variable NASM -# -export NASM_CMD = $(Q)nasmw -export DOSCLI = yes -export FLOPPY_DIR = A: -export SEP := \$(EMPTY_VAR) -export PIPE := -pipe -endif - -# TOPDIR is used by make bootcd but not defined anywhere. Usurp pointed out -# that it has the same meaning as PATH_TO_TOP. -export TOPDIR = $(PATH_TO_TOP) - -# Directory to build a bootable CD image in -export BOOTCD_DIR=$(TOPDIR)/../bootcd/disk -export LIVECD_DIR=$(TOPDIR)/../livecd/disk - -ifeq ($(LIVECD_INSTALL),yes) -export INSTALL_DIR=$(LIVECD_DIR)/reactos -else -# Use environment var ROS_INSTALL to override default install dir -ifeq ($(ROS_INSTALL),) -ifeq ($(HOST),mingw32-windows) -export INSTALL_DIR = C:/reactos -else -export INSTALL_DIR = $(PATH_TO_TOP)/reactos -endif -else -export INSTALL_DIR = $(ROS_INSTALL) -endif -endif - - -export CC = $(Q)$(PREFIX)gcc -export CXX = $(Q)$(PREFIX)g++ -export HOST_CC = $(Q)gcc -export HOST_CXX = $(Q)g++ -export HOST_AR = $(Q)ar -export HOST_NM = $(Q)nm -export LD = $(Q)$(PREFIX)ld -export NM = $(Q)$(PREFIX)nm -export OBJCOPY = $(Q)$(PREFIX)objcopy -export STRIP = $(Q)$(PREFIX)strip -export AS = $(Q)$(PREFIX)gcc -c -x assembler-with-cpp -export CPP = $(Q)$(PREFIX)cpp -export AR = $(Q)$(PREFIX)ar -export RC = $(Q)$(PREFIX)windres -export WRC = $(Q)$(WINE_TOP)/tools/wrc/wrc -export OBJCOPY = $(Q)$(PREFIX)objcopy -export OBJDUMP =$(Q)$(PREFIX)objdump -export TOOLS_PATH = $(PATH_TO_TOP)/tools -export W32API_PATH = $(PATH_TO_TOP)/w32api -export CP = $(Q)$(TOOLS_PATH)/rcopy -export RM = $(Q)$(TOOLS_PATH)/rdel -export RLINE = $(Q)$(TOOLS_PATH)/rline -export RMDIR = $(Q)$(TOOLS_PATH)/rrmdir -export RMKDIR = $(Q)$(TOOLS_PATH)/rmkdir -export RSYM = $(Q)$(TOOLS_PATH)/rsym -export RTOUCH = $(Q)$(TOOLS_PATH)/rtouch -export REGTESTS = $(Q)$(TOOLS_PATH)/regtests -export MC = $(Q)$(TOOLS_PATH)/wmc/wmc -export CABMAN = $(Q)$(TOOLS_PATH)/cabman/cabman -export WINEBUILD = $(Q)$(TOOLS_PATH)/winebuild/winebuild -export WINE2ROS = $(Q)$(TOOLS_PATH)/wine2ros/wine2ros -export MKHIVE = $(Q)$(TOOLS_PATH)/mkhive/mkhive -export CDMAKE = $(Q)$(TOOLS_PATH)/cdmake/cdmake -export BIN2RES = $(Q)$(TOOLS_PATH)/bin2res/bin2res -export XSLTPROC = $(Q)xsltproc -export MS2PS = $(Q)$(TOOLS_PATH)/ms2ps/ms2ps -export WRC = $(Q)$(TOOLS_PATH)/wrc/wrc -export WIDL = $(Q)$(TOOLS_PATH)/widl/widl - -export STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=$(OARCH) -D_M_IX86 -export STD_CPPFLAGS = $(STD_CFLAGS) -# Check for 3GB -ifeq ($(3GB), 1) -export STD_ASFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -D__ASM__ -D_M_IX86 -D__3GB__ -else -export STD_ASFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -D__ASM__ -D_M_IX86 -endif -export STD_RCFLAGS = --include-dir $(PATH_TO_TOP)/include --include-dir $(W32API_PATH)/include -export STD_NFLAGS = -f win32 - -# Developer Kits -export DK_PATH=$(PATH_TO_TOP)/dk -# Native and kernel mode -export DDK_PATH=$(DK_PATH)/nkm -export DDK_PATH_LIB=$(DDK_PATH)/lib -export DDK_PATH_INC=$(PATH_TO_TOP)/include -# Win32 -export SDK_PATH=$(DK_PATH)/w32 -export SDK_PATH_LIB=$(SDK_PATH)/lib -export SDK_PATH_INC=$(PATH_TO_TOP)/include -# POSIX+ -export XDK_PATH=$(DK_PATH)/psx -export XDK_PATH_LIB=$(XDK_PATH)/lib -export XDK_PATH_INC=$(XDK_PATH)/include - -# Wine Integration -export WINE_PATH=$(PATH_TO_TOP)/../wine -export WINE_PATH_LIB=$(WINE_PATH)/lib -export WINE_PATH_INC=$(WINE_PATH)/include - -# Posix+ Integration -export POSIX_PATH=$(PATH_TO_TOP)/../posix -export POSIX_PATH_LIB=$(POSIX_PATH)/lib -export POSIX_PATH_INC=$(POSIX_PATH)/include - -# OS/2 Integration -export OS2_PATH=$(PATH_TO_TOP)/../os2 -export OS2_PATH_LIB=$(OS2_PATH)/lib -export OS2_PATH_INC=$(OS2_PATH)/include - -# Other systems integration -export REGTESTS_PATH=$(PATH_TO_TOP)/regtests -export REGTESTS_PATH_INC=$(PATH_TO_TOP)/regtests/shared _____ Deleted: branches/xmlbuildsystem/reactos/tools/Makefile --- branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,65 +0,0 @@ -RMKDIR_BASE = tools - -RMKDIR_TARGET = \ - $(ROS_INTERMEDIATE)$(RMKDIR_BASE)$(SEP)rmkdir$(EXEPOSTFIX) - -RMKDIR_SOURCES = \ - $(RMKDIR_BASE)$(SEP)rmkdir.c - -RMKDIR_OBJECTS = \ - $(RMKDIR_SOURCES:.c=.o) - -RMKDIR_HOST_CFLAGS = -g -Werror -Wall - -RMKDIR_HOST_LFLAGS = -g - -$(RMKDIR_TARGET): $(RMKDIR_OBJECTS) - $(ECHO_LD) - ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET) - -$(RMKDIR_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@ - -.PHONY: rmkdir_clean -rmkdir_clean: - -@$(rm) $(RMKDIR_TARGET) $(RMKDIR_OBJECTS) 2>$(NUL) -clean: rmkdir_clean - - -RSYM_BASE = tools - -RSYM_TARGET = \ - $(ROS_INTERMEDIATE)$(RSYM_BASE)$(SEP)rsym$(EXEPOSTFIX) - -RSYM_SOURCES = \ - $(RSYM_BASE)$(SEP)rsym.c - -RSYM_OBJECTS = \ - $(RSYM_SOURCES:.c=.o) - -RSYM_HOST_CFLAGS = -g -Werror -Wall - -RSYM_HOST_LFLAGS = -g - -$(RSYM_TARGET): $(RSYM_OBJECTS) - $(ECHO_LD) - ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $(RSYM_TARGET) - -$(RSYM_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ - -.PHONY: rsym_clean -rsym_clean: - -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL) -clean: rsym_clean - -include tools/buildno/makefile -include tools/cdmake/makefile -include tools/nci/makefile -include tools/rbuild/makefile -include tools/unicode/makefile -include tools/wmc/makefile -include tools/wpp/makefile -include tools/wrc/makefile _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/makefile --- branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,7 +1,7 @@ BUILDNO_BASE = tools$(SEP)buildno BUILDNO_TARGET = \ - $(ROS_INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX) + $(EXEPREFIX)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX) BUILDNO_SOURCES = \ $(BUILDNO_BASE)$(SEP)buildno.cpp \ @@ -31,5 +31,8 @@ # BUILDNO_H is defined from the top-level makefile now... #BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h +.PHONY: buildno_h +buildno_h: $(BUILDNO_H) + $(BUILDNO_H): $(BUILDNO_TARGET) - $(EXEPREFIX)$(BUILDNO_TARGET) $(BUILDNO_H) + $(BUILDNO_TARGET) $(BUILDNO_H) _____ Deleted: branches/xmlbuildsystem/reactos/tools/config.mk --- branches/xmlbuildsystem/reactos/tools/config.mk 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/config.mk 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,33 +0,0 @@ -# Global configuration - -# -# Include details of the OS configuration -# -include $(PATH_TO_TOP)/config - -CONFIG := - -ifeq ($(DBG), 1) -CONFIG += DBG -endif - -ifeq ($(KDBG), 1) -CONFIG += KDBG -endif - -ifeq ($(CONFIG_SMP), 1) -CONFIG += CONFIG_SMP -endif - -ifeq ($(ACPI), 1) -CONFIG += ACPI -endif - -$(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX): $(PATH_TO_TOP)/tools/mkconfig.c - @$(HOST_CC) -g -o $(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX) $(PATH_TO_TOP)/tools/mkconfig.c - -$(PATH_TO_TOP)/config: $(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX) - @$(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX) $(PATH_TO_TOP)/include/roscfg.h$(CONFIG) - -$(PATH_TO_TOP)/include/roscfg.h: $(PATH_TO_TOP)/config - @$(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX) $(PATH_TO_TOP)/include/roscfg.h$(CONFIG) _____ Deleted: branches/xmlbuildsystem/reactos/tools/depend.mk --- branches/xmlbuildsystem/reactos/tools/depend.mk 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/depend.mk 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,65 +0,0 @@ -# Automatic dependancy tracking -# Define $DEP_OBJECTS before this file is included -# $DEP_OBJECTS contain a list of object files that are checked for dependancies - -ifneq ($(DEPENDENCIES),no) -ifneq ($(MAKECMDGOALS),implib) - -DEP_FILTERED := $(filter-out $(DEP_EXCLUDE_FILTER), $(DEP_OBJECTS:.o=.d)) - -PCH := - -ifeq ($(ROS_USE_PCH),yes) -ifneq ($(TARGET_PCH),) - -PCH = $(TARGET_PCH).gch - -DEP_FILTERED := $(DEP_FILTERED) $(TARGET_PCH:.h=.d) - -endif # TARGET_PCH -endif - -DEP_FILES := $(join $(dir $(DEP_FILTERED)), $(addprefix ., $(notdir $(DEP_FILTERED)))) - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(DEP_FILES),) --include $(DEP_FILES) -endif -endif - -ifeq ($(SEP),\) -DEPENDS_PATH := $(subst /,\,$(PATH_TO_TOP))\tools -else -DEPENDS_PATH := $(PATH_TO_TOP)/tools -endif - -.%.d: %.c $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.cc $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.cpp $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.S $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.s $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(NASM_CMD) $(NFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.h $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(PCH_CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -endif -endif _____ Deleted: branches/xmlbuildsystem/reactos/tools/helper.mk --- branches/xmlbuildsystem/reactos/tools/helper.mk 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/helper.mk 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,1160 +0,0 @@ -# $Id$ -# -# Helper makefile for ReactOS modules -# Variables this makefile accepts: -# $TARGET_TYPE = Type of target: -# program = User mode program -# proglib = Executable program that have exported functions -# dynlink = Dynamic Link Library (DLL) -# library = Library that will be linked with other code -# driver = Kernel mode driver -# export_driver = Kernel mode driver that have exported functions -# driver_library = Import library for a driver -# kmlibrary = Static kernel-mode library -# host_library = Static library for use in the build env -# hal = Hardware Abstraction Layer -# bootpgm = Boot program -# miniport = Kernel mode driver that does not link with ntoskrnl.exe or hal.dll -# gdi_driver = Kernel mode graphics driver that link with win32k.sys -# subsystem = Kernel subsystem -# kmdll = Kernel mode DLL -# winedll = DLL imported from wine -# kernel = ReactOS kernel -# test = ReactOS test -# $TARGET_APPTYPE = Application type (windows,native,console). -# Required only for TARGET_TYPEs program and proglib -# $TARGET_NAME = Base name of output file and .rc, .def, and .edf files -# $TARGET_OBJECTS = Object files that compose the module -# $TARGET_CPPAPP = C++ application (no,yes) (optional) -# $TARGET_HEADERS = Header files that the object files depend on (optional) -# $TARGET_DEFNAME = Base name of .def and .edf files (optional) -# $TARGET_BASENAME = Base name of output file (overrides $TARGET_NAME if it exists) (optional) -# $TARGET_EXTENSION = Extension of the output file (optional) -# $TARGET_DDKLIBS = DDK libraries that are to be imported by the module (optional) -# $TARGET_SDKLIBS = SDK libraries that are to be imported by the module (optional) -# $TARGET_LIBS = Other libraries that are to be imported by the module (optional) -# $TARGET_GCCLIBS = GCC libraries imported with -l (optional) -# $TARGET_LFLAGS = GCC flags when linking (optional) -# $TARGET_CFLAGS = GCC flags (optional) -# $TARGET_CPPFLAGS = G++ flags (optional) -# $TARGET_ASFLAGS = GCC assembler flags (optional) -# $TARGET_NFLAGS = NASM flags (optional) -# $TARGET_RCFLAGS = Windres flags (optional) -# $TARGET_CLEAN = Files that are part of the clean rule (optional) -# $TARGET_PATH = Relative path for *.def, *.edf, and *.rc (optional) -# $TARGET_BASE = Default base address (optional) -# $TARGET_ENTRY = Entry point (optional) -# $TARGET_NORC = Do not include standard resource file (no,yes) (optional) -# $TARGET_LIBPATH = Destination path for static libraries (optional) -# $TARGET_IMPLIBPATH = Destination path for import libraries (optional) -# $TARGET_INSTALLDIR = Destination path when installed (optional) -# $TARGET_PCH = Filename of header to use to generate a PCH if supported by the compiler (optional) -# $TARGET_BOOTSTRAP = Whether this file is needed to bootstrap the installation (no,yes) (optional) -# $TARGET_BOOTSTRAP_NAME = Name on the installation medium (optional) -# $TARGET_REGTESTS = This module has regression tests (no,yes) (optional) -# $TARGET_WINETESTS = This module Wine regression tests (no,yes) (optional) -# $TARGET_INSTALL = Install the file (no,yes) (optional) -# $SUBDIRS = Subdirs in which to run make (optional) - -include $(PATH_TO_TOP)/config -include $(PATH_TO_TOP)/baseaddress.cfg - -ifeq ($(TARGET_PATH),) -TARGET_PATH := . -endif - -ifeq ($(ARCH),i386) - MK_ARCH_ID := _M_IX86 -endif - -ifeq ($(ARCH),alpha) - MK_ARCH_ID := _M_ALPHA -endif - -ifeq ($(ARCH),mips) - MK_ARCH_ID := _M_MIPS -endif - -ifeq ($(ARCH),powerpc) - MK_ARCH_ID := _M_PPC -endif - -# unknown architecture -ifeq ($(MK_ARCH_ID),) - MK_ARCH_ID := _M_UNKNOWN -endif - -# -# VARIABLES IN USE BY VARIOUS TARGETS -# -# MK_BOOTCDDIR = Directory on the ReactOS ISO CD in which to place the file (subdir of reactos/) -# MK_CFLAGS = C compiler command-line flags for this target -# MK_CPPFLAGS = C++ compiler command-line flags for this target -# MK_DDKLIBS = Import libraries from the ReactOS DDK to link with -# MK_DEFENTRY = Module entry point: -# _WinMain@16 for windows EXE files that are export libraries -# _DriverEntry@8 for .SYS files -# _DllMain@12 for .DLL files -# _DrvEnableDriver@12 for GDI drivers -# _WinMainCRTStartup for Win32 EXE files -# _NtProcessStartup@4 for Native EXE files -# _mainCRTStartup for Console EXE files -# MK_DEFEXT = Extension to give compiled modules (.EXE, .DLL, .SYS, .a) -# MK_DISTDIR = (unused?) -# MK_EXETYPE = Compiler option packages based on type of PE file (exe, dll) -# MK_IMPLIB = Whether or not to generate a DLL import stub library (yes, no) -# MK_IMPLIB_EXT = Extension to give import libraries (.a always) -# MK_IMPLIBDEFPATH = Default place to put the import stub library when built -# MK_IMPLIBONLY = Whether the target is only an import library (yes, no; used only by generic hal) -# MK_INSTALLDIR = Where "make install" should put the target, relative to reactos/ -# MK_MODE = Mode the target's code is intended to run in -# user - User-mode compiler settings -# kernel - Kernel-mode compiler settings -# static - Static library compiler settings -# MK_RCFLAGS = Flags to add to resource compiler command line -# MK_RES_BASE = Base name of resource files -# MK_SDKLIBS = Default SDK libriaries to link with -# - -ifeq ($(TARGET_TYPE),program) - MK_MODE := user - MK_EXETYPE := exe - MK_DEFEXT := .exe - MK_DEFENTRY := _DEFINE_TARGET_APPTYPE - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := bin - MK_BOOTCDDIR := system32 - MK_DISTDIR := apps - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),proglib) - MK_MODE := user - MK_EXETYPE := dll - MK_DEFEXT := .exe - MK_DEFENTRY := _WinMain@16 - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := yes - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(SDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := bin - MK_BOOTCDDIR := system32 - MK_DISTDIR := apps - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),dynlink) - MK_MODE := user - MK_EXETYPE := dll - MK_DEFEXT := .dll - MK_DEFENTRY := _DllMain@12 - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := yes - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(SDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32 - MK_BOOTCDDIR := system32 - MK_DISTDIR := dlls - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),library) - TARGET_NORC := yes - MK_MODE := static - MK_EXETYPE := - MK_DEFEXT := .a - MK_DEFENTRY := - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_IMPLIB_EXT := - MK_INSTALLDIR := # none - MK_BOOTCDDIR := system32 - MK_DISTDIR := # none - MK_RES_BASE := -endif - -ifeq ($(TARGET_TYPE),kmlibrary) - TARGET_NORC := yes - MK_MODE := static - MK_DEFEXT := .a - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) - #MK_IMPLIB_EXT := -endif - -ifeq ($(TARGET_TYPE),driver_library) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .dll - MK_DEFENTRY := - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := no - MK_IMPLIBONLY := yes - MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := $(DDK_PATH_INC) - MK_BOOTCDDIR := . - MK_DISTDIR := # FIXME - MK_RES_BASE := -endif - -ifeq ($(TARGET_TYPE),host_library) - TARGET_NORC := yes - MK_MODE := static - MK_DEFEXT := .a - MK_CFLAGS := - MK_CPPFLAGS := - MK_LIBPATH := . - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_CC := $(HOST_CC) - MK_AR := $(HOST_AR) -endif - -ifeq ($(TARGET_TYPE),driver) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .sys - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := ntoskrnl.a hal.a - MK_SDKLIBS := - MK_CFLAGS := -D__NTDRIVER__ -I. - MK_CPPFLAGS := -D__NTDRIVER__ -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32/drivers - MK_BOOTCDDIR := . - MK_DISTDIR := drivers - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),export_driver) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .sys - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := ntoskrnl.a hal.a - MK_SDKLIBS := - MK_CFLAGS := -D__NTDRIVER__ -I. - MK_CPPFLAGS := -D__NTDRIVER__ -I. - MK_IMPLIB := yes - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32/drivers - MK_BOOTCDDIR := . - MK_DISTDIR := drivers - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),hal) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .dll - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := ntoskrnl.a - MK_SDKLIBS := - MK_CFLAGS := -D__NTHAL__ -I. - MK_CPPFLAGS := -D__NTHAL__ -I. - MK_IMPLIB := yes - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32 - MK_BOOTCDDIR := . - MK_DISTDIR := dlls - MK_RES_BASE := $(TARGET_NAME) - MK_INSTALL_BASENAME := hal - MK_INSTALL_FULLNAME := hal.dll - ifeq ($(TARGET_BOOTSTRAP),yes) - TARGET_BOOTSTRAP_NAME := hal.dll - else - TARGET_BOOTSTRAP_NAME := $(TARGET_NAME)$(MK_DEFEXT) - endif - TARGET_BOOTSTRAP := yes -endif - -ifeq ($(TARGET_TYPE),bootpgm) - MK_MODE := kernel - MK_EXETYPE := exe - MK_DEFEXT := .exe - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -D__NTDRIVER__ -I. - MK_CPPFLAGS := -D__NTDRIVER__ -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32 - MK_BOOTCDDIR := system32 - MK_DISTDIR := # FIXME - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),miniport) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .sys - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -D__NTDRIVER__ -I. - MK_CPPFLAGS := -D__NTDRIVER__ -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := [truncated at 1000 lines; 825 more skipped]

19 years, 9 months

[arty] 13937: Swap the port part of the address so it's reported correctly.

by arty＠svn.reactos.com

Swap the port part of the address so it's reported correctly. Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-03-11 21:07:55 UTC (rev 13936) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-03-11 21:13:11 UTC (rev 13937) @@ -621,7 +621,7 @@ Address->TAAddressCount = 1; Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; Address->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; - Address->Address[0].Address[0].sin_port = AddrFile->Port; + Address->Address[0].Address[0].sin_port = htons(AddrFile->Port); Address->Address[0].Address[0].in_addr = AddrFile->Address.Address.IPv4Address; RtlZeroMemory(

19 years, 9 months

[fireball] 13936: Andrey Korotaev (unC0Rr): Added russian translations for control, appwiz and timedate.

by fireball＠svn.reactos.com

Andrey Korotaev (unC0Rr): Added russian translations for control, appwiz and timedate. Added: trunk/reactos/lib/cpl/appwiz/Ru.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Added: trunk/reactos/lib/cpl/control/Ru.rc Modified: trunk/reactos/lib/cpl/control/control.rc Added: trunk/reactos/lib/cpl/timedate/Ru.rc Modified: trunk/reactos/lib/cpl/timedate/timedate.rc _____ Added: trunk/reactos/lib/cpl/appwiz/Ru.rc --- trunk/reactos/lib/cpl/appwiz/Ru.rc 2005-03-11 18:46:44 UTC (rev 13935) +++ trunk/reactos/lib/cpl/appwiz/Ru.rc 2005-03-11 21:07:55 UTC (rev 13936) @@ -0,0 +1,100 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÞ?³/ËõÓÙÞ?³" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "Î?¯ß¹ ¾±?ÓÝ¯ÔÞ?³ Ý¯Ô¾? ´¯ÒÓýý¾, ""Ë±?ÓÝ¯ ÔÛÓ""",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Ë±?ÓÝ¯ÔÛÓ...", IDC_INSTALL, PROPSHEETWIDTH-72, 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "Î?¯ß¹ ¾±?ÓÝ¯ÔÞ?³ ´¯ÒÓýý¾ ÞÙÞ ÞþýÕÝÞ?³ Õ© ¾±?ÓÝ¯ÔÙÕÝÝ¹Õ Û¯ý´¯ÝÕÝ?¹, Ô¹õÕÙÞ?Õ Õ© Ô ±´Þ±ÛÕ Þ ÝÓµýÞ?Õ ""ÃÓýÕÝÞ?³/ËõÓÙÞ ?³"".",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "&ÃÓýÕÝÞ?³/ËõÓÙÞ?³", IDC_ADDREMOVE, PROPSHEETWIDTH-98, 198, 85, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ Û¯ý´¯ÝÕÝ?¯Ô ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ë±?ÓÝ¯ÔÛÓ Þ ¾õÓÙÕÝÞÕ ´¯ÒÓýý" + IDS_CPLSYSTEMDESCRIPTION "Ë±?ÓÝ¯ÔÛÓ ÞÙÞ ¾õÓÙÕÝÞÕ ´¯ÒÓýý Þ Û¯ý´¯ÝÕÝ? ¯Ô ReactOS" +END +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÞ?³/ËõÓÙÞ?³" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "Î?¯ß¹ ¾±?ÓÝ¯ÔÞ?³ Ý¯Ô¾? ´¯ÒÓýý¾, ""Ë±?ÓÝ¯ ÔÛÓ""",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Ë±?ÓÝ¯ÔÛÓ...", IDC_INSTALL, PROPSHEETWIDTH-72, 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "Î?¯ß¹ ¾±?ÓÝ¯ÔÞ?³ ´¯ÒÓýý¾ ÞÙÞ ÞþýÕÝÞ?³ Õ© ¾±?ÓÝ¯ÔÙÕÝÝ¹Õ Û¯ý´¯ÝÕÝ?¹, Ô¹õÕÙÞ?Õ Õ© Ô ±´Þ±ÛÕ Þ ÝÓµýÞ?Õ ""ÃÓýÕÝÞ?³/ËõÓÙÞ ?³"".",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "&ÃÓýÕÝÞ?³/ËõÓÙÞ?³", IDC_ADDREMOVE, PROPSHEETWIDTH-98, 198, 85, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ Û¯ý´¯ÝÕÝ?¯Ô ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ë±?ÓÝ¯ÔÛÓ Þ ¾õÓÙÕÝÞÕ ´¯ÒÓýý" + IDS_CPLSYSTEMDESCRIPTION "Ë±?ÓÝ¯ÔÛÓ ÞÙÞ ¾õÓÙÕÝÞÕ ´¯ÒÓýý Þ Û¯ý´¯ÝÕÝ? ¯Ô ReactOS" +END _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-03-11 18:46:44 UTC (rev 13935) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-03-11 21:07:55 UTC (rev 13936) @@ -28,3 +28,5 @@ #include "En.rc" #include "De.rc" #include "Dk.rc" +#include "Ru.rc" + _____ Added: trunk/reactos/lib/cpl/control/Ru.rc --- trunk/reactos/lib/cpl/control/Ru.rc 2005-03-11 18:46:44 UTC (rev 13935) +++ trunk/reactos/lib/cpl/control/Ru.rc 2005-03-11 21:07:55 UTC (rev 13936) @@ -0,0 +1,56 @@ +// Russian language resource file (unC0Rr, 2005-03-11) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&ÈÓÚÙ" + BEGIN + MENUITEM "&?¹§¯õ", IDM_CLOSE + END + POPUP "&?Þõ" + BEGIN + MENUITEM "¤Ù&Þ?ÛÓ", IDM_LARGEICONS + MENUITEM "&ÃÝÓ¸ÛÞ", IDM_SMALLICONS + MENUITEM "Ð´Þ±&¯Û", IDM_LIST + MENUITEM "&ÊÓßÙÞ÷Ó", IDM_DETAILS + END + POPUP "&Ð´ÓÔÛÓ" + BEGIN + MENUITEM "&? ´¯ÒÓýýÕ", IDM_ABOUT + END +END + +// Russian language resource file (unC0Rr, 2005-03-11) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&ÈÓÚÙ" + BEGIN + MENUITEM "&?¹§¯õ", IDM_CLOSE + END + POPUP "&?Þõ" + BEGIN + MENUITEM "¤Ù&Þ?ÛÓ", IDM_LARGEICONS + MENUITEM "&ÃÝÓ¸ÛÞ", IDM_SMALLICONS + MENUITEM "Ð´Þ±&¯Û", IDM_LIST + MENUITEM "&ÊÓßÙÞ÷Ó", IDM_DETAILS + END + POPUP "&Ð´ÓÔÛÓ" + BEGIN + MENUITEM "&? ´¯ÒÓýýÕ", IDM_ABOUT + END +END + _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-03-11 18:46:44 UTC (rev 13935) +++ trunk/reactos/lib/cpl/control/control.rc 2005-03-11 21:07:55 UTC (rev 13936) @@ -38,3 +38,4 @@ #include "En.rc" #include "De.rc" #include "Dk.rc" +#include "Ru.rc" _____ Added: trunk/reactos/lib/cpl/timedate/Ru.rc --- trunk/reactos/lib/cpl/timedate/Ru.rc 2005-03-11 18:46:44 UTC (rev 13935) +++ trunk/reactos/lib/cpl/timedate/Ru.rc 2005-03-11 21:07:55 UTC (rev 13936) @@ -0,0 +1,84 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?Ó?Ó Þ ÔÕý " +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&?Ó?Ó", -1, 4, 2, 122, 125 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_SHORTDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 17, 108, 12 + CONTROL "", IDC_MONTHCALENDAR, "SysMonthCal32", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 37, 108, 80 + GROUPBOX "&?Õý ", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 17, 90, 12 + LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÎÓ±¯Ô¯Ú ´¯ ±" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "?Ô?¯ýÓ?Þ&¸Õ±ÛÞÚ ´ÕÕ§¯õ ÝÓ ÙÕ?ÝÕÕ ÔÕý Þ ¯ßÓ?Ý¯", + IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "?Ó?Ó Þ ÔÕý " + IDS_CPLDESCRIPTION "Ë±?ÓÝ¯ÔÛÓ õÓ?¹, ÔÕýÕÝÞ Þ ¸Ó±¯Ô¯Ò¯ ´¯ ±Ó õÙ ²? ¯Ò¯ Û¯ý´³??ÕÓ" + IDS_TIMEZONETEXT "ÊÕÛ¾¨ÞÚ ¸Ó±¯Ô¯Ú ´¯ ±: %s" + IDS_TIMEZONEINVALID "?ÕõÕÚ±?ÔÞ?ÕÙ³ÝÓ " + IDS_TIMEZONEUNKNOWN "?ÕÞþÔÕ±?ÝÓ " +END +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?Ó?Ó Þ ÔÕý " +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&?Ó?Ó", -1, 4, 2, 122, 125 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_SHORTDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 17, 108, 12 + CONTROL "", IDC_MONTHCALENDAR, "SysMonthCal32", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 37, 108, 80 + GROUPBOX "&?Õý ", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 17, 90, 12 + LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÎÓ±¯Ô¯Ú ´¯ ±" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "?Ô?¯ýÓ?Þ&¸Õ±ÛÞÚ ´ÕÕ§¯õ ÝÓ ÙÕ?ÝÕÕ ÔÕý Þ ¯ßÓ?Ý¯", + IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "?Ó?Ó Þ ÔÕý " + IDS_CPLDESCRIPTION "Ë±?ÓÝ¯ÔÛÓ õÓ?¹, ÔÕýÕÝÞ Þ ¸Ó±¯Ô¯Ò¯ ´¯ ±Ó õÙ ²? ¯Ò¯ Û¯ý´³??ÕÓ" + IDS_TIMEZONETEXT "ÊÕÛ¾¨ÞÚ ¸Ó±¯Ô¯Ú ´¯ ±: %s" + IDS_TIMEZONEINVALID "?ÕõÕÚ±?ÔÞ?ÕÙ³ÝÓ " + IDS_TIMEZONEUNKNOWN "?ÕÞþÔÕ±?ÝÓ " +END _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.rc --- trunk/reactos/lib/cpl/timedate/timedate.rc 2005-03-11 18:46:44 UTC (rev 13935) +++ trunk/reactos/lib/cpl/timedate/timedate.rc 2005-03-11 21:07:55 UTC (rev 13936) @@ -22,3 +22,4 @@ #include "Dk.rc" #include "Es.rc" #include "Fr.rc" +#include "Ru.rc"

19 years, 9 months

← Newer
1
...
43
44
45
46
47
48
49
...
61
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 March 2005