Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[tfaber] 62708: [NTOS:CC] - Rename the CACHE_SEGMENT structure to ROS_VACB. This should eventually become NDK's VACB. CORE-8065

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 12 09:31:07 2014 New Revision: 62708 URL: http://svn.reactos.org/svn/reactos?rev=62708&view=rev Log: [NTOS:CC] - Rename the CACHE_SEGMENT structure to ROS_VACB. This should eventually become NDK's VACB. CORE-8065 Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Apr 12 09:31:07 2014 @@ -56,17 +56,17 @@ NTSTATUS NTAPI -ReadCacheSegmentChain ( +ReadVacbChain ( PBCB Bcb, ULONG ReadOffset, ULONG Length, PVOID Buffer) { - PCACHE_SEGMENT head; - PCACHE_SEGMENT current; - PCACHE_SEGMENT previous; + PROS_VACB head; + PROS_VACB current; + PROS_VACB previous; IO_STATUS_BLOCK Iosb; - LARGE_INTEGER SegOffset; + LARGE_INTEGER VacbOffset; NTSTATUS Status; ULONG TempLength; KEVENT Event; @@ -74,7 +74,7 @@ Mdl = _alloca(MmSizeOfMdl(NULL, MAX_RW_LENGTH)); - Status = CcRosGetCacheSegmentChain(Bcb, ReadOffset, Length, &head); + Status = CcRosGetVacbChain(Bcb, ReadOffset, Length, &head); if (!NT_SUCCESS(Status)) { return Status; @@ -83,8 +83,7 @@ while (current != NULL) { /* - * If the current segment is valid then copy it into the - * user buffer. + * If the current VACB is valid then copy it into the user buffer. */ if (current->Valid) { @@ -96,21 +95,21 @@ Length = Length - TempLength; previous = current; current = current->NextInChain; - CcRosReleaseCacheSegment(Bcb, previous, TRUE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, previous, TRUE, FALSE, FALSE); } /* * Otherwise read in as much as we can. */ else { - PCACHE_SEGMENT current2; + PROS_VACB current2; ULONG current_size; ULONG i; PPFN_NUMBER MdlPages; /* * Count the maximum number of bytes we could read starting - * from the current segment. + * from the current VACB. */ current2 = current; current_size = 0; @@ -142,11 +141,11 @@ /* * Read in the information. */ - SegOffset.QuadPart = current->FileOffset; + VacbOffset.QuadPart = current->FileOffset; KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoPageRead(Bcb->FileObject, Mdl, - &SegOffset, + &VacbOffset, &Event, &Iosb); if (Status == STATUS_PENDING) @@ -164,7 +163,7 @@ { previous = current; current = current->NextInChain; - CcRosReleaseCacheSegment(Bcb, previous, FALSE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, previous, FALSE, FALSE, FALSE); } return Status; } @@ -179,7 +178,7 @@ Buffer = (PVOID)((ULONG_PTR)Buffer + TempLength); Length = Length - TempLength; - CcRosReleaseCacheSegment(Bcb, previous, TRUE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, previous, TRUE, FALSE, FALSE); current_size += VACB_MAPPING_GRANULARITY; } } @@ -189,24 +188,24 @@ NTSTATUS NTAPI -ReadCacheSegment ( - PCACHE_SEGMENT CacheSeg) +CcReadVirtualAddress ( + PROS_VACB Vacb) { ULONG Size; PMDL Mdl; NTSTATUS Status; - LARGE_INTEGER SegOffset; + LARGE_INTEGER VacbOffset; IO_STATUS_BLOCK IoStatus; KEVENT Event; - SegOffset.QuadPart = CacheSeg->FileOffset; - Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); + VacbOffset.QuadPart = Vacb->FileOffset; + Size = (ULONG)(Vacb->Bcb->AllocationSize.QuadPart - Vacb->FileOffset); if (Size > VACB_MAPPING_GRANULARITY) { Size = VACB_MAPPING_GRANULARITY; } - Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); + Mdl = IoAllocateMdl(Vacb->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) { return STATUS_INSUFFICIENT_RESOURCES; @@ -215,7 +214,7 @@ MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, &Event, &IoStatus); + Status = IoPageRead(Vacb->Bcb->FileObject, Mdl, &VacbOffset, &Event, &IoStatus); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -232,7 +231,7 @@ if (Size < VACB_MAPPING_GRANULARITY) { - RtlZeroMemory((char*)CacheSeg->BaseAddress + Size, + RtlZeroMemory((char*)Vacb->BaseAddress + Size, VACB_MAPPING_GRANULARITY - Size); } @@ -241,19 +240,19 @@ NTSTATUS NTAPI -WriteCacheSegment ( - PCACHE_SEGMENT CacheSeg) +CcWriteVirtualAddress ( + PROS_VACB Vacb) { ULONG Size; PMDL Mdl; NTSTATUS Status; IO_STATUS_BLOCK IoStatus; - LARGE_INTEGER SegOffset; + LARGE_INTEGER VacbOffset; KEVENT Event; - CacheSeg->Dirty = FALSE; - SegOffset.QuadPart = CacheSeg->FileOffset; - Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); + Vacb->Dirty = FALSE; + VacbOffset.QuadPart = Vacb->FileOffset; + Size = (ULONG)(Vacb->Bcb->AllocationSize.QuadPart - Vacb->FileOffset); if (Size > VACB_MAPPING_GRANULARITY) { Size = VACB_MAPPING_GRANULARITY; @@ -266,11 +265,11 @@ ULONG i = 0; do { - MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i << PAGE_SHIFT))); + MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)Vacb->BaseAddress + (i << PAGE_SHIFT))); } while (++i < (Size >> PAGE_SHIFT)); } - Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); + Mdl = IoAllocateMdl(Vacb->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) { return STATUS_INSUFFICIENT_RESOURCES; @@ -278,7 +277,7 @@ MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, &Event, &IoStatus); + Status = IoSynchronousPageWrite(Vacb->Bcb->FileObject, Mdl, &VacbOffset, &Event, &IoStatus); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -288,7 +287,7 @@ if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { DPRINT1("IoPageWrite failed, Status %x\n", Status); - CacheSeg->Dirty = TRUE; + Vacb->Dirty = TRUE; return Status; } @@ -329,13 +328,13 @@ ULONG TempLength; NTSTATUS Status = STATUS_SUCCESS; PVOID BaseAddress; - PCACHE_SEGMENT CacheSeg; + PROS_VACB Vacb; BOOLEAN Valid; ULONG ReadLength = 0; PBCB Bcb; KIRQL oldirql; PLIST_ENTRY current_entry; - PCACHE_SEGMENT current; + PROS_VACB current; DPRINT("CcCopyRead(FileObject 0x%p, FileOffset %I64x, " "Length %lu, Wait %u, Buffer 0x%p, IoStatus 0x%p)\n", @@ -350,22 +349,22 @@ Bcb->FileSize.QuadPart); /* - * Check for the nowait case that all the cache segments that would + * Check for the nowait case that all the cache VACBs that would * cover this read are in memory. */ if (!Wait) { KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); /* FIXME: this loop doesn't take into account areas that don't have - * a segment in the list yet */ - current_entry = Bcb->BcbSegmentListHead.Flink; - while (current_entry != &Bcb->BcbSegmentListHead) - { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - BcbSegmentListEntry); + * a VACB in the list yet */ + current_entry = Bcb->BcbVacbListHead.Flink; + while (current_entry != &Bcb->BcbVacbListHead) + { + current = CONTAINING_RECORD(current_entry, ROS_VACB, + BcbVacbListEntry); if (!current->Valid && - DoSegmentsIntersect(current->FileOffset, VACB_MAPPING_GRANULARITY, - ReadOffset, Length)) + DoRangesIntersect(current->FileOffset, VACB_MAPPING_GRANULARITY, + ReadOffset, Length)) { KeReleaseSpinLock(&Bcb->BcbLock, oldirql); IoStatus->Status = STATUS_UNSUCCESSFUL; @@ -383,32 +382,32 @@ if (TempLength != 0) { TempLength = min(Length, VACB_MAPPING_GRANULARITY - TempLength); - Status = CcRosRequestCacheSegment(Bcb, - ROUND_DOWN(ReadOffset, - VACB_MAPPING_GRANULARITY), - &BaseAddress, &Valid, &CacheSeg); + Status = CcRosRequestVacb(Bcb, + ROUND_DOWN(ReadOffset, + VACB_MAPPING_GRANULARITY), + &BaseAddress, &Valid, &Vacb); if (!NT_SUCCESS(Status)) { IoStatus->Information = 0; IoStatus->Status = Status; - DPRINT("CcRosRequestCacheSegment faild, Status %x\n", Status); + DPRINT("CcRosRequestVacb failed, Status %x\n", Status); return FALSE; } if (!Valid) { - Status = ReadCacheSegment(CacheSeg); + Status = CcReadVirtualAddress(Vacb); if (!NT_SUCCESS(Status)) { IoStatus->Information = 0; IoStatus->Status = Status; - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); return FALSE; } } RtlCopyMemory(Buffer, (char*)BaseAddress + ReadOffset % VACB_MAPPING_GRANULARITY, TempLength); - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, FALSE); ReadLength += TempLength; Length -= TempLength; ReadOffset += TempLength; @@ -418,12 +417,12 @@ while (Length > 0) { TempLength = min(VACB_MAPPING_GRANULARITY, Length); - Status = ReadCacheSegmentChain(Bcb, ReadOffset, TempLength, Buffer); + Status = ReadVacbChain(Bcb, ReadOffset, TempLength, Buffer); if (!NT_SUCCESS(Status)) { IoStatus->Information = 0; IoStatus->Status = Status; - DPRINT("ReadCacheSegmentChain failed, Status %x\n", Status); + DPRINT("ReadVacbChain failed, Status %x\n", Status); return FALSE; } @@ -457,7 +456,7 @@ KIRQL oldirql; PBCB Bcb; PLIST_ENTRY current_entry; - PCACHE_SEGMENT CacheSeg; + PROS_VACB Vacb; ULONG TempLength; PVOID BaseAddress; BOOLEAN Valid; @@ -474,21 +473,22 @@ /* testing, if the requested datas are available */ KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); /* FIXME: this loop doesn't take into account areas that don't have - * a segment in the list yet */ - current_entry = Bcb->BcbSegmentListHead.Flink; - while (current_entry != &Bcb->BcbSegmentListHead) - { - CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - BcbSegmentListEntry); - if (!CacheSeg->Valid && - DoSegmentsIntersect(CacheSeg->FileOffset, VACB_MAPPING_GRANULARITY, - WriteOffset, Length)) + * a VACB in the list yet */ + current_entry = Bcb->BcbVacbListHead.Flink; + while (current_entry != &Bcb->BcbVacbListHead) + { + Vacb = CONTAINING_RECORD(current_entry, + ROS_VACB, + BcbVacbListEntry); + if (!Vacb->Valid && + DoRangesIntersect(Vacb->FileOffset, VACB_MAPPING_GRANULARITY, + WriteOffset, Length)) { KeReleaseSpinLock(&Bcb->BcbLock, oldirql); /* datas not available */ return FALSE; } - if (CacheSeg->FileOffset >= WriteOffset + Length) + if (Vacb->FileOffset >= WriteOffset + Length) break; current_entry = current_entry->Flink; } @@ -501,15 +501,15 @@ ULONG ROffset; ROffset = ROUND_DOWN(WriteOffset, VACB_MAPPING_GRANULARITY); TempLength = min(Length, VACB_MAPPING_GRANULARITY - TempLength); - Status = CcRosRequestCacheSegment(Bcb, ROffset, - &BaseAddress, &Valid, &CacheSeg); + Status = CcRosRequestVacb(Bcb, ROffset, + &BaseAddress, &Valid, &Vacb); if (!NT_SUCCESS(Status)) { return FALSE; } if (!Valid) { - if (!NT_SUCCESS(ReadCacheSegment(CacheSeg))) + if (!NT_SUCCESS(CcReadVirtualAddress(Vacb))) { return FALSE; } @@ -517,7 +517,7 @@ RtlCopyMemory((char*)BaseAddress + WriteOffset % VACB_MAPPING_GRANULARITY, Buffer, TempLength); - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, TRUE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, TRUE, TRUE, FALSE); Length -= TempLength; WriteOffset += TempLength; @@ -528,25 +528,25 @@ while (Length > 0) { TempLength = min(VACB_MAPPING_GRANULARITY, Length); - Status = CcRosRequestCacheSegment(Bcb, - WriteOffset, - &BaseAddress, - &Valid, - &CacheSeg); + Status = CcRosRequestVacb(Bcb, + WriteOffset, + &BaseAddress, + &Valid, + &Vacb); if (!NT_SUCCESS(Status)) { return FALSE; } if (!Valid && TempLength < VACB_MAPPING_GRANULARITY) { - if (!NT_SUCCESS(ReadCacheSegment(CacheSeg))) - { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + if (!NT_SUCCESS(CcReadVirtualAddress(Vacb))) + { + CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); return FALSE; } } RtlCopyMemory(BaseAddress, Buffer, TempLength); - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, TRUE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, TRUE, TRUE, FALSE); Length -= TempLength; WriteOffset += TempLength; @@ -686,7 +686,7 @@ KIRQL oldirql; PBCB Bcb; PLIST_ENTRY current_entry; - PCACHE_SEGMENT CacheSeg, current, previous; + PROS_VACB Vacb, current, previous; ULONG TempLength; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; @@ -695,21 +695,22 @@ /* testing, if the requested datas are available */ KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); /* FIXME: this loop doesn't take into account areas that don't have - * a segment in the list yet */ - current_entry = Bcb->BcbSegmentListHead.Flink; - while (current_entry != &Bcb->BcbSegmentListHead) - { - CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - BcbSegmentListEntry); - if (!CacheSeg->Valid && - DoSegmentsIntersect(CacheSeg->FileOffset, VACB_MAPPING_GRANULARITY, - WriteOffset.u.LowPart, Length)) + * a VACB in the list yet */ + current_entry = Bcb->BcbVacbListHead.Flink; + while (current_entry != &Bcb->BcbVacbListHead) + { + Vacb = CONTAINING_RECORD(current_entry, + ROS_VACB, + BcbVacbListEntry); + if (!Vacb->Valid && + DoRangesIntersect(Vacb->FileOffset, VACB_MAPPING_GRANULARITY, + WriteOffset.u.LowPart, Length)) { KeReleaseSpinLock(&Bcb->BcbLock, oldirql); /* datas not available */ return FALSE; } - if (CacheSeg->FileOffset >= WriteOffset.u.LowPart + Length) + if (Vacb->FileOffset >= WriteOffset.u.LowPart + Length) break; current_entry = current_entry->Flink; } @@ -728,13 +729,13 @@ { CurrentLength = Length; } - Status = CcRosGetCacheSegmentChain (Bcb, WriteOffset.u.LowPart - Offset, - Offset + CurrentLength, &CacheSeg); + Status = CcRosGetVacbChain(Bcb, WriteOffset.u.LowPart - Offset, + Offset + CurrentLength, &Vacb); if (!NT_SUCCESS(Status)) { return FALSE; } - current = CacheSeg; + current = Vacb; while (current != NULL) { @@ -744,11 +745,11 @@ { if (!current->Valid) { - /* read the segment */ - Status = ReadCacheSegment(current); + /* read the block */ + Status = CcReadVirtualAddress(current); if (!NT_SUCCESS(Status)) { - DPRINT1("ReadCacheSegment failed, status %x\n", + DPRINT1("CcReadVirtualAddress failed, status %x\n", Status); } } @@ -768,12 +769,12 @@ current = current->NextInChain; } - current = CacheSeg; + current = Vacb; while (current != NULL) { previous = current; current = current->NextInChain; - CcRosReleaseCacheSegment(Bcb, previous, TRUE, TRUE, FALSE); + CcRosReleaseVacb(Bcb, previous, TRUE, TRUE, FALSE); } } } Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=62708… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sat Apr 12 09:31:07 2014 @@ -22,7 +22,7 @@ extern KGUARDED_MUTEX ViewLock; extern ULONG DirtyPageCount; -NTSTATUS CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg); +NTSTATUS CcRosInternalFreeVacb(PROS_VACB Vacb); /* FUNCTIONS *****************************************************************/ @@ -52,7 +52,7 @@ IN PVOID Bcb) { PINTERNAL_BCB iBcb = (PINTERNAL_BCB)Bcb; - return iBcb->CacheSegment->Bcb->FileObject; + return iBcb->Vacb->Bcb->FileObject; } /* @@ -130,7 +130,7 @@ KIRQL oldirql; PBCB Bcb; PLIST_ENTRY current_entry; - PCACHE_SEGMENT current; + PROS_VACB current; LIST_ENTRY FreeListHead; NTSTATUS Status; @@ -156,30 +156,30 @@ KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); - current_entry = Bcb->BcbSegmentListHead.Flink; - while (current_entry != &Bcb->BcbSegmentListHead) + current_entry = Bcb->BcbVacbListHead.Flink; + while (current_entry != &Bcb->BcbVacbListHead) { current = CONTAINING_RECORD(current_entry, - CACHE_SEGMENT, - BcbSegmentListEntry); + ROS_VACB, + BcbVacbListEntry); current_entry = current_entry->Flink; if (current->FileOffset >= FileSizes->AllocationSize.QuadPart) { if ((current->ReferenceCount == 0) || ((current->ReferenceCount == 1) && current->Dirty)) { - RemoveEntryList(&current->BcbSegmentListEntry); - RemoveEntryList(&current->CacheSegmentListEntry); - RemoveEntryList(&current->CacheSegmentLRUListEntry); + RemoveEntryList(&current->BcbVacbListEntry); + RemoveEntryList(&current->VacbListEntry); + RemoveEntryList(&current->VacbLruListEntry); if (current->Dirty) { - RemoveEntryList(&current->DirtySegmentListEntry); + RemoveEntryList(&current->DirtyVacbListEntry); DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; } - InsertHeadList(&FreeListHead, &current->BcbSegmentListEntry); + InsertHeadList(&FreeListHead, &current->BcbVacbListEntry); } else { - DPRINT1("Anyone has referenced a cache segment behind the new size.\n"); + DPRINT1("Someone has referenced a VACB behind the new size.\n"); KeBugCheck(CACHE_MANAGER); } } @@ -193,12 +193,12 @@ current_entry = FreeListHead.Flink; while(current_entry != &FreeListHead) { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); + current = CONTAINING_RECORD(current_entry, ROS_VACB, BcbVacbListEntry); current_entry = current_entry->Flink; - Status = CcRosInternalFreeCacheSegment(current); + Status = CcRosInternalFreeVacb(current); if (!NT_SUCCESS(Status)) { - DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n", Status); + DPRINT1("CcRosInternalFreeVacb failed, status = %x\n", Status); KeBugCheck(CACHE_MANAGER); } } Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=6270… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sat Apr 12 09:31:07 2014 @@ -35,7 +35,7 @@ ULONG ReadOffset; BOOLEAN Valid; PBCB Bcb; - PCACHE_SEGMENT CacheSeg; + PROS_VACB Vacb; NTSTATUS Status; PINTERNAL_BCB iBcb; ULONG ROffset; @@ -63,11 +63,11 @@ } ROffset = ROUND_DOWN(ReadOffset, VACB_MAPPING_GRANULARITY); - Status = CcRosRequestCacheSegment(Bcb, - ROffset, - pBuffer, - &Valid, - &CacheSeg); + Status = CcRosRequestVacb(Bcb, + ROffset, + pBuffer, + &Valid, + &Vacb); if (!NT_SUCCESS(Status)) { return FALSE; @@ -77,13 +77,13 @@ { if (!(Flags & MAP_WAIT)) { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); return FALSE; } - if (!NT_SUCCESS(ReadCacheSegment(CacheSeg))) - { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + if (!NT_SUCCESS(CcReadVirtualAddress(Vacb))) + { + CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); return FALSE; } } @@ -92,7 +92,7 @@ iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); if (iBcb == NULL) { - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, FALSE); return FALSE; } @@ -101,7 +101,7 @@ iBcb->PFCB.NodeByteSize = sizeof(PUBLIC_BCB); iBcb->PFCB.MappedLength = Length; iBcb->PFCB.MappedFileOffset = *FileOffset; - iBcb->CacheSegment = CacheSeg; + iBcb->Vacb = Vacb; iBcb->Dirty = FALSE; iBcb->RefCount = 1; *pBcb = (PVOID)iBcb; @@ -165,7 +165,7 @@ /* * FIXME: This is function is similar to CcPinRead, but doesn't * read the data if they're not present. Instead it should just - * prepare the cache segments and zero them out if Zero == TRUE. + * prepare the VACBs and zero them out if Zero == TRUE. * * For now calling CcPinRead is better than returning error or * just having UNIMPLEMENTED here. @@ -195,11 +195,11 @@ { PINTERNAL_BCB iBcb = Bcb; - CcRosReleaseCacheSegment(iBcb->CacheSegment->Bcb, - iBcb->CacheSegment, - TRUE, - iBcb->Dirty, - FALSE); + CcRosReleaseVacb(iBcb->Vacb->Bcb, + iBcb->Vacb, + TRUE, + iBcb->Dirty, + FALSE); if (--iBcb->RefCount == 0) { ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); @@ -248,20 +248,20 @@ IoStatus->Information = 0; if (WriteThrough) { - KeWaitForSingleObject(&iBcb->CacheSegment->Mutex, + KeWaitForSingleObject(&iBcb->Vacb->Mutex, Executive, KernelMode, FALSE, NULL); - if (iBcb->CacheSegment->Dirty) + if (iBcb->Vacb->Dirty) { - IoStatus->Status = CcRosFlushCacheSegment(iBcb->CacheSegment); + IoStatus->Status = CcRosFlushVacb(iBcb->Vacb); } else { IoStatus->Status = STATUS_SUCCESS; } - KeReleaseMutex(&iBcb->CacheSegment->Mutex, FALSE); + KeReleaseMutex(&iBcb->Vacb->Mutex, FALSE); } else { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=627… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Apr 12 09:31:07 2014 @@ -41,9 +41,9 @@ /* GLOBALS *******************************************************************/ -static LIST_ENTRY DirtySegmentListHead; -static LIST_ENTRY CacheSegmentListHead; -static LIST_ENTRY CacheSegmentLRUListHead; +static LIST_ENTRY DirtyVacbListHead; +static LIST_ENTRY VacbListHead; +static LIST_ENTRY VacbLruListHead; static LIST_ENTRY ClosedListHead; ULONG DirtyPageCount = 0; @@ -51,36 +51,36 @@ NPAGED_LOOKASIDE_LIST iBcbLookasideList; static NPAGED_LOOKASIDE_LIST BcbLookasideList; -static NPAGED_LOOKASIDE_LIST CacheSegLookasideList; +static NPAGED_LOOKASIDE_LIST VacbLookasideList; #if DBG -static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line ) -{ - ++cs->ReferenceCount; - if ( cs->Bcb->Trace ) - { - DbgPrint("(%s:%i) CacheSegment %p ++RefCount=%lu, Dirty %u, PageOut %lu\n", - file, line, cs, cs->ReferenceCount, cs->Dirty, cs->PageOut ); - } -} -static void CcRosCacheSegmentDecRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line ) -{ - --cs->ReferenceCount; - if ( cs->Bcb->Trace ) - { - DbgPrint("(%s:%i) CacheSegment %p --RefCount=%lu, Dirty %u, PageOut %lu\n", - file, line, cs, cs->ReferenceCount, cs->Dirty, cs->PageOut ); - } -} -#define CcRosCacheSegmentIncRefCount(cs) CcRosCacheSegmentIncRefCount_(cs,__FILE__,__LINE__) -#define CcRosCacheSegmentDecRefCount(cs) CcRosCacheSegmentDecRefCount_(cs,__FILE__,__LINE__) +static void CcRosVacbIncRefCount_(PROS_VACB vacb, const char* file, int line) +{ + ++vacb->ReferenceCount; + if (vacb->Bcb->Trace) + { + DbgPrint("(%s:%i) VACB %p ++RefCount=%lu, Dirty %u, PageOut %lu\n", + file, line, vacb, vacb->ReferenceCount, vacb->Dirty, vacb->PageOut); + } +} +static void CcRosVacbDecRefCount_(PROS_VACB vacb, const char* file, int line) +{ + --vacb->ReferenceCount; + if (vacb->Bcb->Trace) + { + DbgPrint("(%s:%i) VACB %p --RefCount=%lu, Dirty %u, PageOut %lu\n", + file, line, vacb, vacb->ReferenceCount, vacb->Dirty, vacb->PageOut); + } +} +#define CcRosVacbIncRefCount(vacb) CcRosVacbIncRefCount_(vacb,__FILE__,__LINE__) +#define CcRosVacbDecRefCount(vacb) CcRosVacbDecRefCount_(vacb,__FILE__,__LINE__) #else -#define CcRosCacheSegmentIncRefCount(cs) (++((cs)->ReferenceCount)) -#define CcRosCacheSegmentDecRefCount(cs) (--((cs)->ReferenceCount)) +#define CcRosVacbIncRefCount(vacb) (++((vacb)->ReferenceCount)) +#define CcRosVacbDecRefCount(vacb) (--((vacb)->ReferenceCount)) #endif NTSTATUS -CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg); +CcRosInternalFreeVacb(PROS_VACB Vacb); /* FUNCTIONS *****************************************************************/ @@ -94,7 +94,7 @@ #if DBG KIRQL oldirql; PLIST_ENTRY current_entry; - PCACHE_SEGMENT current; + PROS_VACB current; if ( !Bcb ) return; @@ -108,13 +108,13 @@ KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); - current_entry = Bcb->BcbSegmentListHead.Flink; - while (current_entry != &Bcb->BcbSegmentListHead) - { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); + current_entry = Bcb->BcbVacbListHead.Flink; + while (current_entry != &Bcb->BcbVacbListHead) + { + current = CONTAINING_RECORD(current_entry, ROS_VACB, BcbVacbListEntry); current_entry = current_entry->Flink; - DPRINT1(" CacheSegment 0x%p enabled, RefCount %lu, Dirty %u, PageOut %lu\n", + DPRINT1(" VACB 0x%p enabled, RefCount %lu, Dirty %u, PageOut %lu\n", current, current->ReferenceCount, current->Dirty, current->PageOut ); } KeReleaseSpinLock(&Bcb->BcbLock, oldirql); @@ -133,24 +133,24 @@ NTSTATUS NTAPI -CcRosFlushCacheSegment ( - PCACHE_SEGMENT CacheSegment) +CcRosFlushVacb ( + PROS_VACB Vacb) { NTSTATUS Status; KIRQL oldIrql; - Status = WriteCacheSegment(CacheSegment); + Status = CcWriteVirtualAddress(Vacb); if (NT_SUCCESS(Status)) { KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&CacheSegment->Bcb->BcbLock, &oldIrql); - - CacheSegment->Dirty = FALSE; - RemoveEntryList(&CacheSegment->DirtySegmentListEntry); + KeAcquireSpinLock(&Vacb->Bcb->BcbLock, &oldIrql); + + Vacb->Dirty = FALSE; + RemoveEntryList(&Vacb->DirtyVacbListEntry); DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; - CcRosCacheSegmentDecRefCount(CacheSegment); - - KeReleaseSpinLock(&CacheSegment->Bcb->BcbLock, oldIrql); + CcRosVacbDecRefCount(Vacb); + + KeReleaseSpinLock(&Vacb->Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); } @@ -165,8 +165,7 @@ BOOLEAN Wait) { PLIST_ENTRY current_entry; - PCACHE_SEGMENT current; - ULONG PagesPerSegment; + PROS_VACB current; BOOLEAN Locked; NTSTATUS Status; LARGE_INTEGER ZeroTimeout; @@ -179,25 +178,26 @@ KeEnterCriticalRegion(); KeAcquireGuardedMutex(&ViewLock); - current_entry = DirtySegmentListHead.Flink; - if (current_entry == &DirtySegmentListHead) + current_entry = DirtyVacbListHead.Flink; + if (current_entry == &DirtyVacbListHead) { DPRINT("No Dirty pages\n"); } - while ((current_entry != &DirtySegmentListHead) && (Target > 0)) - { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - DirtySegmentListEntry); + while ((current_entry != &DirtyVacbListHead) && (Target > 0)) + { + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + DirtyVacbListEntry); current_entry = current_entry->Flink; - CcRosCacheSegmentIncRefCount(current); + CcRosVacbIncRefCount(current); Locked = current->Bcb->Callbacks->AcquireForLazyWrite( current->Bcb->LazyWriteContext, Wait); if (!Locked) { - CcRosCacheSegmentDecRefCount(current); + CcRosVacbDecRefCount(current); continue; } @@ -210,7 +210,7 @@ { current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); - CcRosCacheSegmentDecRefCount(current); + CcRosVacbDecRefCount(current); continue; } @@ -222,34 +222,32 @@ KeReleaseMutex(&current->Mutex, FALSE); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); - CcRosCacheSegmentDecRefCount(current); + CcRosVacbDecRefCount(current); continue; } - PagesPerSegment = VACB_MAPPING_GRANULARITY / PAGE_SIZE; - KeReleaseGuardedMutex(&ViewLock); - Status = CcRosFlushCacheSegment(current); + Status = CcRosFlushVacb(current); KeReleaseMutex(&current->Mutex, FALSE); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); KeAcquireGuardedMutex(&ViewLock); - CcRosCacheSegmentDecRefCount(current); + CcRosVacbDecRefCount(current); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { - DPRINT1("CC: Failed to flush cache segment.\n"); + DPRINT1("CC: Failed to flush VACB.\n"); } else { - (*Count) += PagesPerSegment; - Target -= PagesPerSegment; - } - - current_entry = DirtySegmentListHead.Flink; + (*Count) += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + Target -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; + } + + current_entry = DirtyVacbListHead.Flink; } KeReleaseGuardedMutex(&ViewLock); @@ -274,8 +272,7 @@ */ { PLIST_ENTRY current_entry; - PCACHE_SEGMENT current; - ULONG PagesPerSegment; + PROS_VACB current; ULONG PagesFreed; KIRQL oldIrql; LIST_ENTRY FreeList; @@ -292,17 +289,18 @@ retry: KeAcquireGuardedMutex(&ViewLock); - current_entry = CacheSegmentLRUListHead.Flink; - while (current_entry != &CacheSegmentLRUListHead) - { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - CacheSegmentLRUListEntry); + current_entry = VacbLruListHead.Flink; + while (current_entry != &VacbLruListHead) + { + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + VacbLruListEntry); current_entry = current_entry->Flink; KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); - /* Reference the cache segment */ - CcRosCacheSegmentIncRefCount(current); + /* Reference the VACB */ + CcRosVacbIncRefCount(current); /* Check if it's mapped and not dirty */ if (current->MappedCount > 0 && !current->Dirty) @@ -311,7 +309,7 @@ KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - /* Page out the segment */ + /* Page out the VACB */ for (i = 0; i < VACB_MAPPING_GRANULARITY / PAGE_SIZE; i++) { Page = (PFN_NUMBER)(MmGetPhysicalAddress((PUCHAR)current->BaseAddress + (i * PAGE_SIZE)).QuadPart >> PAGE_SHIFT); @@ -324,8 +322,8 @@ KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); } - /* Dereference the cache segment */ - CcRosCacheSegmentDecRefCount(current); + /* Dereference the VACB */ + CcRosVacbDecRefCount(current); /* Check if we can free this entry now */ if (current->ReferenceCount == 0) @@ -333,14 +331,13 @@ ASSERT(!current->Dirty); ASSERT(!current->MappedCount); - RemoveEntryList(&current->BcbSegmentListEntry); - RemoveEntryList(&current->CacheSegmentListEntry); - RemoveEntryList(&current->CacheSegmentLRUListEntry); - InsertHeadList(&FreeList, &current->BcbSegmentListEntry); + RemoveEntryList(&current->BcbVacbListEntry); + RemoveEntryList(&current->VacbListEntry); + RemoveEntryList(&current->VacbLruListEntry); + InsertHeadList(&FreeList, &current->BcbVacbListEntry); /* Calculate how many pages we freed for Mm */ - PagesPerSegment = VACB_MAPPING_GRANULARITY / PAGE_SIZE; - PagesFreed = min(PagesPerSegment, Target); + PagesFreed = min(VACB_MAPPING_GRANULARITY / PAGE_SIZE, Target); Target -= PagesFreed; (*NrFreed) += PagesFreed; } @@ -372,9 +369,10 @@ while (!IsListEmpty(&FreeList)) { current_entry = RemoveHeadList(&FreeList); - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - BcbSegmentListEntry); - CcRosInternalFreeCacheSegment(current); + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + BcbVacbListEntry); + CcRosInternalFreeVacb(current); } DPRINT("Evicted %lu cache pages\n", (*NrFreed)); @@ -384,9 +382,9 @@ NTSTATUS NTAPI -CcRosReleaseCacheSegment ( +CcRosReleaseVacb ( PBCB Bcb, - PCACHE_SEGMENT CacheSeg, + PROS_VACB Vacb, BOOLEAN Valid, BOOLEAN Dirty, BOOLEAN Mapped) @@ -396,71 +394,72 @@ ASSERT(Bcb); - DPRINT("CcReleaseCacheSegment(Bcb 0x%p, CacheSeg 0x%p, Valid %u)\n", - Bcb, CacheSeg, Valid); + DPRINT("CcRosReleaseVacb(Bcb 0x%p, Vacb 0x%p, Valid %u)\n", + Bcb, Vacb, Valid); KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - CacheSeg->Valid = Valid; - - WasDirty = CacheSeg->Dirty; - CacheSeg->Dirty = CacheSeg->Dirty || Dirty; - - if (!WasDirty && CacheSeg->Dirty) - { - InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); + Vacb->Valid = Valid; + + WasDirty = Vacb->Dirty; + Vacb->Dirty = Vacb->Dirty || Dirty; + + if (!WasDirty && Vacb->Dirty) + { + InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } if (Mapped) { - CacheSeg->MappedCount++; - } - CcRosCacheSegmentDecRefCount(CacheSeg); - if (Mapped && (CacheSeg->MappedCount == 1)) - { - CcRosCacheSegmentIncRefCount(CacheSeg); - } - if (!WasDirty && CacheSeg->Dirty) - { - CcRosCacheSegmentIncRefCount(CacheSeg); + Vacb->MappedCount++; + } + CcRosVacbDecRefCount(Vacb); + if (Mapped && (Vacb->MappedCount == 1)) + { + CcRosVacbIncRefCount(Vacb); + } + if (!WasDirty && Vacb->Dirty) + { + CcRosVacbIncRefCount(Vacb); } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeReleaseMutex(&CacheSeg->Mutex, FALSE); + KeReleaseMutex(&Vacb->Mutex, FALSE); return STATUS_SUCCESS; } -/* Returns with Cache Segment Lock Held! */ -PCACHE_SEGMENT -NTAPI -CcRosLookupCacheSegment ( +/* Returns with VACB Lock Held! */ +PROS_VACB +NTAPI +CcRosLookupVacb ( PBCB Bcb, ULONG FileOffset) { PLIST_ENTRY current_entry; - PCACHE_SEGMENT current; + PROS_VACB current; KIRQL oldIrql; ASSERT(Bcb); - DPRINT("CcRosLookupCacheSegment(Bcb -x%p, FileOffset %lu)\n", Bcb, FileOffset); + DPRINT("CcRosLookupVacb(Bcb -x%p, FileOffset %lu)\n", Bcb, FileOffset); KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - current_entry = Bcb->BcbSegmentListHead.Flink; - while (current_entry != &Bcb->BcbSegmentListHead) - { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - BcbSegmentListEntry); - if (IsPointInSegment(current->FileOffset, VACB_MAPPING_GRANULARITY, - FileOffset)) - { - CcRosCacheSegmentIncRefCount(current); + current_entry = Bcb->BcbVacbListHead.Flink; + while (current_entry != &Bcb->BcbVacbListHead) + { + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + BcbVacbListEntry); + if (IsPointInRange(current->FileOffset, VACB_MAPPING_GRANULARITY, + FileOffset)) + { + CcRosVacbIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); KeWaitForSingleObject(&current->Mutex, @@ -483,19 +482,19 @@ NTSTATUS NTAPI -CcRosMarkDirtyCacheSegment ( +CcRosMarkDirtyVacb ( PBCB Bcb, ULONG FileOffset) { - PCACHE_SEGMENT CacheSeg; + PROS_VACB Vacb; KIRQL oldIrql; ASSERT(Bcb); - DPRINT("CcRosMarkDirtyCacheSegment(Bcb 0x%p, FileOffset %lu)\n", Bcb, FileOffset); - - CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset); - if (CacheSeg == NULL) + DPRINT("CcRosMarkDirtyVacb(Bcb 0x%p, FileOffset %lu)\n", Bcb, FileOffset); + + Vacb = CcRosLookupVacb(Bcb, FileOffset); + if (Vacb == NULL) { KeBugCheck(CACHE_MANAGER); } @@ -503,47 +502,47 @@ KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - if (!CacheSeg->Dirty) - { - InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); + if (!Vacb->Dirty) + { + InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } else { - CcRosCacheSegmentDecRefCount(CacheSeg); + CcRosVacbDecRefCount(Vacb); } /* Move to the tail of the LRU list */ - RemoveEntryList(&CacheSeg->CacheSegmentLRUListEntry); - InsertTailList(&CacheSegmentLRUListHead, &CacheSeg->CacheSegmentLRUListEntry); - - CacheSeg->Dirty = TRUE; + RemoveEntryList(&Vacb->VacbLruListEntry); + InsertTailList(&VacbLruListHead, &Vacb->VacbLruListEntry); + + Vacb->Dirty = TRUE; KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeReleaseMutex(&CacheSeg->Mutex, FALSE); + KeReleaseMutex(&Vacb->Mutex, FALSE); return STATUS_SUCCESS; } NTSTATUS NTAPI -CcRosUnmapCacheSegment ( +CcRosUnmapVacb ( PBCB Bcb, ULONG FileOffset, BOOLEAN NowDirty) { - PCACHE_SEGMENT CacheSeg; + PROS_VACB Vacb; BOOLEAN WasDirty; KIRQL oldIrql; ASSERT(Bcb); - DPRINT("CcRosUnmapCacheSegment(Bcb 0x%p, FileOffset %lu, NowDirty %u)\n", + DPRINT("CcRosUnmapVacb(Bcb 0x%p, FileOffset %lu, NowDirty %u)\n", Bcb, FileOffset, NowDirty); - CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset); - if (CacheSeg == NULL) + Vacb = CcRosLookupVacb(Bcb, FileOffset); + if (Vacb == NULL) { return STATUS_UNSUCCESSFUL; } @@ -551,58 +550,58 @@ KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - WasDirty = CacheSeg->Dirty; - CacheSeg->Dirty = CacheSeg->Dirty || NowDirty; - - CacheSeg->MappedCount--; + WasDirty = Vacb->Dirty; + Vacb->Dirty = Vacb->Dirty || NowDirty; + + Vacb->MappedCount--; if (!WasDirty && NowDirty) { - InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); + InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } - CcRosCacheSegmentDecRefCount(CacheSeg); + CcRosVacbDecRefCount(Vacb); if (!WasDirty && NowDirty) { - CcRosCacheSegmentIncRefCount(CacheSeg); - } - if (CacheSeg->MappedCount == 0) - { - CcRosCacheSegmentDecRefCount(CacheSeg); + CcRosVacbIncRefCount(Vacb); + } + if (Vacb->MappedCount == 0) + { + CcRosVacbDecRefCount(Vacb); } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeReleaseMutex(&CacheSeg->Mutex, FALSE); + KeReleaseMutex(&Vacb->Mutex, FALSE); return STATUS_SUCCESS; } static NTSTATUS -CcRosCreateCacheSegment ( +CcRosCreateVacb ( PBCB Bcb, ULONG FileOffset, - PCACHE_SEGMENT* CacheSeg) -{ - PCACHE_SEGMENT current; - PCACHE_SEGMENT previous; + PROS_VACB *Vacb) +{ + PROS_VACB current; + PROS_VACB previous; PLIST_ENTRY current_entry; NTSTATUS Status; KIRQL oldIrql; ASSERT(Bcb); - DPRINT("CcRosCreateCacheSegment()\n"); + DPRINT("CcRosCreateVacb()\n"); if (FileOffset >= Bcb->FileSize.u.LowPart) { - *CacheSeg = NULL; + *Vacb = NULL; return STATUS_INVALID_PARAMETER; } - current = ExAllocateFromNPagedLookasideList(&CacheSegLookasideList); + current = ExAllocateFromNPagedLookasideList(&VacbLookasideList); current->Valid = FALSE; current->Dirty = FALSE; current->PageOut = FALSE; @@ -611,12 +610,12 @@ #if DBG if ( Bcb->Trace ) { - DPRINT1("CacheMap 0x%p: new Cache Segment: 0x%p\n", Bcb, current ); + DPRINT1("CacheMap 0x%p: new VACB: 0x%p\n", Bcb, current ); } #endif current->MappedCount = 0; - current->DirtySegmentListEntry.Flink = NULL; - current->DirtySegmentListEntry.Blink = NULL; + current->DirtyVacbListEntry.Flink = NULL; + current->DirtyVacbListEntry.Blink = NULL; current->ReferenceCount = 1; KeInitializeMutex(&current->Mutex, 0); KeWaitForSingleObject(&current->Mutex, @@ -626,37 +625,38 @@ NULL); KeAcquireGuardedMutex(&ViewLock); - *CacheSeg = current; - /* There is window between the call to CcRosLookupCacheSegment - * and CcRosCreateCacheSegment. We must check if a segment on - * the fileoffset exist. If there exist a segment, we release - * our new created segment and return the existing one. + *Vacb = current; + /* There is window between the call to CcRosLookupVacb + * and CcRosCreateVacb. We must check if a VACB for the + * file offset exist. If there is a VACB, we release + * our newly created VACB and return the existing one. */ KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - current_entry = Bcb->BcbSegmentListHead.Flink; + current_entry = Bcb->BcbVacbListHead.Flink; previous = NULL; - while (current_entry != &Bcb->BcbSegmentListHead) - { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - BcbSegmentListEntry); - if (IsPointInSegment(current->FileOffset, VACB_MAPPING_GRANULARITY, - FileOffset)) - { - CcRosCacheSegmentIncRefCount(current); + while (current_entry != &Bcb->BcbVacbListHead) + { + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + BcbVacbListEntry); + if (IsPointInRange(current->FileOffset, VACB_MAPPING_GRANULARITY, + FileOffset)) + { + CcRosVacbIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); #if DBG if ( Bcb->Trace ) { - DPRINT1("CacheMap 0x%p: deleting newly created Cache Segment 0x%p ( found existing one 0x%p )\n", + DPRINT1("CacheMap 0x%p: deleting newly created VACB 0x%p ( found existing one 0x%p )\n", Bcb, - (*CacheSeg), + (*Vacb), current ); } #endif - KeReleaseMutex(&(*CacheSeg)->Mutex, FALSE); + KeReleaseMutex(&(*Vacb)->Mutex, FALSE); KeReleaseGuardedMutex(&ViewLock); - ExFreeToNPagedLookasideList(&CacheSegLookasideList, *CacheSeg); - *CacheSeg = current; + ExFreeToNPagedLookasideList(&VacbLookasideList, *Vacb); + *Vacb = current; KeWaitForSingleObject(&current->Mutex, Executive, KernelMode, @@ -674,25 +674,25 @@ break; current_entry = current_entry->Flink; } - /* There was no existing segment. */ - current = *CacheSeg; + /* There was no existing VACB. */ + current = *Vacb; if (previous) { - InsertHeadList(&previous->BcbSegmentListEntry, &current->BcbSegmentListEntry); + InsertHeadList(&previous->BcbVacbListEntry, &current->BcbVacbListEntry); } else { - InsertHeadList(&Bcb->BcbSegmentListHead, &current->BcbSegmentListEntry); + InsertHeadList(&Bcb->BcbVacbListHead, &current->BcbVacbListEntry); } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - InsertTailList(&CacheSegmentListHead, &current->CacheSegmentListEntry); - InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry); + InsertTailList(&VacbListHead, &current->VacbListEntry); + InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); KeReleaseGuardedMutex(&ViewLock); MmLockAddressSpace(MmGetKernelAddressSpace()); current->BaseAddress = NULL; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - 0, // nothing checks for cache_segment mareas, so set to 0 + 0, // nothing checks for VACB mareas, so set to 0 &current->BaseAddress, VACB_MAPPING_GRANULARITY, PAGE_READWRITE, @@ -727,49 +727,49 @@ NTSTATUS NTAPI -CcRosGetCacheSegmentChain ( +CcRosGetVacbChain ( PBCB Bcb, ULONG FileOffset, ULONG Length, - PCACHE_SEGMENT* CacheSeg) -{ - PCACHE_SEGMENT current; + PROS_VACB *Vacb) +{ + PROS_VACB current; ULONG i; - PCACHE_SEGMENT* CacheSegList; - PCACHE_SEGMENT Previous = NULL; + PROS_VACB *VacbList; + PROS_VACB Previous = NULL; ASSERT(Bcb); - DPRINT("CcRosGetCacheSegmentChain()\n"); + DPRINT("CcRosGetVacbChain()\n"); Length = ROUND_UP(Length, VACB_MAPPING_GRANULARITY); - CacheSegList = _alloca(sizeof(PCACHE_SEGMENT) * - (Length / VACB_MAPPING_GRANULARITY)); + VacbList = _alloca(sizeof(PROS_VACB) * + (Length / VACB_MAPPING_GRANULARITY)); /* - * Look for a cache segment already mapping the same data. + * Look for a VACB already mapping the same data. */ for (i = 0; i < (Length / VACB_MAPPING_GRANULARITY); i++) { ULONG CurrentOffset = FileOffset + (i * VACB_MAPPING_GRANULARITY); - current = CcRosLookupCacheSegment(Bcb, CurrentOffset); + current = CcRosLookupVacb(Bcb, CurrentOffset); if (current != NULL) { KeAcquireGuardedMutex(&ViewLock); /* Move to tail of LRU list */ - RemoveEntryList(&current->CacheSegmentLRUListEntry); - InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry); + RemoveEntryList(&current->VacbLruListEntry); + InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); KeReleaseGuardedMutex(&ViewLock); - CacheSegList[i] = current; + VacbList[i] = current; } else { - CcRosCreateCacheSegment(Bcb, CurrentOffset, &current); - CacheSegList[i] = current; + CcRosCreateVacb(Bcb, CurrentOffset, &current); + VacbList[i] = current; } } @@ -777,13 +777,13 @@ { if (i == 0) { - *CacheSeg = CacheSegList[i]; - Previous = CacheSegList[i]; + *Vacb = VacbList[i]; + Previous = VacbList[i]; } else { - Previous->NextInChain = CacheSegList[i]; - Previous = CacheSegList[i]; + Previous->NextInChain = VacbList[i]; + Previous = VacbList[i]; } } ASSERT(Previous); @@ -794,31 +794,31 @@ NTSTATUS NTAPI -CcRosGetCacheSegment ( +CcRosGetVacb ( PBCB Bcb, ULONG FileOffset, PULONG BaseOffset, PVOID* BaseAddress, PBOOLEAN UptoDate, - PCACHE_SEGMENT* CacheSeg) -{ - PCACHE_SEGMENT current; + PROS_VACB *Vacb) +{ + PROS_VACB current; NTSTATUS Status; ASSERT(Bcb); - DPRINT("CcRosGetCacheSegment()\n"); + DPRINT("CcRosGetVacb()\n"); /* - * Look for a cache segment already mapping the same data. + * Look for a VACB already mapping the same data. */ - current = CcRosLookupCacheSegment(Bcb, FileOffset); + current = CcRosLookupVacb(Bcb, FileOffset); if (current == NULL) { /* - * Otherwise create a new segment. + * Otherwise create a new VACB. */ - Status = CcRosCreateCacheSegment(Bcb, FileOffset, &current); + Status = CcRosCreateVacb(Bcb, FileOffset, &current); if (!NT_SUCCESS(Status)) { return Status; @@ -828,30 +828,30 @@ KeAcquireGuardedMutex(&ViewLock); /* Move to the tail of the LRU list */ - RemoveEntryList(&current->CacheSegmentLRUListEntry); - InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry); + RemoveEntryList(&current->VacbLruListEntry); + InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); KeReleaseGuardedMutex(&ViewLock); /* - * Return information about the segment to the caller. + * Return information about the VACB to the caller. */ *UptoDate = current->Valid; *BaseAddress = current->BaseAddress; DPRINT("*BaseAddress %p\n", *BaseAddress); - *CacheSeg = current; + *Vacb = current; *BaseOffset = current->FileOffset; return STATUS_SUCCESS; } NTSTATUS NTAPI -CcRosRequestCacheSegment ( +CcRosRequestVacb ( PBCB Bcb, ULONG FileOffset, PVOID* BaseAddress, PBOOLEAN UptoDate, - PCACHE_SEGMENT* CacheSeg) + PROS_VACB *Vacb) /* * FUNCTION: Request a page mapping for a BCB */ @@ -867,12 +867,12 @@ KeBugCheck(CACHE_MANAGER); } - return CcRosGetCacheSegment(Bcb, - FileOffset, - &BaseOffset, - BaseAddress, - UptoDate, - CacheSeg); + return CcRosGetVacb(Bcb, + FileOffset, + &BaseOffset, + BaseAddress, + UptoDate, + Vacb); } static @@ -894,28 +894,28 @@ } NTSTATUS -CcRosInternalFreeCacheSegment ( - PCACHE_SEGMENT CacheSeg) +CcRosInternalFreeVacb ( + PROS_VACB Vacb) /* - * FUNCTION: Releases a cache segment associated with a BCB + * FUNCTION: Releases a VACB associated with a BCB */ { - DPRINT("Freeing cache segment 0x%p\n", CacheSeg); + DPRINT("Freeing VACB 0x%p\n", Vacb); #if DBG - if ( CacheSeg->Bcb->Trace ) - { - DPRINT1("CacheMap 0x%p: deleting Cache Segment: 0x%p\n", CacheSeg->Bcb, CacheSeg ); + if (Vacb->Bcb->Trace) + { + DPRINT1("CacheMap 0x%p: deleting VACB: 0x%p\n", Vacb->Bcb, Vacb); } #endif MmLockAddressSpace(MmGetKernelAddressSpace()); MmFreeMemoryArea(MmGetKernelAddressSpace(), - CacheSeg->MemoryArea, + Vacb->MemoryArea, CcFreeCachePage, NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); - ExFreeToNPagedLookasideList(&CacheSegLookasideList, CacheSeg); + ExFreeToNPagedLookasideList(&VacbLookasideList, Vacb); return STATUS_SUCCESS; } @@ -932,7 +932,7 @@ { PBCB Bcb; LARGE_INTEGER Offset; - PCACHE_SEGMENT current; + PROS_VACB current; NTSTATUS Status; KIRQL oldIrql; @@ -961,12 +961,12 @@ while (Length > 0) { - current = CcRosLookupCacheSegment (Bcb, Offset.u.LowPart); + current = CcRosLookupVacb(Bcb, Offset.u.LowPart); if (current != NULL) { if (current->Dirty) { - Status = CcRosFlushCacheSegment(current); + Status = CcRosFlushVacb(current); if (!NT_SUCCESS(Status) && IoStatus != NULL) { IoStatus->Status = Status; @@ -976,7 +976,7 @@ KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - CcRosCacheSegmentDecRefCount(current); + CcRosVacbDecRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); } @@ -1011,7 +1011,7 @@ */ { PLIST_ENTRY current_entry; - PCACHE_SEGMENT current; + PROS_VACB current; LIST_ENTRY FreeList; KIRQL oldIrql; @@ -1035,23 +1035,23 @@ FileObject->SectionObjectPointer->SharedCacheMap = NULL; /* - * Release all cache segments. + * Release all VACBs */ InitializeListHead(&FreeList); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - while (!IsListEmpty(&Bcb->BcbSegmentListHead)) - { - current_entry = RemoveTailList(&Bcb->BcbSegmentListHead); - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - RemoveEntryList(&current->CacheSegmentListEntry); - RemoveEntryList(&current->CacheSegmentLRUListEntry); + while (!IsListEmpty(&Bcb->BcbVacbListHead)) + { + current_entry = RemoveTailList(&Bcb->BcbVacbListHead); + current = CONTAINING_RECORD(current_entry, ROS_VACB, BcbVacbListEntry); + RemoveEntryList(&current->VacbListEntry); + RemoveEntryList(&current->VacbLruListEntry); if (current->Dirty) { - RemoveEntryList(&current->DirtySegmentListEntry); + RemoveEntryList(&current->DirtyVacbListEntry); DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; - DPRINT1("Freeing dirty segment\n"); + DPRINT1("Freeing dirty VACB\n"); } - InsertHeadList(&FreeList, &current->BcbSegmentListEntry); + InsertHeadList(&FreeList, &current->BcbVacbListEntry); } #if DBG Bcb->Trace = FALSE; @@ -1064,8 +1064,8 @@ while (!IsListEmpty(&FreeList)) { current_entry = RemoveTailList(&FreeList); - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - CcRosInternalFreeCacheSegment(current); + current = CONTAINING_RECORD(current_entry, ROS_VACB, BcbVacbListEntry); + CcRosInternalFreeVacb(current); } ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); KeAcquireGuardedMutex(&ViewLock); @@ -1250,7 +1250,7 @@ ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize; } KeInitializeSpinLock(&Bcb->BcbLock); - InitializeListHead(&Bcb->BcbSegmentListHead); + InitializeListHead(&Bcb->BcbVacbListHead); FileObject->SectionObjectPointer->SharedCacheMap = Bcb; } if (FileObject->PrivateCacheMap == NULL) @@ -1294,9 +1294,9 @@ { DPRINT("CcInitView()\n"); - InitializeListHead(&CacheSegmentListHead); - InitializeListHead(&DirtySegmentListHead); - InitializeListHead(&CacheSegmentLRUListHead); + InitializeListHead(&VacbListHead); + InitializeListHead(&DirtyVacbListHead); + InitializeListHead(&VacbLruListHead); InitializeListHead(&ClosedListHead); KeInitializeGuardedMutex(&ViewLock); ExInitializeNPagedLookasideList (&iBcbLookasideList, @@ -1313,11 +1313,11 @@ sizeof(BCB), TAG_BCB, 20); - ExInitializeNPagedLookasideList (&CacheSegLookasideList, + ExInitializeNPagedLookasideList (&VacbLookasideList, NULL, NULL, 0, - sizeof(CACHE_SEGMENT), + sizeof(ROS_VACB), TAG_CSEG, 20); 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] Sat Apr 12 09:31:07 2014 @@ -103,7 +103,7 @@ typedef struct _BCB { - LIST_ENTRY BcbSegmentListHead; + LIST_ENTRY BcbVacbListHead; LIST_ENTRY BcbRemoveListEntry; BOOLEAN RemoveOnClose; ULONG TimeStamp; @@ -115,49 +115,46 @@ KSPIN_LOCK BcbLock; ULONG RefCount; #if DBG - BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */ + BOOLEAN Trace; /* enable extra trace output for this BCB and it's VACBs */ #endif } BCB, *PBCB; -typedef struct _CACHE_SEGMENT -{ - /* Base address of the region where the cache segment data is mapped. */ +typedef struct _ROS_VACB +{ + /* Base address of the region where the view's data is mapped. */ PVOID BaseAddress; - /* - * Memory area representing the region where the cache segment data is - * mapped. - */ + /* Memory area representing the region where the view's data is mapped. */ struct _MEMORY_AREA* MemoryArea; - /* Are the contents of the cache segment data valid. */ + /* Are the contents of the view valid. */ BOOLEAN Valid; - /* Are the contents of the cache segment data newer than those on disk. */ + /* Are the contents of the view newer than those on disk. */ BOOLEAN Dirty; /* Page out in progress */ BOOLEAN PageOut; ULONG MappedCount; - /* Entry in the list of segments for this BCB. */ - LIST_ENTRY BcbSegmentListEntry; - /* Entry in the list of segments which are dirty. */ - LIST_ENTRY DirtySegmentListEntry; - /* Entry in the list of segments. */ - LIST_ENTRY CacheSegmentListEntry; - LIST_ENTRY CacheSegmentLRUListEntry; - /* Offset in the file which this cache segment maps. */ + /* Entry in the list of VACBs for this BCB. */ + LIST_ENTRY BcbVacbListEntry; + /* Entry in the list of VACBs which are dirty. */ + LIST_ENTRY DirtyVacbListEntry; + /* Entry in the list of VACBs. */ + LIST_ENTRY VacbListEntry; + LIST_ENTRY VacbLruListEntry; + /* Offset in the file which this view maps. */ ULONG FileOffset; /* Mutex */ KMUTEX Mutex; /* Number of references. */ ULONG ReferenceCount; - /* Pointer to the BCB for the file which this cache segment maps data for. */ + /* Pointer to the BCB for the file which this view maps data for. */ PBCB Bcb; - /* Pointer to the next cache segment in a chain. */ - struct _CACHE_SEGMENT* NextInChain; -} CACHE_SEGMENT, *PCACHE_SEGMENT; + /* Pointer to the next VACB in a chain. */ + struct _ROS_VACB *NextInChain; +} ROS_VACB, *PROS_VACB; typedef struct _INTERNAL_BCB { PUBLIC_BCB PFCB; - PCACHE_SEGMENT CacheSegment; + PROS_VACB Vacb; BOOLEAN Dirty; CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ } INTERNAL_BCB, *PINTERNAL_BCB; @@ -185,17 +182,17 @@ NTSTATUS NTAPI -CcRosFlushCacheSegment(PCACHE_SEGMENT CacheSegment); - -NTSTATUS -NTAPI -CcRosGetCacheSegment( +CcRosFlushVacb(PROS_VACB Vacb); + +NTSTATUS +NTAPI +CcRosGetVacb( PBCB Bcb, ULONG FileOffset, PULONG BaseOffset, PVOID *BaseAddress, PBOOLEAN UptoDate, - PCACHE_SEGMENT *CacheSeg + PROS_VACB *Vacb ); VOID @@ -204,11 +201,11 @@ NTSTATUS NTAPI -ReadCacheSegment(PCACHE_SEGMENT CacheSeg); - -NTSTATUS -NTAPI -WriteCacheSegment(PCACHE_SEGMENT CacheSeg); +CcReadVirtualAddress(PROS_VACB Vacb); + +NTSTATUS +NTAPI +CcWriteVirtualAddress(PROS_VACB Vacb); BOOLEAN NTAPI @@ -216,26 +213,26 @@ NTSTATUS NTAPI -CcRosUnmapCacheSegment( +CcRosUnmapVacb( PBCB Bcb, ULONG FileOffset, BOOLEAN NowDirty ); -PCACHE_SEGMENT -NTAPI -CcRosLookupCacheSegment( +PROS_VACB +NTAPI +CcRosLookupVacb( PBCB Bcb, ULONG FileOffset ); NTSTATUS NTAPI -CcRosGetCacheSegmentChain( +CcRosGetVacbChain( PBCB Bcb, ULONG FileOffset, ULONG Length, - PCACHE_SEGMENT* CacheSeg + PROS_VACB *Vacb ); VOID @@ -244,7 +241,7 @@ NTSTATUS NTAPI -CcRosMarkDirtyCacheSegment( +CcRosMarkDirtyVacb( PBCB Bcb, ULONG FileOffset ); @@ -271,9 +268,9 @@ NTSTATUS NTAPI -CcRosReleaseCacheSegment( +CcRosReleaseVacb( BCB* Bcb, - CACHE_SEGMENT *CacheSeg, + PROS_VACB Vacb, BOOLEAN Valid, BOOLEAN Dirty, BOOLEAN Mapped @@ -281,12 +278,12 @@ NTSTATUS NTAPI -CcRosRequestCacheSegment( +CcRosRequestVacb( BCB *Bcb, ULONG FileOffset, PVOID* BaseAddress, PBOOLEAN UptoDate, - CACHE_SEGMENT **CacheSeg + PROS_VACB *Vacb ); NTSTATUS @@ -309,7 +306,7 @@ FORCEINLINE BOOLEAN -DoSegmentsIntersect( +DoRangesIntersect( _In_ ULONG Offset1, _In_ ULONG Length1, _In_ ULONG Offset2, @@ -324,10 +321,10 @@ FORCEINLINE BOOLEAN -IsPointInSegment( +IsPointInRange( _In_ ULONG Offset1, _In_ ULONG Length1, _In_ ULONG Point) { - return DoSegmentsIntersect(Offset1, Length1, Point, 1); + return DoRangesIntersect(Offset1, Length1, Point, 1); } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Apr 12 09:31:07 2014 @@ -921,13 +921,13 @@ Bcb = FileObject->SectionObjectPointer->SharedCacheMap; IsDirectMapped = TRUE; #ifndef NEWCC - Status = CcRosUnmapCacheSegment(Bcb, FileOffset.LowPart, Dirty); + Status = CcRosUnmapVacb(Bcb, FileOffset.LowPart, Dirty); #else Status = STATUS_SUCCESS; #endif if (!NT_SUCCESS(Status)) { - DPRINT1("CcRosUnmapCacheSegment failed, status = %x\n", Status); + DPRINT1("CcRosUnmapVacb failed, status = %x\n", Status); KeBugCheck(MEMORY_MANAGEMENT); } } @@ -1016,12 +1016,12 @@ if (!(MemoryArea->Data.SectionData.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { PBCB Bcb; - PCACHE_SEGMENT CacheSeg; + PROS_VACB Vacb; Bcb = MemoryArea->Data.SectionData.Section->FileObject->SectionObjectPointer->SharedCacheMap; - CacheSeg = CcRosLookupCacheSegment(Bcb, (ULONG)(SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset)); - if (CacheSeg) - { - CcRosReleaseCacheSegment(Bcb, CacheSeg, CacheSeg->Valid, FALSE, TRUE); + Vacb = CcRosLookupVacb(Bcb, (ULONG)(SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset)); + if (Vacb) + { + CcRosReleaseVacb(Bcb, Vacb, Vacb->Valid, FALSE, TRUE); return TRUE; } } @@ -1070,7 +1070,7 @@ ULONGLONG FileOffset; PVOID BaseAddress; BOOLEAN UptoDate; - PCACHE_SEGMENT CacheSeg; + PROS_VACB Vacb; PFILE_OBJECT FileObject; NTSTATUS Status; ULONG_PTR RawLength; @@ -1091,7 +1091,7 @@ /* * If the file system is letting us go directly to the cache and the * memory area was mapped at an offset in the file which is page aligned - * then get the related cache segment. + * then get the related VACB. */ if (((FileOffset % PAGE_SIZE) == 0) && ((SegOffset + PAGE_SIZE <= RawLength) || !IsImageSection) && @@ -1099,16 +1099,16 @@ { /* - * Get the related cache segment; we use a lower level interface than - * filesystems do because it is safe for us to use an offset with a + * Get the related VACB; we use a lower level interface than + * filesystems do because it is safe for us to use an offset with an * alignment less than the file system block size. */ - Status = CcRosGetCacheSegment(Bcb, - (ULONG)FileOffset, - &BaseOffset, - &BaseAddress, - &UptoDate, - &CacheSeg); + Status = CcRosGetVacb(Bcb, + (ULONG)FileOffset, + &BaseOffset, + &BaseAddress, + &UptoDate, + &Vacb); if (!NT_SUCCESS(Status)) { return(Status); @@ -1116,13 +1116,13 @@ if (!UptoDate) { /* - * If the cache segment isn't up to date then call the file + * If the VACB isn't up to date then call the file * system to read in the data. */ - Status = ReadCacheSegment(CacheSeg); + Status = CcReadVirtualAddress(Vacb); if (!NT_SUCCESS(Status)) { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); return Status; } } @@ -1131,19 +1131,19 @@ (void)*((volatile char*)BaseAddress + FileOffset - BaseOffset); /* - * Retrieve the page from the cache segment that we actually want. + * Retrieve the page from the view that we actually want. */ (*Page) = MmGetPhysicalAddress((char*)BaseAddress + FileOffset - BaseOffset).LowPart >> PAGE_SHIFT; - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, TRUE); + CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, TRUE); } else { PEPROCESS Process; KIRQL Irql; PVOID PageAddr; - ULONG_PTR CacheSegOffset; + ULONG_PTR VacbOffset; /* * Allocate a page, this is rather complicated by the possibility @@ -1156,12 +1156,12 @@ { return(Status); } - Status = CcRosGetCacheSegment(Bcb, - (ULONG)FileOffset, - &BaseOffset, - &BaseAddress, - &UptoDate, - &CacheSeg); + Status = CcRosGetVacb(Bcb, + (ULONG)FileOffset, + &BaseOffset, + &BaseAddress, + &UptoDate, + &Vacb); if (!NT_SUCCESS(Status)) { return(Status); @@ -1169,40 +1169,40 @@ if (!UptoDate) { /* - * If the cache segment isn't up to date then call the file + * If the VACB isn't up to date then call the file * system to read in the data. */ - Status = ReadCacheSegment(CacheSeg); + Status = CcReadVirtualAddress(Vacb); if (!NT_SUCCESS(Status)) { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); return Status; } } Process = PsGetCurrentProcess(); PageAddr = MiMapPageInHyperSpace(Process, *Page, &Irql); - CacheSegOffset = (ULONG_PTR)(BaseOffset + VACB_MAPPING_GRANULARITY - FileOffset); + VacbOffset = (ULONG_PTR)(BaseOffset + VACB_MAPPING_GRANULARITY - FileOffset); Length = RawLength - SegOffset; - if (Length <= CacheSegOffset && Length <= PAGE_SIZE) + if (Length <= VacbOffset && Length <= PAGE_SIZE) { memcpy(PageAddr, (char*)BaseAddress + FileOffset - BaseOffset, Length); } - else if (CacheSegOffset >= PAGE_SIZE) + else if (VacbOffset >= PAGE_SIZE) { memcpy(PageAddr, (char*)BaseAddress + FileOffset - BaseOffset, PAGE_SIZE); } else { - memcpy(PageAddr, (char*)BaseAddress + FileOffset - BaseOffset, CacheSegOffset); + memcpy(PageAddr, (char*)BaseAddress + FileOffset - BaseOffset, VacbOffset); MiUnmapPageInHyperSpace(Process, PageAddr, Irql); - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); - Status = CcRosGetCacheSegment(Bcb, - (ULONG)(FileOffset + CacheSegOffset), - &BaseOffset, - &BaseAddress, - &UptoDate, - &CacheSeg); + CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, FALSE); + Status = CcRosGetVacb(Bcb, + (ULONG)(FileOffset + VacbOffset), + &BaseOffset, + &BaseAddress, + &UptoDate, + &Vacb); if (!NT_SUCCESS(Status)) { return(Status); @@ -1210,28 +1210,28 @@ if (!UptoDate) { /* - * If the cache segment isn't up to date then call the file + * If the VACB isn't up to date then call the file * system to read in the data. */ - Status = ReadCacheSegment(CacheSeg); + Status = CcReadVirtualAddress(Vacb); if (!NT_SUCCESS(Status)) { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, FALSE, FALSE, FALSE); return Status; } } PageAddr = MiMapPageInHyperSpace(Process, *Page, &Irql); if (Length < PAGE_SIZE) { - memcpy((char*)PageAddr + CacheSegOffset, BaseAddress, Length - CacheSegOffset); + memcpy((char*)PageAddr + VacbOffset, BaseAddress, Length - VacbOffset); } else { - memcpy((char*)PageAddr + CacheSegOffset, BaseAddress, PAGE_SIZE - CacheSegOffset); + memcpy((char*)PageAddr + VacbOffset, BaseAddress, PAGE_SIZE - VacbOffset); } } MiUnmapPageInHyperSpace(Process, PageAddr, Irql); - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); + CcRosReleaseVacb(Bcb, Vacb, TRUE, FALSE, FALSE); } return(STATUS_SUCCESS); } @@ -1970,7 +1970,7 @@ } /* - * Take an additional reference to the page or the cache segment. + * Take an additional reference to the page or the VACB. */ if (DirectMapped && !Context.Private) { @@ -2066,14 +2066,14 @@ KeBugCheckEx(MEMORY_MANAGEMENT, STATUS_UNSUCCESSFUL, SwapEntry, (ULONG_PTR)Process, (ULONG_PTR)Address); } #ifndef NEWCC - Status = CcRosUnmapCacheSegment(Bcb, (ULONG)FileOffset, FALSE); + Status = CcRosUnmapVacb(Bcb, (ULONG)FileOffset, FALSE); #else Status = STATUS_SUCCESS; #endif #ifndef NEWCC if (!NT_SUCCESS(Status)) { - DPRINT1("CCRosUnmapCacheSegment failed, status = %x\n", Status); + DPRINT1("CcRosUnmapVacb failed, status = %x\n", Status); KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)Bcb, (ULONG_PTR)FileOffset, (ULONG_PTR)Address); } #endif @@ -2366,7 +2366,7 @@ ASSERT(SwapEntry == 0); //SOffset.QuadPart = Offset.QuadPart + Segment->Image.FileOffset; #ifndef NEWCC - CcRosMarkDirtyCacheSegment(Bcb, Offset.LowPart); + CcRosMarkDirtyVacb(Bcb, Offset.LowPart); #endif MmLockSectionSegment(Segment); MmSetPageEntrySectionSegment(Segment, &Offset, PageEntry); @@ -4013,7 +4013,7 @@ FileObject = MemoryArea->Data.SectionData.Section->FileObject; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; #ifndef NEWCC - CcRosMarkDirtyCacheSegment(Bcb, (ULONG)(Offset.QuadPart + Segment->Image.FileOffset)); + CcRosMarkDirtyVacb(Bcb, (ULONG)(Offset.QuadPart + Segment->Image.FileOffset)); #endif ASSERT(SwapEntry == 0); }

