Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[tthompson] 74524: [NTFS] - Expand support for resizing resident attributes and fix NtfsAllocateClusters(). -Modify SetAttributeDataLength() to allow a resident attribute to migrate to non-resident...

by tthompson＠svn.reactos.org

Author: tthompson Date: Sat May 13 08:56:54 2017 New Revision: 74524 URL: http://svn.reactos.org/svn/reactos?rev=74524&view=rev Log: [NTFS] - Expand support for resizing resident attributes and fix NtfsAllocateClusters(). -Modify SetAttributeDataLength() to allow a resident attribute to migrate to non-resident if the attribute grows too large to remain resident. -Fix values returned by NtfsAllocateClusters() in case of error; return error codes, not 0. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c 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] Sat May 13 08:56:54 2017 @@ -356,8 +356,106 @@ if (MaxValueLength < DataSize->LowPart || NextAttribute->Type != AttributeEnd) { - DPRINT1("FIXME: Need to convert attribute to non-resident!\n"); - return STATUS_NOT_IMPLEMENTED; + // convert attribute to non-resident + PNTFS_ATTR_RECORD Destination = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); + LARGE_INTEGER AttribDataSize; + PVOID AttribData; + ULONG EndAttributeOffset; + ULONG LengthWritten; + + DPRINT1("Converting attribute to non-resident.\n"); + + AttribDataSize.QuadPart = AttrContext->Record.Resident.ValueLength; + + // Is there existing data we need to back-up? + if (AttribDataSize.QuadPart > 0) + { + AttribData = ExAllocatePoolWithTag(NonPagedPool, AttribDataSize.QuadPart, TAG_NTFS); + if (AttribData == NULL) + { + DPRINT1("ERROR: Couldn't allocate memory for attribute data. Can't migrate to non-resident!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // read data to temp buffer + Status = ReadAttribute(Fcb->Vcb, AttrContext, 0, AttribData, AttribDataSize.QuadPart); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to read attribute before migrating!\n"); + ExFreePoolWithTag(AttribData, TAG_NTFS); + return Status; + } + } + + // Start by turning this attribute into a 0-length, non-resident attribute, then enlarge it. + + // Zero out the NonResident structure + RtlZeroMemory(&AttrContext->Record.NonResident.LowestVCN, + FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.CompressedSize) - FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.LowestVCN)); + RtlZeroMemory(&Destination->NonResident.LowestVCN, + FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.CompressedSize) - FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.LowestVCN)); + + // update the mapping pairs offset, which will be 0x40 + length in bytes of the name + AttrContext->Record.NonResident.MappingPairsOffset = Destination->NonResident.MappingPairsOffset = 0x40 + (Destination->NameLength * 2); + + // mark the attribute as non-resident + AttrContext->Record.IsNonResident = Destination->IsNonResident = 1; + + // update the end of the file record + // calculate position of end markers (1 byte for empty data run) + EndAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + 1; + EndAttributeOffset = ALIGN_UP_BY(EndAttributeOffset, 8); + + // Update the length + Destination->Length = EndAttributeOffset - AttrOffset; + AttrContext->Record.Length = Destination->Length; + + // Update the file record end + SetFileRecordEnd(FileRecord, + (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + EndAttributeOffset), + FILE_RECORD_END); + + // update file record on disk + Status = UpdateFileRecord(Fcb->Vcb, AttrContext->FileMFTIndex, FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't update file record to continue migration!\n"); + if (AttribDataSize.QuadPart > 0) + ExFreePoolWithTag(AttribData, TAG_NTFS); + return Status; + } + + // Initialize the MCB, potentially catch an exception + _SEH2_TRY{ + FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } _SEH2_END; + + // Now we can treat the attribute as non-resident and enlarge it normally + Status = SetAttributeDataLength(FileObject, Fcb, AttrContext, AttrOffset, FileRecord, DataSize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to migrate resident attribute!\n"); + if(AttribData != NULL) + ExFreePoolWithTag(AttribData, TAG_NTFS); + return Status; + } + + // restore the back-up attribute, if we made one + if (AttribDataSize.QuadPart > 0) + { + Status = WriteAttribute(Fcb->Vcb, AttrContext, 0, AttribData, AttribDataSize.QuadPart, &LengthWritten); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to write attribute data to non-resident clusters during migration!\n"); + // TODO: Reverse migration so no data is lost + ExFreePoolWithTag(AttribData, TAG_NTFS); + return Status; + } + + ExFreePoolWithTag(AttribData, TAG_NTFS); + } } } } @@ -371,7 +469,9 @@ } } - InternalSetResidentAttributeLength(AttrContext, FileRecord, AttrOffset, DataSize->LowPart); + // set the new length of the resident attribute (if we didn't migrate it) + if(!AttrContext->Record.IsNonResident) + InternalSetResidentAttributeLength(AttrContext, FileRecord, AttrOffset, DataSize->LowPart); } //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Sat May 13 08:56:54 2017 @@ -127,21 +127,21 @@ TAG_NTFS); if (BitmapRecord == NULL) { - return 0; + return STATUS_INSUFFICIENT_RESOURCES; } Status = ReadFileRecord(DeviceExt, NTFS_FILE_BITMAP, BitmapRecord); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(BitmapRecord, TAG_NTFS); - return 0; + return Status; } Status = FindAttribute(DeviceExt, BitmapRecord, AttributeData, L"", 0, &DataContext, NULL); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(BitmapRecord, TAG_NTFS); - return 0; + return Status; } BitmapDataSize = AttributeDataLength(&DataContext->Record); @@ -152,7 +152,7 @@ { ReleaseAttributeContext(DataContext); ExFreePoolWithTag(BitmapRecord, TAG_NTFS); - return 0; + return STATUS_INSUFFICIENT_RESOURCES; } DPRINT1("Total clusters: %I64x\n", DeviceExt->NtfsInfo.ClusterCount);

7 years, 7 months

[tthompson] 74523: [NTFS] - Commit early results of a small restructuring effort: -Add a new member to the NTFS_ATTR_CONTEXT struct, a LARGE_MCB. This allows an attribute context to describe the cl...

by tthompson＠svn.reactos.org

