Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

Start a nNew thread

[chorns] 13836: Delete msiexec

by chorns＠svn.reactos.com

Delete msiexec Deleted: branches/xmlbuildsystem/reactos/subsys/system/msiexec/

19 years, 9 months

[mf] 13835: - make new icons look a bit smarter and including a 32 bit alpha channel format

by mf＠svn.reactos.com

- make new icons look a bit smarter and including a 32 bit alpha channel format - update ROS icon in about dialog and start menu side bar Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp Modified: trunk/reactos/subsys/system/explorer/res/reactos.ico Modified: trunk/reactos/subsys/system/explorer/res/ros-big.ico Modified: trunk/reactos/subsys/system/explorer/res/startmenu.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/reactos.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/ros-big.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/startmenu.ico (Binary files differ)

19 years, 9 months

[mf] 13834: update copyright notice

by mf＠svn.reactos.com

update copyright notice Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-03-05 20:50:25 UTC (rev 13833) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-03-05 21:35:46 UTC (rev 13834) @@ -4,7 +4,7 @@ // // xmlstorage.cpp // - // Copyright (c) 2004, Martin Fuchs <martin-fuchs(a)gmx.net> + // Copyright (c) 2004, 2005 Martin Fuchs <martin-fuchs(a)gmx.net> // _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-03-05 20:50:25 UTC (rev 13833) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-03-05 21:35:46 UTC (rev 13834) @@ -4,7 +4,7 @@ // // xmlstorage.h // - // Copyright (c) 2004, Martin Fuchs <martin-fuchs(a)gmx.net> + // Copyright (c) 2004, 2005 Martin Fuchs <martin-fuchs(a)gmx.net> //

19 years, 9 months

[chorns] 13833: Merge 13511:13830 from trunk

by chorns＠svn.reactos.com

