Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[mpiulachs] 34216: - txtsetup.sif and unattend.inf are not arch dependent so move them back to bootdata.rbuild

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Jun 30 04:36:57 2008 New Revision: 34216 URL: http://svn.reactos.org/svn/reactos?rev=34216&view=rev Log: - txtsetup.sif and unattend.inf are not arch dependent so move them back to bootdata.rbuild Modified: trunk/reactos/boot/bootdata/arm/directory.rbuild trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/boot/bootdata/i386/directory.rbuild Modified: trunk/reactos/boot/bootdata/arm/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/arm/director… ============================================================================== --- trunk/reactos/boot/bootdata/arm/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/arm/directory.rbuild [iso-8859-1] Mon Jun 30 04:36:57 2008 @@ -6,7 +6,5 @@ <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile> <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile> <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> - <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> </group> Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] Mon Jun 30 04:36:57 2008 @@ -23,6 +23,9 @@ </directory> </if> + <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> + <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> + <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory> Modified: trunk/reactos/boot/bootdata/i386/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/i386/directo… ============================================================================== --- trunk/reactos/boot/bootdata/i386/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/i386/directory.rbuild [iso-8859-1] Mon Jun 30 04:36:57 2008 @@ -6,7 +6,5 @@ <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile> <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile> <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> - <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> </group>

16 years, 2 months

