Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 65035: [FAST486] Implement an (optional) instruction prefetch cache. Implement the INVLPG instruction.
by aandrejevic＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: aandrejevic Date: Sun Oct 26 23:37:54 2014 New Revision: 65035 URL: http://svn.reactos.org/svn/reactos?rev=65035&view=rev Log: [FAST486] Implement an (optional) instruction prefetch cache. Implement the INVLPG instruction. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/extraops.c trunk/reactos/lib/fast486/opcodes.c trunk/reactos/lib/fast486/opgroups.c Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sun Oct 26 23:37:54 2014 @@ -92,6 +92,18 @@ #define FAST486_PREFIX_REP (1 << 5) #define FAST486_FPU_DEFAULT_CONTROL 0x037F + +#define FAST486_PAGE_SIZE 4096 +#define FAST486_CACHE_SIZE 32 + +/* + * These are condiciones sine quibus non that should be respected, because + * otherwise when fetching DWORDs you would read extra garbage bytes + * (by reading outside of the prefetch buffer). The prefetch cache must + * also not cross a page boundary. + */ +C_ASSERT((FAST486_CACHE_SIZE >= sizeof(DWORD)) + && (FAST486_CACHE_SIZE <= FAST486_PAGE_SIZE)); struct _FAST486_STATE; typedef struct _FAST486_STATE FAST486_STATE, *PFAST486_STATE; @@ -486,6 +498,11 @@ FAST486_INT_STATUS IntStatus; UCHAR PendingIntNum; PULONG Tlb; +#ifndef FAST486_NO_PREFETCH + BOOLEAN PrefetchValid; + ULONG PrefetchAddress; + UCHAR PrefetchCache[FAST486_CACHE_SIZE]; +#endif #ifndef FAST486_NO_FPU FAST486_FPU_DATA_REG FpuRegisters[FAST486_NUM_FPU_REGS]; FAST486_FPU_STATUS_REG FpuStatus; Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sun Oct 26 23:37:54 2014 @@ -95,8 +95,40 @@ /* Find the linear address */ LinearAddress = CachedDescriptor->Base + Offset; - /* Read from the linear address */ - return Fast486ReadLinearMemory(State, LinearAddress, Buffer, Size); +#ifndef FAST486_NO_PREFETCH + if (InstFetch && ((Offset + FAST486_CACHE_SIZE - 1) <= CachedDescriptor->Limit)) + { + State->PrefetchAddress = LinearAddress; + + if ((State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PG) + && (PAGE_OFFSET(State->PrefetchAddress) > (FAST486_PAGE_SIZE - FAST486_CACHE_SIZE))) + { + /* We mustn't prefetch across a page boundary */ + State->PrefetchAddress = PAGE_ALIGN(State->PrefetchAddress) + | (FAST486_PAGE_SIZE - FAST486_CACHE_SIZE); + } + + /* Prefetch */ + if (Fast486ReadLinearMemory(State, + State->PrefetchAddress, + State->PrefetchCache, + FAST486_CACHE_SIZE)) + { + State->PrefetchValid = TRUE; + + RtlMoveMemory(Buffer, + &State->PrefetchCache[LinearAddress - State->PrefetchAddress], + Size); + return TRUE; + } + else return FALSE; + } + else +#endif + { + /* Read from the linear address */ + return Fast486ReadLinearMemory(State, LinearAddress, Buffer, Size); + } } BOOLEAN @@ -155,6 +187,18 @@ /* Find the linear address */ LinearAddress = CachedDescriptor->Base + Offset; + +#ifndef FAST486_NO_PREFETCH + if (State->PrefetchValid + && (LinearAddress >= State->PrefetchAddress) + && ((LinearAddress + Size) <= (State->PrefetchAddress + FAST486_CACHE_SIZE))) + { + /* Update the prefetch */ + RtlMoveMemory(&State->PrefetchCache[LinearAddress - State->PrefetchAddress], + Buffer, + min(Size, FAST486_CACHE_SIZE + State->PrefetchAddress - LinearAddress)); + } +#endif /* Write to the linear address */ return Fast486WriteLinearMemory(State, LinearAddress, Buffer, Size); Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Sun Oct 26 23:37:54 2014 @@ -69,10 +69,6 @@ #define GET_ADDR_PDE(x) ((x) >> 22) #define GET_ADDR_PTE(x) (((x) >> 12) & 0x3FF) #define INVALID_TLB_FIELD 0xFFFFFFFF - -#ifndef PAGE_SIZE -#define PAGE_SIZE 4096 -#endif typedef struct _FAST486_MOD_REG_RM { Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sun Oct 26 23:37:54 2014 @@ -163,9 +163,9 @@ for (Page = PAGE_ALIGN(LinearAddress); Page <= PAGE_ALIGN(LinearAddress + Size - 1); - Page += PAGE_SIZE) - { - ULONG PageOffset = 0, PageLength = PAGE_SIZE; + Page += FAST486_PAGE_SIZE) + { + ULONG PageOffset = 0, PageLength = FAST486_PAGE_SIZE; /* Get the table entry */ TableEntry.Value = Fast486GetPageTableEntry(State, Page, FALSE); @@ -230,9 +230,9 @@ for (Page = PAGE_ALIGN(LinearAddress); Page <= PAGE_ALIGN(LinearAddress + Size - 1); - Page += PAGE_SIZE) - { - ULONG PageOffset = 0, PageLength = PAGE_SIZE; + Page += FAST486_PAGE_SIZE) + { + ULONG PageOffset = 0, PageLength = FAST486_PAGE_SIZE; /* Get the table entry */ TableEntry.Value = Fast486GetPageTableEntry(State, Page, TRUE); @@ -521,6 +521,11 @@ else if (Segment == FAST486_REG_CS) { /* Loading the code segment */ + +#ifndef FAST486_NO_PREFETCH + /* Invalidate the prefetch */ + State->PrefetchValid = FALSE; +#endif if (GET_SEGMENT_INDEX(Selector) == 0) { @@ -641,21 +646,39 @@ PUCHAR Data) { PFAST486_SEG_REG CachedDescriptor; + ULONG Offset; +#ifndef FAST486_NO_PREFETCH + ULONG LinearAddress; +#endif /* Get the cached descriptor of CS */ CachedDescriptor = &State->SegmentRegs[FAST486_REG_CS]; - /* Read from memory */ - if (!Fast486ReadMemory(State, - FAST486_REG_CS, - (CachedDescriptor->Size) ? State->InstPtr.Long - : State->InstPtr.LowWord, - TRUE, - Data, - sizeof(UCHAR))) - { - /* Exception occurred during instruction fetch */ - return FALSE; + Offset = (CachedDescriptor->Size) ? State->InstPtr.Long + : State->InstPtr.LowWord; +#ifndef FAST486_NO_PREFETCH + LinearAddress = CachedDescriptor->Base + Offset; + + if (State->PrefetchValid + && (LinearAddress >= State->PrefetchAddress) + && ((LinearAddress + sizeof(UCHAR)) <= (State->PrefetchAddress + FAST486_CACHE_SIZE))) + { + *Data = *(PUCHAR)&State->PrefetchCache[LinearAddress - State->PrefetchAddress]; + } + else +#endif + { + /* Read from memory */ + if (!Fast486ReadMemory(State, + FAST486_REG_CS, + Offset, + TRUE, + Data, + sizeof(UCHAR))) + { + /* Exception occurred during instruction fetch */ + return FALSE; + } } /* Advance the instruction pointer */ @@ -672,22 +695,41 @@ PUSHORT Data) { PFAST486_SEG_REG CachedDescriptor; + ULONG Offset; +#ifndef FAST486_NO_PREFETCH + ULONG LinearAddress; +#endif /* Get the cached descriptor of CS */ CachedDescriptor = &State->SegmentRegs[FAST486_REG_CS]; - /* Read from memory */ - // FIXME: Fix byte order on big-endian machines - if (!Fast486ReadMemory(State, - FAST486_REG_CS, - (CachedDescriptor->Size) ? State->InstPtr.Long - : State->InstPtr.LowWord, - TRUE, - Data, - sizeof(USHORT))) - { - /* Exception occurred during instruction fetch */ - return FALSE; + Offset = (CachedDescriptor->Size) ? State->InstPtr.Long + : State->InstPtr.LowWord; + +#ifndef FAST486_NO_PREFETCH + LinearAddress = CachedDescriptor->Base + Offset; + + if (State->PrefetchValid + && (LinearAddress >= State->PrefetchAddress) + && ((LinearAddress + sizeof(USHORT)) <= (State->PrefetchAddress + FAST486_CACHE_SIZE))) + { + *Data = *(PUSHORT)&State->PrefetchCache[LinearAddress - State->PrefetchAddress]; + } + else +#endif + { + /* Read from memory */ + // FIXME: Fix byte order on big-endian machines + if (!Fast486ReadMemory(State, + FAST486_REG_CS, + Offset, + TRUE, + Data, + sizeof(USHORT))) + { + /* Exception occurred during instruction fetch */ + return FALSE; + } } /* Advance the instruction pointer */ @@ -704,22 +746,41 @@ PULONG Data) { PFAST486_SEG_REG CachedDescriptor; + ULONG Offset; +#ifndef FAST486_NO_PREFETCH + ULONG LinearAddress; +#endif /* Get the cached descriptor of CS */ CachedDescriptor = &State->SegmentRegs[FAST486_REG_CS]; - /* Read from memory */ - // FIXME: Fix byte order on big-endian machines - if (!Fast486ReadMemory(State, - FAST486_REG_CS, - (CachedDescriptor->Size) ? State->InstPtr.Long - : State->InstPtr.LowWord, - TRUE, - Data, - sizeof(ULONG))) - { - /* Exception occurred during instruction fetch */ - return FALSE; + Offset = (CachedDescriptor->Size) ? State->InstPtr.Long + : State->InstPtr.LowWord; + +#ifndef FAST486_NO_PREFETCH + LinearAddress = CachedDescriptor->Base + Offset; + + if (State->PrefetchValid + && (LinearAddress >= State->PrefetchAddress) + && ((LinearAddress + sizeof(ULONG)) <= (State->PrefetchAddress + FAST486_CACHE_SIZE))) + { + *Data = *(PULONG)&State->PrefetchCache[LinearAddress - State->PrefetchAddress]; + } + else +#endif + { + /* Read from memory */ + // FIXME: Fix byte order on big-endian machines + if (!Fast486ReadMemory(State, + FAST486_REG_CS, + Offset, + TRUE, + Data, + sizeof(ULONG))) + { + /* Exception occurred during instruction fetch */ + return FALSE; + } } /* Advance the instruction pointer */ Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Sun Oct 26 23:37:54 2014 @@ -686,6 +686,11 @@ } } +#ifndef FAST486_NO_PREFETCH + /* Changing CR0 or CR3 can interfere with prefetching (because of paging) */ + State->PrefetchValid = FALSE; +#endif + /* Load a value to the control register */ State->ControlRegisters[ModRegRm.Register] = Value; } Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sun Oct 26 23:37:54 2014 @@ -4240,6 +4240,11 @@ { UCHAR BopCode; +#ifndef FAST486_NO_PREFETCH + /* Invalidate the prefetch since BOP handlers can alter the memory */ + State->PrefetchValid = FALSE; +#endif + /* Fetch the BOP code */ if (!Fast486FetchByte(State, &BopCode)) { Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Sun Oct 26 23:37:54 2014 @@ -2177,7 +2177,31 @@ /* INVLPG */ case 7: { - UNIMPLEMENTED; +#ifndef FAST486_NO_PREFETCH + /* Invalidate the prefetch */ + State->PrefetchValid = FALSE; +#endif + + /* This is a privileged instruction */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return; + } + + if (!ModRegRm.Memory) + { + /* The second operand must be a memory location */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return; + } + + if (State->Tlb != NULL) + { + /* Clear the TLB entry */ + State->Tlb[ModRegRm.MemoryAddress >> 12] = INVALID_TLB_FIELD; + } + break; }

