Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[cgutman] 42180: - Implement OID_GEN_HARDWARE_STATUS
by cgutman＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: cgutman Date: Fri Jul 24 22:49:39 2009 New Revision: 42180 URL: http://svn.reactos.org/svn/reactos?rev=42180&view=rev Log: - Implement OID_GEN_HARDWARE_STATUS Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Fri Jul 24 22:49:39 2009 @@ -139,8 +139,7 @@ case OID_GEN_HARDWARE_STATUS: { - /* TODO: implement this... */ - GenericULONG = (ULONG)NdisHardwareStatusReady; + GenericULONG = (ULONG)((Adapter->MediaState == NdisMediaStateConnected) ? NdisHardwareStatusReady : NdisHardwareStatusNotReady); break; }

1 0

[dgorbachev] 42179: - Turn a macro into an inline function to avoid a warning. - Remove a stray acute accent.
by dgorbachev＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: dgorbachev Date: Fri Jul 24 21:52:05 2009 New Revision: 42179 URL: http://svn.reactos.org/svn/reactos?rev=42179&view=rev Log: - Turn a macro into an inline function to avoid a warning. - Remove a stray acute accent. Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=421… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Fri Jul 24 21:52:05 2009 @@ -2020,9 +2020,12 @@ * OUT PNDIS_BUFFER *FirstBuffer OPTIONAL, * OUT PUINT TotalPacketLength OPTIONAL); */ -#define NdisQueryPacketLength(Packet, \ - TotalPacketLength) \ -{ \ +static __inline +VOID +NdisQueryPacketLength( + IN PNDIS_PACKET Packet, + OUT PUINT TotalPacketLength OPTIONAL) +{ if ((TotalPacketLength)) \ { \ if (!(Packet)->Private.ValidCounts) { \ @@ -2066,7 +2069,7 @@ { \ while (_Buffer->Next != NULL) \ { \ - ´_Buffer = _Buffer->Next; \ + _Buffer = _Buffer->Next; \ } \ (Packet)->Private.Tail = _Buffer; \ } \

1 0

[sginsberg] 42178: - Leftover from 42176
by sginsberg＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: sginsberg Date: Fri Jul 24 21:39:07 2009 New Revision: 42178 URL: http://svn.reactos.org/svn/reactos?rev=42178&view=rev Log: - Leftover from 42176 Modified: trunk/reactos/drivers/storage/port/directory.rbuild Modified: trunk/reactos/drivers/storage/port/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/direc… ============================================================================== --- trunk/reactos/drivers/storage/port/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/port/directory.rbuild [iso-8859-1] Fri Jul 24 21:39:07 2009 @@ -4,7 +4,4 @@ <directory name="buslogic"> <xi:include href="buslogic/buslogic.rbuild" /> </directory> - <directory name="diskdump"> - <xi:include href="diskdump/diskdump.rbuild" /> - </directory> </group>

1 0

[sginsberg] 42177: - Kill off diskdump too
by sginsberg＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: sginsberg Date: Fri Jul 24 21:09:39 2009 New Revision: 42177 URL: http://svn.reactos.org/svn/reactos?rev=42177&view=rev Log: - Kill off diskdump too Removed: trunk/reactos/drivers/storage/port/diskdump/ trunk/reactos/include/reactos/drivers/diskdump/ Modified: trunk/reactos/ntoskrnl/include/precomp.h Modified: trunk/reactos/ntoskrnl/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/precomp.h… ============================================================================== --- trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] Fri Jul 24 21:09:39 2009 @@ -30,9 +30,6 @@ /* FIXME: Temporary until Winldr is used */ #include <rosldr.h> - -/* Disk Dump Driver Header */ -#include <diskdump/diskdump.h> /* C Headers */ #include <stdlib.h>

1 0