[mpiulachs] 34215: - try to fix build (NOT TESTED). This is a temporary solution however. Most of the registry information must be dynamically generated by rbuild and the rest in from of .inf files during 2nd stage setup

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Jun 30 04:28:28 2008 New Revision: 34215 URL: http://svn.reactos.org/svn/reactos?rev=34215&view=rev Log: - try to fix build (NOT TESTED). This is a temporary solution however. Most of the registry information must be dynamically generated by rbuild and the rest in from of .inf files during 2nd stage setup Added: trunk/reactos/boot/bootdata/arm/directory.rbuild (with props) trunk/reactos/boot/bootdata/i386/directory.rbuild (with props) Modified: trunk/reactos/boot/bootdata/bootdata.rbuild Added: trunk/reactos/boot/bootdata/arm/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/arm/director… ============================================================================== --- trunk/reactos/boot/bootdata/arm/directory.rbuild (added) +++ trunk/reactos/boot/bootdata/arm/directory.rbuild [iso-8859-1] Mon Jun 30 04:28:28 2008 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + + <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> + <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> + +</group> Propchange: trunk/reactos/boot/bootdata/arm/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] Mon Jun 30 04:28:28 2008 @@ -4,12 +4,25 @@ <cdfile>autorun.inf</cdfile> <cdfile>icon.ico</cdfile> <cdfile>readme.txt</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> - <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> + + <if property="ARCH" value="i386"> + <directory name="i386"> + <xi:include href="i386/directory.rbuild" /> + </directory> + </if> + + <if property="ARCH" value="arm"> + <directory name="arm"> + <xi:include href="arm/directory.rbuild" /> + </directory> + </if> + <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory> Added: trunk/reactos/boot/bootdata/i386/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/i386/directo… ============================================================================== --- trunk/reactos/boot/bootdata/i386/directory.rbuild (added) +++ trunk/reactos/boot/bootdata/i386/directory.rbuild [iso-8859-1] Mon Jun 30 04:28:28 2008 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + + <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> + <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> + +</group> Propchange: trunk/reactos/boot/bootdata/i386/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[ros-arm-bringup] 34214: - Disable building any other driver than ramdisk.sys and cdfs.sys. Only these two are required for ramdisk booting to user-mode for our purposes. - Ramdisk does not depend on Class2 or ScsiPort. - Disable loading any other driver than ramdisk.sys and cdfs.sys. We won't support PCI and the storage stack for a while, so ramdisks are the best and quickest way to test the actual kernel and get to user-mode as soon as possible to continue work on the VM management inisde Mm.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 30 04:07:30 2008 New Revision: 34214 URL: http://svn.reactos.org/svn/reactos?rev=34214&view=rev Log: - Disable building any other driver than ramdisk.sys and cdfs.sys. Only these two are required for ramdisk booting to user-mode for our purposes. - Ramdisk does not depend on Class2 or ScsiPort. - Disable loading any other driver than ramdisk.sys and cdfs.sys. We won't support PCI and the storage stack for a while, so ramdisks are the best and quickest way to test the actual kernel and get to user-mode as soon as possible to continue work on the VM management inisde Mm. - We get up to RamdiskAddDevice (not yet implemented)! Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/boot/bootdata/arm/hivesys.inf trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=342… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Mon Jun 30 04:07:30 2008 @@ -146,36 +146,15 @@ </directory> <directory name="drivers"> <directory name="storage"> - <directory name="scsiport"> - <xi:include href="drivers/storage/scsiport/scsiport.rbuild" /> - </directory> - <directory name="port"> - <directory name="buslogic"> - <xi:include href="drivers/storage/port/buslogic/buslogic.rbuild" /> - </directory> - </directory> - <directory name="ide"> - <directory name="atapi"> - <xi:include href="drivers/storage/ide/atapi/atapi.rbuild" /> - </directory> - </directory> <directory name="class"> - <directory name="class2"> - <xi:include href="drivers/storage/class/class2/class2.rbuild" /> - </directory> - <directory name="disk"> - <xi:include href="drivers/storage/class/disk/disk.rbuild" /> + <directory name="ramdisk"> + <xi:include href="drivers/storage/class/ramdisk/ramdisk.rbuild" /> </directory> </directory> </directory> <directory name="filesystems"> - <directory name="fastfat"> - <xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" /> - </directory> - </directory> - <directory name="network"> - <directory name="ndis"> - <xi:include href="drivers/network/ndis/ndis.rbuild" /> + <directory name="cdfs"> + <xi:include href="drivers/filesystems/cdfs/cdfs.rbuild" /> </directory> </directory> <directory name="base"> @@ -186,7 +165,5 @@ <xi:include href="drivers/base/bootvid/bootvid.rbuild" /> </directory> </directory> - </directory> - - + </directory> </project> Modified: trunk/reactos/boot/bootdata/arm/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/arm/hivesys.… ============================================================================== --- trunk/reactos/boot/bootdata/arm/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/arm/hivesys.inf [iso-8859-1] Mon Jun 30 04:07:30 2008 @@ -734,52 +734,6 @@ ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" -; Afd driver -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI" -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"system32\drivers\afd.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 - -; Atapi miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Group",0x00000000,"SCSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x00000010 - -; Audio Service -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Description",0x00000000,"Provides audio facilities to applications" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Group",0x00000000,"Audio" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010 - -; BusLogic 958 miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"SCSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x00020000,"system32\drivers\buslogic.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00000020 - -; Beep device driver -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ImagePath",0x00020000,"system32\drivers\beep.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001 - -; BlueScreen device driver -HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Group",0x00000000,"Video Init" -HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ImagePath",0x00020000,"system32\drivers\blue.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Type",0x00010001,0x00000001 - ; Cdfs (ISO96660) filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" @@ -787,270 +741,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 -; Cdrom class driver -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Group",0x00000000,"SCSI Class" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ImagePath",0x00020000,"system32\drivers\cdrom.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Type",0x00010001,0x00000001 - -; Class2 driver -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","Group",0x00000000,"SCSI Class Helper" -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","ImagePath",0x00020000,"system32\drivers\class2.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","Type",0x00010001,0x00000001 - -; Debug output driver -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Group",0x00000000,"Debug" -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ImagePath",0x00020000,"system32\drivers\debugout.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00000001 - -; Disk class driver +; RAM Disk class driver HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Group",0x00000000,"SCSI Class" -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\drivers\disk.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\drivers\ramdisk.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001 - -; DHCP client service -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","DisplayName",0x00000000,"DHCP Client" -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000,"Attempts to obtain network settings automatically from an available DHCP server" -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"Network" -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"%SystemRoot%\system32\dhcp.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Start",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000010 - -; Event logging service -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog",,0x00000010 -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","DisplayName",0x00000000,"Event Logger" -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Description",0x00000000,"Logs events or messages sent by the operating system in a database accessible via the event log viewer" -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Event log" -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ImagePath",0x00020000,"%SystemRoot%\system32\eventlog.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Start",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Type",0x00010001,0x00000010 - -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application",,0x00000010 -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application","File",0x00020000,"%SystemRoot%\system32\config\AppEvent.Evt" -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security",,0x00000010 -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security","File",0x00020000,"%SystemRoot%\system32\config\SecEvent.Evt" -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System",,0x00000010 -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","File",0x00020000,"%SystemRoot%\system32\config\SysEvent.Evt" - -; Floppy driver -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk" -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001 - -; Filesystem recognizer driver -HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Group",0x00000000,"Boot file system" -HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32\drivers\fs_rec.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 - -; i8042 port driver -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard Port" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ImagePath",0x00020000,"system32\drivers\i8042prt.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001 - -; Kernel-Mode Tests -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ImagePath",0x00020000,"system32\drivers\kmtest.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Type",0x00010001,0x00000001 - -; Keyboard class driver -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class" -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000,"system32\drivers\kbdclass.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass" - -; SB16 driver -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ServiceType",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ImagePath",0x00020000,"system32\drivers\sndblst.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","DmaChannel",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","DmaChannel16",0x00010001,0x00000005 -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","Port",0x00010001,0x00000220 -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","Interrupt",0x00010001,0x00000005 -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","DSP Version",0x00010001,0x00000401 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0\Devices","SBWaveIn0",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0\Devices","SBWaveOut0",0x00010001,0x00000002 - -; MPU-401 MIDI driver -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ServiceType",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ImagePath",0x00020000,"system32\drivers\mpu401.sys" - -; Mouse class driver -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Group",0x00000000,"Pointer Class" -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000,"system32\drivers\mouclass.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"mouclass" - -; Mailslot filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ImagePath",0x00020000,"system32\drivers\msfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002 - -; NDIS driver - the only boot-start network driver -HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Group",0x00000000,"NDIS" -HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","ImagePath",0x00020000,"system32\drivers\ndis.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001 - -; NetLogon -HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","DisplayName",0x00000000,"Net Logon" -HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Description",0x00000000,"Sets up a secure channel to a domain controller for domain authentication" -HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 - -; Named Pipe filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ImagePath",0x00020000,"system32\drivers\npfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Type",0x00010001,0x00000002 - -; NTFS filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Type",0x00010001,0x00000002 - -; Null device driver -HKLM,"SYSTEM\CurrentControlSet\Services\Null","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Null","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\Null","ImagePath",0x00020000,"system32\drivers\null.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Null","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Null","Type",0x00010001,0x00000001 - -; Packet driver -HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Group",0x00000000,"PNP_TDI" -HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ImagePath",0x00020000,"system32\drivers\packet.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x00000001 - -; Plug and Play manager -HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","DisplayName",0x00000000,"Plug and Play" -HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Description",0x00000000,"Detects hardware changes and installs needed software if possible" -HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Group",0x00000000,"PlugPlay" -HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ImagePath",0x00020000,"%SystemRoot%\system32\umpnpmgr.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00000010 - -; RPC service -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","DisplayName",0x00000000,"Remote Procedure Call" -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000,"RPC subsystem which is responsible for Remote procedure Calls on the local machine" -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Group",0x00000000," RPC Service" -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"%SystemRoot%\system32\rpcss.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Type",0x00010001,0x00000010 - -; Scsiport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Group",0x00000000,"SCSI Port" -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","ImagePath",0x00020000,"system32\drivers\scsiport.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Type",0x00010001,0x00000001 - -; Simple TCP services -HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Description",0x00000000,"Supports the following TCP/IP services: Chargen, Daytime, Discard, Echo, QOTD" -HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","DisplayName",0x00000000,"Simple TCP/IP Services" -HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Group",0x00000000,"Network" -HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","ImagePath",0x00020000,"%SystemRoot%\system32\tcpsvcs.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Type",0x00010001,0x00000020 - -; Virtual FAT filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Group",0x00000000,"Boot File System" -HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ImagePath",0x00020000,"system32\drivers\fastfat.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 - -; EXT2 Filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 - -; VBE SVGA driver -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 - -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480 - -; VGA miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002 - -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 - -; USB uhci/ehci driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Group",0x00000000,"Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ImagePath",0x00020000,"system32\drivers\usbdriver.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Type",0x00010001,0x00000001 - -; Windows Installer Service -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"Windows Installer" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ImagePath",0x00020000,"system32\msiexec.exe /V" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Type",0x00010001,0x00000020 ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Jun 30 04:07:30 2008 @@ -297,7 +297,6 @@ PCHAR BootDeviceName, CommandLine; PDEVICE_OBJECT PhysicalDeviceObject; NTSTATUS Status; - DPRINT1("RAMDISK Class Driver\n"); // // Query ramdisk parameters Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Mon Jun 30 04:07:30 2008 @@ -4,8 +4,6 @@ <bootstrap installbase="$(CDOUTPUT)" /> <library>ntoskrnl</library> <library>hal</library> - <library>class2</library> - <library>scsiport</library> <file>ramdisk.c</file> <file>ramdisk.rc</file> </module>