Merge 13511:13830 from trunk Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/Makefile Deleted: branches/xmlbuildsystem/reactos/apps/utils/rundll32/ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile Modified: branches/xmlbuildsystem/reactos/boot/freeldr/fdebug/Makefile Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/multiboot.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/install/Makefile Modified: branches/xmlbuildsystem/reactos/boot/freeldr/tools/Makefile Modified: branches/xmlbuildsystem/reactos/bootdata/hivesys.inf Modified: branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff Modified: branches/xmlbuildsystem/reactos/bootdata/txtsetup.sif Modified: branches/xmlbuildsystem/reactos/config Modified: branches/xmlbuildsystem/reactos/doc/README.WINE Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.h Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cleanup.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/fcb.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/fsctl.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/rw.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/create.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/finfo.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/fsctrl.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.h Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/rw.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/volume.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/fcb.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/fsctl.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.h Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/blockdev.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/create.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/dir.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/dirwr.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/fcb.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/fsctl.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/rw.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/shutdown.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfat.h Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/volume.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/ip/transport/tcp/event.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/include/freebsd/src /sys/sys/select.h Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/include/freebsd/src /sys/sys/socketvar.h Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/include/freebsd/src /sys/sys/systm.h Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp/interface. c Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp/route.c Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd/read.c Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/include/afd.h Modified: branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis/miniport.c Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip/fileobjs.c Modified: branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.c Modified: branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.h Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/core/hcd-pci.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/core/hcd.h Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/core/hub.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/core/makefile Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/core/message.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/core/usb.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/core/usbcore.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/core/usbcore.def Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/host/makefile Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/host/ohci-hcd.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/host/ohci-pci.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/host/ohci.h Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/host/ohci_main.c Added: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/host/ohci_main.h Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/linux/linux_wrapper .h Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/linux/pci_hal.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/linux/pci_ids.h Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/sys/linuxwrapper.c Modified: branches/xmlbuildsystem/reactos/drivers/usb/cromwell/usb_wrapper.h Modified: branches/xmlbuildsystem/reactos/hal/hal/hal.c Modified: branches/xmlbuildsystem/reactos/hal/halx86/generic/timer.c Modified: branches/xmlbuildsystem/reactos/hal/halx86/include/hal.h Modified: branches/xmlbuildsystem/reactos/include/base.h Modified: branches/xmlbuildsystem/reactos/include/ddk/csq.h Modified: branches/xmlbuildsystem/reactos/include/ddk/extypes.h Modified: branches/xmlbuildsystem/reactos/include/ddk/fsfuncs.h Modified: branches/xmlbuildsystem/reactos/include/ddk/kefuncs.h Modified: branches/xmlbuildsystem/reactos/include/ddk/psfuncs.h Modified: branches/xmlbuildsystem/reactos/include/ddk/types.h Added: branches/xmlbuildsystem/reactos/include/expat/ Added: branches/xmlbuildsystem/reactos/include/lsass/lsasrv.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/alloc.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/assert.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/conio.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/ctype.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/dir.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/direct.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/errno.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/fcntl.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/float.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/internal/ Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/io.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/locale.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/malloc.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/math.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/mbctype.h Deleted: branches/xmlbuildsystem/reactos/include/msvcrt/mbstring.h [truncated at 100 lines; 918 more skipped] _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-05 20:50:25 UTC (rev 13833) @@ -60,7 +60,8 @@ include$(SEP)reactos$(SEP)errcodes.h \ lib$(SEP)kernel32$(SEP)errcodes.rc -Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) +Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(WRC_TARGET) \ + $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw # $(MAKE) $(MAKECMDGOALS) _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/Makefile --- branches/xmlbuildsystem/reactos/apps/utils/Makefile 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/apps/utils/Makefile 2005-03-05 20:50:25 UTC (rev 13833) @@ -9,7 +9,7 @@ # Console system utilities # cabman cat net objdir partinfo pice ps sc stats -UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount consw rundll32 ps +UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount consw ps UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile 2005-03-05 20:50:25 UTC (rev 13833) @@ -32,26 +32,26 @@ @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) dosmbr.bin : dosmbr.asm - @echo ===================================================== Assembling dosmbr + @echo freeldr: Assembling dosmbr @$(NASM_CMD) $(NFLAGS) -o dosmbr.bin -f bin dosmbr.asm fat.bin : fat.asm $(BIN2C) - @echo ===================================================== Assembling fat + @echo freeldr: Assembling fat @$(NASM_CMD) $(NFLAGS) -o fat.bin -f bin fat.asm @$(BIN2C) fat.bin fat.h fat_data fat32.bin : fat32.asm $(BIN2C) - @echo ===================================================== Assembling fat32 + @echo freeldr: Assembling fat32 @$(NASM_CMD) $(NFLAGS) -o fat32.bin -f bin fat32.asm @$(BIN2C) fat32.bin fat32.h fat32_data isoboot.bin : isoboot.asm - @echo ===================================================== Assembling isoboot + @echo freeldr: Assembling isoboot @$(NASM_CMD) $(NFLAGS) -o isoboot.bin -f bin isoboot.asm ext2.bin : ext2.asm - @echo ===================================================== Assembling ext2 + @echo freeldr: Assembling ext2 @$(NASM_CMD) $(NFLAGS) -o ext2.bin -f bin ext2.asm @$(BIN2C) ext2.bin ext2.h ext2_data @@ -77,4 +77,4 @@ clean: @-$(RM) *.bin @-$(RM) *.h - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/fdebug/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/fdebug/Makefile 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/boot/freeldr/fdebug/Makefile 2005-03-05 20:50:25 UTC (rev 13833) @@ -30,23 +30,23 @@ all: fdebug.exe fdebug.exe: $(OBJS) - @echo ===================================================== LINKING fdebug + @echo freeldr: LINKING fdebug $(CC) $(FLAGS) -o fdebug.exe $(OBJS) -lgdi32 -lcomdlg32 -Wl,--subsystem,windows fdebug.res: fdebug.rc resource.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(RC) -o fdebug.res fdebug.rc -O coff fdebug.o: fdebug.c rs232.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o fdebug.o -c fdebug.c rs232.o: rs232.c rs232.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o rs232.o -c rs232.c clean: @-$(RM) *.o @-$(RM) *.res @-$(RM) *.exe - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile 2005-03-05 20:50:25 UTC (rev 13833) @@ -57,7 +57,7 @@ @-$(RM) setupldr.sys @-$(RM) setupldr.map @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) - @echo Clean ALL done. + @echo freeldr: Clean ALL done. ############################################# @@ -259,11 +259,11 @@ all : freeldr.sys setupldr.sys - @echo Make ALL done. + @echo freeldr: Make ALL done. freeldr.sys : $(ALL_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a - @echo ===================================================== LINKING $@ + @echo freeldr: LINKING $@ @$(LD) $(LFLAGS) -o freeldr.exe $(F_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a ifeq ($(FULL_MAP),yes) @$(OBJDUMP) -d -S freeldr.exe > freeldr.map @@ -274,7 +274,7 @@ setupldr.sys : $(ALL_OBJS) - @echo ===================================================== LINKING $@ + @echo freeldr: LINKING $@ @$(LD) $(LFLAGS) -Map setupldr.map -o setupldr.exe $(S_OBJS) ifeq ($(FULL_MAP),yes) @$(OBJDUMP) -d -S setupldr.exe > setupldr.map @@ -285,15 +285,15 @@ %.o :: %.c - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* @$(CC) $(CFLAGS) -o $@ -c $< @$(DEPTOOL) $*.d %.o :: %.S - @echo ===================================================== Assembling $* + @echo freeldr: Assembling $* @$(CC) $(CFLAGS) -o $@ -c $< @$(DEPTOOL) $*.d %.o :: %.asm - @echo ===================================================== Assembling $* + @echo freeldr: Assembling $* @$(NASM_CMD) $(NASMFLAGS) -o $@ $< _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/multiboot.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/multiboot.c 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/multiboot.c 2005-03-05 20:50:25 UTC (rev 13833) @@ -4,7 +4,7 @@ * FILE: boot/freeldr/freeldr/multiboot.c * PURPOSE: ReactOS Loader * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * Hartmutt Birr - SMP/PAE Code + * Hartmut Birr - SMP/PAE Code */ #include <freeldr.h> @@ -54,7 +54,7 @@ #define ApicPageTableIndexPae (APIC_BASE >> 21) -#define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase +#define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase /* Load Address of Next Module */ ULONG_PTR NextModuleBase = 0; @@ -217,7 +217,7 @@ /* Jump to Kernel */ PagedJump = (ASMCODE)KernelEntryPoint; PagedJump(Magic, &LoaderBlock); - } +} /*++ * FrLdrGetKernelBase @@ -239,27 +239,24 @@ FASTCALL FrLdrGetKernelBase(VOID) { - PCHAR p1; - PCHAR p2; + PCHAR p; /* Read Command Line */ - for(p1 = (PCHAR)&LoaderBlock.CommandLine; *p1 && (p2 = strchr(p1, '/')); p2++) { + p = (PCHAR)LoaderBlock.CommandLine; + while ((p = strchr(p, '/')) != NULL) { /* Find "/3GB" */ - if (!strnicmp(p2, "3GB", 3)) { + if (!strnicmp(p + 1, "3GB", 3)) { /* Make sure there's nothing following it */ - if (p2[3] == ' ' || p2[3] == 0) { + if (p[4] == ' ' || p[4] == 0) { /* Use 3GB */ KernelBase = 0xC0000000; - - } else { - - /* Use 2GB */ - KernelBase = 0x80000000; } } + + p++; } /* Set KernelBase */ _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/install/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/install/Makefile 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/boot/freeldr/install/Makefile 2005-03-05 20:50:25 UTC (rev 13833) @@ -35,18 +35,18 @@ @$(MAKE) --no-print-directory -C ../bootsect install.exe: $(OBJS) - @echo ===================================================== LINKING install + @echo freeldr: LINKING install $(CC) $(FLAGS) -o install.exe $(OBJS) install.o: install.c install.h volume.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o install.o -c install.c volume.o: volume.c volume.h install.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o volume.o -c volume.c clean: @-$(RM) *.o @-$(RM) *.exe - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/tools/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/tools/Makefile 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/boot/freeldr/tools/Makefile 2005-03-05 20:50:25 UTC (rev 13833) @@ -25,16 +25,16 @@ bin2c$(EXE_POSTFIX) all : $(TOOLS) - @echo Tools are up to date. + @echo freeldr: Tools are up to date. % :: all %$(EXE_POSTFIX): %.c - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* @$(HOST_CC) -Wall -O3 -o $@ $< .PHONY : clean clean: @-$(RM) $(TOOLS) - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: branches/xmlbuildsystem/reactos/bootdata/hivesys.inf --- branches/xmlbuildsystem/reactos/bootdata/hivesys.inf 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/bootdata/hivesys.inf 2005-03-05 20:50:25 UTC (rev 13833) @@ -254,6 +254,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","PagingFiles",0x00010000, \ "C:\reactos\pagefile.sys" +; Subsystems +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys " +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00070001,50,00,6f,00,73,00,69,00,78,00, 00,00,4f,00,73,00,32,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\os2ss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00070001,44,00,65,00,62,00,75,00,67,00, 00,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.ex e" + ; 3Com 3c905 Driver HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","ErrorControl",0x00010001 ,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","Group",0x00000000,"NDIS" @@ -573,7 +582,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x000100 01,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00 000003 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Bas e" -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00020000,"Sys tem32\DRIVERS\usbuhci.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000 ,"System32\DRIVERS\usbuhci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Tag",0x00010001,0x0000 000f HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","DisplayName",0x0000000 0,"ReactOS USB UHCI controller miniport driver" ;hard coded values for VMWARE @@ -582,6 +591,21 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","NextInstance",0x0 0010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615A D&REV_00\0000","Service",0x0000000,"usbuhci" +;USB OHCI Driver (Cromwell), especially the same name as windows OHCI miniport +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00 000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ErrorControl",0x00010 001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Start",0x00010001,0x0 0000003 +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Group",0x00000000,"Ba se" +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ImagePath",0x00020000 ,"System32\drivers\ohci.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Tag",0x00010001,0x000 0000f +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","DisplayName",0x000000 00,"ReactOS USB OHCI cromwell-type driver" +;hard coded values for Virtual PC 6/7 (Mac) +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci\Enum","0",0x00000000,"P CI\VEN_2955&DEV_6E61&SUBSYS_6E612955&REV_11\0000" +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci\Enum","Count",0x0001000 1,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci\Enum","NextInstance",0x 00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_2955&DEV_6E61&SUBSYS_6E6129 55&REV_11\0000","Service",0x0000000,"usbohci" + + ; ReactOS PCNet NIC driver ; To use the AMD supplied driver change the driver name to pcntn5m.sys ; _____ Modified: branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff --- branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff 2005-03-05 20:50:25 UTC (rev 13833) @@ -74,7 +74,6 @@ lib\dinput8\dinput8.dll 1 lib\dsound\dsound.dll 1 lib\dxdiagn\dxdiagn.dll 1 -lib\expat\expat.dll 1 lib\fmifs\fmifs.dll 1 lib\freetype\freetype.dll 1 lib\gdi32\gdi32.dll 1 @@ -97,6 +96,7 @@ lib\midimap\midimap.dll 1 lib\mmdrv\mmdrv.dll 1 lib\mpr\mpr.dll 1 +lib\msacm\msacm32.dll 1 lib\msafd\msafd.dll 1 lib\msgina\msgina.dll 1 lib\msimg32\msimg32.dll 1 @@ -120,7 +120,6 @@ lib\syssetup\syssetup.dll 1 lib\twain\twain_32.dll 1 lib\urlmon\urlmon.dll 1 -lib\unicode\wine_unicode.dll 1 lib\user32\user32.dll 1 lib\userenv\userenv.dll 1 lib\version\version.dll 1 @@ -151,9 +150,9 @@ subsys\system\format\format.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\regedit\regedit.exe 4 -subsys\system\regedt32\regedt32.exe 1 subsys\system\regsvr32\regsvr32.exe 1 subsys\system\reporterror\reporterror.exe 1 +subsys\system\rundll32\rundll32.exe 1 subsys\system\services\services.exe 1 subsys\system\setup\setup.exe 1 subsys\system\taskmgr\taskmgr.exe 1 _____ Modified: branches/xmlbuildsystem/reactos/bootdata/txtsetup.sif --- branches/xmlbuildsystem/reactos/bootdata/txtsetup.sif 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/bootdata/txtsetup.sif 2005-03-05 20:50:25 UTC (rev 13833) @@ -22,7 +22,6 @@ class2.sys = 3 disk.sys = 3 floppy.sys = 3 -hal.dll = 2 keyboard.sys = 3 l_intl.nls = 2 ntfs.sys = 3 @@ -48,7 +47,16 @@ [Computer] pci_up = "Standard-PC" +pci_mp = "Standard-PC Multiprocessor" +[Files.pci_up] +; <filename> = <directory_id>,<new name> +hal.dll = 2 + +[Files.pci_mp] +; <filename> = <directory_id>,<new name> +halmp.dll = 2,hal.dll + [Display] ;<id> = <user friendly name>,<spare>,<service key name> vga = "VGA Display",,Vga _____ Modified: branches/xmlbuildsystem/reactos/config --- branches/xmlbuildsystem/reactos/config 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/config 2005-03-05 20:50:25 UTC (rev 13833) @@ -7,12 +7,12 @@ # -# Which cpu should reactos optimze for +# 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 name and which cpu it can -# be optimze for. +# see gcc manual for more cpu names and which cpus it can +# be optimized for. # OARCH := i486 _____ Modified: branches/xmlbuildsystem/reactos/doc/README.WINE --- branches/xmlbuildsystem/reactos/doc/README.WINE 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/doc/README.WINE 2005-03-05 20:50:25 UTC (rev 13833) @@ -10,8 +10,8 @@ If you find that a function in ReactOS that is not implemented properly and is based on WINE sources, check the latest Winehq CVS and see if it has been fixed there. If so, please submit a patch to -ros-kernel(a)reactos.com. Otherwise please send a patch to both -wine-patches(a)winehq.com and ros-kernel(a)reactos.com +ros-dev(a)reactos.com. Otherwise please send a patch to both +wine-patches(a)winehq.com and ros-dev(a)reactos.com When porting a dll from WINE to ReactOS please take a look at how comctl32 has been imported. We start by creating a makefile that has @@ -26,51 +26,52 @@ work to import a new dll. The following build tools are derived from Wine. -reactos/tools/makedep # fast dependancy tool reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Wine Build tool for Creating *.def files +reactos/tools/winebuild # Synced to Wine-20050211 reactos/tools/wmc # Wine Message Compiler +reactos/tools/wrc # Synced to Wine-20050211 - The following shared libraries are a 100% port from Winehq sources. -reactos/lib/cabinet # Synced to Wine-20050111 -reactos/lib/comctl32 # Synced to Wine-20050111 -reactos/lib/comdlg32 # Synced to Wine-20050111 -reactos/lib/dinput # Synced to Wine-20050111 -reactos/lib/dinput8 # Synced to Wine-20050111 -reactos/lib/icmp # Synced to Wine-20050111 +reactos/lib/cabinet # Synced to Wine-20050211 +reactos/lib/comctl32 # Synced to Wine-20050211 +reactos/lib/comdlg32 # Synced to Wine-20050211 +reactos/lib/dinput # Synced to Wine-20050211 +reactos/lib/dinput8 # Synced to Wine-20050211 +reactos/lib/icmp # Synced to Wine-20050211 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050111 +reactos/lib/mpr # Synced to Wine-20050211 reactos/lib/msacm # Out of sync -reactos/lib/msi # Synced to Wine-20050111 +reactos/lib/msimg32 # Synced to Wine-20050211 +reactos/lib/msi # Synced to Wine-20050211 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050111 -reactos/lib/oleaut32 # Synced to Wine-20050111 -reactos/lib/oledlg # Synced to Wine-20050111 -reactos/lib/olepro32 # Synced to Wine-20050111 -reactos/lib/richedit # Synced to Wine-20050111 -reactos/lib/rpcrt4 # Synced to Wine-20050111 +reactos/lib/ole32 # Synced to Wine-20050211 +reactos/lib/oleaut32 # Synced to Wine-20050211 +reactos/lib/oledlg # Synced to Wine-20050211 +reactos/lib/olepro32 # Synced to Wine-20050211 +reactos/lib/richedit # Synced to Wine-20050211 +reactos/lib/rpcrt4 # Synced to Wine-20050211 reactos/lib/setupapi # Synced to Wine-20050125 # CVS -reactos/lib/shell32 # Synced to Wine-20050111 -reactos/lib/shdocvw # Synced to Wine-20050111 -reactos/lib/shlwapi # Synced to Wine-20050111 +reactos/lib/shell32 # Synced to Wine-20050211 +reactos/lib/shdocvw # Synced to Wine-20050211 +reactos/lib/shlwapi # Synced to Wine-20050211 reactos/lib/twain # Out of sync -reactos/lib/unicode # Dependancy on this lib needs to be removed. Synced to Wine-20050111 -reactos/lib/urlmon # Synced to Wine-20050111 +reactos/lib/unicode # Dependancy on this lib needs to be removed. Synced to Wine-20050211 +reactos/lib/urlmon # Synced to Wine-20050211 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20050111 -reactos/lib/winmm/midimap # Synced to Wine-20050111 -reactos/lib/winmm/wavemap # Synced to Wine-20050111 +reactos/lib/winmm # Synced to Wine-20050211 +reactos/lib/winmm/midimap # Synced to Wine-20050211 +reactos/lib/winmm/wavemap # Synced to Wine-20050211 ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync +reactos/subsys/system/msiexec # Synced to Wine-20050211 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files @@ -80,7 +81,7 @@ reactos/lib/uuid # advapi32 - - reactos/lib/advapi32/crypyto/*.c # Synced to Wine-20041201 + reactos/lib/advapi32/crypt/*.c # ekohl says we're not sharing this gdi32 - reactos/lib/gdi32/objects/linedda.c # Out of sync @@ -100,3 +101,31 @@ reactos/lib/user32/misc/wsprintf.c # Out of sync reactos/lib/user32/windows/mdi.c # Out of sync +- Cd to the parent directory of your top-level "reactos" directory +- Check out the Wine release: "cvs -d :pserver:cvs@cvs.winehq.com:2401/home/wine co wine -r Wine-20050211" +- Create "vendor" directory (as a sibling of your top-level "reactos" directory) +- Cd to the vendor dir and check out the current vendor drop: + "svn co svn://svn.reactos.com/vendor/wine". +- For each component shared with Wine (e.g. cabinet): + "del vendor\wine\dlls\cabinet\current\*" + "copy wine\dlls\cabinet vendor\wine\dlls\cabinet\current" + "del vendor\wine\dlls\cabinet\current\.cvsignore" + Check svn status, svn add/delete files as needed + Tag new Wine release "svn copy vendor\wine\dlls\cabinet\current vendor\wine\dlls\cabinet\Wine-20050211" +- Commit the vendor drop: svn commit vendor\wine -m "Wine-20050211 vendor drop" +- Determine the revision number of the last Wine tag by looking at http://svn.reactos.com/viewcvs/tags/ + and finding the last Wine-yyyymmdd-sync tag, e.g. Wine-20050111-sync had rev 13007 +- For each component shared with Wine (e.g. cabinet): +- "cd reactos\lib\cabinet" +- Check for changes in the ReactOS tree: "svn diff -r 13007" (13007 is the revno of the previous sync). + If any changes are found, see if they're present in the Wine code. If not, submit to WineHQ + if apropriate. +- Merge in Wine changes: + "svn merge svn://svn.reactos.com/vendor/wine/dlls/cabinet/Wine-20050111 + svn://svn.reactos.com/vendor/wine/dlls/cabinet/current" +- Fix any merge conflicts +- Build and test (building will sometimes require adjusting header files) +- Check which files were changed: "svn status" +- For each of the changed files, get the WineHQ CVS log. Copy author and CVS commit message into a + commit log +- Commit changed files "svn commit" using generated commit log as commit message _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.h --- branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.h 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.h 2005-03-05 20:50:25 UTC (rev 13833) @@ -3,6 +3,8 @@ #include <ddk/ntifs.h> +#define USE_ROS_CC_AND_FS + #define CDFS_BASIC_SECTOR 2048 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 #define BLOCKSIZE CDFS_BASIC_SECTOR _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cleanup.c --- branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cleanup.c 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cleanup.c 2005-03-05 20:50:25 UTC (rev 13833) @@ -54,7 +54,11 @@ /* Uninitialize file cache if initialized for this file object. */ if (FileObject->SectionObjectPointer && FileObject->SectionObjectPointer->SharedCacheMap) { +#ifdef USE_ROS_CC_AND_FS CcRosReleaseFileCache (FileObject); +#else + CcUninitializeCacheMap (FileObject, NULL, NULL); +#endif } return STATUS_SUCCESS; _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/fcb.c --- branches/xmlbuildsystem/reactos/drivers/fs/cdfs/fcb.c 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/drivers/fs/cdfs/fcb.c 2005-03-05 20:50:25 UTC (rev 13833) @@ -241,6 +241,7 @@ Fcb->FileObject = FileObject; Fcb->DevExt = Vcb; +#ifdef USE_ROS_AND_FS Status = CcRosInitializeFileCache(FileObject, PAGE_SIZE); if (!NT_SUCCESS(Status)) @@ -248,6 +249,14 @@ DbgPrint("CcRosInitializeFileCache failed\n"); KEBUGCHECK(0); } +#else + Status = STATUS_SUCCESS; + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); +#endif ObDereferenceObject(FileObject); Fcb->Flags |= FCB_CACHE_INITIALIZED; @@ -411,7 +420,6 @@ PFCB Fcb, PFILE_OBJECT FileObject) { - NTSTATUS Status; PCCB newCCB; newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), TAG_CCB); @@ -426,9 +434,11 @@ FileObject->FsContext2 = newCCB; newCCB->PtrFileObject = FileObject; Fcb->DevExt = Vcb; - + if (CdfsFCBIsDirectory(Fcb)) { +#ifdef USE_ROS_CC_AND_FS + NTSTATUS Status; Status = CcRosInitializeFileCache(FileObject, PAGE_SIZE); if (!NT_SUCCESS(Status)) @@ -436,6 +446,13 @@ DbgPrint("CcRosInitializeFileCache failed\n"); KEBUGCHECK(0); } +#else + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); +#endif Fcb->Flags |= FCB_CACHE_INITIALIZED; } _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/fsctl.c --- branches/xmlbuildsystem/reactos/drivers/fs/cdfs/fsctl.c 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/drivers/fs/cdfs/fsctl.c 2005-03-05 20:50:25 UTC (rev 13833) @@ -402,7 +402,7 @@ Fcb->Entry.ExtentLocationL = 0; Fcb->Entry.DataLengthL = (DeviceExt->CdInfo.VolumeSpaceSize + DeviceExt->CdInfo.VolumeOffset) * BLOCKSIZE; - +#ifdef USE_ROS_CC_AND_FS Status = CcRosInitializeFileCache(DeviceExt->StreamFileObject, PAGE_SIZE); if (!NT_SUCCESS (Status)) @@ -410,7 +410,13 @@ DbgPrint("CcRosInitializeFileCache failed\n"); goto ByeBye; } - +#else + CcInitializeCacheMap(DeviceExt->StreamFileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + TRUE, + NULL, + NULL); +#endif ExInitializeResourceLite(&DeviceExt->VcbResource); ExInitializeResourceLite(&DeviceExt->DirResource); _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/rw.c --- branches/xmlbuildsystem/reactos/drivers/fs/cdfs/rw.c 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/drivers/fs/cdfs/rw.c 2005-03-05 20:50:25 UTC (rev 13833) @@ -86,7 +86,15 @@ if (FileObject->PrivateCacheMap == NULL) { +#ifdef ROS_USE_CC_AND_FS CcRosInitializeFileCache(FileObject, PAGE_SIZE); +#else + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); +#endif } FileOffset.QuadPart = (LONGLONG)ReadOffset; _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/create.c --- branches/xmlbuildsystem/reactos/drivers/fs/np/create.c 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/drivers/fs/np/create.c 2005-03-05 20:50:25 UTC (rev 13833) @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/np/create.c + * FILE: drivers/fs/np/create.c * PURPOSE: Named pipe filesystem * PROGRAMMER: David Welch <welch(a)cwcom.net> */ @@ -48,17 +48,18 @@ NpfsFindListeningServerInstance(PNPFS_PIPE Pipe) { PLIST_ENTRY CurrentEntry; - PNPFS_FCB ServerFcb; + PNPFS_WAITER_ENTRY Waiter; - CurrentEntry = Pipe->ServerFcbListHead.Flink; - while (CurrentEntry != &Pipe->ServerFcbListHead) + CurrentEntry = Pipe->WaiterListHead.Flink; + while (CurrentEntry != &Pipe->WaiterListHead) { - ServerFcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, FcbListEntry); - if (ServerFcb->PipeState == FILE_PIPE_LISTENING_STATE) + Waiter = CONTAINING_RECORD(CurrentEntry, NPFS_WAITER_ENTRY, Entry); + if (Waiter->Fcb->PipeState == FILE_PIPE_LISTENING_STATE) { - DPRINT("Server found! Fcb %p\n", ServerFcb); - return ServerFcb; + DPRINT("Server found! Fcb %p\n", Waiter->Fcb); + return Waiter->Fcb; } + CurrentEntry = CurrentEntry->Flink; } @@ -66,6 +67,35 @@ } +static VOID +NpfsSignalAndRemoveListeningServerInstance(PNPFS_PIPE Pipe, + PNPFS_FCB Fcb) +{ + PLIST_ENTRY CurrentEntry; + PNPFS_WAITER_ENTRY Waiter; + + CurrentEntry = Pipe->WaiterListHead.Flink; + while (CurrentEntry != &Pipe->WaiterListHead) + { + Waiter = CONTAINING_RECORD(CurrentEntry, NPFS_WAITER_ENTRY, Entry); + if (Waiter->Fcb == Fcb) + { + DPRINT("Server found! Fcb %p\n", Waiter->Fcb); + + KeSetEvent(Waiter->Irp->UserEvent, 0, FALSE); + Waiter->Irp->UserIosb->Status = FILE_PIPE_CONNECTED_STATE; + Waiter->Irp->UserIosb->Information = 0; + IoCompleteRequest(Waiter->Irp, IO_NO_INCREMENT); + + RemoveEntryList(&Waiter->Entry); + ExFreePool(Waiter); + return; + } + CurrentEntry = CurrentEntry->Flink; + } +} + + NTSTATUS STDCALL NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -164,9 +194,9 @@ ClientFcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; /* Initialize data list. */ - if (Pipe->InboundQuota) + if (Pipe->OutboundQuota) { - ClientFcb->Data = ExAllocatePool(NonPagedPool, Pipe->InboundQuota); + ClientFcb->Data = ExAllocatePool(NonPagedPool, Pipe->OutboundQuota); if (ClientFcb->Data == NULL) { DPRINT("No memory!\n"); @@ -185,8 +215,8 @@ ClientFcb->ReadPtr = ClientFcb->Data; ClientFcb->WritePtr = ClientFcb->Data; ClientFcb->ReadDataAvailable = 0; - ClientFcb->WriteQuotaAvailable = Pipe->InboundQuota; - ClientFcb->MaxDataLength = Pipe->InboundQuota; + ClientFcb->WriteQuotaAvailable = Pipe->OutboundQuota; + ClientFcb->MaxDataLength = Pipe->OutboundQuota; KeInitializeSpinLock(&ClientFcb->DataListLock); KeInitializeEvent(&ClientFcb->ConnectEvent, SynchronizationEvent, FALSE); KeInitializeEvent(&ClientFcb->Event, SynchronizationEvent, FALSE); @@ -206,9 +236,8 @@ ClientFcb->PipeState = FILE_PIPE_CONNECTED_STATE; ServerFcb->PipeState = FILE_PIPE_CONNECTED_STATE; - /* Wake server thread */ - DPRINT("Setting the ConnectEvent for %x\n", ServerFcb); - KeSetEvent(&ServerFcb->ConnectEvent, 0, FALSE); + /* Signal the server thread and remove it from the waiter list */ + NpfsSignalAndRemoveListeningServerInstance(Pipe, ServerFcb); } KeUnlockMutex(&Pipe->FcbListLock); @@ -318,6 +347,7 @@ InitializeListHead(&Pipe->ServerFcbListHead); InitializeListHead(&Pipe->ClientFcbListHead); + InitializeListHead(&Pipe->WaiterListHead); KeInitializeMutex(&Pipe->FcbListLock, 0); Pipe->PipeType = Buffer->NamedPipeType; @@ -381,9 +411,9 @@ KeUnlockMutex(&DeviceExt->PipeListLock); } - if (Pipe->OutboundQuota) + if (Pipe->InboundQuota) { - Fcb->Data = ExAllocatePool(NonPagedPool, Pipe->OutboundQuota); + Fcb->Data = ExAllocatePool(NonPagedPool, Pipe->InboundQuota); if (Fcb->Data == NULL) { ExFreePool(Fcb); @@ -407,8 +437,8 @@ Fcb->ReadPtr = Fcb->Data; Fcb->WritePtr = Fcb->Data; Fcb->ReadDataAvailable = 0; - Fcb->WriteQuotaAvailable = Pipe->OutboundQuota; - Fcb->MaxDataLength = Pipe->OutboundQuota; + Fcb->WriteQuotaAvailable = Pipe->InboundQuota; + Fcb->MaxDataLength = Pipe->InboundQuota; KeInitializeSpinLock(&Fcb->DataListLock); Pipe->CurrentInstances++; @@ -442,9 +472,8 @@ NTSTATUS STDCALL -NpfsClose( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NpfsClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PNPFS_DEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION IoStack; @@ -493,10 +522,8 @@ { if (Fcb->OtherSide) { -#ifndef FIN_WORKAROUND_READCLOSE Fcb->OtherSide->PipeState = FILE_PIPE_CLOSING_STATE; Fcb->OtherSide->OtherSide = NULL; -#endif /* * Signaling the write event. If is possible that an other * thread waits for an empty buffer. @@ -504,40 +531,16 @@ KeSetEvent(&Fcb->OtherSide->Event, IO_NO_INCREMENT, FALSE); } -#ifndef FIN_WORKAROUND_READCLOSE Fcb->PipeState = 0; -#endif } FileObject->FsContext = NULL; -#ifndef FIN_WORKAROUND_READCLOSE RemoveEntryList(&Fcb->FcbListEntry); if (Fcb->Data) ExFreePool(Fcb->Data); ExFreePool(Fcb); -#else - Fcb->PipeState = FILE_PIPE_CLOSING_STATE; - if (Fcb->OtherSide == NULL || - Fcb->OtherSide->PipeState == FILE_PIPE_CLOSING_STATE) - { - if (Server && Fcb->OtherSide != NULL && - Fcb->OtherSide->PipeState == FILE_PIPE_CLOSING_STATE) - { - RemoveEntryList(&Fcb->OtherSide->FcbListEntry); - if (Fcb->OtherSide->Data) - ExFreePool(Fcb->OtherSide->Data); - ExFreePool(Fcb->OtherSide); - } - RemoveEntryList(&Fcb->FcbListEntry); - if (Fcb->Data) - ExFreePool(Fcb->Data); - - ExFreePool(Fcb); - } -#endif - KeUnlockMutex(&Pipe->FcbListLock); if (IsListEmpty(&Pipe->ServerFcbListHead) && _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/finfo.c --- branches/xmlbuildsystem/reactos/drivers/fs/np/finfo.c 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/drivers/fs/np/finfo.c 2005-03-05 20:50:25 UTC (rev 13833) @@ -2,9 +2,9 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/np/finfo.c + * FILE: drivers/fs/np/finfo.c * PURPOSE: Named pipe filesystem - * PROGRAMMER: Eric Kohl <ekohl(a)rz-online.de> + * PROGRAMMER: Eric Kohl */ /* INCLUDES ******************************************************************/ @@ -36,7 +36,7 @@ // Info->CompletionMode = *BufferLength -= sizeof(FILE_PIPE_INFORMATION); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -76,7 +76,7 @@ } *BufferLength -= sizeof(FILE_PIPE_LOCAL_INFORMATION); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -93,24 +93,24 @@ PVOID SystemBuffer; ULONG BufferLength; NTSTATUS Status; - + DPRINT("NpfsQueryInformation(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - + IoStack = IoGetCurrentIrpStackLocation (Irp); FileInformationClass = IoStack->Parameters.QueryFile.FileInformationClass; DeviceExtension = DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Fcb = (PNPFS_FCB)FileObject->FsContext; Pipe = Fcb->Pipe; - + SystemBuffer = Irp->AssociatedIrp.SystemBuffer; BufferLength = IoStack->Parameters.QueryFile.Length; - + DPRINT("Pipe name: %wZ\n", &Pipe->PipeName); DPRINT("FileInformationClass %d\n", FileInformationClass); DPRINT("SystemBuffer %p\n", SystemBuffer); DPRINT("BufferLength %lu\n", BufferLength); - + switch (FileInformationClass) { case FilePipeInformation: @@ -134,7 +134,7 @@ default: Status = STATUS_NOT_SUPPORTED; } - + Irp->IoStatus.Status = Status; if (NT_SUCCESS(Status)) Irp->IoStatus.Information = @@ -142,8 +142,8 @@ else Irp->IoStatus.Information = 0; IoCompleteRequest (Irp, IO_NO_INCREMENT); - - return(Status); + + return Status; } @@ -196,7 +196,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); + return Status; } /* EOF */ _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/fsctrl.c --- branches/xmlbuildsystem/reactos/drivers/fs/np/fsctrl.c 2005-03-05 20:44:57 UTC (rev 13832) +++ branches/xmlbuildsystem/reactos/drivers/fs/np/fsctrl.c 2005-03-05 20:50:25 UTC (rev 13833) @@ -2,10 +2,10 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/np/fsctrl.c + * FILE: drivers/fs/np/fsctrl.c * PURPOSE: Named pipe filesystem * PROGRAMMER: David Welch <welch(a)cwcom.net> - * Eric Kohl <ekohl(a)rz-online.de> + * Eric Kohl */ [truncated at 1000 lines; 81657 more skipped]