10 years, 5 months

[akhaldi] 62706: [RAPPS] * Romanian translation update. By Ștefan Fulea. CORE-7908

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 11 15:53:03 2014 New Revision: 62706 URL: http://svn.reactos.org/svn/reactos?rev=62706&view=rev Log: [RAPPS] * Romanian translation update. By Ștefan Fulea. CORE-7908 Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/stamina.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Fri Apr 11 15:53:03 2014 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = 7-Zip @@ -31,7 +31,7 @@ Description = NarzÄdzie do tworzenia i otwierania plikÃ³w typu 7zip, zip, tar, i innych plikÃ³w archiwizacyjnych. (FIXME) [Section.0418] -Description = Utilitar pentru crearea Èi deschiderea arhivelor 7zip, zip, tar, rar Èi altele. (FIXME) +Description = Un utilitar de arhivare a fiÈierelor, compatibil cu 7zip, zip, tar, rar Èi multe alte formate de arhive. Size = 1,1 Mo [Section.041f] Modified: trunk/reactos/base/applications/rapps/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/stamina.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/stamina.txt [iso-8859-1] Fri Apr 11 15:53:03 2014 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Stamina 2.5 @@ -13,7 +13,7 @@ Description = Ein freies Schreiblernprogramm. Um dieses Programm nutzen zu kÃ¶nnen, mÃ¼ssen Sie das Microsoft Visual C++ 6 Redistributable Package installieren. [Section.0418] -Description = Tutor gratuit pentru dactilografiere. (FIXME) +Description = Tutor gratuit pentru dactilografiere. Pentru a putea lansa acest program, asiguraÈi-vÄ cÄ aveÈi instalat pachetul Microsoft Visual C++ 6 Redistributable. Size = 4,7 Mo [Section.041f]

