Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[fireball] 34176: - Merge 34174 (partition table size estimation fix).

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jun 29 03:37:32 2008 New Revision: 34176 URL: http://svn.reactos.org/svn/reactos?rev=34176&view=rev Log: - Merge 34174 (partition table size estimation fix). Modified: branches/ros-branch-0_3_5/reactos/base/setup/usetup/partlist.c Modified: branches/ros-branch-0_3_5/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_5/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Jun 29 03:37:32 2008 @@ -406,8 +406,8 @@ { /* Round-down to cylinder size */ LastUnusedPartitionLength = - ROUND_DOWN (DiskEntry->DiskSize - (LastStartingOffset + LastPartitionLength), - DiskEntry->CylinderSize); + (DiskEntry->DiskSize - (LastStartingOffset + LastPartitionLength)) + & ~(DiskEntry->CylinderSize - 1); if (LastUnusedPartitionLength >= DiskEntry->CylinderSize) {

16 years, 2 months

[pschweitzer] 34175: fs_rec.sys is now able to recognize Ext2 partitions and so, to launch Ext2 driver. Defines have been taken from Linux Kernel Source

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 29 03:33:47 2008 New Revision: 34175 URL: http://svn.reactos.org/svn/reactos?rev=34175&view=rev Log: fs_rec.sys is now able to recognize Ext2 partitions and so, to launch Ext2 driver. Defines have been taken from Linux Kernel Source Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] Sun Jun 29 03:33:47 2008 @@ -4,6 +4,7 @@ * FILE: drivers/filesystems/fs_rec/ext2.c * PURPOSE: EXT2 Recognizer * PROGRAMMER: Eric Kohl + * Pierre Schweitzer */ /* INCLUDES *****************************************************************/ @@ -16,10 +17,15 @@ BOOLEAN NTAPI -FsRecIsExt2Volume(IN PVOID PackedBootSector) +FsRecIsExt2Volume(IN pext2_super_block SuperBlock) { - /* For now, always return failure... */ - return FALSE; + BOOLEAN Result = TRUE; + PAGED_CODE(); + + if (SuperBlock->s_magic != EXT2_SUPER_MAGIC) + Result = FALSE; + + return Result; } NTSTATUS @@ -30,9 +36,9 @@ PIO_STACK_LOCATION Stack; NTSTATUS Status; PDEVICE_OBJECT MountDevice; - PVOID Bpb = NULL; + PVOID SuperBlock = NULL; ULONG SectorSize; - LARGE_INTEGER Offset = {{0}}; + LARGE_INTEGER Offset = {{1024}}; BOOLEAN DeviceError = FALSE; PAGED_CODE(); @@ -49,24 +55,24 @@ MountDevice = Stack->Parameters.MountVolume.DeviceObject; if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) { - /* Try to read the BPB */ + /* Try to read the Super Block */ if (FsRecReadBlock(MountDevice, &Offset, - 512, + 1024, SectorSize, - (PVOID)&Bpb, + (PVOID)&SuperBlock, &DeviceError)) { /* Check if it's an actual EXT2 volume */ - if (FsRecIsExt2Volume(Bpb)) + if (FsRecIsExt2Volume(SuperBlock)) { /* It is! */ Status = STATUS_FS_DRIVER_REQUIRED; } } - /* Free the boot sector if we have one */ - ExFreePool(Bpb); + /* Free the Super Block if we have one */ + ExFreePool(SuperBlock); } else { Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Sun Jun 29 03:33:47 2008 @@ -25,6 +25,12 @@ // #define UDFS_VRS_START_SECTOR 16 #define UDFS_AVDP_SECTOR 256 + +// +// Ext2 Magic +// Taken from Linux Kernel +// +#define EXT2_SUPER_MAGIC 0xEF53 // // Conversion types and macros taken from internal ntifs headers @@ -172,6 +178,73 @@ #include <poppack.h> // +// Ext2 Structure +// Taken from Linux Kernel and adapted for ReactOS +// +/* + * Structure of the super block + */ +typedef struct _ext2_super_block +{ + ULONG s_inodes_count; /* Inodes count */ + ULONG s_blocks_count; /* Blocks count */ + ULONG s_r_blocks_count; /* Reserved blocks count */ + ULONG s_free_blocks_count; /* Free blocks count */ + ULONG s_free_inodes_count; /* Free inodes count */ + ULONG s_first_data_block; /* First Data Block */ + ULONG s_log_block_size; /* Block size */ + LONG s_log_frag_size; /* Fragment size */ + ULONG s_blocks_per_group; /* # Blocks per group */ + ULONG s_frags_per_group; /* # Fragments per group */ + ULONG s_inodes_per_group; /* # Inodes per group */ + ULONG s_mtime; /* Mount time */ + ULONG s_wtime; /* Write time */ + USHORT s_mnt_count; /* Mount count */ + SHORT s_max_mnt_count; /* Maximal mount count */ + USHORT s_magic; /* Magic signature */ + USHORT s_state; /* File system state */ + USHORT s_errors; /* Behaviour when detecting errors */ + USHORT s_minor_rev_level; /* minor revision level */ + ULONG s_lastcheck; /* time of last check */ + ULONG s_checkinterval; /* max. time between checks */ + ULONG s_creator_os; /* OS */ + ULONG s_rev_level; /* Revision level */ + USHORT s_def_resuid; /* Default uid for reserved blocks */ + USHORT s_def_resgid; /* Default gid for reserved blocks */ + /* + * These fields are for EXT2_DYNAMIC_REV superblocks only. + * + * Note: the difference between the compatible feature set and + * the incompatible feature set is that if there is a bit set + * in the incompatible feature set that the kernel doesn't + * know about, it should refuse to mount the filesystem. + * + * e2fsck's requirements are more strict; if it doesn't know + * about a feature in either the compatible or incompatible + * feature set, it must abort and not try to meddle with + * things it doesn't understand... + */ + ULONG s_first_ino; /* First non-reserved inode */ + USHORT s_inode_size; /* size of inode structure */ + USHORT s_block_group_nr; /* block group # of this superblock */ + ULONG s_feature_compat; /* compatible feature set */ + ULONG s_feature_incompat; /* incompatible feature set */ + ULONG s_feature_ro_compat; /* readonly-compatible feature set */ + UCHAR s_uuid[16]; /* 128-bit uuid for volume */ + char s_volume_name[16]; /* volume name */ + char s_last_mounted[64]; /* directory where last mounted */ + ULONG s_algorithm_usage_bitmap; /* For compression */ + /* + * Performance hints. Directory preallocation should only + * happen if the EXT2_COMPAT_PREALLOC flag is on. + */ + UCHAR s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ + UCHAR s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ + USHORT s_padding1; + ULONG s_reserved[204]; /* Padding to the end of the block */ +} ext2_super_block, *pext2_super_block; + +// // Filesystem Types // typedef enum _FILE_SYSTEM_TYPE

16 years, 2 months

[fireball] 34174: Roel Messiant <roelmessiant@gmail.com> - Fix one of the oldest bugs: "ROS can not parse partition table corectly". The original macro that calculates the space casts the value to ULONG, while ULONGLONG math is required here. See issue #950 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jun 29 03:33:21 2008 New Revision: 34174 URL: http://svn.reactos.org/svn/reactos?rev=34174&view=rev Log: Roel Messiant <roelmessiant(a)gmail.com> - Fix one of the oldest bugs: "ROS can not parse partition table corectly". The original macro that calculates the space casts the value to ULONG, while ULONGLONG math is required here. See issue #950 for more details. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Jun 29 03:33:21 2008 @@ -406,8 +406,8 @@ { /* Round-down to cylinder size */ LastUnusedPartitionLength = - ROUND_DOWN (DiskEntry->DiskSize - (LastStartingOffset + LastPartitionLength), - DiskEntry->CylinderSize); + (DiskEntry->DiskSize - (LastStartingOffset + LastPartitionLength)) + & ~(DiskEntry->CylinderSize - 1); if (LastUnusedPartitionLength >= DiskEntry->CylinderSize) {

16 years, 2 months

[fireball] 34173: - Merge 34167,34171-34172.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jun 29 03:20:08 2008 New Revision: 34173 URL: http://svn.reactos.org/svn/reactos?rev=34173&view=rev Log: - Merge 34167,34171-34172. Modified: branches/ros-branch-0_3_5/reactos/dll/win32/kernel32/mem/procmem.c branches/ros-branch-0_3_5/reactos/ntoskrnl/ke/apc.c branches/ros-branch-0_3_5/reactos/ntoskrnl/mm/virtual.c Modified: branches/ros-branch-0_3_5/reactos/dll/win32/kernel32/mem/procmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_5/reactos/dll/win32/kernel32/mem/procmem.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/dll/win32/kernel32/mem/procmem.c [iso-8859-1] Sun Jun 29 03:20:08 2008 @@ -79,7 +79,7 @@ PAGE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY) ? FALSE : TRUE; - if (UnProtect) + if (!UnProtect) { /* Set the new protection */ Status = NtProtectVirtualMemory(hProcess, Modified: branches/ros-branch-0_3_5/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_5/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Sun Jun 29 03:20:08 2008 @@ -212,9 +212,24 @@ } else if (Thread->State == GateWait) { - /* We were in a gate wait. FIXME: Handle this */ - DPRINT1("Not yet supported -- Report this to Alex\n"); - while (TRUE); + /* We were in a gate wait. Handle this. */ + DPRINT1("A thread was in a gate wait\n"); + + /* Lock the gate */ + KiAcquireDispatcherObject(&Thread->GateObject->Header); + + /* Remove it from the waiters list */ + RemoveEntryList(&Thread->WaitBlock[0].WaitListEntry); + + /* Unlock the gate */ + KiReleaseDispatcherObject(&Thread->GateObject->Header); + + /* Increase the queue counter if needed */ + if (Thread->Queue) Thread->Queue->CurrentCount++; + + /* Put into deferred ready list with this status */ + Status = STATUS_KERNEL_APC; + KiInsertDeferredReadyList(Thread); } } else if ((Thread->State == Waiting) && @@ -867,7 +882,7 @@ /* Acquire the dispatcher lock and remove it from the list */ KiAcquireDispatcherLockAtDpcLevel(); - if (RemoveEntryList(&ApcState->ApcListHead[Apc->ApcMode])) + if (RemoveEntryList(&Apc->ApcListEntry)) { /* Set the correct state based on the APC Mode */ if (Apc->ApcMode == KernelMode) Modified: branches/ros-branch-0_3_5/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_5/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Sun Jun 29 03:20:08 2008 @@ -172,7 +172,7 @@ { /* Exit */ Status = _SEH_GetExceptionCode(); - _SEH_YIELD(); + _SEH_YIELD(return Status); } /* Otherwise, we failed probably during the move */ @@ -319,7 +319,7 @@ { /* Exit */ Status = _SEH_GetExceptionCode(); - _SEH_YIELD(); + _SEH_YIELD(return Status); } /* Otherwise, we failed probably during the move */

16 years, 2 months

[fireball] 34172: - Fix exception handling in MiDoMapped/PoolCopy by fixing a typo in SEH_YIELD usage. See issue #3408 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jun 29 03:10:18 2008 New Revision: 34172 URL: http://svn.reactos.org/svn/reactos?rev=34172&view=rev Log: - Fix exception handling in MiDoMapped/PoolCopy by fixing a typo in SEH_YIELD usage. See issue #3408 for more details. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Sun Jun 29 03:10:18 2008 @@ -172,7 +172,7 @@ { /* Exit */ Status = _SEH_GetExceptionCode(); - _SEH_YIELD(); + _SEH_YIELD(return Status); } /* Otherwise, we failed probably during the move */ @@ -319,7 +319,7 @@ { /* Exit */ Status = _SEH_GetExceptionCode(); - _SEH_YIELD(); + _SEH_YIELD(return Status); } /* Otherwise, we failed probably during the move */

16 years, 2 months

[fireball] 34171: - Fix a problem spotted by Juriy Sidorov in bug 3415. With this fix applied, GDB is able to work much better - be able to write in memory, set breakpoints, etc. See issue #3415 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jun 29 03:03:25 2008 New Revision: 34171 URL: http://svn.reactos.org/svn/reactos?rev=34171&view=rev Log: - Fix a problem spotted by Juriy Sidorov in bug 3415. With this fix applied, GDB is able to work much better - be able to write in memory, set breakpoints, etc. See issue #3415 for more details. Modified: trunk/reactos/dll/win32/kernel32/mem/procmem.c Modified: trunk/reactos/dll/win32/kernel32/mem/procmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/pro… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/procmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/procmem.c [iso-8859-1] Sun Jun 29 03:03:25 2008 @@ -79,7 +79,7 @@ PAGE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY) ? FALSE : TRUE; - if (UnProtect) + if (!UnProtect) { /* Set the new protection */ Status = NtProtectVirtualMemory(hProcess,

16 years, 2 months

[ros-arm-bringup] 34170: - Implement beginnings of Ramdisk Port Driver. Planning compatibility with ISO, SDI and WIM files and full Windows support. - New license for our code.

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

Author: ros-arm-bringup Date: Sat Jun 28 21:58:05 2008 New Revision: 34170 URL: http://svn.reactos.org/svn/reactos?rev=34170&view=rev Log: - Implement beginnings of Ramdisk Port Driver. Planning compatibility with ISO, SDI and WIM files and full Windows support. - New license for our code. Added: trunk/reactos/COPYING.ARM trunk/reactos/drivers/storage/class/ramdisk/ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c (with props) trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild (with props) trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rc (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c trunk/reactos/boot/freeldr/freeldr/cmdline.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h trunk/reactos/drivers/storage/class/directory.rbuild trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/hal/halarm/include/hal.h trunk/reactos/include/reactos/arm/peripherals/pl011.h trunk/reactos/include/reactos/arm/peripherals/pl190.h trunk/reactos/include/reactos/arm/peripherals/sp804.h trunk/reactos/lib/rtl/arm/debug_asm.S trunk/reactos/ntoskrnl/config/arm/cmhardwr.c trunk/reactos/ntoskrnl/ex/exintrin.c trunk/reactos/ntoskrnl/ex/fastinterlck.c trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c trunk/reactos/ntoskrnl/ke/arm/boot.s trunk/reactos/ntoskrnl/ke/arm/cpu.c trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s trunk/reactos/ntoskrnl/ke/arm/exp.c trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/thrdini.c trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/ps/arm/psctx.c trunk/reactos/ntoskrnl/rtl/arm/rtlexcpt.c Added: trunk/reactos/COPYING.ARM URL: http://svn.reactos.org/svn/reactos/trunk/reactos/COPYING.ARM?rev=34170&view… ============================================================================== --- trunk/reactos/COPYING.ARM (added) +++ trunk/reactos/COPYING.ARM [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,0 +1,23 @@ +Copyright 2008 ReactOS Portable Systems Group. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided +that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, this list of conditions and + the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions + and the following disclaimer in the documentation and/or other materials provided with the + distribution. + +THIS SOFTWARE IS PROVIDED BY THE REACTOS PORTABLE SYSTEMS GROUP ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REACTOS PORTABLE SYSTEMS GROUP +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those of the authors and +should not be interpreted as representing official policies, either expressed or implied, of the ReactOS +Project. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: boot/freeldr/arch/arm/boot.s * PURPOSE: Implements the entry point for ARM machines * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: boot/freeldr/arch/arm/ferouart.c * PURPOSE: Implements code for Feroceon boards using the 16550 UART * PROGRAMMERS: ReactOS Portable Systems Group 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] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: boot/freeldr/arch/arm/loader.c * PURPOSE: ARM Kernel Loader * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: boot/freeldr/arch/arm/marcharm.c * PURPOSE: Provides abstraction between the ARM Boot Loader and FreeLDR * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: boot/freeldr/arch/arm/versuart.c * PURPOSE: Implements code for Versatile boards using the PL011 UART * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cmdli… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cmdline.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: boot/freeldr/cmdline.c * PURPOSE: FreeLDR Command Line Parsing * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: boot/freeldr/arch/i386/ramdisk.c * PURPOSE: Implements routines to support booting from a RAM Disk * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: boot/freeldr/include/arch/arm/hardware.h * PURPOSE: Header for ARC definitions (to be cleaned up) * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Boot Loader - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: boot/freeldr/include/ramdisk.h * PURPOSE: Header file for ramdisk support * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/drivers/storage/class/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/dire… ============================================================================== --- trunk/reactos/drivers/storage/class/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/directory.rbuild [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -10,4 +10,7 @@ <directory name="disk"> <xi:include href="disk/disk.rbuild" /> </directory> + <directory name="ramdisk"> + <xi:include href="ramdisk/ramdisk.rbuild" /> + </directory> </group> Added: 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 (added) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,0 +1,438 @@ +/* + * PROJECT: Ramdisk Class Driver + * LICENSE: 2-clause BSD - See COPYING.ARM + * FILE: drivers/storage/class/ramdisk/ramdisk.c + * PURPOSE: Main Driver Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntddk.h> +#include <ntdddisk.h> +#include <scsi.h> +#include <ntddscsi.h> +#include <mountdev.h> +#include <mountmgr.h> +#include <helper.h> +#include <ketypes.h> +#include <arc/arc.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +ULONG MaximumViewLength; +ULONG MaximumPerDiskViewLength; +ULONG ReportDetectedDevice; +ULONG MarkRamdisksAsRemovable; +ULONG MinimumViewCount; +ULONG DefaultViewCount; +ULONG MaximumViewCount; +ULONG MinimumViewLength; +ULONG DefaultViewLength; +UNICODE_STRING DriverRegistryPath; +BOOLEAN ExportBootDiskAsCd; +BOOLEAN IsWinPEBoot; + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +QueryParameters(IN PUNICODE_STRING RegistryPath) +{ + ULONG MinView, DefView, MinViewLength, DefViewLength, MaxViewLength; + RTL_QUERY_REGISTRY_TABLE QueryTable[10]; + + // + // Set defaults + // + MaximumViewLength = 0x10000000u; + MaximumPerDiskViewLength = 0x10000000u; + ReportDetectedDevice = 0; + MarkRamdisksAsRemovable = 0; + MinimumViewCount = 2; + DefaultViewCount = 16; + MaximumViewCount = 64; + MinimumViewLength = 0x10000u; + DefaultViewLength = 0x100000u; + + // + // Setup the query table and query the registry + // + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].Flags = 1; + QueryTable[0].Name = L"Parameters"; + QueryTable[1].Flags = 32; + QueryTable[1].Name = L"ReportDetectedDevice"; + QueryTable[1].EntryContext = &ReportDetectedDevice; + QueryTable[2].Flags = 32; + QueryTable[2].Name = L"MarkRamdisksAsRemovable"; + QueryTable[2].EntryContext = &MarkRamdisksAsRemovable; + QueryTable[3].Flags = 32; + QueryTable[3].Name = L"MinimumViewCount"; + QueryTable[3].EntryContext = &MinimumViewCount; + QueryTable[4].Flags = 32; + QueryTable[4].Name = L"DefaultViewCount"; + QueryTable[4].EntryContext = &DefaultViewCount; + QueryTable[5].Flags = 32; + QueryTable[5].Name = L"MaximumViewCount"; + QueryTable[5].EntryContext = &MaximumViewCount; + QueryTable[6].Flags = 32; + QueryTable[6].Name = L"MinimumViewLength"; + QueryTable[6].EntryContext = &MinimumViewLength; + QueryTable[7].Flags = 32; + QueryTable[7].Name = L"DefaultViewLength"; + QueryTable[7].EntryContext = &DefaultViewLength; + QueryTable[8].Flags = 32; + QueryTable[8].Name = L"MaximumViewLength"; + QueryTable[8].EntryContext = &MaximumViewLength; + QueryTable[9].Flags = 32; + QueryTable[9].Name = L"MaximumPerDiskViewLength"; + QueryTable[9].EntryContext = &MaximumPerDiskViewLength; + RtlQueryRegistryValues(RTL_REGISTRY_OPTIONAL, + RegistryPath->Buffer, + QueryTable, + NULL, + NULL); + + // + // Parse minimum view count, cannot be bigger than 256 or smaller than 2 + // + MinView = MinimumViewCount; + if (MinimumViewCount >= 2) + { + if (MinimumViewCount > 256) MinView = 256; + } + else + { + MinView = 2; + } + MinimumViewCount = MinView; + + // + // Parse default view count, cannot be bigger than 256 or smaller than minimum + // + DefView = DefaultViewCount; + if (DefaultViewCount >= MinView) + { + if (DefaultViewCount > 256) DefView = 256; + } + else + { + DefView = MinView; + } + DefaultViewCount = DefView; + + // + // Parse maximum view count, cannot be bigger than 256 or smaller than default + // + if (MaximumViewCount >= DefView) + { + if (MaximumViewCount > 256) MaximumViewCount = 256; + } + else + { + MaximumViewCount = DefView; + } + + // + // Parse minimum view length, cannot be bigger than 1GB or smaller than 64KB + // + MinViewLength = MinimumViewLength; + if (MinimumViewLength >= 0x10000) + { + if (MinimumViewLength > 0x40000000) MinViewLength = 0x40000000u; + } + else + { + MinViewLength = 0x10000u; + } + MinimumViewLength = MinViewLength; + + // + // Parse default view length, cannot be bigger than 1GB or smaller than minimum + // + DefViewLength = DefaultViewLength; + if (DefaultViewLength >= MinViewLength) + { + if (DefaultViewLength > 0x40000000) DefViewLength = 0x40000000u; + } + else + { + DefViewLength = MinViewLength; + } + DefaultViewLength = DefViewLength; + + // + // Parse maximum view length, cannot be bigger than 1GB or smaller than default + // + MaxViewLength = MaximumViewLength; + if (MaximumViewLength >= DefViewLength) + { + if (MaximumViewLength > 0x40000000) MaxViewLength = 0x40000000u; + } + else + { + MaxViewLength = DefViewLength; + } + MaximumViewLength = MaxViewLength; + + // + // Parse maximum view length per disk, cannot be smaller than 16MB + // + if (MaximumPerDiskViewLength >= 0x1000000) + { + if (MaxViewLength > 0xFFFFFFFF) MaximumPerDiskViewLength = -1; + } + else + { + MaximumPerDiskViewLength = 0x1000000u; + } +} + +NTSTATUS +NTAPI +RamdiskOpenClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskReadWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskPnp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskPower(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskScsi(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskFlushBuffers(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +VOID +NTAPI +RamdiskUnload(IN PDRIVER_OBJECT DriverObject) +{ + UNIMPLEMENTED; + while (TRUE); +} + +NTSTATUS +NTAPI +RamdiskAddDevice(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + PCHAR BootDeviceName, CommandLine; + PDEVICE_OBJECT PhysicalDeviceObject; + NTSTATUS Status; + DPRINT1("RAMDISK Class Driver\n"); + + // + // Query ramdisk parameters + // + QueryParameters(RegistryPath); + + // + // Save the registry path + // + DriverRegistryPath = *RegistryPath; + DriverRegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, + RegistryPath->Length + + sizeof(WCHAR), + TAG('R', 'a', 'm', 'd')); + if (!DriverRegistryPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; + RtlCopyUnicodeString(&DriverRegistryPath, RegistryPath); + + // + // Set device routines + // + DriverObject->MajorFunction[IRP_MJ_CREATE] = RamdiskOpenClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = RamdiskOpenClose; + DriverObject->MajorFunction[IRP_MJ_READ] = RamdiskReadWrite; + DriverObject->MajorFunction[IRP_MJ_WRITE] = RamdiskReadWrite; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = RamdiskDeviceControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = RamdiskPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = RamdiskPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = RamdiskSystemControl; + DriverObject->MajorFunction[IRP_MJ_SCSI] = RamdiskScsi; + DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = RamdiskFlushBuffers; + DriverObject->DriverExtension->AddDevice = RamdiskAddDevice; + DriverObject->DriverUnload = RamdiskUnload; + + // + // Check for a loader block + // + if (KeLoaderBlock) + { + // + // Get the boot device name + // + BootDeviceName = KeLoaderBlock->ArcBootDeviceName; + if (BootDeviceName) + { + // + // Check if we're booting from ramdisk + // + if ((strlen(BootDeviceName) >= 10) && + !(_strnicmp(BootDeviceName, "ramdisk(0)", 10))) + { + // + // We'll have to tell the PnP Manager + // + ReportDetectedDevice = TRUE; + + // + // Check for a command line + // + CommandLine = KeLoaderBlock->LoadOptions; + if (CommandLine) + { + // + // Check if this is an ISO boot + // + if (strstr(CommandLine, "RDEXPORTASCD")) + { + // + // Remember for later + // + ExportBootDiskAsCd = TRUE; + } + + // + // Check if this is PE boot + // + if (strstr(CommandLine, "MININT")) + { + // + // Remember for later + // + IsWinPEBoot = TRUE; + } + } + } + + } + } + + // + // Installing from Ramdisk isn't supported yet + // + ASSERT(KeLoaderBlock->SetupLdrBlock); + + // + // Are we reporting the device + // + if (ReportDetectedDevice) + { + // + // Do it + // + Status = IoReportDetectedDevice(DriverObject, + InterfaceTypeUndefined, + 0xFFFFFFFF, + 0xFFFFFFFF, + NULL, + NULL, + 0, + &PhysicalDeviceObject); + if (NT_SUCCESS(Status)) + { + // + // Create the device object + // + Status = RamdiskAddDevice(DriverObject, PhysicalDeviceObject); + if (NT_SUCCESS(Status)) + { + // + // We're done + // + PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + Status = STATUS_SUCCESS; + } + } + } + else + { + // + // Done + // + Status = STATUS_SUCCESS; + } + + // + // Done + // + return Status; +} Propchange: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: 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 (added) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="ramdisk" type="kernelmodedriver" installbase="system32/drivers" installname="ramdisk.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> + <linkerflag>-lgcc</linkerflag> + <library>ntoskrnl</library> + <library>hal</library> + <library>class2</library> + <library>scsiport</library> + <file>ramdisk.c</file> + <file>ramdisk.rc</file> +</module> Propchange: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rc (added) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rc [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Ramdisk Class Driver\0" +#define REACTOS_STR_INTERNAL_NAME "ramdisk\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ramdisk.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain 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] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: hal/halarm/generic/hal.c * PURPOSE: Hardware Abstraction Layer * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/hal/halarm/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halarm/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/include/hal.h [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: hal/halarm/include/hal.h * PURPOSE: Hardware Abstraction Layer Header * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/include/reactos/arm/peripherals/pl011.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: include/reactos/arm/targets/pl011.h * PURPOSE: PL011 Registers and Constants * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/include/reactos/arm/peripherals/pl190.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: include/reactos/arm/targets/pl190.h * PURPOSE: PL190 Registers and Constants * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/include/reactos/arm/peripherals/sp804.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: include/reactos/arm/targets/pl011.h * PURPOSE: SB804 Registers and Constants * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/lib/rtl/arm/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/arm/debug_asm.S?re… ============================================================================== --- trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: rtl/arm/debug_asm.S * PURPOSE: Cross-privilege Debugging and Exception Support for ARM * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/config/arm/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/arm/cmhard… ============================================================================== --- trunk/reactos/ntoskrnl/config/arm/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/arm/cmhardwr.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/config/arm/cmhardwr.c * PURPOSE: Configuration Manager - ARM Specific Code * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/ex/exintrin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/exintrin.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ex/exinrin.c + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/ex/exintrin.c * PURPOSE: Exported kernel functions which are now intrinsics * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinterlck.c… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ex/fastinterlck.c * PURPOSE: Portable Ex*Interlocked and REGISTER routines for non-x86 * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/include/internal/arm/ksarm.h * PURPOSE: Definitions and offsets for ARM Assembly and C code * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/arm_kprint… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/arm_kprintf.c * PURPOSE: Early serial printf-style kernel debugging (ARM bringup) * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/ke/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/boot.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/boot.s * PURPOSE: Implements the kernel entry point for ARM machines * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/cpu.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/cpu.c * PURPOSE: Implements routines for ARM CPU support * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/ctxswtch.s * PURPOSE: Context Switch and Idle Thread on ARM * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/exp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/exp.c * PURPOSE: Implements exception helper routines for ARM machines * PROGRAMMERS: ReactOS Portable Systems Group 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] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/kiinit.c * PURPOSE: Implements the kernel entry point for ARM machines * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/thrdini.c * PURPOSE: Implements thread context setup and startup for ARM machines * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/trap.s * PURPOSE: Support for exceptions and interrupts on ARM machines * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/trapc.c * PURPOSE: Implements the various trap handlers for ARM exceptions * PROGRAMMERS: ReactOS Portable Systems Group 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] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/mm/arm/stubs.c * PURPOSE: ARM Memory Manager * PROGRAMMERS: ReactOS Portable Systems Group @@ -124,7 +124,7 @@ // // Not valid for kernel addresses // - DPRINT1("MmDeletePageTable(%p, %p)\n", Process, Address); + DPRINT("MmDeletePageTable(%p, %p)\n", Process, Address); ASSERT(Address < MmSystemRangeStart); // @@ -388,7 +388,7 @@ MMPTE TempPte, TempPde; NTSTATUS Status; PFN_NUMBER Pfn; - DPRINT1("[KMAP]: %p %d\n", Address, PageCount); + DPRINT("[KMAP]: %p %d\n", Address, PageCount); //ASSERT(Address >= MmSystemRangeStart); // @@ -679,7 +679,7 @@ // Address = HYPER_SPACE + ((PointerPte - FirstPte) * PAGE_SIZE); KiFlushSingleTb(FALSE, Address); - DPRINT1("[HMAP]: %p %lx\n", Address, Page); + DPRINT("[HMAP]: %p %lx\n", Address, Page); return Address; } @@ -689,7 +689,7 @@ { PFN_TYPE Pfn; PMMPTE PointerPte; - DPRINT1("[HUNMAP]: %p\n", Address); + DPRINT("[HUNMAP]: %p\n", Address); // // Get the PTE Modified: trunk/reactos/ntoskrnl/ps/arm/psctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/arm/psctx.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ps/arm/psctx.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/arm/psctx.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ps/arm/pxctx.c * PURPOSE: Process Manager: Set/Get Context for ARM * PROGRAMMERS: ReactOS Portable Systems Group Modified: trunk/reactos/ntoskrnl/rtl/arm/rtlexcpt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/arm/rtlexcpt.… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/arm/rtlexcpt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/arm/rtlexcpt.c [iso-8859-1] Sat Jun 28 21:58:05 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/rtl/arm/rtlexcpt.c * PURPOSE: ARM Exception Helper Routines for Stack Walking * PROGRAMMERS: ReactOS Portable Systems Group

16 years, 2 months

[jimtabor] 34169: Arc: - Ported GraphApp draw arc fill algorithm. It was faster than X11. Include copyright license in header. - Now we can draw pies and arcs and fill them, need to test chord fill.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jun 28 20:19:46 2008 New Revision: 34169 URL: http://svn.reactos.org/svn/reactos?rev=34169&view=rev Log: Arc: - Ported GraphApp draw arc fill algorithm. It was faster than X11. Include copyright license in header. - Now we can draw pies and arcs and fill them, need to test chord fill. Added: trunk/reactos/subsystems/win32/win32k/objects/drawing.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild 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] Sat Jun 28 20:19:46 2008 @@ -24,6 +24,8 @@ #define Rsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0))) #define Rcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0))) + +BOOL FASTCALL IntFillArc( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, double StartArc, double EndArc, ARCTYPE arctype); static BOOL @@ -41,10 +43,11 @@ { PDC_ATTR Dc_Attr; RECTL RectBounds; - PGDIBRUSHOBJ PenBrushObj, FillBrushObj; - GDIBRUSHINST FillBrushInst, PenBrushInst; + PGDIBRUSHOBJ PenBrushObj; + GDIBRUSHINST PenBrushInst; BITMAPOBJ *BitmapObj; BOOL ret = TRUE; + LONG PenWidth, PenOrigWidth; double AngleStart, AngleEnd; LONG RadiusX, RadiusY, CenterX, CenterY; LONG SfCx, SfCy, EfCx, EfCy; @@ -60,50 +63,58 @@ 0|___________________| 0 bottom + */ - if (Right <= Left || Top <= Bottom) - { - DPRINT1("Arc Fail 1\n"); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } -/* - if (Right - Left != Bottom - Top) - { - UNIMPLEMENTED; - } -*/ + if (Right < Left) + { + INT tmp = Right; Right = Left; Left = tmp; + } + if (Bottom < Top) + { + INT tmp = Bottom; Bottom = Top; Top = tmp; + } + if ((Left == Right) || + (Top == Bottom) || + (((arctype != GdiTypeArc) || (arctype != GdiTypeArcTo)) && + ((Right - Left == 1) || + (Bottom - Top == 1)))) + return TRUE; + + if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) + { + INT X, Y; + X = XRadialStart; + Y = YRadialStart; + XRadialStart = XRadialEnd; + YRadialStart = YRadialEnd; + XRadialEnd = X; + YRadialEnd = Y; + } + Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); - if (NULL == FillBrushObj) - { - DPRINT1("Arc Fail 2\n"); + PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); + if (NULL == PenBrushObj) + { + DPRINT1("Arc Fail 1\n"); SetLastWin32Error(ERROR_INTERNAL_ERROR); return FALSE; } - PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); - if (NULL == PenBrushObj) - { - DPRINT1("Arc Fail 3\n"); - BRUSHOBJ_UnlockBrush(FillBrushObj); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (NULL == BitmapObj) - { - DPRINT1("Arc Fail 4\n"); - BRUSHOBJ_UnlockBrush(FillBrushObj); - PENOBJ_UnlockPen(PenBrushObj); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - - IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); + PenOrigWidth = PenWidth = PenBrushObj->ptPenWidth.x; + if (PenBrushObj->ulPenStyle == PS_NULL) PenWidth = 0; + + if (PenBrushObj->ulPenStyle == PS_INSIDEFRAME) + { + if (2*PenWidth > (Right - Left)) PenWidth = (Right -Left + 1)/2; + if (2*PenWidth > (Bottom - Top)) PenWidth = (Bottom -Top + 1)/2; + Left += PenWidth / 2; + Right -= (PenWidth - 1) / 2; + Top += PenWidth / 2; + Bottom -= (PenWidth - 1) / 2; + } + + if (!PenWidth) PenWidth = 1; + PenBrushObj->ptPenWidth.x = PenWidth; Left += dc->ptlDCOrig.x; Right += dc->ptlDCOrig.x; @@ -125,56 +136,103 @@ DPRINT1("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); - if (Left == Right) - { - DPRINT1("Arc Good Exit\n"); - PUTPIXEL(Left, Top, PenBrushInst); - BITMAPOBJ_UnlockBitmap(BitmapObj); - BRUSHOBJ_UnlockBrush(FillBrushObj); - PENOBJ_UnlockPen(PenBrushObj); - return ret; - } - RadiusX = (RectBounds.right - RectBounds.left)/2; - RadiusY = (RectBounds.bottom - RectBounds.top)/2; - CenterX = RectBounds.left + RadiusX; - CenterY = RectBounds.top + RadiusY; - - AngleEnd = atan2(-(YRadialEnd - CenterY), XRadialEnd - CenterX)* (180.0 / M_PI); - AngleStart = atan2(-(YRadialStart - CenterY), XRadialStart - CenterX)* (180.0 / M_PI); + RadiusX = (RectBounds.right - RectBounds.left) / 2; + RadiusY = (RectBounds.bottom - RectBounds.top) / 2; + CenterX = (RectBounds.right + RectBounds.left) / 2; + CenterY = (RectBounds.bottom + RectBounds.top) / 2; + AngleEnd = atan2((YRadialEnd - CenterY), XRadialEnd - CenterX)*(360.0/(M_PI*2)); + AngleStart = atan2((YRadialStart - CenterY), XRadialStart - CenterX)*(360.0/(M_PI*2)); SfCx = (Rcos(AngleStart) * RadiusX); SfCy = (Rsin(AngleStart) * RadiusY); - EfCx = (Rcos(AngleEnd) * RadiusX); EfCy = (Rsin(AngleEnd) * RadiusY); - { - FLOAT AngS = AngleStart, Factor = 1; + + if ((arctype == GdiTypePie) || (arctype == GdiTypeChord)) + { + ret = IntFillArc( dc, + RectBounds.left, + RectBounds.top, + fabs(RectBounds.right-RectBounds.left), // Width + fabs(RectBounds.bottom-RectBounds.top), // Height + AngleStart, + AngleEnd, + arctype); + } + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (NULL == BitmapObj) + { + DPRINT1("Arc Fail 2\n"); + PENOBJ_UnlockPen(PenBrushObj); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + + IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); + + if (arctype == GdiTypePie) + { + PUTLINE(CenterX, CenterY, SfCx + CenterX, SfCy + CenterY, PenBrushInst); + } + { + double AngS = AngleStart, AngT = AngleEnd, + Factor = fabs(RadiusX) < 25 ? 1.0 : (25/fabs(RadiusX)); int x,y, ox = 0, oy = 0; - - if (arctype == GdiTypePie) + BOOL Start = TRUE; + + if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) { - PUTLINE(SfCx + CenterX, SfCy + CenterY, CenterX, CenterY, PenBrushInst); + DPRINT1("Arc CW\n"); + for (; AngS < AngT; AngS += Factor) + { + x = (RadiusX * Rcos(AngS)); + y = (RadiusY * Rsin(AngS)); + + DPRINT("Arc CW -> %d, X: %d Y: %d\n",(INT)AngS,x,y); + if (Start) + { + PUTPIXEL(x + CenterX, y + CenterY, PenBrushInst); + ox = x; + oy = y; + Start = FALSE; + continue; + } + PUTLINE(ox + CenterX, oy + CenterY, x + CenterX, y + CenterY, PenBrushInst); + ox = x; + oy = y; + } } - - for(; AngS < AngleEnd; AngS += Factor) + else { - x = (Rcos(AngS) * RadiusX); - y = (Rsin(AngS) * RadiusY); - - if (arctype == GdiTypePie) - PUTLINE((x + CenterX) - 1, (y + CenterY) - 1, CenterX, CenterY, FillBrushInst); - - PUTPIXEL (x + CenterX, y + CenterY, PenBrushInst); - ox = x; - oy = y; + DPRINT1("Arc CCW\n"); + for (; AngT < AngS; AngS -= Factor) + { + x = (RadiusX * Rcos(AngS)); + y = (RadiusY * Rsin(AngS)); + + DPRINT("Arc CCW -> %d, X: %d Y: %d\n",(INT)AngS,x,y); + if (Start) + { + PUTPIXEL(x + CenterX, y + CenterY, PenBrushInst); + ox = x; + oy = y; + Start = FALSE; + continue; + } + PUTLINE(ox + CenterX, oy + CenterY, x + CenterX, y + CenterY, PenBrushInst); + ox = x; + oy = y; + } } - - if (arctype == GdiTypePie) - PUTLINE(EfCx + CenterX, EfCy + CenterY, CenterX, CenterY, PenBrushInst); - - } + } + if (arctype == GdiTypePie) + PUTLINE(EfCx + CenterX, EfCy + CenterY, CenterX, CenterY, PenBrushInst); + if (arctype == GdiTypeChord) + PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, PenBrushInst); + + PenBrushObj->ptPenWidth.x = PenOrigWidth; BITMAPOBJ_UnlockBitmap(BitmapObj); - BRUSHOBJ_UnlockBrush(FillBrushObj); PENOBJ_UnlockPen(PenBrushObj); DPRINT1("IntArc Exit.\n"); return ret; @@ -196,9 +254,6 @@ { BOOL Ret; RECT rc, rc1; - double AngleStart, AngleEnd; - LONG RadiusX, RadiusY, CenterX, CenterY, Width, Height; - LONG SfCx, SfCy, EfCx = 0, EfCy = 0; DPRINT1("StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", XStartArc,YStartArc,XEndArc,YEndArc); @@ -221,22 +276,10 @@ if (arctype == GdiTypeArcTo) { - Width = fabs(RightRect - LeftRect); - Height = fabs(BottomRect - TopRect); - RadiusX = Width/2; - RadiusY = Height/2; - CenterX = RightRect > LeftRect ? LeftRect + RadiusX : RightRect + RadiusX; - CenterY = BottomRect > TopRect ? TopRect + RadiusY : BottomRect + RadiusY; - - AngleStart = atan2((YStartArc - CenterY)/Height, (XStartArc - CenterX)/Width); - AngleEnd = atan2((YEndArc - CenterY)/Height, (XEndArc - CenterX)/Width); - - EfCx = GDI_ROUND(CenterX+cos(AngleEnd) * RadiusX); - EfCy = GDI_ROUND(CenterY+sin(AngleEnd) * RadiusY); - SfCx = GDI_ROUND(CenterX+cos(AngleStart) * RadiusX); - SfCy = GDI_ROUND(CenterY+sin(AngleStart) * RadiusY); - - IntGdiLineTo(dc, SfCx, SfCy); + if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) + IntGdiLineTo(dc, XEndArc, YEndArc); + else + IntGdiLineTo(dc, XStartArc, YStartArc); } IntGdiSetRect(&rc, LeftRect, TopRect, RightRect, BottomRect); @@ -244,6 +287,7 @@ // IntLPtoDP(dc, (LPPOINT)&rc, 2); // IntLPtoDP(dc, (LPPOINT)&rc1, 2); + Ret = IntArc( dc, rc.left, @@ -258,9 +302,11 @@ if (arctype == GdiTypeArcTo) { - IntGdiMoveToEx(dc, EfCx, EfCy, NULL); - } - + if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) + IntGdiMoveToEx(dc, XStartArc, YStartArc, NULL); + else + IntGdiMoveToEx(dc, XEndArc, YEndArc, NULL); + } return Ret; } @@ -292,9 +338,9 @@ result = IntGdiArcInternal( GdiTypeArcTo, pDC, x-dwRadius, + y-dwRadius, + x+dwRadius, y+dwRadius, - x+dwRadius, - y-dwRadius, x1, y1, x2, @@ -304,7 +350,7 @@ if (result) { - IntGdiMoveToEx(pDC, x2, y2, NULL); + IntGdiMoveToEx(pDC, x2, y2, NULL); // Dont forget Path. } return result; } Added: 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 (added) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Sat Jun 28 20:19:46 2008 @@ -1,0 +1,810 @@ +/* +App Software Licence +-------------------- +This package includes software which is copyright (c) L. Patrick. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. You may not sell this software package. +4. You may include this software in a distribution of other software, + and you may charge a nominal fee for the media used. +5. You may sell derivative programs, providing that such programs + simply use this software in a compiled form. +6. You may sell derivative programs which use a compiled, modified + version of this software, provided that you have attempted as + best as you can to propagate all modifications made to the source + code files of this software package back to the original author(s) + of this package. + +THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS AS IS, AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ +/* Copyright (c) L. Patrick + + This file is part of the App cross-platform programming package. + You may redistribute it and/or modify it under the terms of the + App Software License. See the file LICENSE.TXT for details. + + http://enchantia.com/software/graphapp/ + http://www.it.usyd.edu.au/~graphapp/ +*/ +/* + Modified for ReactOS + */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + + +#define DEGREES_TO_RADIANS(deg) ((deg)*2*M_PI/360) + +typedef struct _Rect +{ + int x, y; /* top-left point inside rect */ + int width, height; /* width and height of rect */ +} Rect, *PRect; + +static +POINT +INTERNAL_CALL +app_new_point(int x, int y) +{ + POINT p; + p.x = x; + p.y = y; + return p; +} +#define pt(x,y) app_new_point((x),(y)) + +static +Rect +INTERNAL_CALL +rect(int x, int y, int width, int height) +{ + Rect r; + + r.x = x; + r.y = y; + r.width = width; + r.height = height; + return r; +} + + +/* + * app_window_fill_rect: + * + * Fill a rectangle with colour, in a window. + * + * This function implements client-side clipping, so that + * we never rely on the GDI system to do clipping, except if + * the destination is a window which is partially obscured. + * In that situation we must rely on the GDI system because there + * is no way for the program to know which portions of the + * window are currently obscured. + */ +static +int +INTERNAL_CALL +app_fill_rect(DC *dc, Rect r, PGDIBRUSHOBJ BrushObj) +{ + RECTL DestRect; + BITMAPOBJ *BitmapObj; + GDIBRUSHINST BrushInst; + POINTL BrushOrigin; + BOOL Ret = TRUE; + + ASSERT(BrushObj); + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (BitmapObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + + /* fix negative spaces */ + if (r.width < 0) + { + r.x += r.width; + r.width = 0 - r.width; + } + if (r.height < 0) + { + r.y += r.height; + r.height = 0 - r.height; + } + + DestRect.left = r.x; + DestRect.right = r.x + r.width; + + DestRect.top = r.y; + DestRect.bottom = r.y + r.height; + + BrushOrigin.x = BrushObj->ptOrigin.x; + BrushOrigin.y = BrushObj->ptOrigin.y; + + IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush); + + Ret = IntEngBitBlt( + &BitmapObj->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + NULL, + NULL, + &BrushInst.BrushObject, // use pDC->eboFill + &BrushOrigin, + ROP3_TO_ROP4(PATCOPY)); + } + + BITMAPOBJ_UnlockBitmap(BitmapObj); + return (int)Ret; +} + +/* + * Draw an arc of an ellipse from start_angle anti-clockwise to + * end_angle. If the angles coincide, draw nothing; if they + * differ by 360 degrees or more, draw a full ellipse. + * The shape is drawn with the current line thickness, + * completely within the bounding rectangle. The shape is also + * axis-aligned, so that the ellipse would be horizontally and + * vertically symmetric is it was complete. + * + * The draw_arc algorithm is based on draw_ellipse, but unlike + * that algorithm is not symmetric in the general case, since + * an angular portion is clipped from the shape. + * This clipping is performed by keeping track of two hypothetical + * lines joining the centre point to the enclosing rectangle, + * at the angles start_angle and end_angle, using a line-intersection + * algorithm. Essentially the algorithm just fills the spaces + * which are within the arc and also between the angles, going + * in an anti-clockwise direction from start_angle to end_angle. + * In the top half of the ellipse, this amounts to drawing + * to the left of the start_angle line and to the right of + * the end_angle line, while in the bottom half of the ellipse, + * it involves drawing to the right of the start_angle and to + * the left of the end_angle. + */ + +/* + * Fill a rectangle within an arc, given the centre point p0, + * and the two end points of the lines corresponding to the + * start_angle and the end_angle. This function takes care of + * the logic needed to swap the fill direction below + * the central point, and also performs the calculations + * needed to intersect the current Y value with each line. + */ +static +int +FASTCALL +app_fill_arc_rect(DC *g, + Rect r, // top, left, width, height + POINT p0, // Center + POINT p1, // Start + POINT p2, // End + int start_angle, + int end_angle, + PGDIBRUSHOBJ BrushObj) +{ + int x1, x2; + int start_above, end_above; + long rise1, run1, rise2, run2; + + rise1 = p1.y - p0.y; + run1 = p1.x - p0.x; + rise2 = p2.y - p0.y; + run2 = p2.x - p0.x; + + if (r.y <= p0.y) // + { + /* in top half of arc ellipse */ + + if (p1.y <= r.y) + { + /* start_line is in the top half and is */ + /* intersected by the current Y scan line */ + if (rise1 == 0) + x1 = p1.x; + else + x1 = p0.x + (r.y-p0.y)*run1/rise1; + start_above = 1; + } + else if ((start_angle >= 0) && (start_angle <= 180)) + { + /* start_line is above middle */ + x1 = p1.x; + start_above = 1; + } + else + { + /* start_line is below middle */ + x1 = r.x + r.width; + start_above = 0; + } + if (x1 < r.x) + x1 = r.x; + if (x1 > r.x+r.width) + x1 = r.x+r.width; + + if (p2.y <= r.y) + { + /* end_line is in the top half and is */ + /* intersected by the current Y scan line */ + if (rise2 == 0) + x2 = p2.x; + else + x2 = p0.x + (r.y-p0.y)*run2/rise2; + end_above = 1; + } + else if ((end_angle >= 0) && (end_angle <= 180)) + { + /* end_line is above middle */ + x2 = p2.x; + end_above = 1; + } + else + { + /* end_line is below middle */ + x2 = r.x; + end_above = 0; + } + + if (x2 < r.x) x2 = r.x; + + if (x2 > r.x+r.width) x2 = r.x+r.width; + + if (start_above && end_above) + { + if (start_angle > end_angle) + { + /* fill outsides of wedge */ + if (! app_fill_rect(g, rect(r.x, r.y, + x1-r.x, r.height), BrushObj)) + return 0; + return app_fill_rect(g, rect(x2, r.y, + r.x+r.width-x2, r.height), BrushObj); + } + else + { + /* fill inside of wedge */ + r.width = x1-x2; + r.x = x2; + return app_fill_rect(g, r, BrushObj); + } + } + else if (start_above) + { + /* fill to the left of the start_line */ + r.width = x1-r.x; + return app_fill_rect(g, r, BrushObj); + } + else if (end_above) + { + /* fill right of end_line */ + r.width = r.x+r.width-x2; + r.x = x2; + return app_fill_rect(g, r, BrushObj); + } + else + { + if (start_angle > end_angle) + return app_fill_rect(g,r, BrushObj); + else + return 1; + } + } + else + { + /* in lower half of arc ellipse */ + + if (p1.y >= r.y) + { + /* start_line is in the lower half and is */ + /* intersected by the current Y scan line */ + if (rise1 == 0) + x1 = p1.x; + else + x1 = p0.x + (r.y-p0.y)*run1/rise1; + start_above = 0; + } + else if ((start_angle >= 180) && (start_angle <= 360)) + { + /* start_line is below middle */ + x1 = p1.x; + start_above = 0; + } + else + { + /* start_line is above middle */ + x1 = r.x; + start_above = 1; + } + if (x1 < r.x) + x1 = r.x; + if (x1 > r.x+r.width) + x1 = r.x+r.width; + + if (p2.y >= r.y) + { + /* end_line is in the lower half and is */ + /* intersected by the current Y scan line */ + if (rise2 == 0) + x2 = p2.x; + else + x2 = p0.x + (r.y-p0.y)*run2/rise2; + end_above = 0; + } + else if ((end_angle >= 180) && (end_angle <= 360)) + { + /* end_line is below middle */ + x2 = p2.x; + end_above = 0; + } + else + { + /* end_line is above middle */ + x2 = r.x + r.width; + end_above = 1; + } + if (x2 < r.x) + x2 = r.x; + if (x2 > r.x+r.width) + x2 = r.x+r.width; + + if (start_above && end_above) + { + if (start_angle > end_angle) + return app_fill_rect(g,r, BrushObj); + else + return 1; + } + else if (start_above) + { + /* fill to the left of end_line */ + r.width = x2-r.x; + return app_fill_rect(g,r, BrushObj); + } + else if (end_above) + { + /* fill right of start_line */ + r.width = r.x+r.width-x1; + r.x = x1; + return app_fill_rect(g,r, BrushObj); + } + else + { + if (start_angle > end_angle) + { + /* fill outsides of wedge */ + if (! app_fill_rect(g, rect(r.x, r.y, + x2-r.x, r.height), BrushObj)) + return 0; + return app_fill_rect(g, rect(x1, r.y, + r.x+r.width-x1, r.height), BrushObj); + } + else + { + /* fill inside of wedge */ + r.width = x2-x1; + r.x = x1; + return app_fill_rect(g, r, BrushObj); + } + } + } +} + +/* + * To fill an axis-aligned ellipse, we use a scan-line algorithm. + * We walk downwards from the top Y co-ordinate, calculating + * the width of the ellipse using incremental integer arithmetic. + * To save calculation, we observe that the top and bottom halves + * of the ellipsoid are mirror-images, therefore we can draw the + * top and bottom halves by reflection. As a result, this algorithm + * draws rectangles inwards from the top and bottom edges of the + * bounding rectangle. + * + * To save rendering time, draw as few rectangles as possible. + * Other ellipse-drawing algorithms assume we want to draw each + * line, using a draw_pixel operation, or a draw_horizontal_line + * operation. This approach is slower than it needs to be in + * circumstances where a fill_rect operation is more efficient + * (such as in X-Windows, where there is a communication overhead + * to the X-Server). For this reason, the algorithm accumulates + * rectangles on adjacent lines which have the same width into a + * single larger rectangle. + * + * This algorithm forms the basis of the later, more complex, + * draw_ellipse algorithm, which renders the rectangular spaces + * between an outer and inner ellipse, and also the draw_arc and + * fill_arc operations which additionally clip drawing between + * a start_angle and an end_angle. + * + */ +static +int +FASTCALL +app_fill_ellipse(DC *g, Rect r, PGDIBRUSHOBJ BrushObj) +{ + /* e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */ + + int a = r.width / 2; + int b = r.height / 2; + int x = 0; + int y = b; + long a2 = a*a; + long b2 = b*b; + long xcrit = (3 * a2 / 4) + 1; + long ycrit = (3 * b2 / 4) + 1; + long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */ + long dxt = b2*(3+x+x); + long dyt = a2*(3-y-y); + int d2xt = b2+b2; + int d2yt = a2+a2; + Rect r1, r2; + int result = 1; + +// START_DEBUG(); + + if ((r.width <= 2) || (r.height <= 2)) + return app_fill_rect(g, r, BrushObj); + + r1.x = r.x + a; + r1.y = r.y; + r1.width = r.width & 1; /* i.e. if width is odd */ + r1.height = 1; + + r2 = r1; + r2.y = r.y + r.height - 1; + + while (y > 0) + { + if (t + a2*y < xcrit) { /* e(x+1,y-1/2) <= 0 */ + /* move outwards to encounter edge */ + x += 1; + t += dxt; + dxt += d2xt; + + /* move outwards */ + r1.x -= 1; r1.width += 2; + r2.x -= 1; r2.width += 2; + } + else if (t - b2*x >= ycrit) { /* e(x+1/2,y-1) > 0 */ + /* drop down one line */ + y -= 1; + t += dyt; + dyt += d2yt; + + /* enlarge rectangles */ + r1.height += 1; + r2.height += 1; r2.y -= 1; + } + else { + /* drop diagonally down and out */ + x += 1; + y -= 1; + t += dxt + dyt; + dxt += d2xt; + dyt += d2yt; + + if ((r1.width > 0) && (r1.height > 0)) + { + /* draw rectangles first */ + + if (r1.y+r1.height < r2.y) { + /* distinct rectangles */ + result &= app_fill_rect(g, r1, BrushObj); + result &= app_fill_rect(g, r2, BrushObj); + } + + /* move down */ + r1.y += r1.height; r1.height = 1; + r2.y -= 1; r2.height = 1; + } + else { + /* skipped pixels on initial diagonal */ + + /* enlarge, rather than moving down */ + r1.height += 1; + r2.height += 1; r2.y -= 1; + } + + /* move outwards */ + r1.x -= 1; r1.width += 2; + r2.x -= 1; r2.width += 2; + } + } + if (r1.y < r2.y) { + /* overlap */ + r1.x = r.x; + r1.width = r.width; + r1.height = r2.y+r2.height-r1.y; + result &= app_fill_rect(g, r1, BrushObj); + } + else if (x <= a) { + /* crossover, draw final line */ + r1.x = r.x; + r1.width = r.width; + r1.height = r1.y+r1.height-r2.y; + r1.y = r2.y; + result &= app_fill_rect(g, r1, BrushObj); + } + return result; +} + +static +FASTCALL +POINT app_boundary_point(Rect r, int angle) +{ + int cx, cy; + double tangent; + + cx = r.width; + cx /= 2; + cx += r.x; + + cy = r.height; + cy /= 2; + cy += r.y; + + if (angle == 0) + return pt(r.x+r.width, cy); + else if (angle == 45) + return pt(r.x+r.width, r.y); + else if (angle == 90) + return pt(cx, r.y); + else if (angle == 135) + return pt(r.x, r.y); + else if (angle == 180) + return pt(r.x, cy); + else if (angle == 225) + return pt(r.x, r.y+r.height); + else if (angle == 270) + return pt(cx, r.y+r.height); + else if (angle == 315) + return pt(r.x+r.width, r.y+r.height); + + tangent = tan(DEGREES_TO_RADIANS(angle)); + + if ((angle > 45) && (angle < 135)) + return pt((int)(cx+r.height/tangent/2), r.y); + else if ((angle > 225) && (angle < 315)) + return pt((int)(cx-r.height/tangent/2), r.y+r.height); + else if ((angle > 135) && (angle < 225)) + return pt(r.x, (int)(cy+r.width*tangent/2)); + else + return pt(r.x+r.width, (int)(cy-r.width*tangent/2)); +} + +int +FASTCALL +app_fill_arc(DC *g, Rect r, int start_angle, int end_angle, PGDIBRUSHOBJ BrushObj, BOOL Chord) +{ + /* e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */ + + int a = r.width / 2; + int b = r.height / 2; + int x = 0; + int y = b; + long a2 = a*a; + long b2 = b*b; + long xcrit = (3 * a2 / 4) + 1; + long ycrit = (3 * b2 / 4) + 1; + long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */ + long dxt = b2*(3+x+x); + long dyt = a2*(3-y-y); + int d2xt = b2+b2; + int d2yt = a2+a2; + Rect r1, r2; + int movedown, moveout; + int result = 1; + + /* line descriptions */ + POINT p0, p1, p2; + +// START_DEBUG(); + + /* if angles differ by 360 degrees or more, close the shape */ + if ((start_angle + 360 <= end_angle) || + (start_angle - 360 >= end_angle)) + { + return app_fill_ellipse(g, r, BrushObj); + } + + /* make start_angle >= 0 and <= 360 */ + while (start_angle < 0) + start_angle += 360; + start_angle %= 360; + + /* make end_angle >= 0 and <= 360 */ + while (end_angle < 0) + end_angle += 360; + end_angle %= 360; + + /* draw nothing if the angles are equal */ + if (start_angle == end_angle) + return 1; + + /* find arc wedge line end points */ + p1 = app_boundary_point(r, start_angle); + p2 = app_boundary_point(r, end_angle); + p0 = pt(r.x + r.width/2, r.y + r.height/2); + if (Chord) + { + int zx, zy; + zx = (p0.x-p1.x)/2; + zy = (p2.y-p1.y)/2; + p0 = pt(p1.x+zx,p0.y+zy); + } + /* initialise rectangles to be drawn */ + r1.x = r.x + a; + r1.y = r.y; + r1.width = r.width & 1; /* i.e. if width is odd */ + r1.height = 1; + + r2 = r1; + r2.y = r.y + r.height - 1; + + while (y > 0) + { + moveout = movedown = 0; + + if (t + a2*y < xcrit) { /* e(x+1,y-1/2) <= 0 */ + /* move outwards to encounter edge */ + x += 1; + t += dxt; + dxt += d2xt; + + moveout = 1; + } + else if (t - b2*x >= ycrit) { /* e(x+1/2,y-1) > 0 */ + /* drop down one line */ + y -= 1; + t += dyt; + dyt += d2yt; + + movedown = 1; + } + else { + /* drop diagonally down and out */ + x += 1; + y -= 1; + t += dxt + dyt; + dxt += d2xt; + dyt += d2yt; + + moveout = 1; + movedown = 1; + } + + if (movedown) { + if (r1.width == 0) { + r1.x -= 1; r1.width += 2; + r2.x -= 1; r2.width += 2; + moveout = 0; + } + + if (r1.x < r.x) + r1.x = r2.x = r.x; + if (r1.width > r.width) + r1.width = r2.width = r.width; + if (r1.y == r2.y-1) { + r1.x = r2.x = r.x; + r1.width = r2.width = r.width; + } + + if ((r1.width > 0) && (r1.y+r1.height < r2.y)) { + /* distinct rectangles */ + result &= app_fill_arc_rect(g, r1, + p0, p1, p2, + start_angle, end_angle, BrushObj); + result &= app_fill_arc_rect(g, r2, + p0, p1, p2, + start_angle, end_angle, BrushObj); + } + + /* move down */ + r1.y += 1; + r2.y -= 1; + } + + if (moveout) { + /* move outwards */ + r1.x -= 1; r1.width += 2; + r2.x -= 1; r2.width += 2; + } + } + if (r1.y < r2.y) { + /* overlap */ + r1.x = r.x; + r1.width = r.width; + r1.height = r2.y+r2.height-r1.y; + while (r1.height > 0) { + result &= app_fill_arc_rect(g, + rect(r1.x, r1.y, r1.width, 1), + p0, p1, p2, start_angle, end_angle, BrushObj); + r1.y += 1; + r1.height -= 1; + } + } + else if (x <= a) { + /* crossover, draw final line */ + r1.x = r.x; + r1.width = r.width; + r1.height = r1.y+r1.height-r2.y; + r1.y = r2.y; + while (r1.height > 0) { + result &= app_fill_arc_rect(g, + rect(r1.x, r1.y, r1.width, 1), + p0, p1, p2, start_angle, end_angle, BrushObj); + r1.y += 1; + r1.height -= 1; + } + } + return result; +} + +/* ReactOS Interface *********************************************************/ + +BOOL +FASTCALL +IntFillArc( PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + double StartArc, + double EndArc, + ARCTYPE arctype) +{ + PDC_ATTR Dc_Attr; + PGDIBRUSHOBJ FillBrushObj; + int Start = ceill(StartArc); + int End = ceill(EndArc); + Rect r; + BOOL Chord = (arctype == GdiTypeChord); + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + if (NULL == FillBrushObj) + { + DPRINT1("FillArc Fail\n"); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + r.x = XLeft; + r.y = YLeft; + r.width = Width; + r.height = Height; + app_fill_arc(dc, r, Start-90, End-90, FillBrushObj, Chord); + + BRUSHOBJ_UnlockBrush(FillBrushObj); + return TRUE; +} + Propchange: trunk/reactos/subsystems/win32/win32k/objects/drawing.c ------------------------------------------------------------------------------ eol-style = native Propchange: trunk/reactos/subsystems/win32/win32k/objects/drawing.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/win32/win32k/objects/drawing.c ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Jun 28 20:19:46 2008 @@ -155,6 +155,7 @@ <file>dc.c</file> <file>dcutil.c</file> <file>dibobj.c</file> + <file>drawing.c</file> <file>fillshap.c</file> <file>gdibatch.c</file> <file>gdiobj.c</file>

16 years, 2 months

[hpoussin] 34168: Operator new[] should go with delete[]

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Jun 28 14:49:04 2008 New Revision: 34168 URL: http://svn.reactos.org/svn/reactos?rev=34168&view=rev Log: Operator new[] should go with delete[] Modified: trunk/rostests/tests/stretchblt/stretchblt.cpp Modified: trunk/rostests/tests/stretchblt/stretchblt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/stretchblt/stretchb… ============================================================================== --- trunk/rostests/tests/stretchblt/stretchblt.cpp [iso-8859-1] (original) +++ trunk/rostests/tests/stretchblt/stretchblt.cpp [iso-8859-1] Sat Jun 28 14:49:04 2008 @@ -365,8 +365,8 @@ DeleteObject(SelectObject(HMemDC, HOldBmp)); DeleteDC(HMemDC); - if (bbits) - delete bbits; + if (bbits) + delete[] bbits; PostQuitMessage(0); return 0;

16 years, 2 months

[fireball] 34167: - Implement a gatewait case (was "tested" with a "Not yet supported" bug previously in the tree; DPRINT1 is left there for further testing). - Fix a bug in KeRemoveQueueApc: the code was always removing the first entry in the APC queue instead of the actual APC. This should fix weird user-mode timer bugs. (Spotted in bug 3354). See issue #3354 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 28 14:23:23 2008 New Revision: 34167 URL: http://svn.reactos.org/svn/reactos?rev=34167&view=rev Log: - Implement a gatewait case (was "tested" with a "Not yet supported" bug previously in the tree; DPRINT1 is left there for further testing). - Fix a bug in KeRemoveQueueApc: the code was always removing the first entry in the APC queue instead of the actual APC. This should fix weird user-mode timer bugs. (Spotted in bug 3354). See issue #3354 for more details. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3416… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Sat Jun 28 14:23:23 2008 @@ -212,9 +212,24 @@ } else if (Thread->State == GateWait) { - /* We were in a gate wait. FIXME: Handle this */ - DPRINT1("Not yet supported -- Report this to Alex\n"); - while (TRUE); + /* We were in a gate wait. Handle this. */ + DPRINT1("A thread was in a gate wait\n"); + + /* Lock the gate */ + KiAcquireDispatcherObject(&Thread->GateObject->Header); + + /* Remove it from the waiters list */ + RemoveEntryList(&Thread->WaitBlock[0].WaitListEntry); + + /* Unlock the gate */ + KiReleaseDispatcherObject(&Thread->GateObject->Header); + + /* Increase the queue counter if needed */ + if (Thread->Queue) Thread->Queue->CurrentCount++; + + /* Put into deferred ready list with this status */ + Status = STATUS_KERNEL_APC; + KiInsertDeferredReadyList(Thread); } } else if ((Thread->State == Waiting) && @@ -867,7 +882,7 @@ /* Acquire the dispatcher lock and remove it from the list */ KiAcquireDispatcherLockAtDpcLevel(); - if (RemoveEntryList(&ApcState->ApcListHead[Apc->ApcMode])) + if (RemoveEntryList(&Apc->ApcListEntry)) { /* Set the correct state based on the APC Mode */ if (Apc->ApcMode == KernelMode)

16 years, 2 months

← Newer
1
2
3
4
5
6
7
8
9
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008