19 years, 9 months

[ion] 13832: - FreeLdr Part II (ntoskrnl is now relocated, removes 3GB compiler flag). Note that there is a bug in LD which Filip and I are examining, so do not try this yet.

by ion＠svn.reactos.com

- FreeLdr Part II (ntoskrnl is now relocated, removes 3GB compiler flag). Note that there is a bug in LD which Filip and I are examining, so do not try this yet. - Fix Registry ObRef/ObDeref bug -- Hartmut - Fix SID Capture Bug -- Thomas - Use KPRCB pointer properly (results in more portable and much faster code) Modified: branches/alex_devel_branch/reactos/boot/freeldr/freeldr/multiboot.c Modified: branches/alex_devel_branch/reactos/config Modified: branches/alex_devel_branch/reactos/include/ntos/security.h Modified: branches/alex_devel_branch/reactos/include/ntos/zwtypes.h Modified: branches/alex_devel_branch/reactos/lib/ntdll/def/ntdll.def Modified: branches/alex_devel_branch/reactos/lib/ntdll/rtl/misc.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/Makefile Modified: branches/alex_devel_branch/reactos/ntoskrnl/cm/registry.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/cm/regobj.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/sysinfo.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/i386/ps.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ke.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ps.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/create.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/device.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/dir.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/kd/kdebug.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/catch.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/clock.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/device.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/dpc.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/fpu.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/gdt.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/irq.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/kernel.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/ipi.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/wait.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ob/object.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/i386/continue.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/idle.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/kill.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/process.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/thread.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/w32call.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/se/sd.c Modified: branches/alex_devel_branch/reactos/w32api/include/ddk/winddk.h _____ Modified: branches/alex_devel_branch/reactos/boot/freeldr/freeldr/multiboot.c --- branches/alex_devel_branch/reactos/boot/freeldr/freeldr/multiboot.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/boot/freeldr/freeldr/multiboot.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -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); _____ Modified: branches/alex_devel_branch/reactos/config --- branches/alex_devel_branch/reactos/config 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/config 2005-03-05 20:44:57 UTC (rev 13832) @@ -5,7 +5,6 @@ # 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 @@ -14,7 +13,6 @@ # see gcc manual for more cpu names and which cpus it can # be optimized for. # - OARCH := pentium2 # @@ -43,11 +41,6 @@ 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 _____ Modified: branches/alex_devel_branch/reactos/include/ntos/security.h --- branches/alex_devel_branch/reactos/include/ntos/security.h 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/include/ntos/security.h 2005-03-05 20:44:57 UTC (rev 13832) @@ -160,7 +160,7 @@ #define TOKEN_WRITE (0x200e0L) #define TOKEN_EXECUTE (0x20000L) -typedef BOOL SECURITY_CONTEXT_TRACKING_MODE; +typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE, *PSECURITY_CONTEXT_TRACKING_MODE; #define SECURITY_STATIC_TRACKING (0) #define SECURITY_DYNAMIC_TRACKING (1) @@ -193,13 +193,14 @@ TokenOrigin } TOKEN_INFORMATION_CLASS; -typedef ULONG SECURITY_IMPERSONATION_LEVEL, *PSECURITY_IMPERSONATION_LEVEL; +typedef enum _SECURITY_IMPERSONATION_LEVEL +{ + SecurityAnonymous, + SecurityIdentification, + SecurityImpersonation, + SecurityDelegation +} SECURITY_IMPERSONATION_LEVEL, *PSECURITY_IMPERSONATION_LEVEL; -#define SecurityAnonymous ((SECURITY_IMPERSONATION_LEVEL)0) -#define SecurityIdentification ((SECURITY_IMPERSONATION_LEVEL)1) -#define SecurityImpersonation ((SECURITY_IMPERSONATION_LEVEL)2) -#define SecurityDelegation ((SECURITY_IMPERSONATION_LEVEL)3) - typedef ULONG ACCESS_MASK, *PACCESS_MASK; typedef ULONG TOKEN_TYPE, *PTOKEN_TYPE; _____ Modified: branches/alex_devel_branch/reactos/include/ntos/zwtypes.h --- branches/alex_devel_branch/reactos/include/ntos/zwtypes.h 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/include/ntos/zwtypes.h 2005-03-05 20:44:57 UTC (rev 13832) @@ -1220,9 +1220,17 @@ #define ProcessSessionInformation 24 #define ProcessForegroundInformation 25 #define ProcessWow64Information 26 -/* ReactOS private. */ #define ProcessImageFileName 27 -#define MaxProcessInfoClass 28 +#define ProcessLUIDDeviceMapsEnabled 28 +#define ProcessBreakOnTermination 29 +#define ProcessDebugObjectHandle 30 +#define ProcessDebugFlags 31 +#define ProcessHandleTracing 32 +#define ProcessUnknown33 33 +#define ProcessUnknown34 34 +#define ProcessUnknown35 35 +#define ProcessCookie 36 +#define MaxProcessInfoClass 36 /* * thread query / set information class _____ Modified: branches/alex_devel_branch/reactos/lib/ntdll/def/ntdll.def --- branches/alex_devel_branch/reactos/lib/ntdll/def/ntdll.def 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/lib/ntdll/def/ntdll.def 2005-03-05 20:44:57 UTC (rev 13832) @@ -362,6 +362,7 @@ RtlCustomCPToUnicodeN@24 RtlCutoverTimeToSystemTime@16 RtlDeNormalizeProcessParams@4 +RtlDecodePointer@4=RtlEncodePointer@4 RtlDecompressBuffer@24 RtlDecompressFragment@32 RtlDelete@4 @@ -394,6 +395,7 @@ RtlDumpResource@4 RtlDuplicateUnicodeString@12 RtlEmptyAtomTable@8 +RtlEncodePointer@4 RtlEnlargedIntegerMultiply@8 RtlEnlargedUnsignedDivide@16 RtlEnlargedUnsignedMultiply@8 _____ Modified: branches/alex_devel_branch/reactos/lib/ntdll/rtl/misc.c --- branches/alex_devel_branch/reactos/lib/ntdll/rtl/misc.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/lib/ntdll/rtl/misc.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -15,6 +15,9 @@ #include <ddk/ntddk.h> #include <ntdll/rtl.h> +#define NDEBUG +#include <ntdll/ntdll.h> + /********************************************************************** * NAME EXPORTED * RtlGetNtProductType @@ -107,3 +110,30 @@ PPEB pPeb = NtCurrentPeb(); return pPeb->NtGlobalFlag; } + + +/* + * @implemented + */ +PVOID +STDCALL +RtlEncodePointer(IN PVOID Pointer) +{ + ULONG Cookie; + NTSTATUS Status; + + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessCookie, + &Cookie, + sizeof(Cookie), + NULL); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("Failed to receive the process cookie! Status: 0x%x\n", Status); + return NULL; + } + + return (PVOID)((ULONG_PTR)Pointer ^ Cookie); +} + _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/Makefile --- branches/alex_devel_branch/reactos/ntoskrnl/Makefile 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/Makefile 2005-03-05 20:44:57 UTC (rev 13832) @@ -47,12 +47,7 @@ TARGET_CFLAGS += -D_DISABLE_TIDENTS # 3GB User Mode Memory Space support -ifeq ($(3GB), 1) -TARGET_CFLAGS += -D__3GB__ -TARGET_BASE = 0xC0000000 -else TARGET_BASE = 0x80000000 -endif ifneq ($(DBG), 0) TARGET_CFLAGS += -DDBG _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/cm/registry.c --- branches/alex_devel_branch/reactos/ntoskrnl/cm/registry.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/cm/registry.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -20,7 +20,6 @@ POBJECT_TYPE CmiKeyType = NULL; PREGISTRY_HIVE CmiVolatileHive = NULL; -KSPIN_LOCK CmiKeyListLock; LIST_ENTRY CmiHiveListHead; @@ -361,7 +360,6 @@ CmiVolatileHive->RootSecurityCell = RootSecurityCell; #endif - KeInitializeSpinLock(&CmiKeyListLock); /* Create '\Registry\Machine' key. */ RtlInitUnicodeString(&KeyName, _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/cm/regobj.c --- branches/alex_devel_branch/reactos/ntoskrnl/cm/regobj.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/cm/regobj.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -76,6 +76,9 @@ KeyName.Length); KeyName.Buffer[KeyName.Length / sizeof(WCHAR)] = 0; + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); FoundObject = CmiScanKeyList(ParsedKey, &KeyName, @@ -91,6 +94,8 @@ Attributes); if (!NT_SUCCESS(Status) || (SubKeyCell == NULL)) { + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); RtlFreeUnicodeString(&KeyName); return(STATUS_UNSUCCESSFUL); } @@ -104,6 +109,9 @@ &LinkPath); if (NT_SUCCESS(Status)) { + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + DPRINT("LinkPath '%wZ'\n", &LinkPath); /* build new FullPath for reparsing */ @@ -152,6 +160,8 @@ (PVOID*)&FoundObject); if (!NT_SUCCESS(Status)) { + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); RtlFreeUnicodeString(&KeyName); return(Status); } @@ -179,7 +189,12 @@ if (NT_SUCCESS(Status)) { DPRINT("LinkPath '%wZ'\n", &LinkPath); + + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + ObDereferenceObject(FoundObject); + /* build new FullPath for reparsing */ TargetPath.MaximumLength = LinkPath.MaximumLength; if (EndPtr != NULL) @@ -213,6 +228,8 @@ } } } + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); DPRINT("CmiObjectParse: %s\n", FoundObject->Name); @@ -269,6 +286,10 @@ ObReferenceObject (ParentKeyObject); + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) { DPRINT1("Key not found in parent list ???\n"); @@ -297,6 +318,9 @@ ObDereferenceObject (ParentKeyObject); + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + if (KeyObject->NumberOfSubKeys) { KEBUGCHECK(REGISTRY_ERROR); @@ -527,11 +551,9 @@ CmiAddKeyToList(PKEY_OBJECT ParentKey, PKEY_OBJECT NewKey) { - KIRQL OldIrql; DPRINT("ParentKey %.08x\n", ParentKey); - KeAcquireSpinLock(&CmiKeyListLock, &OldIrql); if (ParentKey->SizeOfSubKeys <= ParentKey->NumberOfSubKeys) { @@ -563,7 +585,6 @@ NULL, UserMode); NewKey->ParentKey = ParentKey; - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); } @@ -571,11 +592,9 @@ CmiRemoveKeyFromList(PKEY_OBJECT KeyToRemove) { PKEY_OBJECT ParentKey; - KIRQL OldIrql; DWORD Index; ParentKey = KeyToRemove->ParentKey; - KeAcquireSpinLock(&CmiKeyListLock, &OldIrql); /* FIXME: If list maintained in alphabetic order, use dichotomic search */ for (Index = 0; Index < ParentKey->NumberOfSubKeys; Index++) { @@ -586,7 +605,6 @@ &ParentKey->SubKeys[Index + 1], (ParentKey->NumberOfSubKeys - Index - 1) * sizeof(PKEY_OBJECT)); ParentKey->NumberOfSubKeys--; - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); DPRINT("Dereference parent key: 0x%x\n", ParentKey); @@ -594,7 +612,6 @@ return STATUS_SUCCESS; } } - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); return STATUS_UNSUCCESSFUL; } @@ -606,13 +623,12 @@ ULONG Attributes) { PKEY_OBJECT CurKey; - KIRQL OldIrql; ULONG Index; - + NTSTATUS Status; + DPRINT("Scanning key list for: %wZ (Parent: %wZ)\n", KeyName, &Parent->Name); - KeAcquireSpinLock(&CmiKeyListLock, &OldIrql); /* FIXME: if list maintained in alphabetic order, use dichotomic search */ for (Index=0; Index < Parent->NumberOfSubKeys; Index++) { @@ -622,8 +638,7 @@ if ((KeyName->Length == CurKey->Name.Length) && (_wcsicmp(KeyName->Buffer, CurKey->Name.Buffer) == 0)) { - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); - return CurKey; + break; } } else @@ -631,13 +646,23 @@ if ((KeyName->Length == CurKey->Name.Length) && (wcscmp(KeyName->Buffer, CurKey->Name.Buffer) == 0)) { - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); - return CurKey; + break; } } } - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); + if (Index < Parent->NumberOfSubKeys) + { + Status = ObReferenceObjectByPointer(CurKey, + STANDARD_RIGHTS_REQUIRED, + NULL, + UserMode); + if (NT_SUCCESS(Status)) + { + return CurKey; + } + } + return NULL; } _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/sysinfo.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/sysinfo.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/sysinfo.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -46,17 +46,18 @@ PULONG CpuUsage ) { - PKPCR Pcr; + PKPRCB Prcb; ULONG TotalTime; - ULONG PercentTime = 0; ULONGLONG ScaledIdle; - Pcr = KeGetCurrentKPCR(); + Prcb = KeGetCurrentPrcb(); - ScaledIdle = Pcr->PrcbData.IdleThread->KernelTime * 100; - TotalTime = Pcr->PrcbData.KernelTime + Pcr->PrcbData.UserTime; - if (TotalTime) PercentTime = 100 - (ScaledIdle / TotalTime); - CpuUsage = &PercentTime; + ScaledIdle = Prcb->IdleThread->KernelTime * 100; + TotalTime = Prcb->KernelTime + Prcb->UserTime; + if (TotalTime != 0) + *CpuUsage = 100 - (ScaledIdle / TotalTime); + else + *CpuUsage = 0; } /* @@ -70,20 +71,13 @@ PULONG ProcessorNumber ) { - PKPCR Pcr; - ULONG TotalTime; - ULONG ThreadTime; - ULONG ProcNumber; + PKPRCB Prcb; - Pcr = KeGetCurrentKPCR(); + Prcb = KeGetCurrentPrcb(); - TotalTime = Pcr->PrcbData.KernelTime + Pcr->PrcbData.UserTime; - ThreadTime = Pcr->PrcbData.CurrentThread->KernelTime; - ProcNumber = Pcr->ProcessorNumber; - - ThreadKernelTime = &ThreadTime; - TotalCpuTime = &TotalTime; - ProcessorNumber = &ProcNumber; + *ThreadKernelTime = Prcb->KernelTime + Prcb->UserTime; + *TotalCpuTime = Prcb->CurrentThread->KernelTime; + *ProcessorNumber = KeGetCurrentKPCR()->ProcessorNumber; } /* @@ -377,7 +371,7 @@ { PSYSTEM_PROCESSOR_INFORMATION Spi = (PSYSTEM_PROCESSOR_INFORMATION) Buffer; - PKPCR Pcr; + PKPRCB Prcb; *ReqSize = sizeof (SYSTEM_PROCESSOR_INFORMATION); /* * Check user buffer's size @@ -386,12 +380,12 @@ { return (STATUS_INFO_LENGTH_MISMATCH); } - Pcr = KeGetCurrentKPCR(); + Prcb = KeGetCurrentPrcb(); Spi->ProcessorArchitecture = 0; /* Intel Processor */ - Spi->ProcessorLevel = Pcr->PrcbData.CpuType; - Spi->ProcessorRevision = Pcr->PrcbData.CpuStep; + Spi->ProcessorLevel = Prcb->CpuType; + Spi->ProcessorRevision = Prcb->CpuStep; Spi->Unknown = 0; - Spi->FeatureBits = Pcr->PrcbData.FeatureBits; + Spi->FeatureBits = Prcb->FeatureBits; DPRINT("Arch %d Level %d Rev 0x%x\n", Spi->ProcessorArchitecture, Spi->ProcessorLevel, Spi->ProcessorRevision); @@ -727,7 +721,7 @@ ULONG i; LARGE_INTEGER CurrentTime; - PKPCR Pcr; + PKPRCB Prcb; *ReqSize = KeNumberProcessors * sizeof (SYSTEM_PROCESSORTIME_INFO); /* @@ -739,19 +733,17 @@ } CurrentTime.QuadPart = KeQueryInterruptTime(); - Pcr = (PKPCR)KPCR_BASE; + Prcb = ((PKPCR)KPCR_BASE)->Prcb; for (i = 0; i < KeNumberProcessors; i++) { - - Spi->TotalProcessorRunTime.QuadPart = (Pcr->PrcbData.IdleThread->KernelTime + Pcr->PrcbData.IdleThread->UserTime) * 100000LL; // IdleTime - Spi->TotalProcessorTime.QuadPart = Pcr->PrcbData.KernelTime * 100000LL; // KernelTime - Spi->TotalProcessorUserTime.QuadPart = Pcr->PrcbData.UserTime * 100000LL; - Spi->TotalDPCTime.QuadPart = Pcr->PrcbData.DpcTime * 100000LL; - Spi->TotalInterruptTime.QuadPart = Pcr->PrcbData.InterruptTime * 100000LL; - Spi->TotalInterrupts = Pcr->PrcbData.InterruptCount; // Interrupt Count + Spi->TotalProcessorRunTime.QuadPart = (Prcb->IdleThread->KernelTime + Prcb->IdleThread->UserTime) * 100000LL; // IdleTime + Spi->TotalProcessorTime.QuadPart = Prcb->KernelTime * 100000LL; // KernelTime + Spi->TotalProcessorUserTime.QuadPart = Prcb->UserTime * 100000LL; + Spi->TotalDPCTime.QuadPart = Prcb->DpcTime * 100000LL; + Spi->TotalInterruptTime.QuadPart = Prcb->InterruptTime * 100000LL; + Spi->TotalInterrupts = Prcb->InterruptCount; // Interrupt Count Spi++; -// Pcr++; - Pcr = (PKPCR)((ULONG_PTR)Pcr + PAGE_SIZE); + Prcb = (PKPRCB)((ULONG_PTR)Prcb + PAGE_SIZE); } return (STATUS_SUCCESS); _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/i386/ps.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/i386/ps.h 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/i386/ps.h 2005-03-05 20:44:57 UTC (rev 13832) @@ -217,7 +217,7 @@ typedef struct _KPCR { KPCR_TIB Tib; /* 00 */ struct _KPCR *Self; /* 1C */ - struct _KPRCB *PCRCB; /* 20 */ + struct _KPRCB *Prcb; /* 20 */ KIRQL Irql; /* 24 */ ULONG IRR; /* 28 */ ULONG IrrActive; /* 2C */ @@ -269,9 +269,28 @@ return((PKPCR)value); } +static inline PKPRCB KeGetCurrentPrcb(VOID) +{ + ULONG value; + +#if defined(__GNUC__) + __asm__ __volatile__ ("movl %%fs:0x20, %0\n\t" + : "=r" (value) + : /* no inputs */ + ); +#elif defined(_MSC_VER) + __asm mov eax, fs:0x20; + __asm mov value, eax; #else +#error Unknown compiler for inline assembler +#endif + return((PKPRCB)value); +} +#else + #define KeGetCurrentKPCR(X) ((PKPCR)KPCR_BASE) +#define KeGetCurrentPrcb() (((PKPCR)KPCR_BASE)->Prcb) #endif _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ke.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ke.h 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ke.h 2005-03-05 20:44:57 UTC (rev 13832) @@ -41,6 +41,7 @@ struct _KTHREAD; struct _KIRQ_TRAPFRAME; struct _KPCR; +struct _KPRCB; struct _KEXCEPTION_FRAME; #define IPI_REQUEST_FUNCTIONCALL 0 @@ -207,7 +208,7 @@ VOID KeInitExceptions(VOID); VOID KeInitInterrupts(VOID); VOID KeInitTimer(VOID); -VOID KeInitDpc(struct _KPCR* Pcr); +VOID KeInitDpc(struct _KPRCB* Prcb); VOID KeInitDispatcher(VOID); VOID inline FASTCALL KeInitializeDispatcher(VOID); VOID KiInitializeSystemClock(VOID); _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ps.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ps.h 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ps.h 2005-03-05 20:44:57 UTC (rev 13832) @@ -416,6 +416,7 @@ PRTL_BITMAP VadPhysicalPagesBitMap; ULONG VadPhysicalPages; KSPIN_LOCK AweLock; + ULONG Cookie; /* * FIXME - ReactOS specified - remove the following fields ASAP!!! _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/create.c --- branches/alex_devel_branch/reactos/ntoskrnl/io/create.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/io/create.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -213,7 +213,7 @@ DPRINT("IoCreateStreamFileObject(FileObject %x, DeviceObject %x)\n", FileObject, DeviceObject); - ASSERT_IRQL(PASSIVE_LEVEL); + PAGED_CODE(); Status = ObCreateObject(KernelMode, IoFileObjectType, @@ -406,6 +406,10 @@ } _SEH_HANDLE { + if(SystemEaBuffer != NULL) + { + ExFreePool(SystemEaBuffer); + } Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -596,7 +600,7 @@ ExFreePool(SystemEaBuffer); } - ASSERT_IRQL(PASSIVE_LEVEL); + PAGED_CODE(); DPRINT("Finished IoCreateFile() (*FileHandle) %x\n", (*FileHandle)); _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/device.c --- branches/alex_devel_branch/reactos/ntoskrnl/io/device.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/io/device.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -541,7 +541,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; - ASSERT_IRQL(PASSIVE_LEVEL); + PAGED_CODE(); if (DeviceName != NULL) { _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/dir.c --- branches/alex_devel_branch/reactos/ntoskrnl/io/dir.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/io/dir.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -38,13 +38,41 @@ PIRP Irp; PDEVICE_OBJECT DeviceObject; PFILE_OBJECT FileObject; - NTSTATUS Status; PIO_STACK_LOCATION IoStack; KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("NtNotifyChangeDirectoryFile()\n"); + + PAGED_CODE(); PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + if(BufferSize != 0) + { + ProbeForWrite(Buffer, + BufferSize, + sizeof(ULONG)); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } Status = ObReferenceObjectByHandle(FileHandle, FILE_LIST_DIRECTORY, @@ -155,14 +183,39 @@ PIRP Irp; PDEVICE_OBJECT DeviceObject; PFILE_OBJECT FileObject; - NTSTATUS Status; PIO_STACK_LOCATION IoStack; KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("NtQueryDirectoryFile()\n"); + + PAGED_CODE(); PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + ProbeForWrite(FileInformation, + Length, + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + Status = ObReferenceObjectByHandle(FileHandle, FILE_LIST_DIRECTORY, IoFileObjectType, _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/kd/kdebug.c --- branches/alex_devel_branch/reactos/ntoskrnl/kd/kdebug.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/kd/kdebug.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -444,7 +444,7 @@ /* FIXME: This is needed to allow Int10 to attach to csrss until * bugchecks are done properly with Inbv, which i'll implement soon -- Alex */ - KeGetCurrentKPCR()->PrcbData.DpcRoutineActive = FALSE; + KeGetCurrentPrcb()->DpcRoutineActive = FALSE; KEBUGCHECK(MANUALLY_INITIATED_CRASH); } /* _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/catch.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/catch.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/catch.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -54,7 +54,7 @@ DPRINT("KiDispatchException() called\n"); /* Increase number of Exception Dispatches */ - KeGetCurrentKPCR()->PrcbData.KeExceptionDispatchCount++; + KeGetCurrentPrcb()->KeExceptionDispatchCount++; if (!Context) { _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/clock.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/clock.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/clock.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -242,22 +242,22 @@ IN KIRQL Irql ) { - PKPCR Pcr; + PKPRCB Prcb; PKTHREAD CurrentThread; PKPROCESS CurrentProcess; #if 0 ULONG DpcLastCount; #endif - Pcr = KeGetCurrentKPCR(); + Prcb = KeGetCurrentPrcb(); /* Make sure we don't go further if we're in early boot phase. */ - if (Pcr == NULL || Pcr->PrcbData.CurrentThread == NULL) + if (Prcb == NULL || Prcb->CurrentThread == NULL) return; - DPRINT("KernelTime %u, UserTime %u \n", Pcr->PrcbData.KernelTime, Pcr->PrcbData.UserTime); + DPRINT("KernelTime %u, UserTime %u \n", Prcb->KernelTime, Prcb->UserTime); - CurrentThread = Pcr->PrcbData.CurrentThread; + CurrentThread = Prcb->CurrentThread; CurrentProcess = CurrentThread->ApcState.Process; /* @@ -269,36 +269,36 @@ { InterlockedIncrementUL(&CurrentThread->UserTime); InterlockedIncrementUL(&CurrentProcess->UserTime); - Pcr->PrcbData.UserTime++; + Prcb->UserTime++; } else { if (Irql > DISPATCH_LEVEL) { - Pcr->PrcbData.InterruptTime++; + Prcb->InterruptTime++; } else if (Irql == DISPATCH_LEVEL) { - Pcr->PrcbData.DpcTime++; + Prcb->DpcTime++; } else { InterlockedIncrementUL(&CurrentThread->KernelTime); InterlockedIncrementUL(&CurrentProcess->KernelTime); - Pcr->PrcbData.KernelTime++; + Prcb->KernelTime++; } } #if 0 - DpcLastCount = Pcr->PrcbData.DpcLastCount; - Pcr->PrcbData.DpcLastCount = Pcr->PrcbData.DpcCount; - Pcr->PrcbData.DpcRequestRate = ((Pcr->PrcbData.DpcCount - DpcLastCount) + - Pcr->PrcbData.DpcRequestRate) / 2; + DpcLastCount = Prcb->DpcLastCount; + Prcb->DpcLastCount = Prcb->DpcCount; + Prcb->DpcRequestRate = ((Prcb->DpcCount - DpcLastCount) + + Prcb->DpcRequestRate) / 2; #endif - if (Pcr->PrcbData.DpcData[0].DpcQueueDepth > 0 && - Pcr->PrcbData.DpcRoutineActive == FALSE && - Pcr->PrcbData.DpcInterruptRequested == FALSE) + if (Prcb->DpcData[0].DpcQueueDepth > 0 && + Prcb->DpcRoutineActive == FALSE && + Prcb->DpcInterruptRequested == FALSE) { HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } @@ -311,7 +311,7 @@ */ if ((CurrentThread->Quantum -= 3) <= 0) { - Pcr->PrcbData.QuantumEnd = TRUE; + Prcb->QuantumEnd = TRUE; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } } _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/device.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/device.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/device.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -57,17 +57,17 @@ { KIRQL OldIrql; PKPROCESS Process = NULL; - PKPCR Pcr = NULL; + PKPRCB Prcb = NULL; /* Raise the IRQL for the TB Flush */ OldIrql = KeRaiseIrqlToSynchLevel(); /* All CPUs need to have the TB flushed. */ if (CurrentCpuOnly == FALSE) { - Pcr = KeGetCurrentKPCR(); + Prcb = KeGetCurrentPrcb(); /* How many CPUs is our caller using? */ - Process = Pcr->PrcbData.CurrentThread->ApcState.Process; + Process = Prcb->CurrentThread->ApcState.Process; /* More then one, so send an IPI */ if (Process->ActiveProcessors > 1) { @@ -83,7 +83,7 @@ /* Did we send an IPI? If so, wait for completion */ if (Process->ActiveProcessors > 1) { do { - } while (Pcr->PrcbData.TargetSet != 0); + } while (Prcb->TargetSet != 0); } } _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/dpc.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/dpc.c 2005-03-05 20:44:41 UTC (rev 13831) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/dpc.c 2005-03-05 20:44:57 UTC (rev 13832) @@ -32,14 +32,14 @@ */ VOID INIT_FUNCTION -KeInitDpc(PKPCR Pcr) +KeInitDpc(PKPRCB Prcb) { - InitializeListHead(&Pcr->PrcbData.DpcData[0].DpcListHead); - KeInitializeEvent(Pcr->PrcbData.DpcEvent, 0, 0); - KeInitializeSpinLock(&Pcr->PrcbData.DpcData[0].DpcLock); - Pcr->PrcbData.MaximumDpcQueueDepth = 4; - Pcr->PrcbData.MinimumDpcRate = 3; - Pcr->PrcbData.DpcData[0].DpcQueueDepth = 0; + InitializeListHead(&Prcb->DpcData[0].DpcListHead); + KeInitializeEvent(Prcb->DpcEvent, 0, 0); + KeInitializeSpinLock(&Prcb->DpcData[0].DpcLock); + Prcb->MaximumDpcQueueDepth = 4; + Prcb->MinimumDpcRate = 3; + Prcb->DpcData[0].DpcQueueDepth = 0; } /* @@ -156,7 +156,7 @@ PVOID SystemArgument2) { KIRQL OldIrql; - PKPCR Pcr; + PKPRCB Prcb; DPRINT("KeInsertQueueDpc(DPC %x, SystemArgument1 %x, SystemArgument2 %x)\n", Dpc, SystemArgument1, SystemArgument2); [truncated at 1000 lines; 952 more skipped]