10 years, 5 months

[akhaldi] 62705: [TRANSLATIONS] * General maintenance of Romanian resources. By Ștefan Fulea. CORE-7908

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 11 15:49:48 2014 New Revision: 62705 URL: http://svn.reactos.org/svn/reactos?rev=62705&view=rev Log: [TRANSLATIONS] * General maintenance of Romanian resources. By Ștefan Fulea. CORE-7908 Added: trunk/reactos/base/applications/regedit/clb/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/charmap/lang/ro-RO.rc trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mstsc/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/regedit/clb/clb.rc trunk/reactos/base/applications/wordpad/lang/Ro.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ro.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc Modified: trunk/reactos/base/applications/charmap/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -1,8 +1,7 @@ /* * FILE: base/applications/charmap/lang/ro-RO.rc * ReactOS Project (http://www.reactos.org) - * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) - * LAST CHANGE: 2011-12-19 corrections + * TRANSLATOR: Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -42,11 +41,11 @@ END IDD_ABOUTBOX DIALOGEX 22, 16, 270, 182 -CAPTION "Despre Harta caracterelor" +CAPTION "Despre" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Harta caracterelor v0.1\nDrept de autor (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)\nTraducere de Fulea Ètefan", IDC_STATIC, 48, 7, 210, 36 + LTEXT "HartÄ a caracterelor v0.1\nDrept de autor (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)\nTraducere de Ètefan Fulea (stefan.fulea(a)mail.md)", IDC_STATIC, 48, 7, 210, 36 PUSHBUTTON "Ã&nchide", IDOK, 105, 162, 44, 15 ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 254, 107, WS_VISIBLE | WS_VSCROLL | @@ -57,5 +56,5 @@ BEGIN IDS_LICENSE "AceastÄ aplicaÈie este publicÄ; fiind permisÄ modificarea Èi/sau (re)distribuÈia sa Ã®n termenii LicenÈei Publice Generale GNU publicatÄ de Free Software Foundation; sau versiunea 2 a LicenÈei, sau (la alegere) a oricÄrei versiuni ulterioare.\r\n\r\nAceastÄ aplicaÈie este distribuitÄ doar Ã®n speranÈa de a fi utilÄ, FÄRÄ Ã®nsÄ NICI O GARANÈIE; nici mÄcar cu garanÈia implicitÄ a VANDABILITÄÈII sau a UTILITÄÈII ÃNTR-UN SCOP ANUME. Pentru mai multe detalii consultaÈi LicenÈa PublicÄ GeneralÄ GNU.\r\n\r\nPuteÈi vedea aceastÄ licenÈÄ aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea puteÈi consulta traduceri neoficiale ale acestei licenÈe aici:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_ABOUT "&Despreâ¦" - IDS_TITLE "Harta caracterelor" + IDS_TITLE "HartÄ a caracterelor" END Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -62,7 +62,7 @@ BEGIN DEFPUSHBUTTON "Ã&nchide", IDOK, 193, 76, 50, 14 ICON IDI_ICON, IDC_STATIC, 7, 17, 20, 20 - LTEXT "Acest instrument este destinat celor cu deficienÈe vizuale minore. Pentru rezultate mai bune, folosiÈi un instrument mai sofisticat.", IDC_STATIC, 36, 7, 207, 33 + LTEXT "Acest instrument este destinat persoanelor cu deficienÈe vizuale minore. Pentru rezultate mai bune, folosiÈi un instrument mai sofisticat.", IDC_STATIC, 36, 7, 207, 33 CONTROL "N&u doresc recurenÈa acestui mesaj", IDC_SHOWWARNINGCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -40,5 +40,5 @@ IDS_APPTITLE "Lector multimedia" IDS_PLAY "Lecturare" IDS_DEFAULTMCIERRMSG "Nu existÄ descriere pentru aceastÄ eroare" - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." + IDS_UNKNOWNFILEEXT "Nu se poate determina tipul dispozitivului din extensia fiÈierului." END Modified: trunk/reactos/base/applications/mstsc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -39,7 +39,7 @@ COMBOBOX IDC_BPPCOMBO, 56, 102, 128, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "", IDC_COLORIMAGE, "Static", SS_OWNERDRAW | SS_SUNKEN, 56, 121, 127, 10 LTEXT "NotÄ: AceastÄ preferinÈÄ poate fi sau nu compatibilÄ cu configuraÈia calculatorului gazdÄ. PreferinÈele incompatibile vor fi ignorate.", IDC_STATIC, 56, 138, 155, 27 - LTEXT "Mic", IDC_STATIC, 35, 42, 15, 8 + LTEXT "MicÄ", IDC_STATIC, 35, 42, 15, 8 LTEXT "Mare", IDC_STATIC, 189, 42, 17, 8 LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER END Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -91,7 +91,7 @@ IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "DescÄrcareâ¦" +CAPTION "Se descarcÄâ¦" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 @@ -101,10 +101,10 @@ IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -CAPTION "Despre gestionarul de aplicaÈii ReactOS" +CAPTION "Despre gestionarul de programe" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Gestionar de aplicaÈii ReactOS\nDrept de autor (C) 2009\nde cÄtre Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + LTEXT "Gestionar de programe ReactOS\nDrept de autor (C) 2009\nde cÄtre Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 PUSHBUTTON "Ã&nchide", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 END @@ -177,13 +177,13 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Gestionar de aplicaÈii ReactOS" + IDS_APPTITLE "Gestionar de programe" IDS_SEARCH_TEXT "CÄutareâ¦" IDS_INSTALL "InstaleazÄ" IDS_UNINSTALL "DezinstaleazÄ" IDS_MODIFY "ModificÄ" - IDS_APPS_COUNT "NumÄrul de aplicaÈii: %d" - IDS_WELCOME_TITLE "Bun venit la gestionarul de aplicaÈii ReactOS!\n\n" + IDS_APPS_COUNT "NumÄrul de programe: %d" + IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n" IDS_WELCOME_TEXT "AlegeÈi o categorie din stÃ¢nga, apoi alegeÈi o aplicaÈie pentru a o instala sau dezinstala.\nArdesa web ReactOS: " IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "Instalate" @@ -194,5 +194,5 @@ IDS_CHOOSE_FOLDER_ERROR "Dosarul specificat nu existÄ. DoriÈi crearea lui?" IDS_APP_REG_REMOVE "Sigur doriÈi sÄ ÈtergeÈi datele din registru pentru aceastÄ aplicaÈe?" IDS_INFORMATION "InformaÈie" - IDS_UNABLE_TO_REMOVE "Nu se pot elimina datele din registru pentru aceastÄ aplicaÈie!" + IDS_UNABLE_TO_REMOVE "Nu se pot elimina datele din registru pentru acest program!" END Modified: trunk/reactos/base/applications/regedit/clb/clb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/clb.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/clb/clb.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -42,6 +42,9 @@ #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_SK_SK #include "lang/sk-SK.rc" #endif Added: trunk/reactos/base/applications/regedit/clb/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/regedit/clb/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -0,0 +1,28 @@ +/* Translator: Ètefan Fulea (stefan dot fulea at mail dot md) */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Stiluri de cÃ¢mp-listÄ coloanÄ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Stiluri de cÃ¢mp-listÄ coloanÄ", -1, 6, 7, 158, 71 + CHECKBOX "&Standard", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Margine", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ordonat", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Notifi&cantÄ", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "De&rulantÄ vert.", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Sel. m&ultiplÄ", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "Sel. e&xtinsÄ", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "Titluri &evidente", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Coloane flexi&bile", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Stiluri de bazÄ", -1, 6, 80, 158, 34 + CHECKBOX "&Vizibil", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Dezactivat", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Grup", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "CoopteazÄ &tab", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Con&firmÄ", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "De&zact. ne-derulare", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END Propchange: trunk/reactos/base/applications/regedit/clb/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/wordpad/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Ro.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -55,7 +55,7 @@ MENUITEM "CautÄ u&rmÄtorul\tF3", ID_FIND_NEXT MENUITEM "Ã&nlocuireâ¦\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR - MENUITEM "D&oar citire", ID_EDIT_READONLY + MENUITEM "Nem&odificabil", ID_EDIT_READONLY MENUITEM "&Modificat", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "&Suplimente" Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -21,8 +21,8 @@ [/S [/D]]\n\n\ + Consimte atributul\n\ - ReprobÄ atributul\n\ - R Atributul fiÈierelor protejate la scriere\n\ - A Atributul fiÈierelor pentru arhivare\n\ + R Atributul fiÈierelor nemodificabile\n\ + A Atributul fiÈierelor arhivabile\n\ S Atributul fiÈierelor de sistem\n\ H Atributul fiÈierelor ascunse\n\ /S AplicÄ Èi pentru fiÈierele din subdirectoare\n\ @@ -145,12 +145,12 @@ /Q SuprimÄ orice mesaj.\n\ /W Suprascrie fiÈierele cu informaÈii aleatoare Ã®nainte de a le Èterge.\n\ /Y PreconfirmÄ toate Ètergerile.\n\ - /F Èterge Èi fiÈierelor ascunse, de sistem sau protejate la scriere.\n\ + /F Èterge Èi fiÈierelor ascunse, nemodificabile Èi de sistem.\n\ /S Èterge fiÈierul specificat din toate subdirectoarele.\n\ /A SelecteazÄ fiÈierele dupÄ atribute.\n\ Atribute:\n\ - R Protejat la scriere\n\ - S Sistem\n\ + R Nemodificabil\n\ + S De sistem\n\ A Arhivabil\n\ H Ascuns\n\ - Prefix de negaÈie\n" @@ -166,7 +166,7 @@ [unitate:][cale][fiÈier]\n\ SpecificÄ unitatea, directorul Èi/sau fiÈierele de enumerat.\n\n\ /A AfiÈeazÄ fiÈierele dupÄ atributele specificate.\n\ - atribute D Directoare R FiÈiere protejate la scriere\n\ + atribute D Directoare R FiÈiere nemodificabile\n\ H FiÈiere ascunse A FiÈiere arhivabile\n\ S FiÈiere de sistem - Prefix pentru negaÈie\n\ /B PreferÄ format minim (fÄrÄ sumar sau informaÈii de titlu).\n\ @@ -383,8 +383,8 @@ poate folosi cu argumentele /S sau /U\n\ /P Cere confirmare Ã®naintea Ã®nlocuirii unui fiÈier sau\n\ a adÄugÄrii unui fiÈier sursÄ.\n\ - /R ÃnlocuieÈte atÃ¢t fiÈierele neprotejate, cÃ¢t Èi cele\n\ - protejate la scriere.\n\ + /R ÃnlocuieÈte atÃ¢t fiÈierele modificabile, cÃ¢t Èi\n\ + fiÈierele nemodificabile.\n\ /S ÃnlocuieÈte fiÈierele Ã®n toate subdirectoarele\n\ directorului destinaÈie. Nu se poate folosi cu\n\ argumentul /A.\n\ Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -1,4 +1,4 @@ -/* Romanian translation by Fulea Ètefan */ +/* Romanian translation by Ètefan Fulea */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -26,8 +26,8 @@ IDS_DETAIL_INFO_TARGET "ÈintÄ" IDS_DETAIL_INFO_LUN_ID "LUN ID" IDS_DETAIL_INFO_LOC_PATH "Localizat Ã®n" - IDS_DETAIL_INFO_CURR_RO_STATE "Stare curentÄ doar-citire" - IDS_DETAIL_INFO_RO "Protejat-la-scriere" + IDS_DETAIL_INFO_CURR_RO_STATE "Stare curentÄ nemodificabilÄ" + IDS_DETAIL_INFO_RO "Nemodificabil" IDS_DETAIL_INFO_BOOT_DSK "Disc iniÈializator" IDS_DETAIL_INFO_PAGE_FILE_DSK "Disc cu fiÈier de paginare" IDS_DETAIL_INFO_HIBER_FILE_DSK "Disc cu fiÈier de hibernare" Modified: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -49,7 +49,7 @@ STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Gestionar de aplicaÈii" + IDS_CPLSYSTEMNAME "Gestionar de programe" IDS_CPLSYSTEMDESCRIPTION "InstaleazÄ programe Èi creazÄ scurtÄturi." IDS_CREATE_SHORTCUT "Asistentul pentru creare de scurtÄturÄ" IDS_ERROR_NOT_FOUND "Elementul â%sâ nu poate fi localizat." @@ -64,7 +64,7 @@ ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalarea Wine Gecko" +CAPTION "Instalare Wine Gecko" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Pachetul Wine Gecko, necesar pentru funcÈionarea corectÄ a aplicaÈiilor cu HTML Ã®ncorporat, nu este existÄ local. ReactOS permite totuÈi descÄrcarea Èi instalarea automatÄ a acestuia.", Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -196,16 +196,15 @@ STRINGTABLE BEGIN - IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" - IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" - IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" - IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" - IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" - IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" - IDS_ERROR_INPUT_DLL "Unable to start input.dll" -END - + IDS_ERROR "Eroare" + IDS_ERROR_SYMBOL_SEPARATE "Separatorul de datÄ prescurtatÄ introdus conÈine simbol(uri) incorect(e)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Formatul de datÄ prescurtatÄ introdus conÈine simbol(uri) incorect(e)" + IDS_ERROR_SYMBOL_FORMAT_LONG "Formatul de datÄ completÄ introdus conÈine simbol(uri) incorect(e)" + IDS_ERROR_OEM_CODE_PAGE "ProblemÄ la citirea codului de paginÄ OEM" + IDS_ERROR_ANSI_CODE_PAGE "ProblemÄ la citirea codului de paginÄ ANSI" + IDS_ERROR_INT_KEY_REG "ProblemÄ la deschiderea cheii: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "ProblemÄ la deschiderea cheii: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "ProblemÄ la deschiderea cheii: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_CODE_REG "ProblemÄ la deschiderea cheii: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_INPUT_DLL "Nu se poate lansa input.dll" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -277,7 +277,7 @@ IDS_WARNMAXIMUMSIZE "IntroduceÈi o valoare numericÄ pentru dimensiunea maximÄ a fiÈierului de paginare." IDS_WARNINITIALRANGE "Dimensiunea iniÈialÄ a fiÈierului de paginare trebuie sÄ fie Ã®ncadratÄ Ã®ntre 2 Mo Èi spaÈiul liber disponibil al unitÄÈii selectate." IDS_WARNMAXIMUMRANGE "Dimensiunea maximÄ a fiÈierului de paginare trebuie sÄ fie Ã®ncadratÄ Ã®ntre dimensiunea iniÈialÄ Èi spaÈiul liber disponibil al unitÄÈii selectate." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" + IDS_PAGEFILE_NONE "nespecificat" + IDS_PAGEFILE_SYSTEM "gestionat de sistem" IDS_DEVS "\nEchipa ReactOS\n\nCoordonator de proiect\n\nAleksey Bragin\n\nEchipa de dezvoltare\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nIngineri de distribuÈie\n\nColin Finck\nZ98\n\nEchipa paginii web\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEchipa multimedia\n\nMindflyer\nWierd_W\n\nmulÈumiri adresate cÄtre\n\ntoÈi Contribuitorii\nEchipa Wine\n\n" END Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -1,4 +1,4 @@ -/* Translated by Fulea Ètefan */ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -49,8 +49,8 @@ MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR POPUP "&Navigare", FCIDM_MENU_EXPLORE BEGIN - MENUITEM "Ã&napoi\tAlt+Left Arrow", IDM_GOTO_BACK - MENUITEM "Ãna&poi\tAlt+Right Arrow", IDM_GOTO_FORWARD + MENUITEM "Ãnap&oi\tAlt+Left Arrow", IDM_GOTO_BACK + MENUITEM "Ãn&ainte\tAlt+Right Arrow", IDM_GOTO_FORWARD MENUITEM "Un nivel Ã®n s&us", IDM_GOTO_UPONELEVEL MENUITEM "", -1, MFT_SEPARATOR MENUITEM "PaginÄ &iniÈialÄ\tAlt+Home", IDM_GOTO_HOMEPAGE Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/co… ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Ro.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -4,7 +4,7 @@ * Copyright 1999 Bertho Stultiens * Copyright 1999 Eric Kohl * Copyright 2008 Michael Stefaniuc - * 2012 Fulea Ètefan + * 2012 Ètefan Fulea * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -59,7 +59,7 @@ IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Expert" +CAPTION "Asistent" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< Ãnap&oi", IDC_BACK_BUTTON,56,138,55,14 Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -152,7 +152,7 @@ LTEXT "N&ume fiÈier:", stc3, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "D&osare:", -1, 110, 6, 92, 9 + LTEXT "Dos&ar:", -1, 110, 6, 92, 9 LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Tip de fiÈier:", stc2, 6, 104, 90, 9 @@ -162,7 +162,7 @@ DEFPUSHBUTTON "&Deschide", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "A&nuleazÄ", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Manualâ¦", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Do&ar-citire", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Nem&odificabil", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -174,7 +174,7 @@ LTEXT "N&ume fiÈier:", stc3, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "D&osare:", -1, 110, 6, 92, 9 + LTEXT "Dos&ar:", -1, 110, 6, 92, 9 LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Tip de fiÈier:", stc2, 6, 104, 90, 9 @@ -184,7 +184,7 @@ DEFPUSHBUTTON "&PÄstreazÄ", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "A&nuleazÄ", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Manualâ¦", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Do&ar-citire", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Nem&odificabil", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -459,11 +459,12 @@ LTEXT "N&ume fiÈier:", IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Tip de fiÈier:", IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Do&ar-citire", IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 + CONTROL "Nem&odificabil", IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 DEFPUSHBUTTON "&Deschide", IDOK,222,110,54,14 PUSHBUTTON "A&nuleazÄ", IDCANCEL,222,128,54,14 Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -1,4 +1,4 @@ -ï»¿/* Romanian translation by Petru Dimitriu, Fulea Ètefan */ +/* Romanian translation by Petru Dimitriu, Ètefan Fulea */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -177,8 +177,8 @@ EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detaliiâ¦", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Mai multe detalii despre modulele pilot.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Actualizare modul-pilotâ¦", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Actualizare modulului-pilot pentru dispozitiv.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Actualizareâ¦", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "ActualizaÈi modulul-pilot pentru dispozitiv.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -31,7 +31,7 @@ EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Parola:", IDC_STATIC, 6, 78, 52, 8 EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + LTEXT "VÄ autentificaÈi la:", IDC_STATIC, 6, 96, 52, 8 COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL PUSHBUTTON "Con&firmÄ", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "A&nuleazÄ", IDCANCEL, 160, 122, 50, 14 @@ -141,29 +141,29 @@ IDS_LOCKMSG "Doar %s sau un Administrator poate debloca acest calculator." IDS_LOGONMSG "SunteÈi autentificat ca %s." IDS_LOGONDATE "Data autentificÄrii: %s %s" - IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." - IDS_CHANGEPWDTITLE "Change Password" - IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." - IDS_PASSWORDCHANGED "Your password has been changed." - IDS_LOGONTITLE "Logon Message" - IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." - IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." + IDS_COMPUTERLOCKED "Calculator blocat" + IDS_LOCKEDWRONGPASSWORD "Parola este eronatÄ. ÃncercaÈi din nou. Literele din parola necesitÄ atenÈie la capitalizare." + IDS_LOCKEDWRONGUSER "Acest calculator a fost blocat. Doar %s\\%s sau un Administrator pot debloca acest calculator." + IDS_CHANGEPWDTITLE "ModificÄ parola" + IDS_NONMATCHINGPASSWORDS "Parolele tastate nu corespund. TastaÈi aceiaÈi parolÄ Ã®n ambele cÃ¢mpuri de intrpducere." + IDS_PASSWORDCHANGED "Parola dumneavoastrÄ a fost modificatÄ." + IDS_LOGONTITLE "Mesaj de autentificare" + IDS_LOGONWRONGUSERORPWD "Sistemul nu vÄ poate autentifica. AsiguraÈi-vÄ cÄ numele Èi domeniul sunt corecte apoi tastaÈi din nou parola. Ãn parolÄ se face distincÈie Ã®ntre majuscule Èi minuscule." + IDS_LOGONUSERDISABLED "Contul dumneavoastrÄ a fost dezactivat. ContactaÈi administratorul de sistem." END /* Shutdown Dialog Strings */ STRINGTABLE BEGIN - IDS_SHUTDOWN_LOGOFF "Log off ""%s""" - IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_RESTART "Restart" - IDS_SHUTDOWN_SLEEP "Sleep" - IDS_SHUTDOWN_HIBERNATE "Hibernate" + IDS_SHUTDOWN_LOGOFF "Deautentificare ""%s""" + IDS_SHUTDOWN_SHUTDOWN "Ãnchidere" + IDS_SHUTDOWN_RESTART "Repornire" + IDS_SHUTDOWN_SLEEP "Stare de veghe" + IDS_SHUTDOWN_HIBERNATE "Hibernare" /* Shut down descriptions */ - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." - IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." - IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." - IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." + IDS_SHUTDOWN_LOGOFF_DESC "Ãnchide sesiunea curentÄ permiÈÃ¢nd altor utilizatori autentificarea Ã®n sistem." + IDS_SHUTDOWN_SHUTDOWN_DESC "Ãnchide atÃ¢t sesiunea curentÄ cÃ¢t Èi sistemul de operare pentru a puta opri Ã®n siguranÈÄ alimentarea electricÄ." + IDS_SHUTDOWN_RESTART_DESC "Ãnchide sesiunea curentÄ Èi reporneÈte sistemul." + IDS_SHUTDOWN_SLEEP_DESC "Induce sistemul Ã®n starea de veghe." + IDS_SHUTDOWN_HIBERNATE_DESC "PÄstreazÄ sesiunea curentÄ Èi opreÈte calculatorul." END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -213,9 +213,9 @@ EDITTEXT 14015, 68, 128, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Atribute:", 14020, 8, 152, 46, 10 - AUTOCHECKBOX "&Doar-citire", 14021, 56, 152, 70, 10 + AUTOCHECKBOX "Nem&odificabil", 14021, 56, 152, 70, 10 AUTOCHECKBOX "Asc&uns", 14022, 56, 166, 70, 10 - AUTOCHECKBOX "Ar&hivÄ", 14023, 56, 180, 70, 10 + AUTOCHECKBOX "Ar&hivabil", 14023, 56, 180, 70, 10 PUSHBUTTON "A&vansateâ¦", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -249,9 +249,9 @@ EDITTEXT 14019, 68, 163, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Atribute:", 14020, 8, 189, 45, 10 - AUTOCHECKBOX "&Doar-citire", 14021, 58, 189, 67, 10 + AUTOCHECKBOX "Nem&odificabil", 14021, 58, 189, 67, 10 AUTOCHECKBOX "Asc&uns", 14022, 126, 189, 50, 10 - AUTOCHECKBOX "Ar&hivÄ", 14023, 181, 189, 49, 10 + AUTOCHECKBOX "Ar&hivabil", 14023, 181, 189, 49, 10 PUSHBUTTON "A&vansateâ¦", 14028, 180, 185, 50, 15, WS_TABSTOP END @@ -455,7 +455,7 @@ PUSHBUTTON "A&nuleazÄ", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL LTEXT "Dosarul curent deja conÈine un fiÈier cu numele â%2â.", 12291, 44, 10, 231, 22, SS_NOPREFIX - LTEXT "Dosarul curent deja conÈine un fiÈier doar-citire cu numele â%2â.", 12292, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Dosarul curent deja conÈine un fiÈier nemodificabil cu numele â%2â.", 12292, 41, 10, 222, 22, SS_NOPREFIX LTEXT "Dosarul curent deja conÈine un fiÈier de sistem cu numele â%2â.", 12293, 41, 10, 222, 22, SS_NOPREFIX LTEXT "DoriÈi sÄ Ã®nlocuiÈi acest fiÈier?", -1, 44, 35, 228, 10, SS_NOPREFIX LTEXT "(mÄrime/datÄ necunoscutÄ)", 12302, 79, 51, 198, 20, SS_NOPREFIX @@ -730,7 +730,7 @@ IDS_OPEN_WITH_OTHER "Alte programe:" IDS_SHELL_ABOUT_AUTHORS "&Autori" - IDS_SHELL_ABOUT_BACK "< Ãna&poi" + IDS_SHELL_ABOUT_BACK "< Ãnap&oi" FCIDM_SHVIEW_NEW "N&ou" FCIDM_SHVIEW_NEWFOLDER "&Dosar" FCIDM_SHVIEW_NEWLINK "Sc&urtÄturÄ" Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -127,15 +127,15 @@ BEGIN IDS_ACKTITLE "ConÈtientizÄri" IDS_ACKSUBTITLE "ContribuÈii aduse Èi informaÈii despre licenÈÄ" - IDS_OWNERTITLE "Personalizarea sistemului de operare" + IDS_OWNERTITLE "Personalizare sistem" IDS_OWNERSUBTITLE "Asistentul va folosi cÃ¢teva informaÈii pentru a personaliza ReactOS." - IDS_COMPUTERTITLE "Numele calculatorului Èi parola de administrator" + IDS_COMPUTERTITLE "Nume calculator Èi parolÄ de administrator" IDS_COMPUTERSUBTITLE "Pentru calculator sunt necesare un nume Èi o parolÄ de administrator." IDS_LOCALETITLE "ParticularizÄri regionale" IDS_LOCALESUBTITLE "Particularizarea ReactOS pentru anumite regiuni sau limbi." IDS_DATETIMETITLE "DatÄ Èi orÄ" IDS_DATETIMESUBTITLE "StabiliÈi data Èi ora corectÄ pentru calculator." - IDS_PROCESSTITLE "Ãnregistrarea componentelor" + IDS_PROCESSTITLE "Ãnregistrare componente" IDS_PROCESSSUBTITLE "AÈteptaÈiâ¦" END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] Fri Apr 11 15:49:48 2014 @@ -22,5 +22,5 @@ IDS_SCROLLUP "DeruleazÄ Ã®n sus" IDS_SCROLLDOWN "DeruleazÄ Ã®n jos" */ - IDS_TERMINAL_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "Consola ReactOS" END

