Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[ekohl] 68354: [USETUP] Make the keyboard layouts selection not dependent on the selected language. Patch by joao.jeronimo.89. CORE-9630 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 5 21:00:38 2015 New Revision: 68354 URL: http://svn.reactos.org/svn/reactos?rev=68354&view=rev Log: [USETUP] Make the keyboard layouts selection not dependent on the selected language. Patch by joao.jeronimo.89. CORE-9630 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sun Jul 5 21:00:38 2015 @@ -1052,7 +1052,6 @@ return NULL; } - if (_wcsicmp(LayoutsList[uIndex].LayoutID, KeyName) == 0) { UserData = (WCHAR*)RtlAllocateHeap(ProcessHeap, 0,

9 years, 2 months

[pschweitzer] 68353: [NTFS] Properly return allocation size on directory enum

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 5 20:31:54 2015 New Revision: 68353 URL: http://svn.reactos.org/svn/reactos?rev=68353&view=rev Log: [NTFS] Properly return allocation size on directory enum 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 Jul 5 20:31:54 2015 @@ -135,8 +135,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); - Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); Info->FileIndex = MFTIndex; @@ -185,8 +184,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); - Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); Info->FileIndex = MFTIndex; Info->EaSize = 0; @@ -250,8 +248,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); - Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); Info->FileIndex = MFTIndex; Info->EaSize = 0;

9 years, 2 months

[tfaber] 68352: [NTOS:MM] - Show that PAGE_NOCACHE also works for image and data sections - Show that *MapViewOfSection returns user space addresses CORE-9808

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 5 19:44:05 2015 New Revision: 68352 URL: http://svn.reactos.org/svn/reactos?rev=68352&view=rev Log: [NTOS:MM] - Show that PAGE_NOCACHE also works for image and data sections - Show that *MapViewOfSection returns user space addresses CORE-9808 Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Sun Jul 5 19:44:05 2015 @@ -62,6 +62,21 @@ ok_eq_hex(Status, ExpectAtBase ? STATUS_SUCCESS : STATUS_IMAGE_NOT_AT_BASE);\ if (!skip(NT_SUCCESS(Status), "Section not mapped\n")) \ { \ + ok((LONG_PTR)BaseAddress > 0, "BaseAddress = %p\n", BaseAddress); \ + ok_eq_uint(*(PUCHAR)BaseAddress, ExpectM ? 'M' : 0); \ + Status = MmUnmapViewOfSection(PsGetCurrentProcess(), BaseAddress); \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + } \ + BaseAddress = NULL; \ + ViewSize = 0; \ + Status = MmMapViewOfSection(SectionObject, PsGetCurrentProcess(), \ + &BaseAddress, 0, 1, &SectionOffset, \ + &ViewSize, ViewUnmap, 0, \ + PAGE_READONLY | PAGE_NOCACHE); \ + ok_eq_hex(Status, ExpectAtBase ? STATUS_SUCCESS : STATUS_IMAGE_NOT_AT_BASE);\ + if (!skip(NT_SUCCESS(Status), "Section not mapped\n")) \ + { \ + ok((LONG_PTR)BaseAddress > 0, "BaseAddress = %p\n", BaseAddress); \ ok_eq_uint(*(PUCHAR)BaseAddress, ExpectM ? 'M' : 0); \ Status = MmUnmapViewOfSection(PsGetCurrentProcess(), BaseAddress); \ ok_eq_hex(Status, STATUS_SUCCESS); \ @@ -452,6 +467,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); if (!skip(NT_SUCCESS(Status), "No view\n")) { + ok((LONG_PTR)Mapping > 0, "Mapping = %p\n", Mapping); EqualBytes = RtlCompareMemory(Mapping, ZeroPageContents, PAGE_SIZE); @@ -476,6 +492,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); if (!skip(NT_SUCCESS(Status), "No view\n")) { + ok((LONG_PTR)Mapping > 0, "Mapping = %p\n", Mapping); EqualBytes = RtlCompareMemory(Mapping, ZeroPageContents, PAGE_SIZE); @@ -500,6 +517,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); if (!skip(NT_SUCCESS(Status), "No view\n")) { + ok((LONG_PTR)Mapping > 0, "Mapping = %p\n", Mapping); EqualBytes = RtlCompareMemory(Mapping, MyPage, PAGE_SIZE);