[sginsberg] 42176: - Get rid of ccros.h, deprecated by revision 42175
by sginsberg＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: sginsberg Date: Fri Jul 24 19:35:28 2009 New Revision: 42176 URL: http://svn.reactos.org/svn/reactos?rev=42176&view=rev Log: - Get rid of ccros.h, deprecated by revision 42175 Removed: trunk/reactos/include/reactos/ccros.h Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/vfat.h trunk/reactos/lib/fslib/vfatlib/check/vfat.h trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/include/precomp.h Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Fri Jul 24 19:35:28 2009 @@ -773,30 +773,6 @@ return STATUS_INVALID_DEVICE_REQUEST; } -#ifdef USE_ROS_CC_AND_FS -static NTSTATUS -VfatRosQueryLcnMapping(PVFAT_IRP_CONTEXT IrpContext) -{ - PDEVICE_EXTENSION DeviceExt; - PROS_QUERY_LCN_MAPPING LcnQuery; - PIO_STACK_LOCATION Stack; - - DPRINT("VfatRosQueryLcnMapping(IrpContext %p)\n", IrpContext); - - DeviceExt = IrpContext->DeviceExt; - Stack = IrpContext->Stack; - if (IrpContext->Irp->AssociatedIrp.SystemBuffer == NULL || - Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ROS_QUERY_LCN_MAPPING)) - { - return STATUS_BUFFER_TOO_SMALL; - } - LcnQuery = (PROS_QUERY_LCN_MAPPING)(IrpContext->Irp->AssociatedIrp.SystemBuffer); - LcnQuery->LcnDiskOffset.QuadPart = DeviceExt->FatInfo.dataStart * DeviceExt->FatInfo.BytesPerSector; - IrpContext->Irp->IoStatus.Information = sizeof(ROS_QUERY_LCN_MAPPING); - return(STATUS_SUCCESS); -} -#endif - static NTSTATUS VfatIsVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) { @@ -877,11 +853,6 @@ case FSCTL_MOVE_FILE: Status = VfatMoveFile(IrpContext); break; -#ifdef USE_ROS_CC_AND_FS - case FSCTL_ROS_QUERY_LCN_MAPPING: - Status = VfatRosQueryLcnMapping(IrpContext); - break; -#endif case FSCTL_IS_VOLUME_DIRTY: Status = VfatIsVolumeDirty(IrpContext); break; Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Fri Jul 24 19:35:28 2009 @@ -1,8 +1,6 @@ #include <ntifs.h> #include <ntdddisk.h> #include <debug.h> - -#include <ccros.h> #define USE_ROS_CC_AND_FS Removed: trunk/reactos/include/reactos/ccros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ccros.h?re… ============================================================================== --- trunk/reactos/include/reactos/ccros.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/ccros.h (removed) @@ -1,29 +1,0 @@ -#ifndef __INCLUDE_DDK_NTIFS_H -#define __INCLUDE_DDK_NTIFS_H - -NTSTATUS NTAPI -CcRosInitializeFileCache(PFILE_OBJECT FileObject, - ULONG CacheSegmentSize, - PCACHE_MANAGER_CALLBACKS CallBacks, - PVOID LazyWriterContext); - -NTSTATUS NTAPI -CcRosReleaseFileCache (PFILE_OBJECT FileObject); - -struct _BCB; - -VOID -NTAPI -CcRosTraceCacheMap ( - struct _BCB* Bcb, - BOOLEAN Trace ); - -#define FSCTL_ROS_QUERY_LCN_MAPPING \ - CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) - -typedef struct _ROS_QUERY_LCN_MAPPING -{ - LARGE_INTEGER LcnDiskOffset; -} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; - -#endif /* __INCLUDE_DDK_NTIFS_H */ Modified: trunk/reactos/lib/fslib/vfatlib/check/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/vf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/vfat.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/vfat.h [iso-8859-1] Fri Jul 24 19:35:28 2009 @@ -3,7 +3,6 @@ #include <ddk/ntifs.h> #include <ddk/ntdddisk.h> #include <ndk/ntndk.h> -#include <ccros.h> #include <limits.h> #include <debug.h> Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Fri Jul 24 19:35:28 2009 @@ -299,6 +299,21 @@ NTSTATUS NTAPI +CcRosInitializeFileCache( + PFILE_OBJECT FileObject, + ULONG CacheSegmentSize, + PCACHE_MANAGER_CALLBACKS CallBacks, + PVOID LazyWriterContext +); + +NTSTATUS +NTAPI +CcRosReleaseFileCache( + PFILE_OBJECT FileObject +); + +NTSTATUS +NTAPI CcTryToInitializeFileCache(PFILE_OBJECT FileObject); #endif Modified: trunk/reactos/ntoskrnl/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/precomp.h… ============================================================================== --- trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] Fri Jul 24 19:35:28 2009 @@ -28,8 +28,7 @@ #define TEXT(s) L##s #include <regstr.h> -/* FIXME: Temporary until CC Ros is gone */ -#include <ccros.h> +/* FIXME: Temporary until Winldr is used */ #include <rosldr.h> /* Disk Dump Driver Header */

1 0