10 years, 5 months

[hbelusca] 62704: [WINSRV]: Update the description.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Apr 11 02:06:03 2014 New Revision: 62704 URL: http://svn.reactos.org/svn/reactos?rev=62704&view=rev Log: [WINSRV]: Update the description. Modified: trunk/reactos/win32ss/user/winsrv/winsrv.rc Modified: trunk/reactos/win32ss/user/winsrv/winsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/winsrv.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/winsrv.rc [iso-8859-1] Fri Apr 11 02:06:03 2014 @@ -4,7 +4,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User API & Console Server & Terminal Emulator DLL" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User & Console API Server + Terminal Emulator DLL" #define REACTOS_STR_INTERNAL_NAME "winsrv" #define REACTOS_STR_ORIGINAL_FILENAME "winsrv.dll" #include <reactos/version.rc>

10 years, 5 months

[jimtabor] 62703: - Fix penitential crash.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Apr 11 00:24:30 2014 New Revision: 62703 URL: http://svn.reactos.org/svn/reactos?rev=62703&view=rev Log: - Fix penitential crash. Modified: trunk/reactos/win32ss/user/ntuser/callback.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Fri Apr 11 00:24:30 2014 @@ -753,9 +753,9 @@ } break; case HCBT_MOVESIZE: - if (Common->lParam && lParam) + if (Extra && lParam) { - RtlCopyMemory((PVOID) lParam, (PVOID) Common->lParam, sizeof(RECTL)); + RtlCopyMemory((PVOID) lParam, Extra, sizeof(RECTL)); } break; }