Author: tthompson Date: Fri May 12 22:16:20 2017 New Revision: 74523 URL: http://svn.reactos.org/svn/reactos?rev=74523&view=rev Log: [NTFS] - Commit early results of a small restructuring effort: -Add a new member to the NTFS_ATTR_CONTEXT struct, a LARGE_MCB. This allows an attribute context to describe the cluster mapping of a non-resident file while allowing that mapping to change dynamically, without the context itself needing to be resized. This fixes problems which sometimes arose from resizing files. -Remove hacky code from NtfsWriteFile() for dealing with "stale" contexts. This fixes that issue. -Update SetDataAttributeLength(), PrepareAttributeContext(), ReleaseAttributeContext(), FreeClusters(), and AddRun() for the new member. -Update ReadAttribute() and WriteAttribute() to work with the changed structure. A very-soon-to-come commit will overhaul these functions so they'll operate directly on the LARGE_MCB, instead of converting to and from a packed list of data runs. (Sparse files are broken until then.) -Rename "RunBufferOffset" to "RunBufferSize" in several places where appropriate. -Fix, improve, and add some comments. 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] Fri May 12 22:16:20 2017 @@ -261,39 +261,23 @@ ULONG RunLength) { 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 + ULONGLONG NextVBN = 0; + PUCHAR RunBuffer; - ULONG RunBufferOffset = 0; + ULONG RunBufferSize; if (!AttrContext->Record.IsNonResident) return STATUS_INVALID_PARAMETER; - RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); - if (!RunBuffer) - { - DPRINT1("ERROR: Couldn't allocate memory for data runs!\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // 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; - } + if (AttrContext->Record.NonResident.AllocatedSize != 0) + NextVBN = AttrContext->Record.NonResident.HighestVCN + 1; // Add newly-assigned clusters to mcb _SEH2_TRY{ - if (!FsRtlAddLargeMcbEntry(&DataRunsMCB, + if (!FsRtlAddLargeMcbEntry(&AttrContext->DataRunsMCB, NextVBN, NextAssignedCluster, RunLength)) @@ -301,70 +285,65 @@ ExRaiseStatus(STATUS_UNSUCCESSFUL); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - FsRtlUninitializeLargeMcb(&DataRunsMCB); - ExFreePoolWithTag(RunBuffer, TAG_NTFS); _SEH2_YIELD(_SEH2_GetExceptionCode()); } _SEH2_END; + RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (!RunBuffer) + { + DPRINT1("ERROR: Couldn't allocate memory for data runs!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } // Convert the map control block back to encoded data runs - ConvertLargeMCBToDataRuns(&DataRunsMCB, RunBuffer, Vcb->NtfsInfo.BytesPerCluster, &RunBufferOffset); + ConvertLargeMCBToDataRuns(&AttrContext->DataRunsMCB, RunBuffer, Vcb->NtfsInfo.BytesPerCluster, &RunBufferSize); // 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) + if (DataRunMaxLength < RunBufferSize) { 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) + if (NextAttribute->Type != AttributeEnd || DataRunMaxLength < RunBufferSize - 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 = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + RunBufferSize; 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? + // End the file record + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + NextAttributeOffset); + SetFileRecordEnd(FileRecord, NextAttribute, FILE_RECORD_END); + } // Update HighestVCN DestinationAttribute->NonResident.HighestVCN = - AttrContext->Record.NonResident.HighestVCN = max(NextVBN - 1 + RunLength, + 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); + RunBufferSize); // 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); @@ -567,7 +546,7 @@ DataRunLengthSize = GetPackedByteCount(Count, TRUE); DPRINT("%d bytes needed.\n", DataRunLengthSize); - // ensure the next data run + end marker would be > Max buffer size + // ensure the next data run + end marker would be <= Max buffer size if (RunBufferOffset + 2 + DataRunLengthSize + DataRunOffsetSize > MaxBufferSize) { Status = STATUS_BUFFER_TOO_SMALL; @@ -698,17 +677,12 @@ NTSTATUS Status = STATUS_SUCCESS; ULONG ClustersLeftToFree = ClustersToFree; - // convert data runs to mcb - PUCHAR DataRun = (PUCHAR)&AttrContext->Record + AttrContext->Record.NonResident.MappingPairsOffset; PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); - LARGE_MCB DataRunsMCB; ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + NextAttributeOffset); - ULONGLONG NextVBN = AttrContext->Record.NonResident.LowestVCN; - - // Allocate some memory for the RunBuffer + PUCHAR RunBuffer; - ULONG RunBufferOffset = 0; + ULONG RunBufferSize = 0; PFILE_RECORD_HEADER BitmapRecord; PNTFS_ATTR_CONTEXT DataContext; @@ -722,30 +696,13 @@ return STATUS_INVALID_PARAMETER; } - RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); - if (!RunBuffer) - { - DPRINT1("ERROR: Couldn't allocate memory for data runs!\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // 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; - } - + // Read the $Bitmap file BitmapRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); if (BitmapRecord == NULL) { DPRINT1("Error: Unable to allocate memory for bitmap file record!\n"); - FsRtlUninitializeLargeMcb(&DataRunsMCB); - ExFreePoolWithTag(RunBuffer, TAG_NTFS); return STATUS_NO_MEMORY; } @@ -753,9 +710,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Error: Unable to read file record for bitmap!\n"); - FsRtlUninitializeLargeMcb(&DataRunsMCB); ExFreePoolWithTag(BitmapRecord, TAG_NTFS); - ExFreePoolWithTag(RunBuffer, TAG_NTFS); return 0; } @@ -763,9 +718,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Error: Unable to find data attribute for bitmap file!\n"); - FsRtlUninitializeLargeMcb(&DataRunsMCB); ExFreePoolWithTag(BitmapRecord, TAG_NTFS); - ExFreePoolWithTag(RunBuffer, TAG_NTFS); return 0; } @@ -777,9 +730,7 @@ { DPRINT1("Error: Unable to allocate memory for bitmap file data!\n"); ReleaseAttributeContext(DataContext); - FsRtlUninitializeLargeMcb(&DataRunsMCB); ExFreePoolWithTag(BitmapRecord, TAG_NTFS); - ExFreePoolWithTag(RunBuffer, TAG_NTFS); return 0; } @@ -792,7 +743,7 @@ { LONGLONG LargeVbn, LargeLbn; - if (!FsRtlLookupLastLargeMcbEntry(&DataRunsMCB, &LargeVbn, &LargeLbn)) + if (!FsRtlLookupLastLargeMcbEntry(&AttrContext->DataRunsMCB, &LargeVbn, &LargeLbn)) { Status = STATUS_INVALID_PARAMETER; DPRINT1("DRIVER ERROR: FreeClusters called to free %lu clusters, which is %lu more clusters than are assigned to attribute!", @@ -806,7 +757,9 @@ // deallocate this cluster RtlClearBits(&Bitmap, LargeLbn, 1); } - FsRtlTruncateLargeMcb(&DataRunsMCB, AttrContext->Record.NonResident.HighestVCN); + FsRtlTruncateLargeMcb(&AttrContext->DataRunsMCB, AttrContext->Record.NonResident.HighestVCN); + + // decrement HighestVCN, but don't let it go below 0 AttrContext->Record.NonResident.HighestVCN = min(AttrContext->Record.NonResident.HighestVCN, AttrContext->Record.NonResident.HighestVCN - 1); ClustersLeftToFree--; } @@ -816,19 +769,27 @@ if (!NT_SUCCESS(Status)) { ReleaseAttributeContext(DataContext); - FsRtlUninitializeLargeMcb(&DataRunsMCB); ExFreePoolWithTag(BitmapData, TAG_NTFS); ExFreePoolWithTag(BitmapRecord, TAG_NTFS); - ExFreePoolWithTag(RunBuffer, TAG_NTFS); return Status; } ReleaseAttributeContext(DataContext); ExFreePoolWithTag(BitmapData, TAG_NTFS); ExFreePoolWithTag(BitmapRecord, TAG_NTFS); + + // Save updated data runs to file record + + // Allocate some memory for a new RunBuffer + RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (!RunBuffer) + { + DPRINT1("ERROR: Couldn't allocate memory for data runs!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } // Convert the map control block back to encoded data runs - ConvertLargeMCBToDataRuns(&DataRunsMCB, RunBuffer, Vcb->NtfsInfo.BytesPerCluster, &RunBufferOffset); + ConvertLargeMCBToDataRuns(&AttrContext->DataRunsMCB, RunBuffer, Vcb->NtfsInfo.BytesPerCluster, &RunBufferSize); // Update HighestVCN DestinationAttribute->NonResident.HighestVCN = AttrContext->Record.NonResident.HighestVCN; @@ -836,27 +797,23 @@ // Write data runs to destination attribute RtlCopyMemory((PVOID)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), RunBuffer, - RunBufferOffset); - + RunBufferSize); + + // Is DestinationAttribute the last attribute in the file record? if (NextAttribute->Type == AttributeEnd) { // update attribute length - AttrContext->Record.Length = ALIGN_UP_BY(AttrContext->Record.NonResident.MappingPairsOffset + RunBufferOffset, 8); + AttrContext->Record.Length = ALIGN_UP_BY(AttrContext->Record.NonResident.MappingPairsOffset + RunBufferSize, 8); DestinationAttribute->Length = AttrContext->Record.Length; // write end markers NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)DestinationAttribute + DestinationAttribute->Length); - NextAttribute->Type = AttributeEnd; - NextAttribute->Length = FILE_RECORD_END; - - // update file record length - FileRecord->BytesInUse = AttrOffset + DestinationAttribute->Length + (sizeof(ULONG) * 2); + SetFileRecordEnd(FileRecord, NextAttribute, FILE_RECORD_END); } // Update the file record Status = UpdateFileRecord(Vcb, AttrContext->FileMFTIndex, FileRecord); - FsRtlUninitializeLargeMcb(&DataRunsMCB); ExFreePoolWithTag(RunBuffer, TAG_NTFS); NtfsDumpDataRuns((PUCHAR)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), 0); 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] Fri May 12 22:16:20 2017 @@ -50,8 +50,10 @@ { LONGLONG DataRunOffset; ULONGLONG DataRunLength; - - Context->CacheRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset; + ULONGLONG NextVBN = 0; + PUCHAR DataRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset; + + Context->CacheRun = DataRun; Context->CacheRunOffset = 0; Context->CacheRun = DecodeRun(Context->CacheRun, &DataRunOffset, &DataRunLength); Context->CacheRunLength = DataRunLength; @@ -68,6 +70,14 @@ Context->CacheRunLastLCN = 0; } Context->CacheRunCurrentOffset = 0; + + // Convert the data runs to a map control block + if (!NT_SUCCESS(ConvertDataRunsToLargeMCB(DataRun, &Context->DataRunsMCB, &NextVBN))) + { + DPRINT1("Unable to convert data runs to MCB!\n"); + ExFreePoolWithTag(Context, TAG_NTFS); + return NULL; + } } return Context; @@ -77,6 +87,11 @@ VOID ReleaseAttributeContext(PNTFS_ATTR_CONTEXT Context) { + if (Context->Record.IsNonResident) + { + FsRtlUninitializeLargeMcb(&Context->DataRunsMCB); + } + ExFreePoolWithTag(Context, TAG_NTFS); } @@ -246,10 +261,30 @@ ULONG NextAssignedCluster; ULONG AssignedClusters; - NTSTATUS Status = GetLastClusterInDataRun(Fcb->Vcb, &AttrContext->Record, (PULONGLONG)&LastClusterInDataRun.QuadPart); - - DPRINT1("GetLastClusterInDataRun returned: %I64u\n", LastClusterInDataRun.QuadPart); - DPRINT1("Highest VCN of record: %I64u\n", AttrContext->Record.NonResident.HighestVCN); + if (ExistingClusters == 0) + { + LastClusterInDataRun.QuadPart = 0; + } + else + { + if (!FsRtlLookupLargeMcbEntry(&AttrContext->DataRunsMCB, + (LONGLONG)AttrContext->Record.NonResident.HighestVCN, + (PLONGLONG)&LastClusterInDataRun.QuadPart, + NULL, + NULL, + NULL, + NULL)) + { + DPRINT1("Error looking up final large MCB entry!\n"); + + // Most likely, HighestVCN went above the largest mapping + DPRINT1("Highest VCN of record: %I64u\n", AttrContext->Record.NonResident.HighestVCN); + return STATUS_INVALID_PARAMETER; + } + } + + DPRINT("LastClusterInDataRun: %I64u\n", LastClusterInDataRun.QuadPart); + DPRINT("Highest VCN of record: %I64u\n", AttrContext->Record.NonResident.HighestVCN); while (ClustersNeeded > 0) { @@ -405,6 +440,9 @@ ULONG ReadLength; ULONG AlreadyRead; NTSTATUS Status; + + //TEMPTEMP + PUCHAR TempBuffer; if (!Context->Record.IsNonResident) { @@ -438,9 +476,20 @@ } else { + //TEMPTEMP + ULONG UsedBufferSize; + TempBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + LastLCN = 0; - DataRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset; CurrentOffset = 0; + + // This will be rewritten in the next iteration to just use the DataRuns MCB directly + ConvertLargeMCBToDataRuns(&Context->DataRunsMCB, + TempBuffer, + Vcb->NtfsInfo.BytesPerFileRecord, + &UsedBufferSize); + + DataRun = TempBuffer; while (1) { @@ -557,6 +606,10 @@ } /* while */ } /* if Disk */ + + // TEMPTEMP + if (Context->Record.IsNonResident) + ExFreePoolWithTag(TempBuffer, TAG_NTFS); Context->CacheRun = DataRun; Context->CacheRunOffset = Offset + AlreadyRead; @@ -622,6 +675,10 @@ NTSTATUS Status; PUCHAR SourceBuffer = Buffer; LONGLONG StartingOffset; + + //TEMPTEMP + PUCHAR TempBuffer; + DPRINT("WriteAttribute(%p, %p, %I64u, %p, %lu, %p)\n", Vcb, Context, Offset, Buffer, Length, RealLengthWritten); @@ -707,9 +764,19 @@ } else*/ { + ULONG UsedBufferSize; LastLCN = 0; - DataRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset; - CurrentOffset = 0; + CurrentOffset = 0; + + // This will be rewritten in the next iteration to just use the DataRuns MCB directly + TempBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + + ConvertLargeMCBToDataRuns(&Context->DataRunsMCB, + TempBuffer, + Vcb->NtfsInfo.BytesPerFileRecord, + &UsedBufferSize); + + DataRun = TempBuffer; while (1) { @@ -863,6 +930,10 @@ DataRunStartLCN = -1; } } // end while (Length > 0) [more data to write] + + // TEMPTEMP + if(Context->Record.IsNonResident) + ExFreePoolWithTag(TempBuffer, TAG_NTFS); Context->CacheRun = DataRun; Context->CacheRunOffset = Offset + *RealLengthWritten; 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] Fri May 12 22:16:20 2017 @@ -437,6 +437,7 @@ ULONGLONG CacheRunLength; LONGLONG CacheRunLastLCN; ULONGLONG CacheRunCurrentOffset; + LARGE_MCB DataRunsMCB; ULONGLONG FileMFTIndex; NTFS_ATTR_RECORD Record; } NTFS_ATTR_CONTEXT, *PNTFS_ATTR_CONTEXT; 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] Fri May 12 22:16:20 2017 @@ -432,22 +432,6 @@ 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.

