Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[ekohl] 15819: Disable patch 15796 because it breaks the bootcd.

by ekohl＠svn.reactos.com

Disable patch 15796 because it breaks the bootcd. Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-06-05 23:07:51 UTC (rev 15818) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-06-06 19:34:36 UTC (rev 15819) @@ -892,6 +892,7 @@ ZwClose(LogConfKey); } +#if 0 if (DeviceNode->PhysicalDeviceObject != NULL) { /* Create the 'Control' key */ @@ -924,6 +925,7 @@ ZwClose(LogConfKey); } } +#endif DPRINT("IopSetDeviceInstanceData() done\n"); @@ -2017,6 +2019,7 @@ static NTSTATUS INIT_FUNCTION IopSetRootDeviceInstanceData(PDEVICE_NODE DeviceNode) { +#if 0 PWSTR KeyBuffer; HANDLE InstanceKey = NULL; NTSTATUS Status; @@ -2040,6 +2043,8 @@ ZwClose(InstanceKey); return Status; +#endif + return STATUS_SUCCESS; }

19 years, 6 months

[hbirr] 15818: Allocate the section object from non paged pool because the storage for a spin lock must be in non paged memory.

by hbirr＠svn.reactos.com

Allocate the section object from non paged pool because the storage for a spin lock must be in non paged memory. Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-06-05 21:30:41 UTC (rev 15817) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-06-05 23:07:51 UTC (rev 15818) @@ -2123,8 +2123,8 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Section"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(SECTION_OBJECT); - ObjectTypeInitializer.PoolType = PagedPool; + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(SECTION_OBJECT); + ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = MmpSectionMapping; ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection;

19 years, 6 months

[hbirr] 15817: Fixed the clean rule.

by hbirr＠svn.reactos.com

Fixed the clean rule. Modified: trunk/reactos/tools/rsym.mak _____ Modified: trunk/reactos/tools/rsym.mak --- trunk/reactos/tools/rsym.mak 2005-06-05 21:24:36 UTC (rev 15816) +++ trunk/reactos/tools/rsym.mak 2005-06-05 21:30:41 UTC (rev 15817) @@ -37,5 +37,5 @@ .PHONY: rsym_clean rsym_clean: - -@$(nrm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL) + -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL) clean: rsym_clean

19 years, 6 months

[hbirr] 15816: Revert my changes from rev 15805.

by hbirr＠svn.reactos.com