[ros-arm-bringup] 42175: - Remove deprecated/old/buggy/unused code. - Make MxGetNextPage return the lowest free physical page, not the highest. - This way we fragment the address space less. - Also makes calculation of "forgotten" pages when we build the PFN database earlier. - Remove MmAllocEarlyPage and use MxGetNextPage instead.
by ros-arm-bringup＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: ros-arm-bringup Date: Fri Jul 24 17:49:27 2009 New Revision: 42175 URL: http://svn.reactos.org/svn/reactos?rev=42175&view=rev Log: - Remove deprecated/old/buggy/unused code. - Make MxGetNextPage return the lowest free physical page, not the highest. - This way we fragment the address space less. - Also makes calculation of "forgotten" pages when we build the PFN database earlier. - Remove MmAllocEarlyPage and use MxGetNextPage instead. Modified: trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4217… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Fri Jul 24 17:49:27 2009 @@ -1162,13 +1162,7 @@ /* FIXME: Support Triage Dump */ - /* Write the crash dump */ - MmDumpToPagingFile(KiBugCheckData[4], - KiBugCheckData[0], - KiBugCheckData[1], - KiBugCheckData[2], - KiBugCheckData[3], - TrapFrame); + /* FIXME: Write the crash dump */ } else { Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Fri Jul 24 17:49:27 2009 @@ -250,9 +250,10 @@ } // - // Use our highest usable free pages - // - Pfn = MxFreeDescriptor->BasePage + MxFreeDescriptor->PageCount - PageCount; + // Use our lowest usable free pages + // + Pfn = MxFreeDescriptor->BasePage; + MxFreeDescriptor->BasePage += PageCount; MxFreeDescriptor->PageCount -= PageCount; return Pfn; } Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Fri Jul 24 17:49:27 2009 @@ -133,110 +133,6 @@ MmRemoveLRUUserPage(PFN_TYPE Page) { RemoveEntryList(&MiGetPfnEntry(Page)->ListEntry); -} - -PFN_TYPE -NTAPI -MmGetContinuousPages(ULONG NumberOfBytes, - PHYSICAL_ADDRESS LowestAcceptableAddress, - PHYSICAL_ADDRESS HighestAcceptableAddress, - PHYSICAL_ADDRESS BoundaryAddressMultiple, - BOOLEAN ZeroPages) -{ - ULONG NrPages; - ULONG i, j; - ULONG start; - ULONG last; - ULONG length; - ULONG boundary; - KIRQL oldIrql; - - NrPages = PAGE_ROUND_UP(NumberOfBytes) / PAGE_SIZE; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - last = min(HighestAcceptableAddress.LowPart / PAGE_SIZE, MmHighestPhysicalPage - 1); - boundary = BoundaryAddressMultiple.LowPart / PAGE_SIZE; - - for (j = 0; j < 2; j++) - { - start = -1; - length = 0; - /* First try to allocate the pages above the 16MB area. This may fail - * because there are not enough continuous pages or we cannot allocate - * pages above the 16MB area because the caller has specify an upper limit. - * The second try uses the specified lower limit. - */ - for (i = j == 0 ? 0x100000 / PAGE_SIZE : LowestAcceptableAddress.LowPart / PAGE_SIZE; i <= last; ) - { - if (MiGetPfnEntry(i)->Flags.Type == MM_PHYSICAL_PAGE_FREE) - { - if (start == (ULONG)-1) - { - start = i; - length = 1; - } - else - { - length++; - if (boundary) - { - if (start / boundary != i / boundary) - { - start = i; - length = 1; - } - } - } - if (length == NrPages) - { - break; - } - } - else - { - start = (ULONG)-1; - } - i++; - } - - if (start != (ULONG)-1 && length == NrPages) - { - for (i = start; i < (start + length); i++) - { - PPHYSICAL_PAGE Page; - Page = MiGetPfnEntry(i); - RemoveEntryList(&Page->ListEntry); - if (MmPfnDatabase[i].Flags.Zero == 0) - { - UnzeroedPageCount--; - } - MmStats.NrFreePages--; - MmStats.NrSystemPages++; - Page->Flags.Type = MM_PHYSICAL_PAGE_USED; - Page->Flags.Consumer = MC_NPPOOL; - Page->ReferenceCount = 1; - Page->LockCount = 0; - Page->MapCount = 0; - Page->SavedSwapEntry = 0; - } - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - for (i = start; i < (start + length); i++) - { - if (MiGetPfnEntry(i)->Flags.Zero == 0) - { - if (ZeroPages) MiZeroPage(i); - } - else - { - MiGetPfnEntry(i)->Flags.Zero = 0; - } - } - return start; - } - } - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - return 0; } PFN_NUMBER @@ -706,20 +602,6 @@ return Mdl; } -PFN_TYPE -NTAPI -MmAllocEarlyPage(VOID) -{ - PFN_TYPE Pfn; - - /* Use one of our highest usable pages */ - Pfn = MxFreeDescriptor->BasePage + MxFreeDescriptor->PageCount - 1; - MxFreeDescriptor->PageCount--; - - /* Return it */ - return Pfn; -} - VOID NTAPI MmDumpPfnDatabase(VOID) @@ -820,6 +702,10 @@ KeLowerIrql(OldIrql); } +PFN_NUMBER +NTAPI +MxGetNextPage(IN PFN_NUMBER PageCount); + VOID NTAPI MmInitializePageList(VOID) @@ -845,7 +731,7 @@ if (!MmIsPagePresent(NULL, Address)) { /* Use one of our highest usable pages */ - Pfn = MmAllocEarlyPage(); + Pfn = MxGetNextPage(1); /* Set the PFN */ Status = MmCreateVirtualMappingForKernel(Address, @@ -934,9 +820,7 @@ } /* Finally handle the pages describing the PFN database themselves */ - for (i = (MxFreeDescriptor->BasePage + MxFreeDescriptor->PageCount); - i < (MxOldFreeDescriptor.BasePage + MxOldFreeDescriptor.PageCount); - i++) + for (i = MxOldFreeDescriptor.BasePage; i < MxFreeDescriptor->BasePage; i++) { /* Ensure this page was not added previously */ ASSERT(MmPfnDatabase[i].Flags.Type == 0); @@ -945,9 +829,8 @@ MmPfnDatabase[i] = UsedPage; MmStats.NrSystemPages++; } - + KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); - DPRINT("Pages: %x %x\n", MmStats.NrFreePages, MmStats.NrSystemPages); MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); @@ -1290,11 +1173,7 @@ /* Check if this allocation is for the PFN DB itself */ if (MmStats.NrTotalPages == 0) { - /* Allocate an early page -- we'll account for it later */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - PfnOffset = MmAllocEarlyPage(); - if (Consumer != MC_SYSTEM) MiZeroPage(PfnOffset); - return PfnOffset; + MxGetNextPage(1); } DPRINT1("MmAllocPage(): Out of memory\n"); @@ -1353,154 +1232,6 @@ KeBugCheck(MEMORY_MANAGEMENT); } return PfnOffset; -} - -LONG -NTAPI -MmAllocPagesSpecifyRange(ULONG Consumer, - PHYSICAL_ADDRESS LowestAddress, - PHYSICAL_ADDRESS HighestAddress, - ULONG NumberOfPages, - PPFN_TYPE Pages) -{ - PPHYSICAL_PAGE PageDescriptor; - KIRQL oldIrql; - PFN_TYPE LowestPage, HighestPage; - PFN_TYPE pfn; - ULONG NumberOfPagesFound = 0; - ULONG i; - - DPRINT("MmAllocPagesSpecifyRange()\n" - " LowestAddress = 0x%08x%08x\n" - " HighestAddress = 0x%08x%08x\n" - " NumberOfPages = %d\n", - LowestAddress.u.HighPart, LowestAddress.u.LowPart, - HighestAddress.u.HighPart, HighestAddress.u.LowPart, - NumberOfPages); - - if (NumberOfPages == 0) - return 0; - - LowestPage = LowestAddress.LowPart / PAGE_SIZE; - HighestPage = HighestAddress.LowPart / PAGE_SIZE; - if ((HighestAddress.u.LowPart % PAGE_SIZE) != 0) - HighestPage++; - - if (LowestPage >= MmHighestPhysicalPage) - { - DPRINT1("MmAllocPagesSpecifyRange(): Out of memory\n"); - return -1; - } - if (HighestPage > MmHighestPhysicalPage) - HighestPage = MmHighestPhysicalPage; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - if (LowestPage == 0 && HighestPage == MmHighestPhysicalPage) - { - PLIST_ENTRY ListEntry; - while (NumberOfPagesFound < NumberOfPages) - { - if (!IsListEmpty(&FreeZeroedPageListHead)) - { - ListEntry = RemoveTailList(&FreeZeroedPageListHead); - } - else if (!IsListEmpty(&FreeUnzeroedPageListHead)) - { - ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); - UnzeroedPageCount--; - } - else - { - if (NumberOfPagesFound == 0) - { - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - DPRINT1("MmAllocPagesSpecifyRange(): Out of memory\n"); - return -1; - } - else - { - break; - } - } - PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); - - ASSERT(PageDescriptor->Flags.Type == MM_PHYSICAL_PAGE_FREE); - ASSERT(PageDescriptor->MapCount == 0); - ASSERT(PageDescriptor->ReferenceCount == 0); - - /* Allocate the page */ - PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; - PageDescriptor->Flags.Consumer = Consumer; - PageDescriptor->ReferenceCount = 1; - PageDescriptor->LockCount = 0; - PageDescriptor->MapCount = 0; - PageDescriptor->SavedSwapEntry = 0; /* FIXME: Do we need swap entries? */ - - MmStats.NrSystemPages++; - MmStats.NrFreePages--; - - /* Remember the page */ - pfn = PageDescriptor - MmPfnDatabase; - Pages[NumberOfPagesFound++] = pfn; - if(Consumer == MC_USER) MmInsertLRULastUserPage(pfn); - } - } - else - { - INT LookForZeroedPages; - for (LookForZeroedPages = 1; LookForZeroedPages >= 0; LookForZeroedPages--) - { - for (pfn = LowestPage; pfn < HighestPage; pfn++) - { - PageDescriptor = MmPfnDatabase + pfn; - - if (PageDescriptor->Flags.Type != MM_PHYSICAL_PAGE_FREE) - continue; - if (PageDescriptor->Flags.Zero != LookForZeroedPages) - continue; - - ASSERT(PageDescriptor->MapCount == 0); - ASSERT(PageDescriptor->ReferenceCount == 0); - - /* Allocate the page */ - PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; - PageDescriptor->Flags.Consumer = Consumer; - PageDescriptor->ReferenceCount = 1; - PageDescriptor->LockCount = 0; - PageDescriptor->MapCount = 0; - PageDescriptor->SavedSwapEntry = 0; /* FIXME: Do we need swap entries? */ - - if (!PageDescriptor->Flags.Zero) - UnzeroedPageCount--; - MmStats.NrSystemPages++; - MmStats.NrFreePages--; - - /* Remember the page */ - Pages[NumberOfPagesFound++] = pfn; - if (NumberOfPagesFound == NumberOfPages) - break; - } - if (NumberOfPagesFound == NumberOfPages) - break; - } - } - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - - /* Zero unzero-ed pages */ - for (i = 0; i < NumberOfPagesFound; i++) - { - pfn = Pages[i]; - if (MiGetPfnEntry(pfn)->Flags.Zero == 0) - { - MiZeroPage(pfn); - } - else - { - MiGetPfnEntry(pfn)->Flags.Zero = 0; - } - } - - return NumberOfPagesFound; } NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Fri Jul 24 17:49:27 2009 @@ -105,15 +105,6 @@ */ #define MM_PAGEFILE_COMMIT_GRACE (256) -static PVOID MmCoreDumpPageFrame = NULL; -static ULONG MmCoreDumpSize; -static DUMP_POINTERS MmCoreDumpPointers; -static PMM_CORE_DUMP_FUNCTIONS MmCoreDumpFunctions; -static ULONG MmCoreDumpPageFile = 0xFFFFFFFF; -static ROS_QUERY_LCN_MAPPING MmCoreDumpLcnMapping; - -ULONG MmCoreDumpType = MM_CORE_DUMP_TYPE_NONE; - /* * Translate between a swap entry and a file and offset pair. */ @@ -360,22 +351,6 @@ PagingFileList[i] = NULL; } MiPagingFileCount = 0; - - /* - * Initialize the crash dump support. - */ - if (MmCoreDumpType != MM_CORE_DUMP_TYPE_NONE) - { - MmCoreDumpPageFrame = MmAllocateSection(PAGE_SIZE, NULL); - if (MmCoreDumpType == MM_CORE_DUMP_TYPE_FULL) - { - MmCoreDumpSize = MmStats.NrTotalPages * 4096 + 1024 * 1024; - } - else - { - MmCoreDumpSize = 1024 * 1024; - } - } } BOOLEAN @@ -536,263 +511,6 @@ } return RetDescList; -} - -NTSTATUS NTAPI -MmDumpToPagingFile(ULONG BugCode, - ULONG BugCodeParameter1, - ULONG BugCodeParameter2, - ULONG BugCodeParameter3, - ULONG BugCodeParameter4, - PKTRAP_FRAME TrapFrame) -{ - PMM_CORE_DUMP_HEADER Headers; - NTSTATUS Status; - UCHAR MdlBase[sizeof(MDL) + sizeof(ULONG)]; - PMDL Mdl = (PMDL)MdlBase; - PETHREAD Thread = PsGetCurrentThread(); - ULONG_PTR StackSize; - PULONG MdlMap; - LONGLONG NextOffset = 0; - ULONG i; - PRETRIEVAL_POINTERS_BUFFER RetrievalPointers; - LARGE_INTEGER DiskOffset; - - if (MmCoreDumpPageFile == 0xFFFFFFFF) - { - return(STATUS_UNSUCCESSFUL); - } - - DbgPrint("\nMM: Dumping core: "); - - /* Prepare the dump headers. */ - Headers = (PMM_CORE_DUMP_HEADER)MmCoreDumpPageFrame; - Headers->Magic = MM_CORE_DUMP_HEADER_MAGIC; - Headers->Version = MM_CORE_DUMP_HEADER_VERSION; - Headers->Type = MmCoreDumpType; - if (TrapFrame != NULL) - { -#ifdef _M_IX86 - if (!(TrapFrame->EFlags & (1 << 17))) - { - memcpy(&Headers->TrapFrame, TrapFrame, - sizeof(KTRAP_FRAME) - (4 * sizeof(ULONG))); - } - else -#endif - { - memcpy(&Headers->TrapFrame, TrapFrame, sizeof(KTRAP_FRAME)); - } - } - Headers->BugCheckCode = BugCode; - Headers->BugCheckParameters[0] = BugCodeParameter1; - Headers->BugCheckParameters[1] = BugCodeParameter2; - Headers->BugCheckParameters[2] = BugCodeParameter3; - Headers->BugCheckParameters[3] = BugCodeParameter4; - Headers->FaultingStackBase = (PVOID)Thread->Tcb.StackLimit; - Headers->FaultingStackSize = - StackSize = (ULONG_PTR)Thread->Tcb.StackBase - (ULONG_PTR)Thread->Tcb.StackLimit; - Headers->PhysicalMemorySize = MmStats.NrTotalPages * PAGE_SIZE; - - /* Initialize the dump device. */ - Status = MmCoreDumpFunctions->DumpInit(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MM: Failed to initialize core dump device.\n"); - return(Status); - } - - /* Initialize the MDL. */ - MmInitializeMdl(Mdl, MmCoreDumpPageFrame, PAGE_SIZE); - Mdl->MdlFlags = MDL_PAGES_LOCKED|MDL_IO_PAGE_READ|MDL_SOURCE_IS_NONPAGED_POOL; - MdlMap = (PULONG)(Mdl + 1); - - - /* Initialize the retrieval offsets. */ - RetrievalPointers = PagingFileList[MmCoreDumpPageFile]->RetrievalPointers; - - /* Dump the header. */ - MdlMap[0] = (ULONG)(MmGetPhysicalAddress(MmCoreDumpPageFrame).QuadPart >> PAGE_SHIFT); -#if defined(__GNUC__) - - DiskOffset = MmGetOffsetPageFile(RetrievalPointers, (LARGE_INTEGER)0LL); -#else - - { - const LARGE_INTEGER dummy = - { - 0 - }; - DiskOffset = MmGetOffsetPageFile(RetrievalPointers, dummy); - } -#endif - DiskOffset.QuadPart += MmCoreDumpLcnMapping.LcnDiskOffset.QuadPart; - Status = MmCoreDumpFunctions->DumpWrite(DiskOffset, Mdl); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MM: Failed to write core dump header\n."); - return(Status); - } - NextOffset += PAGE_SIZE; - ; - DbgPrint("00"); - - - /* Write out the contents of physical memory. */ - if (MmCoreDumpType == MM_CORE_DUMP_TYPE_FULL) - { - for (i = 0; i < MmStats.NrTotalPages; i++) - { - MdlMap[0] = i; - MmCreateVirtualMappingForKernel(MmCoreDumpPageFrame, - PAGE_READWRITE, - MdlMap, - 1); -#if defined(__GNUC__) - - DiskOffset = MmGetOffsetPageFile(RetrievalPointers, - (LARGE_INTEGER)NextOffset); -#else - - { - LARGE_INTEGER dummy; - dummy.QuadPart = NextOffset; - DiskOffset = MmGetOffsetPageFile(RetrievalPointers, dummy); - } -#endif - DiskOffset.QuadPart += MmCoreDumpLcnMapping.LcnDiskOffset.QuadPart; - Status = MmCoreDumpFunctions->DumpWrite(DiskOffset, Mdl); - MmRawDeleteVirtualMapping(MmCoreDumpPageFrame); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MM: Failed to write page to core dump.\n"); - return(Status); - } - if ((i % ((1024*1024) / PAGE_SIZE)) == 0) - { - DbgPrint("\b\b%.2d", i / ((1024*1024)/PAGE_SIZE)); - } - NextOffset += PAGE_SIZE; - } - } - - DbgPrint("\n"); - MmCoreDumpFunctions->DumpFinish(); - return(STATUS_SUCCESS); -} - -NTSTATUS NTAPI -MmInitializeCrashDump(HANDLE PageFileHandle, ULONG PageFileNum) -{ - PFILE_OBJECT PageFile; - PDEVICE_OBJECT PageFileDevice; - NTSTATUS Status; - PIRP Irp; - KEVENT Event; - IO_STATUS_BLOCK Iosb; - UNICODE_STRING DiskDumpName = RTL_CONSTANT_STRING(L"DiskDump"); - ANSI_STRING ProcName; - PIO_STACK_LOCATION StackPtr; - PLDR_DATA_TABLE_ENTRY ModuleObject = NULL; - PVOID BaseAddress; - - Status = ZwFsControlFile(PageFileHandle, - 0, - NULL, - NULL, - &Iosb, - FSCTL_ROS_QUERY_LCN_MAPPING, - NULL, - 0, - &MmCoreDumpLcnMapping, - sizeof(ROS_QUERY_LCN_MAPPING)); - if (!NT_SUCCESS(Status) || - Iosb.Information != sizeof(ROS_QUERY_LCN_MAPPING)) - { - return(Status); - } - - /* Get the underlying storage device. */ - Status = - ObReferenceObjectByHandle(PageFileHandle, - FILE_ALL_ACCESS, - NULL, - KernelMode, - (PVOID*)&PageFile, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - PageFileDevice = PageFile->Vpb->RealDevice; - - /* Get the dump pointers. */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoBuildDeviceIoControlRequest(IOCTL_SCSI_GET_DUMP_POINTERS, - PageFileDevice, - NULL, - 0, - &MmCoreDumpPointers, - sizeof(MmCoreDumpPointers), - FALSE, - &Event, - &Iosb); - if(Irp == NULL) - { - ObDereferenceObject(PageFile); - return(STATUS_NO_MEMORY);// tMk - is this correct return code ??? - } - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->FileObject = PageFile; - StackPtr->DeviceObject = PageFileDevice; - StackPtr->Parameters.DeviceIoControl.InputBufferLength = 0; - StackPtr->Parameters.DeviceIoControl.OutputBufferLength = sizeof(MmCoreDumpPointers); - - Status = IoCallDriver(PageFileDevice,Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - } - if (Status != STATUS_SUCCESS || - Iosb.Information != sizeof(MmCoreDumpPointers)) - { - ObDereferenceObject(PageFile); - return(Status); - } - - /* Load the diskdump driver. */ - Status = MmLoadSystemImage(&DiskDumpName, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); - if (ModuleObject == NULL) - { - return(STATUS_OBJECT_NAME_NOT_FOUND); - } - RtlInitAnsiString(&ProcName, "DiskDumpFunctions"); - MmCoreDumpFunctions = MiFindExportedRoutineByName(BaseAddress, - &ProcName); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(PageFile); - return(Status); - } - - /* Prepare for disk dumping. */ - Status = MmCoreDumpFunctions->DumpPrepare(PageFileDevice, - &MmCoreDumpPointers); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(PageFile); - return(Status); - } - - MmCoreDumpPageFile = PageFileNum; - ObDereferenceObject(PageFile); - return(STATUS_SUCCESS); } NTSTATUS NTAPI @@ -1135,13 +853,6 @@ MiPagingFileCount++; KeReleaseSpinLock(&PagingFileListLock, oldIrql); - /* Check whether this pagefile can be a crash dump target. */ - if (MmCoreDumpType != MM_CORE_DUMP_TYPE_NONE && - PagingFile->CurrentSize.QuadPart >= MmCoreDumpSize && - MmCoreDumpPageFile == 0xFFFFFFFF) - { - MmInitializeCrashDump(FileHandle, i); - } ZwClose(FileHandle); MmSwapSpaceMessage = FALSE;

