Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[dgorbachev] 26303: Fix debug message.
by dgorbachev＠svn.reactos.org 10 Apr '07

10 Apr '07

Author: dgorbachev Date: Tue Apr 10 14:07:15 2007 New Revision: 26303 URL: http://svn.reactos.org/svn/reactos?rev=26303&view=rev Log: Fix debug message. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Tue Apr 10 14:07:15 2007 @@ -2117,7 +2117,7 @@ DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n")); return; } - DbgPrint((DPRINT_HWDETECT, "Created key: PointerController\\0\n")); + DbgPrint((DPRINT_HWDETECT, "Created key: DisplayController\\0\n")); /* Set 'ComponentInformation' value */ SetComponentInformation(ControllerKey,

1 0

[hpoussin] 26302: Replace freeldr DEBUG define, by the global DBG define
by hpoussin＠svn.reactos.org 10 Apr '07

10 Apr '07

Author: hpoussin Date: Tue Apr 10 13:31:51 2007 New Revision: 26302 URL: http://svn.reactos.org/svn/reactos?rev=26302&view=rev Log: Replace freeldr DEBUG define, by the global DBG define Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Tue Apr 10 13:31:51 2007 @@ -165,37 +165,35 @@ memcpy(Buffer, Ptr, BufferSize); -#ifdef DEBUG - DbgPrint((DPRINT_DISK, "size of buffer: %x\n", Ptr[0])); - DbgPrint((DPRINT_DISK, "information flags: %x\n", Ptr[1])); - DbgPrint((DPRINT_DISK, "number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2])); - DbgPrint((DPRINT_DISK, "number of physical heads on drive: %u\n", *(PULONG)&Ptr[4])); - DbgPrint((DPRINT_DISK, "number of physical sectors per track: %u\n", *(PULONG)&Ptr[6])); - DbgPrint((DPRINT_DISK, "total number of sectors on drive: %I64u\n", *(unsigned long long*)&Ptr[8])); - DbgPrint((DPRINT_DISK, "bytes per sector: %u\n", Ptr[12])); - if (Ptr[0] >= 0x1e) + DbgPrint((DPRINT_DISK, "size of buffer: %x\n", Ptr[0])); + DbgPrint((DPRINT_DISK, "information flags: %x\n", Ptr[1])); + DbgPrint((DPRINT_DISK, "number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2])); + DbgPrint((DPRINT_DISK, "number of physical heads on drive: %u\n", *(PULONG)&Ptr[4])); + DbgPrint((DPRINT_DISK, "number of physical sectors per track: %u\n", *(PULONG)&Ptr[6])); + DbgPrint((DPRINT_DISK, "total number of sectors on drive: %I64u\n", *(unsigned long long*)&Ptr[8])); + DbgPrint((DPRINT_DISK, "bytes per sector: %u\n", Ptr[12])); + if (Ptr[0] >= 0x1e) + { + DbgPrint((DPRINT_DISK, "EED configuration parameters: %x:%x\n", Ptr[13], Ptr[14])); + if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) { - DbgPrint((DPRINT_DISK, "EED configuration parameters: %x:%x\n", Ptr[13], Ptr[14])); - if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) - { - PUCHAR SpecPtr = (PUCHAR)((Ptr[13] << 4) + Ptr[14]); - DbgPrint((DPRINT_DISK, "SpecPtr: %x\n", SpecPtr)); - DbgPrint((DPRINT_DISK, "physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0])); - DbgPrint((DPRINT_DISK, "disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2])); - DbgPrint((DPRINT_DISK, "drive flags: %x\n", SpecPtr[4])); - DbgPrint((DPRINT_DISK, "proprietary information: %x\n", SpecPtr[5])); - DbgPrint((DPRINT_DISK, "IRQ for drive: %u\n", SpecPtr[6])); - DbgPrint((DPRINT_DISK, "sector count for multi-sector transfers: %u\n", SpecPtr[7])); - DbgPrint((DPRINT_DISK, "DMA control: %x\n", SpecPtr[8])); - DbgPrint((DPRINT_DISK, "programmed I/O control: %x\n", SpecPtr[9])); - DbgPrint((DPRINT_DISK, "drive options: %x\n", *(PUSHORT)&SpecPtr[10])); - } + PUCHAR SpecPtr = (PUCHAR)((Ptr[13] << 4) + Ptr[14]); + DbgPrint((DPRINT_DISK, "SpecPtr: %x\n", SpecPtr)); + DbgPrint((DPRINT_DISK, "physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0])); + DbgPrint((DPRINT_DISK, "disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2])); + DbgPrint((DPRINT_DISK, "drive flags: %x\n", SpecPtr[4])); + DbgPrint((DPRINT_DISK, "proprietary information: %x\n", SpecPtr[5])); + DbgPrint((DPRINT_DISK, "IRQ for drive: %u\n", SpecPtr[6])); + DbgPrint((DPRINT_DISK, "sector count for multi-sector transfers: %u\n", SpecPtr[7])); + DbgPrint((DPRINT_DISK, "DMA control: %x\n", SpecPtr[8])); + DbgPrint((DPRINT_DISK, "programmed I/O control: %x\n", SpecPtr[9])); + DbgPrint((DPRINT_DISK, "drive options: %x\n", *(PUSHORT)&SpecPtr[10])); } - if (Ptr[0] >= 0x42) - { - DbgPrint((DPRINT_DISK, "signature: %x\n", Ptr[15])); - } -#endif + } + if (Ptr[0] >= 0x42) + { + DbgPrint((DPRINT_DISK, "signature: %x\n", Ptr[15])); + } return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c Tue Apr 10 13:31:51 2007 @@ -162,10 +162,8 @@ { REGS Regs; PVESA_SVGA_INFO SvgaInfo = (PVESA_SVGA_INFO)BIOSCALLBUFFER; -#ifdef DEBUG //USHORT* VideoModes; //USHORT Index; -#endif // defined DEBUG DbgPrint((DPRINT_UI, "BiosIsVesaSupported()\n")); @@ -210,7 +208,6 @@ return 0x0000; } -#ifdef DEBUG DbgPrint((DPRINT_UI, "Supported.\n")); DbgPrint((DPRINT_UI, "SvgaInfo->Signature[4] = %c%c%c%c\n", SvgaInfo->Signature[0], SvgaInfo->Signature[1], SvgaInfo->Signature[2], SvgaInfo->Signature[3])); DbgPrint((DPRINT_UI, "SvgaInfo->VesaVersion = v%d.%d\n", ((SvgaInfo->VesaVersion >> 8) & 0xFF), (SvgaInfo->VesaVersion & 0xFF))); @@ -242,8 +239,6 @@ //} DbgPrint((DPRINT_UI, "\n")); - //getch(); -#endif // defined DEBUG return SvgaInfo->VesaVersion; } Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c Tue Apr 10 13:31:51 2007 @@ -23,7 +23,7 @@ /* MACROS *******************************************************************/ -#ifdef DEBUG +#ifdef DBG #define DEFAULT_BAUD_RATE 19200 @@ -275,11 +275,11 @@ WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend); } -#endif +#endif /* defined DBG */ BOOLEAN Rs232PortInUse(ULONG Base) { -#ifdef DEBUG +#ifdef DBG return PortInitialized && Rs232PortBase == (PUCHAR)Base ? TRUE : FALSE; #else return FALSE; Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c Tue Apr 10 13:31:51 2007 @@ -21,7 +21,7 @@ #include <debug.h> -#ifdef DEBUG +#ifdef DBG //#define DEBUG_ALL //#define DEBUG_INIFILE @@ -356,4 +356,4 @@ } } -#endif // defined DEBUG +#endif // defined DBG Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c Tue Apr 10 13:31:51 2007 @@ -199,9 +199,7 @@ BOOLEAN DiskReadBootRecord(ULONG DriveNumber, ULONGLONG LogicalSectorNumber, PMASTER_BOOT_RECORD BootRecord) { char ErrMsg[64]; -#ifdef DEBUG ULONG Index; -#endif // Read master boot record if (!MachDiskReadLogicalSectors(DriveNumber, LogicalSectorNumber, 1, (PVOID)DISKREADBUFFER)) @@ -210,8 +208,6 @@ } RtlCopyMemory(BootRecord, (PVOID)DISKREADBUFFER, sizeof(MASTER_BOOT_RECORD)); - -#ifdef DEBUG DbgPrint((DPRINT_DISK, "Dumping partition table for drive 0x%x:\n", DriveNumber)); DbgPrint((DPRINT_DISK, "Boot record logical start sector = %d\n", LogicalSectorNumber)); @@ -233,8 +229,6 @@ DbgPrint((DPRINT_DISK, "PartitionSectorCount: 0x%x\n", BootRecord->PartitionTable[Index].PartitionSectorCount)); } -#endif // defined DEBUG - // Check the partition table magic value if (BootRecord->MasterBootRecordMagic != 0xaa55) { Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Tue Apr 10 13:31:51 2007 @@ -6,9 +6,6 @@ <include base="freeldr_base">cache</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <define name="_NTHAL_" /> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> @@ -52,9 +49,6 @@ <include base="freeldr_base">cache</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <define name="_NTHAL_" /> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> @@ -67,4 +61,23 @@ </module> </if> </directory> + <directory name="mips"> + <if property="ARCH" value="mips"> + <module name="freeldr_arch" type="objectlibrary"> + <include base="freeldr_base">include</include> + <include base="freeldr_base">cache</include> + <include base="ntoskrnl">include</include> + <define name="__USE_W32API" /> + <define name="DEBUG" /> + <define name="_NTHAL_" /> + <file>boot.s</file> + <file>console.c</file> + <file>disk.c</file> + <file>hardware.c</file> + <file>loader.c</file> + <file>mach.c</file> + <file>video.c</file> + </module> + </if> + </directory> </directory> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Tue Apr 10 13:31:51 2007 @@ -4,9 +4,6 @@ <include base="cmlib">.</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <define name="_NTHAL_" /> <define name="_NTSYSTEM_" /> <compilerflag>-ffreestanding</compilerflag> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild Tue Apr 10 13:31:51 2007 @@ -2,9 +2,6 @@ <include base="freeldr_base64k">include</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <define name="_NTHAL_" /> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild Tue Apr 10 13:31:51 2007 @@ -2,9 +2,6 @@ <include base="freeldr_startup">include</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Tue Apr 10 13:31:51 2007 @@ -77,8 +77,6 @@ // Get the FAT type FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount); - -#ifdef DEBUG DbgPrint((DPRINT_FILESYSTEM, "Dumping boot sector:\n")); @@ -155,9 +153,7 @@ DbgPrint((DPRINT_FILESYSTEM, "BootSectorMagic: 0x%x\n", FatVolumeBootSector->BootSectorMagic)); } -#endif // defined DEBUG - - // + // // Set the correct partition offset // FatVolumeStartSector = VolumeStartSector; Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c Tue Apr 10 13:31:51 2007 @@ -152,7 +152,6 @@ break; } -#ifdef DEBUG // // Check return value // @@ -164,7 +163,6 @@ { DbgPrint((DPRINT_FILESYSTEM, "FsOpenFile() failed.\n")); } -#endif // defined DEBUG return FileHandle; } Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Tue Apr 10 13:31:51 2007 @@ -400,7 +400,7 @@ return NtfsFixupRecord((PNTFS_RECORD)Buffer); } -#ifdef DEBUG +#ifdef DBG VOID NtfsPrintFile(PNTFS_INDEX_ENTRY IndexEntry) { PWCHAR FileName; @@ -428,7 +428,7 @@ EntryFileName = IndexEntry->FileName.FileName; EntryFileNameLength = IndexEntry->FileName.FileNameLength; -#ifdef DEBUG +#ifdef DBG NtfsPrintFile(IndexEntry); #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Tue Apr 10 13:31:51 2007 @@ -21,7 +21,7 @@ #ifndef __DEBUG_H #define __DEBUG_H -#ifdef DEBUG +#ifdef DBG #define DPRINT_NONE 0x00000000 // No debug print #define DPRINT_WARNING 0x00000001 // OR this with DebugPrintMask to enable debugger messages and other misc stuff @@ -72,7 +72,7 @@ void MEMORY_READWRITE_BREAKPOINT4(unsigned long addr); void MEMORY_WRITE_BREAKPOINT4(unsigned long addr); -#endif +#endif // defined __i386__ #else @@ -82,7 +82,7 @@ #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_) -#endif // defined DEBUG +#endif // defined DBG #define UNIMPLEMENTED() BugCheck((DPRINT_WARNING, "This function is unimplemented!\n")) Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Tue Apr 10 13:31:51 2007 @@ -67,6 +67,8 @@ #include <arch/i386/machxbox.h> #include <internal/i386/intrin_i.h> #include <internal/i386/ke.h> +#elif _MIPS_ +#include <arch/mips/arcbios.h> #endif /* misc files */ #include <keycodes.h> Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h Tue Apr 10 13:31:51 2007 @@ -37,7 +37,7 @@ ULONG Reserved; } PACKED BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; -#if defined(__i386__) || defined(_PPC_) +#if defined(__i386__) || defined(_PPC_) || defined(_MIPS_) #define MM_PAGE_SIZE 4096 #define MM_PAGE_MASK 0xFFF @@ -46,7 +46,7 @@ #define MM_SIZE_TO_PAGES(a) \ ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) -#endif // defined __i386__ or _PPC_ +#endif // defined __i386__ or _PPC_ or _MIPS_ typedef struct { @@ -68,7 +68,7 @@ extern ULONG FreePagesInLookupTable; extern ULONG LastFreePageHint; -#ifdef DEBUG +#ifdef DBG PUCHAR MmGetSystemMemoryMapTypeString(ULONG Type); #endif Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Tue Apr 10 13:31:51 2007 @@ -83,9 +83,7 @@ { PINI_SECTION Section = (PINI_SECTION)SectionId; PINI_SECTION_ITEM SectionItem; -#ifdef DEBUG ULONG RealSettingNumber = SettingNumber; -#endif DbgPrint((DPRINT_INIFILE, ".001 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() SectionId = 0x%x\n", SectionId)); Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Tue Apr 10 13:31:51 2007 @@ -22,7 +22,7 @@ #define NDEBUG #include <debug.h> -#ifdef DEBUG +#ifdef DBG typedef struct { ULONG Type; @@ -49,7 +49,7 @@ { BIOS_MEMORY_MAP BiosMemoryMap[32]; ULONG BiosMemoryMapEntryCount; -#ifdef DEBUG +#ifdef DBG ULONG Index; #endif @@ -59,7 +59,7 @@ BiosMemoryMapEntryCount = MachGetMemoryMap(BiosMemoryMap, sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); -#ifdef DEBUG +#ifdef DBG // Dump the system memory map if (BiosMemoryMapEntryCount != 0) { @@ -101,7 +101,7 @@ return TRUE; } -#ifdef DEBUG +#ifdef DBG PUCHAR MmGetSystemMemoryMapTypeString(ULONG Type) { ULONG Index; Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Tue Apr 10 13:31:51 2007 @@ -22,7 +22,7 @@ #define NDEBUG #include <debug.h> -#ifdef DEBUG +#ifdef DBG ULONG AllocationCount = 0; VOID VerifyHeap(VOID); @@ -30,7 +30,7 @@ VOID IncrementAllocationCount(VOID); VOID DecrementAllocationCount(VOID); VOID MemAllocTest(VOID); -#endif // DEBUG +#endif // DBG /* * Hack alert @@ -114,12 +114,12 @@ } -#ifdef DEBUG +#ifdef DBG IncrementAllocationCount(); DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd, AllocationCount)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); //VerifyHeap(); -#endif // DEBUG +#endif // DBG // Now return the pointer return MemPointer; @@ -173,12 +173,12 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)(StartPageNumber * MM_PAGE_SIZE); -#ifdef DEBUG +#ifdef DBG IncrementAllocationCount(); DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, StartPageNumber, AllocationCount)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); //VerifyHeap(); -#endif // DEBUG +#endif // DBG // Now return the pointer return MemPointer; @@ -228,12 +228,12 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE); -#ifdef DEBUG +#ifdef DBG IncrementAllocationCount(); DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd, AllocationCount)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); //VerifyHeap(); -#endif // DEBUG +#endif // DBG // Now return the pointer return MemPointer; @@ -246,21 +246,21 @@ ULONG Idx; PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTableAddress; -#ifdef DEBUG +#ifdef DBG // Make sure we didn't get a bogus pointer if (MemoryPointer >= (PVOID)(TotalPagesInLookupTable * MM_PAGE_SIZE)) { BugCheck((DPRINT_MEMORY, "Bogus memory pointer (0x%x) passed to MmFreeMemory()\n", MemoryPointer)); } -#endif // DEBUG +#endif // DBG // Find out the page number of the first // page of memory they allocated PageNumber = MmGetPageNumberFromAddress(MemoryPointer); PageCount = RealPageLookupTable[PageNumber].PageAllocationLength; -#ifdef DEBUG +#ifdef DBG // Make sure we didn't get a bogus pointer if ((PageCount < 1) || (PageCount > (TotalPagesInLookupTable - PageNumber))) { @@ -297,14 +297,14 @@ FreePagesInLookupTable += PageCount; -#ifdef DEBUG +#ifdef DBG DecrementAllocationCount(); DbgPrint((DPRINT_MEMORY, "Freed %d pages of memory starting at page %d. AllocationCount: %d\n", PageCount, PageNumber, AllocationCount)); //VerifyHeap(); -#endif // DEBUG -} - -#ifdef DEBUG +#endif // DBG +} + +#ifdef DBG VOID VerifyHeap(VOID) { ULONG Idx; @@ -480,7 +480,7 @@ printf("MemPtr5: 0x%x\n", (int)MemPtr5); MachConsGetCh(); } -#endif // DEBUG +#endif // DBG ULONG GetSystemMemorySize(VOID) { Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Tue Apr 10 13:31:51 2007 @@ -534,7 +534,7 @@ DbgPrint((DPRINT_WINDOWS, "Memory Descriptor List prepared, printing PDE\n")); List_PaToVa(&LoaderBlock->MemoryDescriptorListHead); - #if DEBUG +#ifdef DBG { ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000; int j; @@ -553,7 +553,7 @@ DbgPrint((DPRINT_WINDOWS, "\n")); } } - #endif +#endif // Enable paging