7 years, 7 months

[gadamopoulos] 74522: [UXTHEME] -Fix the tab background pattern hack when the background pattern is smaller than the window that we are trying to paint. CORE-13147, CORE-13192. There is still a bug...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri May 12 12:44:49 2017 New Revision: 74522 URL: http://svn.reactos.org/svn/reactos?rev=74522&view=rev Log: [UXTHEME] -Fix the tab background pattern hack when the background pattern is smaller than the window that we are trying to paint. CORE-13147, CORE-13192. There is still a bug where the pattern doesn't change after a theme change. Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Fri May 12 12:44:49 2017 @@ -312,14 +312,13 @@ { /* Unfortunately SetBrushOrgEx doesn't work at all */ RECT rcWindow, rcParent; - POINT pt; + UINT y; HDC hdcPattern, hdcHackPattern; HBITMAP hbmpOld1, hbmpold2, hbmpHack; GetWindowRect(hwnd, &rcWindow); GetWindowRect(GetParent(hwnd), &rcParent); - pt.x = rcWindow.left - rcParent.left; - pt.y = rcWindow.top - rcParent.top; + y = (rcWindow.top - rcParent.top) % bmpRect.bottom; hdcPattern = CreateCompatibleDC(hdc); hbmpOld1 = (HBITMAP)SelectObject(hdcPattern, hbmp); @@ -328,8 +327,8 @@ hbmpHack = CreateCompatibleBitmap(hdc, bmpRect.right, bmpRect.bottom); hbmpold2 = (HBITMAP)SelectObject(hdcHackPattern, hbmpHack); - BitBlt(hdcHackPattern, 0, 0, bmpRect.right, bmpRect.bottom - pt.y, hdcPattern, 0, pt.y, SRCCOPY); - BitBlt(hdcHackPattern, 0, bmpRect.bottom - pt.y, bmpRect.right, pt.y, hdcPattern, 0, 0, SRCCOPY); + BitBlt(hdcHackPattern, 0, 0, bmpRect.right, bmpRect.bottom - y, hdcPattern, 0, y, SRCCOPY); + BitBlt(hdcHackPattern, 0, bmpRect.bottom - y, bmpRect.right, y, hdcPattern, 0, 0, SRCCOPY); hbmpold2 = (HBITMAP)SelectObject(hdcHackPattern, hbmpold2); hbmpOld1 = (HBITMAP)SelectObject(hdcPattern, hbmpOld1);

7 years, 7 months

[mjansen] 74521: [SHELL32] Add stub for SHEnumerateUnreadMailAccountsW, needed by Thunderbird. Found by Joachim Henze. CORE-13229

by mjansen＠svn.reactos.org

Author: mjansen Date: Thu May 11 20:20:47 2017 New Revision: 74521 URL: http://svn.reactos.org/svn/reactos?rev=74521&view=rev Log: [SHELL32] Add stub for SHEnumerateUnreadMailAccountsW, needed by Thunderbird. Found by Joachim Henze. CORE-13229 Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/stubs.cpp Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Thu May 11 20:20:47 2017 @@ -283,7 +283,7 @@ 284 stdcall SHEmptyRecycleBinA(long str long) 285 stdcall SHEmptyRecycleBinW(long wstr long) 286 stub SHEnableServiceObject -287 stub SHEnumerateUnreadMailAccountsW +287 stdcall SHEnumerateUnreadMailAccountsW(ptr long ptr long) 288 stdcall SHExtractIconsW(wstr long long long ptr ptr long long) user32.PrivateExtractIconsW 289 stdcall SHFileOperation(ptr) SHFileOperationA 290 stdcall SHFileOperationA(ptr) Modified: trunk/reactos/dll/win32/shell32/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] Thu May 11 20:20:47 2017 @@ -107,6 +107,21 @@ { FIXME("SHSetUnreadMailCountW() stub\n"); return E_FAIL; +} + +/* + * Unimplemented + */ +EXTERN_C HRESULT +WINAPI +SHEnumerateUnreadMailAccountsW(HKEY user, + DWORD idx, + LPWSTR mailaddress, + INT mailaddresslen) +{ + FIXME("SHEnumerateUnreadMailAccountsW(%p %d %p %d) stub\n", + user, idx, mailaddress, mailaddresslen); + return E_NOTIMPL; } /*

7 years, 7 months

[tthompson] 74520: [CMAKE] - configure.cmd - Merge latest changes from trunk (support for Visual Studio 15). Add even more foolproofing: -Ensure the source path doesn't contain any spaces. -Issue a...

by tthompson＠svn.reactos.org