9 years, 2 months

[tfaber] 68351: [KMTESTS:MM] - Add a test for \Device\PhysicalMemory sections, which shows that we have trouble with PAGE_NOCACHE. CORE-9808

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 5 19:17:50 2015 New Revision: 68351 URL: http://svn.reactos.org/svn/reactos?rev=68351&view=rev Log: [KMTESTS:MM] - Add a test for \Device\PhysicalMemory sections, which shows that we have trouble with PAGE_NOCACHE. CORE-9808 Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Sun Jul 5 19:17:50 2015 @@ -381,6 +381,209 @@ } } +static +VOID +TestPhysicalMemorySection(VOID) +{ + NTSTATUS Status; + UNICODE_STRING SectionName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE SectionHandle; + PVOID SectionObject; + PUCHAR MyPage; + PHYSICAL_ADDRESS MyPagePhysical; + PUCHAR ZeroPageContents; + PHYSICAL_ADDRESS ZeroPagePhysical; + PVOID Mapping; + PUCHAR MappingBytes; + SIZE_T ViewSize; + SIZE_T EqualBytes; + + MyPage = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, 'MPmK'); + if (skip(MyPage != NULL, "Out of memory\n")) + return; + MyPagePhysical = MmGetPhysicalAddress(MyPage); + RtlFillMemory(MyPage + 0 * PAGE_SIZE / 4, PAGE_SIZE / 4, 0x23); + RtlFillMemory(MyPage + 1 * PAGE_SIZE / 4, PAGE_SIZE / 4, 0x67); + RtlFillMemory(MyPage + 2 * PAGE_SIZE / 4, PAGE_SIZE / 4, 0xab); + RtlFillMemory(MyPage + 3 * PAGE_SIZE / 4, PAGE_SIZE / 4, 0xef); + + ZeroPageContents = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, 'ZPmK'); + if (skip(ZeroPageContents != NULL, "Out of memory\n")) + { + ExFreePoolWithTag(MyPage, 'MPmK'); + return; + } + ZeroPagePhysical.QuadPart = 0; + + Mapping = MmMapIoSpace(ZeroPagePhysical, PAGE_SIZE, MmCached); + if (skip(Mapping != NULL, "Failed to map zero page\n")) + { + ExFreePoolWithTag(ZeroPageContents, 'ZPmK'); + ExFreePoolWithTag(MyPage, 'MPmK'); + return; + } + + RtlCopyMemory(ZeroPageContents, Mapping, PAGE_SIZE); + MmUnmapIoSpace(Mapping, PAGE_SIZE); + + InitializeObjectAttributes(&ObjectAttributes, + &SectionName, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenSection(&SectionHandle, SECTION_ALL_ACCESS, &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No section\n")) + { + /* Map zero page and compare */ + Mapping = NULL; + ViewSize = PAGE_SIZE; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &ZeroPagePhysical, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No view\n")) + { + EqualBytes = RtlCompareMemory(Mapping, + ZeroPageContents, + PAGE_SIZE); + ok_eq_size(EqualBytes, PAGE_SIZE); + Status = ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + /* Map the zero page non-cached */ + Mapping = NULL; + ViewSize = PAGE_SIZE; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &ZeroPagePhysical, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE | PAGE_NOCACHE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No view\n")) + { + EqualBytes = RtlCompareMemory(Mapping, + ZeroPageContents, + PAGE_SIZE); + ok_eq_size(EqualBytes, PAGE_SIZE); + Status = ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + /* Map our NP page, compare, and check that modifications are reflected */ + Mapping = NULL; + ViewSize = PAGE_SIZE; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &MyPagePhysical, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No view\n")) + { + EqualBytes = RtlCompareMemory(Mapping, + MyPage, + PAGE_SIZE); + ok_eq_size(EqualBytes, PAGE_SIZE); + + MappingBytes = Mapping; + ok(MappingBytes[5] == 0x23, "Mapping[5] = 0x%x\n", MappingBytes[5]); + ok(MyPage[5] == 0x23, "MyPage[5] = 0x%x\n", MyPage[5]); + + MyPage[5] = 0x44; + ok(MappingBytes[5] == 0x44, "Mapping[5] = 0x%x\n", MappingBytes[5]); + ok(MyPage[5] == 0x44, "MyPage[5] = 0x%x\n", MyPage[5]); + + MappingBytes[5] = 0x88; + ok(MappingBytes[5] == 0x88, "Mapping[5] = 0x%x\n", MappingBytes[5]); + ok(MyPage[5] == 0x88, "MyPage[5] = 0x%x\n", MyPage[5]); + + Status = ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + Status = ZwClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + /* Try flag 0x80000000, which ROS calls SEC_PHYSICALMEMORY */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes, + NULL, + PAGE_READWRITE, + 0x80000000, + NULL); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER_6); + if (NT_SUCCESS(Status)) + ZwClose(SectionHandle); + + /* Assertion failure: AllocationAttributes & SEC_IMAGE | SEC_RESERVE | SEC_COMMIT */ + if (!KmtIsCheckedBuild) + { + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = MmCreateSection(&SectionObject, + SECTION_ALL_ACCESS, + &ObjectAttributes, + NULL, + PAGE_READWRITE, + 0x80000000, + NULL, + NULL); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER_6); + if (NT_SUCCESS(Status)) + ObDereferenceObject(SectionObject); + } + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = MmCreateSection(&SectionObject, + SECTION_ALL_ACCESS, + &ObjectAttributes, + NULL, + PAGE_READWRITE, + SEC_RESERVE | 0x80000000, + NULL, + NULL); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER_6); + if (NT_SUCCESS(Status)) + ObDereferenceObject(SectionObject); + + ExFreePoolWithTag(ZeroPageContents, 'ZPmK'); + ExFreePoolWithTag(MyPage, 'MPmK'); +} + START_TEST(MmSection) { NTSTATUS Status; @@ -453,4 +656,6 @@ ZwClose(FileHandle2); if (FileHandle1) ZwClose(FileHandle1); + + TestPhysicalMemorySection(); }

9 years, 2 months

[pschweitzer] 68350: [ARF] Fix build(tm)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 5 19:09:20 2015 New Revision: 68350 URL: http://svn.reactos.org/svn/reactos?rev=68350&view=rev Log: [ARF] Fix build(tm) Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun Jul 5 19:09:20 2015 @@ -209,8 +209,8 @@ NetworkInfo->LastWriteTime.QuadPart = FileName->LastWriteTime; NetworkInfo->ChangeTime.QuadPart = FileName->ChangeTime; - NetworkInfo->EndOfFile.QuadPart = Fcb->RFCB.FileSize; - NetworkInfo->AllocationSize.QuadPart = Fcb->RFCB.AllocationSize; + NetworkInfo->EndOfFile = Fcb->RFCB.FileSize; + NetworkInfo->AllocationSize = Fcb->RFCB.AllocationSize; NtfsFileFlagsToAttributes(FileName->FileAttributes, &NetworkInfo->FileAttributes);

9 years, 2 months

[pschweitzer] 68349: [NTFS] Return correct size in FileNetworkOpenInformation operation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 5 19:08:08 2015 New Revision: 68349 URL: http://svn.reactos.org/svn/reactos?rev=68349&view=rev Log: [NTFS] Return correct size in FileNetworkOpenInformation operation Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun Jul 5 19:08:08 2015 @@ -209,8 +209,8 @@ NetworkInfo->LastWriteTime.QuadPart = FileName->LastWriteTime; NetworkInfo->ChangeTime.QuadPart = FileName->ChangeTime; - NetworkInfo->EndOfFile.QuadPart = FileName->AllocatedSize; - NetworkInfo->AllocationSize.QuadPart = ROUND_UP(FileName->AllocatedSize, DeviceExt->NtfsInfo.BytesPerCluster); + NetworkInfo->EndOfFile.QuadPart = Fcb->RFCB.FileSize; + NetworkInfo->AllocationSize.QuadPart = Fcb->RFCB.AllocationSize; NtfsFileFlagsToAttributes(FileName->FileAttributes, &NetworkInfo->FileAttributes);

9 years, 2 months

[pschweitzer] 68348: [NTFS] Continue streams integration: - NtfsGetFileSize() will now return the file size depending on the open data stream - NtfsGetFileSize() will also optionally return allocat...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 5 19:04:05 2015 New Revision: 68348 URL: http://svn.reactos.org/svn/reactos?rev=68348&view=rev Log: [NTFS] Continue streams integration: - NtfsGetFileSize() will now return the file size depending on the open data stream - NtfsGetFileSize() will also optionally return allocated size - In NtfsMakeFCBFromDirEntry(), when initializing FSRTL_COMMON_FCB_HEADER entry, use data stream sizes Modified: 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/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 Jul 5 19:04:05 2015 @@ -35,22 +35,27 @@ /* FUNCTIONS ****************************************************************/ -static ULONGLONG +ULONGLONG NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PFILENAME_ATTRIBUTE FileName) -{ - ULONGLONG Size; + PCWSTR Stream, + ULONG StreamLength, + PULONGLONG AllocatedSize) +{ + ULONGLONG Size = 0ULL; + ULONGLONG Allocated = 0ULL; NTSTATUS Status; PNTFS_ATTR_CONTEXT DataContext; - Size = FileName->AllocatedSize; - Status = FindAttribute(DeviceExt, FileRecord, AttributeData, L"", 0, &DataContext); + Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Stream, StreamLength, &DataContext); if (NT_SUCCESS(Status)) { Size = AttributeDataLength(&DataContext->Record); + Allocated = AttributeAllocatedLength(&DataContext->Record); ReleaseAttributeContext(DataContext); } + + if (AllocatedSize != NULL) *AllocatedSize = Allocated; return Size; } @@ -130,7 +135,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, FileName); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); Info->FileIndex = MFTIndex; @@ -180,7 +185,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, FileName); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); Info->FileIndex = MFTIndex; @@ -245,7 +250,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, FileName); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); Info->FileIndex = MFTIndex; @@ -362,7 +367,7 @@ */ if (MFTRecord == OldMFTRecord) { - DPRINT("Ignoring duplicate MFT entry 0x%x\n", MFTRecord); + DPRINT1("Ignoring duplicate MFT entry 0x%x\n", MFTRecord); Ccb->Entry++; ExFreePoolWithTag(FileRecord, TAG_NTFS); continue; 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 Jul 5 19:04:05 2015 @@ -421,6 +421,7 @@ PFILENAME_ATTRIBUTE FileName; PSTANDARD_INFORMATION StdInfo; PNTFS_FCB rcFCB; + ULONGLONG Size, AllocatedSize; DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB); @@ -451,6 +452,8 @@ pathName[FileName->NameLength] = UNICODE_NULL; } + Size = NtfsGetFileSize(Vcb, Record, Stream, wcslen(Stream), &AllocatedSize); + rcFCB = NtfsCreateFCB(pathName, Stream, Vcb); if (!rcFCB) { @@ -459,9 +462,9 @@ memcpy(&rcFCB->Entry, FileName, FIELD_OFFSET(FILENAME_ATTRIBUTE, NameLength)); rcFCB->Entry.NameType = FileName->NameType; - rcFCB->RFCB.FileSize.QuadPart = FileName->DataSize; - rcFCB->RFCB.ValidDataLength.QuadPart = FileName->DataSize; - rcFCB->RFCB.AllocationSize.QuadPart = FileName->AllocatedSize; + rcFCB->RFCB.FileSize.QuadPart = Size; + rcFCB->RFCB.ValidDataLength.QuadPart = Size; + rcFCB->RFCB.AllocationSize.QuadPart = AllocatedSize; StdInfo = GetStandardInformationFromRecord(Record); if (StdInfo != NULL) 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 Jul 5 19:04:05 2015 @@ -550,6 +550,13 @@ /* dirctl.c */ +ULONGLONG +NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PCWSTR Stream, + ULONG StreamLength, + PULONGLONG AllocatedSize); + NTSTATUS NtfsDirectoryControl(PNTFS_IRP_CONTEXT IrpContext);

9 years, 2 months

[hbelusca] 68347: [NTVDM] - Implement INT 10h, AH=13h "Write String" function. - Fix VidBiosPrintCharacter to use the colour attribute only in graphics mode, or when explicitely needed. - Fix some ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jul 5 18:35:25 2015 New Revision: 68347 URL: http://svn.reactos.org/svn/reactos?rev=68347&view=rev Log: [NTVDM] - Implement INT 10h, AH=13h "Write String" function. - Fix VidBiosPrintCharacter to use the colour attribute only in graphics mode, or when explicitely needed. - Fix some special cases where specifying a BIOS mode page of 0xFF means "use current page". - Use a macro to check whether a given mode number specifies a text mode, and use it where needed. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sun Jul 5 18:35:25 2015 @@ -1949,6 +1949,8 @@ {&VideoMode_320x200_256color, 0x2000, 8}, /* Mode 13h - VGA */ }; +#define IS_TEXT_MODE(ModeNumber) \ + (((ModeNumber) >= 0x00 && (ModeNumber) <= 0x03) || ((ModeNumber) == 0x07)) static PVGA_STATIC_FUNC_TABLE VgaStaticFuncTable; @@ -2282,21 +2284,14 @@ VgaSetPalette(Palette, Size); } -static VOID VidBiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page) -{ - /* Make sure the selected video page is valid */ - if (Page >= BIOS_MAX_PAGES) return; - - /* Get the cursor location */ +static __inline VOID VidBiosGetCursorPosition(PBYTE Row, PBYTE Column, BYTE Page) +{ *Row = HIBYTE(Bda->CursorPosition[Page]); *Column = LOBYTE(Bda->CursorPosition[Page]); } static VOID VidBiosSetCursorPosition(BYTE Row, BYTE Column, BYTE Page) { - /* Make sure the selected video page is valid */ - if (Page >= BIOS_MAX_PAGES) return; - /* Update the position in the BDA */ Bda->CursorPosition[Page] = MAKEWORD(Column, Row); @@ -2316,7 +2311,7 @@ static VOID VidBiosSetCursorShape(WORD CursorStartEnd) { /* Only valid in text-mode */ - if ((Bda->VideoMode > 0x03) && (Bda->VideoMode != 0x07)) return; + if (!IS_TEXT_MODE(Bda->VideoMode)) return; /* Update the BDA */ Bda->CursorStartLine = HIBYTE(CursorStartEnd) & 0x1F; @@ -2367,7 +2362,7 @@ SHORT ScreenColumns = VgaGetDisplayResolution().X; WORD Offset; - /* Get the cursor location */ + /* Get the cursor position */ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); Low = IOReadB(VGA_CRTC_DATA); IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); @@ -2406,6 +2401,7 @@ VideoAddress = MemoryMaps[(Misc >> 2) & 3]; BufferSize = MemorySizes[(Misc >> 2) & 3]; + // !IS_TEXT_MODE(Bda->VideoMode) if (Misc & 1) { /* Graphics mode */ @@ -2484,7 +2480,7 @@ Bda->ScreenRows = Resolution.Y - 1; /* Adjust the number of columns for graphics modes */ - if (ModeNumber > 3) Bda->ScreenColumns >>= 3; + if (!IS_TEXT_MODE(ModeNumber)) Bda->ScreenColumns >>= 3; /* Update the current font */ Bda->CharacterHeight = VideoModes[ModeNumber].CharacterHeight; @@ -2496,7 +2492,7 @@ */ case 8: { - if (ModeNumber <= 3) + if (IS_TEXT_MODE(ModeNumber)) VgaWriteTextModeFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x8_OFFSET, VIDEO_BIOS_DATA_SEG); @@ -2504,7 +2500,7 @@ } case 14: { - if (ModeNumber <= 3) + if (IS_TEXT_MODE(ModeNumber)) VgaWriteTextModeFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x14_OFFSET, VIDEO_BIOS_DATA_SEG); @@ -2512,7 +2508,7 @@ } case 16: { - if (ModeNumber <= 3) + if (IS_TEXT_MODE(ModeNumber)) VgaWriteTextModeFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); @@ -2538,7 +2534,7 @@ * Use the default CGA cursor scanline values, * see: http://vitaly_filatov.tripod.com/ng/asm/asm_023.2.html */ - if ((ModeNumber >= 0x00 && ModeNumber <= 0x03) || (ModeNumber == 0x07)) + if (IS_TEXT_MODE(ModeNumber)) // FIXME: we might read the CRT registers and do the adjustment? VidBiosSetCursorShape(MAKEWORD(0x07, 0x06)); @@ -2575,8 +2571,8 @@ IOWriteB(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); /* - * Get the cursor location (we don't update anything on the BIOS side - * but we update the cursor location on the VGA side). + * Get the cursor position (we don't update anything on the BIOS side + * but we update the cursor position on the VGA side). */ VidBiosGetCursorPosition(&Row, &Column, PageNumber); VidBiosSetCursorPosition(Row, Column, PageNumber); @@ -2593,6 +2589,7 @@ case 0x01: case 0x02: case 0x03: + case 0x07: { EmulatorWriteMemory(&EmulatorContext, TO_LINEAR(TEXT_VIDEO_SEG, @@ -2827,15 +2824,12 @@ } } -static VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page) - { +static VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BOOLEAN UseAttr, BYTE Page) +{ WORD CharData = MAKEWORD(Character, Attribute); BYTE Row, Column; - /* Make sure the page exists */ - if (Page >= BIOS_MAX_PAGES) return; - - /* Get the cursor location */ + /* Get the cursor position */ VidBiosGetCursorPosition(&Row, &Column, Page); if (Character == '\a') @@ -2860,7 +2854,7 @@ /* Erase the existing character */ CharData = MAKEWORD(' ', Attribute); - VidBiosDrawGlyph(CharData, TRUE, Page, Row, Column); + VidBiosDrawGlyph(CharData, UseAttr, Page, Row, Column); } else if (Character == '\t') { @@ -2868,7 +2862,7 @@ do { // Taken from DOSBox - VidBiosPrintCharacter(' ', Attribute, Page); + VidBiosPrintCharacter(' ', Attribute, UseAttr, Page); VidBiosGetCursorPosition(&Row, &Column, Page); } while (Column % 8); } @@ -2887,7 +2881,7 @@ /* Default character */ /* Write the character and advance the cursor */ - VidBiosDrawGlyph(CharData, TRUE, Page, Row, Column); + VidBiosDrawGlyph(CharData, UseAttr, Page, Row, Column); Column++; } @@ -2935,19 +2929,29 @@ /* Set Cursor Position */ case 0x02: { - VidBiosSetCursorPosition(getDH(), getDL(), getBH()); + BYTE Page = getBH(); + + /* Validate the selected video page */ + if (Page >= BIOS_MAX_PAGES) break; + + VidBiosSetCursorPosition(getDH(), getDL(), Page); break; } /* Get Cursor Position and Shape */ case 0x03: { - /* Make sure the selected video page exists */ - if (getBH() >= BIOS_MAX_PAGES) break; + BYTE Page = getBH(); + + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; /* Return the result */ setCX(MAKEWORD(Bda->CursorEndLine, Bda->CursorStartLine)); - setDX(Bda->CursorPosition[getBH()]); + setDX(Bda->CursorPosition[Page]); break; } @@ -2988,8 +2992,11 @@ BYTE Page = getBH(); DWORD Offset; - /* Check if the page exists */ - if (Page >= BIOS_MAX_PAGES) break; + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; /* Find the offset of the character */ Offset = Page * Bda->VideoPageSize + @@ -3019,13 +3026,14 @@ BYTE Page = getBH(); BYTE Row, Column; - /* Check if the page exists */ - if (Page >= BIOS_MAX_PAGES) break; - - /* Get the cursor location */ - // VidBiosGetCursorPosition(&Row, &Column, Page); - Row = HIBYTE(Bda->CursorPosition[Page]); - Column = LOBYTE(Bda->CursorPosition[Page]); + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; + + /* Get the cursor position */ + VidBiosGetCursorPosition(&Row, &Column, Page); /* Write to video memory a certain number of times */ while (Counter-- > 0) @@ -3137,7 +3145,15 @@ /* Teletype Output */ case 0x0E: { - VidBiosPrintCharacter(getAL(), getBL(), getBH()); + BYTE Page = getBH(); + + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; + + VidBiosPrintCharacter(getAL(), getBL(), !IS_TEXT_MODE(Bda->VideoMode), Page); break; } @@ -3686,7 +3702,44 @@ /* Write String */ case 0x13: { - DPRINT1("BIOS Function INT 13h (Write String) is UNIMPLEMENTED\n"); + PCHAR String = (PCHAR)SEG_OFF_TO_PTR(getES(), getBP()); + WORD Counter = getCX(); + BYTE Row, Column; + BYTE OldRow, OldColumn; + CHAR Character; + BYTE Attribute = getBL(); // Default attribute in case the string contains only characters. + BYTE Page = getBH(); + BYTE Flags = getAL(); + + /* Validate the selected video page */ + if (Page == 0xFF) // Special case: use the current video page + Page = Bda->VideoPage; + else if (Page >= BIOS_MAX_PAGES) + break; + + /* Get the original cursor position */ + VidBiosGetCursorPosition(&OldRow, &OldColumn, Page); + + /* Set the new cursor position */ + Row = getDH(); + Column = getDL(); + if (Row == 0xFF) // Special case: use the current cursor position + { + Row = OldRow; + Column = OldColumn; + } + VidBiosSetCursorPosition(Row, Column, Page); + + while (Counter-- > 0) + { + Character = *String++; + if (Flags & 0x02) Attribute = *String++; + VidBiosPrintCharacter(Character, Attribute, TRUE, Page); + } + + /* Reset the cursor position to its original value if we don't want to update it */ + if (!(Flags & 0x01)) VidBiosSetCursorPosition(OldRow, OldColumn, Page); + break; }

9 years, 2 months

[ekohl] 68346: [NTOSKRNL] NtQuerySystemInformation: Return ResultLength only in case of success.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 5 09:58:03 2015 New Revision: 68346 URL: http://svn.reactos.org/svn/reactos?rev=68346&view=rev Log: [NTOSKRNL] NtQuerySystemInformation: Return ResultLength only in case of success. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Jul 5 09:58:03 2015 @@ -2440,7 +2440,7 @@ &ResultLength); /* Save the result length to the caller */ - if (UnsafeResultLength) + if (NT_SUCCESS(FStatus) && UnsafeResultLength) *UnsafeResultLength = ResultLength; } }

9 years, 2 months

[pschweitzer] 68345: [NTFS] Ignore DOS name only entries when browsing index. CORE-9086

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 5 09:04:24 2015 New Revision: 68345 URL: http://svn.reactos.org/svn/reactos?rev=68345&view=rev Log: [NTFS] Ignore DOS name only entries when browsing index. CORE-9086 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 Jul 5 09:04:24 2015 @@ -501,6 +501,31 @@ } } +#if 0 +static +VOID +DumpIndexEntry(PINDEX_ENTRY_ATTRIBUTE IndexEntry) +{ + DPRINT1("Entry: %p\n", IndexEntry); + DPRINT1("\tData.Directory.IndexedFile: %I64x\n", IndexEntry->Data.Directory.IndexedFile); + DPRINT1("\tLength: %u\n", IndexEntry->Length); + DPRINT1("\tKeyLength: %u\n", IndexEntry->KeyLength); + DPRINT1("\tFlags: %x\n", IndexEntry->Flags); + DPRINT1("\tReserved: %x\n", IndexEntry->Reserved); + DPRINT1("\t\tDirectoryFileReferenceNumber: %I64x\n", IndexEntry->FileName.DirectoryFileReferenceNumber); + DPRINT1("\t\tCreationTime: %I64u\n", IndexEntry->FileName.CreationTime); + DPRINT1("\t\tChangeTime: %I64u\n", IndexEntry->FileName.ChangeTime); + DPRINT1("\t\tLastWriteTime: %I64u\n", IndexEntry->FileName.LastWriteTime); + DPRINT1("\t\tLastAccessTime: %I64u\n", IndexEntry->FileName.LastAccessTime); + DPRINT1("\t\tAllocatedSize: %I64u\n", IndexEntry->FileName.AllocatedSize); + DPRINT1("\t\tDataSize: %I64u\n", IndexEntry->FileName.DataSize); + DPRINT1("\t\tFileAttributes: %x\n", IndexEntry->FileName.FileAttributes); + DPRINT1("\t\tNameLength: %u\n", IndexEntry->FileName.NameLength); + DPRINT1("\t\tNameType: %x\n", IndexEntry->FileName.NameType); + DPRINT1("\t\tName: %.*S\n", IndexEntry->FileName.NameLength, IndexEntry->FileName.Name); +} +#endif + NTSTATUS BrowseIndexEntries(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER MftRecord, @@ -529,6 +554,7 @@ { if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && *CurrentEntry >= *StartEntry && + IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && CompareFileName(FileName, IndexEntry, DirSearch)) { *StartEntry = *CurrentEntry;

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015