16 years, 2 months

[ros-arm-bringup] 34213: - Fix license header for this file.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 30 03:54:30 2008 New Revision: 34213 URL: http://svn.reactos.org/svn/reactos?rev=34213&view=rev Log: - Fix license header for this file. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Jun 30 03:54:30 2008 @@ -1,6 +1,6 @@ /* * PROJECT: Ramdisk Class Driver - * LICENSE: 2-clause BSD - See COPYING.ARM + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: drivers/storage/class/ramdisk/ramdisk.c * PURPOSE: Main Driver Routines * PROGRAMMERS: ReactOS Portable Systems Group

16 years, 2 months

[ros-arm-bringup] 34212: - Make copies of the registry inf data for arm

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 30 03:53:49 2008 New Revision: 34212 URL: http://svn.reactos.org/svn/reactos?rev=34212&view=rev Log: - Make copies of the registry inf data for arm Added: trunk/reactos/boot/bootdata/arm/hivecls.inf - copied unchanged from r34211, trunk/reactos/boot/bootdata/i386/hivecls.inf trunk/reactos/boot/bootdata/arm/hivedef.inf - copied unchanged from r34211, trunk/reactos/boot/bootdata/i386/hivedef.inf trunk/reactos/boot/bootdata/arm/hiveinst.inf - copied unchanged from r34211, trunk/reactos/boot/bootdata/i386/hiveinst.inf trunk/reactos/boot/bootdata/arm/hivesft.inf - copied unchanged from r34211, trunk/reactos/boot/bootdata/i386/hivesft.inf trunk/reactos/boot/bootdata/arm/hivesys.inf - copied unchanged from r34211, trunk/reactos/boot/bootdata/i386/hivesys.inf

16 years, 2 months

[ros-arm-bringup] 34211: - Registry configuration will likely end up having arch-specific settings, so separate bootdata folder for each architecture. - If we move away from a standard inf file (not necessarly a good idea), we may be able to return back to a single directory and dynamically generate .inf data. - Update rbuild to deal with this new fact.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 30 03:51:19 2008 New Revision: 34211 URL: http://svn.reactos.org/svn/reactos?rev=34211&view=rev Log: - Registry configuration will likely end up having arch-specific settings, so separate bootdata folder for each architecture. - If we move away from a standard inf file (not necessarly a good idea), we may be able to return back to a single directory and dynamically generate .inf data. - Update rbuild to deal with this new fact. Added: trunk/reactos/boot/bootdata/arm/ trunk/reactos/boot/bootdata/i386/ trunk/reactos/boot/bootdata/i386/hivecls.inf - copied unchanged from r34201, trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/i386/hivedef.inf - copied unchanged from r34201, trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/i386/hiveinst.inf - copied unchanged from r34201, trunk/reactos/boot/bootdata/hiveinst.inf trunk/reactos/boot/bootdata/i386/hivesft.inf - copied unchanged from r34201, trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/i386/hivesys.inf - copied unchanged from r34201, trunk/reactos/boot/bootdata/hivesys.inf Removed: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hiveinst.inf trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… Removed: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… Removed: trunk/reactos/boot/bootdata/hiveinst.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hiveinst.inf… Removed: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… Removed: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…

16 years, 2 months