Author: tthompson Date: Thu May 11 01:06:40 2017 New Revision: 74520 URL: http://svn.reactos.org/svn/reactos?rev=74520&view=rev Log: [CMAKE] - configure.cmd - Merge latest changes from trunk (support for Visual Studio 15). Add even more foolproofing: -Ensure the source path doesn't contain any spaces. -Issue a warning if passed an invalid switch. -Don't announce completion if there were errors. -Make end message specific for VSSolution. -Replace redundant exit commands with quit label, as suggested by HBelusca. Modified: branches/GSoC_2016/NTFS/configure.cmd Modified: branches/GSoC_2016/NTFS/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/configure.cmd?re… ============================================================================== --- branches/GSoC_2016/NTFS/configure.cmd [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/configure.cmd [iso-8859-1] Thu May 11 01:06:40 2017 @@ -15,8 +15,7 @@ echo Syntax: path\to\source\configure.cmd [script-options] [Cmake-options] echo Available script-options: Codeblocks, Eclipse, Makefiles, clang, VSSolution, RTC echo Cmake-options: -DVARIABLE:TYPE=VALUE - endlocal - exit /b + goto quit ) REM Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR% @@ -33,6 +32,16 @@ REM Get the source root directory set REACTOS_SOURCE_DIR=%~dp0 + +REM Ensure there's no spaces in the source path +echo %REACTOS_SOURCE_DIR%| find " " > NUL +if %ERRORLEVEL% == 0 ( + echo. && echo Your source path contains at least one space. + echo This will cause problems with building. + echo Please rename your folders so there are no spaces in the source path, + echo or move your source to a different folder. + goto quit +) REM Set default generator set CMAKE_GENERATOR="Ninja" @@ -58,10 +67,10 @@ cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11 cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14 + cl 2>&1 | find "19.10." > NUL && set VS_VERSION=15 if not defined VS_VERSION ( echo Error: Visual Studio version too old or version detection failed. - endlocal - exit /b + goto quit ) set BUILD_ENVIRONMENT=VS set VS_SOLUTION=0 @@ -69,15 +78,13 @@ echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH! ) else ( echo Error: Unable to detect build environment. Configure script failure. - endlocal - exit /b + goto quit ) REM Checkpoint if not defined ARCH ( echo Unknown build architecture - endlocal - exit /b + goto quit ) set NEW_STYLE_BUILD=1 @@ -98,11 +105,12 @@ ) else if /I "%1" == "VSSolution" ( echo. && echo Error: Creation of VS Solution files is not supported in a MinGW environment. echo Please run this command in a [Developer] Command Prompt for Visual Studio. - endlocal - exit /b + goto quit ) else if /I "%1" == "RTC" ( echo. && echo Warning: RTC switch is ignored outside of a Visual Studio environment. && echo. - ) else ( + ) else if /I "%1" NEQ "" ( + echo. && echo Warning: Unrecognized switch "%1" && echo. + ) else ( goto continue ) ) else ( @@ -153,11 +161,22 @@ ) else ( set CMAKE_GENERATOR="Visual Studio 14" ) + ) else if "!VS_VERSION!" == "15" ( + if "!ARCH!" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 15 Win64" + ) else if "!ARCH!" == "arm" ( + set CMAKE_GENERATOR="Visual Studio 15 ARM" + set CMAKE_GENERATOR_HOST="Visual Studio 15" + ) else ( + set CMAKE_GENERATOR="Visual Studio 15" + ) ) ) else if /I "%1" == "RTC" ( echo Runtime checks enabled set VS_RUNTIME_CHECKS=1 - ) else ( + ) else if /I "%1" NEQ "" ( + echo. && echo Warning: Unrecognized switch "%1" && echo. + ) else ( goto continue ) ) @@ -195,15 +214,13 @@ echo. && echo Error: This directory has already been configured for ninja. echo An output folder configured for ninja can't be reconfigured for VSSolution. echo Use an empty folder or delete the contents of this folder, then try again. - endlocal - exit /b + goto quit ) ) else if exist REACTOS.sln ( echo. && echo Error: This directory has already been configured for Visual Studio. echo An output folder configured for VSSolution can't be reconfigured for ninja. echo Use an empty folder or delete the contents of this folder, then try again. && echo. - endlocal - exit /b + goto quit ) if "%NEW_STYLE_BUILD%"=="0" ( @@ -261,15 +278,28 @@ cd.. ) +if %ERRORLEVEL% NEQ 0 ( + goto quit +) + if "%CD_SAME_AS_SOURCE%" == "1" ( - echo Configure script complete^^! Execute appropriate build commands ^(ex: ninja, make, nmake, etc...^) from %REACTOS_OUTPUT_PATH%. + set ENDV= from %REACTOS_OUTPUT_PATH% +) + +if "%VS_SOLUTION%" == "1" ( + set ENDV= You can now open REACTOS.sln%ENDV%. ) else ( - echo Configure script complete^^! Execute appropriate build commands ^(ex: ninja, make, nmake, etc...^). -) + set ENDV= Execute appropriate build commands ^(ex: ninja, make, nmake, etc...^)%ENDV% + ) +) + +echo. && echo Configure script complete^^!%ENDV% + +goto quit + +:cmake_notfound +echo Unable to find cmake, if it is installed, check your PATH variable. + +:quit endlocal exit /b - -:cmake_notfound -echo Unable to find cmake, if it is installed, check your PATH variable. -endlocal -exit /b

7 years, 7 months

[ion] 74519: Fully working x86 paging support! [BOOTLIB]: Fix a critical bug in BlpArchSwitchContext which was not switching to Firmware mode once paging was enabled. [BOOTLIB]: Fix a critical bug ...

by ion＠svn.reactos.org

