Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[ros-arm-bringup] 41860: Fix a braindead bug that killed my system (512MB) since the loop goes on past 4096 pages if you have enough non paged pool... do you even test this?

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

Author: ros-arm-bringup Date: Sat Jul 11 13:36:18 2009 New Revision: 41860 URL: http://svn.reactos.org/svn/reactos?rev=41860&view=rev Log: Fix a braindead bug that killed my system (512MB) since the loop goes on past 4096 pages if you have enough non paged pool... do you even test this? Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Sat Jul 11 13:36:18 2009 @@ -726,6 +726,7 @@ { Buffers[i] = MiAllocatePoolPages(NonPagedPool, PAGE_SIZE); if (!Buffers[i]) break; + if (i == 4096) break; i++; }

15 years, 5 months

[ros-arm-bringup] 41859: - Implement a simple nonpaged pool page allocator and deallocator: - Not actually used yet! - No support for expansion nonpaged pool yet. - No major optimizations. - We simply do the sane thing of trying to combine the next free allocation with the one we're about to make, on free. - If possible, we'll also check if the previous allocation was a free block, and we'll merge ourselves (and in the best case, whoever is following us) into that block instead. - No debug check

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

Author: ros-arm-bringup Date: Sat Jul 11 10:46:39 2009 New Revision: 41859 URL: http://svn.reactos.org/svn/reactos?rev=41859&view=rev Log: - Implement a simple nonpaged pool page allocator and deallocator: - Not actually used yet! - No support for expansion nonpaged pool yet. - No major optimizations. - We simply do the sane thing of trying to combine the next free allocation with the one we're about to make, on free. - If possible, we'll also check if the previous allocation was a free block, and we'll merge ourselves (and in the best case, whoever is following us) into that block instead. - No debug checks/validation. - Write a couple lines of code to allocate and free up to 4096 pages (it will stop when it runs out). - This is to properly excercise this code on everyone's machines to make sure it works fine (it adds a little delay to booting, but only temporary). Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Sat Jul 11 10:46:39 2009 @@ -714,6 +714,26 @@ // Initialize the nonpaged pool // InitializePool(NonPagedPool, 0); + + // + // Do a little test of the nonpaged pool allocator + // + if (1) + { + ULONG i = 0; + PVOID Buffers[4096]; + while (TRUE) + { + Buffers[i] = MiAllocatePoolPages(NonPagedPool, PAGE_SIZE); + if (!Buffers[i]) break; + i++; + } + + while (i--) + { + MiFreePoolPages(Buffers[i]); + } + } } else { Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sat Jul 11 10:46:39 2009 @@ -125,4 +125,395 @@ NonPagedPoolExpansion); } +PVOID +NTAPI +MiAllocatePoolPages(IN POOL_TYPE PoolType, + IN SIZE_T SizeInBytes) +{ + PFN_NUMBER SizeInPages; + ULONG i; + KIRQL OldIrql; + PLIST_ENTRY NextEntry, NextHead, LastHead; + PMMPTE PointerPte; + PMMPFN Pfn1; + PVOID BaseVa; + PMMFREE_POOL_ENTRY FreeEntry; + + // + // Figure out how big the allocation is in pages + // + SizeInPages = BYTES_TO_PAGES(SizeInBytes); + + // + // Allocations of less than 4 pages go into their individual buckets + // + i = SizeInPages - 1; + if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; + + // + // Loop through all the free page lists based on the page index + // + NextHead = &MmNonPagedPoolFreeListHead[i]; + LastHead = &MmNonPagedPoolFreeListHead[MI_MAX_FREE_PAGE_LISTS]; + + // + // Acquire the nonpaged pool lock + // + OldIrql = KeAcquireQueuedSpinLock(LockQueueMmNonPagedPoolLock); + do + { + // + // Now loop through all the free page entries in this given list + // + NextEntry = NextHead->Flink; + while (NextEntry != NextHead) + { + // + // Grab the entry and see if it can handle our allocation + // + FreeEntry = CONTAINING_RECORD(NextEntry, MMFREE_POOL_ENTRY, List); + if (FreeEntry->Size >= SizeInPages) + { + // + // It does, so consume the pages from here + // + FreeEntry->Size -= SizeInPages; + + // + // The allocation will begin in this free page area + // + BaseVa = (PVOID)((ULONG_PTR)FreeEntry + + (FreeEntry->Size << PAGE_SHIFT)); + + // + // This is not a free page segment anymore + // + RemoveEntryList(&FreeEntry->List); + + // + // However, check if its' still got space left + // + if (FreeEntry->Size != 0) + { + // + // Insert it back into a different list, based on its pages + // + i = FreeEntry->Size - 1; + if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; + InsertTailList (&MmNonPagedPoolFreeListHead[i], + &FreeEntry->List); + } + + // + // Grab the PTE for this allocation + // + PointerPte = MiAddressToPte(BaseVa); + ASSERT(PointerPte->u.Hard.Valid == 1); + + // + // Grab the PFN NextEntry and index + // + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte)); + + // + // Now mark it as the beginning of an allocation + // + ASSERT(Pfn1->u3.e1.StartOfAllocation == 0); + Pfn1->u3.e1.StartOfAllocation = 1; + + // + // Check if the allocation is larger than one page + // + if (SizeInPages != 1) + { + // + // Navigate to the last PFN entry and PTE + // + PointerPte += SizeInPages - 1; + ASSERT(PointerPte->u.Hard.Valid == 1); + Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); + } + + // + // Mark this PFN as the last (might be the same as the first) + // + ASSERT(Pfn1->u3.e1.EndOfAllocation == 0); + Pfn1->u3.e1.EndOfAllocation = 1; + + // + // Release the nonpaged pool lock, and return the allocation + // + KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); + return BaseVa; + } + + // + // Try the next free page entry + // + NextEntry = FreeEntry->List.Flink; + } + } while (++NextHead < LastHead); + + // + // If we got here, we're out of space. + // Start by releasing the lock + // + KeReleaseQueuedSpinLock (LockQueueMmNonPagedPoolLock, OldIrql); + + // + // We should now go into expansion nonpaged pool + // + DPRINT1("Out of NP Pool\n"); + return NULL; +} + +ULONG +NTAPI +MiFreePoolPages(IN PVOID StartingVa) +{ + PMMPTE PointerPte, StartPte; + PMMPFN Pfn1, StartPfn; + PFN_NUMBER FreePages, NumberOfPages; + KIRQL OldIrql; + PMMFREE_POOL_ENTRY FreeEntry, NextEntry, LastEntry; + ULONG i; + + // + // Get the first PTE and its corresponding PFN entry + // + StartPte = PointerPte = MiAddressToPte(StartingVa); + StartPfn = Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); + + // + // Loop until we find the last PTE + // + while (Pfn1->u3.e1.EndOfAllocation == 0) + { + // + // Keep going + // + PointerPte++; + Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); + } + + // + // Now we know how many pages we have + // + NumberOfPages = PointerPte - StartPte + 1; + + // + // Acquire the nonpaged pool lock + // + OldIrql = KeAcquireQueuedSpinLock(LockQueueMmNonPagedPoolLock); + + // + // Mark the first and last PTEs as not part of an allocation anymore + // + StartPfn->u3.e1.StartOfAllocation = 0; + Pfn1->u3.e1.EndOfAllocation = 0; + + // + // Assume we will free as many pages as the allocation was + // + FreePages = NumberOfPages; + + // + // Peek one page past the end of the allocation + // + PointerPte++; + + // + // Guard against going past initial nonpaged pool + // + if (MiGetPfnEntryIndex(Pfn1) == MiEndOfInitialPoolFrame) + { + // + // This page is on the outskirts of initial nonpaged pool, so ignore it + // + DPRINT1("End of initial frame\n"); + Pfn1 = NULL; + } + else + { + // + // Otherwise, our entire allocation must've fit within the initial non + // paged pool, or the expansion nonpaged pool, so get the PFN entry of + // the next allocation + // + ASSERT((ULONG_PTR)StartingVa + NumberOfPages <= (ULONG_PTR)MmNonPagedPoolEnd); + if (PointerPte->u.Hard.Valid == 1) + { + // + // It's either expansion or initial: get the PFN entry + // + Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); + } + else + { + // + // This means we've reached the guard page that protects the end of + // the expansion nonpaged pool + // + Pfn1 = NULL; + } + + } + + // + // Check if this allocation actually exists + // + if ((Pfn1) && (Pfn1->u3.e1.StartOfAllocation == 0)) + { + // + // It doesn't, so we should actually locate a free entry descriptor + // + FreeEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)StartingVa + + (NumberOfPages << PAGE_SHIFT)); + ASSERT(FreeEntry->Owner == FreeEntry); + + // + // Consume this entry's pages, and remove it from its free list + // + FreePages += FreeEntry->Size; + RemoveEntryList (&FreeEntry->List); + } + + // + // Now get the official free entry we'll create for the caller's allocation + // + FreeEntry = StartingVa; + + // + // Check if the our allocation is the very first page + // + if (MiGetPfnEntryIndex(StartPfn) == MiStartOfInitialPoolFrame) + { + // + // Then we can't do anything or we'll risk underflowing + // + DPRINT1("Start of of initial frame\n"); + Pfn1 = NULL; + } + else + { + // + // Otherwise, get the PTE for the page right before our allocation + // + PointerPte -= NumberOfPages + 1; + if (PointerPte->u.Hard.Valid == 1) + { + // + // It's either expansion or initial nonpaged pool, get the PFN entry + // + Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); + } + else + { + // + // We must've reached the guard page, so don't risk touching it + // + Pfn1 = NULL; + } + } + + // + // Check if there is a valid PFN entry for the page before the allocation + // and then check if this page was actually the end of an allocation. + // If it wasn't, then we know for sure it's a free page + // + if ((Pfn1) && (Pfn1->u3.e1.EndOfAllocation == 0)) + { + // + // Get the free entry descriptor for that given page range + // + FreeEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)StartingVa - PAGE_SIZE); + FreeEntry = FreeEntry->Owner; + + // + // Check if the entry is small enough to be indexed on a free list + // If it is, we'll want to re-insert it, since we're about to + // collapse our pages on top of it, which will change its count + // + if (FreeEntry->Size < (MI_MAX_FREE_PAGE_LISTS - 1)) + { + // + // Remove the list from where it is now + // + RemoveEntryList(&FreeEntry->List); + + // + // Update its size + // + FreeEntry->Size += FreePages; + + // + // And now find the new appropriate list to place it in + // + i = (ULONG)(FreeEntry->Size - 1); + if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; + + // + // Do it + // + InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); + } + else + { + // + // Otherwise, just combine our free pages into this entry + // + FreeEntry->Size += FreePages; + } + } + + // + // Check if we were unable to do any compaction, and we'll stick with this + // + if (FreeEntry == StartingVa) + { + // + // Well, now we are a free entry. At worse we just have our newly freed + // pages, at best we have our pages plus whatever entry came after us + // + FreeEntry->Size = FreePages; + + // + // Find the appropriate list we should be on + // + i = FreeEntry->Size - 1; + if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; + + // + // And insert us + // + InsertTailList (&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); + } + + // + // Just a sanity check + // + ASSERT(FreePages != 0); + + // + // Get all the pages between our allocation and its end. These will all now + // become free page chunks. + // + NextEntry = StartingVa; + LastEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)NextEntry + (FreePages << PAGE_SHIFT)); + do + { + // + // Link back to the parent free entry, and keep going + // + NextEntry->Owner = FreeEntry; + NextEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)NextEntry + PAGE_SIZE); + } while (NextEntry != LastEntry); + + // + // We're done, release the lock and let the caller know how much we freed + // + KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); + return NumberOfPages; +} + /* EOF */