1 0

[pschweitzer] 65034: [KERNEL32] Prevent a use-after-free issue in GetVolumeNameForVolumeMountPointW()
by pschweitzer＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: pschweitzer Date: Sun Oct 26 21:09:07 2014 New Revision: 65034 URL: http://svn.reactos.org/svn/reactos?rev=65034&view=rev Log: [KERNEL32] Prevent a use-after-free issue in GetVolumeNameForVolumeMountPointW() Modified: trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c Modified: trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c [iso-8859-1] Sun Oct 26 21:09:07 2014 @@ -118,14 +118,15 @@ NULL, 0, MountDevName, BufferLength); if (!NT_SUCCESS(Status)) { - RtlFreeHeap(GetProcessHeap(), 0, MountDevName); if (Status == STATUS_BUFFER_OVERFLOW) { BufferLength = sizeof(MOUNTDEV_NAME) + MountDevName->NameLength; + RtlFreeHeap(GetProcessHeap(), 0, MountDevName); continue; } else { + RtlFreeHeap(GetProcessHeap(), 0, MountDevName); NtClose(FileHandle); BaseSetLastNTError(Status); return FALSE;

1 0

[pschweitzer] 65033: [FASTFAT] Make sure the appropriate resource is exclusively acquired when playing with FCB references
by pschweitzer＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: pschweitzer Date: Sun Oct 26 20:29:00 2014 New Revision: 65033 URL: http://svn.reactos.org/svn/reactos?rev=65033&view=rev Log: [FASTFAT] Make sure the appropriate resource is exclusively acquired when playing with FCB references Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sun Oct 26 20:29:00 2014 @@ -292,6 +292,8 @@ PDEVICE_EXTENSION pVCB, PVFATFCB pFCB) { + ASSERT(ExIsResourceAcquiredExclusive(&pVCB->DirResource)); + ++pFCB->RefCount; } @@ -304,6 +306,8 @@ DPRINT("releasing FCB at %p: %wZ, refCount:%d\n", pFCB, &pFCB->PathNameU, pFCB->RefCount); + + ASSERT(ExIsResourceAcquiredExclusive(&pVCB->DirResource)); while (pFCB) {

1 0

[pschweitzer] 65032: [FASTFAT] s/DeviceObject/DeviceExt/g
by pschweitzer＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: pschweitzer Date: Sun Oct 26 20:23:07 2014 New Revision: 65032 URL: http://svn.reactos.org/svn/reactos?rev=65032&view=rev Log: [FASTFAT] s/DeviceObject/DeviceExt/g Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sun Oct 26 20:23:07 2014 @@ -455,7 +455,7 @@ VfatSetRenameInformation( PFILE_OBJECT FileObject, PVFATFCB FCB, - PDEVICE_EXTENSION DeviceObject, + PDEVICE_EXTENSION DeviceExt, PFILE_RENAME_INFORMATION RenameInfo, PFILE_OBJECT TargetFileObject) { @@ -474,7 +474,7 @@ HANDLE TargetHandle; BOOLEAN DeletedTarget; - DPRINT("VfatSetRenameInfo(%p, %p, %p, %p, %p)\n", FileObject, FCB, DeviceObject, RenameInfo, TargetFileObject); + DPRINT("VfatSetRenameInfo(%p, %p, %p, %p, %p)\n", FileObject, FCB, DeviceExt, RenameInfo, TargetFileObject); /* Disallow renaming root */ if (vfatFCBIsRoot(FCB)) @@ -691,8 +691,8 @@ if (FsRtlAreNamesEqual(&SourceFile, &NewFile, TRUE, NULL)) { - FsRtlNotifyFullReportChange(DeviceObject->NotifySync, - &(DeviceObject->NotifyList), + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), (PSTRING)&FCB->PathNameU, FCB->PathNameU.Length - FCB->LongNameU.Length, NULL, @@ -701,11 +701,11 @@ FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), FILE_ACTION_RENAMED_OLD_NAME, NULL); - Status = vfatRenameEntry(DeviceObject, FCB, &NewFile, TRUE); + Status = vfatRenameEntry(DeviceExt, FCB, &NewFile, TRUE); if (NT_SUCCESS(Status)) { - FsRtlNotifyFullReportChange(DeviceObject->NotifySync, - &(DeviceObject->NotifyList), + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), (PSTRING)&FCB->PathNameU, FCB->PathNameU.Length - FCB->LongNameU.Length, NULL, @@ -720,8 +720,8 @@ { /* Try to find target */ ParentFCB = FCB->parentFcb; - vfatGrabFCB(DeviceObject, ParentFCB); - Status = vfatPrepareTargetForRename(DeviceObject, + vfatGrabFCB(DeviceExt, ParentFCB); + Status = vfatPrepareTargetForRename(DeviceExt, &ParentFCB, &NewFile, RenameInfo->ReplaceIfExists, @@ -732,8 +732,8 @@ goto Cleanup; } - FsRtlNotifyFullReportChange(DeviceObject->NotifySync, - &(DeviceObject->NotifyList), + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), (PSTRING)&FCB->PathNameU, FCB->PathNameU.Length - FCB->LongNameU.Length, NULL, @@ -742,13 +742,13 @@ FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), (DeletedTarget ? FILE_ACTION_REMOVED : FILE_ACTION_RENAMED_OLD_NAME), NULL); - Status = vfatRenameEntry(DeviceObject, FCB, &NewFile, FALSE); + Status = vfatRenameEntry(DeviceExt, FCB, &NewFile, FALSE); if (NT_SUCCESS(Status)) { if (DeletedTarget) { - FsRtlNotifyFullReportChange(DeviceObject->NotifySync, - &(DeviceObject->NotifyList), + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), (PSTRING)&FCB->PathNameU, FCB->PathNameU.Length - FCB->LongNameU.Length, NULL, @@ -760,8 +760,8 @@ } else { - FsRtlNotifyFullReportChange(DeviceObject->NotifySync, - &(DeviceObject->NotifyList), + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), (PSTRING)&FCB->PathNameU, FCB->PathNameU.Length - FCB->LongNameU.Length, NULL, @@ -778,7 +778,7 @@ { /* Try to find target */ ParentFCB = NULL; - Status = vfatPrepareTargetForRename(DeviceObject, + Status = vfatPrepareTargetForRename(DeviceExt, &ParentFCB, &NewName, RenameInfo->ReplaceIfExists, @@ -789,8 +789,8 @@ goto Cleanup; } - FsRtlNotifyFullReportChange(DeviceObject->NotifySync, - &(DeviceObject->NotifyList), + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), (PSTRING)&FCB->PathNameU, FCB->PathNameU.Length - FCB->LongNameU.Length, NULL, @@ -799,13 +799,13 @@ FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), FILE_ACTION_REMOVED, NULL); - Status = VfatMoveEntry(DeviceObject, FCB, &NewFile, ParentFCB); + Status = VfatMoveEntry(DeviceExt, FCB, &NewFile, ParentFCB); if (NT_SUCCESS(Status)) { if (DeletedTarget) { - FsRtlNotifyFullReportChange(DeviceObject->NotifySync, - &(DeviceObject->NotifyList), + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), (PSTRING)&FCB->PathNameU, FCB->PathNameU.Length - FCB->LongNameU.Length, NULL, @@ -817,8 +817,8 @@ } else { - FsRtlNotifyFullReportChange(DeviceObject->NotifySync, - &(DeviceObject->NotifyList), + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), (PSTRING)&FCB->PathNameU, FCB->PathNameU.Length - FCB->LongNameU.Length, NULL, @@ -832,7 +832,7 @@ } Cleanup: - if (ParentFCB != NULL) vfatReleaseFCB(DeviceObject, ParentFCB); + if (ParentFCB != NULL) vfatReleaseFCB(DeviceExt, ParentFCB); if (NewName.Buffer != NULL) ExFreePoolWithTag(NewName.Buffer, TAG_VFAT); if (RenameInfo->RootDirectory != NULL) ObDereferenceObject(RootFileObject);