Revert my changes from rev 15805. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/ppool.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-05 21:12:30 UTC (rev 15815) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-05 21:24:36 UTC (rev 15816) @@ -367,9 +367,6 @@ /* FUNCTIONS */ -VOID MmLockPagedPool(VOID); -VOID MmUnlockPagedPool(VOID); - /* aspace.c ******************************************************************/ VOID MmLockAddressSpace(PMADDRESS_SPACE AddressSpace); _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-06-05 21:12:30 UTC (rev 15815) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-06-05 21:24:36 UTC (rev 15816) @@ -364,7 +364,6 @@ PFN_TYPE Page; PEPROCESS CurrentProcess = PsGetCurrentProcess(); PMADDRESS_SPACE AddressSpace; - BOOLEAN PagedPool; DPRINT("MmProbeAndLockPages(Mdl %x)\n", Mdl); @@ -399,7 +398,6 @@ Mode = KernelMode; Mdl->Process = NULL; AddressSpace = MmGetKernelAddressSpace(); - PagedPool = Mdl->StartVa >= MmPagedPoolBase && Mdl->StartVa < MmPagedPoolBase + MmPagedPoolSize ? TRUE : FALSE; } else { @@ -407,21 +405,14 @@ Mode = UserMode; Mdl->Process = CurrentProcess; AddressSpace = &CurrentProcess->AddressSpace; - PagedPool = FALSE; } - if (PagedPool) - { - MmLockPagedPool(); - } - else - { - MmLockAddressSpace(AddressSpace); - } /* * Lock the pages */ + MmLockAddressSpace(AddressSpace); + for (i = 0; i < NrPages; i++) { PVOID Address; @@ -447,14 +438,7 @@ MmDereferencePage(Page); } } - if (PagedPool) - { - MmUnlockPagedPool(); - } - else - { - MmUnlockAddressSpace(AddressSpace); - } + MmUnlockAddressSpace(AddressSpace); ExRaiseStatus(STATUS_ACCESS_VIOLATION); } } @@ -478,14 +462,7 @@ MmDereferencePage(Page); } } - if (PagedPool) - { - MmUnlockPagedPool(); - } - else - { - MmUnlockAddressSpace(AddressSpace); - } + MmUnlockAddressSpace(AddressSpace); ExRaiseStatus(STATUS_ACCESS_VIOLATION); } } @@ -497,14 +474,7 @@ MmReferencePage(Page); } - if (PagedPool) - { - MmUnlockPagedPool(); - } - else - { - MmUnlockAddressSpace(AddressSpace); - } + MmUnlockAddressSpace(AddressSpace); Mdl->MdlFlags |= MDL_PAGES_LOCKED; } _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2005-06-05 21:12:30 UTC (rev 15815) +++ trunk/reactos/ntoskrnl/mm/mm.c 2005-06-05 21:24:36 UTC (rev 15816) @@ -215,10 +215,6 @@ DbgPrint("%s:%d\n",__FILE__,__LINE__); return(STATUS_UNSUCCESSFUL); } - if (Address >= (ULONG_PTR)MmPagedPoolBase && Address < (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize) - { - return STATUS_SUCCESS; - } AddressSpace = MmGetKernelAddressSpace(); } else @@ -289,7 +285,9 @@ Status = MmRequestPageMemoryConsumer(MC_PPOOL, FALSE, &AllocatedPage); if (!NT_SUCCESS(Status)) { - return Status; + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + Status = MmRequestPageMemoryConsumer(MC_PPOOL, TRUE, &AllocatedPage); + MmLockAddressSpace(MmGetKernelAddressSpace()); } Status = MmCreateVirtualMapping(NULL, @@ -313,7 +311,6 @@ NTSTATUS Status; BOOLEAN Locked = FromMdl; PFN_TYPE Pfn; - BOOLEAN PagedPool; DPRINT("MmNotPresentFault(Mode %d, Address %x)\n", Mode, Address); @@ -347,25 +344,16 @@ CPRINT("Address: %x\n", Address); return(STATUS_UNSUCCESSFUL); } - PagedPool = Address >= (ULONG_PTR)MmPagedPoolBase && Address < (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize ? TRUE : FALSE; AddressSpace = MmGetKernelAddressSpace(); } else { - PagedPool = FALSE; AddressSpace = &PsGetCurrentProcess()->AddressSpace; } if (!FromMdl) { - if (PagedPool) - { - MmLockPagedPool(); - } - else - { - MmLockAddressSpace(AddressSpace); - } + MmLockAddressSpace(AddressSpace); } /* @@ -373,56 +361,56 @@ */ do { - if (PagedPool) + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)Address); + if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { - Status = MmCommitPagedPoolAddress((PVOID)Address, Locked); + if (!FromMdl) + { + MmUnlockAddressSpace(AddressSpace); + } + return (STATUS_UNSUCCESSFUL); } - else + + switch (MemoryArea->Type) { - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)Address); - if (MemoryArea == NULL || MemoryArea->DeleteInProgress) - { - if (!FromMdl) + case MEMORY_AREA_PAGED_POOL: { - MmUnlockAddressSpace(AddressSpace); + Status = MmCommitPagedPoolAddress((PVOID)Address, Locked); + break; } - return (STATUS_UNSUCCESSFUL); - } - switch (MemoryArea->Type) - { - case MEMORY_AREA_SYSTEM: - Status = STATUS_UNSUCCESSFUL; - break; + case MEMORY_AREA_SYSTEM: + Status = STATUS_UNSUCCESSFUL; + break; - case MEMORY_AREA_SECTION_VIEW: - Status = MmNotPresentFaultSectionView(AddressSpace, - MemoryArea, - (PVOID)Address, - Locked); - break; + case MEMORY_AREA_SECTION_VIEW: + Status = MmNotPresentFaultSectionView(AddressSpace, + MemoryArea, + (PVOID)Address, + Locked); + break; - case MEMORY_AREA_VIRTUAL_MEMORY: - case MEMORY_AREA_PEB_OR_TEB: - Status = MmNotPresentFaultVirtualMemory(AddressSpace, - MemoryArea, - (PVOID)Address, - Locked); - break; + case MEMORY_AREA_VIRTUAL_MEMORY: + case MEMORY_AREA_PEB_OR_TEB: + Status = MmNotPresentFaultVirtualMemory(AddressSpace, + MemoryArea, + (PVOID)Address, + Locked); + break; - case MEMORY_AREA_SHARED_DATA: - Pfn = MmSharedDataPagePhysicalAddress.QuadPart >> PAGE_SHIFT; - Status = MmCreateVirtualMapping(PsGetCurrentProcess(), - (PVOID)PAGE_ROUND_DOWN(Address), - PAGE_READONLY, - &Pfn, - 1); - break; + case MEMORY_AREA_SHARED_DATA: + Pfn = MmSharedDataPagePhysicalAddress.QuadPart >> PAGE_SHIFT; + Status = + MmCreateVirtualMapping(PsGetCurrentProcess(), + (PVOID)PAGE_ROUND_DOWN(Address), + PAGE_READONLY, + &Pfn, + 1); + break; - default: - Status = STATUS_UNSUCCESSFUL; - break; - } + default: + Status = STATUS_UNSUCCESSFUL; + break; } } while (Status == STATUS_MM_RESTART_OPERATION); @@ -430,14 +418,7 @@ DPRINT("Completed page fault handling\n"); if (!FromMdl) { - if (PagedPool) - { - MmUnlockPagedPool(); - } - else - { - MmUnlockAddressSpace(AddressSpace); - } + MmUnlockAddressSpace(AddressSpace); } return(Status); } _____ Modified: trunk/reactos/ntoskrnl/mm/ppool.c --- trunk/reactos/ntoskrnl/mm/ppool.c 2005-06-05 21:12:30 UTC (rev 15815) +++ trunk/reactos/ntoskrnl/mm/ppool.c 2005-06-05 21:24:36 UTC (rev 15816) @@ -41,7 +41,6 @@ ULONG MmPagedPoolSize; ULONG MmTotalPagedPoolQuota = 0; // TODO FIXME commented out until we use it static PR_POOL MmPagedPool = NULL; -static FAST_MUTEX MmPagedPoolLock; /* FUNCTIONS *****************************************************************/ @@ -61,19 +60,8 @@ PAGE_SIZE ); ExInitializeFastMutex(&MmPagedPool->Mutex); - ExInitializeFastMutex(&MmPagedPoolLock); } -VOID MmLockPagedPool(VOID) -{ - ExAcquireFastMutex(&MmPagedPoolLock); -} - -VOID MmUnlockPagedPool(VOID) -{ - ExReleaseFastMutex(&MmPagedPoolLock); -} - /********************************************************************** * NAME INTERNAL * ExAllocatePagedPoolWithTag@12