10 years, 5 months

[jimtabor] 62702: [Win32k] - Add write back for HCBT_MOVESIZE.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Apr 10 23:32:34 2014 New Revision: 62702 URL: http://svn.reactos.org/svn/reactos?rev=62702&view=rev Log: [Win32k] - Add write back for HCBT_MOVESIZE. Modified: trunk/reactos/win32ss/user/ntuser/callback.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Thu Apr 10 23:32:34 2014 @@ -736,21 +736,30 @@ switch (HookId) { case WH_CBT: - if (Code == HCBT_CREATEWND) + { + switch (Code) { - if (CbtCreatewndExtra) - {/* - The parameters could have been changed, include the coordinates - and dimensions of the window. We copy it back. - */ - CbtCreateWnd->hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; - CbtCreateWnd->lpcs->x = CbtCreatewndExtra->Cs.x; - CbtCreateWnd->lpcs->y = CbtCreatewndExtra->Cs.y; - CbtCreateWnd->lpcs->cx = CbtCreatewndExtra->Cs.cx; - CbtCreateWnd->lpcs->cy = CbtCreatewndExtra->Cs.cy; - } + case HCBT_CREATEWND: + if (CbtCreatewndExtra) + {/* + The parameters could have been changed, include the coordinates + and dimensions of the window. We copy it back. + */ + CbtCreateWnd->hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; + CbtCreateWnd->lpcs->x = CbtCreatewndExtra->Cs.x; + CbtCreateWnd->lpcs->y = CbtCreatewndExtra->Cs.y; + CbtCreateWnd->lpcs->cx = CbtCreatewndExtra->Cs.cx; + CbtCreateWnd->lpcs->cy = CbtCreatewndExtra->Cs.cy; + } + break; + case HCBT_MOVESIZE: + if (Common->lParam && lParam) + { + RtlCopyMemory((PVOID) lParam, (PVOID) Common->lParam, sizeof(RECTL)); + } + break; } - break; + } // "The GetMsgProc hook procedure can examine or modify the message." case WH_GETMESSAGE: if (pMsg)