1 0

[pschweitzer] 65031: [FASTFAT] Implement vfatGrabFCB() (which was defined but never implemented) for increasing the reference count on a FCB. This will make debugging easier. Dedicated to Thomas :-).
by pschweitzer＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: pschweitzer Date: Sun Oct 26 20:20:42 2014 New Revision: 65031 URL: http://svn.reactos.org/svn/reactos?rev=65031&view=rev Log: [FASTFAT] Implement vfatGrabFCB() (which was defined but never implemented) for increasing the reference count on a FCB. This will make debugging easier. Dedicated to Thomas :-). Modified: trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Oct 26 20:20:42 2014 @@ -365,7 +365,7 @@ DPRINT("'%wZ'\n", &FileObject->RelatedFileObject->FileName); *ParentFcb = FileObject->RelatedFileObject->FsContext; - (*ParentFcb)->RefCount++; + vfatGrabFCB(DeviceExt, *ParentFcb); } else { @@ -391,7 +391,7 @@ if (*ParentFcb) { - (*ParentFcb)->RefCount++; + vfatGrabFCB(DeviceExt, *ParentFcb); } /* try first to find an existing FCB in memory */ @@ -497,7 +497,7 @@ pFcb = DeviceExt->VolumeFcb; vfatAttachFCBToFileObject(DeviceExt, pFcb, FileObject); - pFcb->RefCount++; + vfatGrabFCB(DeviceExt, pFcb); Irp->IoStatus.Information = FILE_OPENED; return STATUS_SUCCESS; @@ -562,7 +562,7 @@ if (Status == STATUS_SUCCESS) { - ParentFcb->RefCount++; + vfatGrabFCB(DeviceExt, ParentFcb); vfatReleaseFCB(DeviceExt, TargetFcb); Irp->IoStatus.Information = FILE_EXISTS; } Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sun Oct 26 20:20:42 2014 @@ -288,6 +288,14 @@ } VOID +vfatGrabFCB( + PDEVICE_EXTENSION pVCB, + PVFATFCB pFCB) +{ + ++pFCB->RefCount; +} + +VOID vfatReleaseFCB( PDEVICE_EXTENSION pVCB, PVFATFCB pFCB) @@ -338,7 +346,7 @@ } if (pFCB->parentFcb) { - pFCB->parentFcb->RefCount++; + vfatGrabFCB(pVCB, pFCB->parentFcb); } } @@ -402,12 +410,6 @@ * We also derefence in case we're just renaming since AddFCBToTable references it */ vfatReleaseFCB(pVCB, OldParent); - - /* In case we were moving accross directories, reset caching on old parent */ - //if (OldParent != ParentFcb) - //{ - // CcUninitializeCacheMap(OldParent->FileObject, NULL, NULL); - //} return STATUS_SUCCESS; } @@ -455,7 +457,7 @@ DPRINT("'%wZ' '%wZ'\n", &FileNameU, FcbNameU); if (RtlEqualUnicodeString(&FileNameU, FcbNameU, TRUE)) { - rcFCB->RefCount++; + vfatGrabFCB(pVCB, rcFCB); return rcFCB; } } @@ -489,7 +491,7 @@ fileObject->FsContext = fcb; fileObject->FsContext2 = newCCB; fcb->FileObject = fileObject; - fcb->RefCount++; + vfatGrabFCB(vcb, fcb); _SEH2_TRY { @@ -655,7 +657,7 @@ rcFCB->RFCB.FileSize.QuadPart = Size; rcFCB->RFCB.ValidDataLength.QuadPart = Size; rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, vcb->FatInfo.BytesPerCluster); - rcFCB->RefCount++; + vfatGrabFCB(vcb, rcFCB); if (vfatFCBIsDirectory(rcFCB)) { vfatFCBInitializeCacheFromVolume(vcb, rcFCB); @@ -817,7 +819,7 @@ { *pFCB = FCB; *pParentFCB = FCB->parentFcb; - (*pParentFCB)->RefCount++; + vfatGrabFCB(pVCB, *pParentFCB); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sun Oct 26 20:20:42 2014 @@ -426,7 +426,7 @@ /* Effectively delete old file to allow renaming */ VfatDelEntry(DeviceExt, TargetFcb, NULL); - (*ParentFCB)->RefCount++; + vfatGrabFCB(DeviceExt, *ParentFCB); vfatReleaseFCB(DeviceExt, TargetFcb); *Deleted = TRUE; } @@ -720,7 +720,7 @@ { /* Try to find target */ ParentFCB = FCB->parentFcb; - ParentFCB->RefCount++; + vfatGrabFCB(DeviceObject, ParentFCB); Status = vfatPrepareTargetForRename(DeviceObject, &ParentFCB, &NewFile,

1 0

[akhaldi] 65030: [ADVAPI32] * Update ConvertStringSidToSid{A, W}(). * Fixes some advapi32:security tests. CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 19:56:15 2014 New Revision: 65030 URL: http://svn.reactos.org/svn/reactos?rev=65030&view=rev Log: [ADVAPI32] * Update ConvertStringSidToSid{A,W}(). * Fixes some advapi32:security tests. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Oct 26 19:56:15 2014 @@ -279,6 +279,19 @@ { NULL, 0 }, }; +static LPWSTR SERV_dup( LPCSTR str ) +{ + UINT len; + LPWSTR wstr; + + if( !str ) + return NULL; + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + wstr = heap_alloc( len*sizeof (WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, str, -1, wstr, len ); + return wstr; +} + /************************************************************ * ADVAPI_IsLocalComputer * @@ -3203,162 +3216,49 @@ } } -/* - * @implemented - */ -BOOL -WINAPI -ConvertStringSidToSidW(IN LPCWSTR StringSid, - OUT PSID* sid) -{ - DWORD size; - DWORD i, cBytes, identAuth, csubauth; - BOOL ret; - SID* pisid; - - TRACE("%s %p\n", debugstr_w(StringSid), sid); - - if (!StringSid) - { - SetLastError(ERROR_INVALID_SID); - return FALSE; - } - - for (i = 0; i < sizeof(SidTable) / sizeof(SidTable[0]) - 1; i++) - { - if (wcscmp(StringSid, SidTable[i].key) == 0) - { - WELL_KNOWN_SID_TYPE knownSid = (WELL_KNOWN_SID_TYPE)SidTable[i].value; - size = SECURITY_MAX_SID_SIZE; - *sid = LocalAlloc(0, size); - if (!*sid) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - ret = CreateWellKnownSid(knownSid, - NULL, - *sid, - &size); - if (!ret) - { - SetLastError(ERROR_INVALID_SID); - LocalFree(*sid); - } - return ret; - } - } - - /* That's probably a string S-R-I-S-S... */ - if (StringSid[0] != 'S' || StringSid[1] != '-') - { - SetLastError(ERROR_INVALID_SID); - return FALSE; - } - - cBytes = ComputeStringSidSize(StringSid); - pisid = (SID*)LocalAlloc( 0, cBytes ); - if (!pisid) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - i = 0; - ret = FALSE; - csubauth = ((cBytes - GetSidLengthRequired(0)) / sizeof(DWORD)); - - StringSid += 2; /* Advance to Revision */ - pisid->Revision = atoiW(StringSid); - - if (pisid->Revision != SDDL_REVISION) - { - TRACE("Revision %d is unknown\n", pisid->Revision); - goto lend; /* ERROR_INVALID_SID */ - } - if (csubauth == 0) - { - TRACE("SubAuthorityCount is 0\n"); - goto lend; /* ERROR_INVALID_SID */ - } - - pisid->SubAuthorityCount = csubauth; - - /* Advance to identifier authority */ - while (*StringSid && *StringSid != '-') - StringSid++; - if (*StringSid == '-') - StringSid++; - - /* MS' implementation can't handle values greater than 2^32 - 1, so - * we don't either; assume most significant bytes are always 0 - */ - pisid->IdentifierAuthority.Value[0] = 0; - pisid->IdentifierAuthority.Value[1] = 0; - identAuth = atoiW(StringSid); - pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; - pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; - pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; - pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; - - /* Advance to first sub authority */ - while (*StringSid && *StringSid != '-') - StringSid++; - if (*StringSid == '-') - StringSid++; - - while (*StringSid) - { - pisid->SubAuthority[i++] = atoiW(StringSid); - - while (*StringSid && *StringSid != '-') - StringSid++; - if (*StringSid == '-') - StringSid++; - } - - if (i != pisid->SubAuthorityCount) - goto lend; /* ERROR_INVALID_SID */ - - *sid = pisid; - ret = TRUE; - -lend: - if (!ret) - { - LocalFree(pisid); - SetLastError(ERROR_INVALID_SID); - } - - TRACE("returning %s\n", ret ? "TRUE" : "FALSE"); - return ret; -} - -/* - * @implemented - */ -BOOL -WINAPI -ConvertStringSidToSidA(IN LPCSTR StringSid, - OUT PSID* sid) -{ - BOOL bRetVal = FALSE; - - TRACE("%s, %p\n", debugstr_a(StringSid), sid); +/****************************************************************************** + * ConvertStringSidToSidW [ADVAPI32.@] + */ +BOOL WINAPI ConvertStringSidToSidW(LPCWSTR StringSid, PSID* Sid) +{ + BOOL bret = FALSE; + DWORD cBytes; + + TRACE("%s, %p\n", debugstr_w(StringSid), Sid); if (GetVersion() & 0x80000000) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - else if (!StringSid || !sid) + else if (!StringSid || !Sid) + SetLastError(ERROR_INVALID_PARAMETER); + else if (ParseStringSidToSid(StringSid, NULL, &cBytes)) + { + PSID pSid = *Sid = LocalAlloc(0, cBytes); + + bret = ParseStringSidToSid(StringSid, pSid, &cBytes); + if (!bret) + LocalFree(*Sid); + } + return bret; +} + +/****************************************************************************** + * ConvertStringSidToSidA [ADVAPI32.@] + */ +BOOL WINAPI ConvertStringSidToSidA(LPCSTR StringSid, PSID* Sid) +{ + BOOL bret = FALSE; + + TRACE("%s, %p\n", debugstr_a(StringSid), Sid); + if (GetVersion() & 0x80000000) + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + else if (!StringSid || !Sid) SetLastError(ERROR_INVALID_PARAMETER); else { - UINT len = MultiByteToWideChar(CP_ACP, 0, StringSid, -1, NULL, 0); - LPWSTR wStringSid = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (wStringSid == NULL) - return FALSE; - MultiByteToWideChar(CP_ACP, 0, StringSid, - 1, wStringSid, len); - bRetVal = ConvertStringSidToSidW(wStringSid, sid); - HeapFree(GetProcessHeap(), 0, wStringSid); - } - return bRetVal; + WCHAR *wStringSid = SERV_dup(StringSid); + bret = ConvertStringSidToSidW(wStringSid, Sid); + heap_free(wStringSid); + } + return bret; } /*