Author: ion Date: Wed May 10 14:38:34 2017 New Revision: 74519 URL: http://svn.reactos.org/svn/reactos?rev=74519&view=rev Log: Fully working x86 paging support! [BOOTLIB]: Fix a critical bug in BlpArchSwitchContext which was not switching to Firmware mode once paging was enabled. [BOOTLIB]: Fix a critical bug in OslMain which was incorrectly setting BL_LIBRARY_INITIALIZATION_COMPLETED instead of BL_LIBRARY_FLAG_REINITIALIZE_ALL and causing all sorts of failure paths. [BOOTLIB]: MmDefInitializeTranslation now turns on paging. [BOOTLIB]: Implement TrpGenerateMappingTracker and BlpArchEnableTranslation [BOOTLIB]: BlMmMapPhysicalAddressEx now works with paging enabled, and correctly finds mapped memory to use from the virtual MDLs. [BOOTLIB]: MmPapAllocateRegionFromMdl now handles virtual allocations from MmMdlMappedUnallocated. [BOOTLIB]: MmPapAllocatePagesInRange now handles BlMemoryKernelRange (KSEG0) allocations. [BOOTLIB]: MmMdFindSatisfyingRegion now handles virtual descriptors as well, and handles alignment better. Modified: trunk/reactos/boot/environ/app/rosload/rosload.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/arch/i386/arch.c trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/i386/mmx86.c trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/app/rosload/rosload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/rosload/r… ============================================================================== --- trunk/reactos/boot/environ/app/rosload/rosload.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/rosload/rosload.c [iso-8859-1] Wed May 10 14:38:34 2017 @@ -39,10 +39,11 @@ /* Setup the boot library parameters for this application */ BlSetupDefaultParameters(&LibraryParameters); LibraryParameters.TranslationType = BlVirtual; - LibraryParameters.LibraryFlags = BL_LIBRARY_FLAG_INITIALIZATION_COMPLETED; + LibraryParameters.LibraryFlags = BL_LIBRARY_FLAG_ZERO_HEAP_ALLOCATIONS_ON_FREE | + BL_LIBRARY_FLAG_REINITIALIZE_ALL; LibraryParameters.MinimumAllocationCount = 1024; LibraryParameters.MinimumHeapSize = 2 * 1024 * 1024; - LibraryParameters.HeapAllocationAttributes = 0x20000; + LibraryParameters.HeapAllocationAttributes = BlMemoryKernelRange; LibraryParameters.FontBaseDirectory = L"\\Reactos\\Boot\\Fonts"; LibraryParameters.DescriptorCount = 512; Status = BlInitializeLibrary(BootParameters, &LibraryParameters); Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Wed May 10 14:38:34 2017 @@ -2005,6 +2005,11 @@ VOID BlpArchSwitchContext ( _In_ BL_ARCH_MODE NewMode + ); + +VOID +BlpArchEnableTranslation ( + VOID ); VOID Modified: trunk/reactos/boot/environ/lib/arch/i386/arch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/arch/i386… ============================================================================== --- trunk/reactos/boot/environ/lib/arch/i386/arch.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/arch/i386/arch.c [iso-8859-1] Wed May 10 14:38:34 2017 @@ -171,7 +171,10 @@ /* In real mode, use EFI, otherwise, use the application mode */ Context = &FirmwareExecutionContext; - if (NewMode != BlProtectedMode) Context = &ApplicationExecutionContext; + if (NewMode != BlRealMode) + { + Context = &ApplicationExecutionContext; + } /* Are we in a different mode? */ if (CurrentExecutionContext->Mode != NewMode) @@ -179,6 +182,40 @@ /* Switch to the new one */ ArchSwitchContext(Context, CurrentExecutionContext); CurrentExecutionContext = Context; + } +} + +VOID +BlpArchEnableTranslation ( + VOID + ) +{ + PBL_ARCH_CONTEXT Context; + + /* Does the current execution context already have paging enabled? */ + Context = CurrentExecutionContext; + if (!(Context->ContextFlags & BL_CONTEXT_PAGING_ON)) + { + /* No -- does it have interrupts enabled? */ + if (Context->ContextFlags & BL_CONTEXT_INTERRUPTS_ON) + { + /* Disable them */ + _disable(); + Context->ContextFlags &= ~BL_CONTEXT_INTERRUPTS_ON; + } + + /* Are we enabling PAE? */ + if (Context->TranslationType == BlPae) + { + /* Make sure CR4 reflects this */ + __writecr4(__readcr4() | CR4_PAE); + } + + /* Enable paging in the CPU */ + __writecr0(__readcr0() | CR0_PG); + + /* Reflect that paging is enabled */ + Context->ContextFlags |= BL_CONTEXT_PAGING_ON; } } Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Wed May 10 14:38:34 2017 @@ -1022,8 +1022,10 @@ _In_ ULONG Alignment ) { - ULONGLONG BaseMin, BaseMax; + ULONGLONG BaseMin, BaseMax, AlignedMin; ULONGLONG VirtualPage, BasePage; + ULONGLONG BaseDelta, AlignedBase; + ULONGLONG VirtualMin, VirtualMax; /* Extract the minimum and maximum range */ BaseMin = BaseRange->Minimum; @@ -1050,11 +1052,15 @@ /* Align the base as required */ if (Alignment != 1) { - BaseMin = ALIGN_UP_BY(BaseMin, Alignment); + AlignedMin = ALIGN_UP_BY(BaseMin, Alignment); + } + else + { + AlignedMin = BaseMin; } /* Check for range overflow */ - if (((BaseMin + Pages - 1) < BaseMin) || ((BaseMin + Pages - 1) > BaseMax)) + if (((AlignedMin + Pages - 1) < AlignedMin) || ((AlignedMin + Pages - 1) > BaseMax)) { return FALSE; } @@ -1067,13 +1073,22 @@ if (Alignment != 1) { /* Align it as needed */ - BasePage = ALIGN_DOWN_BY(BasePage, Alignment); - } + AlignedBase = ALIGN_DOWN_BY(BasePage, Alignment); + } + else + { + AlignedBase = BasePage; + } + + /* Calculate the delta between max address and our aligned base */ + BaseDelta = BasePage - AlignedBase; + BasePage -= BaseDelta; } else { /* Otherwise, get the lowest page possible */ - BasePage = BaseMin; + BasePage = AlignedMin; + BaseDelta = 0; } /* If a virtual address range was passed in, this must be a virtual descriptor */ @@ -1086,8 +1101,49 @@ /* Any mapped page already? */ if (Descriptor->VirtualPage) { - EfiPrintf(L"Virtual memory not yet supported\r\n"); - return FALSE; + /* Get virtual min/max */ + VirtualMin = VirtualRange->Minimum; + VirtualMax = VirtualRange->Maximum; + + /* Don't go below where the descriptor maps */ + if (VirtualMin <= Descriptor->VirtualPage) + { + VirtualMin = Descriptor->VirtualPage; + } + + /* Don't go above where the descriptor maps */ + if (VirtualMax >= (Descriptor->VirtualPage + Descriptor->PageCount - 1)) + { + VirtualMax = Descriptor->VirtualPage + Descriptor->PageCount - 1; + } + + /* Don't let the base overflow */ + if (VirtualMin > VirtualMax) + { + return 0; + } + + /* Adjust the base by the alignment delta */ + VirtualMin += AlignedMin - BaseMin; + + /* Check that the bounds don't overflow or underflow */ + if (((VirtualMin + Pages - 1) < VirtualMin) || + ((VirtualMin + Pages - 1) > VirtualMax)) + { + return 0; + } + + /* Finally, pick the correct address based on direction */ + if (TopDown) + { + /* Highest possible base address, aligned */ + VirtualPage = VirtualMax - Pages + 1 - BaseDelta; + } + else + { + /* Lowest possible base address, aligned */ + VirtualPage = VirtualMin; + } } else { Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/i386/m… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] Wed May 10 14:38:34 2017 @@ -1042,8 +1042,10 @@ goto Quickie; } - EfiPrintf(L"Ready to turn on motherfucking paging, brah!\r\n"); - Status = STATUS_NOT_IMPLEMENTED; + /* Turn on paging with the new CR3 */ + __writecr3((ULONG_PTR)MmPdpt); + BlpArchEnableTranslation(); + EfiPrintf(L"Paging... ON\r\n"); Quickie: /* Free reference page if we allocated it */ Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] Wed May 10 14:38:34 2017 @@ -19,6 +19,66 @@ ULONG MmDescriptorCallTreeCount; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +TrpGenerateMappingTracker ( + _In_ PVOID VirtualAddress, + _In_ ULONG Flags, + _In_ LARGE_INTEGER PhysicalAddress, + _In_ ULONGLONG Size + ) +{ + PBL_MEMORY_DESCRIPTOR Descriptor, NextDescriptor; + PLIST_ENTRY ListHead, NextEntry; + + /* Increment descriptor call count */ + MmDescriptorCallTreeCount++; + + /* Initialize a descriptor for this allocation */ + Descriptor = MmMdInitByteGranularDescriptor(Flags, + 0, + PhysicalAddress.QuadPart, + (ULONG_PTR)VirtualAddress, + Size); + + /* Loop the current tracker list */ + ListHead = MmMdlMappingTrackers.First; + NextEntry = ListHead->Flink; + if (IsListEmpty(ListHead)) + { + /* If it's empty, just add the descriptor at the end */ + InsertTailList(ListHead, &Descriptor->ListEntry); + goto Quickie; + } + + /* Otherwise, go to the last descriptor */ + NextDescriptor = CONTAINING_RECORD(NextEntry, + BL_MEMORY_DESCRIPTOR, + ListEntry); + while (NextDescriptor->VirtualPage < Descriptor->VirtualPage) + { + /* Keep going... */ + NextEntry = NextEntry->Flink; + NextDescriptor = CONTAINING_RECORD(NextEntry, + BL_MEMORY_DESCRIPTOR, + ListEntry); + + /* If we hit the end of the list, just add it at the end */ + if (NextEntry == ListHead) + { + goto Quickie; + } + + /* Otherwise, add it right after this descriptor */ + InsertTailList(&NextDescriptor->ListEntry, &Descriptor->ListEntry); + } + +Quickie: + /* Release any global descriptors allocated */ + MmMdFreeGlobalDescriptors(); + --MmDescriptorCallTreeCount; + return STATUS_SUCCESS; +} NTSTATUS MmTrInitialize ( @@ -142,6 +202,11 @@ PVOID MappedBase; ULONGLONG MapSize; UCHAR CacheAttributes; + ULONGLONG BasePage, EndPage, MappedPage, FoundBasePage; + ULONGLONG PageOffset, FoundPageCount; + PBL_MEMORY_DESCRIPTOR Descriptor, NewDescriptor; + PBL_MEMORY_DESCRIPTOR_LIST List; + ULONG AddPages; /* Increase call depth */ ++MmDescriptorCallTreeCount; @@ -206,21 +271,174 @@ } /* Compute the final address where the mapping was made */ - MappedBase = (PVOID)((ULONG_PTR)MappingAddress + - PhysicalAddress.LowPart - - MappedAddress.LowPart); + MappedBase = (PVOID)(ULONG_PTR)((ULONG_PTR)MappingAddress + + PhysicalAddress.QuadPart - + MappedAddress.QuadPart); + MappedAddress.QuadPart = (ULONG_PTR)MappedBase; /* Check if we're in physical or virtual mode */ - if (MmTranslationType != BlNone) - { - /* We don't support virtual memory yet @TODO */ - EfiPrintf(L"not yet implemented in BlMmMapPhysicalAddressEx\r\n"); - EfiStall(1000000); - Status = STATUS_NOT_IMPLEMENTED; - goto Quickie; - } - - /* Return the mapped virtual address */ + if (MmTranslationType == BlNone) + { + /* We are in physical mode -- just return this address directly */ + Status = STATUS_SUCCESS; + *VirtualAddress = MappedBase; + goto Quickie; + } + + /* Remove the mapping address from the list of free virtual memory */ + Status = MmMdRemoveRegionFromMdlEx(&MmMdlFreeVirtual, + BL_MM_REMOVE_VIRTUAL_REGION_FLAG, + (ULONG_PTR)MappingAddress >> PAGE_SHIFT, + MapSize >> PAGE_SHIFT, + NULL); + if (NT_SUCCESS(Status)) + { + /* And then add an entry for the fact we mapped it */ + Status = TrpGenerateMappingTracker(MappedBase, + CacheAttributes, + PhysicalAddress, + MapSize); + } + + /* Abandon if we didn't update the memory map successfully */ + if (!NT_SUCCESS(Status)) + { + /* Unmap the virtual address so it can be used later */ + MmUnmapVirtualAddress(MappingAddress, &MapSize); + goto Quickie; + } + + /* Check if no real mapping into RAM was made */ + if (PhysicalAddress.QuadPart == -1) + { + /* Then we're done here */ + Status = STATUS_SUCCESS; + *VirtualAddress = MappedBase; + goto Quickie; + } + + + /* Loop over the entire allocation */ + BasePage = MappedAddress.QuadPart >> PAGE_SHIFT; + EndPage = (MappedAddress.QuadPart + MapSize) >> PAGE_SHIFT; + MappedPage = (ULONG_PTR)MappingAddress >> PAGE_SHIFT; + do + { + /* Start with the unmapped allocated list */ + List = &MmMdlUnmappedAllocated; + Descriptor = MmMdFindDescriptor(BL_MM_INCLUDE_UNMAPPED_ALLOCATED, + BL_MM_REMOVE_PHYSICAL_REGION_FLAG, + BasePage); + if (!Descriptor) + { + /* Try persistent next */ + List = &MmMdlPersistentMemory; + Descriptor = MmMdFindDescriptor(BL_MM_INCLUDE_PERSISTENT_MEMORY, + BL_MM_REMOVE_PHYSICAL_REGION_FLAG, + BasePage); + } + if (!Descriptor) + { + /* Try unmapped, unallocated, next */ + List = &MmMdlUnmappedUnallocated; + Descriptor = MmMdFindDescriptor(BL_MM_INCLUDE_UNMAPPED_UNALLOCATED, + BL_MM_REMOVE_PHYSICAL_REGION_FLAG, + BasePage); + } + if (!Descriptor) + { + /* Try reserved next */ + List = &MmMdlReservedAllocated; + Descriptor = MmMdFindDescriptor(BL_MM_INCLUDE_RESERVED_ALLOCATED, + BL_MM_REMOVE_PHYSICAL_REGION_FLAG, + BasePage); + } + + /* Check if we have a descriptor */ + if (Descriptor) + { + /* Remove it from its list */ + MmMdRemoveDescriptorFromList(List, Descriptor); + + /* Check if it starts before our allocation */ + FoundBasePage = Descriptor->BasePage; + if (FoundBasePage < BasePage) + { + /* Create a new descriptor to cover the gap before our allocation */ + PageOffset = BasePage - FoundBasePage; + NewDescriptor = MmMdInitByteGranularDescriptor(Descriptor->Flags, + Descriptor->Type, + FoundBasePage, + 0, + PageOffset); + + /* Insert it */ + MmMdAddDescriptorToList(List, NewDescriptor, 0); + + /* Adjust ours to ignore that piece */ + Descriptor->PageCount -= PageOffset; + Descriptor->BasePage = BasePage; + } + + /* Check if it goes beyond our allocation */ + FoundPageCount = Descriptor->PageCount; + if (EndPage < (FoundPageCount + Descriptor->BasePage)) + { + /* Create a new descriptor to cover the range after our allocation */ + PageOffset = EndPage - BasePage; + NewDescriptor = MmMdInitByteGranularDescriptor(Descriptor->Flags, + Descriptor->Type, + EndPage, + 0, + FoundPageCount - + PageOffset); + + /* Insert it */ + MmMdAddDescriptorToList(List, NewDescriptor, 0); + + /* Adjust ours to ignore that piece */ + Descriptor->PageCount = PageOffset; + } + + /* Update the descriptor to be mapepd at this virtual page */ + Descriptor->VirtualPage = MappedPage; + + /* Check if this was one of the regular lists */ + if ((List != &MmMdlReservedAllocated) && + (List != &MmMdlPersistentMemory)) + { + /* Was it allocated, or unallocated? */ + if (List != &MmMdlUnmappedAllocated) + { + /* In which case use the unallocated mapped list */ + List = &MmMdlMappedUnallocated; + } + else + { + /* Insert it into the mapped list */ + List = &MmMdlMappedAllocated; + } + } + + /* Add the descriptor that was removed, into the right list */ + MmMdAddDescriptorToList(List, Descriptor, 0); + + /* Add the pages this descriptor had */ + AddPages = Descriptor->PageCount; + } + else + { + /* Nope, so just add one page */ + AddPages = 1; + } + + /* Increment the number of pages the descriptor had */ + MappedPage += AddPages; + BasePage += AddPages; + } + while (BasePage < EndPage); + + /* We're done -- returned the address */ Status = STATUS_SUCCESS; *VirtualAddress = MappedBase; @@ -250,7 +468,7 @@ else { /* We don't support virtual memory yet @TODO */ - EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); + EfiPrintf(L"unmap not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); Status = STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Wed May 10 14:38:34 2017 @@ -187,12 +187,34 @@ /* Remove the descriptor from the original list it was on */ MmMdRemoveDescriptorFromList(CurrentList, FoundDescriptor); + /* Get the end pages */ + LocalEndPage = LocalDescriptor.PageCount + LocalDescriptor.BasePage; + FoundEndPage = FoundDescriptor->PageCount + FoundDescriptor->BasePage; + /* Are we allocating from the virtual memory list? */ if (CurrentList == &MmMdlMappedUnallocated) { - EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); - EfiStall(1000000); - return STATUS_NOT_IMPLEMENTED; + /* Check if the region matches perfectly */ + if ((LocalDescriptor.BasePage == FoundDescriptor->BasePage) && + (LocalEndPage == FoundEndPage)) + { + /* Check if the original descriptor had the flag set */ + if ((FoundDescriptor->Flags & 0x40000000) && (Descriptor)) + { + /* Make our local one have it too, even if not needed */ + LocalDescriptor.Flags |= 0x40000000; + } + } + else + { + /* Write the 'incomplete mapping' flag */ + FoundDescriptor->Flags |= 0x40000000; + if (Descriptor) + { + /* Including on the local one if there's one passed in */ + LocalDescriptor.Flags |= 0x40000000; + } + } } /* Does the memory we received not exactly fall onto the beginning of its descriptor? */ @@ -212,8 +234,6 @@ } /* Does the memory we received not exactly fall onto the end of its descriptor? */ - LocalEndPage = LocalDescriptor.PageCount + LocalDescriptor.BasePage; - FoundEndPage = FoundDescriptor->PageCount + FoundDescriptor->BasePage; LocalVirtualEndPage = LocalDescriptor.VirtualPage ? LocalDescriptor.VirtualPage + LocalDescriptor.PageCount : 0; if (LocalEndPage != FoundEndPage) @@ -303,7 +323,7 @@ /* Are we failing due to some attributes? */ if (Request->Flags & BlMemoryValidAllocationAttributeMask) { - EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); + EfiPrintf(L"alloc fail not yet implemented %lx in %S\r\n", Status, __FUNCTION__); EfiStall(1000000); return STATUS_NOT_IMPLEMENTED; } @@ -532,7 +552,6 @@ AllocationFlags | CacheAttributes, NewDescriptor.PageCount << PAGE_SHIFT, PhysicalAddress); - EfiPrintf(L"MAP status: %lx\r\n", Status); if (Status == STATUS_SUCCESS) { /* Add the cache attributes now that the mapping worked */ @@ -627,7 +646,7 @@ if (Range) { /* We don't support virtual memory yet @TODO */ - EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); + EfiPrintf(L"virt range not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); Status = STATUS_NOT_IMPLEMENTED; goto Exit; @@ -643,26 +662,26 @@ if (Attributes & BlMemoryFixed) { /* We don't support virtual memory yet @TODO */ - EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); + EfiPrintf(L"fixed not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); Status = STATUS_NOT_IMPLEMENTED; goto Exit; } else { - /* Check if non-fixed was specifically requested */ + /* Check if kernel range was specifically requested */ if (Attributes & BlMemoryKernelRange) { - /* We don't support virtual memory yet @TODO */ - EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); - EfiStall(1000000); - Status = STATUS_NOT_IMPLEMENTED; - goto Exit; + /* Use the kernel range */ + Request.VirtualRange.Minimum = MmArchKsegAddressRange.Minimum >> PAGE_SHIFT; + Request.VirtualRange.Maximum = MmArchKsegAddressRange.Maximum >> PAGE_SHIFT; } - - /* Set the virtual address range */ - Request.VirtualRange.Minimum = 0; - Request.VirtualRange.Maximum = 0xFFFFFFFF >> PAGE_SHIFT; + else + { + /* Set the virtual address range */ + Request.VirtualRange.Minimum = 0; + Request.VirtualRange.Maximum = 0xFFFFFFFF >> PAGE_SHIFT; + } } /* Check what type of allocation was requested */ @@ -702,7 +721,7 @@ if (!NT_SUCCESS(Status)) { /* Fail since we're out of memory */ - EfiPrintf(L"OUT OF MEMORY: %lx\r\n", Status); + EfiPrintf(L"EXTEND OUT OF MEMORY: %lx\r\n", Status); Status = STATUS_NO_MEMORY; goto Exit; } @@ -716,7 +735,7 @@ if (!NT_SUCCESS(Status)) { /* Fail since we're out of memory */ - EfiPrintf(L"OUT OF MEMORY: %lx\r\n", Status); + EfiPrintf(L"PALLOC OUT OF MEMORY: %lx\r\n", Status); goto Exit; } } @@ -1082,7 +1101,7 @@ /* Handle virtual memory scenario */ if (MmTranslationType != BlNone) { - EfiPrintf(L"Unimplemented free virtual path\r\n"); + EfiPrintf(L"Unimplemented free virtual path: %p %lx\r\n", Address, WhichList); return STATUS_SUCCESS; }