1 0

[tkreuzer] 42174: - move delayimp.h to psdk
by tkreuzer＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: tkreuzer Date: Fri Jul 24 13:29:54 2009 New Revision: 42174 URL: http://svn.reactos.org/svn/reactos?rev=42174&view=rev Log: - move delayimp.h to psdk Added: trunk/reactos/include/psdk/delayimp.h - copied unchanged from r42172, trunk/reactos/lib/sdk/delayimp/delayimp.h Removed: trunk/reactos/lib/sdk/delayimp/delayimp.h Modified: trunk/reactos/lib/sdk/delayimp/delayimp.c Modified: trunk/reactos/lib/sdk/delayimp/delayimp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/delayimp/delayimp.… ============================================================================== --- trunk/reactos/lib/sdk/delayimp/delayimp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/delayimp/delayimp.c [iso-8859-1] Fri Jul 24 13:29:54 2009 @@ -8,7 +8,7 @@ */ #include <windows.h> -#include "delayimp.h" +#include <delayimp.h> /**** load helper ****/ Removed: trunk/reactos/lib/sdk/delayimp/delayimp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/delayimp/delayimp.… ============================================================================== --- trunk/reactos/lib/sdk/delayimp/delayimp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/delayimp/delayimp.h (removed) @@ -1,83 +1,0 @@ -#ifndef _delayimp_h -#define _delayimp_h - -#define DELAYLOAD_VERSION 0x200 - -typedef DWORD RVA; -typedef IMAGE_THUNK_DATA *PImgThunkData; -typedef const IMAGE_THUNK_DATA *PCImgThunkData; - -enum DLAttr -{ - dlattrRva = 0x1, -}; - -/* Notification codes */ -enum -{ - dliStartProcessing, - dliNotePreLoadLibrary, - dliNotePreGetProcAddress, - dliFailLoadLib, - dliFailGetProc, - dliNoteEndProcessing, -}; - -typedef struct ImgDelayDescr -{ - DWORD grAttrs; - RVA rvaDLLName; - RVA rvaHmod; - RVA rvaIAT; - RVA rvaINT; - RVA rvaBoundIAT; - RVA rvaUnloadIAT; - DWORD dwTimeStamp; -} ImgDelayDescr, *PImgDelayDescr; -typedef const ImgDelayDescr *PCImgDelayDescr; - -typedef struct DelayLoadProc -{ - BOOL fImportByName; - union - { - LPCSTR szProcName; - DWORD dwOrdinal; - }; -} DelayLoadProc; - -typedef struct DelayLoadInfo -{ - DWORD cb; - PCImgDelayDescr pidd; - FARPROC *ppfn; - LPCSTR szDll; - DelayLoadProc dlp; - HMODULE hmodCur; - FARPROC pfnCur; - DWORD dwLastError; -} DelayLoadInfo, *PDelayLoadInfo; - -typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo); - -static __inline__ -unsigned -IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase) -{ - return pData - pBase; -} - -extern const IMAGE_DOS_HEADER __ImageBase; - -static __inline__ -PVOID -PFromRva(RVA rva) -{ - return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&__ImageBase)); -} - - -extern PfnDliHook __pfnDliNotifyHook2; -extern PfnDliHook __pfnDliFailureHook2; - -#endif /* not _delayimp_h */