1 0

[akhaldi] 65029: [RASDLG] * Turkish translation update by Erdem Ersoy. CORE-7861
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 19:43:01 2014 New Revision: 65029 URL: http://svn.reactos.org/svn/reactos?rev=65029&view=rev Log: [RASDLG] * Turkish translation update by Erdem Ersoy. CORE-7861 Modified: trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc Modified: trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc [iso-8859-1] Sun Oct 26 19:43:01 2014 @@ -46,7 +46,7 @@ AUTOCHECKBOX "&Ä°leride, Olmayan GeÃ§ekleri Deneme", 1030, 38, 226, 222, 10 DEFPUSHBUTTON "&Onayla", 1, 135, 242, 60, 14 PUSHBUTTON "&Ertele", 2, 201, 242, 60, 14 - LTEXT "EÄer yalnÄ±zca bir tek geÃ§ek baÄlÄ±ysa sunucu Ã§oklu baÄlantÄ±lÄ± aramalarÄ± kabul etmeye yapÄ±landÄ±rÄ±lmamÄ±Å olabilir. BÃ¶yle bir durumda gereksiz baÄlantÄ± gÃ¶revlerinden kaÃ§Ä±nmak iÃ§in ""Ä°leride, Olmayan GeÃ§ekleri Deneme""yi imleyiniz.", -1, 37, 36, 224, 44 + LTEXT "EÄer yalnÄ±zca bir tek geÃ§ek baÄlÄ±ysa sunucu Ã§oklu baÄlantÄ±lÄ± aramalarÄ± kabul etmeye yapÄ±landÄ±rÄ±lmamÄ±Å olabilir. BÃ¶yle bir durumda gereksiz baÄlantÄ± yÃ¼klerinden kaÃ§Ä±nmak iÃ§in ""Ä°leride, Olmayan GeÃ§ekleri Deneme""yi imleyiniz.", -1, 37, 36, 224, 44 END 105 DIALOGEX 0, 0, 261, 253 @@ -366,145 +366,145 @@ 125 DIALOGEX 12, 16, 261, 190 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Modem Configuration" +CAPTION "Ãevirge YapÄ±landÄ±rÄ±lmasÄ±" FONT 8, "MS Shell Dlg" BEGIN ICON 15102, 1238, 7, 7, 20, 20 - LTEXT "Modem", -1, 25, 27, 24, 8, NOT WS_VISIBLE | NOT WS_GROUP + LTEXT "Ãevirge", -1, 25, 27, 24, 8, NOT WS_VISIBLE | NOT WS_GROUP EDITTEXT 1235, 40, 7, 214, 16, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "&Maximum speed (bps):", 1243, 7, 36, 110, 8 + LTEXT "E&n Ãok HÄ±z (bps):", 1243, 7, 36, 110, 8 COMBOBOX 1239, 119, 34, 136, 186, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Modem &protocol", 1244, 7, 52, 111, 8 + LTEXT "&Ãevirge Ä°letiÅim KÃ¢idesi", 1244, 7, 52, 111, 8 COMBOBOX 1245, 119, 50, 136, 186, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "Hardware features", 1237, 6, 70, 248, 61, WS_GROUP - AUTOCHECKBOX "E&nable hardware flow control", 1232, 19, 82, 217, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "En&able modem error control", 1231, 19, 98, 217, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Enable m&odem compression", 1229, 19, 115, 217, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "&Show terminal window", 1234, 8, 136, 246, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Enable mo&dem speaker", 1230, 8, 151, 247, 10, BS_TOP | BS_MULTILINE | WS_GROUP - DEFPUSHBUTTON "OK", 1, 129, 171, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 194, 171, 60, 14 + GROUPBOX "DonanÄ±m HusÃ»siyetleri", 1237, 6, 70, 248, 61, WS_GROUP + AUTOCHECKBOX "&DonanÄ±m AkÄ±Å Denetimini EtkinleÅtir", 1232, 19, 82, 217, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Ã&evirge YanlÄ±ÅlÄ±k Denetimini EtkinleÅtir", 1231, 19, 98, 217, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Ãe&virge SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± EtkinleÅtir", 1229, 19, 115, 217, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&UÃ§birim Penceresini GÃ¶ster", 1234, 8, 136, 246, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Ãev&irge HoparlÃ¶rÃ¼nÃ¼ EtkinleÅtir", 1230, 8, 151, 247, 10, BS_TOP | BS_MULTILINE | WS_GROUP + DEFPUSHBUTTON "Tamam", 1, 129, 171, 60, 14, WS_GROUP + PUSHBUTTON "Ä°ptal", 2, 194, 171, 60, 14 END 126 DIALOGEX 0, 0, 270, 117 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Select Network Component Type" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Click the type of network component you want to install:", -1, 8, 7, 258, 8 +CAPTION "AÄ BileÅeni TÃ¼rÃ¼nÃ¼ SeÃ§" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kurmak istediÄiniz aÄ bileÅeninin tÃ¼rÃ¼nÃ¼ tÄ±klayÄ±nÄ±z:", -1, 8, 7, 258, 8 CONTROL "", 1251, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 8, 20, 188, 58 GROUPBOX "", -1, 8, 81, 188, 30 LTEXT "", 1250, 12, 90, 177, 17 - DEFPUSHBUTTON "&Add...", 1252, 205, 20, 60, 14 - PUSHBUTTON "Cancel", 2, 205, 38, 60, 14 + DEFPUSHBUTTON "&Ekle...", 1252, 205, 20, 60, 14 + PUSHBUTTON "Ä°ptal", 2, 205, 38, 60, 14 END 127 DIALOGEX 16, 20, 260, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "NetWare or Compatible Connections" +CAPTION "NetWare veyÃ¢ Uyumlu BaÄlantÄ±lar" FONT 8, "MS Shell Dlg" BEGIN ICON 32515, 1278, 7, 7, 21, 20, WS_GROUP - LTEXT "You have connections to a NetWare compatible network. These connections will be closed when the PPP IPX connection is established.", 1279, 42, 7, 215, 37 - LTEXT "Before dialing, to avoid data loss, either close all files using these connections or uncheck IPX on this entry's Network Protocol settings.", 1280, 42, 46, 215, 38, NOT WS_GROUP - AUTOCHECKBOX "&Do not display this message in the future", 1277, 42, 86, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP - DEFPUSHBUTTON "OK", 1, 65, 112, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 134, 112, 60, 14 + LTEXT "Bir NetWare uyumlu aÄ iÃ§in baÄlantÄ±larÄ±nÄ±z var. PPP IPX baÄlantÄ±sÄ± kurulduÄunda bu baÄlantÄ±lar kapatÄ±lacaktÄ±r.", 1279, 42, 7, 215, 37 + LTEXT "Ãevirmeden Ã¶nce veri yitiminden kaÃ§Ä±nmak iÃ§in ya bu baÄlantÄ±larÄ± kullanan tÃ¼m kÃ¼tÃ¼kleri siliniz ya da bu giriÅin AÄ Ä°letiÅim KÃ¢idesi ayarlarÄ±nda IPX'in imini kaldÄ±rÄ±nÄ±z.", 1280, 42, 46, 215, 38, NOT WS_GROUP + AUTOCHECKBOX "&Gelecekte Bu Ä°letiyi GÃ¶sterme", 1277, 42, 86, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP + DEFPUSHBUTTON "Tamam", 1, 65, 112, 60, 14, WS_GROUP + PUSHBUTTON "Ä°ptal", 2, 134, 112, 60, 14 END 128 DIALOGEX 7, 22, 236, 90 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Manual Dial" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Pick up the handset and dial (or ask the operator to dial). After dialing is complete, click OK. Listen to handset until silent, and then hang up.", 1281, 8, 8, 219, 32 - LTEXT "Phone number:", 1282, 8, 46, 91, 8 +CAPTION "Elle Ãevir" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "AlmacÄ± kaldÄ±rÄ±nÄ±z ve Ã§eviriniz (ya da Ã§evirmek iÃ§in iÅletmene sorunuz). Ãevirme bitirildikten sonra Tamam'a tÄ±klayÄ±nÄ±z. AlmacÄ±, sessiz olana dek dinleyniz, sonra erteleyiniz.", 1281, 8, 8, 219, 32 + LTEXT "Telefon NumarasÄ±:", 1282, 8, 46, 91, 8 LTEXT "", 1283, 103, 46, 126, 8, NOT WS_GROUP - DEFPUSHBUTTON "OK", 1, 104, 70, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 168, 70, 60, 14 + DEFPUSHBUTTON "Tamam", 1, 104, 70, 60, 14, WS_GROUP + PUSHBUTTON "Ä°ptal", 2, 168, 70, 60, 14 END 129 DIALOGEX 6, 20, 260, 85 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Network Protocol Connection Result" +CAPTION "AÄ Ä°letiÅim KÃ¢idesi BaÄlantÄ± Sonucu" FONT 8, "MS Shell Dlg" BEGIN ICON 32516, 1328, 7, 7, 21, 20, WS_GROUP LTEXT "", 1329, 38, 7, 216, 24, NOT WS_GROUP - AUTOCHECKBOX "&Do not request the failed protocols next time", 1327, 40, 44, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Accept", 1, 129, 64, 60, 14 - PUSHBUTTON "&Hang Up", 2, 193, 64, 60, 14 + AUTOCHECKBOX "O&lmayan Ä°letiÅim KÃ¢idelerini Bir Dahaki Kezde Ä°steme", 1327, 40, 44, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP + PUSHBUTTON "&Onayla", 1, 129, 64, 60, 14 + PUSHBUTTON "&Ertele", 2, 193, 64, 60, 14 END 133 DIALOGEX 6, 18, 231, 211 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "X.25 Logon Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Select your X.25 network provider and type the X.121 address of the remote server:", 1408, 7, 4, 220, 27 - LTEXT "&Network:", 1410, 9, 35, 213, 8, NOT WS_GROUP +CAPTION "X.25 Oturum AÃ§ma AyarlarÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "X.25 aÄ saÄlayÄ±cÄ±nÄ±zÄ± seÃ§iniz ve uzak sunucunun X.121 adresini yazÄ±nÄ±z:", 1408, 7, 4, 220, 27 + LTEXT "&AÄ:", 1410, 9, 35, 213, 8, NOT WS_GROUP COMBOBOX 1406, 9, 46, 215, 125, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "X.121&address:", 1407, 9, 66, 213, 8, NOT WS_GROUP + LTEXT "&X.121 Adresi:", 1407, 9, 66, 213, 8, NOT WS_GROUP EDITTEXT 1402, 8, 77, 215, 14, ES_AUTOHSCROLL - GROUPBOX "Optional", 1405, 8, 95, 215, 79 - LTEXT "&User data:", 1411, 19, 109, 182, 8, NOT WS_GROUP + GROUPBOX "SeÃ§imlik", 1405, 8, 95, 215, 79 + LTEXT "&KullanÄ±cÄ± Verisi:", 1411, 19, 109, 182, 8, NOT WS_GROUP EDITTEXT 1404, 19, 120, 193, 14, ES_AUTOHSCROLL - LTEXT "&Facilities:", 1409, 19, 138, 182, 8, NOT WS_GROUP + LTEXT "&Olanaklar:", 1409, 19, 138, 182, 8, NOT WS_GROUP EDITTEXT 1403, 19, 149, 193, 14, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", 1, 100, 189, 60, 14 - PUSHBUTTON "Cancel", 2, 164, 189, 60, 14 + DEFPUSHBUTTON "Tamam", 1, 100, 189, 60, 14 + PUSHBUTTON "Ä°ptal", 2, 164, 189, 60, 14 END 146 DIALOGEX 6, 18, 230, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Autodial" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "If you are disconnected from a network, autodial attempts to connect to a network whenever you try to access remote information.", -1, 7, 4, 219, 32 - LTEXT "&Enable autodial by location:", 1006, 8, 42, 213, 8 +CAPTION "KendiliÄinden Ãevirme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bir aÄdan ayrÄ±ysanÄ±z ne zaman uzak bilgiye eriÅmeye Ã§alÄ±ÅtÄ±ÄÄ±nÄ±z bir aÄ iÃ§in kendiliÄinden Ã§evirme baÄlanmaya giriÅir.", -1, 7, 4, 219, 32 + LTEXT "&Åu Konuma GÃ¶re KendiliÄinden Ãevirmeyi EtkinleÅtir:", 1006, 8, 42, 213, 8 CONTROL "", 1004, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000C401, 7, 53, 216, 109 - AUTOCHECKBOX "Al&ways ask me before autodialing", 1496, 8, 170, 218, 9, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "&Disable autodial while I am logged on", 1550, 8, 185, 217, 9, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&KendiliÄinden Ãevirmeden Ãnce TÃ¼m Zamanlarda Bana Sor", 1496, 8, 170, 218, 9, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Ben Oturum AÃ§tÄ±ÄÄ±m SÃ¼rede KendiliÄinden Ãevirmeyi EdilginleÅtir", 1550, 8, 185, 217, 9, BS_TOP | BS_MULTILINE END 147 DIALOGEX 6, 18, 230, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Dialing" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These preferences apply to 'Login using Dial-Up Networking' at Ctrl-Alt-Del login. You, as an administrator, have access to this sheet.", 1007, 7, 4, 221, 40, NOT WS_GROUP - LTEXT "&Number of redial attempts:", 1005, 7, 55, 154, 8 +CAPTION "Ãevirme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bu yeÄlemeler; Denetim, SeÃ§enek ve Silme oturum aÃ§mada ""Ãevirmeli AÄ'Ä± kullanan oturum aÃ§maya"" uygulanÄ±r. Sizin bir yÃ¶netici olarak bu sayfaya eriÅiminiz var.", 1007, 7, 4, 221, 40, NOT WS_GROUP + LTEXT "&Yeniden Ãevirme GiriÅimlerinin SayÄ±sÄ±:", 1005, 7, 55, 154, 8 EDITTEXT 1001, 164, 52, 60, 14, ES_AUTOHSCROLL - LTEXT "&Seconds between redial attempts:", 1009, 7, 73, 156, 8, NOT WS_GROUP + LTEXT "Y&eniden Ãevirme GiriÅimleri ArasÄ±ndaki SÃ¢niyeler:", 1009, 7, 73, 156, 8, NOT WS_GROUP EDITTEXT 1003, 164, 70, 60, 14, ES_AUTOHSCROLL - LTEXT "I&dle seconds before hanging up:", 1008, 7, 91, 154, 8, NOT WS_GROUP + LTEXT "E&rtelemeden Ãnce BoÅta Kalma SÃ¢niyeleri:", 1008, 7, 91, 154, 8, NOT WS_GROUP EDITTEXT 1002, 164, 88, 60, 14, ES_AUTOHSCROLL END 148 DIALOGEX 6, 18, 230, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Callback" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "When you dial into a server, it may offer to call you back to reduce your phone charges. Specify whether you want callback. (Callback is not supported for virtual private network (VPN) connections.)", 1043, 8, 4, 219, 43 - AUTORADIOBUTTON "&No callback", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "A&sk me during dialing when the server offers", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE - AUTORADIOBUTTON "Al&ways call me back at the number(s) below:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE +CAPTION "Geri Arama" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bir sunucuya Ã§evirdiÄinizde o, telefonunuzun yÃ¼kÃ¼nÃ¼ azaltmaya sizi yeniden aramak iÃ§in saÄlayabilir. Geri arama isteseniz de istemeseniz de belirtiniz. (Geri arama farazÃ® ve ÅahsÃ® aÄ (VPN) baÄlantÄ±larÄ± iÃ§in desteklenmiyor.)", 1043, 8, 4, 219, 43 + AUTORADIOBUTTON "&Geri Arama Yok", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "S&unucu SunduÄunda Ãevirme EsnÃ¢sÄ±nda Bana Sor", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE + AUTORADIOBUTTON "&Beni TÃ¼m Zamanalarda AÅaÄÄ±daki Numaralardan Geri Ara:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE CONTROL "", 1037, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 16, 88, 204, 94 - PUSHBUTTON "&Edit...", 1039, 96, 190, 60, 14 - PUSHBUTTON "&Delete", 1038, 159, 190, 60, 14 + PUSHBUTTON "&DÃ¼zenle...", 1039, 96, 190, 60, 14 + PUSHBUTTON "&Sil", 1038, 159, 190, 60, 14 END 149 DIALOGEX 6, 18, 317, 142 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "You need to set the dial-in credentials that remote routers will use when connecting to this interface. A user account will be created on this router with the information that you enter here.", 1094, 8, 5, 307, 35 - LTEXT "&User name:", 1078, 8, 47, 124, 8, NOT WS_GROUP + LTEXT "Bu arayÃ¼z iÃ§in baÄlandÄ±ÄÄ±nda kullanÄ±lacak uzak yÃ¶nlendiriciler arama kimlik bilgilerini ayarlamaya gerksiniminiz var. Bu yÃ¶nlendiricide buraya girdiÄiniz bilgiyle bir kullanÄ±cÄ± hesÃ¢bÄ± oluÅturulacaktÄ±r.", 1094, 8, 5, 307, 35 + LTEXT "&KullanÄ±cÄ± AdÄ±:", 1078, 8, 47, 124, 8, NOT WS_GROUP EDITTEXT 1074, 135, 45, 175, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "&Password:", 1077, 8, 68, 124, 8, NOT WS_GROUP + LTEXT "&Åifre:", 1077, 8, 68, 124, 8, NOT WS_GROUP EDITTEXT 1073, 135, 66, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Confirm password:", 1075, 8, 90, 124, 8, NOT WS_GROUP + LTEXT "Å&ifreyi DoÄrula:", 1075, 8, 90, 124, 8, NOT WS_GROUP EDITTEXT 1071, 135, 87, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL END @@ -512,14 +512,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "You need to set the dial out credentials that this interface will use when connecting to the remote router. These credentials must match the dial in credentials configured on the remote router.", 1094, 8, 5, 308, 33 - LTEXT "&User name:", 1096, 8, 43, 130, 8, NOT WS_GROUP + LTEXT "Uzak yÃ¶nlendiriciye baÄlanÄ±rken bu arayÃ¼zÃ¼n kullanacaÄÄ± dÄ±ÅarÄ±ya arama kimlik bilgilerini ayarlamaya gereksiniminiz var. Bu kimlik bilgileri, uzak yÃ¶nlendiricide yapÄ±landÄ±rÄ±lmÄ±Å iÃ§eriye arama kimlik bilgileriyle eÅleÅmelidir.", 1094, 8, 5, 308, 33 + LTEXT "&KullanÄ±cÄ± AdÄ±:", 1096, 8, 43, 130, 8, NOT WS_GROUP EDITTEXT 1091, 140, 40, 175, 12, ES_AUTOHSCROLL - LTEXT "&Domain:", 1093, 8, 63, 130, 8, NOT WS_GROUP + LTEXT "&Etki AlanÄ±:", 1093, 8, 63, 130, 8, NOT WS_GROUP EDITTEXT 1089, 140, 60, 175, 12, ES_UPPERCASE | ES_AUTOHSCROLL - LTEXT "&Password:", 1095, 8, 81, 130, 8, NOT WS_GROUP + LTEXT "&Åifre:", 1095, 8, 81, 130, 8, NOT WS_GROUP EDITTEXT 1090, 140, 78, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Confirm password:", 1092, 8, 99, 130, 8, NOT WS_GROUP + LTEXT "Å&ifreyi DoÄrula:", 1092, 8, 99, 130, 8, NOT WS_GROUP EDITTEXT 1088, 140, 96, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL END @@ -527,140 +527,140 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Type a name you want for this connection:", -1, 8, 4, 190, 8 + LTEXT "Bu baÄlantÄ± iÃ§in istediÄiniz bir ad yazÄ±nÄ±z:", -1, 8, 4, 190, 8 EDITTEXT 1114, 8, 17, 190, 12, ES_AUTOHSCROLL - LTEXT "Click Finish to save it in the Network Connections folder.", -1, 8, 38, 193, 8 - LTEXT "To edit this connection later, select it, click the File menu, and then click Properties.", -1, 8, 58, 193, 16 + LTEXT "Onu AÄ BaÄlantÄ±larÄ± dizini iÃ§ine kaydetmek iÃ§in Bitir'e tÄ±klayÄ±nÄ±z.", -1, 8, 38, 193, 8 + LTEXT "Bu baÄlantÄ±yÄ± daha sonra dÃ¼zenlemek iÃ§in onu seÃ§iniz, KÃ¼tÃ¼k seÃ§kesine tÄ±klayÄ±nÄ±z, sonra HusÃ»siyetler'e tÄ±klayÄ±nÄ±z.", -1, 8, 58, 193, 16 END 155 DIALOGEX 0, 0, 231, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Connec&t using:", 1124, 7, 5, 219, 8 +CAPTION "UmÃ»mÃ®" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&BaÄlanÄ±rken Kullan:", 1124, 7, 5, 219, 8 CONTROL "", 1128, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00004C0D, 7, 17, 198, 44, WS_EX_CLIENTEDGE - PUSHBUTTON "&Up", 1132, 210, 18, 16, 14, BS_ICON - PUSHBUTTON "&Down", 1131, 210, 36, 16, 14, BS_ICON - AUTOCHECKBOX "A&ll devices call the same numbers", 1119, 9, 66, 133, 14, BS_TOP | BS_MULTILINE - PUSHBUTTON "C&onfigure...", 1130, 144, 66, 60, 14 - GROUPBOX "Sample type", 1125, 8, 84, 215, 100, WS_GROUP - LTEXT "Ar&ea code:", 1133, 17, 102, 52, 8 + PUSHBUTTON "&YukarÄ±", 1132, 210, 18, 16, 14, BS_ICON + PUSHBUTTON "&AÅaÄÄ±", 1131, 210, 36, 16, 14, BS_ICON + AUTOCHECKBOX "&TÃ¼m AygÄ±tlar AynÄ± Numaralardan ArasÄ±n", 1119, 9, 66, 133, 14, BS_TOP | BS_MULTILINE + PUSHBUTTON "Ya&pÄ±landÄ±r...", 1130, 144, 66, 60, 14 + GROUPBOX "Ãrnek TÃ¼r", 1125, 8, 84, 215, 100, WS_GROUP + LTEXT "A&lan Kodu:", 1133, 17, 102, 52, 8 COMBOBOX 1122, 17, 112, 52, 110, CBS_DROPDOWN | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Phone number:", 1135, 71, 102, 139, 8 + LTEXT "T&elefon NumarasÄ±:", 1135, 71, 102, 139, 8 EDITTEXT 1123, 73, 112, 79, 14, ES_AUTOHSCROLL - PUSHBUTTON "Alter&nates", 1129, 154, 112, 60, 14 - LTEXT "Country/re&gion code:", 1134, 17, 132, 197, 8 + PUSHBUTTON "Ba&ÅkalarÄ±", 1129, 154, 112, 60, 14 + LTEXT "&Ãlke ya da BÃ¶lge Kodu:", 1134, 17, 132, 197, 8 COMBOBOX 1126, 17, 143, 193, 130, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - AUTOCHECKBOX "U&se dialing rules", 1121, 17, 163, 132, 14, BS_TOP | BS_MULTILINE - PUSHBUTTON "Dialing &Rules", 1136, 151, 161, 60, 14 - AUTOCHECKBOX "Sho&w icon in notification area when connected", 1120, 10, 192, 214, 19, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Ãevirme KÃ¢idelerini Kullan", 1121, 17, 163, 132, 14, BS_TOP | BS_MULTILINE + PUSHBUTTON "Ãe&virme KÃ¢ideleri", 1136, 151, 161, 60, 14 + AUTOCHECKBOX "Ba&ÄlandÄ±ÄÄ±nda Bildirim AlanÄ±nda Simge GÃ¶ster", 1120, 10, 192, 214, 19, BS_TOP | BS_MULTILINE END 156 DIALOGEX 0, 0, 231, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "C&onfigure...", 1130, 164, 38, 60, 14 - GROUPBOX "Sample text", 1125, 8, 55, 217, 100, WS_GROUP - LTEXT "Ar&ea code:", 1133, 17, 72, 48, 8 +CAPTION "UmÃ»mÃ®" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&YapÄ±landÄ±r...", 1130, 164, 38, 60, 14 + GROUPBOX "Ãrnek Metin", 1125, 8, 55, 217, 100, WS_GROUP + LTEXT "A&lan Kodu:", 1133, 17, 72, 48, 8 COMBOBOX 1122, 17, 83, 48, 119, CBS_DROPDOWN | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Phone number:", 1135, 71, 72, 146, 8 + LTEXT "T&elefon NumarasÄ±:", 1135, 71, 72, 146, 8 EDITTEXT 1123, 71, 83, 81, 14, ES_AUTOHSCROLL - PUSHBUTTON "Alter&nates", 1129, 155, 83, 63, 14 - LTEXT "Country/re&gion code:", 1134, 17, 103, 193, 8 + PUSHBUTTON "Ba&ÅkalarÄ±", 1129, 155, 83, 63, 14 + LTEXT "&Ãlke ya da BÃ¶lge Kodu:", 1134, 17, 103, 193, 8 COMBOBOX 1126, 17, 114, 201, 130, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - AUTOCHECKBOX "U&se dialing rules", 1121, 19, 134, 136, 12, BS_TOP | BS_MULTILINE - PUSHBUTTON "Dialing &Rules", 1136, 157, 132, 60, 14 - AUTOCHECKBOX "Sho&w icon in notification area when connected", 1120, 12, 164, 209, 18, BS_TOP | BS_MULTILINE - LTEXT "Connect using:", 1124, 8, 5, 217, 8 + AUTOCHECKBOX "&Ãevirme KÃ¢idelerini Kullan", 1121, 19, 134, 136, 12, BS_TOP | BS_MULTILINE + PUSHBUTTON "Ãe&virme KÃ¢ideleri", 1136, 157, 132, 60, 14 + AUTOCHECKBOX "Ba&ÄlandÄ±ÄÄ±nda Bildirim AlanÄ±nda Simge GÃ¶ster", 1120, 12, 164, 209, 18, BS_TOP | BS_MULTILINE + LTEXT "&BaÄlanÄ±rken Kullan:", 1124, 8, 5, 217, 8 CONTROL "", 1127, "SYSLISTVIEW32", WS_DISABLED | WS_BORDER | 0x0000EC0D, 7, 18, 217, 15 END 157 DIALOGEX 6, 18, 235, 160 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Appearance" -FONT 8, "MS Shell Dlg" -BEGIN - AUTOCHECKBOX "&Preview phone numbers before dialing", 1142, 8, 10, 224, 10, WS_GROUP - AUTOCHECKBOX "Show &location setting before dialing", 1139, 8, 27, 224, 10 - AUTOCHECKBOX "Allo&w location edits during login", 1140, 21, 43, 212, 10 - AUTOCHECKBOX "Show &connection progress while dialing", 1143, 8, 59, 224, 10 - AUTOCHECKBOX "Clo&se on dial", 1137, 8, 76, 224, 10 - AUTOCHECKBOX "All&ow phonebook edits during login", 1141, 8, 94, 224, 10 - AUTOCHECKBOX "&Use wizard to create new phonebook entries", 1144, 22, 111, 210, 10 +CAPTION "GÃ¶rÃ¼nÃ¼m" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Ãevirmeden Ãnce Telefon NumaralarÄ±nÄ± Ãnceden GÃ¶ster", 1142, 8, 10, 224, 10, WS_GROUP + AUTOCHECKBOX "Ã&evirmeden Ãnce Koum AyÃ¢rÄ±nÄ± GÃ¶ster", 1139, 8, 27, 224, 10 + AUTOCHECKBOX "&Oturum AÃ§ma EsnÃ¢sÄ±nda Konum DÃ¼zenlemelerine Ä°zin Ver", 1140, 21, 43, 212, 10 + AUTOCHECKBOX "Ãe&virirken BaÄlantÄ± Ä°lerlemesini GÃ¶ster", 1143, 8, 59, 224, 10 + AUTOCHECKBOX "&Aramada Kapat", 1137, 8, 76, 224, 10 + AUTOCHECKBOX "O&turum AÃ§ma EsnÃ¢sÄ±nda Telefon Defteri DÃ¼zenlemelerine Ä°zin Ver", 1141, 8, 94, 224, 10 + AUTOCHECKBOX "&Yeni Telefon Defteri GiriÅlerini OluÅturmak Ä°Ã§in YardÄ±mcÄ± Kullan", 1144, 22, 111, 210, 10 END 158 DIALOGEX 6, 18, 235, 160 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Appearance" -FONT 8, "MS Shell Dlg" -BEGIN - AUTOCHECKBOX "&Preview phone numbers before dialing", 1142, 8, 10, 223, 10, WS_GROUP - AUTOCHECKBOX "Show &location setting before dialing", 1139, 8, 27, 206, 10 - AUTOCHECKBOX "Start dial-up networking &monitor before dialing", 1138, 8, 44, 226, 10 - AUTOCHECKBOX "Show &connection progress while dialing", 1143, 8, 61, 224, 10 - AUTOCHECKBOX "Clo&se on dial", 1137, 8, 79, 220, 10 - AUTOCHECKBOX "&Use wizard to create new phonebook entries", 1144, 8, 97, 220, 10 - AUTOCHECKBOX "Always prompt &before auto-dialing", 1136, 8, 114, 220, 10 +CAPTION "GÃ¶rÃ¼nÃ¼m" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Ãevirmeden Ãnce Telefon NumaralarÄ±nÄ± Ãnceden GÃ¶ster", 1142, 8, 10, 223, 10, WS_GROUP + AUTOCHECKBOX "Ã&evirmeden Ãnce Koum AyÃ¢rÄ±nÄ± GÃ¶ster", 1139, 8, 27, 206, 10 + AUTOCHECKBOX "Ãev&irmeden Ãnce Ãevirmeli AÄ Ä°zlemesini BaÅlat", 1138, 8, 44, 226, 10 + AUTOCHECKBOX "Ãe&virirken BaÄlantÄ± Ä°lerlemesini GÃ¶ster", 1143, 8, 61, 224, 10 + AUTOCHECKBOX "&Aramada Kapat", 1137, 8, 79, 220, 10 + AUTOCHECKBOX "&Yeni Telefon Defteri GiriÅlerini OluÅturmak Ä°Ã§in YardÄ±mcÄ± Kullan", 1144, 8, 97, 220, 10 + AUTOCHECKBOX "&KendiliÄinden Ãevirmeden Ãnce TÃ¼m Zamanlarda Sor", 1136, 8, 114, 220, 10 END 160 DIALOGEX 6, 18, 320, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CHILD | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select a name for this demand dial interface. A common practice is to name interfaces after the network or router to which they connect.", 1158, 7, 5, 309, 29 - LTEXT "&Interface name:", 1159, 17, 41, 285, 8, NOT WS_GROUP + LTEXT "Bu Ã§evirme arayÃ¼zÃ¼ isteÄi iÃ§in bir ad seÃ§iniz. BaÄlanan yÃ¶nlendirici ya da aÄdan sonra arayÃ¼zleri adlandÄ±rmak bilinen bir uygulamadÄ±r.", 1158, 7, 5, 309, 29 + LTEXT "&ArayÃ¼z AdÄ±:", 1159, 17, 41, 285, 8, NOT WS_GROUP EDITTEXT 1157, 17, 53, 284, 12, ES_AUTOHSCROLL - AUTOCHECKBOX "I &know all about demand-dial interfaces and would rather edit the properties directly", 1156, 24, 100, 258, 31, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED + AUTOCHECKBOX "&Ãevirme ArayÃ¼zleri Ä°steÄi Ãzerine TÃ¼m Åeyleri Biliyorum ve HusÃ»siyetleri DoÄrudan DÃ¼zenlemeyi YeÄliyorum", 1156, 24, 100, 258, 31, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED END 162 DIALOGEX 0, 0, 230, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Security" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Security options", 1580, 8, 3, 215, 139 - AUTORADIOBUTTON "&Typical (recommended settings)", 1540, 14, 16, 201, 9, BS_NOTIFY | WS_GROUP - AUTORADIOBUTTON "A&dvanced (custom settings)", 1541, 14, 102, 198, 8, BS_NOTIFY - LTEXT "&Validate my identity as follows:", 1537, 26, 29, 187, 8, NOT WS_GROUP +CAPTION "GÃ¼venlik" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "GÃ¼venlik SeÃ§enekleri", 1580, 8, 3, 215, 139 + AUTORADIOBUTTON "&Tipik (Ãnerilen Ayarlar)", 1540, 14, 16, 201, 9, BS_NOTIFY | WS_GROUP + AUTORADIOBUTTON "&GeliÅmiÅ (HusÃ»sÃ® Ayarlar)", 1541, 14, 102, 198, 8, BS_NOTIFY + LTEXT "&KimliÄimi AÅaÄÄ±daki Gibi Onayla:", 1537, 26, 29, 187, 8, NOT WS_GROUP COMBOBOX 1178, 26, 40, 184, 78, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP - AUTOCHECKBOX "A&utomatically use my ReactOS logon name and password (and domain if any)", 1174, 26, 58, 184, 20, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Requ&ire data encryption (disconnect if none)", 1169, 26, 82, 183, 10, BS_TOP | BS_MULTILINE - LTEXT "Using these settings requires a knowledge of security protocols.", 1539, 15, 114, 134, 20 - PUSHBUTTON "&Settings...", 1180, 151, 115, 60, 14 - GROUPBOX "Interactive logon and scripting", 1177, 8, 146, 215, 62, WS_GROUP - AUTOCHECKBOX "S&how terminal window", 1173, 14, 159, 198, 11, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "&Run script:", 1172, 14, 172, 57, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&ReactOS Oturum AÃ§ma AdÄ±mÄ± ve Åifremi KendiliÄinden Kullan (EÄer Varsa Etki AlanÄ±nÄ± Da)", 1174, 26, 58, 184, 20, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Veri SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± Gerektir (EÄer Yoksa BaÄlantÄ±yÄ± Kes)", 1169, 26, 82, 183, 10, BS_TOP | BS_MULTILINE + LTEXT "Bu ayarlarÄ± kullanmak gÃ¼venlik iletiÅim kÃ¢idelerinin bir bilgisini gerektirir.", 1539, 15, 114, 134, 20 + PUSHBUTTON "&Ayarlar...", 1180, 151, 115, 60, 14 + GROUPBOX "EtkileÅimli Oturum AÃ§ma ve Betikleme", 1177, 8, 146, 215, 62, WS_GROUP + AUTOCHECKBOX "&UÃ§birim Penceresini GÃ¶ster", 1173, 14, 159, 198, 11, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&BetiÄi ÃalÄ±ÅtÄ±r:", 1172, 14, 172, 57, 10, BS_TOP | BS_MULTILINE COMBOBOX 1179, 72, 171, 140, 104, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP - PUSHBUTTON "&Edit...", 1182, 87, 187, 60, 14 - PUSHBUTTON "&Browse...", 1181, 151, 187, 60, 14 + PUSHBUTTON "&DÃ¼zenle...", 1182, 87, 187, 60, 14 + PUSHBUTTON "G&Ã¶z At...", 1181, 151, 187, 60, 14 END 163 DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "You have more than one dial-up device on your computer.", -1, 6, 3, 307, 13 - LTEXT "&Select the devices to use in this connection:", -1, 6, 15, 307, 11 + LTEXT "BilgisayarÄ±nÄ±zda birden Ã§ok Ã§evirme aygÄ±tÄ±nÄ±z var.", -1, 6, 3, 307, 13 + LTEXT "&Bu baÄlantÄ±da kullanmak iÃ§in aygÄ±tlarÄ± seÃ§iniz:", -1, 6, 15, 307, 11 CONTROL "", 1228, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C415, 7, 28, 304, 77 END 165 DIALOGEX 0, 0, 230, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Networking" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Typ&e of dial-up server I am calling:", 1583, 7, 4, 219, 8 +CAPTION "AÄ Kurma" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&AradÄ±ÄÄ±m Ãevirme Sunucusunun TÃ¼rÃ¼:", 1583, 7, 4, 219, 8 COMBOBOX 1418, 7, 17, 215, 46, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - PUSHBUTTON "&Settings", 1419, 160, 35, 60, 14 - LTEXT "This c&onnection uses the following items:", 1684, 8, 64, 219, 10 + PUSHBUTTON "A&yarlar", 1419, 160, 35, 60, 14 + LTEXT "&Bu BaÄlantÄ± AÅaÄÄ±daki ÃÄeleri KullanÄ±r:", 1684, 8, 64, 219, 10 CONTROL "", 1251, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C40D, 7, 75, 216, 53 - PUSHBUTTON "I&nstall...", 1252, 7, 133, 67, 14 - PUSHBUTTON "&Uninstall", 1254, 80, 133, 67, 14 - PUSHBUTTON "P&roperties", 1253, 153, 133, 67, 14 - GROUPBOX "Description", 1585, 9, 158, 213, 43 + PUSHBUTTON "&Kur...", 1252, 7, 133, 67, 14 + PUSHBUTTON "Ka&ldÄ±r", 1254, 80, 133, 67, 14 + PUSHBUTTON "&HusÃ»siyetler", 1253, 153, 133, 67, 14 + GROUPBOX "TanÄ±m", 1585, 9, 158, 213, 43 LTEXT "", 1250, 18, 167, 195, 25 END