10 years, 5 months

[ekohl] 62701: [SYSDM] - Improve the paging file management code. - Display no paging file and system managed paging file in the list. - Do not display the total paging file size because the calcul...

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Apr 10 21:51:29 2014 New Revision: 62701 URL: http://svn.reactos.org/svn/reactos?rev=62701&view=rev Log: [SYSDM] - Improve the paging file management code. - Display no paging file and system managed paging file in the list. - Do not display the total paging file size because the calculated value is rubbish. Will be fixed next. Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/precomp.h trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "ÐÑÐ²ÐµÐ´ÐµÑÐµ ÑÐ¸ÑÐ»ÐµÐ½Ð° ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ Ð·Ð° Ð²ÑÑÑÐ¾Ð²Ð¸Ñ ÑÐ°Ð·Ð¼ÐµÑ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹Ð»." IDS_WARNINITIALRANGE "ÐÐ°ÑÐ°Ð»Ð½Ð¸ÑÑ ÑÐ°Ð·Ð¼ÐµÑ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹Ð» Ð½Ðµ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ðµ Ð¿Ð¾-Ð¼Ð°Ð»ÑÐº Ð¾Ñ 2 ÐÐ Ð¸ Ð½Ðµ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð½Ð°Ð´ÑÐ²ÑÑÐ»Ñ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ÑÐ¾ Ð¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÐ²Ð¾ Ð½Ð° Ð¸Ð·Ð±ÑÐ°Ð½Ð¾ÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." IDS_WARNMAXIMUMRANGE "ÐÑÑÑÐ¾Ð²Ð¸ÑÑ ÑÐ°Ð·Ð¼ÐµÑ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹Ð» Ð½Ðµ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ðµ Ð¿Ð¾-Ð¼Ð°Ð»ÑÐº Ð¾Ñ Ð½Ð°ÑÐ°Ð»Ð½Ð¸Ñ Ð¸ Ð½Ðµ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð½Ð°Ð´Ð²Ð¸ÑÐ°Ð²Ð° ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ÑÐ¾ Ð¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÐ²Ð¾ Ð½Ð° Ð¸Ð·Ð±ÑÐ°Ð½Ð¾ÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -280,5 +280,7 @@ IDS_WARNMAXIMUMSIZE "Zadejte ÄÃselnou hodnotu pro maximÃ¡lnÃ velikost strÃ¡nkovacÃho souboru." IDS_WARNINITIALRANGE "VÃ½chozÃ velikost strÃ¡nkovacÃho souboru nesmÃ bÃ½t menÅ¡Ã neÅ¾ 2 MB a nesmÃ pÅekroÄit mnoÅ¾stvÃ volnÃ©ho mÃsta na zvolenÃ© diskovÃ© jednotce." IDS_WARNMAXIMUMRANGE "MaximÃ¡lnÃ velikost strÃ¡nkovacÃho souboru nesmÃ bÃ½t menÅ¡Ã neÅ¾ velikost vÃ½chozÃ a nesmÃ pÅekroÄit mnoÅ¾stvÃ volnÃ©ho mÃsta na zvolenÃ© diskovÃ© jednotce." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -284,5 +284,7 @@ IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert fÃ¼r die MaximalgrÃ¶Ãe der Auslagerungsdatei an." IDS_WARNINITIALRANGE "Die AnfangsgrÃ¶Ãe der Auslagerungsdatei darf nicht kleiner als 2 MB sein und darf den verfÃ¼gbaren Speicherplatz auf dem gewÃ¤hlten Laufwerk nicht Ã¼berschreiten." IDS_WARNMAXIMUMRANGE "Die MaximalgrÃ¶Ãe der Auslagerungsdatei darf nicht kleiner als die AnfangsgrÃ¶Ãe sein und darf den verfÃ¼gbaren Speicherplatz auf dem gewÃ¤hlten Laufwerk nicht Ã¼berschreiten." + IDS_PAGEFILE_NONE "Keine" + IDS_PAGEFILE_SYSTEM "Systemverwaltet" IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Verantwortliche\n\nColin Finck\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht an\n\nalle Mitwirkenden\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -277,5 +277,7 @@ IDS_WARNMAXIMUMSIZE "Ingresar el tamaÃ±o mÃ¡ximo del archivo de paginaciÃ³n." IDS_WARNINITIALRANGE "El tamaÃ±o inicial del archivo de paginaciÃ³n no puede ser inferior a 2 MB y no puede exceder el espacio disponible en la unidad seleccionada." IDS_WARNMAXIMUMRANGE "El tamaÃ±o mÃ¡ximo del archivo de paginaciÃ³n no puede ser inferior al tamaÃ±o inicial y no puede exceder el espacio disponible en la unidad seleccionada." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -277,5 +277,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -277,5 +277,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Immettere la dimensione massima del file di paging." IDS_WARNINITIALRANGE "La dimensione iniziale del file di paging non puÃ² essere inferiore a 2 MB e non puÃ² superare lo spazio disponibile nell'unitÃ selezionata." IDS_WARNMAXIMUMRANGE "La dimensione massima del file di paging non puÃ² essere inferiore a quella iniziale e non puÃ² superare lo spazio disponibile nell'unitÃ selezionata." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nCoordinatore\n\nAleksey Bragin\n\nGruppo di sviluppo\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nUlteriori ringraziamenti\n\na tutti i Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -284,5 +284,7 @@ IDS_WARNMAXIMUMSIZE "WprowadÅº wielkoÅÄ dla maksymalnego rozmiaru pliku stronicowania." IDS_WARNINITIALRANGE "PoczÄtkowy rozmiar pliku stronicowania nie moÅ¼e byÄ mniejszy niÅ¼ 2MB i nie moÅ¼e przekraczaÄ dostÄpnej iloÅci miejsca w wybranym napÄdzie." IDS_WARNMAXIMUMRANGE "Maksymalny rozmiar pliku stronicowania nie moÅ¼e byÄ mniejszy niÅ¼ jego rozmiar poczÄtkowy i nie moÅ¼e przekraczaÄ dostÄpnej iloÅci miejsca w wybranym napÄdzie." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nEkipa ReactOS\n\nKoordynator Projektu\n\nAleksey Bragin\n\nEkipa ProgramistÃ³w\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nInÅ¼ynierowie WydaÅ\n\nColin Finck\nZ98\n\nEkipa WWW\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEkipa PR\n\nMindflyer\nWierd_W\n\nPodziÄkowania dla\n\nwszystkich wspÃ³ÅpracownikÃ³w\nEkipy Wine\n\n"//FIXME END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -277,5 +277,7 @@ IDS_WARNMAXIMUMSIZE "IntroduceÈi o valoare numericÄ pentru dimensiunea maximÄ a fiÈierului de paginare." IDS_WARNINITIALRANGE "Dimensiunea iniÈialÄ a fiÈierului de paginare trebuie sÄ fie Ã®ncadratÄ Ã®ntre 2 Mo Èi spaÈiul liber disponibil al unitÄÈii selectate." IDS_WARNMAXIMUMRANGE "Dimensiunea maximÄ a fiÈierului de paginare trebuie sÄ fie Ã®ncadratÄ Ã®ntre dimensiunea iniÈialÄ Èi spaÈiul liber disponibil al unitÄÈii selectate." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nEchipa ReactOS\n\nCoordonator de proiect\n\nAleksey Bragin\n\nEchipa de dezvoltare\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nIngineri de distribuÈie\n\nColin Finck\nZ98\n\nEchipa paginii web\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEchipa multimedia\n\nMindflyer\nWierd_W\n\nmulÈumiri adresate cÄtre\n\ntoÈi Contribuitorii\nEchipa Wine\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐ¸ÑÐ»Ð¾Ð²Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸." IDS_WARNINITIALRANGE "ÐÐ°ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð½Ðµ Ð¼ÐµÐ½ÑÑÐµ, ÑÐµÐ¼ 2 ÐÐ Ð¸ Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ° Ð½Ð° Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." IDS_WARNMAXIMUMRANGE "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð½Ðµ Ð¼ÐµÐ½ÑÑÐµ, ÑÐµÐ¼ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ° Ð½Ð° Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS\n\nÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÐ¾Ñ Ð¿ÑÐ¾ÐµÐºÑÐ°\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\n\nÐÐ¾Ð»Ð»ÐµÐºÑÐ¸Ð² ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¾Ð²\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\nÐÐ½Ð´ÑÑ ÐÑÐ¸Ð½Ð²ÑÐ´\nÐÐ½Ð´ÑÐµÐ¹ ÐÐ¾ÑÐ¾ÑÐ°ÐµÐ²\nÐÑÑ ÐÐµÑÐºÑ\nÐÑÐ¸ÑÑÐ¾Ñ ÑÐ¾Ð½ ÐÐ¸ÑÑÐ¸Ñ\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐÐ°Ð½Ð¸ÑÐ»Ñ Ð Ð°Ð¹Ð¼ÐµÑ\nÐÐ¼Ð¸ÑÑÐ¸Ð¹ Ð§Ð°Ð¿ÑÑÐµÐ²\nÐÑÐ¸Ðº ÐÐ¾Ð»Ñ\nÐÐµÐ´ ÐÑÑÑÐ¸\nÐÑÐµÐ³Ð¾Ñ ÐÑÑÐ½Ð¼Ð°Ñ\nÐÑÐ²Ðµ ÐÐ¾ÑÑÐ¸Ð½Ð¾\nÐÐ¶ÐµÐ¹Ð¼Ñ Ð¢ÑÐ±Ð¾Ñ\nÐÐ¶ÐµÑÑÑÐ¸ ÐÐ¾ÑÐ»Ð°Ð½\nÐÐ¾ÑÐ°Ð½Ð½ÐµÑ ÐÐ½Ð´ÐµÑÐ²Ð°Ð»ÑÐ´\nKJK::ÐÐ¸Ð¿ÐµÑÐ¸Ð¾Ð½\nÐÐ°Ð°ÑÑÐµÐ½ ÐÐ¾ÑÐ¼Ð°\nÐÐ°Ð³Ð½ÑÑ ÐÐ»ÑÐµÐ½\nÐÐ°ÑÐº ÐÐ¸ÑÐ»Ð°ÑÑ\nÐÐ°ÑÑÐ¸Ð°Ñ ÐÑÐ¿ÑÐµÑ\nÐÐ°Ð¹Ðº ÐÐ¾ÑÐ´ÐµÐ»Ð»\nÐÐ¸ÑÐµÑ ÐÐ°ÑÐ´\nÐÑÐµÑ Ð¨Ð²ÐµÐ¹ÑÐµÑ\nÐ¡Ð°Ð²ÐµÐ»Ð¸Ð¹ Ð¢ÑÐµÑÑÑÐºÐ¾Ð²\nÐ¡ÑÐµÑÐ°Ð½ ÐÐ¸Ð½ÑÐ±ÐµÑÐ³\nÐ¡Ð¸Ð»ÑÐ²ÐµÐ¹Ð½ ÐÐµÑÑÐµÐ¾Ð»Ñ\nÐ¢Ð¾Ð¼Ð°Ñ ÐÐ»ÑÐ¼ÐµÐ»Ñ\nÐ¢Ð¸Ð¼Ð¾ ÐÑÐ¾Ð¹ÑÐµÑ\n\nÐÐ»ÐµÐºÑ ÐÐ¾Ð½ÐµÑÐºÑ\nÐ¤Ð¸Ð»Ð¸Ð¿ ÐÐ°Ð²Ð°ÑÐ°\nÐÑÐ½Ð½Ð°Ñ ÐÐ°Ð»ÑÐ½ÐµÑ\nÐÐ°ÑÑÐ¸Ð½ Ð¤ÑÐºÑ\nÐ Ð¾Ð¹Ñ ÐÐ¸ÑÑÐµÐ»Ð» III\nÐÑÑÐ½Ð´Ð¾Ð½ Ð¢ÑÑÐ½ÐµÑ\nÐÑÐ°Ð¹Ð°Ð½ ÐÐ°Ð»Ð¼ÐµÑ\nÐÐ°ÑÐ¿ÐµÑ Ð¥Ð¾ÑÐ½ÑÑÑÑÐ¿\nÐÑÐ²Ð¸Ð´ ÐÐµÐ»Ñ\nÐÐ¼Ð°Ð½ÑÑÐ»Ñ ÐÐ»Ð¸Ð±ÐµÑÑÐ¸\nÐÐµ Ð²Ð°Ð½ ÐÐµÐ»ÑÐ´Ð¾ÑÐ¿\nÐÑÐµÐ³Ð¾Ñ ÐÐ½Ð¸Ñ\nÐÐ¶ÐµÐ¹ÑÐ¾Ð½ Ð¤Ð¸Ð»Ð±Ð¸\nÐÐµÐ½Ñ ÐÐ¾Ð»Ð»Ð¸Ð½\nÐÐ¸ÑÐ°ÑÐ»Ñ ÐÐ¸ÑÑ\nÐÐ°ÑÐ°Ð½ ÐÑÐ´Ñ\nÐ Ð¾Ð±ÐµÑÑ ÐÐ¸ÐºÐµÐ½ÑÐ¾Ð½\nÐ ÐµÐºÑ ÐÐ¶Ð¾Ð»Ð»Ð¸ÑÑ\nVizzini\n\nÐ ÐµÐ»Ð¸Ð·-Ð¸Ð½Ð¶ÐµÐ½ÐµÑÑ\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐ Ð°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ°\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¯Ð½ ÐÐ»ÑÐ¼ÐºÐ²Ð¸ÑÑ ÐÐ¸Ð½Ð°Ð½Ð´ÐµÑ\nÐÐ»ÐµÐ¼ÐµÐ½Ñ Ð¤ÑÐ¸Ð´Ð»\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ Ð´Ð¸Ð·Ð°Ð¹Ð½\n\nMindflyer\nWierd_W\n\nÐÐ»Ð°Ð³Ð¾Ð´Ð°ÑÐ½Ð¾ÑÑÐ¸\n\nÐ²ÑÐµÐ¼ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ°Ð¼ Ð¿ÑÐ¾ÐµÐºÑÐ°\nÐÐ¾Ð¼Ð°Ð½Ð´Ðµ Wine\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -283,5 +283,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -275,5 +275,7 @@ IDS_WARNMAXIMUMSIZE "Futni njÃ« vlerÃ« numerike pÃ«r madhÃ«sinÃ« maksimale e faqeve tÃ« dokumentave." IDS_WARNINITIALRANGE "MadhÃ«sia fillestare e faqes sÃ« dokumentit nuk duhet tÃ« jetÃ« mÃ« e vogÃ«l se 2 MB dhe nuk duhet tÃ« kalojÃ« hapÃ«sirÃ«n nÃ« dispozicion nÃ« driver-in e pÃ«rzgjedhur." IDS_WARNMAXIMUMRANGE "MadhÃ«sia maksimale e faqes sÃ« dokumenit nuk duhet tÃ« jetÃ« mÃ« e vogÃ«l se madhÃ«sia e saj fillestare dhe nuk duhet tÃ« kalojÃ« hapÃ«sirÃ«n nÃ« dispozicion nÃ« driver-in e pÃ«rzgjedhur." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -277,5 +277,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -277,5 +277,7 @@ IDS_WARNMAXIMUMSIZE "Sayfalama kÃ¼tÃ¼ÄÃ¼nÃ¼n azamÃ® bÃ¼yÃ¼klÃ¼ÄÃ¼nÃ¼ giriniz." IDS_WARNINITIALRANGE "Sayfalama kÃ¼tÃ¼ÄÃ¼nÃ¼n baÅlangÄ±Ã§ bÃ¼yÃ¼klÃ¼ÄÃ¼, 2 MB'tan kÃ¼Ã§Ã¼k, seÃ§ili sÃ¼rÃ¼cÃ¼deki boÅluÄun bÃ¼yÃ¼klÃ¼ÄÃ¼nden bÃ¼yÃ¼k olamaz." IDS_WARNMAXIMUMRANGE "Sayfalama kÃ¼tÃ¼ÄÃ¼nÃ¼n azamÃ® bÃ¼yÃ¼klÃ¼ÄÃ¼, baÅlangÄ±Ã§ bÃ¼yÃ¼klÃ¼ÄÃ¼nden kÃ¼Ã§Ã¼k, seÃ§ili sÃ¼rÃ¼cÃ¼deki boÅluÄun bÃ¼yÃ¼klÃ¼ÄÃ¼nden bÃ¼yÃ¼k olamaz." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS TakÄ±mÄ±\n\nTasarÄ± EÅ GÃ¼dÃ¼mcÃ¼sÃ¼:\n\nAleksey Bragin\n\nGeliÅtirme TakÄ±mÄ±:\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nSÃ¼rÃ¼m TasarlayÄ±cÄ±larÄ±:\n\nColin Finck\nZ98\n\nUmÃ»mÃ® AÄ Sitesi TakÄ±mÄ±:\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedya TakÄ±mÄ±:\n\nMindflyer\nWierd_W\n\nAyrÄ±ca, diÄer tÃ¼m katkÄ±da bulunanlara teÅekkÃ¼rler:\nWine TakÄ±mÄ±\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -283,5 +283,7 @@ IDS_WARNMAXIMUMSIZE "ÐÐ²ÐµÐ´ÑÑÑ ÑÐ¸ÑÐ»Ð¾Ð²Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÐ¾Ð·Ð¼ÑÑÑ ÑÐ°Ð¹Ð»Ñ Ð´Ð¾Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ." IDS_WARNINITIALRANGE "ÐÐ¾ÑÐ°ÑÐºÐ¾Ð²Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ ÑÐ°Ð¹Ð»Ñ Ð´Ð¾Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑÑÐ¸ Ð¼ÐµÐ½ÑÐ¸Ð¼ 2 ÐÐ± Ñ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð¿ÐµÑÐµÐ²Ð¸ÑÑÐ²Ð°ÑÐ¸ Ð¾Ð±'ÑÐ¼ Ð²ÑÐ»ÑÐ½Ð¾Ð³Ð¾ Ð¼ÑÑÑÑ Ð½Ð° Ð¾Ð±ÑÐ°Ð½Ð¾Ð¼Ñ Ð´Ð¸ÑÐºÑ." IDS_WARNMAXIMUMRANGE "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ ÑÐ°Ð¹Ð»Ñ Ð´Ð¾Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑÑÐ¸ Ð¼ÐµÐ½ÑÐ¸Ð¼ Ð²ÑÐ´ Ð¿Ð¾ÑÐ°ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ ÑÐ° Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð¿ÐµÑÐµÐ²Ð¸ÑÑÐ²Ð°ÑÐ¸ Ð¾Ð±'ÑÐ¼ Ð²ÑÐ»ÑÐ½Ð¾Ð³Ð¾ Ð¼ÑÑÑÑ Ð½Ð° Ð¾Ð±ÑÐ°Ð½Ð¾Ð¼Ñ Ð´Ð¸ÑÐºÑ." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -277,5 +277,7 @@ IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_PAGEFILE_NONE "none" + IDS_PAGEFILE_SYSTEM "system managed" IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/precomp.h [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -51,6 +51,7 @@ typedef struct _PAGEFILE { TCHAR szDrive[3]; + LPTSTR pszVolume; UINT InitialSize; UINT MaximumSize; UINT FreeSize; Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -37,6 +37,8 @@ #define IDS_WARNMAXIMUMSIZE 79 #define IDS_WARNINITIALRANGE 80 #define IDS_WARNMAXIMUMRANGE 81 +#define IDS_PAGEFILE_NONE 82 +#define IDS_PAGEFILE_SYSTEM 83 /* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100 Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] Thu Apr 10 21:51:29 2014 @@ -107,24 +107,18 @@ TCHAR szDrives[1024]; // All drives LPTSTR DrivePtr = szDrives; TCHAR szDrive[3]; // Single drive - TCHAR szVolume[MAX_PATH]; - TCHAR *szDisplayString; - INT InitialSize = 0; - INT MaximumSize = 0; + TCHAR szVolume[MAX_PATH + 1]; + INT InitialSize; + INT MaximumSize; INT DriveLen; INT PgCnt = 0; + INT Len; DriveLen = GetLogicalDriveStrings(1023, szDrives); - szDisplayString = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MAX_PATH * 2 + 69) * sizeof(TCHAR)); - if (szDisplayString == NULL) - return; - while (DriveLen != 0) { - INT Len; - Len = lstrlen(DrivePtr) + 1; DriveLen -= Len; @@ -135,68 +129,47 @@ if (GetDriveType(DrivePtr) == DRIVE_FIXED) { + InitialSize = -1; + MaximumSize = -1; + /* Does drive match the one in the registry ? */ if (!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2)) { - /* FIXME: We only check the first available pagefile in the reg */ GetPageFileSizes(pVirtMem->szPagingFiles, &InitialSize, &MaximumSize); - - pVirtMem->Pagefile[PgCnt].InitialSize = InitialSize; - pVirtMem->Pagefile[PgCnt].MaximumSize = MaximumSize; - pVirtMem->Pagefile[PgCnt].bUsed = TRUE; - lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive); - } - else - { - pVirtMem->Pagefile[PgCnt].InitialSize = 0; - pVirtMem->Pagefile[PgCnt].MaximumSize = 0; - pVirtMem->Pagefile[PgCnt].bUsed = FALSE; - lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive); - } - - _tcscpy(szDisplayString, szDrive); - _tcscat(szDisplayString, _T("\t")); - - /* Set a volume label if there is one */ + } + + pVirtMem->Pagefile[PgCnt].InitialSize = InitialSize; + pVirtMem->Pagefile[PgCnt].MaximumSize = MaximumSize; + pVirtMem->Pagefile[PgCnt].bUsed = TRUE; + lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive); + + + /* Get the volume label if there is one */ if (GetVolumeInformation(DrivePtr, szVolume, - 255, + MAX_PATH + 1, NULL, NULL, NULL, NULL, 0)) { - if (szVolume[0] != _T('\0')) - { - TCHAR szVol[MAX_PATH + 2]; - _stprintf(szVol, _T("[%s]"), szVolume); - _tcscat(szDisplayString, szVol); - } - } - - if ((InitialSize != 0) || (MaximumSize != 0)) - { - TCHAR szSize[64]; - - _stprintf(szSize, _T("%i - %i"), InitialSize, MaximumSize); - _tcscat(szDisplayString, _T("\t")); - _tcscat(szDisplayString, szSize); - } - - SendMessage(pVirtMem->hListBox, LB_ADDSTRING, (WPARAM)0, (LPARAM)szDisplayString); + pVirtMem->Pagefile[PgCnt].pszVolume = HeapAlloc(GetProcessHeap(), + 0, + (_tcslen(szVolume) + 1) * sizeof(TCHAR)); + if (pVirtMem->Pagefile[PgCnt].pszVolume != NULL) + _tcscpy(pVirtMem->Pagefile[PgCnt].pszVolume, szVolume); + } + PgCnt++; } DrivePtr += Len; } - SendMessage(pVirtMem->hListBox, LB_SETCURSEL, (WPARAM)0, (LPARAM)0); - HeapFree(GetProcessHeap(), 0, szDisplayString); pVirtMem->Count = PgCnt; - OnSelChange(pVirtMem->hSelf, pVirtMem); } @@ -211,9 +184,12 @@ for (i = 0; i < pVirtMem->Count; ++i) { - if (pVirtMem->Pagefile[i].bUsed) - { - _stprintf(szText, _T("%s\\pagefile.sys %i %i"), + if (pVirtMem->Pagefile[i].bUsed && + pVirtMem->Pagefile[i].InitialSize != -1 && + pVirtMem->Pagefile[i].MaximumSize != -1) + { + _stprintf(szText, + _T("%s\\pagefile.sys %i %i"), pVirtMem->Pagefile[i].szDrive, pVirtMem->Pagefile[i].InitialSize, pVirtMem->Pagefile[i].MaximumSize); @@ -261,9 +237,10 @@ static VOID SetListBoxColumns(HWND hwndListBox) { - const INT tabs[2] = {30, 120}; - - SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)2, (LPARAM)&tabs[0]); + RECT rect = {0, 0, 103, 0}; + MapDialogRect(hwndListBox, &rect); + + SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)1, (LPARAM)&rect.right); } @@ -291,6 +268,102 @@ /* Enable the page file custom size boxes */ EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE); EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); +} + + +static VOID +InitPagefileList(PVIRTMEM pVirtMem) +{ + TCHAR szDisplayString[256]; + TCHAR szSize[64]; + INT Index; + INT i; + + for (i = 0; i < 26; i++) + { + if (pVirtMem->Pagefile[i].bUsed) + { + if ((pVirtMem->Pagefile[i].InitialSize == -1) && + (pVirtMem->Pagefile[i].MaximumSize == -1)) + { + LoadString(hApplet, + IDS_PAGEFILE_NONE, + szSize, + sizeof(szSize) / sizeof(szSize[0])); + } + else if ((pVirtMem->Pagefile[i].InitialSize == 0) && + (pVirtMem->Pagefile[i].MaximumSize == 0)) + { + LoadString(hApplet, + IDS_PAGEFILE_SYSTEM, + szSize, + sizeof(szSize) / sizeof(szSize[0])); + } + else + { + _stprintf(szSize, _T("%d - %d"), + pVirtMem->Pagefile[i].InitialSize, + pVirtMem->Pagefile[i].MaximumSize); + } + + _stprintf(szDisplayString, + _T("%s [%s]\t%s"), + pVirtMem->Pagefile[i].szDrive, + pVirtMem->Pagefile[i].pszVolume ? pVirtMem->Pagefile[i].pszVolume : _T(""), + szSize); + + Index = SendMessage(pVirtMem->hListBox, LB_ADDSTRING, (WPARAM)0, (LPARAM)szDisplayString); + SendMessage(pVirtMem->hListBox, LB_SETITEMDATA, Index, i); + } + } + + SendMessage(pVirtMem->hListBox, LB_SETCURSEL, (WPARAM)0, (LPARAM)0); + + OnSelChange(pVirtMem->hSelf, pVirtMem); +} + + +static VOID +UpdatePagefileEntry(PVIRTMEM pVirtMem, + INT ListIndex, + INT DriveIndex) +{ + TCHAR szDisplayString[256]; + TCHAR szSize[64]; + + if ((pVirtMem->Pagefile[DriveIndex].InitialSize == -1) && + (pVirtMem->Pagefile[DriveIndex].MaximumSize == -1)) + { + LoadString(hApplet, + IDS_PAGEFILE_NONE, + szSize, + sizeof(szSize) / sizeof(szSize[0])); + } + else if ((pVirtMem->Pagefile[DriveIndex].InitialSize == 0) && + (pVirtMem->Pagefile[DriveIndex].MaximumSize == 0)) + { + LoadString(hApplet, + IDS_PAGEFILE_SYSTEM, + szSize, + sizeof(szSize) / sizeof(szSize[0])); + } + else + { + _stprintf(szSize, + _T("%d - %d"), + pVirtMem->Pagefile[DriveIndex].InitialSize, + pVirtMem->Pagefile[DriveIndex].MaximumSize); + } + + _stprintf(szDisplayString, + _T("%s [%s]\t%s"), + pVirtMem->Pagefile[DriveIndex].szDrive, + pVirtMem->Pagefile[DriveIndex].pszVolume ? pVirtMem->Pagefile[DriveIndex].pszVolume : L"", + szSize); + + SendMessage(pVirtMem->hListBox, LB_DELETESTRING, (WPARAM)ListIndex, 0); + SendMessage(pVirtMem->hListBox, LB_INSERTSTRING, (WPARAM)ListIndex, (LPARAM)szDisplayString); + SendMessage(pVirtMem->hListBox, LB_SETCURSEL, (WPARAM)ListIndex, 0); } @@ -303,6 +376,7 @@ BOOL bTranslated; TCHAR szTitle[64]; TCHAR szMessage[256]; + INT DriveIndex = 0; pVirtMem->bSave = TRUE; @@ -313,6 +387,12 @@ 0); if (Index >= 0 && Index < pVirtMem->Count) { + DriveIndex = SendDlgItemMessage(pVirtMem->hSelf, + IDC_PAGEFILELIST, + LB_GETITEMDATA, + 0, + 0); + /* Check if custom settings are checked */ if (IsDlgButtonChecked(pVirtMem->hSelf, IDC_CUSTOM) == BST_CHECKED) @@ -369,7 +449,7 @@ /* Check the valid range of the inial size */ if (InitialSize < 2 || - InitialSize > pVirtMem->Pagefile[Index].FreeSize) + InitialSize > pVirtMem->Pagefile[DriveIndex].FreeSize) { if (LoadString(hApplet, IDS_MESSAGEBOXTITLE, @@ -391,7 +471,7 @@ /* Check the valid range of the maximum size */ if (MaximumSize < InitialSize || - MaximumSize > pVirtMem->Pagefile[Index].FreeSize) + MaximumSize > pVirtMem->Pagefile[DriveIndex].FreeSize) { if (LoadString(hApplet, IDS_MESSAGEBOXTITLE, @@ -411,27 +491,26 @@ return; } - pVirtMem->Pagefile[Index].InitialSize = InitialSize; - pVirtMem->Pagefile[Index].MaximumSize = MaximumSize; - pVirtMem->Pagefile[Index].bUsed = TRUE; + pVirtMem->Pagefile[DriveIndex].InitialSize = InitialSize; + pVirtMem->Pagefile[DriveIndex].MaximumSize = MaximumSize; + pVirtMem->Pagefile[DriveIndex].bUsed = TRUE; + } + else if (IsDlgButtonChecked(pVirtMem->hSelf, + IDC_NOPAGEFILE) == BST_CHECKED) + { + /* Set sizes to -1 */ + pVirtMem->Pagefile[DriveIndex].InitialSize = -1; + pVirtMem->Pagefile[DriveIndex].MaximumSize = -1; + pVirtMem->Pagefile[DriveIndex].bUsed = TRUE; } else { - /* Set sizes to 0 */ - pVirtMem->Pagefile[Index].InitialSize = 0; - pVirtMem->Pagefile[Index].MaximumSize = 0; - - // Check to see if this drive is used for a paging file - if (IsDlgButtonChecked(pVirtMem->hSelf, - IDC_NOPAGEFILE) == BST_UNCHECKED) - { - pVirtMem->Pagefile[Index].bUsed = TRUE; - } - else - { - pVirtMem->Pagefile[Index].bUsed = FALSE; - } - } + pVirtMem->Pagefile[DriveIndex].InitialSize = 0; + pVirtMem->Pagefile[DriveIndex].MaximumSize = 0; + pVirtMem->Pagefile[DriveIndex].bUsed = TRUE; + } + + UpdatePagefileEntry(pVirtMem, Index, DriveIndex); } } @@ -442,7 +521,7 @@ TCHAR szBuffer[64]; MEMORYSTATUSEX MemoryStatus; ULARGE_INTEGER FreeDiskSpace; - UINT i, FreeMemMb, PageFileSizeMb; + UINT /*i,*/ FreeMemMb /*, PageFileSizeMb*/; INT Index; Index = (INT)SendDlgItemMessage(hwndDlg, @@ -465,9 +544,30 @@ SetDlgItemText(hwndDlg, IDC_SPACEAVAIL, szBuffer); } - if (pVirtMem->Pagefile[Index].InitialSize != 0 && - pVirtMem->Pagefile[Index].MaximumSize != 0) - { + if (pVirtMem->Pagefile[Index].InitialSize == -1 && + pVirtMem->Pagefile[Index].MaximumSize == -1) + { + /* No pagefile */ + + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); + + CheckDlgButton(pVirtMem->hSelf, IDC_NOPAGEFILE, BST_CHECKED); + } + else if (pVirtMem->Pagefile[Index].InitialSize == 0 && + pVirtMem->Pagefile[Index].MaximumSize == 0) + { + /* System managed size*/ + + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); + + CheckDlgButton(pVirtMem->hSelf, IDC_SYSMANSIZE, BST_CHECKED); + } + else + { + /* Custom size */ + /* Enable and fill the custom values */ EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE); @@ -486,26 +586,6 @@ IDC_CUSTOM, BST_CHECKED); } - else - { - /* It's not a custom value */ - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); - - /* Is it system managed */ - if (pVirtMem->Pagefile[Index].bUsed) - { - CheckDlgButton(pVirtMem->hSelf, - IDC_SYSMANSIZE, - BST_CHECKED); - } - else - { - CheckDlgButton(pVirtMem->hSelf, - IDC_NOPAGEFILE, - BST_CHECKED); - } - } /* Set minimum pagefile size */ SetDlgItemText(hwndDlg, IDC_MINIMUM, _T("2 MB")); @@ -520,6 +600,7 @@ } /* Set current pagefile size */ +#if 0 PageFileSizeMb = 0; for (i = 0; i < 26; i++) { @@ -527,6 +608,7 @@ } _stprintf(szBuffer, _T("%u MB"), PageFileSizeMb); SetDlgItemText(hwndDlg, IDC_CURRENT, szBuffer); +#endif } return TRUE; @@ -546,18 +628,46 @@ static VOID OnInitDialog(HWND hwnd, PVIRTMEM pVirtMem) { + INT i; + pVirtMem->hSelf = hwnd; pVirtMem->hListBox = GetDlgItem(hwnd, IDC_PAGEFILELIST); pVirtMem->bSave = FALSE; SetListBoxColumns(pVirtMem->hListBox); + for (i = 0; i < 26; i++) + { + pVirtMem->Pagefile[i].bUsed = FALSE; + pVirtMem->Pagefile[i].InitialSize = -1; + pVirtMem->Pagefile[i].MaximumSize = -1; + } + /* Load the pagefile systems from the reg */ - if (ReadPageFileSettings(pVirtMem)) - { - /* Parse our settings and set up dialog */ - ParseMemSettings(pVirtMem); - } + ReadPageFileSettings(pVirtMem); + + /* Parse our settings and set up dialog */ + ParseMemSettings(pVirtMem); + + InitPagefileList(pVirtMem); +} + + +static VOID +OnDestroy(PVIRTMEM pVirtMem) +{ + INT i; + + for (i = 0; i < 26; i++) + { + if (pVirtMem->Pagefile[i].pszVolume != NULL) + HeapFree(GetProcessHeap(), 0, pVirtMem->Pagefile[i].pszVolume); + } + + if (pVirtMem->szPagingFiles) + HeapFree(GetProcessHeap(), 0, pVirtMem->szPagingFiles); + + HeapFree(GetProcessHeap(), 0, pVirtMem); } @@ -589,10 +699,7 @@ break; case WM_DESTROY: - if (pVirtMem->szPagingFiles) - HeapFree(GetProcessHeap(), 0, - pVirtMem->szPagingFiles); - HeapFree(GetProcessHeap(), 0, pVirtMem); + OnDestroy(pVirtMem); break; case WM_COMMAND:

10 years, 5 months

[hbelusca] 62700: [CONSRV] Fix Insert mode.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 10 20:24:49 2014 New Revision: 62700 URL: http://svn.reactos.org/svn/reactos?rev=62700&view=rev Log: [CONSRV] Fix Insert mode. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c trunk/reactos/win32ss/user/winsrv/consrv/settings.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Thu Apr 10 20:24:49 2014 @@ -260,7 +260,7 @@ Console->LineComplete = FALSE; Console->LineUpPressed = FALSE; - Console->LineInsertToggle = 0; + Console->LineInsertToggle = Console->InsertMode; Console->LineWakeupMask = ReadControl->dwCtrlWakeupMask; Console->LineSize = ReadControl->nInitialChars; Console->LinePos = Console->LineSize; Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Thu Apr 10 20:24:49 2014 @@ -569,7 +569,8 @@ Console->InsertMode = ConsoleInfo->InsertMode; Console->LineBuffer = NULL; Console->LineMaxSize = Console->LineSize = Console->LinePos = 0; - Console->LineComplete = Console->LineUpPressed = Console->LineInsertToggle = FALSE; + Console->LineComplete = Console->LineUpPressed = FALSE; + Console->LineInsertToggle = Console->InsertMode; // LineWakeupMask // FIXME: This is terminal-specific !! VV Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Thu Apr 10 20:24:49 2014 @@ -298,7 +298,7 @@ { DWORD Size = (Console->ActiveBuffer->CursorInfo.dwSize * Scale + 99) / 100; /* If line input in progress, perhaps adjust for insert toggle */ - if (Console->LineBuffer && !Console->LineComplete && Console->LineInsertToggle) + if (Console->LineBuffer && !Console->LineComplete && (Console->InsertMode ? !Console->LineInsertToggle : Console->LineInsertToggle)) return (Size * 2 <= Scale) ? (Size * 2) : (Size / 2); return Size; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Thu Apr 10 20:24:49 2014 @@ -444,8 +444,8 @@ else { /* Normal character */ - BOOL Overstrike = Console->LineInsertToggle && Console->LinePos != Console->LineSize; - LineInputEdit(Console, Overstrike, 1, &KeyEvent->uChar.UnicodeChar); + BOOL Overstrike = !Console->LineInsertToggle && (Console->LinePos != Console->LineSize); + LineInputEdit(Console, (Overstrike ? 1 : 0), 1, &KeyEvent->uChar.UnicodeChar); } } } Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Thu Apr 10 20:24:49 2014 @@ -267,17 +267,17 @@ } else if (!wcscmp(szValueName, L"HistoryNoDup")) { - ConsoleInfo->HistoryNoDup = (BOOLEAN)Value; + ConsoleInfo->HistoryNoDup = !!Value; RetVal = TRUE; } else if (!wcscmp(szValueName, L"QuickEdit")) { - ConsoleInfo->QuickEdit = (BOOLEAN)Value; + ConsoleInfo->QuickEdit = !!Value; RetVal = TRUE; } else if (!wcscmp(szValueName, L"InsertMode")) { - ConsoleInfo->InsertMode = (BOOLEAN)Value; + ConsoleInfo->InsertMode = !!Value; RetVal = TRUE; } else if (!wcscmp(szValueName, L"ScreenBufferSize")) @@ -421,7 +421,7 @@ memcpy(ConsoleInfo->Colors, s_Colors, sizeof(s_Colors)); - // ConsoleInfo->CodePage; + ConsoleInfo->CodePage = 0; ConsoleInfo->ConsoleTitle[0] = L'\0';