19 years, 9 months

[mf] 13831: case insensitive startmenu merging

by mf＠svn.reactos.com

case insensitive startmenu merging Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-03-05 17:52:12 UTC (rev 13830) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-03-05 20:44:41 UTC (rev 13831) @@ -1005,7 +1005,7 @@ for(ShellEntryMap::iterator it=_entries.begin(); it!=_entries.end(); ++it) { StartMenuEntry& sme = it->second; - if (sme._title == title) ///@todo speed up by using a map indexed by name + if (!_tcsicmp(sme._title, title)) ///@todo speed up by using a map indexed by name for(ShellEntrySet::iterator it2=sme._entries.begin(); it2!=sme._entries.end(); ++it2) { if ((*it2)->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { // merge the new shell entry with the existing of the same name

19 years, 9 months

[mf] 13830: add ibrowser to XML build

by mf＠svn.reactos.com

add ibrowser to XML build Modified: branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/ibrowser/Makefile Added: branches/xmlbuildsystem/reactos/subsys/system/ibrowser/ibrowser.xml _____ Modified: branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff --- branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff 2005-03-05 17:27:21 UTC (rev 13829) +++ branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff 2005-03-05 17:52:12 UTC (rev 13830) @@ -147,6 +147,7 @@ subsys\system\explorer\explorer.exe 4 subsys\system\explorer\explorer-cfg-template.xml 4 subsys\system\explorer\notifyhook\notifyhook.dll 1 +subsys\system\ibrowser\ibrowser.exe 1 subsys\system\format\format.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\regedit\regedit.exe 4 _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml --- branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-03-05 17:27:21 UTC (rev 13829) +++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-03-05 17:52:12 UTC (rev 13830) @@ -10,6 +10,9 @@ <directory name="explorer"> <xi:include href="explorer/explorer.xml" /> </directory> +<directory name="ibrowser"> + <xi:include href="ibrowser/ibrowser.xml" /> +</directory> <directory name="format"> <xi:include href="format/format.xml" /> </directory> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/ibrowser/Makefile --- branches/xmlbuildsystem/reactos/subsys/system/ibrowser/Makefile 2005-03-05 17:27:21 UTC (rev 13829) +++ branches/xmlbuildsystem/reactos/subsys/system/ibrowser/Makefile 2005-03-05 17:52:12 UTC (rev 13830) @@ -12,7 +12,7 @@ TARGET_NAME := ibrowser -TARGET_INSTALLDIR := . +TARGET_INSTALLDIR := system32 TARGET_CFLAGS := \ -D__USE_W32API -DWIN32 -D_ROS_ \ _____ Added: branches/xmlbuildsystem/reactos/subsys/system/ibrowser/ibrowser.xml --- branches/xmlbuildsystem/reactos/subsys/system/ibrowser/ibrowser.xml 2005-03-05 17:27:21 UTC (rev 13829) +++ branches/xmlbuildsystem/reactos/subsys/system/ibrowser/ibrowser.xml 2005-03-05 17:52:12 UTC (rev 13830) @@ -0,0 +1,29 @@ +<module name="ibrowser" type="win32gui"> + <linkerflag>-fexceptions</linkerflag> + <include base="ibrowser">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="WIN32" /> + <define name="_ROS_" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0500</define> + <library>uuid</library> + <library>kernel32</library> + <library>gdi32</library> + <library>comctl32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>shell32</library> + <library>expat</library> + <directory name="utility"> + <file>utility.cpp</file> + <file>window.cpp</file> + <file>xmlstorage.cpp</file> + </directory> + <file>ibrowser.cpp</file> + <file>favorites.cpp</file> + <file>mainframe.cpp</file> + <file>webchild.cpp</file> + <file>ibrowser.rc</file> +</module>

19 years, 9 months

[mf] 13829: install ibrowser.exe in system32 dir

by mf＠svn.reactos.com

install ibrowser.exe in system32 dir Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/subsys/system/ibrowser/Makefile _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-03-05 15:38:22 UTC (rev 13828) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-03-05 17:27:21 UTC (rev 13829) @@ -146,6 +146,7 @@ subsys\system\explorer\explorer.exe 4 subsys\system\explorer\explorer-cfg-template.xml 4 subsys\system\explorer\notifyhook\notifyhook.dll 1 +subsys\system\ibrowser\ibrowser.exe 1 subsys\system\format\format.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\regedit\regedit.exe 4 _____ Modified: trunk/reactos/subsys/system/ibrowser/Makefile --- trunk/reactos/subsys/system/ibrowser/Makefile 2005-03-05 15:38:22 UTC (rev 13828) +++ trunk/reactos/subsys/system/ibrowser/Makefile 2005-03-05 17:27:21 UTC (rev 13829) @@ -12,7 +12,7 @@ TARGET_NAME := ibrowser -TARGET_INSTALLDIR := . +TARGET_INSTALLDIR := system32 TARGET_CFLAGS := \ -D__USE_W32API -DWIN32 -D_ROS_ \

19 years, 9 months

[mf] 13828: tag ReactOS 0.2.5 release

by mf＠svn.reactos.com

tag ReactOS 0.2.5 release Added: tags/ReactOS-0.2.5/ _____ Copied: tags/ReactOS-0.2.5 (from rev 13827, branches/ros-branch-0_2_5)

19 years, 9 months

[mf] 13827: Remove wrong folder copy

by mf＠svn.reactos.com

Remove wrong folder copy Deleted: branches/ros-branch-0_2_5/reactos/ros-branch-0_2_5/

19 years, 9 months

← Newer
1
...
54
55
56
57
58
59
60
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