1 0

[hpoussin] 65028: [NTFS] Also return the short file name to caller if available
by hpoussin＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hpoussin Date: Sun Oct 26 19:10:39 2014 New Revision: 65028 URL: http://svn.reactos.org/svn/reactos?rev=65028&view=rev Log: [NTFS] Also return the short file name to caller if available Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Oct 26 19:10:39 2014 @@ -242,12 +242,13 @@ ULONG BufferLength) { ULONG Length; - PFILENAME_ATTRIBUTE FileName; + PFILENAME_ATTRIBUTE FileName, ShortFileName; DPRINT("NtfsGetBothDirectoryInformation() called\n"); FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); + ShortFileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); Length = FileName->NameLength * sizeof (WCHAR); if ((sizeof(FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) @@ -258,6 +259,19 @@ ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, sizeof(ULONG)); RtlCopyMemory(Info->FileName, FileName->Name, Length); + if (ShortFileName) + { + /* Should we upcase the filename? */ + ASSERT(ShortFileName->NameLength <= ARRAYSIZE(Info->ShortName)); + Info->ShortNameLength = ShortFileName->NameLength * sizeof(WCHAR); + RtlCopyMemory(Info->ShortName, ShortFileName->Name, Info->ShortNameLength); + } + else + { + Info->ShortName[0] = 0; + Info->ShortNameLength = 0; + } + Info->CreationTime.QuadPart = FileName->CreationTime; Info->LastAccessTime.QuadPart = FileName->LastAccessTime; Info->LastWriteTime.QuadPart = FileName->LastWriteTime; @@ -271,9 +285,6 @@ // Info->FileIndex=; Info->EaSize = 0; - - Info->ShortName[0] = 0; - Info->ShortNameLength = 0; return STATUS_SUCCESS; }