7 years, 7 months

[cfinck] 74518: [PRINTING] SetDefaultPrinterW needs to fail with ERROR_INVALID_PRINTER_NAME if the input parameter is invalid. Also add a test for that.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed May 10 13:03:08 2017 New Revision: 74518 URL: http://svn.reactos.org/svn/reactos?rev=74518&view=rev Log: [PRINTING] SetDefaultPrinterW needs to fail with ERROR_INVALID_PRINTER_NAME if the input parameter is invalid. Also add a test for that. Modified: trunk/reactos/win32ss/printing/base/winspool/printers.c trunk/rostests/apitests/winspool/GetDefaultPrinter.c Modified: trunk/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… ============================================================================== --- trunk/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Wed May 10 13:03:08 2017 @@ -817,7 +817,7 @@ dwErrorCode = (DWORD)RegQueryValueExW(hDevicesKey, pszPrinter, NULL, NULL, NULL, &cbPrinterValueData); if (dwErrorCode == ERROR_FILE_NOT_FOUND) { - // The caller gave us an invalid printer name, return with ERROR_FILE_NOT_FOUND. + dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } else if (dwErrorCode != ERROR_SUCCESS) Modified: trunk/rostests/apitests/winspool/GetDefaultPrinter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/GetDefa… ============================================================================== --- trunk/rostests/apitests/winspool/GetDefaultPrinter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/GetDefaultPrinter.c [iso-8859-1] Wed May 10 13:03:08 2017 @@ -45,5 +45,10 @@ ok(SetDefaultPrinterW(pwszDefaultPrinter), "SetDefaultPrinterW returns FALSE!\n"); ok(GetLastError() == ERROR_SUCCESS, "SetDefaultPrinterW returns error %lu!\n", GetLastError()); + // SetDefaultPrinterW with an invalid printer name needs to fail with ERROR_INVALID_PRINTER_NAME. + SetLastError(0xDEADBEEF); + ok(!SetDefaultPrinterW(L"INVALID PRINTER NAME!!!"), "SetDefaultPrinterW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PRINTER_NAME, "SetDefaultPrinterW returns error %lu!\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pwszDefaultPrinter); }

7 years, 7 months

[gadamopoulos] 74517: [SHELL32_APITEST] -Add tests for Control_RunDLLW.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed May 10 10:06:02 2017 New Revision: 74517 URL: http://svn.reactos.org/svn/reactos?rev=74517&view=rev Log: [SHELL32_APITEST] -Add tests for Control_RunDLLW. Added: trunk/rostests/apitests/shell32/Control_RunDLLW.cpp (with props) trunk/rostests/apitests/shell32/shell32_apitest.spec (with props) Modified: trunk/rostests/apitests/shell32/CMakeLists.txt trunk/rostests/apitests/shell32/testlist.c Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Wed May 10 10:06:02 2017 @@ -1,3 +1,5 @@ + +spec2def(shell32_apitest.exe shell32_apitest.spec) set_cpp(WITH_RUNTIME) @@ -5,6 +7,7 @@ add_executable(shell32_apitest AddCommas.c + Control_RunDLLW.cpp CFSFolder.cpp CMyComputer.cpp CShellDesktop.cpp @@ -13,7 +16,8 @@ ShellExecuteEx.cpp shelltest.cpp SHParseDisplayName.cpp - testlist.c) + testlist.c + ${CMAKE_CURRENT_BINARY_DIR}/shell32_apitest.def) target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB}) set_module_type(shell32_apitest win32cui) add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll) Added: trunk/rostests/apitests/shell32/Control_RunDLLW.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/Control_… ============================================================================== --- trunk/rostests/apitests/shell32/Control_RunDLLW.cpp (added) +++ trunk/rostests/apitests/shell32/Control_RunDLLW.cpp [iso-8859-1] Wed May 10 10:06:02 2017 @@ -0,0 +1,160 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for Control_RunDLLW + * PROGRAMMER: Giannis Adamopoulos + */ + +#include "shelltest.h" +#include <cpl.h> +#define NDEBUG +#include <debug.h> + +extern "C" +void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); + +int g_iParams; +int g_iClk; +WCHAR g_wstrParams[MAX_PATH]; + +extern "C" +LONG CALLBACK +CPlApplet(HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) +{ + INT i = (INT)lParam1; + + switch (uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return 2; + + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = CPL_DYNAMIC_RES ; + CPlInfo->idName = CPL_DYNAMIC_RES ; + CPlInfo->idInfo = CPL_DYNAMIC_RES ; + } + break; + case CPL_NEWINQUIRE: + { + LPNEWCPLINFOW pinfo = (LPNEWCPLINFOW)lParam2; + + memset(pinfo, 0, sizeof(NEWCPLINFOW)); + pinfo->dwSize = sizeof(NEWCPLINFOW); + pinfo->hIcon = LoadIcon(NULL, IDI_APPLICATION); + if (i == 0) + { + wcscpy(pinfo->szName, L"name0"); + wcscpy(pinfo->szInfo, L"info0"); + wcscpy(pinfo->szHelpFile, L"help0"); + } + else + { + wcscpy(pinfo->szName, L"name1"); + wcscpy(pinfo->szInfo, L"info1"); + wcscpy(pinfo->szHelpFile, L"help1"); + } + break; + } + case CPL_DBLCLK: + g_iClk = i; + break; + case CPL_STARTWPARMSW: + g_iParams = i; + ok(lParam2 != NULL, "Got NULL lParam2!\n"); + if (lParam2) + wcscpy(g_wstrParams, (LPCWSTR)lParam2); + break; + } + + return FALSE; +} + + +#define MSG_NOT_CALLED -1 + +struct param_test +{ + int srcLine; + LPCWSTR cmd; + INT iStartParams; /* MSG_NOT_CALLED when CPL_STARTWPARMS is not sent */ + LPCWSTR params; /* second param of CPL_STARTWPARMS */ + INT iClick; /* MSG_NOT_CALLED when CPL_DBLCLK is not sent */ +}; + +struct param_test tests[] = +{ + {__LINE__, L"", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L",name0", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L",name1", MSG_NOT_CALLED, L"", 1}, + {__LINE__, L",@0", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L",@1", MSG_NOT_CALLED, L"", 1}, + {__LINE__, L",0", MSG_NOT_CALLED, L"", MSG_NOT_CALLED}, + {__LINE__, L",1", MSG_NOT_CALLED, L"", MSG_NOT_CALLED}, + {__LINE__, L",@name0", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L",@name1", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L" name0", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L" name1", MSG_NOT_CALLED, L"", 1}, + {__LINE__, L" @0", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L" @1", MSG_NOT_CALLED, L"", 1}, + {__LINE__, L" 0", MSG_NOT_CALLED, L"", MSG_NOT_CALLED}, + {__LINE__, L" 1", MSG_NOT_CALLED, L"", MSG_NOT_CALLED}, + {__LINE__, L" @name0", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L" @name1", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L"\"name0\"", MSG_NOT_CALLED, L"", MSG_NOT_CALLED}, + {__LINE__, L"\"name1\"", MSG_NOT_CALLED, L"", MSG_NOT_CALLED}, + {__LINE__, L",\"name0\"", MSG_NOT_CALLED, L"", 0}, + {__LINE__, L",\"name1\"", MSG_NOT_CALLED, L"", 1}, + {__LINE__, L"\",name0\"", MSG_NOT_CALLED, L"", MSG_NOT_CALLED}, + {__LINE__, L"\",name1\"", MSG_NOT_CALLED, L"", MSG_NOT_CALLED}, + {__LINE__, L",name0,@1", 0, L"@1", 0}, + {__LINE__, L",name1,@0", 1, L"@0", 1}, + {__LINE__, L",name0, ", 0, L" ", 0}, + {__LINE__, L",name1, ", 1, L" ", 1}, + {__LINE__, L",@0,@1", 0, L"@1", 0}, + {__LINE__, L",@1,@0", 1, L"@0", 1}, + {__LINE__, L",\"@0\",@1", 0, L"@1", 0}, + {__LINE__, L",\"@1\",@0", 1, L"@0", 1}, + {__LINE__, L",\"@0\",\"@1\"", 0, L"\"@1\"", 0}, + {__LINE__, L",\"@1\",\"@0\"", 1, L"\"@0\"", 1}, + {__LINE__, L",\"@0\",@1,2,3,4,5", 0, L"@1,2,3,4,5", 0}, + {__LINE__, L",\"@1\",@0,2,3,4,5", 1, L"@0,2,3,4,5", 1}, + {__LINE__, L",\"@0\",@1,2,\"3\",4,5", 0, L"@1,2,\"3\",4,5", 0}, + {__LINE__, L",\"@1\",@0,2,\"3\",4,5", 1, L"@0,2,\"3\",4,5", 1}, + {__LINE__, L",\"@0\", @1 , 2 , 3 , 4 , 5", 0, L" @1 , 2 , 3 , 4 , 5", 0}, + {__LINE__, L",\"@1\", @0 , 2 , 3 , 4 , 5", 1, L" @0 , 2 , 3 , 4 , 5", 1}, + {__LINE__, L",\"@0\", @1 , 2 , /3 , 4 , 5", 0, L" @1 , 2 , /3 , 4 , 5", 0}, + {__LINE__, L",\"@1\", @0 , 2 , /3 , 4 , 5", 1, L" @0 , 2 , /3 , 4 , 5", 1}, + {__LINE__, L",\"@0\", @1 , 2 , /3 , 4 , 5", 0, L" @1 , 2 , /3 , 4 , 5", 0}, + {__LINE__, L",\"@1\", @0 , 2 , /3 , 4 , 5", 1, L" @0 , 2 , /3 , 4 , 5", 1}, + +}; + +START_TEST(Control_RunDLLW) +{ + WCHAR finename[MAX_PATH]; + WCHAR buffer[MAX_PATH]; + + GetModuleFileNameW(NULL, finename, MAX_PATH); + + for (UINT i = 0; i < _countof(tests); i++) + { + swprintf(buffer, L"%s%s", finename, tests[i].cmd); + + g_iClk = MSG_NOT_CALLED; + g_iParams = MSG_NOT_CALLED; + g_wstrParams[0] = 0; + Control_RunDLLW( GetDesktopWindow (), 0, buffer, 0); + ok (tests[i].iClick == g_iClk, "%d, CPL_DBLCLK: expected %d got %d\n", tests[i].srcLine, tests[i].iClick, g_iClk); + ok (tests[i].iStartParams == g_iParams, "%d, CPL_STARTWPARMSW: expected %d got %d\n", tests[i].srcLine, tests[i].iStartParams, g_iParams); + ok (wcscmp(tests[i].params, g_wstrParams) == 0, "%d, CPL_STARTWPARMSW: expected %S got %S\n", tests[i].srcLine, tests[i].params, g_wstrParams); + } +} Propchange: trunk/rostests/apitests/shell32/Control_RunDLLW.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/shell32/shell32_apitest.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shell32_… ============================================================================== --- trunk/rostests/apitests/shell32/shell32_apitest.spec (added) +++ trunk/rostests/apitests/shell32/shell32_apitest.spec [iso-8859-1] Wed May 10 10:06:02 2017 @@ -0,0 +1 @@ +@ stdcall CPlApplet(ptr long ptr ptr) Propchange: trunk/rostests/apitests/shell32/shell32_apitest.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/testlist… ============================================================================== --- trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] Wed May 10 10:06:02 2017 @@ -4,6 +4,7 @@ #include <wine/test.h> extern void func_AddCommas(void); +extern void func_Control_RunDLLW(void); extern void func_CFSFolder(void); extern void func_CMyComputer(void); extern void func_CShellDesktop(void); @@ -15,6 +16,7 @@ const struct test winetest_testlist[] = { { "AddCommas", func_AddCommas }, + { "Control_RunDLLW", func_Control_RunDLLW }, { "CFSFolder", func_CFSFolder }, { "CMyComputer", func_CMyComputer }, { "CShellDesktop", func_CShellDesktop },

7 years, 7 months

[hbelusca] 74516: [USETUP]: Fix the primary/extended partitions creation checks introduced in r63392 : indeed this is if there are *already* 4 (primary) partitions in the table that we cannot creat...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 9 22:09:06 2017 New Revision: 74516 URL: http://svn.reactos.org/svn/reactos?rev=74516&view=rev Log: [USETUP]: Fix the primary/extended partitions creation checks introduced in r63392 : indeed this is if there are *already* 4 (primary) partitions in the table that we cannot create new primary/extended partitions. Otherwise with the old (broken) checks, we allowed creating more than 4 partitions, and then we overflowed over memory and corrupted the partition list structures. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Tue May 9 22:09:06 2017 @@ -3550,8 +3550,8 @@ if (PartEntry->IsPartitioned == TRUE) return ERROR_NEW_PARTITION; - /* Fail if there are more than 4 partitions in the list */ - if (GetPrimaryPartitionCount(DiskEntry) > 4) + /* Fail if there are already 4 primary partitions in the list */ + if (GetPrimaryPartitionCount(DiskEntry) >= 4) return ERROR_PARTITION_TABLE_FULL; return ERROR_SUCCESS; @@ -3572,8 +3572,8 @@ if (PartEntry->IsPartitioned == TRUE) return ERROR_NEW_PARTITION; - /* Fail if there are more than 4 partitions in the list */ - if (GetPrimaryPartitionCount(DiskEntry) > 4) + /* Fail if there are already 4 primary partitions in the list */ + if (GetPrimaryPartitionCount(DiskEntry) >= 4) return ERROR_PARTITION_TABLE_FULL; /* Fail if there is another extended partition in the list */

7 years, 7 months

[hbelusca] 74515: [FREELDR]: Report the correct number of BIOS (hard) disk drives detected, that is, without any possible extra boot drive that went enumerated afterwards. This fixes the list of di...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 9 19:33:46 2017 New Revision: 74515 URL: http://svn.reactos.org/svn/reactos?rev=74515&view=rev Log: [FREELDR]: Report the correct number of BIOS (hard) disk drives detected, that is, without any possible extra boot drive that went enumerated afterwards. This fixes the list of disks enumerated in HKEY_LOCAL_MACHINE\HARDWARE\DESCRIPTION\System\MultifunctionAdapter\0\DiskController\0\DiskPeripheral\ and we now behave in this regards similarly to Windows 2003 & co. I thank Lesan Ilie for reporting & testing, and Serge Gautherie and Peter Hater for reviewing. This fixes a bug introduced in commit r59079. CORE-13131 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Tue May 9 19:33:46 2017 @@ -35,6 +35,8 @@ #define LATCH (CLOCK_TICK_RATE / HZ) static unsigned int delay_count = 1; + +/* Used for BIOS disks pre-enumeration performed when detecting the boot devices in InitializeBootDevices() */ extern UCHAR PcBiosDiskCount; /* This function is slightly different in its PC and XBOX versions */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Tue May 9 19:33:46 2017 @@ -44,6 +44,7 @@ static CHAR Hex[] = "0123456789abcdef"; +/* Data cache for BIOS disks pre-enumeration */ UCHAR PcBiosDiskCount = 0; static CHAR PcDiskIdentifier[32][20]; @@ -323,8 +324,8 @@ } if (!Changed) { - TRACE("BIOS reports success for disk %d but data didn't change\n", - (int)DiskCount); + TRACE("BIOS reports success for disk %d (0x%02X) but data didn't change\n", + (int)DiskCount, DriveNumber); break; } @@ -340,6 +341,8 @@ memset(DiskReadBuffer, 0xcd, DiskReadBufferSize); } DiskReportError(TRUE); + + PcBiosDiskCount = DiskCount; TRACE("BIOS reports %d harddisk%s\n", (int)DiskCount, (DiskCount == 1) ? "" : "s"); @@ -384,12 +387,9 @@ reactos_disk_count++; FsRegisterDevice(BootPath, &DiskVtbl); - DiskCount++; - } - - PcBiosDiskCount = DiskCount; - TRACE("BIOS reports %d harddisk%s\n", - (int)DiskCount, (DiskCount == 1) ? "": "s"); + DiskCount++; // This is not accounted for in the number of pre-enumerated BIOS drives! + TRACE("Additional boot drive detected: 0x%02X\n", (int)FrldrBootDrive); + } return (DiskCount != 0); }

7 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017