1 0

[tkreuzer] 26301: tabs->spaces reformat, no code change.
by tkreuzer＠svn.reactos.org 09 Apr '07

09 Apr '07

Author: tkreuzer Date: Mon Apr 9 23:52:32 2007 New Revision: 26301 URL: http://svn.reactos.org/svn/reactos?rev=26301&view=rev Log: tabs->spaces reformat, no code change. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Mon Apr 9 23:52:32 2007 @@ -55,133 +55,133 @@ BOOL STDCALL EngIntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2) { - static const RECTL rclEmpty = { 0, 0, 0, 0 }; - - prcDst->left = max(prcSrc1->left, prcSrc2->left); - prcDst->right = min(prcSrc1->right, prcSrc2->right); - - if (prcDst->left < prcDst->right) - { - prcDst->top = max(prcSrc1->top, prcSrc2->top); - prcDst->bottom = min(prcSrc1->bottom, prcSrc2->bottom); - - if (prcDst->top < prcDst->bottom) - { - return TRUE; - } - } - - *prcDst = rclEmpty; - - return FALSE; + static const RECTL rclEmpty = { 0, 0, 0, 0 }; + + prcDst->left = max(prcSrc1->left, prcSrc2->left); + prcDst->right = min(prcSrc1->right, prcSrc2->right); + + if (prcDst->left < prcDst->right) + { + prcDst->top = max(prcSrc1->top, prcSrc2->top); + prcDst->bottom = min(prcSrc1->bottom, prcSrc2->bottom); + + if (prcDst->top < prcDst->bottom) + { + return TRUE; + } + } + + *prcDst = rclEmpty; + + return FALSE; } static BOOLEAN STDCALL BltMask(SURFOBJ* Dest, - SURFOBJ* Source, - SURFOBJ* Mask, - XLATEOBJ* ColorTranslation, - RECTL* DestRect, - POINTL* SourcePoint, - POINTL* MaskPoint, - BRUSHOBJ* Brush, - POINTL* BrushPoint, - ROP4 Rop4) + SURFOBJ* Source, + SURFOBJ* Mask, + XLATEOBJ* ColorTranslation, + RECTL* DestRect, + POINTL* SourcePoint, + POINTL* MaskPoint, + BRUSHOBJ* Brush, + POINTL* BrushPoint, + ROP4 Rop4) { - LONG i, j, dx, dy, c8; - BYTE *tMask, *lMask; - static BYTE maskbit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; - /* Pattern brushes */ - PGDIBRUSHINST GdiBrush = NULL; - SURFOBJ *PatternObj = NULL; - PBITMAPOBJ PatternBitmap; - ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0; - - if (Mask == NULL) - { - return FALSE; - } - - dx = DestRect->right - DestRect->left; - dy = DestRect->bottom - DestRect->top; - - if (Brush->iSolidColor == 0xFFFFFFFF) - { - GdiBrush = CONTAINING_RECORD( - Brush, - GDIBRUSHINST, - BrushObject); - - PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->GdiBrushObject->hbmPattern); - if(PatternBitmap != NULL) - { - PatternObj = &PatternBitmap->SurfObj; - PatternWidth = PatternObj->sizlBitmap.cx; - PatternHeight = PatternObj->sizlBitmap.cy; - } - } - else - PatternBitmap = NULL; - - tMask = (PBYTE)Mask->pvScan0 + SourcePoint->y * Mask->lDelta + (SourcePoint->x >> 3); - for (j = 0; j < dy; j++) - { - lMask = tMask; - c8 = SourcePoint->x & 0x07; - - if(PatternBitmap != NULL) - PatternY = (DestRect->top + j) % PatternHeight; - - for (i = 0; i < dx; i++) - { - if (0 != (*lMask & maskbit[c8])) - { - if (PatternBitmap == NULL) + LONG i, j, dx, dy, c8; + BYTE *tMask, *lMask; + static BYTE maskbit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; + /* Pattern brushes */ + PGDIBRUSHINST GdiBrush = NULL; + SURFOBJ *PatternObj = NULL; + PBITMAPOBJ PatternBitmap; + ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0; + + if (Mask == NULL) + { + return FALSE; + } + + dx = DestRect->right - DestRect->left; + dy = DestRect->bottom - DestRect->top; + + if (Brush->iSolidColor == 0xFFFFFFFF) + { + GdiBrush = CONTAINING_RECORD( + Brush, + GDIBRUSHINST, + BrushObject); + + PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->GdiBrushObject->hbmPattern); + if (PatternBitmap != NULL) + { + PatternObj = &PatternBitmap->SurfObj; + PatternWidth = PatternObj->sizlBitmap.cx; + PatternHeight = PatternObj->sizlBitmap.cy; + } + } + else + PatternBitmap = NULL; + + tMask = (PBYTE)Mask->pvScan0 + SourcePoint->y * Mask->lDelta + (SourcePoint->x >> 3); + for (j = 0; j < dy; j++) + { + lMask = tMask; + c8 = SourcePoint->x & 0x07; + + if (PatternBitmap != NULL) + PatternY = (DestRect->top + j) % PatternHeight; + + for (i = 0; i < dx; i++) + { + if (0 != (*lMask & maskbit[c8])) { - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( - Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor); + if (PatternBitmap == NULL) + { + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( + Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor); + } + else + { + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( + Dest, DestRect->left + i, DestRect->top + j, + DIB_GetSource(PatternObj, (DestRect->left + i) % PatternWidth, PatternY, GdiBrush->XlateObject)); + } } - else + c8++; + if (8 == c8) { - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( - Dest, DestRect->left + i, DestRect->top + j, - DIB_GetSource(PatternObj, (DestRect->left + i) % PatternWidth, PatternY, GdiBrush->XlateObject)); + lMask++; + c8 = 0; } - } - c8++; - if (8 == c8) - { - lMask++; - c8 = 0; - } - } - tMask += Mask->lDelta; - } - - if (PatternBitmap != NULL) - BITMAPOBJ_UnlockBitmap(PatternBitmap); - - return TRUE; + } + tMask += Mask->lDelta; + } + + if (PatternBitmap != NULL) + BITMAPOBJ_UnlockBitmap(PatternBitmap); + + return TRUE; } static BOOLEAN STDCALL BltPatCopy(SURFOBJ* Dest, - SURFOBJ* Source, - SURFOBJ* Mask, - XLATEOBJ* ColorTranslation, - RECTL* DestRect, - POINTL* SourcePoint, - POINTL* MaskPoint, - BRUSHOBJ* Brush, - POINTL* BrushPoint, - ROP4 Rop4) + SURFOBJ* Source, + SURFOBJ* Mask, + XLATEOBJ* ColorTranslation, + RECTL* DestRect, + POINTL* SourcePoint, + POINTL* MaskPoint, + BRUSHOBJ* Brush, + POINTL* BrushPoint, + ROP4 Rop4) { - // These functions are assigned if we're working with a DIB - // The assigned functions depend on the bitsPerPixel of the DIB - - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_ColorFill(Dest, DestRect, Brush->iSolidColor); - - return TRUE; + // These functions are assigned if we're working with a DIB + // The assigned functions depend on the bitsPerPixel of the DIB + + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_ColorFill(Dest, DestRect, Brush->iSolidColor); + + return TRUE; } static BOOLEAN STDCALL @@ -196,54 +196,54 @@ POINTL* BrushOrigin, ROP4 Rop4) { - BLTINFO BltInfo; - PGDIBRUSHINST GdiBrush = NULL; - BITMAPOBJ *bmPattern; - BOOLEAN Result; - - BltInfo.DestSurface = OutputObj; - BltInfo.SourceSurface = InputObj; - BltInfo.PatternSurface = NULL; - BltInfo.XlateSourceToDest = ColorTranslation; - BltInfo.DestRect = *OutputRect; - BltInfo.SourcePoint = *InputPoint; - - if (ROP3_TO_ROP4(SRCCOPY) == Rop4) - return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); - - BltInfo.XlatePatternToDest = NULL; - BltInfo.Brush = Brush; - BltInfo.BrushOrigin = *BrushOrigin; - BltInfo.Rop4 = Rop4; - - /* Pattern brush */ - if (ROP4_USES_PATTERN(Rop4) && Brush->iSolidColor == 0xFFFFFFFF) - { - GdiBrush = CONTAINING_RECORD(Brush, GDIBRUSHINST, BrushObject); - if((bmPattern = BITMAPOBJ_LockBitmap(GdiBrush->GdiBrushObject->hbmPattern))) - { - BltInfo.PatternSurface = &bmPattern->SurfObj; - } - else - { - /* FIXME - What to do here? */ - } - BltInfo.XlatePatternToDest = GdiBrush->XlateObject; - } - else - { - bmPattern = NULL; - } - - Result = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBlt(&BltInfo); - - /* Pattern brush */ - if (bmPattern != NULL) - { - BITMAPOBJ_UnlockBitmap(bmPattern); - } - - return Result; + BLTINFO BltInfo; + PGDIBRUSHINST GdiBrush = NULL; + BITMAPOBJ *bmPattern; + BOOLEAN Result; + + BltInfo.DestSurface = OutputObj; + BltInfo.SourceSurface = InputObj; + BltInfo.PatternSurface = NULL; + BltInfo.XlateSourceToDest = ColorTranslation; + BltInfo.DestRect = *OutputRect; + BltInfo.SourcePoint = *InputPoint; + + if (ROP3_TO_ROP4(SRCCOPY) == Rop4) + return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); + + BltInfo.XlatePatternToDest = NULL; + BltInfo.Brush = Brush; + BltInfo.BrushOrigin = *BrushOrigin; + BltInfo.Rop4 = Rop4; + + /* Pattern brush */ + if (ROP4_USES_PATTERN(Rop4) && Brush->iSolidColor == 0xFFFFFFFF) + { + GdiBrush = CONTAINING_RECORD(Brush, GDIBRUSHINST, BrushObject); + if ((bmPattern = BITMAPOBJ_LockBitmap(GdiBrush->GdiBrushObject->hbmPattern))) + { + BltInfo.PatternSurface = &bmPattern->SurfObj; + } + else + { + /* FIXME - What to do here? */ + } + BltInfo.XlatePatternToDest = GdiBrush->XlateObject; + } + else + { + bmPattern = NULL; + } + + Result = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBlt(&BltInfo); + + /* Pattern brush */ + if (bmPattern != NULL) + { + BITMAPOBJ_UnlockBitmap(bmPattern); + } + + return Result; } INT __cdecl abs(INT nm); @@ -253,280 +253,280 @@ */ BOOL STDCALL EngBitBlt(SURFOBJ *DestObj, - SURFOBJ *SourceObj, - SURFOBJ *Mask, - CLIPOBJ *ClipRegion, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint, - POINTL *MaskOrigin, - BRUSHOBJ *Brush, - POINTL *BrushOrigin, - ROP4 Rop4) + SURFOBJ *SourceObj, + SURFOBJ *Mask, + CLIPOBJ *ClipRegion, + XLATEOBJ *ColorTranslation, + RECTL *DestRect, + POINTL *SourcePoint, + POINTL *MaskOrigin, + BRUSHOBJ *Brush, + POINTL *BrushOrigin, + ROP4 Rop4) { - BYTE clippingType; - RECTL CombinedRect; - RECT_ENUM RectEnum; - BOOL EnumMore; - POINTL InputPoint; - RECTL InputRect; - RECTL OutputRect; - POINTL Translate; - INTENG_ENTER_LEAVE EnterLeaveSource; - INTENG_ENTER_LEAVE EnterLeaveDest; - SURFOBJ* InputObj; - SURFOBJ* OutputObj; - PBLTRECTFUNC BltRectFunc; - BOOLEAN Ret = TRUE; - RECTL ClipRect; - unsigned i; - POINTL Pt; - ULONG Direction; - BOOL UsesSource; - BOOL UsesPattern; - POINTL AdjustedBrushOrigin; - - UsesSource = ROP4_USES_SOURCE(Rop4); - UsesPattern = ROP4_USES_PATTERN(Rop4); - if (R4_NOOP == Rop4) - { - /* Copy destination onto itself: nop */ - return TRUE; - } - - OutputRect = *DestRect; - if (OutputRect.right < OutputRect.left) - { - OutputRect.left = DestRect->right; - OutputRect.right = DestRect->left; - } - if (OutputRect.bottom < OutputRect.top) - { - OutputRect.left = DestRect->right; - OutputRect.right = DestRect->left; - } - - if (UsesSource) - { - if (NULL == SourcePoint) - { - return FALSE; - } - - /* Make sure we don't try to copy anything outside the valid source - region */ - InputPoint = *SourcePoint; - if (InputPoint.x < 0) - { - OutputRect.left -= InputPoint.x; - InputPoint.x = 0; - } - if (InputPoint.y < 0) - { - OutputRect.top -= InputPoint.y; - InputPoint.y = 0; - } - if (SourceObj->sizlBitmap.cx < InputPoint.x + - OutputRect.right - OutputRect.left) - { - OutputRect.right = OutputRect.left + - SourceObj->sizlBitmap.cx - InputPoint.x; - } - if (SourceObj->sizlBitmap.cy < InputPoint.y + - OutputRect.bottom - OutputRect.top) - { - OutputRect.bottom = OutputRect.top + - SourceObj->sizlBitmap.cy - InputPoint.y; - } - - InputRect.left = InputPoint.x; - InputRect.right = InputPoint.x + (OutputRect.right - OutputRect.left); - InputRect.top = InputPoint.y; - InputRect.bottom = InputPoint.y + (OutputRect.bottom - OutputRect.top); - - if (! IntEngEnter(&EnterLeaveSource, SourceObj, &InputRect, TRUE, - &Translate, &InputObj)) - { - return FALSE; - } - - InputPoint.x += Translate.x; - InputPoint.y += Translate.y; - } - else - { - InputRect.left = 0; - InputRect.right = DestRect->right - DestRect->left; - InputRect.top = 0; - InputRect.bottom = DestRect->bottom - DestRect->top; - } - - if (NULL != ClipRegion) - { - if (OutputRect.left < ClipRegion->rclBounds.left) - { - InputRect.left += ClipRegion->rclBounds.left - OutputRect.left; - InputPoint.x += ClipRegion->rclBounds.left - OutputRect.left; - OutputRect.left = ClipRegion->rclBounds.left; - } - if (ClipRegion->rclBounds.right < OutputRect.right) - { - InputRect.right -= OutputRect.right - ClipRegion->rclBounds.right; - OutputRect.right = ClipRegion->rclBounds.right; - } - if (OutputRect.top < ClipRegion->rclBounds.top) - { - InputRect.top += ClipRegion->rclBounds.top - OutputRect.top; - InputPoint.y += ClipRegion->rclBounds.top - OutputRect.top; - OutputRect.top = ClipRegion->rclBounds.top; - } - if (ClipRegion->rclBounds.bottom < OutputRect.bottom) - { - InputRect.bottom -= OutputRect.bottom - ClipRegion->rclBounds.bottom; - OutputRect.bottom = ClipRegion->rclBounds.bottom; - } - } - - /* Check for degenerate case: if height or width of OutputRect is 0 pixels - there's nothing to do */ - if (OutputRect.right <= OutputRect.left || - OutputRect.bottom <= OutputRect.top) - { + BYTE clippingType; + RECTL CombinedRect; + RECT_ENUM RectEnum; + BOOL EnumMore; + POINTL InputPoint; + RECTL InputRect; + RECTL OutputRect; + POINTL Translate; + INTENG_ENTER_LEAVE EnterLeaveSource; + INTENG_ENTER_LEAVE EnterLeaveDest; + SURFOBJ* InputObj; + SURFOBJ* OutputObj; + PBLTRECTFUNC BltRectFunc; + BOOLEAN Ret = TRUE; + RECTL ClipRect; + unsigned i; + POINTL Pt; + ULONG Direction; + BOOL UsesSource; + BOOL UsesPattern; + POINTL AdjustedBrushOrigin; + + UsesSource = ROP4_USES_SOURCE(Rop4); + UsesPattern = ROP4_USES_PATTERN(Rop4); + if (R4_NOOP == Rop4) + { + /* Copy destination onto itself: nop */ + return TRUE; + } + + OutputRect = *DestRect; + if (OutputRect.right < OutputRect.left) + { + OutputRect.left = DestRect->right; + OutputRect.right = DestRect->left; + } + if (OutputRect.bottom < OutputRect.top) + { + OutputRect.left = DestRect->right; + OutputRect.right = DestRect->left; + } + if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return TRUE; - } - - if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, - &OutputObj)) - { + { + if (NULL == SourcePoint) + { + return FALSE; + } + + /* Make sure we don't try to copy anything outside the valid source + region */ + InputPoint = *SourcePoint; + if (InputPoint.x < 0) + { + OutputRect.left -= InputPoint.x; + InputPoint.x = 0; + } + if (InputPoint.y < 0) + { + OutputRect.top -= InputPoint.y; + InputPoint.y = 0; + } + if (SourceObj->sizlBitmap.cx < InputPoint.x + + OutputRect.right - OutputRect.left) + { + OutputRect.right = OutputRect.left + + SourceObj->sizlBitmap.cx - InputPoint.x; + } + if (SourceObj->sizlBitmap.cy < InputPoint.y + + OutputRect.bottom - OutputRect.top) + { + OutputRect.bottom = OutputRect.top + + SourceObj->sizlBitmap.cy - InputPoint.y; + } + + InputRect.left = InputPoint.x; + InputRect.right = InputPoint.x + (OutputRect.right - OutputRect.left); + InputRect.top = InputPoint.y; + InputRect.bottom = InputPoint.y + (OutputRect.bottom - OutputRect.top); + + if (! IntEngEnter(&EnterLeaveSource, SourceObj, &InputRect, TRUE, + &Translate, &InputObj)) + { + return FALSE; + } + + InputPoint.x += Translate.x; + InputPoint.y += Translate.y; + } + else + { + InputRect.left = 0; + InputRect.right = DestRect->right - DestRect->left; + InputRect.top = 0; + InputRect.bottom = DestRect->bottom - DestRect->top; + } + + if (NULL != ClipRegion) + { + if (OutputRect.left < ClipRegion->rclBounds.left) + { + InputRect.left += ClipRegion->rclBounds.left - OutputRect.left; + InputPoint.x += ClipRegion->rclBounds.left - OutputRect.left; + OutputRect.left = ClipRegion->rclBounds.left; + } + if (ClipRegion->rclBounds.right < OutputRect.right) + { + InputRect.right -= OutputRect.right - ClipRegion->rclBounds.right; + OutputRect.right = ClipRegion->rclBounds.right; + } + if (OutputRect.top < ClipRegion->rclBounds.top) + { + InputRect.top += ClipRegion->rclBounds.top - OutputRect.top; + InputPoint.y += ClipRegion->rclBounds.top - OutputRect.top; + OutputRect.top = ClipRegion->rclBounds.top; + } + if (ClipRegion->rclBounds.bottom < OutputRect.bottom) + { + InputRect.bottom -= OutputRect.bottom - ClipRegion->rclBounds.bottom; + OutputRect.bottom = ClipRegion->rclBounds.bottom; + } + } + + /* Check for degenerate case: if height or width of OutputRect is 0 pixels + there's nothing to do */ + if (OutputRect.right <= OutputRect.left || + OutputRect.bottom <= OutputRect.top) + { + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + return TRUE; + } + + if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, + &OutputObj)) + { + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + return FALSE; + } + + OutputRect.left += Translate.x; + OutputRect.right += Translate.x; + OutputRect.top += Translate.y; + OutputRect.bottom += Translate.y; + + if (BrushOrigin) + { + AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; + AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; + } + else + { + AdjustedBrushOrigin = Translate; + } + + /* Determine clipping type */ + if (ClipRegion == (CLIPOBJ *) NULL) + { + clippingType = DC_TRIVIAL; + } + else + { + clippingType = ClipRegion->iDComplexity; + } + + if (R4_MASK == Rop4) + { + BltRectFunc = BltMask; + } + else if (ROP3_TO_ROP4(PATCOPY) == Rop4) + { + if (Brush->iSolidColor == 0xFFFFFFFF) + BltRectFunc = CallDibBitBlt; + else + BltRectFunc = BltPatCopy; + } + else + { + BltRectFunc = CallDibBitBlt; + } + + + switch (clippingType) + { + case DC_TRIVIAL: + Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, + &OutputRect, &InputPoint, MaskOrigin, Brush, + &AdjustedBrushOrigin, Rop4); + break; + case DC_RECT: + /* Clip the blt to the clip rectangle */ + ClipRect.left = ClipRegion->rclBounds.left + Translate.x; + ClipRect.right = ClipRegion->rclBounds.right + Translate.x; + ClipRect.top = ClipRegion->rclBounds.top + Translate.y; + ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; + Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; + Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, + &CombinedRect, &Pt, MaskOrigin, Brush, + &AdjustedBrushOrigin, Rop4); + } + break; + case DC_COMPLEX: + Ret = TRUE; + if (OutputObj == InputObj) + { + if (OutputRect.top < InputPoint.y) + { + Direction = OutputRect.left < InputPoint.x ? + CD_RIGHTDOWN : CD_LEFTDOWN; + } + else + { + Direction = OutputRect.left < InputPoint.x ? + CD_RIGHTUP : CD_LEFTUP; + } + } + else + { + Direction = CD_ANY; + } + CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, Direction, 0); + do + { + EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), + (PVOID) &RectEnum); + + for (i = 0; i < RectEnum.c; i++) + { + ClipRect.left = RectEnum.arcl[i].left + Translate.x; + ClipRect.right = RectEnum.arcl[i].right + Translate.x; + ClipRect.top = RectEnum.arcl[i].top + Translate.y; + ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; + Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; + Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, + ColorTranslation, &CombinedRect, &Pt, + MaskOrigin, Brush, &AdjustedBrushOrigin, + Rop4) && Ret; + } + } + } + while (EnumMore); + break; + } + + + IntEngLeave(&EnterLeaveDest); if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return FALSE; - } - - OutputRect.left += Translate.x; - OutputRect.right += Translate.x; - OutputRect.top += Translate.y; - OutputRect.bottom += Translate.y; - - if(BrushOrigin) - { - AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; - AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; - } - else - { - AdjustedBrushOrigin = Translate; - } - - /* Determine clipping type */ - if (ClipRegion == (CLIPOBJ *) NULL) - { - clippingType = DC_TRIVIAL; - } - else - { - clippingType = ClipRegion->iDComplexity; - } - - if (R4_MASK == Rop4) - { - BltRectFunc = BltMask; - } - else if (ROP3_TO_ROP4(PATCOPY) == Rop4) - { - if (Brush->iSolidColor == 0xFFFFFFFF) - BltRectFunc = CallDibBitBlt; - else - BltRectFunc = BltPatCopy; - } - else - { - BltRectFunc = CallDibBitBlt; - } - - - switch(clippingType) - { - case DC_TRIVIAL: - Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, Brush, - &AdjustedBrushOrigin, Rop4); - break; - case DC_RECT: - /* Clip the blt to the clip rectangle */ - ClipRect.left = ClipRegion->rclBounds.left + Translate.x; - ClipRect.right = ClipRegion->rclBounds.right + Translate.x; - ClipRect.top = ClipRegion->rclBounds.top + Translate.y; - ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; - if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) - { - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, - &AdjustedBrushOrigin, Rop4); - } - break; - case DC_COMPLEX: - Ret = TRUE; - if (OutputObj == InputObj) - { - if (OutputRect.top < InputPoint.y) - { - Direction = OutputRect.left < InputPoint.x ? - CD_RIGHTDOWN : CD_LEFTDOWN; - } - else - { - Direction = OutputRect.left < InputPoint.x ? - CD_RIGHTUP : CD_LEFTUP; - } - } - else - { - Direction = CD_ANY; - } - CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, Direction, 0); - do - { - EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), - (PVOID) &RectEnum); - - for (i = 0; i < RectEnum.c; i++) - { - ClipRect.left = RectEnum.arcl[i].left + Translate.x; - ClipRect.right = RectEnum.arcl[i].right + Translate.x; - ClipRect.top = RectEnum.arcl[i].top + Translate.y; - ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; - if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) - { - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, - ColorTranslation, &CombinedRect, &Pt, - MaskOrigin, Brush, &AdjustedBrushOrigin, - Rop4) && Ret; - } - } - } - while(EnumMore); - break; - } - - - IntEngLeave(&EnterLeaveDest); - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - - return Ret; + { + IntEngLeave(&EnterLeaveSource); + } + + return Ret; } BOOL STDCALL @@ -543,154 +543,154 @@ ROP4 Rop4, BOOL RemoveMouse) { - BOOLEAN ret; - RECTL InputClippedRect; - RECTL OutputRect; - POINTL InputPoint; - BOOLEAN UsesSource; - BITMAPOBJ *DestObj; - BITMAPOBJ *SourceObj = NULL; - - if (DestSurf == NULL) - return FALSE; - - ASSERT(DestSurf); - DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); - ASSERT(DestObj); - - InputClippedRect = *DestRect; - if (InputClippedRect.right < InputClippedRect.left) - { - InputClippedRect.left = DestRect->right; - InputClippedRect.right = DestRect->left; - } - if (InputClippedRect.bottom < InputClippedRect.top) - { - InputClippedRect.top = DestRect->bottom; - InputClippedRect.bottom = DestRect->top; - } - UsesSource = ROP4_USES_SOURCE(Rop4); - if (UsesSource) - { - if (NULL == SourcePoint || NULL == SourceSurf) - { - return FALSE; - } - InputPoint = *SourcePoint; - - /* Make sure we don't try to copy anything outside the valid source - region */ - if (InputPoint.x < 0) - { - InputClippedRect.left -= InputPoint.x; - InputPoint.x = 0; - } - if (InputPoint.y < 0) - { - InputClippedRect.top -= InputPoint.y; - InputPoint.y = 0; - } - if (SourceSurf->sizlBitmap.cx < InputPoint.x + - InputClippedRect.right - - InputClippedRect.left) - { - InputClippedRect.right = InputClippedRect.left + - SourceSurf->sizlBitmap.cx - InputPoint.x; - } - if (SourceSurf->sizlBitmap.cy < InputPoint.y + - InputClippedRect.bottom - - InputClippedRect.top) - { - InputClippedRect.bottom = InputClippedRect.top + - SourceSurf->sizlBitmap.cy - InputPoint.y; - } - - if (InputClippedRect.right < InputClippedRect.left || - InputClippedRect.bottom < InputClippedRect.top) - { - /* Everything clipped away, nothing to do */ - return TRUE; - } - } - - /* Clip against the bounds of the clipping region so we won't try to write - * outside the surface */ - if (NULL != ClipRegion) - { - if (! EngIntersectRect(&OutputRect, &InputClippedRect, - &ClipRegion->rclBounds)) - { - return TRUE; - } - InputPoint.x += OutputRect.left - InputClippedRect.left; - InputPoint.y += OutputRect.top - InputClippedRect.top; - } - else - { - OutputRect = InputClippedRect; - } - - if (RemoveMouse) - { - BITMAPOBJ_LockBitmapBits(DestObj); - + BOOLEAN ret; + RECTL InputClippedRect; + RECTL OutputRect; + POINTL InputPoint; + BOOLEAN UsesSource; + BITMAPOBJ *DestObj; + BITMAPOBJ *SourceObj = NULL; + + if (DestSurf == NULL) + return FALSE; + + ASSERT(DestSurf); + DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); + ASSERT(DestObj); + + InputClippedRect = *DestRect; + if (InputClippedRect.right < InputClippedRect.left) + { + InputClippedRect.left = DestRect->right; + InputClippedRect.right = DestRect->left; + } + if (InputClippedRect.bottom < InputClippedRect.top) + { + InputClippedRect.top = DestRect->bottom; + InputClippedRect.bottom = DestRect->top; + } + UsesSource = ROP4_USES_SOURCE(Rop4); if (UsesSource) - { - if (SourceSurf != DestSurf) - { - SourceObj = CONTAINING_RECORD(SourceSurf, BITMAPOBJ, SurfObj); - BITMAPOBJ_LockBitmapBits(SourceObj); - } - MouseSafetyOnDrawStart(SourceSurf, InputPoint.x, InputPoint.y, - (InputPoint.x + abs(DestRect->right - DestRect->left)), - (InputPoint.y + abs(DestRect->bottom - DestRect->top))); - } - MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top, - OutputRect.right, OutputRect.bottom); - } - - /* No success yet */ - ret = FALSE; - - /* Call the driver's DrvBitBlt if available */ - if (DestObj->flHooks & HOOK_BITBLT) - { - ret = GDIDEVFUNCS(DestSurf).BitBlt( - DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin, - Rop4); - } - - if (! ret) - { - ret = EngBitBlt(DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin, - Rop4); - } - - if (RemoveMouse) - { - MouseSafetyOnDrawEnd(DestSurf); - if (UsesSource) - { - MouseSafetyOnDrawEnd(SourceSurf); - if (SourceSurf != DestSurf) - { - BITMAPOBJ_UnlockBitmapBits(SourceObj); - } - } - - BITMAPOBJ_UnlockBitmapBits(DestObj); - } - - return ret; + { + if (NULL == SourcePoint || NULL == SourceSurf) + { + return FALSE; + } + InputPoint = *SourcePoint; + + /* Make sure we don't try to copy anything outside the valid source + region */ + if (InputPoint.x < 0) + { + InputClippedRect.left -= InputPoint.x; + InputPoint.x = 0; + } + if (InputPoint.y < 0) + { + InputClippedRect.top -= InputPoint.y; + InputPoint.y = 0; + } + if (SourceSurf->sizlBitmap.cx < InputPoint.x + + InputClippedRect.right - + InputClippedRect.left) + { + InputClippedRect.right = InputClippedRect.left + + SourceSurf->sizlBitmap.cx - InputPoint.x; + } + if (SourceSurf->sizlBitmap.cy < InputPoint.y + + InputClippedRect.bottom - + InputClippedRect.top) + { + InputClippedRect.bottom = InputClippedRect.top + + SourceSurf->sizlBitmap.cy - InputPoint.y; + } + + if (InputClippedRect.right < InputClippedRect.left || + InputClippedRect.bottom < InputClippedRect.top) + { + /* Everything clipped away, nothing to do */ + return TRUE; + } + } + + /* Clip against the bounds of the clipping region so we won't try to write + * outside the surface */ + if (NULL != ClipRegion) + { + if (! EngIntersectRect(&OutputRect, &InputClippedRect, + &ClipRegion->rclBounds)) + { + return TRUE; + } + InputPoint.x += OutputRect.left - InputClippedRect.left; + InputPoint.y += OutputRect.top - InputClippedRect.top; + } + else + { + OutputRect = InputClippedRect; + } + + if (RemoveMouse) + { + BITMAPOBJ_LockBitmapBits(DestObj); + + if (UsesSource) + { + if (SourceSurf != DestSurf) + { + SourceObj = CONTAINING_RECORD(SourceSurf, BITMAPOBJ, SurfObj); + BITMAPOBJ_LockBitmapBits(SourceObj); + } + MouseSafetyOnDrawStart(SourceSurf, InputPoint.x, InputPoint.y, + (InputPoint.x + abs(DestRect->right - DestRect->left)), + (InputPoint.y + abs(DestRect->bottom - DestRect->top))); + } + MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top, + OutputRect.right, OutputRect.bottom); + } + + /* No success yet */ + ret = FALSE; + + /* Call the driver's DrvBitBlt if available */ + if (DestObj->flHooks & HOOK_BITBLT) + { + ret = GDIDEVFUNCS(DestSurf).BitBlt( + DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation, + &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin, + Rop4); + } + + if (! ret) + { + ret = EngBitBlt(DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation, + &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin, + Rop4); + } + + if (RemoveMouse) + { + MouseSafetyOnDrawEnd(DestSurf); + if (UsesSource) + { + MouseSafetyOnDrawEnd(SourceSurf); + if (SourceSurf != DestSurf) + { + BITMAPOBJ_UnlockBitmapBits(SourceObj); + } + } + + BITMAPOBJ_UnlockBitmapBits(DestObj); + } + + return ret; } static BOOLEAN STDCALL CallDibStretchBlt(SURFOBJ* OutputObj, SURFOBJ* InputObj, SURFOBJ* Mask, - CLIPOBJ* ClipRegion, + CLIPOBJ* ClipRegion, XLATEOBJ* ColorTranslation, RECTL* OutputRect, RECTL* InputRect, @@ -698,117 +698,117 @@ POINTL* BrushOrigin, ULONG Mode) { - POINTL RealBrushOrigin; - if (BrushOrigin == NULL) - { - RealBrushOrigin.x = RealBrushOrigin.y = 0; - } - else - { - RealBrushOrigin = *BrushOrigin; - } - return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_StretchBlt( - OutputObj, InputObj, OutputRect, InputRect, MaskOrigin, RealBrushOrigin, ClipRegion, ColorTranslation, Mode); + POINTL RealBrushOrigin; + if (BrushOrigin == NULL) + { + RealBrushOrigin.x = RealBrushOrigin.y = 0; + } + else + { + RealBrushOrigin = *BrushOrigin; + } + return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_StretchBlt( + OutputObj, InputObj, OutputRect, InputRect, MaskOrigin, RealBrushOrigin, ClipRegion, ColorTranslation, Mode); } BOOL STDCALL EngStretchBlt( - IN SURFOBJ *DestObj, - IN SURFOBJ *SourceObj, - IN SURFOBJ *Mask, - IN CLIPOBJ *ClipRegion, - IN XLATEOBJ *ColorTranslation, - IN COLORADJUSTMENT *pca, - IN POINTL *BrushOrigin, - IN RECTL *prclDest, - IN RECTL *prclSrc, - IN POINTL *MaskOrigin, - IN ULONG Mode - ) + IN SURFOBJ *DestObj, + IN SURFOBJ *SourceObj, + IN SURFOBJ *Mask, + IN CLIPOBJ *ClipRegion, + IN XLATEOBJ *ColorTranslation, + IN COLORADJUSTMENT *pca, + IN POINTL *BrushOrigin, + IN RECTL *prclDest, + IN RECTL *prclSrc, + IN POINTL *MaskOrigin, + IN ULONG Mode +) { - // www.osr.com/ddk/graphics/gdifncs_0bs7.htm - - POINTL InputPoint; - RECTL InputRect; - RECTL OutputRect; - POINTL Translate; - INTENG_ENTER_LEAVE EnterLeaveSource; - INTENG_ENTER_LEAVE EnterLeaveDest; - SURFOBJ* InputObj; - SURFOBJ* OutputObj; - PSTRETCHRECTFUNC BltRectFunc; - BOOLEAN Ret; - POINTL AdjustedBrushOrigin; - - InputRect.left = prclSrc->left; - InputRect.right = prclSrc->right; - InputRect.top = prclSrc->top; - InputRect.bottom = prclSrc->bottom; - - if (! IntEngEnter(&EnterLeaveSource, SourceObj, &InputRect, TRUE, &Translate, &InputObj)) - { - return FALSE; - } - - InputPoint.x = InputRect.left + Translate.x; - InputPoint.y = InputRect.top + Translate.y; - - OutputRect = *prclDest; - - /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's - nothing to do */ - if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) - { - IntEngLeave(&EnterLeaveSource); - return TRUE; - } - - if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, &OutputObj)) - { - IntEngLeave(&EnterLeaveSource); - return FALSE; - } - - OutputRect.left = prclDest->left + Translate.x; - OutputRect.right = prclDest->right + Translate.x; - OutputRect.top = prclDest->top + Translate.y; - OutputRect.bottom = prclDest->bottom + Translate.y; - - if (NULL != BrushOrigin) - { - AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; - AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; - } - else - { - AdjustedBrushOrigin = Translate; - } - - if (Mask != NULL) - { - //BltRectFunc = BltMask; - DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); - IntEngLeave(&EnterLeaveDest); - IntEngLeave(&EnterLeaveSource); - - return FALSE; - } - else - { - BltRectFunc = CallDibStretchBlt; - } - - - Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ClipRegion, - ColorTranslation, &OutputRect, &InputRect, MaskOrigin, - &AdjustedBrushOrigin, Mode); - - IntEngLeave(&EnterLeaveDest); - IntEngLeave(&EnterLeaveSource); - - return Ret; + // www.osr.com/ddk/graphics/gdifncs_0bs7.htm + + POINTL InputPoint; + RECTL InputRect; + RECTL OutputRect; + POINTL Translate; + INTENG_ENTER_LEAVE EnterLeaveSource; + INTENG_ENTER_LEAVE EnterLeaveDest; + SURFOBJ* InputObj; + SURFOBJ* OutputObj; + PSTRETCHRECTFUNC BltRectFunc; + BOOLEAN Ret; + POINTL AdjustedBrushOrigin; + + InputRect.left = prclSrc->left; + InputRect.right = prclSrc->right; + InputRect.top = prclSrc->top; + InputRect.bottom = prclSrc->bottom; + + if (! IntEngEnter(&EnterLeaveSource, SourceObj, &InputRect, TRUE, &Translate, &InputObj)) + { + return FALSE; + } + + InputPoint.x = InputRect.left + Translate.x; + InputPoint.y = InputRect.top + Translate.y; + + OutputRect = *prclDest; + + /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's + nothing to do */ + if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) + { + IntEngLeave(&EnterLeaveSource); + return TRUE; + } + + if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, &OutputObj)) + { + IntEngLeave(&EnterLeaveSource); + return FALSE; + } + + OutputRect.left = prclDest->left + Translate.x; + OutputRect.right = prclDest->right + Translate.x; + OutputRect.top = prclDest->top + Translate.y; + OutputRect.bottom = prclDest->bottom + Translate.y; + + if (NULL != BrushOrigin) + { + AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; + AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; + } + else + { + AdjustedBrushOrigin = Translate; + } + + if (Mask != NULL) + { + //BltRectFunc = BltMask; + DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); + IntEngLeave(&EnterLeaveDest); + IntEngLeave(&EnterLeaveSource); + + return FALSE; + } + else + { + BltRectFunc = CallDibStretchBlt; + } + + + Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ClipRegion, + ColorTranslation, &OutputRect, &InputRect, MaskOrigin, + &AdjustedBrushOrigin, Mode); + + IntEngLeave(&EnterLeaveDest); + IntEngLeave(&EnterLeaveSource); + + return Ret; } BOOL STDCALL @@ -824,72 +824,72 @@ POINTL *BrushOrigin, ULONG Mode) { - BOOLEAN ret; - COLORADJUSTMENT ca; - POINT MaskOrigin; - BITMAPOBJ *DestObj; - BITMAPOBJ *SourceObj = NULL; - - ASSERT(DestSurf); - DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); - ASSERT(DestObj); - - if (pMaskOrigin != NULL) - { - MaskOrigin.x = pMaskOrigin->x; MaskOrigin.y = pMaskOrigin->y; - } - - /* No success yet */ - ret = FALSE; - ASSERT(DestRect); - BITMAPOBJ_LockBitmapBits(DestObj); - MouseSafetyOnDrawStart(DestSurf, DestRect->left, DestRect->top, - DestRect->right, DestRect->bottom); - - if (NULL != SourceSurf) - { - SourceObj = CONTAINING_RECORD(SourceSurf, BITMAPOBJ, SurfObj); - ASSERT(SourceRect); - if (SourceSurf != DestSurf) - { - BITMAPOBJ_LockBitmapBits(SourceObj); - } - MouseSafetyOnDrawStart(SourceSurf, SourceRect->left, SourceRect->top, - SourceRect->right, SourceRect->bottom); - } - - /* Prepare color adjustment */ - - /* Call the driver's DrvStretchBlt if available */ - if (DestObj->flHooks & HOOK_STRETCHBLT) - { - /* Drv->StretchBlt (look at http://www.osr.com/ddk/graphics/ddifncs_3ew7.htm ) - SURFOBJ *psoMask // optional, if it exists, then rop4=0xCCAA, otherwise rop4=0xCCCC */ - // FIXME: MaskOrigin is always NULL ! - ret = GDIDEVFUNCS(DestSurf).StretchBlt( - DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation, + BOOLEAN ret; + COLORADJUSTMENT ca; + POINT MaskOrigin; + BITMAPOBJ *DestObj; + BITMAPOBJ *SourceObj = NULL; + + ASSERT(DestSurf); + DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); + ASSERT(DestObj); + + if (pMaskOrigin != NULL) + { + MaskOrigin.x = pMaskOrigin->x; MaskOrigin.y = pMaskOrigin->y; + } + + /* No success yet */ + ret = FALSE; + ASSERT(DestRect); + BITMAPOBJ_LockBitmapBits(DestObj); + MouseSafetyOnDrawStart(DestSurf, DestRect->left, DestRect->top, + DestRect->right, DestRect->bottom); + + if (NULL != SourceSurf) + { + SourceObj = CONTAINING_RECORD(SourceSurf, BITMAPOBJ, SurfObj); + ASSERT(SourceRect); + if (SourceSurf != DestSurf) + { + BITMAPOBJ_LockBitmapBits(SourceObj); + } + MouseSafetyOnDrawStart(SourceSurf, SourceRect->left, SourceRect->top, + SourceRect->right, SourceRect->bottom); + } + + /* Prepare color adjustment */ + + /* Call the driver's DrvStretchBlt if available */ + if (DestObj->flHooks & HOOK_STRETCHBLT) + { + /* Drv->StretchBlt (look at http://www.osr.com/ddk/graphics/ddifncs_3ew7.htm ) + SURFOBJ *psoMask // optional, if it exists, then rop4=0xCCAA, otherwise rop4=0xCCCC */ + // FIXME: MaskOrigin is always NULL ! + ret = GDIDEVFUNCS(DestSurf).StretchBlt( + DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation, + &ca, BrushOrigin, DestRect, SourceRect, NULL, Mode); + } + + if (! ret) + { + // FIXME: see previous fixme + ret = EngStretchBlt(DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation, &ca, BrushOrigin, DestRect, SourceRect, NULL, Mode); } - if (! ret) - { - // FIXME: see previous fixme - ret = EngStretchBlt(DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation, - &ca, BrushOrigin, DestRect, SourceRect, NULL, Mode); - } - - if (NULL != SourceSurf) - { - MouseSafetyOnDrawEnd(SourceSurf); - if (SourceSurf != DestSurf) - { - BITMAPOBJ_UnlockBitmapBits(SourceObj); - } - } - MouseSafetyOnDrawEnd(DestSurf); - BITMAPOBJ_UnlockBitmapBits(DestObj); - - return ret; + if (NULL != SourceSurf) + { + MouseSafetyOnDrawEnd(SourceSurf); + if (SourceSurf != DestSurf) + { + BITMAPOBJ_UnlockBitmapBits(SourceObj); + } + } + MouseSafetyOnDrawEnd(DestSurf); + BITMAPOBJ_UnlockBitmapBits(DestObj); + + return ret; } BOOL @@ -902,245 +902,245 @@ IN PRECTL SourceRect, IN BLENDOBJ *BlendObj) { - RECTL SourceStretchedRect; - SIZEL SourceStretchedSize; - HBITMAP SourceStretchedBitmap = 0; - SURFOBJ* SourceStretchedObj = NULL; - RECTL InputRect; - RECTL OutputRect; - RECTL ClipRect; - RECTL CombinedRect; - RECTL Rect; - POINTL Translate; - INTENG_ENTER_LEAVE EnterLeaveSource; - INTENG_ENTER_LEAVE EnterLeaveDest; - SURFOBJ* InputObj; - SURFOBJ* OutputObj; - LONG Width; - LONG ClippingType; - RECT_ENUM RectEnum; - BOOL EnumMore; - INT i; - BOOLEAN Ret; - - DPRINT("EngAlphaBlend(Dest:0x%p, Source:0x%p, ClipRegion:0x%p, ColorTranslation:0x%p,\n", Dest, Source, ClipRegion, ColorTranslation); - DPRINT(" DestRect:{0x%x, 0x%x, 0x%x, 0x%x}, SourceRect:{0x%x, 0x%x, 0x%x, 0x%x},\n", - DestRect->left, DestRect->top, DestRect->right, DestRect->bottom, - SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); - DPRINT(" BlendObj:{0x%x, 0x%x, 0x%x, 0x%x}\n", BlendObj->BlendFunction.BlendOp, - BlendObj->BlendFunction.BlendFlags, BlendObj->BlendFunction.SourceConstantAlpha, - BlendObj->BlendFunction.AlphaFormat); - - /* Validate input */ - if (DestRect->left >= DestRect->right || DestRect->top >= DestRect->bottom) - { - DPRINT1("Empty destination rectangle!\n"); - return FALSE; - } - if (SourceRect->left >= SourceRect->right || SourceRect->top >= SourceRect->bottom) - { - DPRINT1("Empty source rectangle!\n"); - return FALSE; - } - if (Dest == Source && - !(DestRect->left >= SourceRect->right || SourceRect->left >= DestRect->right || - DestRect->top >= SourceRect->bottom || SourceRect->top >= DestRect->bottom)) - { - DPRINT1("Source and destination rectangles overlap!\n"); - return FALSE; - } - - if (BlendObj->BlendFunction.BlendOp != AC_SRC_OVER) - { - DPRINT1("BlendOp != AC_SRC_OVER (0x%x)\n", BlendObj->BlendFunction.BlendOp); - return FALSE; - } - if (BlendObj->BlendFunction.BlendFlags != 0) - { - DPRINT1("BlendFlags != 0 (0x%x)\n", BlendObj->BlendFunction.BlendFlags); - return FALSE; - } - if ((BlendObj->BlendFunction.AlphaFormat & ~AC_SRC_ALPHA) != 0) - { - DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendObj->BlendFunction.AlphaFormat); - return FALSE; - } - - /* Check if there is anything to draw */ - if (ClipRegion != NULL && - (ClipRegion->rclBounds.left >= ClipRegion->rclBounds.right || - ClipRegion->rclBounds.top >= ClipRegion->rclBounds.bottom)) - { - /* Nothing to do */ - return TRUE; - } - - /* Stretch source if needed */ - if (DestRect->right - DestRect->left != SourceRect->right - SourceRect->left || - DestRect->bottom - DestRect->top != SourceRect->bottom - SourceRect->top) - { - SourceStretchedSize.cx = DestRect->right - DestRect->left; - SourceStretchedSize.cy = DestRect->bottom - DestRect->top; - Width = DIB_GetDIBWidthBytes(SourceStretchedSize.cx, BitsPerFormat(Source->iBitmapFormat)); - /* FIXME: Maybe it is a good idea to use EngCreateDeviceBitmap and IntEngStretchBlt - if possible to get a HW accelerated stretch. */ - SourceStretchedBitmap = EngCreateBitmap(SourceStretchedSize, Width, Source->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, NULL); - if (SourceStretchedBitmap == 0) - { - DPRINT1("EngCreateBitmap failed!\n"); - return FALSE; - } - SourceStretchedObj = EngLockSurface((HSURF)SourceStretchedBitmap); - if (SourceStretchedObj == NULL) - { - DPRINT1("EngLockSurface failed!\n"); - EngDeleteSurface((HSURF)SourceStretchedBitmap); - return FALSE; - } - - SourceStretchedRect.left = 0; - SourceStretchedRect.right = SourceStretchedSize.cx; - SourceStretchedRect.top = 0; - SourceStretchedRect.bottom = SourceStretchedSize.cy; - /* FIXME: IntEngStretchBlt isn't used here atm because it results in a - try to acquire an already acquired mutex (lock the already locked source surface) */ - /*if (!IntEngStretchBlt(SourceStretchedObj, Source, NULL, NULL, - NULL, &SourceStretchedRect, SourceRect, NULL, - NULL, NULL, COLORONCOLOR))*/ - if (!EngStretchBlt(SourceStretchedObj, Source, NULL, NULL, NULL, - NULL, NULL, &SourceStretchedRect, SourceRect, - NULL, COLORONCOLOR)) - { - DPRINT1("EngStretchBlt failed!\n"); - EngFreeMem(SourceStretchedObj->pvBits); - EngUnlockSurface(SourceStretchedObj); - EngDeleteSurface((HSURF)SourceStretchedBitmap); - return FALSE; - } - SourceRect = &SourceStretchedRect; - Source = SourceStretchedObj; - } - - /* Now call the DIB function */ - InputRect.left = SourceRect->left; - InputRect.right = SourceRect->right; - InputRect.top = SourceRect->top; - InputRect.bottom = SourceRect->bottom; - if (!IntEngEnter(&EnterLeaveSource, Source, &InputRect, TRUE, &Translate, &InputObj)) - { - if (SourceStretchedObj != NULL) - { - EngFreeMem(SourceStretchedObj->pvBits); - EngUnlockSurface(SourceStretchedObj); - } - if (SourceStretchedBitmap != 0) - { - EngDeleteSurface((HSURF)SourceStretchedBitmap); - } - return FALSE; - } - InputRect.left = SourceRect->left + Translate.x; - InputRect.right = SourceRect->right + Translate.x; - InputRect.top = SourceRect->top + Translate.y; - InputRect.bottom = SourceRect->bottom + Translate.y; - - OutputRect.left = DestRect->left; - OutputRect.right = DestRect->right; - OutputRect.top = DestRect->top; - OutputRect.bottom = DestRect->bottom; - if (!IntEngEnter(&EnterLeaveDest, Dest, &OutputRect, FALSE, &Translate, &OutputObj)) - { - IntEngLeave(&EnterLeaveSource); - if (SourceStretchedObj != NULL) - { - EngFreeMem(SourceStretchedObj->pvBits); - EngUnlockSurface(SourceStretchedObj); - } - if (SourceStretchedBitmap != 0) - { - EngDeleteSurface((HSURF)SourceStretchedBitmap); - } - return FALSE; - } - OutputRect.left = DestRect->left + Translate.x; - OutputRect.right = DestRect->right + Translate.x; - OutputRect.top = DestRect->top + Translate.y; - OutputRect.bottom = DestRect->bottom + Translate.y; - - Ret = FALSE; - ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity; - switch(ClippingType) - { - case DC_TRIVIAL: - Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( - OutputObj, InputObj, &OutputRect, &InputRect, ClipRegion, ColorTranslation, BlendObj); - break; - - case DC_RECT: - ClipRect.left = ClipRegion->rclBounds.left + Translate.x; - ClipRect.right = ClipRegion->rclBounds.right + Translate.x; - ClipRect.top = ClipRegion->rclBounds.top + Translate.y; - ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; - if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) - { - Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; - Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; - Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; - Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; - Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( - OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj); - } - break; - - case DC_COMPLEX: - Ret = TRUE; - CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, CD_ANY, 0); - do - { - EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), - (PVOID) &RectEnum); - - for (i = 0; i < RectEnum.c; i++) + RECTL SourceStretchedRect; + SIZEL SourceStretchedSize; + HBITMAP SourceStretchedBitmap = 0; + SURFOBJ* SourceStretchedObj = NULL; + RECTL InputRect; + RECTL OutputRect; + RECTL ClipRect; + RECTL CombinedRect; + RECTL Rect; + POINTL Translate; + INTENG_ENTER_LEAVE EnterLeaveSource; + INTENG_ENTER_LEAVE EnterLeaveDest; + SURFOBJ* InputObj; + SURFOBJ* OutputObj; + LONG Width; + LONG ClippingType; + RECT_ENUM RectEnum; + BOOL EnumMore; + INT i; + BOOLEAN Ret; + + DPRINT("EngAlphaBlend(Dest:0x%p, Source:0x%p, ClipRegion:0x%p, ColorTranslation:0x%p,\n", Dest, Source, ClipRegion, ColorTranslation); + DPRINT(" DestRect:{0x%x, 0x%x, 0x%x, 0x%x}, SourceRect:{0x%x, 0x%x, 0x%x, 0x%x},\n", + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom, + SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); + DPRINT(" BlendObj:{0x%x, 0x%x, 0x%x, 0x%x}\n", BlendObj->BlendFunction.BlendOp, + BlendObj->BlendFunction.BlendFlags, BlendObj->BlendFunction.SourceConstantAlpha, + BlendObj->BlendFunction.AlphaFormat); + + /* Validate input */ + if (DestRect->left >= DestRect->right || DestRect->top >= DestRect->bottom) + { + DPRINT1("Empty destination rectangle!\n"); + return FALSE; + } + if (SourceRect->left >= SourceRect->right || SourceRect->top >= SourceRect->bottom) + { + DPRINT1("Empty source rectangle!\n"); + return FALSE; + } + if (Dest == Source && + !(DestRect->left >= SourceRect->right || SourceRect->left >= DestRect->right || + DestRect->top >= SourceRect->bottom || SourceRect->top >= DestRect->bottom)) + { + DPRINT1("Source and destination rectangles overlap!\n"); + return FALSE; + } + + if (BlendObj->BlendFunction.BlendOp != AC_SRC_OVER) + { + DPRINT1("BlendOp != AC_SRC_OVER (0x%x)\n", BlendObj->BlendFunction.BlendOp); + return FALSE; + } + if (BlendObj->BlendFunction.BlendFlags != 0) + { + DPRINT1("BlendFlags != 0 (0x%x)\n", BlendObj->BlendFunction.BlendFlags); + return FALSE; + } + if ((BlendObj->BlendFunction.AlphaFormat & ~AC_SRC_ALPHA) != 0) + { + DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendObj->BlendFunction.AlphaFormat); + return FALSE; + } + + /* Check if there is anything to draw */ + if (ClipRegion != NULL && + (ClipRegion->rclBounds.left >= ClipRegion->rclBounds.right || + ClipRegion->rclBounds.top >= ClipRegion->rclBounds.bottom)) + { + /* Nothing to do */ + return TRUE; + } + + /* Stretch source if needed */ + if (DestRect->right - DestRect->left != SourceRect->right - SourceRect->left || + DestRect->bottom - DestRect->top != SourceRect->bottom - SourceRect->top) + { + SourceStretchedSize.cx = DestRect->right - DestRect->left; + SourceStretchedSize.cy = DestRect->bottom - DestRect->top; + Width = DIB_GetDIBWidthBytes(SourceStretchedSize.cx, BitsPerFormat(Source->iBitmapFormat)); + /* FIXME: Maybe it is a good idea to use EngCreateDeviceBitmap and IntEngStretchBlt + if possible to get a HW accelerated stretch. */ + SourceStretchedBitmap = EngCreateBitmap(SourceStretchedSize, Width, Source->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, NULL); + if (SourceStretchedBitmap == 0) + { + DPRINT1("EngCreateBitmap failed!\n"); + return FALSE; + } + SourceStretchedObj = EngLockSurface((HSURF)SourceStretchedBitmap); + if (SourceStretchedObj == NULL) + { + DPRINT1("EngLockSurface failed!\n"); + EngDeleteSurface((HSURF)SourceStretchedBitmap); + return FALSE; + } + + SourceStretchedRect.left = 0; + SourceStretchedRect.right = SourceStretchedSize.cx; + SourceStretchedRect.top = 0; + SourceStretchedRect.bottom = SourceStretchedSize.cy; + /* FIXME: IntEngStretchBlt isn't used here atm because it results in a + try to acquire an already acquired mutex (lock the already locked source surface) */ + /*if (!IntEngStretchBlt(SourceStretchedObj, Source, NULL, NULL, + NULL, &SourceStretchedRect, SourceRect, NULL, + NULL, NULL, COLORONCOLOR))*/ + if (!EngStretchBlt(SourceStretchedObj, Source, NULL, NULL, NULL, + NULL, NULL, &SourceStretchedRect, SourceRect, + NULL, COLORONCOLOR)) + { + DPRINT1("EngStretchBlt failed!\n"); + EngFreeMem(SourceStretchedObj->pvBits); + EngUnlockSurface(SourceStretchedObj); + EngDeleteSurface((HSURF)SourceStretchedBitmap); + return FALSE; + } + SourceRect = &SourceStretchedRect; + Source = SourceStretchedObj; + } + + /* Now call the DIB function */ + InputRect.left = SourceRect->left; + InputRect.right = SourceRect->right; + InputRect.top = SourceRect->top; + InputRect.bottom = SourceRect->bottom; + if (!IntEngEnter(&EnterLeaveSource, Source, &InputRect, TRUE, &Translate, &InputObj)) + { + if (SourceStretchedObj != NULL) + { + EngFreeMem(SourceStretchedObj->pvBits); + EngUnlockSurface(SourceStretchedObj); + } + if (SourceStretchedBitmap != 0) + { + EngDeleteSurface((HSURF)SourceStretchedBitmap); + } + return FALSE; + } + InputRect.left = SourceRect->left + Translate.x; + InputRect.right = SourceRect->right + Translate.x; + InputRect.top = SourceRect->top + Translate.y; + InputRect.bottom = SourceRect->bottom + Translate.y; + + OutputRect.left = DestRect->left; + OutputRect.right = DestRect->right; + OutputRect.top = DestRect->top; + OutputRect.bottom = DestRect->bottom; + if (!IntEngEnter(&EnterLeaveDest, Dest, &OutputRect, FALSE, &Translate, &OutputObj)) + { + IntEngLeave(&EnterLeaveSource); + if (SourceStretchedObj != NULL) + { + EngFreeMem(SourceStretchedObj->pvBits); + EngUnlockSurface(SourceStretchedObj); + } + if (SourceStretchedBitmap != 0) + { + EngDeleteSurface((HSURF)SourceStretchedBitmap); + } + return FALSE; + } + OutputRect.left = DestRect->left + Translate.x; + OutputRect.right = DestRect->right + Translate.x; + OutputRect.top = DestRect->top + Translate.y; + OutputRect.bottom = DestRect->bottom + Translate.y; + + Ret = FALSE; + ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity; + switch (ClippingType) + { + case DC_TRIVIAL: + Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( + OutputObj, InputObj, &OutputRect, &InputRect, ClipRegion, ColorTranslation, BlendObj); + break; + + case DC_RECT: + ClipRect.left = ClipRegion->rclBounds.left + Translate.x; + ClipRect.right = ClipRegion->rclBounds.right + Translate.x; + ClipRect.top = ClipRegion->rclBounds.top + Translate.y; + ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { - ClipRect.left = RectEnum.arcl[i].left + Translate.x; - ClipRect.right = RectEnum.arcl[i].right + Translate.x; - ClipRect.top = RectEnum.arcl[i].top + Translate.y; - ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; - if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; + Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; + Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; + Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; + Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( + OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj); + } + break; + + case DC_COMPLEX: + Ret = TRUE; + CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, CD_ANY, 0); + do + { + EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), + (PVOID) &RectEnum); + + for (i = 0; i < RectEnum.c; i++) { - Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; - Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; - Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; - Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; - Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( - OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj) && Ret; + ClipRect.left = RectEnum.arcl[i].left + Translate.x; + ClipRect.right = RectEnum.arcl[i].right + Translate.x; + ClipRect.top = RectEnum.arcl[i].top + Translate.y; + ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; + Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; + Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; + Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; + Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( + OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj) && Ret; + } } } - } - while(EnumMore); - break; - - default: - UNIMPLEMENTED; - ASSERT(FALSE); - break; - } - - IntEngLeave(&EnterLeaveDest); - IntEngLeave(&EnterLeaveSource); - - if (SourceStretchedObj != NULL) - { - EngFreeMem(SourceStretchedObj->pvBits); - EngUnlockSurface(SourceStretchedObj); - } - if (SourceStretchedBitmap != 0) - { - EngDeleteSurface((HSURF)SourceStretchedBitmap); - } - - return Ret; + while (EnumMore); + break; + + default: + UNIMPLEMENTED; + ASSERT(FALSE); + break; + } + + IntEngLeave(&EnterLeaveDest); + IntEngLeave(&EnterLeaveSource); + + if (SourceStretchedObj != NULL) + { + EngFreeMem(SourceStretchedObj->pvBits); + EngUnlockSurface(SourceStretchedObj); + } + if (SourceStretchedBitmap != 0) + { + EngDeleteSurface((HSURF)SourceStretchedBitmap); + } + + return Ret; } BOOL STDCALL @@ -1152,60 +1152,60 @@ IN PRECTL SourceRect, IN BLENDOBJ *BlendObj) { - BOOL ret = FALSE; - BITMAPOBJ *DestObj; - BITMAPOBJ *SourceObj; - - ASSERT(Dest); - DestObj = CONTAINING_RECORD(Dest, BITMAPOBJ, SurfObj); - ASSERT(DestObj); - - ASSERT(Source); - SourceObj = CONTAINING_RECORD(Source, BITMAPOBJ, SurfObj); - ASSERT(SourceObj); - - ASSERT(DestRect); - ASSERT(SourceRect); - - /* Check if there is anything to draw */ - if (ClipRegion != NULL && - (ClipRegion->rclBounds.left >= ClipRegion->rclBounds.right || - ClipRegion->rclBounds.top >= ClipRegion->rclBounds.bottom)) - { - /* Nothing to do */ - return TRUE; - } - - BITMAPOBJ_LockBitmapBits(DestObj); - MouseSafetyOnDrawStart(Dest, DestRect->left, DestRect->top, - DestRect->right, DestRect->bottom); - - if (Source != Dest) - BITMAPOBJ_LockBitmapBits(SourceObj); - MouseSafetyOnDrawStart(Source, SourceRect->left, SourceRect->top, - SourceRect->right, SourceRect->bottom); - - /* Call the driver's DrvAlphaBlend if available */ - if (DestObj->flHooks & HOOK_ALPHABLEND) - { - ret = GDIDEVFUNCS(Dest).AlphaBlend( - Dest, Source, ClipRegion, ColorTranslation, - DestRect, SourceRect, BlendObj); - } - - if (! ret) - { - ret = EngAlphaBlend(Dest, Source, ClipRegion, ColorTranslation, - DestRect, SourceRect, BlendObj); - } - - MouseSafetyOnDrawEnd(Source); - if (Source != Dest) - BITMAPOBJ_UnlockBitmapBits(SourceObj); - MouseSafetyOnDrawEnd(Dest); - BITMAPOBJ_UnlockBitmapBits(DestObj); - - return ret; + BOOL ret = FALSE; + BITMAPOBJ *DestObj; + BITMAPOBJ *SourceObj; + + ASSERT(Dest); + DestObj = CONTAINING_RECORD(Dest, BITMAPOBJ, SurfObj); + ASSERT(DestObj); + + ASSERT(Source); + SourceObj = CONTAINING_RECORD(Source, BITMAPOBJ, SurfObj); + ASSERT(SourceObj); + + ASSERT(DestRect); + ASSERT(SourceRect); + + /* Check if there is anything to draw */ + if (ClipRegion != NULL && + (ClipRegion->rclBounds.left >= ClipRegion->rclBounds.right || + ClipRegion->rclBounds.top >= ClipRegion->rclBounds.bottom)) + { + /* Nothing to do */ + return TRUE; + } + + BITMAPOBJ_LockBitmapBits(DestObj); + MouseSafetyOnDrawStart(Dest, DestRect->left, DestRect->top, + DestRect->right, DestRect->bottom); + + if (Source != Dest) + BITMAPOBJ_LockBitmapBits(SourceObj); + MouseSafetyOnDrawStart(Source, SourceRect->left, SourceRect->top, + SourceRect->right, SourceRect->bottom); + + /* Call the driver's DrvAlphaBlend if available */ + if (DestObj->flHooks & HOOK_ALPHABLEND) + { + ret = GDIDEVFUNCS(Dest).AlphaBlend( + Dest, Source, ClipRegion, ColorTranslation, + DestRect, SourceRect, BlendObj); + } + + if (! ret) + { + ret = EngAlphaBlend(Dest, Source, ClipRegion, ColorTranslation, + DestRect, SourceRect, BlendObj); + } + + MouseSafetyOnDrawEnd(Source); + if (Source != Dest) + BITMAPOBJ_UnlockBitmapBits(SourceObj); + MouseSafetyOnDrawEnd(Dest); + BITMAPOBJ_UnlockBitmapBits(DestObj); + + return ret; } /**** REACTOS FONT RENDERING CODE *********************************************/ @@ -1213,289 +1213,289 @@ /* renders the alpha mask bitmap */ static BOOLEAN STDCALL AlphaBltMask(SURFOBJ* Dest, - SURFOBJ* Source, - SURFOBJ* Mask, - XLATEOBJ* ColorTranslation, - XLATEOBJ* SrcColorTranslation, - RECTL* DestRect, - POINTL* SourcePoint, - POINTL* MaskPoint, - BRUSHOBJ* Brush, - POINTL* BrushPoint) + SURFOBJ* Source, + SURFOBJ* Mask, + XLATEOBJ* ColorTranslation, + XLATEOBJ* SrcColorTranslation, + RECTL* DestRect, + POINTL* SourcePoint, + POINTL* MaskPoint, + BRUSHOBJ* Brush, + POINTL* BrushPoint) { - LONG i, j, dx, dy; - int r, g, b; - ULONG Background, BrushColor, NewColor; - BYTE *tMask, *lMask; - - dx = DestRect->right - DestRect->left; - dy = DestRect->bottom - DestRect->top; - - if (Mask != NULL) - { - BrushColor = XLATEOBJ_iXlate(SrcColorTranslation, Brush->iSolidColor); - r = (int)GetRValue(BrushColor); - g = (int)GetGValue(BrushColor); - b = (int)GetBValue(BrushColor); - - tMask = (PBYTE)Mask->pvScan0 + (SourcePoint->y * Mask->lDelta) + SourcePoint->x; - for (j = 0; j < dy; j++) - { - lMask = tMask; - for (i = 0; i < dx; i++) + LONG i, j, dx, dy; + int r, g, b; + ULONG Background, BrushColor, NewColor; + BYTE *tMask, *lMask; + + dx = DestRect->right - DestRect->left; + dy = DestRect->bottom - DestRect->top; + + if (Mask != NULL) + { + BrushColor = XLATEOBJ_iXlate(SrcColorTranslation, Brush->iSolidColor); + r = (int)GetRValue(BrushColor); + g = (int)GetGValue(BrushColor); + b = (int)GetBValue(BrushColor); + + tMask = (PBYTE)Mask->pvScan0 + (SourcePoint->y * Mask->lDelta) + SourcePoint->x; + for (j = 0; j < dy; j++) + { + lMask = tMask; + for (i = 0; i < dx; i++) { - if (*lMask > 0) + if (*lMask > 0) { - if (*lMask == 0xff) + if (*lMask == 0xff) { - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( - Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor); + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( + Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor); } - else + else { - Background = DIB_GetSource(Dest, DestRect->left + i, DestRect->top + j, - SrcColorTranslation); - - NewColor = - RGB((*lMask * (r - GetRValue(Background)) >> 8) + GetRValue(Background), - (*lMask * (g - GetGValue(Background)) >> 8) + GetGValue(Background), - (*lMask * (b - GetBValue(Background)) >> 8) + GetBValue(Background)); - - Background = XLATEOBJ_iXlate(ColorTranslation, NewColor); - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( - Dest, DestRect->left + i, DestRect->top + j, Background); + Background = DIB_GetSource(Dest, DestRect->left + i, DestRect->top + j, + SrcColorTranslation); + + NewColor = + RGB((*lMask * (r - GetRValue(Background)) >> 8) + GetRValue(Background), + (*lMask * (g - GetGValue(Background)) >> 8) + GetGValue(Background), + (*lMask * (b - GetBValue(Background)) >> 8) + GetBValue(Background)); + + Background = XLATEOBJ_iXlate(ColorTranslation, NewColor); + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( + Dest, DestRect->left + i, DestRect->top + j, Background); } } - lMask++; + lMask++; } - tMask += Mask->lDelta; - } - return TRUE; - } - else - { - return FALSE; + tMask += Mask->lDelta; + } + return TRUE; + } + else + { + return FALSE; } } BOOL STDCALL EngMaskBitBlt(SURFOBJ *DestObj, - SURFOBJ *Mask, - CLIPOBJ *ClipRegion, - XLATEOBJ *DestColorTranslation, - XLATEOBJ *SourceColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint, - POINTL *MaskOrigin, - BRUSHOBJ *Brush, - POINTL *BrushOrigin) + SURFOBJ *Mask, + CLIPOBJ *ClipRegion, + XLATEOBJ *DestColorTranslation, + XLATEOBJ *SourceColorTranslation, + RECTL *DestRect, + POINTL *SourcePoint, + POINTL *MaskOrigin, + BRUSHOBJ *Brush, + POINTL *BrushOrigin) { - BYTE clippingType; - RECTL CombinedRect; - RECT_ENUM RectEnum; - BOOL EnumMore; - POINTL InputPoint; - RECTL InputRect; - RECTL OutputRect; - POINTL Translate; - INTENG_ENTER_LEAVE EnterLeaveSource; - INTENG_ENTER_LEAVE EnterLeaveDest; - SURFOBJ* InputObj; - SURFOBJ* OutputObj; - BOOLEAN Ret = TRUE; - RECTL ClipRect; - unsigned i; - POINTL Pt; - ULONG Direction; - POINTL AdjustedBrushOrigin; - - ASSERT ( Mask ); - - if (NULL != SourcePoint) - { - InputRect.left = SourcePoint->x; - InputRect.right = SourcePoint->x + (DestRect->right - DestRect->left); - InputRect.top = SourcePoint->y; - InputRect.bottom = SourcePoint->y + (DestRect->bottom - DestRect->top); - } - else - { - InputRect.left = 0; - InputRect.right = DestRect->right - DestRect->left; - InputRect.top = 0; - InputRect.bottom = DestRect->bottom - DestRect->top; - } - - if (! IntEngEnter(&EnterLeaveSource, DestObj, &InputRect, TRUE, &Translate, &InputObj)) - { - return FALSE; - } - - if (NULL != SourcePoint) - { - InputPoint.x = SourcePoint->x + Translate.x; - InputPoint.y = SourcePoint->y + Translate.y; - } - else - { - InputPoint.x = 0; - InputPoint.y = 0; - } - - OutputRect = *DestRect; - if (NULL != ClipRegion) - { - if (OutputRect.left < ClipRegion->rclBounds.left) - { - InputRect.left += ClipRegion->rclBounds.left - OutputRect.left; - InputPoint.x += ClipRegion->rclBounds.left - OutputRect.left; - OutputRect.left = ClipRegion->rclBounds.left; - } - if (ClipRegion->rclBounds.right < OutputRect.right) - { - InputRect.right -= OutputRect.right - ClipRegion->rclBounds.right; - OutputRect.right = ClipRegion->rclBounds.right; - } - if (OutputRect.top < ClipRegion->rclBounds.top) - { - InputRect.top += ClipRegion->rclBounds.top - OutputRect.top; - InputPoint.y += ClipRegion->rclBounds.top - OutputRect.top; - OutputRect.top = ClipRegion->rclBounds.top; - } - if (ClipRegion->rclBounds.bottom < OutputRect.bottom) - { - InputRect.bottom -= OutputRect.bottom - ClipRegion->rclBounds.bottom; - OutputRect.bottom = ClipRegion->rclBounds.bottom; - } - } - - /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's - nothing to do */ - if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) - { - IntEngLeave(&EnterLeaveSource); - return TRUE; - } - - if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, &OutputObj)) - { - IntEngLeave(&EnterLeaveSource); - return FALSE; - } - - OutputRect.left = DestRect->left + Translate.x; - OutputRect.right = DestRect->right + Translate.x; - OutputRect.top = DestRect->top + Translate.y; - OutputRect.bottom = DestRect->bottom + Translate.y; - - if(BrushOrigin) - { - AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; - AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; - } - else - AdjustedBrushOrigin = Translate; - - // Determine clipping type - if (ClipRegion == (CLIPOBJ *) NULL) - { - clippingType = DC_TRIVIAL; - } else { - clippingType = ClipRegion->iDComplexity; - } - - switch(clippingType) - { - case DC_TRIVIAL: - if(Mask->iBitmapFormat == BMF_8BPP) - Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin); - else - Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin, - R4_MASK); - break; - case DC_RECT: - // Clip the blt to the clip rectangle - ClipRect.left = ClipRegion->rclBounds.left + Translate.x; - ClipRect.right = ClipRegion->rclBounds.right + Translate.x; - ClipRect.top = ClipRegion->rclBounds.top + Translate.y; - ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; - if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) - { - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - if(Mask->iBitmapFormat == BMF_8BPP) + BYTE clippingType; + RECTL CombinedRect; + RECT_ENUM RectEnum; + BOOL EnumMore; + POINTL InputPoint; + RECTL InputRect; + RECTL OutputRect; + POINTL Translate; + INTENG_ENTER_LEAVE EnterLeaveSource; + INTENG_ENTER_LEAVE EnterLeaveDest; + SURFOBJ* InputObj; + SURFOBJ* OutputObj; + BOOLEAN Ret = TRUE; + RECTL ClipRect; + unsigned i; + POINTL Pt; + ULONG Direction; + POINTL AdjustedBrushOrigin; + + ASSERT ( Mask ); + + if (NULL != SourcePoint) + { + InputRect.left = SourcePoint->x; + InputRect.right = SourcePoint->x + (DestRect->right - DestRect->left); + InputRect.top = SourcePoint->y; + InputRect.bottom = SourcePoint->y + (DestRect->bottom - DestRect->top); + } + else + { + InputRect.left = 0; + InputRect.right = DestRect->right - DestRect->left; + InputRect.top = 0; + InputRect.bottom = DestRect->bottom - DestRect->top; + } + + if (! IntEngEnter(&EnterLeaveSource, DestObj, &InputRect, TRUE, &Translate, &InputObj)) + { + return FALSE; + } + + if (NULL != SourcePoint) + { + InputPoint.x = SourcePoint->x + Translate.x; + InputPoint.y = SourcePoint->y + Translate.y; + } + else + { + InputPoint.x = 0; + InputPoint.y = 0; + } + + OutputRect = *DestRect; + if (NULL != ClipRegion) + { + if (OutputRect.left < ClipRegion->rclBounds.left) + { + InputRect.left += ClipRegion->rclBounds.left - OutputRect.left; + InputPoint.x += ClipRegion->rclBounds.left - OutputRect.left; + OutputRect.left = ClipRegion->rclBounds.left; + } + if (ClipRegion->rclBounds.right < OutputRect.right) + { + InputRect.right -= OutputRect.right - ClipRegion->rclBounds.right; + OutputRect.right = ClipRegion->rclBounds.right; + } + if (OutputRect.top < ClipRegion->rclBounds.top) + { + InputRect.top += ClipRegion->rclBounds.top - OutputRect.top; + InputPoint.y += ClipRegion->rclBounds.top - OutputRect.top; + OutputRect.top = ClipRegion->rclBounds.top; + } + if (ClipRegion->rclBounds.bottom < OutputRect.bottom) + { + InputRect.bottom -= OutputRect.bottom - ClipRegion->rclBounds.bottom; + OutputRect.bottom = ClipRegion->rclBounds.bottom; + } + } + + /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's + nothing to do */ + if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) + { + IntEngLeave(&EnterLeaveSource); + return TRUE; + } + + if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, &OutputObj)) + { + IntEngLeave(&EnterLeaveSource); + return FALSE; + } + + OutputRect.left = DestRect->left + Translate.x; + OutputRect.right = DestRect->right + Translate.x; + OutputRect.top = DestRect->top + Translate.y; + OutputRect.bottom = DestRect->bottom + Translate.y; + + if (BrushOrigin) + { + AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; + AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; + } + else + AdjustedBrushOrigin = Translate; + + // Determine clipping type + if (ClipRegion == (CLIPOBJ *) NULL) + { + clippingType = DC_TRIVIAL; + } else { + clippingType = ClipRegion->iDComplexity; + } + + switch (clippingType) + { + case DC_TRIVIAL: + if (Mask->iBitmapFormat == BMF_8BPP) + Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation, + &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin); + else + Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, + &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin, + R4_MASK); + break; + case DC_RECT: + // Clip the blt to the clip rectangle + ClipRect.left = ClipRegion->rclBounds.left + Translate.x; + ClipRect.right = ClipRegion->rclBounds.right + Translate.x; + ClipRect.top = ClipRegion->rclBounds.top + Translate.y; + ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { - Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin); + Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; + Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; + if (Mask->iBitmapFormat == BMF_8BPP) + { + Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation, + &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin); + } + else + { + Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, + &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK); + } } - else + break; + case DC_COMPLEX: + Ret = TRUE; + if (OutputObj == InputObj) { - Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK); + if (OutputRect.top < InputPoint.y) + { + Direction = OutputRect.left < InputPoint.x ? CD_RIGHTDOWN : CD_LEFTDOWN; + } + else + { + Direction = OutputRect.left < InputPoint.x ? CD_RIGHTUP : CD_LEFTUP; + } } - } - break; - case DC_COMPLEX: - Ret = TRUE; - if (OutputObj == InputObj) - { - if (OutputRect.top < InputPoint.y) - { - Direction = OutputRect.left < InputPoint.x ? CD_RIGHTDOWN : CD_LEFTDOWN; - } - else - { - Direction = OutputRect.left < InputPoint.x ? CD_RIGHTUP : CD_LEFTUP; - } - } - else - { - Direction = CD_ANY; - } - CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, Direction, 0); - do - { - EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), (PVOID) &RectEnum); - - for (i = 0; i < RectEnum.c; i++) - { - ClipRect.left = RectEnum.arcl[i].left + Translate.x; - ClipRect.right = RectEnum.arcl[i].right + Translate.x; - ClipRect.top = RectEnum.arcl[i].top + Translate.y; - ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; - if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + else + { + Direction = CD_ANY; + } + CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, Direction, 0); + do + { + EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + + for (i = 0; i < RectEnum.c; i++) { - Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; - Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - if(Mask->iBitmapFormat == BMF_8BPP) + ClipRect.left = RectEnum.arcl[i].left + Translate.x; + ClipRect.right = RectEnum.arcl[i].right + Translate.x; + ClipRect.top = RectEnum.arcl[i].top + Translate.y; + ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { - Ret = AlphaBltMask(OutputObj, InputObj, Mask, - DestColorTranslation, - SourceColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, - &AdjustedBrushOrigin) && Ret; - } - else - { - Ret = BltMask(OutputObj, InputObj, Mask, - DestColorTranslation, &CombinedRect, &Pt, - MaskOrigin, Brush, &AdjustedBrushOrigin, - R4_MASK) && Ret; + Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; + Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; + if (Mask->iBitmapFormat == BMF_8BPP) + { + Ret = AlphaBltMask(OutputObj, InputObj, Mask, + DestColorTranslation, + SourceColorTranslation, + &CombinedRect, &Pt, MaskOrigin, Brush, + &AdjustedBrushOrigin) && Ret; + } + else + { + Ret = BltMask(OutputObj, InputObj, Mask, + DestColorTranslation, &CombinedRect, &Pt, + MaskOrigin, Brush, &AdjustedBrushOrigin, + R4_MASK) && Ret; + } } } - } - } - while(EnumMore); - break; - } - - - IntEngLeave(&EnterLeaveDest); - IntEngLeave(&EnterLeaveSource); - - return Ret; + } + while (EnumMore); + break; + } + + + IntEngLeave(&EnterLeaveDest); + IntEngLeave(&EnterLeaveSource); + + return Ret; } BOOL STDCALL @@ -1510,61 +1510,61 @@ BRUSHOBJ *Brush, POINTL *BrushOrigin) { - BOOLEAN ret; - RECTL OutputRect; - POINTL InputPoint; - BITMAPOBJ *DestObj; - - ASSERT(Mask); - - if (NULL != SourcePoint) - { - InputPoint = *SourcePoint; - } - - /* Clip against the bounds of the clipping region so we won't try to write - * outside the surface */ - if (NULL != ClipRegion) - { - if (! EngIntersectRect(&OutputRect, DestRect, &ClipRegion->rclBounds)) - { - return TRUE; - } - InputPoint.x += OutputRect.left - DestRect->left; - InputPoint.y += OutputRect.top - DestRect->top; - } - else - { - OutputRect = *DestRect; - } - - /* No success yet */ - ret = FALSE; - ASSERT(DestSurf); - DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); - - BITMAPOBJ_LockBitmapBits(DestObj); - MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top, - OutputRect.right, OutputRect.bottom); - - /* Dummy BitBlt to let driver know that it should flush its changes. - This should really be done using a call to DrvSynchronizeSurface, - but the VMware driver doesn't hook that call. */ - IntEngBitBltEx(DestSurf, NULL, Mask, ClipRegion, DestColorTranslation, - DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, - R4_NOOP, FALSE); - - ret = EngMaskBitBlt(DestSurf, Mask, ClipRegion, DestColorTranslation, SourceColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin); - - /* Dummy BitBlt to let driver know that something has changed. */ - IntEngBitBltEx(DestSurf, NULL, Mask, ClipRegion, DestColorTranslation, - DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, - R4_NOOP, FALSE); - - MouseSafetyOnDrawEnd(DestSurf); - BITMAPOBJ_UnlockBitmapBits(DestObj); - - return ret; + BOOLEAN ret; + RECTL OutputRect; + POINTL InputPoint; + BITMAPOBJ *DestObj; + + ASSERT(Mask); + + if (NULL != SourcePoint) + { + InputPoint = *SourcePoint; + } + + /* Clip against the bounds of the clipping region so we won't try to write + * outside the surface */ + if (NULL != ClipRegion) + { + if (! EngIntersectRect(&OutputRect, DestRect, &ClipRegion->rclBounds)) + { + return TRUE; + } + InputPoint.x += OutputRect.left - DestRect->left; + InputPoint.y += OutputRect.top - DestRect->top; + } + else + { + OutputRect = *DestRect; + } + + /* No success yet */ + ret = FALSE; + ASSERT(DestSurf); + DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); + + BITMAPOBJ_LockBitmapBits(DestObj); + MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top, + OutputRect.right, OutputRect.bottom); + + /* Dummy BitBlt to let driver know that it should flush its changes. + This should really be done using a call to DrvSynchronizeSurface, + but the VMware driver doesn't hook that call. */ + IntEngBitBltEx(DestSurf, NULL, Mask, ClipRegion, DestColorTranslation, + DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, + R4_NOOP, FALSE); + + ret = EngMaskBitBlt(DestSurf, Mask, ClipRegion, DestColorTranslation, SourceColorTranslation, + &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin); + + /* Dummy BitBlt to let driver know that something has changed. */ + IntEngBitBltEx(DestSurf, NULL, Mask, ClipRegion, DestColorTranslation, + DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, + R4_NOOP, FALSE); + + MouseSafetyOnDrawEnd(DestSurf); + BITMAPOBJ_UnlockBitmapBits(DestObj); + + return ret; } /* EOF */