15 years, 5 months

[cgutman] 41858: - Initialize remote address to 0 if the caller didn't specify one

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jul 11 08:54:44 2009 New Revision: 41858 URL: http://svn.reactos.org/svn/reactos?rev=41858&view=rev Log: - Initialize remote address to 0 if the caller didn't specify one Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/d… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Sat Jul 11 08:54:44 2009 @@ -266,7 +266,8 @@ } else { - ReceiveRequest->RemotePort = 0; + ReceiveRequest->RemotePort = 0; + AddrInitIPv4(&ReceiveRequest->RemoteAddress, 0); } IoMarkIrpPending(Irp);

15 years, 5 months

[tkreuzer] 41857: Only call the drivers DrvRealizeBrush when called from BRUSHOBJ_pbGetRbrush. The driver might punt back to GDI and gdi might want to realize the brush although the surface is driver managed. Shuffle functions.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jul 11 05:19:39 2009 New Revision: 41857 URL: http://svn.reactos.org/svn/reactos?rev=41857&view=rev Log: Only call the drivers DrvRealizeBrush when called from BRUSHOBJ_pbGetRbrush. The driver might punt back to GDI and gdi might want to realize the brush although the surface is driver managed. Shuffle functions. Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/include/brush.h Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sat Jul 11 05:19:39 2009 @@ -13,6 +13,104 @@ #include <debug.h> /** Internal functions ********************************************************/ + +VOID +NTAPI +EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) +{ + ULONG iSolidColor; + XLATEOBJ *pxlo; + PSURFACE psurfTrg; + + ASSERT(pebo); + ASSERT(pbrush); + ASSERT(pdc); + + psurfTrg = pdc->dclevel.pSurface; + + pebo->psurfTrg = psurfTrg; + pebo->BrushObject.flColorType = 0; + pebo->pbrush = pbrush; + pebo->flattrs = pbrush->flAttrs; + pebo->crCurrentText = pdc->pdcattr->crForegroundClr; + pebo->crCurrentBack = pdc->pdcattr->crBackgroundClr; + pebo->BrushObject.pvRbrush = NULL; + pebo->pengbrush = NULL; + + if (pbrush->flAttrs & GDIBRUSH_IS_NULL) + { + pebo->BrushObject.iSolidColor = 0; + } + else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) + { + /* Set the RGB color */ + pebo->crRealize = pbrush->BrushAttr.lbColor; + pebo->ulRGBColor = pbrush->BrushAttr.lbColor; + + /* Translate the brush color to the target format */ + pxlo = IntCreateBrushXlate(pbrush, psurfTrg, pebo->crCurrentBack); + iSolidColor = XLATEOBJ_iXlate(pxlo, pbrush->BrushAttr.lbColor); + pebo->BrushObject.iSolidColor = iSolidColor; + if (pxlo) + EngDeleteXlate(pxlo); + } + else + { + /* This is a pattern brush that needs realization */ + pebo->BrushObject.iSolidColor = 0xFFFFFFFF; + } +} + +VOID +FASTCALL +EBRUSHOBJ_vSetSolidBrushColor(EBRUSHOBJ *pebo, COLORREF crColor, XLATEOBJ *pxlo) +{ + ULONG iSolidColor; + + /* Never use with non-solid brushes */ + ASSERT(pebo->flattrs & GDIBRUSH_IS_SOLID); + + /* Set the RGB color */ + pebo->crRealize = crColor; + pebo->ulRGBColor = crColor; + + /* Translate the brush color to the target format */ + iSolidColor = XLATEOBJ_iXlate(pxlo, crColor); + pebo->BrushObject.iSolidColor = iSolidColor; + + pebo->BrushObject.iSolidColor = iSolidColor; +} + +VOID +NTAPI +EBRUSHOBJ_vCleanup(EBRUSHOBJ *pebo) +{ + /* Check if there's a GDI realisation */ + if (pebo->pengbrush) + { + EngDeleteSurface(pebo->pengbrush); + pebo->pengbrush = NULL; + } + + /* Check if there's a driver's realisation */ + if (pebo->BrushObject.pvRbrush) + { + /* Free allocated driver memory */ + EngFreeMem(pebo->BrushObject.pvRbrush); + pebo->BrushObject.pvRbrush = NULL; + } +} + +VOID +NTAPI +EBRUSHOBJ_vUpdate(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) +{ + /* Cleanup the brush */ + EBRUSHOBJ_vCleanup(pebo); + + /* Reinitialize */ + EBRUSHOBJ_vInit(pebo, pbrush, pdc); +} /** * This function is not exported, because it makes no sense for @@ -70,76 +168,9 @@ return TRUE; } -VOID -NTAPI -EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) -{ - ULONG iSolidColor; - XLATEOBJ *pxlo; - PSURFACE psurfTrg; - - ASSERT(pebo); - ASSERT(pbrush); - ASSERT(pdc); - - psurfTrg = pdc->dclevel.pSurface; - - pebo->psurfTrg = psurfTrg; - pebo->BrushObject.flColorType = 0; - pebo->pbrush = pbrush; - pebo->flattrs = pbrush->flAttrs; - pebo->crCurrentText = pdc->pdcattr->crForegroundClr; - pebo->crCurrentBack = pdc->pdcattr->crBackgroundClr; - pebo->BrushObject.pvRbrush = NULL; - pebo->pengbrush = NULL; - - if (pbrush->flAttrs & GDIBRUSH_IS_NULL) - { - pebo->BrushObject.iSolidColor = 0; - } - else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) - { - /* Set the RGB color */ - pebo->crRealize = pbrush->BrushAttr.lbColor; - pebo->ulRGBColor = pbrush->BrushAttr.lbColor; - - /* Translate the brush color to the target format */ - pxlo = IntCreateBrushXlate(pbrush, psurfTrg, pebo->crCurrentBack); - iSolidColor = XLATEOBJ_iXlate(pxlo, pbrush->BrushAttr.lbColor); - pebo->BrushObject.iSolidColor = iSolidColor; - if (pxlo) - EngDeleteXlate(pxlo); - } - else - { - /* This is a pattern brush that needs realization */ - pebo->BrushObject.iSolidColor = 0xFFFFFFFF; - } -} - -VOID -FASTCALL -EBRUSHOBJ_vSetSolidBrushColor(EBRUSHOBJ *pebo, COLORREF crColor, XLATEOBJ *pxlo) -{ - ULONG iSolidColor; - - /* Never use with non-solid brushes */ - ASSERT(pebo->flattrs & GDIBRUSH_IS_SOLID); - - /* Set the RGB color */ - pebo->crRealize = crColor; - pebo->ulRGBColor = crColor; - - /* Translate the brush color to the target format */ - iSolidColor = XLATEOBJ_iXlate(pxlo, crColor); - pebo->BrushObject.iSolidColor = iSolidColor; - - pebo->BrushObject.iSolidColor = iSolidColor; -} - BOOL NTAPI -EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo) +EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo, BOOL bCallDriver) { BOOL bResult; PFN_DrvRealizeBrush pfnRealzizeBrush = NULL; @@ -155,7 +186,7 @@ } ppdev = (PPDEVOBJ)psurfTrg->SurfObj.hdev; // FIXME: all SURFACEs need a PDEV - if (ppdev) + if (ppdev && bCallDriver) pfnRealzizeBrush = ppdev->DriverFunctions.RealizeBrush; if (!pfnRealzizeBrush) { @@ -194,37 +225,6 @@ return bResult; } -VOID -NTAPI -EBRUSHOBJ_vCleanup(EBRUSHOBJ *pebo) -{ - /* Check if there's a GDI realisation */ - if (pebo->pengbrush) - { - EngDeleteSurface(pebo->pengbrush); - pebo->pengbrush = NULL; - } - - /* Check if there's a driver's realisation */ - if (pebo->BrushObject.pvRbrush) - { - /* Free allocated driver memory */ - EngFreeMem(pebo->BrushObject.pvRbrush); - pebo->BrushObject.pvRbrush = NULL; - } -} - -VOID -NTAPI -EBRUSHOBJ_vUpdate(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) -{ - /* Cleanup the brush */ - EBRUSHOBJ_vCleanup(pebo); - - /* Reinitialize */ - EBRUSHOBJ_vInit(pebo, pbrush, pdc); -} - PVOID NTAPI EBRUSHOBJ_pvGetEngBrush(EBRUSHOBJ *pebo) @@ -233,7 +233,7 @@ if (!pebo->pengbrush) { - bResult = EBRUSHOBJ_bRealizeBrush(pebo); + bResult = EBRUSHOBJ_bRealizeBrush(pebo, FALSE); if (!bResult) { if (pebo->pengbrush) @@ -272,7 +272,7 @@ if (!pbo->pvRbrush) { - bResult = EBRUSHOBJ_bRealizeBrush(pebo); + bResult = EBRUSHOBJ_bRealizeBrush(pebo, TRUE); if (!bResult) { if (pbo->pvRbrush) Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Sat Jul 11 05:19:39 2009 @@ -118,7 +118,7 @@ BOOL NTAPI -EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo); +EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo, BOOL bCallDriver); VOID NTAPI

15 years, 5 months

[tkreuzer] 41856: Fix cleanup in EBRUSHOBJ_vUpdate, that I commented out for testing purposes.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jul 11 05:05:05 2009 New Revision: 41856 URL: http://svn.reactos.org/svn/reactos?rev=41856&view=rev Log: Fix cleanup in EBRUSHOBJ_vUpdate, that I commented out for testing purposes. Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sat Jul 11 05:05:05 2009 @@ -219,7 +219,7 @@ EBRUSHOBJ_vUpdate(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) { /* Cleanup the brush */ -// EBRUSHOBJ_vCleanup(pebo); + EBRUSHOBJ_vCleanup(pebo); /* Reinitialize */ EBRUSHOBJ_vInit(pebo, pbrush, pdc);

15 years, 5 months

[tkreuzer] 41855: [win32k] Implement brush realization part 1 / 2 - Fix BRUSHOBJ_pvGetRbrush, it's supposed to provide a realization, when there is none. For this reason call ENRUSHOBJ_bRealizeBrush, that will call Eng/DrvRealizeBrush to create a realisation. The old implementation never did this and I wonder how 3rd party display drivers were expected to work correctly without this. - Implement EBRUSHOBJ_pvGetEngBrush working similar to BRUSHOBJ_pvGetRbrush, but providing the engbrush as GDI's

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jul 11 03:44:05 2009 New Revision: 41855 URL: http://svn.reactos.org/svn/reactos?rev=41855&view=rev Log: [win32k] Implement brush realization part 1 / 2 - Fix BRUSHOBJ_pvGetRbrush, it's supposed to provide a realization, when there is none. For this reason call ENRUSHOBJ_bRealizeBrush, that will call Eng/DrvRealizeBrush to create a realisation. The old implementation never did this and I wonder how 3rd party display drivers were expected to work correctly without this. - Implement EBRUSHOBJ_pvGetEngBrush working similar to BRUSHOBJ_pvGetRbrush, but providing the engbrush as GDI's realization. It's currently implemented as a handle to a translated pattern and not used anywhere yet. - Rename EBRUSHOBJ_vUnrealizeBrus to EBRUSHOBJ_vCleanup. This function now needs to be called to free the resources for a BRUSHOBJECT that GDI or a driver might have allocated. This is done in DC_Cleanup before deleting the DC and in EBRUSHOBJ_vUpdate before newly initializing it. - Get rid of the EBRUSHOBJ's XlateObject, instead for now create new XLATEOBJ's whenever needed. Don't worry these will be gone, as soon as we make use of the engbrush. - Pass a pointer to the DC to EBRUSHOBJ_vInit, as this allows us to save stuff like the back and fore color. - Fix a bitmap leak: CallDibStretchBlt returned before releasing the reference to the pattern surface. - Some FASTCALL -> NTAPI changes - tested with VBE, VMWare-Tools and VBox driver - I hope I didn't forget anything Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/inteng.h trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sat Jul 11 03:44:05 2009 @@ -50,6 +50,7 @@ PFN_DIB_GetPixel fnPattern_GetPixel = NULL; XLATEOBJ *XlateObj; ULONG Pattern = 0; + SURFACE *psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); if (psoMask == NULL) { @@ -78,7 +79,9 @@ fnDest_PutPixel = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_PutPixel; if (psurfPattern) { - XlateObj = pebo->XlateObject; + XlateObj = IntCreateBrushXlate(pebo->pbrush, + psurfDest, + pebo->crCurrentBack); PatternY = (prclDest->top - pptlBrush->y) % PatternHeight; if (PatternY < 0) { @@ -113,6 +116,9 @@ PatternY++; PatternY %= PatternHeight; } + + if (XlateObj) + EngDeleteXlate(XlateObj); } else { @@ -177,6 +183,8 @@ PEBRUSHOBJ GdiBrush = NULL; SURFACE *psurfPattern; BOOLEAN Result; + SURFACE *psurfDest = CONTAINING_RECORD(OutputObj, SURFACE, SurfObj); + XLATEOBJ *XlatePatternToDest = NULL; BltInfo.DestSurface = OutputObj; BltInfo.SourceSurface = InputObj; @@ -205,7 +213,10 @@ { /* FIXME - What to do here? */ } - BltInfo.XlatePatternToDest = GdiBrush->XlateObject; + XlatePatternToDest = IntCreateBrushXlate(GdiBrush->pbrush, + psurfDest, + GdiBrush->crCurrentBack); + BltInfo.XlatePatternToDest = XlatePatternToDest; } else { @@ -213,6 +224,9 @@ } Result = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBlt(&BltInfo); + + if (XlatePatternToDest) + EngDeleteXlate(XlatePatternToDest); /* Pattern brush */ if (psurfPattern != NULL) Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sat Jul 11 03:44:05 2009 @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Brush Functions @@ -34,8 +34,6 @@ RECTL rclDest; ULONG lWidth; - rclDest = (RECTL){0, 0, psoPattern->sizlBitmap.cx, psoPattern->sizlBitmap.cy}; - /* Calculate width in bytes of the realized brush */ lWidth = DIB_GetDIBWidthBytes(psoPattern->sizlBitmap.cx, BitsPerFormat(psoDst->iBitmapFormat)); @@ -60,6 +58,7 @@ } /* Copy the bits to the new format bitmap */ + rclDest = (RECTL){0, 0, psoPattern->sizlBitmap.cx, psoPattern->sizlBitmap.cy}; EngCopyBits(psoRealize, psoPattern, NULL, pxlo, &rclDest, &ptlSrc); /* Unlock the bitmap again */ @@ -72,13 +71,27 @@ } VOID -FASTCALL -EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, XLATEOBJ *pxlo) +NTAPI +EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) { ULONG iSolidColor; + XLATEOBJ *pxlo; + PSURFACE psurfTrg; ASSERT(pebo); ASSERT(pbrush); + ASSERT(pdc); + + psurfTrg = pdc->dclevel.pSurface; + + pebo->psurfTrg = psurfTrg; + pebo->BrushObject.flColorType = 0; + pebo->pbrush = pbrush; + pebo->flattrs = pbrush->flAttrs; + pebo->crCurrentText = pdc->pdcattr->crForegroundClr; + pebo->crCurrentBack = pdc->pdcattr->crBackgroundClr; + pebo->BrushObject.pvRbrush = NULL; + pebo->pengbrush = NULL; if (pbrush->flAttrs & GDIBRUSH_IS_NULL) { @@ -91,22 +104,17 @@ pebo->ulRGBColor = pbrush->BrushAttr.lbColor; /* Translate the brush color to the target format */ + pxlo = IntCreateBrushXlate(pbrush, psurfTrg, pebo->crCurrentBack); iSolidColor = XLATEOBJ_iXlate(pxlo, pbrush->BrushAttr.lbColor); pebo->BrushObject.iSolidColor = iSolidColor; + if (pxlo) + EngDeleteXlate(pxlo); } else { /* This is a pattern brush that needs realization */ pebo->BrushObject.iSolidColor = 0xFFFFFFFF; -// EBRUSHOBJ_bRealizeBrush(pebo); - } - -// pebo->psurfTrg = psurfTrg; - pebo->BrushObject.pvRbrush = pbrush->ulRealization; - pebo->BrushObject.flColorType = 0; - pebo->pbrush = pbrush; - pebo->flattrs = pbrush->flAttrs; - pebo->XlateObject = pxlo; + } } VOID @@ -130,39 +138,53 @@ } BOOL -FASTCALL +NTAPI EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo) { BOOL bResult; - PFN_DrvRealizeBrush pfnRealzizeBrush; + PFN_DrvRealizeBrush pfnRealzizeBrush = NULL; PSURFACE psurfTrg, psurfPattern, psurfMask; - PPDEVOBJ ppdev; + PPDEVOBJ ppdev = NULL; XLATEOBJ *pxlo; psurfTrg = pebo->psurfTrg; // FIXME: all EBRUSHOBJs need a surface + if (!psurfTrg) + { + DPRINT1("Pattern brush has no target surface!\n"); + return FALSE; + } + ppdev = (PPDEVOBJ)psurfTrg->SurfObj.hdev; // FIXME: all SURFACEs need a PDEV - - pfnRealzizeBrush = NULL;//ppdev->DriverFunctions.RealizeBrush; + if (ppdev) + pfnRealzizeBrush = ppdev->DriverFunctions.RealizeBrush; if (!pfnRealzizeBrush) { pfnRealzizeBrush = EngRealizeBrush; } psurfPattern = SURFACE_LockSurface(pebo->pbrush->hbmPattern); + if (!psurfPattern) + { + DPRINT1("No pattern, nothing to realize!\n"); + return FALSE; + } /* FIXME: implement mask */ psurfMask = NULL; - // FIXME - pxlo = NULL; - - bResult = pfnRealzizeBrush(&pebo->BrushObject, + /* Create xlateobj for the brush */ + pxlo = IntCreateBrushXlate(pebo->pbrush, psurfTrg, pebo->crCurrentBack); + + /* Perform the realization */ + bResult = pfnRealzizeBrush(&pebo->BrushObject, &pebo->psurfTrg->SurfObj, - psurfPattern ? &psurfPattern->SurfObj : NULL, + &psurfPattern->SurfObj, psurfMask ? &psurfMask->SurfObj : NULL, pxlo, -1); // FIXME: what about hatch brushes? + EngDeleteXlate(pxlo); + if (psurfPattern) SURFACE_UnlockSurface(psurfPattern); @@ -173,33 +195,55 @@ } VOID -FASTCALL -EBRUSHOBJ_vUnrealizeBrush(EBRUSHOBJ *pebo) -{ - /* Check if it's a GDI realisation */ +NTAPI +EBRUSHOBJ_vCleanup(EBRUSHOBJ *pebo) +{ + /* Check if there's a GDI realisation */ if (pebo->pengbrush) { EngDeleteSurface(pebo->pengbrush); - } - else if (pebo->BrushObject.pvRbrush) + pebo->pengbrush = NULL; + } + + /* Check if there's a driver's realisation */ + if (pebo->BrushObject.pvRbrush) { /* Free allocated driver memory */ EngFreeMem(pebo->BrushObject.pvRbrush); - } -} - - - -VOID -FASTCALL -EBRUSHOBJ_vUpdate(EBRUSHOBJ *pebo, PBRUSH pbrush, XLATEOBJ *pxlo) -{ - /* Unrealize the brush */ - EBRUSHOBJ_vUnrealizeBrush(pebo); - - EBRUSHOBJ_vInit(pebo, pbrush, pxlo); -} - + pebo->BrushObject.pvRbrush = NULL; + } +} + +VOID +NTAPI +EBRUSHOBJ_vUpdate(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) +{ + /* Cleanup the brush */ +// EBRUSHOBJ_vCleanup(pebo); + + /* Reinitialize */ + EBRUSHOBJ_vInit(pebo, pbrush, pdc); +} + +PVOID +NTAPI +EBRUSHOBJ_pvGetEngBrush(EBRUSHOBJ *pebo) +{ + BOOL bResult; + + if (!pebo->pengbrush) + { + bResult = EBRUSHOBJ_bRealizeBrush(pebo); + if (!bResult) + { + if (pebo->pengbrush) + EngDeleteSurface(pebo->pengbrush); + pebo->pengbrush = NULL; + } + } + + return pebo->pengbrush; +} /** Exported DDI functions ****************************************************/ @@ -223,7 +267,20 @@ BRUSHOBJ_pvGetRbrush( IN BRUSHOBJ *pbo) { - // FIXME: this is wrong! Read msdn. + EBRUSHOBJ *pebo = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); + BOOL bResult; + + if (!pbo->pvRbrush) + { + bResult = EBRUSHOBJ_bRealizeBrush(pebo); + if (!bResult) + { + if (pbo->pvRbrush) + EngFreeMem(pbo->pvRbrush); + pbo->pvRbrush = NULL; + } + } + return pbo->pvRbrush; } Modified: trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] Sat Jul 11 03:44:05 2009 @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI stretch blt functions @@ -39,6 +39,8 @@ PEBRUSHOBJ GdiBrush = NULL; SURFOBJ* PatternSurface = NULL; XLATEOBJ* XlatePatternToDest = NULL; + BOOL bResult; + SURFACE *psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); if (BrushOrigin == NULL) { @@ -62,23 +64,32 @@ { /* FIXME - What to do here? */ } - XlatePatternToDest = GdiBrush->XlateObject; + XlatePatternToDest = IntCreateBrushXlate(GdiBrush->pbrush, + psurfDest, + GdiBrush->crCurrentBack); } else { psurfPattern = NULL; } - return DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_StretchBlt( - psoDest, psoSource, Mask, PatternSurface, - OutputRect, InputRect, MaskOrigin, pbo, &RealBrushOrigin, + bResult = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_StretchBlt( + psoDest, psoSource, Mask, PatternSurface, + OutputRect, InputRect, MaskOrigin, pbo, &RealBrushOrigin, ColorTranslation, XlatePatternToDest, Rop4); + + if (XlatePatternToDest) + { + EngDeleteXlate(XlatePatternToDest); + } /* Pattern brush */ if (psurfPattern) { SURFACE_UnlockSurface(psurfPattern); } + + return bResult; } Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Sat Jul 11 03:44:05 2009 @@ -689,13 +689,11 @@ // HACK! XLATEOBJ* -IntCreateBrushXlate(PDC pdc, BRUSH *pbrush) -{ - SURFACE * psurf; +IntCreateBrushXlate(BRUSH *pbrush, SURFACE * psurf, COLORREF crBackgroundClr) +{ XLATEOBJ *pxlo = NULL; HPALETTE hPalette = NULL; - psurf = pdc->dclevel.pSurface; if (psurf) { hPalette = psurf->hDIBPalette; @@ -719,10 +717,9 @@ /* Special case: 1bpp pattern */ if (psurfPattern->SurfObj.iBitmapFormat == BMF_1BPP) { - if (pdc->rosdc.bitsPerPixel != 1) - pxlo = IntEngCreateSrcMonoXlate(hPalette, - pdc->pdcattr->crBackgroundClr, - pbrush->BrushAttr.lbColor); + pxlo = IntEngCreateSrcMonoXlate(hPalette, + crBackgroundClr, + pbrush->BrushAttr.lbColor); } else if (pbrush->flAttrs & GDIBRUSH_IS_DIB) { Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Sat Jul 11 03:44:05 2009 @@ -67,9 +67,6 @@ DWORD ulUnique; // DWORD dwUnknown54; // DWORD dwUnknown58; - - /* Ros specific */ - XLATEOBJ *XlateObject; } EBRUSHOBJ, *PEBRUSHOBJ; /* GDI Brush Attributes */ @@ -105,19 +102,26 @@ INT FASTCALL BRUSH_GetObject (PBRUSH GdiObject, INT Count, LPLOGBRUSH Buffer); BOOL INTERNAL_CALL BRUSH_Cleanup(PVOID ObjectBody); -VOID FASTCALL -EBRUSHOBJ_vInit(EBRUSHOBJ *BrushInst, PBRUSH BrushObj, XLATEOBJ *XlateObj); +struct _DC; + +VOID +NTAPI +EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, struct _DC *); VOID FASTCALL EBRUSHOBJ_vSetSolidBrushColor(EBRUSHOBJ *pebo, COLORREF crColor, XLATEOBJ *pxlo); VOID -FASTCALL -EBRUSHOBJ_vUpdate(EBRUSHOBJ *pebo, PBRUSH pbrush, XLATEOBJ *pxlo); +NTAPI +EBRUSHOBJ_vUpdate(EBRUSHOBJ *pebo, PBRUSH pbrush, struct _DC *pdc); BOOL -FASTCALL +NTAPI EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo); +VOID +NTAPI +EBRUSHOBJ_vCleanup(EBRUSHOBJ *pebo); + #endif Modified: trunk/reactos/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] Sat Jul 11 03:44:05 2009 @@ -110,7 +110,7 @@ ULONG Color1); XLATEOBJ* -IntCreateBrushXlate(PDC pdc, BRUSH *pbrush); +IntCreateBrushXlate(BRUSH *pbrush, SURFACE * psurf, COLORREF crBackgroundClr); HPALETTE FASTCALL IntEngGetXlatePalette(XLATEOBJ *XlateObj, Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sat Jul 11 03:44:05 2009 @@ -941,7 +941,6 @@ EBRUSHOBJ eboFill; POINTL BrushOrigin; BOOL ret; - XLATEOBJ *pxlo; ASSERT(pbrush); @@ -989,8 +988,7 @@ BrushOrigin.x = pbrush->ptOrigin.x + pdc->ptlDCOrig.x; BrushOrigin.y = pbrush->ptOrigin.y + pdc->ptlDCOrig.y; - pxlo = IntCreateBrushXlate(pdc, pbrush); - EBRUSHOBJ_vInit(&eboFill, pbrush, pxlo); + EBRUSHOBJ_vInit(&eboFill, pbrush, pdc); ret = IntEngBitBlt( &psurf->SurfObj, @@ -1005,7 +1003,7 @@ &BrushOrigin, ROP3_TO_ROP4(dwRop)); - EngDeleteXlate(pxlo); + EBRUSHOBJ_vCleanup(&eboFill); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat Jul 11 03:44:05 2009 @@ -100,21 +100,21 @@ /* Create the default fill brush */ pdcattr->hbrush = NtGdiGetStockObject(WHITE_BRUSH); NewDC->dclevel.pbrFill = BRUSH_ShareLockBrush(pdcattr->hbrush); - EBRUSHOBJ_vInit(&NewDC->eboFill, NewDC->dclevel.pbrFill, NULL); + EBRUSHOBJ_vInit(&NewDC->eboFill, NewDC->dclevel.pbrFill, NewDC); /* Create the default pen / line brush */ pdcattr->hpen = NtGdiGetStockObject(BLACK_PEN); NewDC->dclevel.pbrLine = PEN_ShareLockPen(pdcattr->hpen); - EBRUSHOBJ_vInit(&NewDC->eboLine, NewDC->dclevel.pbrLine, NULL); + EBRUSHOBJ_vInit(&NewDC->eboLine, NewDC->dclevel.pbrLine, NewDC); /* Create the default text brush */ pbrush = BRUSH_ShareLockBrush(NtGdiGetStockObject(BLACK_BRUSH)); - EBRUSHOBJ_vInit(&NewDC->eboText, pbrush, NULL); + EBRUSHOBJ_vInit(&NewDC->eboText, pbrush, NewDC); pdcattr->ulDirty_ |= DIRTY_TEXT; /* Create the default background brush */ pbrush = BRUSH_ShareLockBrush(NtGdiGetStockObject(WHITE_BRUSH)); - EBRUSHOBJ_vInit(&NewDC->eboBackground, pbrush, NULL); + EBRUSHOBJ_vInit(&NewDC->eboBackground, pbrush, NewDC); pdcattr->hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); TextIntRealizeFont(pdcattr->hlfntNew,NULL); @@ -161,6 +161,12 @@ /* Dereference default brushes */ BRUSH_ShareUnlockBrush(pDC->eboText.pbrush); BRUSH_ShareUnlockBrush(pDC->eboBackground.pbrush); + + /* Cleanup the dc brushes */ + EBRUSHOBJ_vCleanup(&pDC->eboFill); + EBRUSHOBJ_vCleanup(&pDC->eboLine); + EBRUSHOBJ_vCleanup(&pDC->eboText); + EBRUSHOBJ_vCleanup(&pDC->eboBackground); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Sat Jul 11 03:44:05 2009 @@ -41,7 +41,9 @@ } /* ROS HACK, should use surf xlate */ - pxlo = IntCreateBrushXlate(pdc, pdc->dclevel.pbrFill); + pxlo = IntCreateBrushXlate(pdc->dclevel.pbrFill, + pdc->dclevel.pSurface, + pdc->pdcattr->crBackgroundClr); /* Check if the EBRUSHOBJ needs update */ if (pdcattr->ulDirty_ & DIRTY_FILL) @@ -49,7 +51,7 @@ pbrFill = pdc->dclevel.pbrFill; /* Update eboFill, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pxlo); + EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pdc); } /* Check for DC brush */ @@ -95,7 +97,9 @@ } /* ROS HACK, should use surf xlate */ - pxlo = IntCreateBrushXlate(pdc, pdc->dclevel.pbrFill); + pxlo = IntCreateBrushXlate(pdc->dclevel.pbrFill, + pdc->dclevel.pSurface, + pdc->pdcattr->crBackgroundClr); /* Check if the EBRUSHOBJ needs update */ if (pdcattr->ulDirty_ & DIRTY_LINE) @@ -103,7 +107,7 @@ pbrLine = pdc->dclevel.pbrLine; /* Update eboLine, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pxlo); + EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pdc); } /* Check for DC pen */ @@ -177,8 +181,8 @@ pdcattr->ulDirty_ &= ~DIRTY_BACKGROUND; } -HPALETTE -FASTCALL +HPALETTE +FASTCALL GdiSelectPalette( HDC hDC, HPALETTE hpal, @@ -331,7 +335,7 @@ // If Info DC this is zero and pSurface is moved to DC->pSurfInfo. psurfBmp->hDC = hDC; - // if we're working with a DIB, get the palette + // if we're working with a DIB, get the palette // [fixme: only create if the selected palette is null] if (psurfBmp->hSecure) {

15 years, 5 months

[sginsberg] 41854: - Don't link portcls and kmixer to the static version rtl -- those routines are exported by ntoskrnl (and all imports were resolved there anyway).

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Jul 11 03:13:13 2009 New Revision: 41854 URL: http://svn.reactos.org/svn/reactos?rev=41854&view=rev Log: - Don't link portcls and kmixer to the static version rtl -- those routines are exported by ntoskrnl (and all imports were resolved there anyway). Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.rbuild Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Sat Jul 11 03:13:13 2009 @@ -8,7 +8,6 @@ <library>ntoskrnl</library> <library>ks</library> <library>drmk</library> - <library>rtl</library> <library>hal</library> <library>libcntpr</library> <file>adapter.c</file> Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.rbuild [iso-8859-1] Sat Jul 11 03:13:13 2009 @@ -5,7 +5,6 @@ <include base="libsamplerate">.</include> <library>ntoskrnl</library> <library>ks</library> - <library>rtl</library> <library>hal</library> <library>libcntpr</library> <library>libsamplerate</library>

15 years, 5 months

[jmorlan] 41853: Rearrange some code in cmd parser, avoiding excessive stack space usage (Bug 4536)

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sat Jul 11 02:33:18 2009 New Revision: 41853 URL: http://svn.reactos.org/svn/reactos?rev=41853&view=rev Log: Rearrange some code in cmd parser, avoiding excessive stack space usage (Bug 4536) Modified: trunk/reactos/base/shell/cmd/parser.c Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Sat Jul 11 02:33:18 2009 @@ -528,78 +528,14 @@ return NULL; } -static PARSED_COMMAND *ParseCommandPart(void) +static DECLSPEC_NOINLINE PARSED_COMMAND *ParseCommandPart(REDIRECTION *RedirList) { TCHAR ParsedLine[CMDLINE_LENGTH]; - TCHAR *Pos; - DWORD TailOffset; PARSED_COMMAND *Cmd; PARSED_COMMAND *(*Func)(void); - REDIRECTION *RedirList = NULL; - int Type; - - while (IsSeparator(CurChar)) - { - if (CurChar == _T('\n')) - return NULL; - ParseChar(); - } - - if (!CurChar) - return NULL; - - if (CurChar == _T(':')) - { - /* "Ignore" the rest of the line. - * (Line continuations will still be parsed, though.) */ - while (ParseToken(0, NULL) != TOK_END) - ; - return NULL; - } - - if (CurChar == _T('@')) - { - ParseChar(); - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); - Cmd->Type = C_QUIET; - Cmd->Next = NULL; - /* @ acts like a unary operator with low precedence, - * so call the top-level parser */ - Cmd->Subcommands = ParseCommandOp(C_OP_LOWEST); - Cmd->Redirections = NULL; - return Cmd; - } - - /* Get the head of the command */ - while (1) - { - Type = ParseToken(_T('('), STANDARD_SEPS); - if (Type == TOK_NORMAL) - { - Pos = _stpcpy(ParsedLine, CurrentToken) + 1; - break; - } - else if (Type == TOK_REDIRECTION) - { - if (!ParseRedirection(&RedirList)) - return NULL; - } - else if (Type == TOK_BEGIN_BLOCK) - { - return ParseBlock(RedirList); - } - else if (Type == TOK_END_BLOCK && !RedirList) - { - return NULL; - } - else - { - ParseError(); - FreeRedirection(RedirList); - return NULL; - } - } - TailOffset = Pos - ParsedLine; + + TCHAR *Pos = _stpcpy(ParsedLine, CurrentToken) + 1; + DWORD TailOffset = Pos - ParsedLine; /* Check for special forms */ if ((Func = ParseFor, _tcsicmp(ParsedLine, _T("for")) == 0) || @@ -624,7 +560,7 @@ /* Now get the tail */ while (1) { - Type = ParseToken(0, NULL); + int Type = ParseToken(0, NULL); if (Type == TOK_NORMAL) { if (Pos + _tcslen(CurrentToken) >= &ParsedLine[CMDLINE_LENGTH]) @@ -657,12 +593,68 @@ return Cmd; } +static PARSED_COMMAND *ParsePrimary(void) +{ + REDIRECTION *RedirList = NULL; + int Type; + + while (IsSeparator(CurChar)) + { + if (CurChar == _T('\n')) + return NULL; + ParseChar(); + } + + if (!CurChar) + return NULL; + + if (CurChar == _T(':')) + { + /* "Ignore" the rest of the line. + * (Line continuations will still be parsed, though.) */ + while (ParseToken(0, NULL) != TOK_END) + ; + return NULL; + } + + if (CurChar == _T('@')) + { + ParseChar(); + PARSED_COMMAND *Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd->Type = C_QUIET; + Cmd->Next = NULL; + /* @ acts like a unary operator with low precedence, + * so call the top-level parser */ + Cmd->Subcommands = ParseCommandOp(C_OP_LOWEST); + Cmd->Redirections = NULL; + return Cmd; + } + + /* Process leading redirections and get the head of the command */ + while ((Type = ParseToken(_T('('), STANDARD_SEPS)) == TOK_REDIRECTION) + { + if (!ParseRedirection(&RedirList)) + return NULL; + } + + if (Type == TOK_NORMAL) + return ParseCommandPart(RedirList); + else if (Type == TOK_BEGIN_BLOCK) + return ParseBlock(RedirList); + else if (Type == TOK_END_BLOCK && !RedirList) + return NULL; + + ParseError(); + FreeRedirection(RedirList); + return NULL; +} + static PARSED_COMMAND *ParseCommandOp(int OpType) { PARSED_COMMAND *Cmd, *Left, *Right; if (OpType == C_OP_HIGHEST) - Cmd = ParseCommandPart(); + Cmd = ParsePrimary(); else Cmd = ParseCommandOp(OpType + 1);

15 years, 5 months

[cgutman] 41852: - Fix more global variable abuse - Fix some inaccurate cur_time values

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jul 11 01:32:02 2009 New Revision: 41852 URL: http://svn.reactos.org/svn/reactos?rev=41852&view=rev Log: - Fix more global variable abuse - Fix some inaccurate cur_time values Modified: trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/base/services/dhcp/dispatch.c trunk/reactos/base/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Sat Jul 11 01:32:02 2009 @@ -72,8 +72,6 @@ #define domainchar(c) ((c) > 0x20 && (c) < 0x7f) unsigned long debug_trace_level = 0; /* DEBUG_ULTRA */ -time_t cur_time; -time_t default_lease_time = 43200; /* 12 hours... */ char *path_dhclient_conf = _PATH_DHCLIENT_CONF; char *path_dhclient_db = NULL; @@ -85,7 +83,6 @@ struct iaddr iaddr_broadcast = { 4, { 255, 255, 255, 255 } }; struct in_addr inaddr_any; struct sockaddr_in sockaddr_broadcast; -unsigned long old_default_route = 0; /* * ASSERT_STATE() does nothing now; it used to be @@ -139,7 +136,6 @@ PipeInit(); tzset(); - time(&cur_time); memset(&sockaddr_broadcast, 0, sizeof(sockaddr_broadcast)); sockaddr_broadcast.sin_family = AF_INET; @@ -249,7 +245,7 @@ flags. */ make_request(ip, ip->client->active); ip->client->destination = iaddr_broadcast; - ip->client->first_sending = cur_time; + time(&ip->client->first_sending); ip->client->interval = ip->client->config->initial_interval; /* Zap the medium list... */ @@ -276,7 +272,7 @@ ip->client->xid = ip->client->packet.xid; ip->client->destination = iaddr_broadcast; ip->client->state = S_SELECTING; - ip->client->first_sending = cur_time; + time(&ip->client->first_sending); ip->client->interval = ip->client->config->initial_interval; /* Add an immediate timeout to cause the first DHCPDISCOVER packet @@ -293,8 +289,11 @@ { struct interface_info *ip = ipp; struct client_lease *lp, *next, *picked; + time_t cur_time; ASSERT_STATE(state, S_SELECTING); + + time(&cur_time); /* Cancel state_selecting and send_discover timeouts, since either one could have got us here. */ @@ -371,6 +370,9 @@ { struct interface_info *ip = packet->interface; struct client_lease *lease; + time_t cur_time; + + time(&cur_time); /* If we're not receptive to an offer right now, or if the offer has an unrecognizable transaction id, then just drop it. */ @@ -404,7 +406,7 @@ ip->client->new->expiry = getULong( ip->client->new->options[DHO_DHCP_LEASE_TIME].data); else - ip->client->new->expiry = default_lease_time; + ip->client->new->expiry = DHCP_DEFAULT_LEASE_TIME; /* A number that looks negative here is really just very large, because the lease expiry offset is unsigned. */ if (ip->client->new->expiry < 0) @@ -539,28 +541,24 @@ } if( new_lease->options[DHO_ROUTERS].len ) { - MIB_IPFORWARDROW RouterMib; NTSTATUS Status; - RouterMib.dwForwardDest = 0; /* Default route */ - RouterMib.dwForwardMask = 0; - RouterMib.dwForwardMetric1 = 1; - - if( old_default_route ) { + Adapter->RouterMib.dwForwardDest = 0; /* Default route */ + Adapter->RouterMib.dwForwardMask = 0; + Adapter->RouterMib.dwForwardMetric1 = 1; + + if( Adapter->RouterMib.dwForwardNextHop ) { /* If we set a default route before, delete it before continuing */ - RouterMib.dwForwardDest = old_default_route; - DeleteIpForwardEntry( &RouterMib ); + DeleteIpForwardEntry( &Adapter->RouterMib ); } - RouterMib.dwForwardNextHop = + Adapter->RouterMib.dwForwardNextHop = *((ULONG*)new_lease->options[DHO_ROUTERS].data); - Status = CreateIpForwardEntry( &RouterMib ); + Status = CreateIpForwardEntry( &Adapter->RouterMib ); if( !NT_SUCCESS(Status) ) warning("CreateIpForwardEntry: %lx\n", Status); - else - old_default_route = RouterMib.dwForwardNextHop; if (hkey) { Buffer[0] = '\0'; @@ -585,6 +583,9 @@ { PDHCP_ADAPTER Adapter; struct client_lease *new_lease = ip->client->new; + time_t cur_time; + + time(&cur_time); /* Remember the medium. */ ip->client->new->medium = ip->client->medium; @@ -638,7 +639,7 @@ } else ip->client->destination = iaddr_broadcast; - ip->client->first_sending = cur_time; + time(&ip->client->first_sending); ip->client->interval = ip->client->config->initial_interval; ip->client->state = S_RENEWING; @@ -711,6 +712,9 @@ int arp_timeout_needed = 0, stop_selecting; char *name = packet->options[DHO_DHCP_MESSAGE_TYPE].len ? "DHCPOFFER" : "BOOTREPLY"; + time_t cur_time; + + time(&cur_time); /* If we're not receptive to an offer right now, or if the offer has an unrecognizable transaction id, then just drop it. */ @@ -949,8 +953,11 @@ { struct interface_info *ip = ipp; int interval, increase = 1; + time_t cur_time; DH_DbgPrint(MID_TRACE,("Doing discover on interface %p\n",ip)); + + time(&cur_time); /* Figure out how long it's been since we started transmitting. */ interval = cur_time - ip->client->first_sending; @@ -1053,8 +1060,11 @@ struct interface_info *ip = ipp; struct client_lease *loop = ip->client->active; struct client_lease *lp; + time_t cur_time; note("No DHCPOFFERS received."); + + time(&cur_time); /* We may not have an active lease, but we may have some predefined leases that we can try. */ @@ -1140,6 +1150,9 @@ struct sockaddr_in destination; struct in_addr from; int interval; + time_t cur_time; + + time(&cur_time); /* Figure out how long it's been since we started transmitting. */ interval = cur_time - ip->client->first_sending; Modified: trunk/reactos/base/services/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dispatc… ============================================================================== --- trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Sat Jul 11 01:32:02 2009 @@ -96,7 +96,7 @@ int count, i, to_msec, nfds = 0; struct protocol *l; fd_set fds; - time_t howlong; + time_t howlong, cur_time; struct timeval timeval; ApiLock(); @@ -112,6 +112,8 @@ * a timeout registered, time out the select call then. */ another: + time(&cur_time); + if (timeouts) { struct timeout *t; @@ -183,16 +185,12 @@ /* Not likely to be transitory... */ if (count == SOCKET_ERROR) { if (errno == EAGAIN || errno == EINTR) { - time(&cur_time); continue; } else { error("poll: %s", strerror(errno)); break; } } - - /* Get the current time... */ - time(&cur_time); i = 0; for (l = protocols; l; l = l->next) { Modified: trunk/reactos/base/services/dhcp/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] Sat Jul 11 01:32:02 2009 @@ -25,6 +25,7 @@ #define DHCP_REBOOT_TIMEOUT 300 #define DHCP_PANIC_TIMEOUT DHCP_REBOOT_TIMEOUT * 3 #define DHCP_BACKOFF_MAX 300 +#define DHCP_DEFAULT_LEASE_TIME 43200 /* 12 hours */ #define _PATH_DHCLIENT_PID "\\systemroot\\system32\\drivers\\etc\\dhclient.pid" typedef void *VOIDPTR; @@ -54,6 +55,7 @@ typedef struct _DHCP_ADAPTER { LIST_ENTRY ListEntry; MIB_IFROW IfMib; + MIB_IPFORWARDROW RouterMib; MIB_IPADDRROW IfAddr; SOCKADDR Address; ULONG NteContext,NteInstance;

15 years, 5 months

[bfreisen] 41851: - During resizing the future size is shown in the status bar - Rubber works as color replacer when used with right mouse button (mouse handling code reorganized) - Bug occuring when painting to neg. coordinates finally fixed - Polygon-tool added - Bezier-tool added

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Fri Jul 10 22:21:27 2009 New Revision: 41851 URL: http://svn.reactos.org/svn/reactos?rev=41851&view=rev Log: - During resizing the future size is shown in the status bar - Rubber works as color replacer when used with right mouse button (mouse handling code reorganized) - Bug occuring when painting to neg. coordinates finally fixed - Polygon-tool added - Bezier-tool added Modified: trunk/reactos/base/applications/paint/drawing.c trunk/reactos/base/applications/paint/drawing.h trunk/reactos/base/applications/paint/globalvar.h trunk/reactos/base/applications/paint/mouse.c trunk/reactos/base/applications/paint/mouse.h trunk/reactos/base/applications/paint/sizebox.c trunk/reactos/base/applications/paint/toolsettings.c trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/dr… ============================================================================== --- trunk/reactos/base/applications/paint/drawing.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/drawing.c [iso-8859-1] Fri Jul 10 22:21:27 2009 @@ -20,13 +20,13 @@ DeleteObject(SelectObject(hdc, oldPen)); } -void Rect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, BOOL filled) -{ - HBRUSH oldBrush; - LOGBRUSH logbrush; - HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); - if (filled) logbrush.lbStyle = BS_SOLID; else logbrush.lbStyle = BS_HOLLOW; - logbrush.lbColor = bg; +void Rect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, int style) +{ + HBRUSH oldBrush; + LOGBRUSH logbrush; + HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); + if (style==0) logbrush.lbStyle = BS_HOLLOW; else logbrush.lbStyle = BS_SOLID; + if (style==2) logbrush.lbColor = fg; else logbrush.lbColor = bg; logbrush.lbHatch = 0; oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); Rectangle(hdc, x1, y1, x2, y2); @@ -34,13 +34,13 @@ DeleteObject(SelectObject(hdc, oldPen)); } -void Ellp(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, BOOL filled) -{ - HBRUSH oldBrush; - LOGBRUSH logbrush; - HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); - if (filled) logbrush.lbStyle = BS_SOLID; else logbrush.lbStyle = BS_HOLLOW; - logbrush.lbColor = bg; +void Ellp(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, int style) +{ + HBRUSH oldBrush; + LOGBRUSH logbrush; + HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); + if (style==0) logbrush.lbStyle = BS_HOLLOW; else logbrush.lbStyle = BS_SOLID; + if (style==2) logbrush.lbColor = fg; else logbrush.lbColor = bg; logbrush.lbHatch = 0; oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); Ellipse(hdc, x1, y1, x2, y2); @@ -48,17 +48,46 @@ DeleteObject(SelectObject(hdc, oldPen)); } -void RRect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, BOOL filled) -{ - LOGBRUSH logbrush; - HBRUSH oldBrush; - HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); - if (filled) logbrush.lbStyle = BS_SOLID; else logbrush.lbStyle = BS_HOLLOW; - logbrush.lbColor = bg; +void RRect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, int style) +{ + LOGBRUSH logbrush; + HBRUSH oldBrush; + HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); + if (style==0) logbrush.lbStyle = BS_HOLLOW; else logbrush.lbStyle = BS_SOLID; + if (style==2) logbrush.lbColor = fg; else logbrush.lbColor = bg; logbrush.lbHatch = 0; oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); RoundRect(hdc, x1, y1, x2, y2, 16, 16); DeleteObject(SelectObject(hdc, oldBrush)); + DeleteObject(SelectObject(hdc, oldPen)); +} + +void Poly(HDC hdc, POINT *lpPoints, int nCount, int fg, int bg, int thickness, int style, BOOL closed) +{ + LOGBRUSH logbrush; + HBRUSH oldBrush; + HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); + if (style==0) logbrush.lbStyle = BS_HOLLOW; else logbrush.lbStyle = BS_SOLID; + if (style==2) logbrush.lbColor = fg; else logbrush.lbColor = bg; + logbrush.lbHatch = 0; + oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); + if (closed) + Polygon(hdc, lpPoints, nCount); + else + Polyline(hdc, lpPoints, nCount); + DeleteObject(SelectObject(hdc, oldBrush)); + DeleteObject(SelectObject(hdc, oldPen)); +} + +void Bezier(HDC hdc, POINT p1, POINT p2, POINT p3, POINT p4, int color, int thickness) +{ + POINT fourPoints[4]; + fourPoints[0] = p1; + fourPoints[1] = p2; + fourPoints[2] = p3; + fourPoints[3] = p4; + HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color)); + PolyBezier(hdc, fourPoints, 4); DeleteObject(SelectObject(hdc, oldPen)); } @@ -79,6 +108,15 @@ Rectangle(hdc, (x1*(100-a)+x2*a)/100-radius+1, (y1*(100-a)+y2*a)/100-radius+1, (x1*(100-a)+x2*a)/100+radius+1, (y1*(100-a)+y2*a)/100+radius+1); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); +} + +void Replace(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int radius) +{ + short a, x, y; + for (a=0; a<=100; a++) + for (y=(y1*(100-a)+y2*a)/100-radius+1; y<(y1*(100-a)+y2*a)/100+radius+1; y++) + for (x=(x1*(100-a)+x2*a)/100-radius+1; x<(x1*(100-a)+x2*a)/100+radius+1; x++) + if (GetPixel(hdc, x, y)==fg) SetPixel(hdc, x, y, bg); } void Airbrush(HDC hdc, short x, short y, int color, int r) Modified: trunk/reactos/base/applications/paint/drawing.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/dr… ============================================================================== --- trunk/reactos/base/applications/paint/drawing.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/drawing.h [iso-8859-1] Fri Jul 10 22:21:27 2009 @@ -8,15 +8,21 @@ void Line(HDC hdc, short x1, short y1, short x2, short y2, int color, int thickness); -void Rect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, BOOL filled); +void Rect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, int style); -void Ellp(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, BOOL filled); +void Ellp(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, int style); -void RRect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, BOOL filled); +void RRect(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int thickness, int style); + +void Poly(HDC hdc, POINT *lpPoints, int nCount, int fg, int bg, int thickness, int style, BOOL closed); + +void Bezier(HDC hdc, POINT p1, POINT p2, POINT p3, POINT p4, int color, int thickness); void Fill(HDC hdc, int x, int y, int color); void Erase(HDC hdc, short x1, short y1, short x2, short y2, int color, int radius); + +void Replace(HDC hdc, short x1, short y1, short x2, short y2, int fg, int bg, int radius); void Airbrush(HDC hdc, short x, short y, int color, int r); Modified: trunk/reactos/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gl… ============================================================================== --- trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] Fri Jul 10 22:21:27 2009 @@ -85,3 +85,8 @@ extern HWND hSizeboxLeftBottom; extern HWND hSizeboxCenterBottom; extern HWND hSizeboxRightBottom; + +/* VARIABLES declared in mouse.c *************************************/ + +extern POINT pointStack[256]; +extern short pointSP; Modified: trunk/reactos/base/applications/paint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/mo… ============================================================================== --- trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] Fri Jul 10 22:21:27 2009 @@ -23,37 +23,70 @@ //SendMessage(hSelection, WM_PAINT, 0, 0); } -void startPainting(HDC hdc, short x, short y, int fg, int bg) +POINT pointStack[256]; +short pointSP; + +void startPaintingL(HDC hdc, short x, short y, int fg, int bg) { startX = x; startY = y; lastX = x; lastY = y; - if ((activeTool!=5)&&(activeTool!=6)) newReversible(); - switch (activeTool) - { + switch (activeTool) + { + case 1: + case 10: + case 11: + case 15: + case 16: + newReversible(); case 2: + newReversible(); ShowWindow(hSelection, SW_HIDE); break; case 3: + newReversible(); Erase(hdc, x, y, x, y, bg, rubberRadius); break; case 4: + newReversible(); Fill(hdc, x, y, fg); break; case 7: + newReversible(); SetPixel(hdc, x, y, fg); break; case 8: + newReversible(); Brush(hdc, x, y, x, y, fg, brushStyle); break; case 9: + newReversible(); Airbrush(hdc, x, y, fg, airBrushWidth); break; - } -} - -void whilePainting(HDC hdc, short x, short y, int fg, int bg) + case 12: + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + if (pointSP==0) + { + newReversible(); + pointSP++; + } + break; + case 14: + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + if (pointSP+1>=2) Poly(hdc, pointStack, pointSP+1, fg, bg, lineWidth, shapeStyle, FALSE); + if (pointSP==0) + { + newReversible(); + pointSP++; + } + break; + } +} + +void whilePaintingL(HDC hdc, short x, short y, int fg, int bg) { switch (activeTool) { @@ -87,50 +120,34 @@ resetToU1(); Line(hdc, startX, startY, x, y, fg, lineWidth); break; + case 12: + resetToU1(); + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + switch (pointSP) + { + case 1: Line(hdc, pointStack[0].x, pointStack[0].y, pointStack[1].x, pointStack[1].y, fg, lineWidth); break; + case 2: Bezier(hdc, pointStack[0], pointStack[2], pointStack[2], pointStack[1], fg, lineWidth); break; + case 3: Bezier(hdc, pointStack[0], pointStack[2], pointStack[3], pointStack[1], fg, lineWidth); break; + } + break; case 13: resetToU1(); - switch (shapeStyle) - { - case 0: - Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, FALSE); - break; - case 1: - Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, TRUE); - break; - case 2: - Rect(hdc, startX, startY, x, y, fg, fg, lineWidth, TRUE); - break; - } - break; - case 15: - resetToU1(); - switch (shapeStyle) - { - case 0: - Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, FALSE); - break; - case 1: - Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, TRUE); - break; - case 2: - Ellp(hdc, startX, startY, x, y, fg, fg, lineWidth, TRUE); - break; - } - break; - case 16: - resetToU1(); - switch (shapeStyle) - { - case 0: - RRect(hdc, startX, startY, x, y, fg, bg, lineWidth, FALSE); - break; - case 1: - RRect(hdc, startX, startY, x, y, fg, bg, lineWidth, TRUE); - break; - case 2: - RRect(hdc, startX, startY, x, y, fg, fg, lineWidth, TRUE); - break; - } + Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); + break; + case 14: + resetToU1(); + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + if (pointSP+1>=2) Poly(hdc, pointStack, pointSP+1, fg, bg, lineWidth, shapeStyle, FALSE); + break; + case 15: + resetToU1(); + Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); + break; + case 16: + resetToU1(); + RRect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); break; } @@ -138,7 +155,7 @@ lastY = y; } -void endPainting(HDC hdc, short x, short y, int fg, int bg) +void endPaintingL(HDC hdc, short x, short y, int fg, int bg) { switch (activeTool) { @@ -163,50 +180,204 @@ resetToU1(); Line(hdc, startX, startY, x, y, fg, lineWidth); break; + case 12: + pointSP++; + if (pointSP==4) pointSP = 0; + break; case 13: resetToU1(); - switch (shapeStyle) - { - case 0: - Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, FALSE); - break; - case 1: - Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, TRUE); - break; - case 2: - Rect(hdc, startX, startY, x, y, fg, fg, lineWidth, TRUE); - break; - } - break; - case 15: - resetToU1(); - switch (shapeStyle) - { - case 0: - Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, FALSE); - break; - case 1: - Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, TRUE); - break; - case 2: - Ellp(hdc, startX, startY, x, y, fg, fg, lineWidth, TRUE); - break; - } - break; - case 16: - resetToU1(); - switch (shapeStyle) - { - case 0: - RRect(hdc, startX, startY, x, y, fg, bg, lineWidth, FALSE); - break; - case 1: - RRect(hdc, startX, startY, x, y, fg, bg, lineWidth, TRUE); - break; - case 2: - RRect(hdc, startX, startY, x, y, fg, fg, lineWidth, TRUE); - break; - } - break; - } -} + Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); + break; + case 14: + resetToU1(); + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + pointSP++; + if (pointSP>=2) + { + if ( (pointStack[0].x-x)*(pointStack[0].x-x) + (pointStack[0].y-y)*(pointStack[0].y-y) <= lineWidth*lineWidth+1) + { + Poly(hdc, pointStack, pointSP, fg, bg, lineWidth, shapeStyle, TRUE); + pointSP = 0; + } + else + { + Poly(hdc, pointStack, pointSP, fg, bg, lineWidth, shapeStyle, FALSE); + } + } + if (pointSP==255) pointSP--; + break; + case 15: + resetToU1(); + Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); + break; + case 16: + resetToU1(); + RRect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); + break; + } +} + +void startPaintingR(HDC hdc, short x, short y, int fg, int bg) +{ + startX = x; + startY = y; + lastX = x; + lastY = y; + switch (activeTool) + { + case 1: + case 10: + case 11: + case 15: + case 16: + newReversible(); + case 3: + newReversible(); + Replace(hdc, x, y, x, y, fg, bg, rubberRadius); + break; + case 4: + newReversible(); + Fill(hdc, x, y, bg); + break; + case 7: + newReversible(); + SetPixel(hdc, x, y, bg); + break; + case 8: + newReversible(); + Brush(hdc, x, y, x, y, bg, brushStyle); + break; + case 9: + newReversible(); + Airbrush(hdc, x, y, bg, airBrushWidth); + break; + case 12: + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + if (pointSP==0) + { + newReversible(); + pointSP++; + } + break; + case 14: + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + if (pointSP+1>=2) Poly(hdc, pointStack, pointSP+1, bg, fg, lineWidth, shapeStyle, FALSE); + if (pointSP==0) + { + newReversible(); + pointSP++; + } + break; + } +} + +void whilePaintingR(HDC hdc, short x, short y, int fg, int bg) +{ + switch (activeTool) + { + case 3: + Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius); + break; + case 7: + Line(hdc, lastX, lastY, x, y, bg, 1); + break; + case 8: + Brush(hdc, lastX, lastY, x, y, bg, brushStyle); + break; + case 9: + Airbrush(hdc, x, y, bg, airBrushWidth); + break; + case 11: + resetToU1(); + Line(hdc, startX, startY, x, y, bg, lineWidth); + break; + case 12: + resetToU1(); + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + switch (pointSP) + { + case 1: Line(hdc, pointStack[0].x, pointStack[0].y, pointStack[1].x, pointStack[1].y, bg, lineWidth); break; + case 2: Bezier(hdc, pointStack[0], pointStack[2], pointStack[2], pointStack[1], bg, lineWidth); break; + case 3: Bezier(hdc, pointStack[0], pointStack[2], pointStack[3], pointStack[1], bg, lineWidth); break; + } + break; + case 13: + resetToU1(); + Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); + break; + case 14: + resetToU1(); + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + if (pointSP+1>=2) Poly(hdc, pointStack, pointSP+1, bg, fg, lineWidth, shapeStyle, FALSE); + break; + case 15: + resetToU1(); + Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); + break; + case 16: + resetToU1(); + RRect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); + break; + } + + lastX = x; + lastY = y; +} + +void endPaintingR(HDC hdc, short x, short y, int fg, int bg) +{ + switch (activeTool) + { + case 3: + Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius); + break; + case 7: + Line(hdc, lastX, lastY, x, y, bg, 1); + SetPixel(hdc, x, y, bg); + break; + case 11: + resetToU1(); + Line(hdc, startX, startY, x, y, bg, lineWidth); + break; + case 12: + pointSP++; + if (pointSP==4) pointSP = 0; + break; + case 13: + resetToU1(); + Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); + break; + case 14: + resetToU1(); + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + pointSP++; + if (pointSP>=2) + { + if ( (pointStack[0].x-x)*(pointStack[0].x-x) + (pointStack[0].y-y)*(pointStack[0].y-y) <= lineWidth*lineWidth+1) + { + Poly(hdc, pointStack, pointSP, bg, fg, lineWidth, shapeStyle, TRUE); + pointSP = 0; + } + else + { + Poly(hdc, pointStack, pointSP, bg, fg, lineWidth, shapeStyle, FALSE); + } + } + if (pointSP==255) pointSP--; + break; + case 15: + resetToU1(); + Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); + break; + case 16: + resetToU1(); + RRect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); + break; + } +} Modified: trunk/reactos/base/applications/paint/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/mo… ============================================================================== --- trunk/reactos/base/applications/paint/mouse.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/mouse.h [iso-8859-1] Fri Jul 10 22:21:27 2009 @@ -8,8 +8,14 @@ void placeSelWin(); -void startPainting(HDC hdc, short x, short y, int fg, int bg); +void startPaintingL(HDC hdc, short x, short y, int fg, int bg); -void whilePainting(HDC hdc, short x, short y, int fg, int bg); +void whilePaintingL(HDC hdc, short x, short y, int fg, int bg); -void endPainting(HDC hdc, short x, short y, int fg, int bg); +void endPaintingL(HDC hdc, short x, short y, int fg, int bg); + +void startPaintingR(HDC hdc, short x, short y, int fg, int bg); + +void whilePaintingR(HDC hdc, short x, short y, int fg, int bg); + +void endPaintingR(HDC hdc, short x, short y, int fg, int bg); Modified: trunk/reactos/base/applications/paint/sizebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/si… ============================================================================== --- trunk/reactos/base/applications/paint/sizebox.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/sizebox.c [iso-8859-1] Fri Jul 10 22:21:27 2009 @@ -9,10 +9,10 @@ /* INCLUDES *********************************************************/ #include <windows.h> +#include <commctrl.h> +#include <tchar.h> #include "globalvar.h" -#include "drawing.h" #include "history.h" -#include "mouse.h" /* FUNCTIONS ********************************************************/ @@ -43,7 +43,31 @@ SetCapture(hwnd); break; case WM_MOUSEMOVE: - // TODO: print things in the status bar + if (resizing) + { + TCHAR sizeStr[100]; + short xRel; + short yRel; + xRel = ((short)LOWORD(lParam)-xOrig)*1000/zoom; + yRel = ((short)HIWORD(lParam)-yOrig)*1000/zoom; + if (hwnd==hSizeboxLeftTop) + _stprintf(sizeStr, _T("%d x %d"), imgXRes-xRel, imgYRes-yRel); + if (hwnd==hSizeboxCenterTop) + _stprintf(sizeStr, _T("%d x %d"), imgXRes, imgYRes-yRel); + if (hwnd==hSizeboxRightTop) + _stprintf(sizeStr, _T("%d x %d"), imgXRes+xRel, imgYRes-yRel); + if (hwnd==hSizeboxLeftCenter) + _stprintf(sizeStr, _T("%d x %d"), imgXRes-xRel, imgYRes); + if (hwnd==hSizeboxRightCenter) + _stprintf(sizeStr, _T("%d x %d"), imgXRes+xRel, imgYRes); + if (hwnd==hSizeboxLeftBottom) + _stprintf(sizeStr, _T("%d x %d"), imgXRes-xRel, imgYRes+yRel); + if (hwnd==hSizeboxCenterBottom) + _stprintf(sizeStr, _T("%d x %d"), imgXRes, imgYRes+yRel); + if (hwnd==hSizeboxRightBottom) + _stprintf(sizeStr, _T("%d x %d"), imgXRes+xRel, imgYRes+yRel); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM)sizeStr); + } break; case WM_LBUTTONUP: if (resizing) @@ -70,6 +94,7 @@ cropReversible(imgXRes, imgYRes+yRel, 0, 0); if (hwnd==hSizeboxRightBottom) cropReversible(imgXRes+xRel, imgYRes+yRel, 0, 0); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM)_T("")); } break; Modified: trunk/reactos/base/applications/paint/toolsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/to… ============================================================================== --- trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] Fri Jul 10 22:21:27 2009 @@ -148,14 +148,14 @@ } } if (shapeStyle==0) - Rect(hdc, 5, 6, 37, 16, GetSysColor(COLOR_HIGHLIGHTTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, FALSE); - else - Rect(hdc, 5, 6, 37, 16, GetSysColor(COLOR_WINDOWTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, FALSE); + Rect(hdc, 5, 6, 37, 16, GetSysColor(COLOR_HIGHLIGHTTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, 0); + else + Rect(hdc, 5, 6, 37, 16, GetSysColor(COLOR_WINDOWTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, 0); if (shapeStyle==1) - Rect(hdc, 5, 26, 37, 36, GetSysColor(COLOR_HIGHLIGHTTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, TRUE); - else - Rect(hdc, 5, 26, 37, 36, GetSysColor(COLOR_WINDOWTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, TRUE); - Rect(hdc, 5, 46, 37, 56, GetSysColor(COLOR_APPWORKSPACE), GetSysColor(COLOR_APPWORKSPACE), 1, TRUE); + Rect(hdc, 5, 26, 37, 36, GetSysColor(COLOR_HIGHLIGHTTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, 1); + else + Rect(hdc, 5, 26, 37, 36, GetSysColor(COLOR_WINDOWTEXT), GetSysColor(COLOR_APPWORKSPACE), 1, 1); + Rect(hdc, 5, 46, 37, 56, GetSysColor(COLOR_APPWORKSPACE), GetSysColor(COLOR_APPWORKSPACE), 1, 1); for (i=0; i<5; i++) { if (lineWidth==i+1) Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Fri Jul 10 22:21:27 2009 @@ -29,6 +29,7 @@ { ShowWindow(hSelection, SW_HIDE); activeTool = tool; + pointSP = 0; // resets the point-buffer of the polygon and bezier functions SendMessage(hToolSettings, WM_PAINT, 0, 0); } @@ -354,7 +355,7 @@ { SetCapture(hImageArea); drawing = TRUE; - startPainting(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, fgColor, bgColor); + startPaintingL(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, fgColor, bgColor); }else { SendMessage(hwnd, WM_LBUTTONUP, wParam, lParam); @@ -371,7 +372,7 @@ { SetCapture(hImageArea); drawing = TRUE; - startPainting(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, bgColor, fgColor); + startPaintingR(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, fgColor, bgColor); }else { SendMessage(hwnd, WM_RBUTTONUP, wParam, lParam); @@ -386,7 +387,7 @@ { ReleaseCapture(); drawing = FALSE; - endPainting(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, fgColor, bgColor); + endPaintingL(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, fgColor, bgColor); SendMessage(hImageArea, WM_PAINT, 0, 0); if (activeTool==5) { @@ -402,7 +403,7 @@ { ReleaseCapture(); drawing = FALSE; - endPainting(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, bgColor, fgColor); + endPaintingR(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, fgColor, bgColor); SendMessage(hImageArea, WM_PAINT, 0, 0); if (activeTool==5) { @@ -426,7 +427,7 @@ { if ((wParam&MK_LBUTTON)!=0) { - whilePainting(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, fgColor, bgColor); + whilePaintingL(hDrawingDC, (short)LOWORD(lParam)*1000/zoom, (short)HIWORD(lParam)*1000/zoom, fgColor, bgColor); SendMessage(hImageArea, WM_PAINT, 0, 0); if ((activeTool>=10)||(activeTool==2)) { @@ -437,7 +438,7 @@ } if ((wParam&MK_RBUTTON)!=0) { - whilePainting(hDrawingDC, LOWORD(lParam)*1000/zoom, HIWORD(lParam)*1000/zoom, bgColor, fgColor); + whilePaintingR(hDrawingDC, (short)LOWORD(lParam)*1000/zoom, (short)HIWORD(lParam)*1000/zoom, fgColor, bgColor); SendMessage(hImageArea, WM_PAINT, 0, 0); if (activeTool>=10) { @@ -564,9 +565,9 @@ case IDM_EDITSELECTALL: if (activeTool==2) { - startPainting(hDrawingDC, 0, 0, fgColor, bgColor); - whilePainting(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); - endPainting(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); + startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); + whilePaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); + endPaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); } break; case IDM_EDITCOPYTO:

15 years, 5 months

← Newer
1
...
44
45
46
47
48
49
50
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009