1 0

[dgorbachev] 42173: Add missing license.
by dgorbachev＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: dgorbachev Date: Fri Jul 24 12:52:49 2009 New Revision: 42173 URL: http://svn.reactos.org/svn/reactos?rev=42173&view=rev Log: Add missing license. Added: trunk/reactos/base/applications/paint/gpl.txt (with props) Modified: trunk/reactos/base/applications/paint/lgpl.txt Added: trunk/reactos/base/applications/paint/gpl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gp… ============================================================================== --- trunk/reactos/base/applications/paint/gpl.txt (added) +++ trunk/reactos/base/applications/paint/gpl.txt [iso-8859-1] Fri Jul 24 12:52:49 2009 @@ -1,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Propchange: trunk/reactos/base/applications/paint/gpl.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/paint/lgpl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/lg… ============================================================================== --- trunk/reactos/base/applications/paint/lgpl.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lgpl.txt [iso-8859-1] Fri Jul 24 12:52:49 2009 @@ -1,4 +1,4 @@ - GNU LESSER GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the

1 0

[tkreuzer] 42172: [delayimp] - move IndexFromPImgThunkData and PFromRva to delayimp.h - use __ImageBase insetad of _image_base__ - fix include guard - RVA is a DWORD, not a PVOID
by tkreuzer＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: tkreuzer Date: Fri Jul 24 12:25:53 2009 New Revision: 42172 URL: http://svn.reactos.org/svn/reactos?rev=42172&view=rev Log: [delayimp] - move IndexFromPImgThunkData and PFromRva to delayimp.h - use __ImageBase insetad of _image_base__ - fix include guard - RVA is a DWORD, not a PVOID Modified: trunk/reactos/lib/sdk/delayimp/delayimp.c trunk/reactos/lib/sdk/delayimp/delayimp.h Modified: trunk/reactos/lib/sdk/delayimp/delayimp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/delayimp/delayimp.… ============================================================================== --- trunk/reactos/lib/sdk/delayimp/delayimp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/delayimp/delayimp.c [iso-8859-1] Fri Jul 24 12:25:53 2009 @@ -9,21 +9,6 @@ #include <windows.h> #include "delayimp.h" - -inline -unsigned -IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase) -{ - return pData - pBase; -} - -extern const IMAGE_DOS_HEADER _image_base__; - -inline PVOID -PFromRva(RVA rva) -{ - return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&_image_base__)); -} /**** load helper ****/ Modified: trunk/reactos/lib/sdk/delayimp/delayimp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/delayimp/delayimp.… ============================================================================== --- trunk/reactos/lib/sdk/delayimp/delayimp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/delayimp/delayimp.h [iso-8859-1] Fri Jul 24 12:25:53 2009 @@ -1,14 +1,15 @@ -#ifndef _DELAYIMP_H_ -#define _DELAYIMP_H_ +#ifndef _delayimp_h +#define _delayimp_h -typedef void *RVA; +#define DELAYLOAD_VERSION 0x200 +typedef DWORD RVA; typedef IMAGE_THUNK_DATA *PImgThunkData; typedef const IMAGE_THUNK_DATA *PCImgThunkData; -enum +enum DLAttr { - dlattrRva + dlattrRva = 0x1, }; /* Notification codes */ @@ -59,7 +60,24 @@ typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo); +static __inline__ +unsigned +IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase) +{ + return pData - pBase; +} + +extern const IMAGE_DOS_HEADER __ImageBase; + +static __inline__ +PVOID +PFromRva(RVA rva) +{ + return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&__ImageBase)); +} + + extern PfnDliHook __pfnDliNotifyHook2; extern PfnDliHook __pfnDliFailureHook2; -#endif /* not _DELAYIMP_H_ */ +#endif /* not _delayimp_h */