[ros-arm-bringup] 34210: - Add driver database code to FreeLDR (using ReactOS-style LoadOrderListHead instead of BootDriversListHead, oh well!). - This means we actually load and parse drivers now!!! Some Mm work was required to support unloading and remapping: MmDeleteVirtualMapping is now implemented. - We can now see scsiport.sys and atapi.sys strings displayed on the LCD. - Implemented HalQuery/SetDisplayParameters, HalQuery/ReleaseDisplayOwnership and HalDisplayString just like on x86. - Si

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 30 03:40:54 2008 New Revision: 34210 URL: http://svn.reactos.org/svn/reactos?rev=34210&view=rev Log: - Add driver database code to FreeLDR (using ReactOS-style LoadOrderListHead instead of BootDriversListHead, oh well!). - This means we actually load and parse drivers now!!! Some Mm work was required to support unloading and remapping: MmDeleteVirtualMapping is now implemented. - We can now see scsiport.sys and atapi.sys strings displayed on the LCD. - Implemented HalQuery/SetDisplayParameters, HalQuery/ReleaseDisplayOwnership and HalDisplayString just like on x86. - Since we now load symbols for the drivers (or at least try to), stubbed DebugService2, which also shows us what's being loaded. - Extended the Loader MemoryType array to include XIP/RAM Disk Memory. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] Mon Jun 30 03:40:54 2008 @@ -30,7 +30,6 @@ CHAR ArmArcHalPath[64]; CHAR ArmNtHalPath[64]; CHAR ArmNtBootPath[64]; -WCHAR ArmModuleName[64]; PNLS_DATA_BLOCK ArmNlsDataBlock; PLOADER_PARAMETER_EXTENSION ArmExtension; BIOS_MEMORY_DESCRIPTOR ArmBoardMemoryDescriptors[16] = {{0}}; @@ -48,6 +47,7 @@ extern ULONG_PTR KernelBase; extern ULONG_PTR AnsiData, OemData, UnicodeData, RegistryData, KernelData, HalData, DriverData[16]; extern ULONG RegistrySize, AnsiSize, OemSize, UnicodeSize, KernelSize, HalSize, DriverSize[16]; +extern PCHAR DriverName[16]; extern ULONG Drivers; extern ULONG BootStack, TranslationTableStart, TranslationTableEnd; @@ -1061,6 +1061,7 @@ ULONG ArcDiskCount = 0, Checksum = 0; PMASTER_BOOT_RECORD Mbr; PULONG Buffer; + PWCHAR ArmModuleName; // // Allocate the ARM Shared Heap @@ -1231,6 +1232,7 @@ // // Setup loader entry for the kernel // + ArmModuleName = ArmAllocateFromSharedHeap(64 * sizeof(WCHAR)); wcscpy(ArmModuleName, L"ntoskrnl.exe"); LdrEntry = ArmAllocateFromSharedHeap(sizeof(LDR_DATA_TABLE_ENTRY)); RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY)); @@ -1244,12 +1246,55 @@ LdrEntry->FullDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->FullDllName.Buffer | KSEG0_BASE); LdrEntry->BaseDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->BaseDllName.Buffer | KSEG0_BASE); InsertTailList(&ArmLoaderBlock->LoadOrderListHead, &LdrEntry->InLoadOrderLinks); + + // + // Setup loader entry for the HAL + // + ArmModuleName = ArmAllocateFromSharedHeap(64 * sizeof(WCHAR)); + wcscpy(ArmModuleName, L"hal.dll"); + LdrEntry = ArmAllocateFromSharedHeap(sizeof(LDR_DATA_TABLE_ENTRY)); + RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY)); + LdrEntry->DllBase = (PVOID)(HalData | KSEG0_BASE); + LdrEntry->SizeOfImage = HalSize; + LdrEntry->EntryPoint = (PVOID)RtlImageNtHeader((PVOID)HalData)-> + OptionalHeader.AddressOfEntryPoint; + LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)LdrEntry->EntryPoint | KSEG0_BASE); + LdrEntry->LoadCount = 1; + LdrEntry->Flags = LDRP_IMAGE_DLL | LDRP_ENTRY_PROCESSED; + RtlInitUnicodeString(&LdrEntry->FullDllName, ArmModuleName); + RtlInitUnicodeString(&LdrEntry->BaseDllName, ArmModuleName); + LdrEntry->FullDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->FullDllName.Buffer | KSEG0_BASE); + LdrEntry->BaseDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->BaseDllName.Buffer | KSEG0_BASE); + InsertTailList(&ArmLoaderBlock->LoadOrderListHead, &LdrEntry->InLoadOrderLinks); // // Build descriptors for the drivers loaded // for (i = 0; i < Drivers; i++) { + // + // Setup loader entry for the driver + // + LdrEntry = ArmAllocateFromSharedHeap(sizeof(LDR_DATA_TABLE_ENTRY)); + RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY)); + LdrEntry->DllBase = (PVOID)(DriverData[i] | KSEG0_BASE); + LdrEntry->SizeOfImage = DriverSize[i]; + LdrEntry->EntryPoint = (PVOID)RtlImageNtHeader((PVOID)DriverData[i])-> + OptionalHeader.AddressOfEntryPoint; + LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)LdrEntry->EntryPoint | KSEG0_BASE); + LdrEntry->LoadCount = 1; + LdrEntry->Flags = LDRP_IMAGE_DLL | LDRP_ENTRY_PROCESSED; + ArmModuleName = ArmAllocateFromSharedHeap(64 * sizeof(WCHAR)); + RtlZeroMemory(ArmModuleName, 64 * sizeof(WCHAR)); + LdrEntry->FullDllName.Length = strlen(DriverName[i]) * sizeof(WCHAR); + LdrEntry->FullDllName.MaximumLength = LdrEntry->FullDllName.Length; + LdrEntry->FullDllName.Buffer = ArmModuleName; + LdrEntry->BaseDllName = LdrEntry->FullDllName; + while (*DriverName[i]) *ArmModuleName++ = *DriverName[i]++; + LdrEntry->FullDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->FullDllName.Buffer | KSEG0_BASE); + LdrEntry->BaseDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->BaseDllName.Buffer | KSEG0_BASE); + InsertTailList(&ArmLoaderBlock->LoadOrderListHead, &LdrEntry->InLoadOrderLinks); + // // Build a descriptor for the driver // Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] Mon Jun 30 03:40:54 2008 @@ -19,6 +19,7 @@ ULONG Drivers; PVOID AnsiData, OemData, UnicodeData, RegistryData, KernelData, HalData, DriverData[16]; ULONG RegistrySize, AnsiSize, OemSize, UnicodeSize, KernelSize, HalSize, DriverSize[16]; +PCHAR DriverName[16]; /* MODULE MANAGEMENT **********************************************************/ @@ -568,6 +569,7 @@ } else { + DriverName[Drivers] = reactos_module_strings[ImageId]; DriverData[Drivers] = (PVOID)NextModuleBase; DriverSize[Drivers] = ImageSize; Drivers++; Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Mon Jun 30 03:40:54 2008 @@ -11,6 +11,7 @@ #include <hal.h> #define NDEBUG #include <debug.h> +#include <ndk/inbvfuncs.h> #undef ExAcquireFastMutex #undef ExReleaseFastMutex @@ -173,15 +174,6 @@ } -VOID -NTAPI -HalAcquireDisplayOwnership( - PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) -{ - UNIMPLEMENTED; -} - - NTSTATUS NTAPI HalAdjustResourceList( @@ -295,15 +287,49 @@ return TRUE; } - -VOID -NTAPI -HalDisplayString( - PCH String) -{ - UNIMPLEMENTED; -} - +VOID +NTAPI +HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) +{ + // + // Stub since Windows XP implemented Inbv + // + return; +} + +VOID +NTAPI +HalDisplayString(IN PCH String) +{ + // + // Call the Inbv driver + // + InbvDisplayString(String); +} + +VOID +NTAPI +HalQueryDisplayParameters(OUT PULONG DispSizeX, + OUT PULONG DispSizeY, + OUT PULONG CursorPosX, + OUT PULONG CursorPosY) +{ + // + // Stub since Windows XP implemented Inbv + // + return; +} + +VOID +NTAPI +HalSetDisplayParameters(IN ULONG CursorPosX, + IN ULONG CursorPosY) +{ + // + // Stub since Windows XP implemented Inbv + // + return; +} BOOLEAN NTAPI @@ -672,27 +698,6 @@ } -BOOLEAN -NTAPI -HalQueryDisplayOwnership(VOID) -{ - UNIMPLEMENTED; - - return FALSE; -} - - -VOID -NTAPI -HalQueryDisplayParameters( - OUT PULONG DispSizeX, - OUT PULONG DispSizeY, - OUT PULONG CursorPosX, - OUT PULONG CursorPosY) -{ - UNIMPLEMENTED; -} - #define RTC_DATA (PVOID)0xE00E8000 BOOLEAN @@ -729,13 +734,6 @@ return 0; } - -VOID -NTAPI -HalReleaseDisplayOwnership(VOID) -{ - UNIMPLEMENTED; -} VOID NTAPI @@ -816,16 +814,6 @@ } -VOID -NTAPI -HalSetDisplayParameters( - ULONG CursorPosX, - ULONG CursorPosY) -{ - UNIMPLEMENTED; -} - - ARC_STATUS NTAPI HalSetEnvironmentVariable( Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Mon Jun 30 03:40:54 2008 @@ -43,6 +43,18 @@ // void arm_kprintf(const char *fmt, ...); arm_kprintf("%s", Buffer); +} + +VOID +DebugService2(IN ULONG Arg1, + IN ULONG Arg2, + IN ULONG Service) +{ + // + // FIXME: ARM Bring-up Hack + // + void arm_kprintf(const char *fmt, ...); + arm_kprintf("Loading symbols for %Z...\n", (PCHAR)Arg1); } VOID Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Mon Jun 30 03:40:54 2008 @@ -53,7 +53,6 @@ GENERATE_ARM_STUB RtlUnwind GENERATE_ARM_STUB RtlpGetExceptionAddress GENERATE_ARM_STUB RtlDispatchException -GENERATE_ARM_STUB DebugService2 GENERATE_ARM_STUB RtlpGetStackLimits GENERATE_ARM_STUB KdpGdbStubInit Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Mon Jun 30 03:40:54 2008 @@ -240,10 +240,91 @@ OUT PBOOLEAN WasDirty, OUT PPFN_TYPE Page) { - // - // TODO - // - UNIMPLEMENTED; + PMMPTE PointerPte, PointerPde; + MMPTE Pte; + + // + // Check if this is for a different process + // + if ((Process) && (Process != PsGetCurrentProcess())) + { + // + // TODO + // + UNIMPLEMENTED; + return; + } + + // + // Get the PDE + // + PointerPde = MiGetPdeAddress(Address); + if (PointerPde->u.Hard.L1.Fault.Type == FaultPte) + { + // + // Invalid PDE + // + if (WasDirty) *WasDirty = FALSE; + if (Page) *Page = 0; + return; + } + + // + // Get the PTE + // + PointerPte = MiGetPteAddress(Address); + ASSERT(PointerPte->u.Hard.L2.Small.Type == SmallPte); + + // + // Save the PTE + // + Pte = *PointerPte; + + // + // Destroy the PTE + // + PointerPte->u.Hard.AsUlong = 0; + ASSERT(PointerPte->u.Hard.L2.Fault.Type == FaultPte); + + // + // Flush the TLB + // + KiFlushSingleTb(TRUE, Address); + + // + // Check if the PTE was valid + // + if (Pte.u.Hard.L2.Fault.Type != FaultPte) + { + // + // Mark the page as unmapped + // + MmMarkPageUnmapped(Pte.u.Hard.L2.Small.BaseAddress); + } + else + { + // + // Make it sane + // + Pte.u.Hard.L2.Small.BaseAddress = 0; + } + + // + // Check if this was our page, and valid + // + if ((FreePage) && (Pte.u.Hard.L2.Fault.Type != FaultPte)) + { + // + // Release it + // + MmReleasePageMemoryConsumer(MC_NPPOOL, Pte.u.Hard.L2.Small.BaseAddress); + } + + // + // Return if the page was dirty + // + if (WasDirty) *WasDirty = TRUE; // LIE!!! + if (Page) *Page = Pte.u.Hard.L2.Small.BaseAddress; } VOID Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Mon Jun 30 03:40:54 2008 @@ -41,7 +41,8 @@ "NlsData ", "SpecialMemory ", "BBTMemory ", - "LoaderReserve " + "LoaderReserve ", + "LoaderXIPRom " }; BOOLEAN IsThisAnNtAsSystem = FALSE;

16 years, 2 months

[ros-arm-bringup] 34209: - Fix broken check for ramdisk boot path... *sigh* please test your patches.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 30 02:06:48 2008 New Revision: 34209 URL: http://svn.reactos.org/svn/reactos?rev=34209&view=rev Log: - Fix broken check for ramdisk boot path... *sigh* please test your patches. Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Mon Jun 30 02:06:48 2008 @@ -514,7 +514,7 @@ BusRelations); /* Check if this was a ramdisk boot */ - if (RtlEqualMemory(LoaderBlock->ArcBootDeviceName, "ramdisk(0)", 10)) + if (!_strnicmp(LoaderBlock->ArcBootDeviceName, "ramdisk(0)", 10)) { /* Initialize the ramdisk driver */ IopStartRamdisk(LoaderBlock);

16 years, 2 months

[jimtabor] 34208: Cleanup code.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jun 30 01:45:45 2008 New Revision: 34208 URL: http://svn.reactos.org/svn/reactos?rev=34208&view=rev Log: Cleanup code. Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Mon Jun 30 01:45:45 2008 @@ -52,17 +52,6 @@ LONG RadiusX, RadiusY, CenterX, CenterY; LONG SfCx, SfCy, EfCx, EfCy; -/* top - ___________________ - +| | - | | - | | - left | | right - | | - | | - 0|___________________| - 0 bottom + - */ if (Right < Left) { INT tmp = Right; Right = Left; Left = tmp; @@ -126,7 +115,7 @@ XRadialEnd += dc->ptlDCOrig.x; YRadialEnd += dc->ptlDCOrig.y; - DPRINT1("1: StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", + DPRINT("1: StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", XRadialStart,YRadialStart,XRadialEnd,YRadialEnd); RectBounds.left = Left; @@ -136,7 +125,7 @@ IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); - DPRINT1("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", + DPRINT("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); RadiusX = max((RectBounds.right - RectBounds.left) / 2, 1); @@ -186,7 +175,7 @@ if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) { - DPRINT1("Arc CW\n"); + DPRINT("Arc CW\n"); for (; AngS < AngT; AngS += Factor) { x = (RadiusX * Rcos(AngS)); @@ -208,7 +197,7 @@ } else { - DPRINT1("Arc CCW\n"); + DPRINT("Arc CCW\n"); for (; AngT < AngS; AngS -= Factor) { x = (RadiusX * Rcos(AngS)); @@ -237,7 +226,7 @@ PenBrushObj->ptPenWidth.x = PenOrigWidth; BITMAPOBJ_UnlockBitmap(BitmapObj); PENOBJ_UnlockPen(PenBrushObj); - DPRINT1("IntArc Exit.\n"); + DPRINT("IntArc Exit.\n"); return ret; } @@ -256,12 +245,13 @@ int YEndArc) { BOOL Ret; - RECT rc, rc1; - - DPRINT1("StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", + + DPRINT("StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", XStartArc,YStartArc,XEndArc,YEndArc); - DPRINT1("Left: %d, Top: %d, Right: %d, Bottom: %d\n", + DPRINT("Left: %d, Top: %d, Right: %d, Bottom: %d\n", LeftRect,TopRect,RightRect,BottomRect); + + if ((LeftRect == RightRect) || (TopRect == BottomRect)) return TRUE; if (PATH_IsPathOpen(dc->DcLevel)) { @@ -285,22 +275,15 @@ IntGdiLineTo(dc, XStartArc, YStartArc); } - IntGdiSetRect(&rc, LeftRect, TopRect, RightRect, BottomRect); - IntGdiSetRect(&rc1, XStartArc, YStartArc, XEndArc, YEndArc); - -// IntLPtoDP(dc, (LPPOINT)&rc, 2); -// IntLPtoDP(dc, (LPPOINT)&rc1, 2); - - Ret = IntArc( dc, - rc.left, - rc.top, - rc.right, - rc.bottom, - rc1.left, - rc1.top, - rc1.right, - rc1.bottom, + LeftRect, + TopRect, + RightRect, + BottomRect, + XStartArc, + YStartArc, + XEndArc, + YEndArc, arctype); if (arctype == GdiTypeArcTo)

16 years, 2 months

[jimtabor] 34207: Fix drawing pie fill aligment.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jun 30 00:11:39 2008 New Revision: 34207 URL: http://svn.reactos.org/svn/reactos?rev=34207&view=rev Log: Fix drawing pie fill aligment. Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Mon Jun 30 00:11:39 2008 @@ -133,11 +133,14 @@ RectBounds.right = Right; RectBounds.top = Top; RectBounds.bottom = Bottom; + + IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); + DPRINT1("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); - RadiusX = (RectBounds.right - RectBounds.left) / 2; - RadiusY = (RectBounds.bottom - RectBounds.top) / 2; + RadiusX = max((RectBounds.right - RectBounds.left) / 2, 1); + RadiusY = max((RectBounds.bottom - RectBounds.top) / 2, 1); CenterX = (RectBounds.right + RectBounds.left) / 2; CenterY = (RectBounds.bottom + RectBounds.top) / 2; AngleEnd = atan2((YRadialEnd - CenterY), XRadialEnd - CenterX)*(360.0/(M_PI*2)); @@ -151,13 +154,13 @@ if ((arctype == GdiTypePie) || (arctype == GdiTypeChord)) { ret = IntFillArc( dc, - RectBounds.left, + RectBounds.left, RectBounds.top, - fabs(RectBounds.right-RectBounds.left), // Width - fabs(RectBounds.bottom-RectBounds.top), // Height - AngleStart, - AngleEnd, - arctype); + abs(RectBounds.right-RectBounds.left), // Width + abs(RectBounds.bottom-RectBounds.top), // Height + AngleStart, + AngleEnd, + arctype); } BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Mon Jun 30 00:11:39 2008 @@ -802,7 +802,12 @@ r.y = YLeft; r.width = Width; r.height = Height; - app_fill_arc(dc, r, Start-90, End-90, FillBrushObj, Chord); + // Sort out alignment here. + app_fill_arc(dc, r, + (dc->DcLevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, + (dc->DcLevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, + FillBrushObj, Chord); + BRUSHOBJ_UnlockBrush(FillBrushObj); return TRUE;

16 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008