10 years, 5 months

[akhaldi] 62699: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 10 13:33:27 2014 New Revision: 62699 URL: http://svn.reactos.org/svn/reactos?rev=62699&view=rev Log: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861 Added: trunk/reactos/dll/win32/jscript/lang/jscript_Tr.rc (with props) trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc (with props) trunk/reactos/dll/win32/localspl/lang/spl_Tr.rc (with props) trunk/reactos/dll/win32/localui/lang/ui_Tr.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/charmap/charmap.rc trunk/reactos/base/applications/charmap/lang/tr-TR.rc trunk/reactos/base/applications/dxdiag/dxdiag.rc trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/fontview/fontview.rc trunk/reactos/base/applications/fontview/lang/tr-TR.rc trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc trunk/reactos/base/applications/games/spider/lang/tr-TR.rc trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc trunk/reactos/base/applications/kbswitch/kbswitch.rc trunk/reactos/base/applications/kbswitch/lang/tr-TR.rc trunk/reactos/base/applications/magnify/lang/tr-TR.rc trunk/reactos/base/applications/mmc/lang/tr-TR.rc trunk/reactos/base/applications/mmc/mmc.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/mplay32.rc trunk/reactos/base/applications/msconfig/lang/tr-TR.rc trunk/reactos/base/applications/msconfig/msconfig.rc trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/servman.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/rsrc.rc trunk/reactos/base/applications/mstsc/lang/tr-TR.rc trunk/reactos/base/applications/mstsc/rdc.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/rapps.rc trunk/reactos/base/applications/regedit/clb/clb.rc trunk/reactos/base/applications/regedit/clb/lang/tr-TR.rc trunk/reactos/base/applications/regedit/lang/tr-TR.rc trunk/reactos/base/applications/regedit/regedit.rc trunk/reactos/base/applications/screensavers/3dtext/lang/tr-TR.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/lang/tr-TR.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/applications/sndvol32/lang/tr-TR.rc trunk/reactos/base/applications/sndvol32/sndvol32.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/taskmgr.rc trunk/reactos/base/applications/winhlp32/lang/Tr.rc trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/wordpad/lang/Tr.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/write/lang/Tr.rc trunk/reactos/base/applications/write/rsrc.rc trunk/reactos/base/setup/reactos/lang/tr-TR.rc trunk/reactos/base/setup/vmwinst/lang/tr-TR.rc trunk/reactos/base/setup/welcome/lang/tr-TR.rc trunk/reactos/base/shell/explorer-new/lang/tr-TR.rc trunk/reactos/base/system/rundll32/lang/tr-TR.rc trunk/reactos/base/system/runonce/lang/tr-TR.rc trunk/reactos/base/system/userinit/lang/tr-TR.rc trunk/reactos/base/system/winlogon/lang/tr-TR.rc trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc trunk/reactos/dll/cpl/access/lang/tr-TR.rc trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/console/lang/tr-TR.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc trunk/reactos/dll/cpl/input/lang/tr-TR.rc trunk/reactos/dll/cpl/intl/lang/tr-TR.rc trunk/reactos/dll/cpl/joy/lang/tr-TR.rc trunk/reactos/dll/cpl/liccpa/lang/tr-TR.rc trunk/reactos/dll/cpl/main/lang/tr-TR.rc trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/cpl/telephon/lang/tr-TR.rc trunk/reactos/dll/cpl/timedate/lang/tr-TR.rc trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc trunk/reactos/dll/shellext/slayer/lang/tr-TR.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/credui/lang/credui_Tr.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc trunk/reactos/dll/win32/iccvid/lang/iccvid_Tr.rc trunk/reactos/dll/win32/jscript/rsrc.rc trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/localspl/localspl.rc trunk/reactos/dll/win32/localui/localui.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/mshtml/lang/Tr.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Tr.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc trunk/reactos/dll/win32/msvidc32/lang/msvidc32_Tr.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… Modified: trunk/reactos/base/applications/charmap/charmap.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/dxdiag/dxdiag.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/fontview/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/kbswitch/kbswitch.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/kbswitch/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/magnify/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mmc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mmc/mmc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.… Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mplay32/mplay32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/mstsc/rdc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/regedit/clb/clb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/regedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/sndvol32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/write/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/la… Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs… Modified: trunk/reactos/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/tr… Modified: trunk/reactos/base/setup/vmwinst/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/tr… Modified: trunk/reactos/base/setup/welcome/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/tr… Modified: trunk/reactos/base/shell/explorer-new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/system/rundll32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/runonce/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/t… Modified: trunk/reactos/base/system/userinit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/winlogon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/t… Modified: trunk/reactos/dll/cpl/access/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/console/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/tr-TR… Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/tr-TR… Modified: trunk/reactos/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/joy/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/tr-TR.rc?… Modified: trunk/reactos/dll/cpl/liccpa/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/main/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/tr-T… Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/telephon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/tr-T… Modified: trunk/reactos/dll/cpl/timedate/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/tr-T… Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/tr… Modified: trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… Modified: trunk/reactos/dll/shellext/slayer/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/t… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/credui/lang/credui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/lang/cred… Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/tr-T… Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv… Added: trunk/reactos/dll/win32/jscript/lang/jscript_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/rsrc.rc?… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Added: trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Added: trunk/reactos/dll/win32/localspl/lang/spl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… Modified: trunk/reactos/dll/win32/localspl/localspl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… Added: trunk/reactos/dll/win32/localui/lang/ui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… Modified: trunk/reactos/dll/win32/localui/localui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… Modified: trunk/reactos/dll/win32/mshtml/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Tr.r… Modified: trunk/reactos/dll/win32/msrle32/lang/msrle_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/lang/msr… Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… Modified: trunk/reactos/dll/win32/msvidc32/lang/msvidc32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/lang/ms… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/tr…

10 years, 5 months

[jimtabor] 62698: [Win32k] - Create call message filter for internal use.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Apr 10 01:29:26 2014 New Revision: 62698 URL: http://svn.reactos.org/svn/reactos?rev=62698&view=rev Log: [Win32k] - Create call message filter for internal use. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.h Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Apr 10 01:29:26 2014 @@ -1906,6 +1906,22 @@ return FALSE; } +BOOL FASTCALL +IntCallMsgFilter( LPMSG lpmsg, INT code) +{ + BOOL Ret = FALSE; + + if ( co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)lpmsg)) + { + Ret = TRUE; + } + else + { + Ret = co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)lpmsg); + } + return Ret; +} + /** Functions ******************************************************************/ BOOL Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Thu Apr 10 01:29:26 2014 @@ -254,6 +254,7 @@ BOOL FASTCALL co_MsqReplyMessage(LRESULT); VOID FASTCALL MsqWakeQueue(PTHREADINFO,DWORD,BOOL); VOID FASTCALL ClearMsgBitsMask(PTHREADINFO,UINT); +BOOL FASTCALL IntCallMsgFilter(LPMSG,INT); int UserShowCursor(BOOL bShow); PCURICON_OBJECT

10 years, 5 months

← Newer
1
...
36
37
38
39
40
41
42
...
50
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 April 2014