1 0

[gedmurphy] 42171: Add a missing mockup image
by gedmurphy＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: gedmurphy Date: Fri Jul 24 09:44:51 2009 New Revision: 42171 URL: http://svn.reactos.org/svn/reactos?rev=42171&view=rev Log: Add a missing mockup image Added: trunk/reactos/base/shell/explorer-new/res/nolock_group_ql.bmp (with props) Modified: trunk/reactos/base/shell/explorer-new/explorer.rc Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] Fri Jul 24 09:44:51 2009 @@ -19,7 +19,7 @@ IDB_TASKBARPROP_NOLOCK_GROUP_NOQL BITMAP DISCARDABLE res/nolock_group_noql.bmp IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL BITMAP DISCARDABLE res/nolock_nogroup_noql.bmp IDB_TASKBARPROP_NOLOCK_NOGROUP_QL BITMAP DISCARDABLE res/nolock_nogroup_ql.bmp -IDB_TASKBARPROP_NOLOCK_GROUP_QL BITMAP DISCARDABLE res/nolock_nogroup_ql.bmp +IDB_TASKBARPROP_NOLOCK_GROUP_QL BITMAP DISCARDABLE res/nolock_group_ql.bmp #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" Added: trunk/reactos/base/shell/explorer-new/res/nolock_group_ql.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/shell/explorer-new/res/nolock_group_ql.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
61
Older →

Jump to page:

2025

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