19 years, 6 months

[hbirr] 15815: Allocate the section segments from non paged pool because the storage for fast mutex must be in non paged memory.

by hbirr＠svn.reactos.com

Allocate the section segments from non paged pool because the storage for fast mutex must be in non paged memory. Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-06-05 20:56:14 UTC (rev 15814) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-06-05 21:12:30 UTC (rev 15815) @@ -2183,7 +2183,7 @@ KeInitializeSpinLock(&Section->ViewListLock); Section->FileObject = NULL; Section->MaximumSize = MaximumSize; - Segment = ExAllocatePoolWithTag(PagedPool, sizeof(MM_SECTION_SEGMENT), + Segment = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_SECTION_SEGMENT), TAG_MM_SECTION_SEGMENT); if (Segment == NULL) { @@ -2387,7 +2387,7 @@ */ if (FileObject->SectionObjectPointer->DataSectionObject == NULL) { - Segment = ExAllocatePoolWithTag(PagedPool, sizeof(MM_SECTION_SEGMENT), + Segment = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_SECTION_SEGMENT), TAG_MM_SECTION_SEGMENT); if (Segment == NULL) { @@ -2499,7 +2499,7 @@ /* TODO: check for integer overflow */ SizeOfSegments = sizeof(MM_SECTION_SEGMENT) * NrSegments; - Segments = ExAllocatePoolWithTag(PagedPool, + Segments = ExAllocatePoolWithTag(NonPagedPool, SizeOfSegments, TAG_MM_SECTION_SEGMENT);

19 years, 6 months

[gvg] 15814: Implement /LOADSYMBOLS and /NOLOADSYMBOLS command line option

by gvg＠svn.reactos.com

Implement /LOADSYMBOLS and /NOLOADSYMBOLS command line option Note to self: send shipping address for coffee mug to Alex Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-06-05 20:05:56 UTC (rev 15813) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-06-05 20:56:14 UTC (rev 15814) @@ -26,6 +26,7 @@ PROSSYM_INFO RosSymInfo; } IMAGE_SYMBOL_INFO_CACHE, *PIMAGE_SYMBOL_INFO_CACHE; +static BOOLEAN LoadSymbols; static LIST_ENTRY SymbolFileListHead; static KSPIN_LOCK SymbolFileListLock; @@ -415,6 +416,12 @@ /* Allow KDB to break on module load */ KdbModuleLoaded(FileName); + if (! LoadSymbols) + { + *RosSymInfo = NULL; + return; + } + /* Try to find cached (already loaded) symbol file */ *RosSymInfo = KdbpSymFindCachedFile(FileName); if (*RosSymInfo != NULL) @@ -490,6 +497,8 @@ UNICODE_STRING KernelName; DPRINT("LdrModule %p\n", LdrModule); + LdrModule->RosSymInfo = NULL; + KernelName.MaximumLength = sizeof(Prefix) + LdrModule->FullDllName.Length; KernelName.Length = KernelName.MaximumLength - sizeof(WCHAR); KernelName.Buffer = ExAllocatePoolWithTag(PagedPool, KernelName.MaximumLength, TAG_KDBS); @@ -502,8 +511,6 @@ LdrModule->FullDllName.Length); KernelName.Buffer[KernelName.Length / sizeof(WCHAR)] = L'\0'; - LdrModule->RosSymInfo = NULL; - KdbpSymLoadModuleSymbols(&KernelName, &LdrModule->RosSymInfo); ExFreePool(KernelName.Buffer); @@ -612,6 +619,12 @@ if (ModuleObject != NULL) { + if (! LoadSymbols) + { + ModuleObject->TextSection->RosSymInfo = NULL; + return; + } + for (i = 0; i < KeLoaderBlock.ModsCount; i++) { if (0 == _stricmp(FileName, (PCHAR)KeLoaderModules[i].String)) @@ -670,12 +683,63 @@ KdbSymInit(IN PMODULE_TEXT_SECTION NtoskrnlTextSection, IN PMODULE_TEXT_SECTION LdrHalTextSection) { + PCHAR p1, p2; + int Found; + char YesNo; + NtoskrnlTextSection->RosSymInfo = NULL; LdrHalTextSection->RosSymInfo = NULL; InitializeListHead(&SymbolFileListHead); KeInitializeSpinLock(&SymbolFileListLock); +#ifdef DBG + LoadSymbols = TRUE; +#else + LoadSymbols = FALSE; +#endif + + /* Check the command line for /LOADSYMBOLS, /NOLOADSYMBOLS, + * /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */ + p1 = (PCHAR) KeLoaderBlock.CommandLine; + while('\0' != *p1 && NULL != (p2 = strchr(p1, '/'))) + { + p2++; + Found = 0; + if (0 == _strnicmp(p2, "LOADSYMBOLS", 11)) + { + Found = +1; + p2 += 11; + } + else if (0 == _strnicmp(p2, "NOLOADSYMBOLS", 13)) + { + Found = -1; + p2 += 13; + } + if (0 != Found) + { + while (isspace(*p2)) + { + p2++; + } + if ('=' == *p2) + { + p2++; + while (isspace(*p2)) + { + p2++; + } + YesNo = toupper(*p2); + if ('N' == YesNo || 'F' == YesNo || '0' == YesNo) + { + Found = -1 * Found; + } + } + LoadSymbols = (0 < Found); + } + p1 = p2; + } + RosSymInitKernelMode(); }

19 years, 6 months

[hpoussin] 15813: Include French resources in explorer

by hpoussin＠svn.reactos.com

Include French resources in explorer Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-06-05 18:15:08 UTC (rev 15812) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-06-05 20:05:56 UTC (rev 15813) @@ -186,6 +186,7 @@ #include "explorer-en.rc" #include "explorer-de.rc" #include "explorer-es.rc" +#include "explorer-fr.rc" #include "explorer-sw.rc" #include "explorer-pt.rc" #include "explorer-cz.rc"

19 years, 6 months

[greatlrd] 15812: more optimze of bitblt for dib32

by greatlrd＠svn.reactos.com

more optimze of bitblt for dib32 Modified: trunk/reactos/subsys/win32k/dib/dib.h Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib.h --- trunk/reactos/subsys/win32k/dib/dib.h 2005-06-05 17:02:54 UTC (rev 15811) +++ trunk/reactos/subsys/win32k/dib/dib.h 2005-06-05 18:15:08 UTC (rev 15812) @@ -120,11 +120,16 @@ BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); -BOOLEAN FASTCALL DIB_32DstInvert(PBLTINFO BltInfo); -BOOLEAN DIB32_Srccopy(PBLTINFO BltInfo); -BOOLEAN DIB32_ColorFill(PBLTINFO BltInfo, ULONG); -BOOLEAN DIB32_SrcPaint(PBLTINFO BltInfo); +BOOLEAN FASTCALL DIB_32DstInvert(PBLTINFO); +BOOLEAN FASTCALL DIB32_Srccopy(PBLTINFO); +BOOLEAN FASTCALL DIB32_ColorFill(PBLTINFO, ULONG); +BOOLEAN FASTCALL DIB32_SrcPaint(PBLTINFO); +BOOLEAN FASTCALL DIB32_NotSrcErase(PBLTINFO); +BOOLEAN FASTCALL DIB32_SrcErase(PBLTINFO); +BOOLEAN FASTCALL DIB_32PatCopy(PBLTINFO); + + extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; #define MASK1BPP(x) (1<<(7-((x)&7))) _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-05 17:02:54 UTC (rev 15811) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-05 18:15:08 UTC (rev 15812) @@ -44,25 +44,38 @@ #ifdef _M_IX86 VOID DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) -{ - PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x1; - LONG cx = x2 - x1; - if (cx>0) memset4(addr, c, cx); +{ + LONG cx = (x2 - x1) ; + if (cx>0) + { + PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x1; + memset4(addr, c, cx); + } + else if (cx<0) + { + PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x2; + cx = (x1 - x2) ; + memset4(addr, c, cx); + } + } #else VOID DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { - PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x1; - LONG cx = x1; - - while(cx < x2) { - *addr = (DWORD)c; - ++addr; - ++cx; - } + + + PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x1; + LONG cx = x1; + while(cx < x2) + { + *addr = (DWORD)c; + ++addr; + ++cx; + } } #endif @@ -74,11 +87,12 @@ LONG lDelta = SurfObj->lDelta >> 2; /* >> 2 == / sizeof(DWORD) */ byteaddr = (PBYTE)addr; - while(y1++ < y2) { - *addr = (DWORD)c; - - addr += lDelta; - } + while(y1++ < y2) + { + *addr = (DWORD)c; + addr += lDelta; + } + } BOOLEAN @@ -335,7 +349,19 @@ case ROP4_SRCPAINT: // return(Dest | Source); return DIB32_SrcPaint(BltInfo); - break; + break; + + case ROP4_NOTSRCERASE: + return DIB32_NotSrcErase(BltInfo); + break; + case ROP4_SRCERASE: + return DIB32_SrcErase(BltInfo); + break; + + case ROP4_PATCOPY: + // return(Pattern); + return DIB_32PatCopy(BltInfo); + break; default: break; @@ -400,58 +426,142 @@ } /* optimze functions for bitblt */ + BOOLEAN FASTCALL +DIB_32PatCopy(PBLTINFO BltInfo) +{ + ULONG delta; + ULONG DestX, DestY, PatternY; + PULONG DestBits; + + if (!BltInfo->PatternSurface) + { + return DIB32_ColorFill(BltInfo, XLATEOBJ_iXlate(BltInfo->XlatePatternToDest, BltInfo->Brush->iSolidColor)); + } + + + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + + delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2); + + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; + + for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) + { + + for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++) + { + *DestBits = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); + } + + PatternY++; + PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + } + + + return TRUE; +} + +BOOLEAN +FASTCALL DIB_32DstInvert(PBLTINFO BltInfo) { - PULONG DestBits; - ULONG top = BltInfo->DestRect.top; - ULONG left = BltInfo->DestRect.left; - ULONG DestX = BltInfo->DestRect.right - left; - ULONG DestY = BltInfo->DestRect.bottom - top; - ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); + ULONG DestX, DestY; + PULONG DestBits; - /* Calculate the Initial Destination */ - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + - top * BltInfo->DestSurface->lDelta); + ULONG bottom = BltInfo->DestRect.bottom; + ULONG right = BltInfo->DestRect.right; + ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; - while (DestY > 0) - { - while (DestX > 0) - { - /* Invert bits */ - *DestBits =~ *DestBits; - - /* Update Position */ - DestBits++; - - /* Decrease distance to do */ - DestX--; - } - - /* Update position */ - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - - /* Decrease distance to do */ - DestY--; - } + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++) + { + + *DestBits = ~*DestBits ; + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + } + /* Return TRUE */ return TRUE; } -BOOLEAN -DIB32_SrcPaint(PBLTINFO BltInfo) +BOOLEAN +FASTCALL +DIB32_SrcErase(PBLTINFO BltInfo) { BOOLEAN status = FALSE; + + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + PULONG DestBits; - // return(Source); + ULONG bottom = BltInfo->DestRect.bottom; + ULONG right = BltInfo->DestRect.right; + ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + + SourceY = BltInfo->SourcePoint.y; + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + *DestBits = ~(*DestBits & DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest)); + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + } + + } + status = TRUE; + break; + + + default: + break; + } + + return status; +} + +BOOLEAN +FASTCALL +DIB32_NotSrcErase(PBLTINFO BltInfo) +{ + BOOLEAN status = FALSE; + switch (BltInfo->SourceSurface->iBitmapFormat) { case BMF_1BPP: case BMF_4BPP: case BMF_16BPP: case BMF_24BPP: + case BMF_32BPP: { ULONG DestX, DestY; ULONG SourceX, SourceY; @@ -470,6 +580,59 @@ { SourceX = BltInfo->SourcePoint.x; for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + *DestBits = ~(*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest)); + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + } + + } + status = TRUE; + break; + + + default: + break; + } + + return status; +} + +BOOLEAN +FASTCALL +DIB32_SrcPaint(PBLTINFO BltInfo) +{ + BOOLEAN status = FALSE; + + // return(Source); + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_16BPP: + case BMF_24BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + PULONG DestBits; + + ULONG bottom = BltInfo->DestRect.bottom; + ULONG right = BltInfo->DestRect.right; + ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + + SourceY = BltInfo->SourcePoint.y; + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) { *DestBits = (*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, @@ -494,8 +657,9 @@ ULONG right = BltInfo->DestRect.right; ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); SourceY = BltInfo->SourcePoint.y; @@ -522,7 +686,9 @@ return status; } -BOOLEAN + +BOOLEAN +FASTCALL DIB32_Srccopy(PBLTINFO BltInfo) { BOOLEAN status = FALSE; @@ -543,8 +709,9 @@ ULONG right = BltInfo->DestRect.right; ULONG delta = ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) + BltInfo->DestSurface->lDelta; - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); SourceY = BltInfo->SourcePoint.y; @@ -588,8 +755,8 @@ Destdelta = BltInfo->DestSurface->lDelta; Sourcedelta = BltInfo->SourceSurface->lDelta; - Destaddr = BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * Destdelta + BltInfo->DestRect.left; - Srcaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->SourcePoint.y * Sourcedelta + BltInfo->SourcePoint.x; + Destaddr = BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * Destdelta + (BltInfo->DestRect.left<<2); + Srcaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->SourcePoint.y * Sourcedelta + (BltInfo->SourcePoint.x<<2); DesmaxX *= 4; if (DesmaxY > 0) @@ -605,6 +772,7 @@ status = TRUE; break; } + default: break; } @@ -612,7 +780,8 @@ return status; } -BOOLEAN +BOOLEAN +FASTCALL DIB32_ColorFill(PBLTINFO BltInfo, ULONG color) { ULONG DestY;

19 years, 6 months

[chorns] 15811: svn:ignore maintenance

by chorns＠svn.reactos.com

svn:ignore maintenance Property changes on: trunk/reactos/lib/comctl32 ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c makefile + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.cur *.bmp *.ico Makefile.ros *.spec.def *.stubs.c makefile Property changes on: trunk/reactos/lib/comdlg32 ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c makefile *.ico + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.cur *.bmp *.ico Makefile.ros *.spec.def *.stubs.c makefile *.ico Property changes on: trunk/reactos/lib/ole32 ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c makefile + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.cur Makefile.ros *.spec.def *.stubs.c makefile

19 years, 6 months

[chorns] 15810: Clean proxy makefiles on 'make clean'

by chorns＠svn.reactos.com

Clean proxy makefiles on 'make clean' Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-05 16:32:33 UTC (rev 15809) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-05 16:47:42 UTC (rev 15810) @@ -1732,8 +1732,15 @@ string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" ); string ar = ( module.host == HostTrue ? "${host_ar}" : "${ar}" ); + if ( module.name != "zlib" ) /* Avoid make warning */ + { + string proxyMakefile = PassThruCacheDirectory ( + NormalizeFilename ( module.GetBasePath () + SSEP + "makefile" ), + backend->outputDirectory ); + CLEAN_FILE ( proxyMakefile ); + } + string targetMacro = GetTargetMacro ( module ); - CLEAN_FILE ( targetMacro ); // generate phony target for module name

19 years, 6 months

← Newer
1
...
52
53
54
55
56
57
58
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005