1 0

[fireball] 26300: - Reverting 26299: Please fix an actual bug (wherever it is), and don't commit your temporary personal workarounds.
by fireball＠svn.reactos.org 09 Apr '07

09 Apr '07

Author: fireball Date: Mon Apr 9 22:05:27 2007 New Revision: 26300 URL: http://svn.reactos.org/svn/reactos?rev=26300&view=rev Log: - Reverting 26299: Please fix an actual bug (wherever it is), and don't commit your temporary personal workarounds. Modified: trunk/reactos/boot/bootdata/hiveinst.inf Modified: trunk/reactos/boot/bootdata/hiveinst.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hiveinst.inf… ============================================================================== --- trunk/reactos/boot/bootdata/hiveinst.inf (original) +++ trunk/reactos/boot/bootdata/hiveinst.inf Mon Apr 9 22:05:27 2007 @@ -16,4 +16,4 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600 ; VGA miniport driver -;HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001

1 0

[greatlrd] 26299: comment out vga drv, we only need one of thuse two driver start on livecd. and that is vbe driver not both driver.
by greatlrd＠svn.reactos.org 09 Apr '07

09 Apr '07

Author: greatlrd Date: Mon Apr 9 20:09:22 2007 New Revision: 26299 URL: http://svn.reactos.org/svn/reactos?rev=26299&view=rev Log: comment out vga drv, we only need one of thuse two driver start on livecd. and that is vbe driver not both driver. Modified: trunk/reactos/boot/bootdata/hiveinst.inf Modified: trunk/reactos/boot/bootdata/hiveinst.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hiveinst.inf… ============================================================================== --- trunk/reactos/boot/bootdata/hiveinst.inf (original) +++ trunk/reactos/boot/bootdata/hiveinst.inf Mon Apr 9 20:09:22 2007 @@ -16,4 +16,4 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600 ; VGA miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001