1 0

[hpoussin] 65027: [NTFS] Prefer long file name when naming objects We now always see the long file name of an object when browsing NTFS partitions.
by hpoussin＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hpoussin Date: Sun Oct 26 19:10:17 2014 New Revision: 65027 URL: http://svn.reactos.org/svn/reactos?rev=65027&view=rev Log: [NTFS] Prefer long file name when naming objects We now always see the long file name of an object when browsing NTFS partitions. Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Sun Oct 26 19:10:17 2014 @@ -287,16 +287,25 @@ } PFILENAME_ATTRIBUTE -GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord) +GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord, UCHAR NameType) { PNTFS_ATTR_RECORD Attribute; + PFILENAME_ATTRIBUTE Name; Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && Attribute->Type != AttributeEnd) { if (Attribute->Type == AttributeFileName) - return (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + { + Name = (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + if (Name->NameType == NameType || + (Name->NameType == NTFS_FILE_NAME_WIN32_AND_DOS && NameType == NTFS_FILE_NAME_WIN32) || + (Name->NameType == NTFS_FILE_NAME_WIN32_AND_DOS && NameType == NTFS_FILE_NAME_DOS)) + { + return Name; + } + } Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); } Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Oct 26 19:10:17 2014 @@ -135,7 +135,7 @@ DPRINT("NtfsGetNameInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -163,7 +163,7 @@ DPRINT("NtfsGetDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -204,7 +204,7 @@ DPRINT("NtfsGetFullDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -246,7 +246,7 @@ DPRINT("NtfsGetBothDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Oct 26 19:10:17 2014 @@ -289,7 +289,7 @@ return NULL; } - FileName = GetFileNameFromRecord(MftRecord); + FileName = GetFileNameFromRecord(MftRecord, NTFS_FILE_NAME_WIN32); if (!FileName) { ExFreePoolWithTag(MftRecord, TAG_NTFS); @@ -391,7 +391,7 @@ DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p)\n", Vcb, DirectoryFCB, Name, Record, fileFCB); - FileName = GetFileNameFromRecord(Record); + FileName = GetFileNameFromRecord(Record, NTFS_FILE_NAME_WIN32); if (!FileName) { return STATUS_OBJECT_NAME_NOT_FOUND; // Not sure that's the best here Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Oct 26 19:10:17 2014 @@ -448,7 +448,7 @@ NtfsDumpFileAttributes(PFILE_RECORD_HEADER FileRecord); PFILENAME_ATTRIBUTE -GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord); +GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord, UCHAR NameType); /* blockdev.c */

1 0

[hpoussin] 65026: [NTFS] Correctly read indexes This fixes (at least) an infinite loop when trying to mount some partitions.
by hpoussin＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hpoussin Date: Sun Oct 26 19:10:04 2014 New Revision: 65026 URL: http://svn.reactos.org/svn/reactos?rev=65026&view=rev Log: [NTFS] Correctly read indexes This fixes (at least) an infinite loop when trying to mount some partitions. Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Oct 26 19:10:04 2014 @@ -631,9 +631,9 @@ IndexBuffer = (PINDEX_BUFFER)IndexRecord; ASSERT(IndexBuffer->Ntfs.Type == 'XDNI'); ASSERT(IndexBuffer->Header.AllocatedSize + 0x18 == IndexBlockSize); - IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); - IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); - //ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); FIXME: Why doesn't it work? + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); + IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); + ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) @@ -653,6 +653,7 @@ } ++CurrentEntry; + ASSERT(IndexEntry->Length >= sizeof(INDEX_ENTRY_ATTRIBUTE)); IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs