Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[jimtabor] 71946: [NtGdi] - Make SetBkColor work the same as client side.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jul 15 20:13:33 2016 New Revision: 71946 URL: http://svn.reactos.org/svn/reactos?rev=71946&view=rev Log: [NtGdi] - Make SetBkColor work the same as client side. Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Fri Jul 15 20:13:33 2016 @@ -105,10 +105,15 @@ return CLR_INVALID; } pdcattr = dc->pdcattr; - oldColor = pdcattr->crBackgroundClr; - pdcattr->crBackgroundClr = color; - pdcattr->ulBackgroundClr = (ULONG)color; - pdcattr->ulDirty_ |= DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL; // Clear Flag if set. + + oldColor = pdcattr->ulBackgroundClr; + pdcattr->ulBackgroundClr = color; + + if (pdcattr->crBackgroundClr != color) + { + pdcattr->ulDirty_ |= (DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL); // Clear Flag if set. + pdcattr->crBackgroundClr = color; + } hBrush = pdcattr->hbrush; DC_UnlockDc(dc); NtGdiSelectBrush(hDC, hBrush); @@ -184,6 +189,8 @@ } DC_vUpdateTextBrush(pdc); +// DC_vUpdateLineBrush(pdc); +// DC_vUpdateFillBrush(pdc); DC_UnlockDc(pdc);

8 years, 5 months

[tthompson] 71945: [NTFS] *AddRun() - Don't leak RunBuffer when encountering errors. Handle exception from FsRtlAddLargeMcbEntry().

by tthompson＠svn.reactos.org

Author: tthompson Date: Fri Jul 15 15:27:04 2016 New Revision: 71945 URL: http://svn.reactos.org/svn/reactos?rev=71945&view=rev Log: [NTFS] *AddRun() - Don't leak RunBuffer when encountering errors. Handle exception from FsRtlAddLargeMcbEntry(). Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Fri Jul 15 15:27:04 2016 @@ -88,25 +88,40 @@ ULONGLONG NextVBN = AttrContext->Record.NonResident.LowestVCN; // Allocate some memory for the RunBuffer - PUCHAR RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + PUCHAR RunBuffer; int RunBufferOffset = 0; if (!AttrContext->Record.IsNonResident) return STATUS_INVALID_PARAMETER; + + RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); // Convert the data runs to a map control block Status = ConvertDataRunsToLargeMCB(DataRun, &DataRunsMCB, &NextVBN); if (!NT_SUCCESS(Status)) { DPRINT1("Unable to convert data runs to MCB (probably ran out of memory)!\n"); + ExFreePoolWithTag(RunBuffer, TAG_NTFS); return Status; } // Add newly-assigned clusters to mcb - FsRtlAddLargeMcbEntry(&DataRunsMCB, - NextVBN, - NextAssignedCluster, - RunLength); + _SEH2_TRY{ + if (!FsRtlAddLargeMcbEntry(&DataRunsMCB, + NextVBN, + NextAssignedCluster, + RunLength)) + { + FsRtlUninitializeLargeMcb(&DataRunsMCB); + ExFreePoolWithTag(RunBuffer, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + FsRtlUninitializeLargeMcb(&DataRunsMCB); + ExFreePoolWithTag(RunBuffer, TAG_NTFS); + _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + } _SEH2_END; + // Convert the map control block back to encoded data runs ConvertLargeMCBToDataRuns(&DataRunsMCB, RunBuffer, Vcb->NtfsInfo.BytesPerCluster, &RunBufferOffset);

8 years, 5 months

[hbelusca] 71944: [EVENTVWR]: Fix transparency problems for some icons.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jul 14 18:58:05 2016 New Revision: 71944 URL: http://svn.reactos.org/svn/reactos?rev=71944&view=rev Log: [EVENTVWR]: Fix transparency problems for some icons. Modified: trunk/reactos/base/applications/mscutils/eventvwr/res/copy.ico trunk/reactos/base/applications/mscutils/eventvwr/res/next_event.ico trunk/reactos/base/applications/mscutils/eventvwr/res/prev_event.ico Modified: trunk/reactos/base/applications/mscutils/eventvwr/res/copy.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mscutils/eventvwr/res/next_event.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mscutils/eventvwr/res/prev_event.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available.

8 years, 5 months

[zhu] 71943: Added global static lists to keep track of memory allocations for debugging purposes.

by zhu＠svn.reactos.org

Author: zhu Date: Thu Jul 14 16:40:43 2016 New Revision: 71943 URL: http://svn.reactos.org/svn/reactos?rev=71943&view=rev Log: Added global static lists to keep track of memory allocations for debugging purposes. Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Thu Jul 14 16:40:43 2016 @@ -18,6 +18,9 @@ PADDRESS_FILE AddrFileList[128]; PTCP_CONTEXT ContextList[128]; +KSPIN_LOCK PCBListLock; +KSPIN_LOCK AddrFileListLock; +KSPIN_LOCK ContextListLock; typedef struct { @@ -101,6 +104,7 @@ PLIST_ENTRY Entry; PTCP_REQUEST Request; KIRQL OldIrql; + int i; IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -141,8 +145,19 @@ } tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); - InterlockedDecrement(&PcbCount); - DPRINT1("\n PCB Count: %d\n", PcbCount); + KeAcquireSpinLockAtDpcLevel(&PCBListLock); + DPRINT1("Deleting PCB at %p\n", Context->lwip_tcp_pcb); + for (i=0; i<PcbCount; i++) { + if (PCBList[i] == Context->lwip_tcp_pcb) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } else if (PCBList[i] == NULL) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } + } + PcbCount--; + KeReleaseSpinLockFromDpcLevel(&PCBListLock); Context->lwip_tcp_pcb = NULL; RemoveEntryList(Entry); @@ -160,8 +175,19 @@ AddressFile->lwip_tcp_pcb = NULL; } tcp_close(Context->lwip_tcp_pcb); - InterlockedDecrement(&PcbCount); - DPRINT1("\n PCB Count: %d\n", PcbCount); + KeAcquireSpinLockAtDpcLevel(&PCBListLock); + DPRINT1("Deleting PCB at %p\n", Context->lwip_tcp_pcb); + for (i=0; i<PcbCount; i++) { + if (PCBList[i] == Context->lwip_tcp_pcb) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } else if (PCBList[i] == NULL) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } + } + PcbCount--; + KeReleaseSpinLockFromDpcLevel(&PCBListLock); Context->lwip_tcp_pcb = NULL; RemoveEntryList(Entry); @@ -210,6 +236,10 @@ RtlZeroMemory(PCBList, sizeof(PCBList)); RtlZeroMemory(AddrFileList, sizeof(AddrFileList)); RtlZeroMemory(ContextList, sizeof(ContextList)); + + KeInitializeSpinLock(&PCBListLock); + KeInitializeSpinLock(&AddrFileListLock); + KeInitializeSpinLock(&ContextListLock); } static @@ -239,6 +269,7 @@ PIO_STACK_LOCATION IrpSp; NTSTATUS Status; + int i; switch (err) { @@ -314,8 +345,19 @@ { tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); - InterlockedDecrement(&PcbCount); - DPRINT1("\n PCB Count\n", PcbCount); + KeAcquireSpinLockAtDpcLevel(&PCBListLock); + DPRINT1("Deleting PCB at %p\n", Context->lwip_tcp_pcb); + for (i=0; i<PcbCount; i++) { + if (PCBList[i] == Context->lwip_tcp_pcb) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } else if (PCBList[i] == NULL) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } + } + PcbCount--; + KeReleaseSpinLockFromDpcLevel(&PCBListLock); } Context->lwip_tcp_pcb = NULL; @@ -495,7 +537,10 @@ Context->lwip_tcp_pcb = newpcb; tcp_err(Context->lwip_tcp_pcb, lwip_tcp_err_callback); - InterlockedIncrement(&PcbCount); + KeAcquireSpinLockAtDpcLevel(&PCBListLock); + PCBList[PcbCount] = newpcb; + PcbCount++; + KeReleaseSpinLockFromDpcLevel(&PCBListLock); DPRINT1("\n PCB Count: %d\n", PcbCount); Context->TcpState = TCP_STATE_ACCEPTED; tcp_accepted(AddressFile->lwip_tcp_pcb); @@ -679,6 +724,7 @@ PLIST_ENTRY Entry; NTSTATUS Status; err_t lwip_err; + int i; /* This error is currently unimplemented in lwIP */ /* if (err != ERR_OK) @@ -728,8 +774,19 @@ DPRINT1("Receive tcp_pcb mismatch\nAborting PCB at %p\n", tpcb); tcp_arg(tpcb, NULL); tcp_abort(tpcb); - InterlockedDecrement(&PcbCount); - DPRINT1("\n PCB Count\n", PcbCount); + KeAcquireSpinLockAtDpcLevel(&PCBListLock); + DPRINT1("Deleting PCB at %p\n", tpcb); + for (i=0; i<PcbCount; i++) { + if (PCBList[i] == tpcb) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } else if (PCBList[i] == NULL) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } + } + PcbCount--; + KeReleaseSpinLockFromDpcLevel(&PCBListLock); // TODO: better return code Status = STATUS_UNSUCCESSFUL; @@ -1013,6 +1070,10 @@ /* Allocate our new address file */ AddressFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(*AddressFile), TAG_ADDRESS_FILE); + KeAcquireSpinLockAtDpcLevel(&AddrFileListLock); + AddrFileList[AddrFileCount] = AddressFile; + AddrFileCount++; + KeReleaseSpinLockFromDpcLevel(&AddrFileListLock); if (!AddressFile) { KeReleaseSpinLock(&AddressListLock, OldIrql); @@ -1041,7 +1102,10 @@ InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); AddressFile->ContextCount = 0; AddressFile->lwip_tcp_pcb = tcp_new(); - InterlockedIncrement(&PcbCount); + KeAcquireSpinLockAtDpcLevel(&PCBListLock); + PCBList[PcbCount] = AddressFile->lwip_tcp_pcb; + PcbCount++; + KeReleaseSpinLockFromDpcLevel(&PCBListLock); DPRINT1("\n PCB Count: %d\n", PcbCount); tcp_arg(AddressFile->lwip_tcp_pcb, AddressFile); tcp_err(AddressFile->lwip_tcp_pcb, lwip_tcp_err_callback); @@ -1103,6 +1167,7 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; + KIRQL OldIrql; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1113,6 +1178,10 @@ } Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Context), TAG_TCP_CONTEXT); + KeAcquireSpinLock(&ContextListLock, &OldIrql); + ContextList[ContextCount] = Context; + ContextCount++; + KeReleaseSpinLock(&ContextListLock, OldIrql); if (!Context) { return STATUS_NO_MEMORY; @@ -1142,6 +1211,7 @@ NTSTATUS Status; err_t lwip_err; + int i; /* Lock the global address list */ KeAcquireSpinLock(&AddressListLock, &OldIrql); @@ -1183,8 +1253,19 @@ tcp_abort(AddressFile->lwip_tcp_pcb); lwip_err = ERR_OK; } - InterlockedDecrement(&PcbCount); - DPRINT1("\n PCB Count: %d\n", PcbCount); + KeAcquireSpinLockAtDpcLevel(&PCBListLock); + DPRINT1("Deleting PCB at %p\n", AddressFile->lwip_tcp_pcb); + for (i=0; i<PcbCount; i++) { + if (PCBList[i] == AddressFile->lwip_tcp_pcb) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } else if (PCBList[i] == NULL) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } + } + PcbCount--; + KeReleaseSpinLockFromDpcLevel(&PCBListLock); if (lwip_err != ERR_OK) { DPRINT1("lwIP tcp_close error: %d", lwip_err); @@ -1215,6 +1296,18 @@ KeReleaseSpinLockFromDpcLevel(&AddressFile->ContextListLock); ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); + KeAcquireSpinLockAtDpcLevel(&AddrFileListLock); + for (i=0; i<AddrFileCount; i++) { + if (AddrFileList[i] == NULL) { + AddrFileList[i] = AddrFileList[i+1]; + AddrFileList[i+1] = NULL; + } else if (AddrFileList[i] == AddressFile) { + AddrFileList[i] = AddrFileList[i+1]; + AddrFileList[i+1] = NULL; + } + } + AddrFileCount--; + KeReleaseSpinLockFromDpcLevel(&AddrFileListLock); KeReleaseSpinLock(&AddressListLock, OldIrql); @@ -1236,6 +1329,7 @@ KIRQL OldIrql; NTSTATUS Status; + int i; AddressFile = Context->AddressFile; @@ -1278,9 +1372,20 @@ tcp_abort(Context->lwip_tcp_pcb); lwip_err = ERR_OK; } + KeAcquireSpinLockAtDpcLevel(&PCBListLock); + DPRINT1("Deleting PCB at %p\n", Context->lwip_tcp_pcb); + for (i=0; i<PcbCount; i++) { + if (PCBList[i] == Context->lwip_tcp_pcb) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } else if (PCBList[i] == NULL) { + PCBList[i] = PCBList[i+1]; + PCBList[i+1] = NULL; + } + } + PcbCount--; + KeReleaseSpinLockFromDpcLevel(&PCBListLock); Context->lwip_tcp_pcb = NULL; - InterlockedDecrement(&PcbCount); - DPRINT1("\n PCB Count: %d\n", PcbCount); if (lwip_err != ERR_OK) { DPRINT1("lwIP tcp_close error: %d", lwip_err); @@ -1319,17 +1424,32 @@ KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); ExFreePoolWithTag(Context, TAG_TCP_CONTEXT); + KeAcquireSpinLockAtDpcLevel(&ContextListLock); + for (i=0; i<ContextCount; i++) { + if (ContextList[i] == NULL) { + ContextList[i] = ContextList[i+1]; + ContextList[i+1] = NULL; + } else if (ContextList[i] == Context) { + ContextList[i] = ContextList[i+1]; + ContextList[i+1] = NULL; + } + } + ContextCount--; + KeReleaseSpinLockFromDpcLevel(&ContextListLock); if (AddressFile->ContextCount == 0) { + DPRINT1("Closing Address File at %p from TcpIpCloseContext on Context at %p", + AddressFile, Context); + + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); Status = TcpIpCloseAddress(AddressFile); } else { + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); Status = STATUS_SUCCESS; } - - KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return Status; }

8 years, 5 months

[tthompson] 71942: [NTFS] Implement AddRun(). Add support functions and documentation. +ConvertDataRunsToLargeMCB() +ConvertLargeMCBToDataRuns() *SetAttributeDataLength(), *NtfsWriteFile() - Update...

by tthompson＠svn.reactos.org

Author: tthompson Date: Thu Jul 14 15:20:48 2016 New Revision: 71942 URL: http://svn.reactos.org/svn/reactos?rev=71942&view=rev Log: [NTFS] Implement AddRun(). Add support functions and documentation. +ConvertDataRunsToLargeMCB() +ConvertLargeMCBToDataRuns() *SetAttributeDataLength(), *NtfsWriteFile() - Update for AddRun() implementation. Add hack to SetAttributeDataLength() to allow notepad.exe to save files until freeing clusters is implemented. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Thu Jul 14 15:20:48 2016 @@ -35,17 +35,309 @@ /* FUNCTIONS ****************************************************************/ +/** +* @name AddRun +* @implemented +* +* Adds a run of allocated clusters to a non-resident attribute. +* +* @param Vcb +* Pointer to an NTFS_VCB for the destination volume. +* +* @param AttrContext +* Pointer to an NTFS_ATTR_CONTEXT describing the destination attribute. +* +* @param AttrOffset +* Byte offset of the destination attribute relative to its file record. +* +* @param FileRecord +* Pointer to a complete copy of the file record containing the destination attribute. Must be at least +* Vcb->NtfsInfo.BytesPerFileRecord bytes long. +* +* @param NextAssignedCluster +* Logical cluster number of the start of the data run being added. +* +* @param RunLength +* How many clusters are in the data run being added. Can't be 0. +* +* @return +* STATUS_SUCCESS on success. STATUS_INVALID_PARAMETER if AttrContext describes a resident attribute. +* STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails. +* STATUS_BUFFER_TOO_SMALL if ConvertLargeMCBToDataRuns() fails. +* STATUS_NOT_IMPLEMENTED if we need to migrate the attribute to an attribute list (TODO). +* +* @remarks +* Clusters should have been allocated previously with NtfsAllocateClusters(). +* +* +*/ NTSTATUS -AddRun(PNTFS_ATTR_CONTEXT AttrContext, +AddRun(PNTFS_VCB Vcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, ULONGLONG NextAssignedCluster, ULONG RunLength) { - UNIMPLEMENTED; + NTSTATUS Status; + PUCHAR DataRun = (PUCHAR)&AttrContext->Record + AttrContext->Record.NonResident.MappingPairsOffset; + int DataRunMaxLength; + PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); + LARGE_MCB DataRunsMCB; + ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; + ULONGLONG NextVBN = AttrContext->Record.NonResident.LowestVCN; + + // Allocate some memory for the RunBuffer + PUCHAR RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + int RunBufferOffset = 0; if (!AttrContext->Record.IsNonResident) return STATUS_INVALID_PARAMETER; - return STATUS_NOT_IMPLEMENTED; + // Convert the data runs to a map control block + Status = ConvertDataRunsToLargeMCB(DataRun, &DataRunsMCB, &NextVBN); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to convert data runs to MCB (probably ran out of memory)!\n"); + return Status; + } + + // Add newly-assigned clusters to mcb + FsRtlAddLargeMcbEntry(&DataRunsMCB, + NextVBN, + NextAssignedCluster, + RunLength); + + // Convert the map control block back to encoded data runs + ConvertLargeMCBToDataRuns(&DataRunsMCB, RunBuffer, Vcb->NtfsInfo.BytesPerCluster, &RunBufferOffset); + + // Get the amount of free space between the start of the of the first data run and the attribute end + DataRunMaxLength = AttrContext->Record.Length - AttrContext->Record.NonResident.MappingPairsOffset; + + // Do we need to extend the attribute (or convert to attribute list)? + if (DataRunMaxLength < RunBufferOffset) + { + PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + NextAttributeOffset); + DataRunMaxLength += Vcb->NtfsInfo.BytesPerFileRecord - NextAttributeOffset - (sizeof(ULONG) * 2); + + // Can we move the end of the attribute? + if (NextAttribute->Type != AttributeEnd || DataRunMaxLength < RunBufferOffset - 1) + { + DPRINT1("FIXME: Need to create attribute list! Max Data Run Length available: %d\n", DataRunMaxLength); + if (NextAttribute->Type != AttributeEnd) + DPRINT1("There's another attribute after this one with type %0xlx\n", NextAttribute->Type); + ExFreePoolWithTag(RunBuffer, TAG_NTFS); + FsRtlUninitializeLargeMcb(&DataRunsMCB); + return STATUS_NOT_IMPLEMENTED; + } + + // calculate position of end markers + NextAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + RunBufferOffset; + NextAttributeOffset = ALIGN_UP_BY(NextAttributeOffset, 8); + + // Write the end markers + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + NextAttributeOffset); + NextAttribute->Type = AttributeEnd; + NextAttribute->Length = FILE_RECORD_END; + + // Update the length + DestinationAttribute->Length = NextAttributeOffset - AttrOffset; + AttrContext->Record.Length = DestinationAttribute->Length; + + // We need to increase the FileRecord size + FileRecord->BytesInUse = NextAttributeOffset + (sizeof(ULONG) * 2); + } + + // NOTE: from this point on the original attribute record will contain invalid data in it's runbuffer + // TODO: Elegant fix? Could we free the old Record and allocate a new one without issue? + + // Update HighestVCN + DestinationAttribute->NonResident.HighestVCN = + AttrContext->Record.NonResident.HighestVCN = max(NextVBN - 1 + RunLength, + AttrContext->Record.NonResident.HighestVCN); + + // Write data runs to destination attribute + RtlCopyMemory((PVOID)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), + RunBuffer, + RunBufferOffset); + + // Update the file record + Status = UpdateFileRecord(Vcb, AttrContext->FileMFTIndex, FileRecord); + + ExFreePoolWithTag(RunBuffer, TAG_NTFS); + FsRtlUninitializeLargeMcb(&DataRunsMCB); + + NtfsDumpDataRuns((PUCHAR)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), 0); + + return Status; +} + +/** +* @name ConvertDataRunsToLargeMCB +* @implemented +* +* Converts binary data runs to a map control block. +* +* @param DataRun +* Pointer to the run data +* +* @param DataRunsMCB +* Pointer to an unitialized LARGE_MCB structure. +* +* @return +* STATUS_SUCCESS on success, STATUS_INSUFFICIENT_RESOURCES if we fail to +* initialize the mcb or add an entry. +* +* @remarks +* Initializes the LARGE_MCB pointed to by DataRunsMCB. If this function succeeds, you +* need to call FsRtlUninitializeLargeMcb() when you're done with DataRunsMCB. This +* function will ensure the LargeMCB has been unitialized in case of failure. +* +*/ +NTSTATUS +ConvertDataRunsToLargeMCB(PUCHAR DataRun, + PLARGE_MCB DataRunsMCB, + PULONGLONG pNextVBN) +{ + LONGLONG DataRunOffset; + ULONGLONG DataRunLength; + LONGLONG DataRunStartLCN; + ULONGLONG NextCluster; + + ULONGLONG LastLCN = 0; + + // Initialize the MCB, potentially catch an exception + _SEH2_TRY{ + FsRtlInitializeLargeMcb(DataRunsMCB, NonPagedPool); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + } _SEH2_END; + + while (*DataRun != 0) + { + DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); + + if (DataRunOffset != -1) + { + // Normal data run. + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + NextCluster = LastLCN + DataRunLength; + + + _SEH2_TRY{ + if (!FsRtlAddLargeMcbEntry(DataRunsMCB, + *pNextVBN, + DataRunStartLCN, + DataRunLength)) + { + FsRtlUninitializeLargeMcb(DataRunsMCB); + return STATUS_INSUFFICIENT_RESOURCES; + } + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + FsRtlUninitializeLargeMcb(DataRunsMCB); + _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + } _SEH2_END; + + } + + *pNextVBN += DataRunLength; + } + + return STATUS_SUCCESS; +} + +/** +* @name ConvertLargeMCBToDataRuns +* @implemented +* +* Converts a map control block to a series of encoded data runs (used by non-resident attributes). +* +* @param DataRunsMCB +* Pointer to a LARGE_MCB structure describing the data runs. +* +* @param RunBuffer +* Pointer to the buffer that will receive the encoded data runs. +* +* @param MaxBufferSize +* Size of RunBuffer, in bytes. +* +* @param UsedBufferSize +* Pointer to a ULONG that will receive the size of the data runs in bytes. Can't be NULL. +* +* @return +* STATUS_SUCCESS on success, STATUS_BUFFER_TOO_SMALL if RunBuffer is too small to contain the +* complete output. +* +*/ +NTSTATUS +ConvertLargeMCBToDataRuns(PLARGE_MCB DataRunsMCB, + PUCHAR RunBuffer, + ULONG MaxBufferSize, + PULONG UsedBufferSize) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG RunBufferOffset = 0; + LONGLONG DataRunOffset; + ULONGLONG LastLCN = 0; + + LONGLONG Vbn, Lbn, Count; + + + DPRINT("\t[Vbn, Lbn, Count]\n"); + + // convert each mcb entry to a data run + for (int i = 0; FsRtlGetNextLargeMcbEntry(DataRunsMCB, i, &Vbn, &Lbn, &Count); i++) + { + UCHAR DataRunOffsetSize = 0; + UCHAR DataRunLengthSize = 0; + UCHAR ControlByte = 0; + + // [vbn, lbn, count] + DPRINT("\t[%I64d, %I64d,%I64d]\n", Vbn, Lbn, Count); + + // TODO: check for holes and convert to sparse runs + DataRunOffset = Lbn - LastLCN; + LastLCN = Lbn; + + // now we need to determine how to represent DataRunOffset with the minimum number of bytes + DPRINT("Determining how many bytes needed to represent %I64x\n", DataRunOffset); + DataRunOffsetSize = GetPackedByteCount(DataRunOffset, TRUE); + DPRINT("%d bytes needed.\n", DataRunOffsetSize); + + // determine how to represent DataRunLengthSize with the minimum number of bytes + DPRINT("Determining how many bytes needed to represent %I64x\n", Count); + DataRunLengthSize = GetPackedByteCount(Count, TRUE); + DPRINT("%d bytes needed.\n", DataRunLengthSize); + + // ensure the next data run + end marker would be > Max buffer size + if (RunBufferOffset + 2 + DataRunLengthSize + DataRunOffsetSize > MaxBufferSize) + { + Status = STATUS_BUFFER_TOO_SMALL; + DPRINT1("FIXME: Ran out of room in buffer for data runs!\n"); + break; + } + + // pack and copy the control byte + ControlByte = (DataRunOffsetSize << 4) + DataRunLengthSize; + RunBuffer[RunBufferOffset++] = ControlByte; + + // copy DataRunLength + RtlCopyMemory(RunBuffer + RunBufferOffset, &Count, DataRunLengthSize); + RunBufferOffset += DataRunLengthSize; + + // copy DataRunOffset + RtlCopyMemory(RunBuffer + RunBufferOffset, &DataRunOffset, DataRunOffsetSize); + RunBufferOffset += DataRunOffsetSize; + } + + // End of data runs + RunBuffer[RunBufferOffset++] = 0; + + *UsedBufferSize = RunBufferOffset; + DPRINT("New Size of DataRuns: %ld\n", *UsedBufferSize); + + return Status; } PUCHAR Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Jul 14 15:20:48 2016 @@ -211,6 +211,11 @@ FileRecord->BytesInUse = NextAttributeOffset + (sizeof(ULONG) * 2); } +/** +* @parameter FileRecord +* Pointer to a file record. Must be a full record at least +* Fcb->Vcb->NtfsInfo.BytesPerFileRecord bytes large, not just the header. +*/ NTSTATUS SetAttributeDataLength(PFILE_OBJECT FileObject, PNTFS_FCB Fcb, @@ -235,6 +240,7 @@ { ULONG BytesPerCluster = Fcb->Vcb->NtfsInfo.BytesPerCluster; ULONGLONG AllocationSize = ROUND_UP(DataSize->QuadPart, BytesPerCluster); + PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); // do we need to increase the allocation size? if (AttrContext->Record.NonResident.AllocatedSize < AllocationSize) @@ -265,7 +271,7 @@ } // now we need to add the clusters we allocated to the data run - Status = AddRun(AttrContext, NextAssignedCluster, AssignedClusters); + Status = AddRun(Fcb->Vcb, AttrContext, AttrOffset, FileRecord, NextAssignedCluster, AssignedClusters); if (!NT_SUCCESS(Status)) { DPRINT1("Error: Unable to add data run!\n"); @@ -275,23 +281,34 @@ ClustersNeeded -= AssignedClusters; LastClusterInDataRun.LowPart = NextAssignedCluster + AssignedClusters - 1; } - - DPRINT1("FixMe: Increasing allocation size is unimplemented!\n"); - return STATUS_NOT_IMPLEMENTED; + } + else if (AttrContext->Record.NonResident.AllocatedSize > AllocationSize) + { + // shrink allocation size (TODO) + if (AllocationSize == 0) + { + // hack for notepad.exe + PUCHAR DataRuns = (PUCHAR)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset); + *DataRuns = 0; + DestinationAttribute->NonResident.HighestVCN = + AttrContext->Record.NonResident.HighestVCN = 0; + } } // TODO: is the file compressed, encrypted, or sparse? // NOTE: we need to have acquired the main resource exclusively, as well as(?) the PagingIoResource - // TODO: update the allocated size on-disk - DPRINT("Allocated Size: %I64u\n", AttrContext->Record.NonResident.AllocatedSize); - + Fcb->RFCB.AllocationSize.QuadPart = AllocationSize; + AttrContext->Record.NonResident.AllocatedSize = AllocationSize; AttrContext->Record.NonResident.DataSize = DataSize->QuadPart; AttrContext->Record.NonResident.InitializedSize = DataSize->QuadPart; - // copy the attribute record back into the FileRecord - RtlCopyMemory((PCHAR)FileRecord + AttrOffset, &AttrContext->Record, AttrContext->Record.Length); + DestinationAttribute->NonResident.AllocatedSize = AllocationSize; + DestinationAttribute->NonResident.DataSize = DataSize->QuadPart; + DestinationAttribute->NonResident.InitializedSize = DataSize->QuadPart; + + DPRINT("Allocated Size: %I64u\n", DestinationAttribute->NonResident.AllocatedSize); } else { Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Jul 14 15:20:48 2016 @@ -517,9 +517,23 @@ //NtfsDumpAttribute(PATTRIBUTE Attribute); NTSTATUS -AddRun(PNTFS_ATTR_CONTEXT AttrContext, +AddRun(PNTFS_VCB Vcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, ULONGLONG NextAssignedCluster, ULONG RunLength); + +NTSTATUS +ConvertDataRunsToLargeMCB(PUCHAR DataRun, + PLARGE_MCB DataRunsMCB, + PULONGLONG pNextVBN); + +NTSTATUS +ConvertLargeMCBToDataRuns(PLARGE_MCB DataRunsMCB, + PUCHAR RunBuffer, + ULONG MaxBufferSize, + PULONG UsedBufferSize); PUCHAR DecodeRun(PUCHAR DataRun, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Thu Jul 14 15:20:48 2016 @@ -429,6 +429,22 @@ return Status; } + // at this point the record in DataContext may be stale, so we need to refresh it + ReleaseAttributeContext(DataContext); + + Status = FindAttribute(DeviceExt, + FileRecord, + AttributeData, + Fcb->Stream, + wcslen(Fcb->Stream), + &DataContext, + &AttributeOffset); + if (!NT_SUCCESS(Status)) + { + DPRINT1("DRIVER ERROR: Couldn't find $DATA attribute after setting size!\n"); + return Status; + } + // now we need to update this file's size in every directory index entry that references it // TODO: put this code in its own function and adapt it to work with every filename / hardlink // stored in the file record.

8 years, 5 months