1 0

[spetreolle] 26298: make french accents display correctly, patch by Pierre Schweitzer see issue #1919
by spetreolle＠svn.reactos.org 09 Apr '07

09 Apr '07

Author: spetreolle Date: Mon Apr 9 18:32:53 2007 New Revision: 26298 URL: http://svn.reactos.org/svn/reactos?rev=26298&view=rev Log: make french accents display correctly, patch by Pierre Schweitzer see issue #1919 Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.c Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.c (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.c Mon Apr 9 18:32:53 2007 @@ -3,6 +3,7 @@ * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * autor: Jean-Michel Gay 2003 + * Pierre Schweitzer 2007 * */ @@ -30,6 +31,11 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +/** + * FIXME : - VK_DIVIDE produces ! instead of / + * - VK_SNAPSHOT produces * + */ ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -106,22 +112,44 @@ }; ROSDATA VSC_VK extcode0_to_vk[] = { - // FIXME:m qu'est ce que c'est ? - // What is this? -#if 0 - { 'G', '$' }, - { 'H', '&' }, - //{ 'I', '!' }, - { 'K', '%' }, - { 'M', '\'' }, - { 'O', '#' }, - { 'P', '(' }, - { 'Q', '"' }, - { 'R', '-' }, - { '_', '_' }, - { '[', '[' }, - { ']', ']' }, -#endif + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, { 0, 0 }, }; @@ -151,35 +179,22 @@ /* Normal vs Shifted */ /* The numbers */ { '1', NOCAPS, {'&', '1'} }, - //{ '2', NOCAPS, {'é', '2'} }, - /* Ctrl-2 generates NUL */ - //{ '3', NOCAPS, {'"', '3'} }, - //{ '4', NOCAPS, {'\'', '4'} }, - //{ '5', NOCAPS, {'(', '5'} }, - //{ '6', NOCAPS, {'-', '6'} }, - /* Ctrl-6 generates RS */ - //{ '7', NOCAPS, {'è', '7'} }, - //{ '8', NOCAPS, {'_', '8'} }, - //{ '9', NOCAPS, {'ç', '9'} }, - //{ '0', NOCAPS, {'à', '0'} }, - /* Specials */ /* Ctrl-_ generates US */ - //{ VK_OEM_1 ,NOCAPS, {'$', '£'} }, - { VK_OEM_5 ,NOCAPS, {'*','µ'} }, - { VK_OEM_3 ,NOCAPS, {'ù', '%'} }, + { VK_OEM_5 ,NOCAPS, {'*',0xb5} }, /* */ + { VK_OEM_3 ,NOCAPS, {0xf9, '%'} }, /* ù */ { VK_OEM_COMMA ,NOCAPS, {',', '?'} }, { VK_OEM_PERIOD ,NOCAPS, {';', '.'} }, { VK_OEM_2 ,NOCAPS, {':', '/'} }, - { VK_OEM_8 ,NOCAPS, {'!', '§'} }, + { VK_OEM_8 ,NOCAPS, {'!', 0xa7} }, /* § */ /* Keys that do not have shift states */ - { VK_TAB ,NOCAPS, {'\t','\t'} }, - { VK_ADD ,NOCAPS, {'+', '+'} }, - { VK_SUBTRACT,NOCAPS, {'-', '-'} }, - { VK_MULTIPLY,NOCAPS, {'*', '*'} }, - { VK_DIVIDE ,NOCAPS, {'/', '/'} }, - { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} }, - { VK_SPACE ,NOCAPS, {' ', ' '} }, + { VK_TAB ,NOCAPS, {'\t','\t'} }, + { VK_ADD ,NOCAPS, {'+', '+'} }, + { VK_SUBTRACT ,NOCAPS, {'-', '-'} }, + { VK_MULTIPLY ,NOCAPS, {'*', '*'} }, + { VK_DIVIDE ,NOCAPS, {'/', '/'} }, + { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE ,NOCAPS, {' ', ' '} }, { 0, 0 } }; @@ -216,26 +231,26 @@ /* Legacy (telnet-style) ascii escapes */ { VK_OEM_102, 0, {'<', '>', 0x1c /* FS */} }, { VK_OEM_6, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE} }, - { VK_EMPTY, 0, {'^', '¨', WCH_NONE} }, //OEM 6 DEAD - { VK_OEM_7, 0, {'²','|', 0x1c /* FS */} }, + { VK_EMPTY, 0, {'^', 0xa8, WCH_NONE} }, //OEM 6 DEAD ¨ + { VK_OEM_7, 0, {0xb2,0xb3, 0x1c /* FS */} }, /* ², ³ */ { VK_RETURN, 0, {'\r', '\r', '\n'} }, { 0,0 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, shifted, control, Alt+Gr */ - { '2' , 1, {'é', '2', WCH_NONE, WCH_DEAD} }, - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, '~'} }, - { '3' , 0, {'"', '3', WCH_NONE, '#'} }, - { '4' , 0, {'\'', '4', WCH_NONE, '{'} }, - { '7' , 1, {'è', '7', WCH_NONE, WCH_DEAD} }, - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, '`'} }, - { '9' , 1, {'ç', '9', WCH_NONE, '^'} }, - { '0' , 1, {'à', '0', WCH_NONE, '@'} }, - { VK_OEM_PLUS,0, {'=', '+', WCH_NONE, '}'} }, - { 'E' , 1, {'e', 'E', 0x05, '' /* euro */} }, - { VK_OEM_1, 0, {'$', '£', WCH_NONE, '¤'} }, - { VK_OEM_4, 0, {')', '°', WCH_NONE, ']'} }, + { '2' , CAPS, {0xe9, '2', WCH_NONE, WCH_DEAD} }, + { VK_EMPTY, NOCAPS, {WCH_NONE, WCH_NONE, WCH_NONE, '~'} }, + { '3' , NOCAPS, {'"', '3', WCH_NONE, '#'} }, + { '4' , NOCAPS, {'\'', '4', WCH_NONE, '{'} }, + { '7' , CAPS, {0xe8, '7', WCH_NONE, WCH_DEAD} }, + { VK_EMPTY, NOCAPS, {WCH_NONE, WCH_NONE, WCH_NONE, '`'} }, + { '9' , CAPS, {0xe7, '9', WCH_NONE, '^'} }, /* ç */ + { '0' , CAPS, {0xe0, '0', WCH_NONE, '@'} }, /* à */ + { VK_OEM_PLUS,NOCAPS, {'=', '+', WCH_NONE, '}'} }, + { 'E' , CAPS, {'e', 'E', 0x05, 0x20ac } }, /* */ + { VK_OEM_1, NOCAPS, {0x24, 0xa3, WCH_NONE, 0xa4} }, /* $, £, ¤ */ + { VK_OEM_4, NOCAPS, {')', 0xb0, WCH_NONE, ']'} }, /* ° */ { 0, 0 } }; @@ -282,27 +297,61 @@ #define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags ROSDATA DEADKEY deadkey[] = { - { DEADTRANS(0x0061, 0x00A8, 0x00E4, 0x0000) }, - { DEADTRANS(0x0065, 0x00A8, 0x00EB, 0x0000) }, - { DEADTRANS(0x0069, 0x00A8, 0x00EF, 0x0000) }, - { DEADTRANS(0x006F, 0x00A8, 0x00F6, 0x0000) }, - { DEADTRANS(0x0075, 0x00A8, 0x00FC, 0x0000) }, - { DEADTRANS(0x0020, 0x00A8, 0x00A8, 0x0000) }, - { DEADTRANS(0x0061, 0x005E, 0x00E2, 0x0000) }, - { DEADTRANS(0x005E, 0x0065, 0x00EA, 0x0000) }, - { DEADTRANS(0x0069, 0x005E, 0x00EE, 0x0000) }, - { DEADTRANS(0x006F, 0x005E, 0x00F4, 0x0000) }, - { DEADTRANS(0x0075, 0x005E, 0x00FB, 0x0000) }, - { DEADTRANS(0x0020, 0x005E, 0x005E, 0x0000) }, - { DEADTRANS(0x0061, 0x0060, 0x00E0, 0x0000) }, - { DEADTRANS(0x0065, 0x0060, 0x00E8, 0x0000) }, - { DEADTRANS(0x0069, 0x0060, 0x00EC, 0x0000) }, - { DEADTRANS(0x006F, 0x0060, 0x00F2, 0x0000) }, - { DEADTRANS(0x0075, 0x0060, 0x00F9, 0x0000) }, - { DEADTRANS(0x0020, 0x0060, 0x0060, 0x0000) }, - { DEADTRANS(0x006E, 0x007E, 0x00F1, 0x0000) }, - { DEADTRANS(0x0020, 0x007E, 0x007E, 0x0000) }, - { 0, 0, 0} + //*´* + { DEADTRANS(L'a', 0xb4, 0xe1, 0x00) }, // á + { DEADTRANS(L'A', 0xb4, 0xc1, 0x00) }, // Á + { DEADTRANS(L'e', 0xb4, 0xe9, 0x00) }, // é + { DEADTRANS(L'E', 0xb4, 0xc9, 0x00) }, // É + { DEADTRANS(L'i', 0xb4, 0xeD, 0x00) }, // í + { DEADTRANS(L'I', 0xb4, 0xcD, 0x00) }, // Í + { DEADTRANS(L'o', 0xb4, 0xf3, 0x00) }, // ó + { DEADTRANS(L'O', 0xb4, 0xd3, 0x00) }, // Ó + { DEADTRANS(L'u', 0xb4, 0xfa, 0x00) }, // ú + { DEADTRANS(L'U', 0xb4, 0xda, 0x00) }, // Ú + { DEADTRANS(L'y', 0xb4, 0xfd, 0x00) }, // ý + { DEADTRANS(L'Y', 0xb4, 0xdd, 0x00) }, // Ý + //*`* + { DEADTRANS(L'a', 0x60, 0xe0, 0x00) }, // à + { DEADTRANS(L'A', 0x60, 0xc0, 0x00) }, // À + { DEADTRANS(L'e', 0x60, 0xe8, 0x00) }, // è + { DEADTRANS(L'E', 0x60, 0xc8, 0x00) }, // È + { DEADTRANS(L'i', 0x60, 0xec, 0x00) }, // ì + { DEADTRANS(L'I', 0x60, 0xcc, 0x00) }, // Ì + { DEADTRANS(L'o', 0x60, 0xf2, 0x00) }, // ò + { DEADTRANS(L'O', 0x60, 0xd2, 0x00) }, // Ò + { DEADTRANS(L'u', 0x60, 0xf9, 0x00) }, // ù + { DEADTRANS(L'U', 0x60, 0xd9, 0x00) }, // Ù + //*^* + { DEADTRANS(L'a', 0x5e, 0xe2, 0x00) }, // â + { DEADTRANS(L'A', 0x5e, 0xd2, 0x00) }, // Â + { DEADTRANS(L'e', 0x5e, 0xea, 0x00) }, // ê + { DEADTRANS(L'E', 0x5e, 0xca, 0x00) }, // Ê + { DEADTRANS(L'i', 0x5e, 0xee, 0x00) }, // î + { DEADTRANS(L'I', 0x5e, 0xce, 0x00) }, // Î + { DEADTRANS(L'o', 0x5e, 0xf4, 0x00) }, // ô + { DEADTRANS(L'O', 0x5e, 0xd4, 0x00) }, // Ô + { DEADTRANS(L'u', 0x5e, 0xfb, 0x00) }, // û + { DEADTRANS(L'U', 0x5e, 0xdb, 0x00) }, // Û + //*¨* + { DEADTRANS(L'a', 0xa8, 0xe4, 0x00) }, // ä + { DEADTRANS(L'A', 0xa8, 0xc4, 0x00) }, // Ä + { DEADTRANS(L'e', 0xa8, 0xeb, 0x00) }, // ë + { DEADTRANS(L'E', 0xa8, 0xcb, 0x00) }, // Ë + { DEADTRANS(L'i', 0xa8, 0xef, 0x00) }, // ï + { DEADTRANS(L'I', 0xa8, 0xcf, 0x00) }, // Ï + { DEADTRANS(L'o', 0xa8, 0xf6, 0x00) }, // ö + { DEADTRANS(L'O', 0xa8, 0xd6, 0x00) }, // Ö + { DEADTRANS(L'u', 0xa8, 0xfc, 0x00) }, // ü + { DEADTRANS(L'U', 0xa8, 0xdc, 0x00) }, // Ü + { DEADTRANS(L'y', 0xa8, 0xff, 0x00) }, // ÿ + //*~* + { DEADTRANS(L'a', 0x7e, 0xe3, 0x00) }, // ã + { DEADTRANS(L'A', 0x7e, 0xc3, 0x00) }, // Ã + { DEADTRANS(L'n', 0x7e, 0xf1, 0x00) }, // ñ + { DEADTRANS(L'N', 0x7e, 0xd1, 0x00) }, // Ñ + { DEADTRANS(L'o', 0x7e, 0xf5, 0x00) }, // õ + { DEADTRANS(L'O', 0x7e, 0xd5, 0x00) }, // Õ + { 0, 0, 0} }; @@ -412,7 +461,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- English doesn't have any */ + /* Ligatures -- French doesn't have any */ 0, 0, NULL

1 0

[fireball] 26297: Tag ReactOS 0.3.1 release (2/2).
by fireball＠svn.reactos.org 09 Apr '07

09 Apr '07

Author: fireball Date: Mon Apr 9 17:55:17 2007 New Revision: 26297 URL: http://svn.reactos.org/svn/reactos?rev=26297&view=rev Log: Tag ReactOS 0.3.1 release (2/2). Added: tags/ReactOS-0.3.1/ - copied from r26296, tags/ros-branch-0_3_1/ Removed: tags/ros-branch-0_3_1/

1 0

[fireball] 26296: Tag 0.3.1 branch (1/2).
by fireball＠svn.reactos.org 09 Apr '07

09 Apr '07

Author: fireball Date: Mon Apr 9 17:53:11 2007 New Revision: 26296 URL: http://svn.reactos.org/svn/reactos?rev=26296&view=rev Log: Tag 0.3.1 branch (1/2). Added: tags/ros-branch-0_3_1/ - copied from r26295, branches/ros-branch-0_3_1/ Removed: branches/ros-branch-0_3_1/

1 0

[ekohl] 26295: Change keyboard settings on-the-fly to make the preview work properly.
by ekohl＠svn.reactos.org 09 Apr '07

09 Apr '07

Author: ekohl Date: Mon Apr 9 17:26:55 2007 New Revision: 26295 URL: http://svn.reactos.org/svn/reactos?rev=26295&view=rev Log: Change keyboard settings on-the-fly to make the preview work properly. Modified: trunk/reactos/dll/cpl/main/keyboard.c Modified: trunk/reactos/dll/cpl/main/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/keyboard.c?re… ============================================================================== --- trunk/reactos/dll/cpl/main/keyboard.c (original) +++ trunk/reactos/dll/cpl/main/keyboard.c Mon Apr 9 17:26:55 2007 @@ -39,7 +39,9 @@ typedef struct _SPEED_DATA { INT nKeyboardDelay; + INT nOrigKeyboardDelay; DWORD dwKeyboardSpeed; + DWORD dwOrigKeyboardSpeed; UINT uCaretBlinkTime; UINT uOrigCaretBlinkTime; BOOL fShowCursor; @@ -73,6 +75,8 @@ pSpeedData->nKeyboardDelay = 2; } + pSpeedData->nOrigKeyboardDelay = pSpeedData->nKeyboardDelay; + /* Get current keyboard delay */ if (!SystemParametersInfo(SPI_GETKEYBOARDSPEED, sizeof(DWORD), @@ -81,6 +85,8 @@ { pSpeedData->dwKeyboardSpeed = 31; } + + pSpeedData->dwOrigKeyboardSpeed = pSpeedData->dwKeyboardSpeed; pSpeedData->fShowCursor = TRUE; GetWindowRect(GetDlgItem(hwndDlg, IDC_TEXT_CURSOR_BLINK), &pSpeedData->rcCursor); @@ -117,11 +123,19 @@ case TB_BOTTOM: case TB_ENDTRACK: pSpeedData->nKeyboardDelay = 3 - (INT)SendDlgItemMessage(hwndDlg, IDC_SLIDER_REPEAT_DELAY, TBM_GETPOS, 0, 0); + SystemParametersInfo(SPI_SETKEYBOARDDELAY, + pSpeedData->nKeyboardDelay, + 0, + 0); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case TB_THUMBTRACK: pSpeedData->nKeyboardDelay = 3 - (INT)HIWORD(wParam); + SystemParametersInfo(SPI_SETKEYBOARDDELAY, + pSpeedData->nKeyboardDelay, + 0, + 0); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } @@ -138,11 +152,19 @@ case TB_BOTTOM: case TB_ENDTRACK: pSpeedData->dwKeyboardSpeed = (DWORD)SendDlgItemMessage(hwndDlg, IDC_SLIDER_REPEAT_RATE, TBM_GETPOS, 0, 0); + SystemParametersInfo(SPI_SETKEYBOARDSPEED, + pSpeedData->dwKeyboardSpeed, + 0, + 0); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case TB_THUMBTRACK: pSpeedData->dwKeyboardSpeed = (DWORD)HIWORD(wParam); + SystemParametersInfo(SPI_SETKEYBOARDSPEED, + pSpeedData->dwKeyboardSpeed, + 0, + 0); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } @@ -203,11 +225,11 @@ switch(lpnm->code) { case PSN_APPLY: + /* Set the new keyboard settings */ SystemParametersInfo(SPI_SETKEYBOARDDELAY, pSpeedData->nKeyboardDelay, 0, 0); - SystemParametersInfo(SPI_SETKEYBOARDSPEED, pSpeedData->dwKeyboardSpeed, 0, @@ -215,7 +237,16 @@ return TRUE; case PSN_RESET: + /* Restore the original settings */ SetCaretBlinkTime(pSpeedData->uOrigCaretBlinkTime); + SystemParametersInfo(SPI_SETKEYBOARDDELAY, + pSpeedData->nOrigKeyboardDelay, + 0, + 0); + SystemParametersInfo(SPI_SETKEYBOARDSPEED, + pSpeedData->dwOrigKeyboardSpeed, + 0, + 0); break; default:

1 0

[ion] 26294: - Call IRP_MN_START_DEVICE in a critical region, since NT drivers depend on this implementation detail (on NT, an ERESOURCE+CriticalRegion is always held when parsing a new device node, so all related IRP_MNs are actually received under a critical region. For now, I only made IRP_MN_START_DEVICE behave as such. i8042prt from the DDK depends on this behavior. - Cleaned up Fast Mutex Implementation. - Disabled a hard-coded bugcheck and instead disabled soem code.
by ion＠svn.reactos.org 09 Apr '07

09 Apr '07

Author: ion Date: Mon Apr 9 17:00:38 2007 New Revision: 26294 URL: http://svn.reactos.org/svn/reactos?rev=26294&view=rev Log: - Call IRP_MN_START_DEVICE in a critical region, since NT drivers depend on this implementation detail (on NT, an ERESOURCE+CriticalRegion is always held when parsing a new device node, so all related IRP_MNs are actually received under a critical region. For now, I only made IRP_MN_START_DEVICE behave as such. i8042prt from the DDK depends on this behavior. - Cleaned up Fast Mutex Implementation. - Disabled a hard-coded bugcheck and instead disabled soem code. Modified: trunk/reactos/ntoskrnl/ex/fmutex.c trunk/reactos/ntoskrnl/io/iomgr/error.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/ex/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fmutex.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fmutex.c (original) +++ trunk/reactos/ntoskrnl/ex/fmutex.c Mon Apr 9 17:00:38 2007 @@ -9,37 +9,32 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <internal/debug.h> - -VOID -FASTCALL -KiAcquireFastMutex(IN PFAST_MUTEX FastMutex); - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -VOID -FASTCALL -ExEnterCriticalRegionAndAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) +#define NDEBUG +#include <debug.h> + +VOID +FASTCALL +KiAcquireFastMutex( + IN PFAST_MUTEX FastMutex +); + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +FORCEINLINE +ExiAcquireFastMutexUnsafe(IN PFAST_MUTEX FastMutex) { PKTHREAD Thread = KeGetCurrentThread(); - /* Enter the Critical Region */ - KeEnterCriticalRegion(); - + DPRINT("Sanity print: %d %d %p\n", + KeGetCurrentIrql(), Thread->CombinedApcDisable, Thread->Teb); + + /* Sanity check */ ASSERT((KeGetCurrentIrql() == APC_LEVEL) || - (Thread == NULL) || (Thread->CombinedApcDisable != 0) || (Thread->Teb == NULL) || (Thread->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); - - ASSERT((KeGetCurrentIrql() == APC_LEVEL) || - (Thread == NULL) || - (Thread->CombinedApcDisable != 0)); - - ASSERT((Thread == NULL) || (FastMutex->Owner != Thread)); + ASSERT(FastMutex->Owner != Thread); /* Decrease the count */ if (InterlockedDecrement(&FastMutex->Count)) @@ -52,130 +47,16 @@ FastMutex->Owner = Thread; } -/* - * @implemented - */ -VOID -FASTCALL -ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(PFAST_MUTEX FastMutex) -{ - +VOID +FORCEINLINE +ExiReleaseFastMutexUnsafe(IN OUT PFAST_MUTEX FastMutex) +{ ASSERT((KeGetCurrentIrql() == APC_LEVEL) || - (KeGetCurrentThread() == NULL) || - (KeGetCurrentThread()->CombinedApcDisable != 0) || - (KeGetCurrentThread()->Teb == NULL) || - (KeGetCurrentThread()->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); - - - ASSERT((KeGetCurrentIrql() == APC_LEVEL) || - (KeGetCurrentThread() == NULL) || - (KeGetCurrentThread()->CombinedApcDisable != 0)); - ASSERT(FastMutex->Owner == KeGetCurrentThread()); - - /* Erase the owner */ - FastMutex->Owner = NULL; - - /* Increase the count */ - if (InterlockedIncrement(&FastMutex->Count) <= 0) - { - /* Someone was waiting for it, signal the waiter */ - KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); - } - - /* Leave the critical region */ - KeLeaveCriticalRegion(); -} - -/* - * @implemented - */ -VOID -FASTCALL -ExAcquireFastMutex(PFAST_MUTEX FastMutex) -{ - KIRQL OldIrql; - ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); - - /* Raise IRQL to APC */ - OldIrql = KfRaiseIrql(APC_LEVEL); - - /* Decrease the count */ - if (InterlockedDecrement(&FastMutex->Count)) - { - /* Someone is still holding it, use slow path */ - KiAcquireFastMutex(FastMutex); - } - - /* Set the owner and IRQL */ - FastMutex->Owner = KeGetCurrentThread(); - FastMutex->OldIrql = OldIrql; -} - -/* - * @implemented - */ -VOID -FASTCALL -ExReleaseFastMutex (PFAST_MUTEX FastMutex) -{ - KIRQL OldIrql; - ASSERT_IRQL(APC_LEVEL); - - /* Erase the owner */ - FastMutex->Owner = NULL; - OldIrql = FastMutex->OldIrql; - - /* Increase the count */ - if (InterlockedIncrement(&FastMutex->Count) <= 0) - { - /* Someone was waiting for it, signal the waiter */ - KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); - } - - /* Lower IRQL back */ - KfLowerIrql(OldIrql); -} - -/* - * @implemented - */ -VOID -FASTCALL -ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) -{ - PKTHREAD Thread = KeGetCurrentThread(); - ASSERT((KeGetCurrentIrql() == APC_LEVEL) || - (Thread == NULL) || - (Thread->CombinedApcDisable != 0) || - (Thread->Teb == NULL) || - (Thread->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); - ASSERT((Thread == NULL) || (FastMutex->Owner != Thread)); - - /* Decrease the count */ - if (InterlockedDecrement(&FastMutex->Count)) - { - /* Someone is still holding it, use slow path */ - KiAcquireFastMutex(FastMutex); - } - - /* Set the owner */ - FastMutex->Owner = Thread; -} - -/* - * @implemented - */ -VOID -FASTCALL -ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) -{ - ASSERT((KeGetCurrentIrql() == APC_LEVEL) || - (KeGetCurrentThread() == NULL) || (KeGetCurrentThread()->CombinedApcDisable != 0) || (KeGetCurrentThread()->Teb == NULL) || (KeGetCurrentThread()->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); ASSERT(FastMutex->Owner == KeGetCurrentThread()); - + /* Erase the owner */ FastMutex->Owner = NULL; @@ -183,8 +64,110 @@ if (InterlockedIncrement(&FastMutex->Count) <= 0) { /* Someone was waiting for it, signal the waiter */ + KeSetEventBoostPriority(&FastMutex->Gate, NULL); + } +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +FASTCALL +ExEnterCriticalRegionAndAcquireFastMutexUnsafe(IN OUT PFAST_MUTEX FastMutex) +{ + /* Enter the Critical Region */ + KeEnterCriticalRegion(); + + /* Acquire the mutex unsafely */ + ExiAcquireFastMutexUnsafe(FastMutex); +} + +/* + * @implemented + */ +VOID +FASTCALL +ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(IN OUT PFAST_MUTEX FastMutex) +{ + /* Release the mutex unsafely */ + ExiReleaseFastMutexUnsafe(FastMutex); + + /* Leave the critical region */ + KeLeaveCriticalRegion(); +} + +/* + * @implemented + */ +VOID +FASTCALL +ExAcquireFastMutex(IN OUT PFAST_MUTEX FastMutex) +{ + KIRQL OldIrql; + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + + /* Raise IRQL to APC */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Decrease the count */ + if (InterlockedDecrement(&FastMutex->Count) != 0) + { + /* Someone is still holding it, use slow path */ + KiAcquireFastMutex(FastMutex); + } + + /* Set the owner and IRQL */ + FastMutex->Owner = KeGetCurrentThread(); + FastMutex->OldIrql = OldIrql; +} + +/* + * @implemented + */ +VOID +FASTCALL +ExReleaseFastMutex(IN OUT PFAST_MUTEX FastMutex) +{ + KIRQL OldIrql; + ASSERT_IRQL(APC_LEVEL); + + /* Erase the owner */ + FastMutex->Owner = NULL; + OldIrql = FastMutex->OldIrql; + + /* Increase the count */ + if (InterlockedIncrement(&FastMutex->Count) <= 0) + { + /* Someone was waiting for it, signal the waiter */ KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); } + + /* Lower IRQL back */ + KfLowerIrql(OldIrql); +} + +/* + * @implemented + */ +VOID +FASTCALL +ExAcquireFastMutexUnsafe(IN OUT PFAST_MUTEX FastMutex) +{ + /* Acquire the mutex unsafely */ + ExiAcquireFastMutexUnsafe(FastMutex); +} + +/* + * @implemented + */ +VOID +FASTCALL +ExReleaseFastMutexUnsafe(IN OUT PFAST_MUTEX FastMutex) +{ + /* Release the mutex unsafely */ + ExiReleaseFastMutexUnsafe(FastMutex); } /* @@ -192,10 +175,10 @@ */ BOOLEAN FASTCALL -ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) +ExTryToAcquireFastMutex(IN OUT PFAST_MUTEX FastMutex) { KIRQL OldIrql; - ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); /* Raise to APC_LEVEL */ OldIrql = KfRaiseIrql(APC_LEVEL); Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c Mon Apr 9 17:00:38 2007 @@ -572,7 +572,6 @@ KIRQL Irql; /* Get the main header */ - KEBUGCHECK(0); LogEntry = (PERROR_LOG_ENTRY)((ULONG_PTR)ElEntry - sizeof(ERROR_LOG_ENTRY)); @@ -586,12 +585,14 @@ /* Check if the worker is runnign */ if (!IopLogWorkerRunning) { +#if 0 /* It's not, initialize it and queue it */ ExInitializeWorkItem(&IopErrorLogWorkItem, IopLogWorker, &IopErrorLogWorkItem); ExQueueWorkItem(&IopErrorLogWorkItem, DelayedWorkQueue); IopLogWorkerRunning = TRUE; +#endif } /* Release the lock and return */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Mon Apr 9 17:00:38 2007 @@ -141,11 +141,20 @@ Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated; + /* + * Windows NT Drivers receive IRP_MN_START_DEVICE in a critical region and + * actually _depend_ on this!. This is because NT will lock the Device Node + * with an ERESOURCE, which of course requires APCs to be disabled. + */ + KeEnterCriticalRegion(); + Status = IopInitiatePnpIrp( Fdo, &IoStatusBlock, IRP_MN_START_DEVICE, &Stack); + + KeLeaveCriticalRegion(); if (!NT_SUCCESS(Status)) {

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
38
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2007