Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[gadamopoulos] 74971: [EXPLORER] -Fix the return value in HandleShellHookMsg. Suggestion by Christoph.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Jun 9 08:29:04 2017 New Revision: 74971 URL: http://svn.reactos.org/svn/reactos?rev=74971&view=rev Log: [EXPLORER] -Fix the return value in HandleShellHookMsg. Suggestion by Christoph. Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Fri Jun 9 08:29:04 2017 @@ -1387,34 +1387,29 @@ switch ((INT) wParam) { case HSHELL_APPCOMMAND: - HandleAppCommand(wParam, lParam); - Ret = TRUE; + Ret = HandleAppCommand(wParam, lParam); break; case HSHELL_WINDOWCREATED: - Ret = AddTask((HWND) lParam); + AddTask((HWND) lParam); break; case HSHELL_WINDOWDESTROYED: /* The window still exists! Delay destroying it a bit */ DeleteTask((HWND) lParam); - Ret = TRUE; break; case HSHELL_RUDEAPPACTIVATED: case HSHELL_WINDOWACTIVATED: ActivateTask((HWND) lParam); - Ret = TRUE; break; case HSHELL_FLASH: FlashTask((HWND) lParam); - Ret = TRUE; break; case HSHELL_REDRAW: RedrawTask((HWND) lParam); - Ret = TRUE; break; case HSHELL_TASKMAN:

7 years, 3 months

[tthompson] 74970: [NTFS] - Add the most basic support for file creation. Expand diagnostic output, especially in NtfsDumpIndexRootAttribute(). Replace an ExFreePool() with ExFreePoolWithTag(). Add...

by tthompson＠svn.reactos.org

Author: tthompson Date: Fri Jun 9 03:14:30 2017 New Revision: 74970 URL: http://svn.reactos.org/svn/reactos?rev=74970&view=rev Log: [NTFS] - Add the most basic support for file creation. Expand diagnostic output, especially in NtfsDumpIndexRootAttribute(). Replace an ExFreePool() with ExFreePoolWithTag(). AddFileName() - Add a parameter to receive the Mft index of the parent directory. Fix so the name of the file will be stored in the attribute, not the name of the directory. NtfsCreateFile() - Open a file that was successfully created, instead of assuming failure. NtfsCreateFileRecord() - Add the filename attribute of the created file to the parent directory's index. +NtfsAddFilenameToDirectory() - Adds a $FILE_NAME attribute to a given directory index. Presently, a file can be created in an empty directory only. AddNewMftEntry() - Add a parameter to receive the mft index where the new entry was stored. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h 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 Jun 9 03:14:30 2017 @@ -112,6 +112,9 @@ * Pointer to the FILE_OBJECT which represents the new name. * This parameter is used to determine the filename and parent directory. * +* @param ParentMftIndex +* Pointer to a ULONGLONG which will receive the index of the parent directory. +* * @return * STATUS_SUCCESS on success. STATUS_NOT_IMPLEMENTED if target address isn't at the end * of the given file record. @@ -128,16 +131,18 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, PNTFS_ATTR_RECORD AttributeAddress, PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject) + PFILE_OBJECT FileObject, + PULONGLONG ParentMftIndex) { ULONG ResidentHeaderLength = FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.Reserved) + sizeof(UCHAR); PFILENAME_ATTRIBUTE FileNameAttribute; LARGE_INTEGER SystemTime; ULONG FileRecordEnd = AttributeAddress->Length; ULONGLONG CurrentMFTIndex = NTFS_FILE_ROOT; - UNICODE_STRING Current, Remaining; + UNICODE_STRING Current, Remaining, FilenameNoPath; NTSTATUS Status = STATUS_SUCCESS; ULONG FirstEntry = 0; + WCHAR Buffer[MAX_PATH]; if (AttributeAddress->Type != AttributeEnd) { @@ -162,20 +167,29 @@ // we need to extract the filename from the path DPRINT1("Pathname: %wZ\n", &FileObject->FileName); + RtlZeroMemory(&FilenameNoPath, sizeof(UNICODE_STRING)); + FilenameNoPath.Buffer = Buffer; + FilenameNoPath.MaximumLength = MAX_PATH; + FsRtlDissectName(FileObject->FileName, &Current, &Remaining); while (Current.Length != 0) { DPRINT1("Current: %wZ\n", &Current); + + if(Remaining.Length != 0) + RtlCopyUnicodeString(&FilenameNoPath, &Remaining); Status = NtfsFindMftRecord(DeviceExt, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) - { - break; - } - - if (Remaining.Length == 0) - break; + break; + + if (Remaining.Length == 0 ) + { + if(Current.Length != 0) + RtlCopyUnicodeString(&FilenameNoPath, &Current); + break; + } FsRtlDissectName(Current, &Current, &Remaining); } @@ -184,6 +198,9 @@ // set reference to parent directory FileNameAttribute->DirectoryFileReferenceNumber = CurrentMFTIndex; + *ParentMftIndex = CurrentMFTIndex; + + DPRINT1("SequenceNumber: 0x%02x\n", FileRecord->SequenceNumber); // The highest 2 bytes should be the sequence number, unless the parent happens to be root if (CurrentMFTIndex == NTFS_FILE_ROOT) @@ -191,19 +208,19 @@ else FileNameAttribute->DirectoryFileReferenceNumber |= (ULONGLONG)FileRecord->SequenceNumber << 48; - DPRINT1("FileNameAttribute->DirectoryFileReferenceNumber: 0x%I64x\n", FileNameAttribute->DirectoryFileReferenceNumber); - - FileNameAttribute->NameLength = Current.Length / 2; + DPRINT1("FileNameAttribute->DirectoryFileReferenceNumber: 0x%016I64x\n", FileNameAttribute->DirectoryFileReferenceNumber); + + FileNameAttribute->NameLength = FilenameNoPath.Length / 2; // TODO: Get proper nametype, add DOS links as needed FileNameAttribute->NameType = NTFS_FILE_NAME_WIN32_AND_DOS; - RtlCopyMemory(FileNameAttribute->Name, Current.Buffer, Current.Length); + RtlCopyMemory(FileNameAttribute->Name, FilenameNoPath.Buffer, FilenameNoPath.Length); FileRecord->LinkCount++; AttributeAddress->Length = ResidentHeaderLength + - FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + Current.Length; + FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + FilenameNoPath.Length; AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); - AttributeAddress->Resident.ValueLength = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + Current.Length; + AttributeAddress->Resident.ValueLength = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + FilenameNoPath.Length; AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; AttributeAddress->Resident.Flags = 1; // indexed @@ -1054,6 +1071,7 @@ DbgPrint(" (%x) '%.*S' ", FileNameAttr->NameType, FileNameAttr->NameLength, FileNameAttr->Name); DbgPrint(" '%x' \n", FileNameAttr->FileAttributes); DbgPrint(" AllocatedSize: %I64u\nDataSize: %I64u\n", FileNameAttr->AllocatedSize, FileNameAttr->DataSize); + DbgPrint(" File reference: 0x%016I64x\n", FileNameAttr->DirectoryFileReferenceNumber); } @@ -1110,23 +1128,73 @@ NtfsDumpIndexRootAttribute(PNTFS_ATTR_RECORD Attribute) { PINDEX_ROOT_ATTRIBUTE IndexRootAttr; + ULONG currentOffset; + ULONG currentNode; IndexRootAttr = (PINDEX_ROOT_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); if (IndexRootAttr->AttributeType == AttributeFileName) ASSERT(IndexRootAttr->CollationRule == COLLATION_FILE_NAME); - DbgPrint(" $INDEX_ROOT (%uB, %u) ", IndexRootAttr->SizeOfEntry, IndexRootAttr->ClustersPerIndexRecord); + DbgPrint(" $INDEX_ROOT (%u bytes per index record, %u clusters) ", IndexRootAttr->SizeOfEntry, IndexRootAttr->ClustersPerIndexRecord); if (IndexRootAttr->Header.Flags == INDEX_ROOT_SMALL) { - DbgPrint(" (small) "); + DbgPrint(" (small)\n"); } else { ASSERT(IndexRootAttr->Header.Flags == INDEX_ROOT_LARGE); - DbgPrint(" (large) "); - } + DbgPrint(" (large)\n"); + } + + DbgPrint(" Offset to first index: 0x%lx\n Total size of index entries: 0x%lx\n Allocated size of node: 0x%lx\n", + IndexRootAttr->Header.FirstEntryOffset, + IndexRootAttr->Header.TotalSizeOfEntries, + IndexRootAttr->Header.AllocatedSize); + currentOffset = IndexRootAttr->Header.FirstEntryOffset; + currentNode = 0; + // print details of every node in the index + while (currentOffset < IndexRootAttr->Header.TotalSizeOfEntries) + { + PINDEX_ENTRY_ATTRIBUTE currentIndexExtry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexRootAttr + 0x10 + currentOffset); + DbgPrint(" Index Node Entry %u", currentNode++); + if (currentIndexExtry->Flags & NTFS_INDEX_ENTRY_NODE) + DbgPrint(" (Branch)"); + else + DbgPrint(" (Leaf)"); + if((currentIndexExtry->Flags & NTFS_INDEX_ENTRY_END)) + { + DbgPrint(" (Dummy Key)"); + } + DbgPrint("\n File Reference: 0x%016I64x\n", currentIndexExtry->Data.Directory.IndexedFile); + DbgPrint(" Index Entry Length: 0x%x\n", currentIndexExtry->Length); + DbgPrint(" Index Key Length: 0x%x\n", currentIndexExtry->KeyLength); + + // if this isn't the final (dummy) node, print info about the key (Filename attribute) + if (!(currentIndexExtry->Flags & NTFS_INDEX_ENTRY_END)) + { + UNICODE_STRING Name; + DbgPrint(" Parent File Reference: 0x%016I64x\n", currentIndexExtry->FileName.DirectoryFileReferenceNumber); + DbgPrint(" $FILENAME indexed: "); + Name.Length = currentIndexExtry->FileName.NameLength * sizeof(WCHAR); + Name.MaximumLength = Name.Length; + Name.Buffer = currentIndexExtry->FileName.Name; + DbgPrint("'%wZ'\n", &Name); + } + + // if this node has a sub-node beneath it + if (currentIndexExtry->Flags & NTFS_INDEX_ENTRY_NODE) + { + // Print the VCN of the sub-node + PULONGLONG SubNodeVCN = (PULONGLONG)((ULONG_PTR)currentIndexExtry + currentIndexExtry->Length - 8); + DbgPrint(" VCN of sub-node: 0x%llx\n", *SubNodeVCN); + } + + currentOffset += currentIndexExtry->Length; + ASSERT(currentIndexExtry->Length); + } + } Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Fri Jun 9 03:14:30 2017 @@ -523,7 +523,7 @@ DoneOverwriting: if (fileRecord) - ExFreePool(fileRecord); + ExFreePoolWithTag(fileRecord, TAG_NTFS); if (dataContext) ReleaseAttributeContext(dataContext); @@ -562,13 +562,14 @@ // Create the file record on disk Status = NtfsCreateFileRecord(DeviceExt, FileObject); - - // Update the parent directory index - // Still TODO - - // Call NtfsOpenFile() - - return STATUS_CANNOT_MAKE; + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't create file record!\n"); + return Status; + } + + // Now we should be able to open the file + return NtfsCreateFile(DeviceObject, Irp); } } @@ -624,7 +625,8 @@ * @name NtfsCreateFileRecord() * @implemented * -* Creates a file record and saves it to the MFT. +* Creates a file record and saves it to the MFT. Adds the filename attribute of the +* created file to the parent directory's index. * * @param DeviceExt * Points to the target disk's DEVICE_EXTENSION @@ -643,6 +645,9 @@ NTSTATUS Status = STATUS_SUCCESS; PFILE_RECORD_HEADER FileRecord; PNTFS_ATTR_RECORD NextAttribute; + PFILENAME_ATTRIBUTE FilenameAttribute; + ULONGLONG ParentMftIndex; + ULONGLONG FileMftIndex; // allocate memory for file record FileRecord = ExAllocatePoolWithTag(NonPagedPool, @@ -686,7 +691,10 @@ NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)NextAttribute + (ULONG_PTR)NextAttribute->Length); // Add the $FILE_NAME attribute - AddFileName(FileRecord, NextAttribute, DeviceExt, FileObject); + AddFileName(FileRecord, NextAttribute, DeviceExt, FileObject, &ParentMftIndex); + + // save a pointer to the filename attribute + FilenameAttribute = (PFILENAME_ATTRIBUTE)((ULONG_PTR)NextAttribute + NextAttribute->Resident.ValueOffset); // advance NextAttribute pointer to the next attribute NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)NextAttribute + (ULONG_PTR)NextAttribute->Length); @@ -698,7 +706,23 @@ NtfsDumpFileRecord(DeviceExt, FileRecord); // Now that we've built the file record in memory, we need to store it in the MFT. - Status = AddNewMftEntry(FileRecord, DeviceExt); + Status = AddNewMftEntry(FileRecord, DeviceExt, &FileMftIndex); + if (NT_SUCCESS(Status)) + { + // The highest 2 bytes should be the sequence number, unless the parent happens to be root + if (FileMftIndex == NTFS_FILE_ROOT) + FileMftIndex = FileMftIndex + ((ULONGLONG)NTFS_FILE_ROOT << 48); + else + FileMftIndex = FileMftIndex + ((ULONGLONG)FileRecord->SequenceNumber << 48); + + DPRINT1("New File Reference: 0x%016I64x\n", FileMftIndex); + + // Add the filename attribute to the filename-index of the parent directory + Status = NtfsAddFilenameToDirectory(DeviceExt, + ParentMftIndex, + FileMftIndex, + FilenameAttribute); + } ExFreePoolWithTag(FileRecord, TAG_NTFS); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Fri Jun 9 03:14:30 2017 @@ -34,6 +34,256 @@ /* FUNCTIONS ****************************************************************/ +/** +* @name NtfsAddFilenameToDirectory +* @implemented +* +* Adds a $FILE_NAME attribute to a given directory index. +* +* @param DeviceExt +* Points to the target disk's DEVICE_EXTENSION. +* +* @param DirectoryMftIndex +* Mft index of the parent directory which will receive the file. +* +* @param FileReferenceNumber +* File reference of the file to be added to the directory. This is a combination of the +* Mft index and sequence number. +* +* @param FilenameAttribute +* Pointer to the FILENAME_ATTRIBUTE of the file being added to the directory. +* +* @return +* STATUS_SUCCESS on success. +* STATUS_INSUFFICIENT_RESOURCES if an allocation fails. +* STATUS_NOT_IMPLEMENTED if target address isn't at the end of the given file record. +* +* @remarks +* WIP - Can only support an empty directory. +* One FILENAME_ATTRIBUTE is added to the directory's index for each link to that file. So, each +* file which contains one FILENAME_ATTRIBUTE for a long name and another for the 8.3 name, will +* get both attributes added to its parent directory. +*/ +NTSTATUS +NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, + ULONGLONG DirectoryMftIndex, + ULONGLONG FileReferenceNumber, + PFILENAME_ATTRIBUTE FilenameAttribute) +{ + NTSTATUS Status = STATUS_SUCCESS; + PFILE_RECORD_HEADER ParentFileRecord; + PNTFS_ATTR_CONTEXT DirectoryContext; + PINDEX_ROOT_ATTRIBUTE I30IndexRoot; + ULONG IndexRootOffset; + ULONGLONG I30IndexRootLength; + PINDEX_ENTRY_ATTRIBUTE IndexNodeEntry; + ULONG LengthWritten; + PNTFS_ATTR_RECORD DestinationAttribute; + PINDEX_ROOT_ATTRIBUTE NewIndexRoot; + ULONG AttributeLength; + PNTFS_ATTR_RECORD NextAttribute; + + // Allocate memory for the parent directory + ParentFileRecord = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (!ParentFileRecord) + { + DPRINT1("ERROR: Couldn't allocate memory for file record!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Open the parent directory + Status = ReadFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + DPRINT1("ERROR: Couldn't read parent directory with index %I64u\n", + DirectoryMftIndex); + return Status; + } + + DPRINT1("Dumping old parent file record:\n"); + NtfsDumpFileRecord(DeviceExt, ParentFileRecord); + + // Find the index root attribute for the directory + Status = FindAttribute(DeviceExt, + ParentFileRecord, + AttributeIndexRoot, + L"$I30", + 4, + &DirectoryContext, + &IndexRootOffset); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't find $I30 $INDEX_ROOT attribute for parent directory with MFT #: %I64u!\n", + DirectoryMftIndex); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + I30IndexRootLength = AttributeDataLength(&DirectoryContext->Record); + + // Allocate memory for the index root data + I30IndexRoot = (PINDEX_ROOT_ATTRIBUTE)ExAllocatePoolWithTag(NonPagedPool, I30IndexRootLength, TAG_NTFS); + if (!I30IndexRoot) + { + DPRINT1("ERROR: Couldn't allocate memory for index root attribute!\n"); + ReleaseAttributeContext(DirectoryContext); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + } + + // Read the Index Root + Status = ReadAttribute(DeviceExt, DirectoryContext, 0, (PCHAR)I30IndexRoot, I30IndexRootLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couln't read index root attribute for Mft index #%I64u\n", DirectoryMftIndex); + ReleaseAttributeContext(DirectoryContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + // Make sure it's empty (temporarily) + IndexNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)I30IndexRoot + I30IndexRoot->Header.FirstEntryOffset + 0x10); + if (IndexNodeEntry->Data.Directory.IndexedFile != 0 || IndexNodeEntry->Flags != 2) + { + DPRINT1("FIXME: File-creation is only supported in empty directories right now! Be patient! :)\n"); + ReleaseAttributeContext(DirectoryContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return STATUS_NOT_IMPLEMENTED; + } + + // Now we need to setup a new index root attribute to replace the old one + NewIndexRoot = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerIndexRecord, TAG_NTFS); + if (!NewIndexRoot) + { + DPRINT1("ERROR: Unable to allocate memory for new index root attribute!\n"); + ReleaseAttributeContext(DirectoryContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Setup the new index record + RtlZeroMemory(NewIndexRoot, DeviceExt->NtfsInfo.BytesPerIndexRecord); // shouldn't be necessary but aids in debugging + + NewIndexRoot->AttributeType = AttributeFileName; + NewIndexRoot->CollationRule = COLLATION_FILE_NAME; + NewIndexRoot->SizeOfEntry = DeviceExt->NtfsInfo.BytesPerIndexRecord; + // If Bytes per index record is less than cluster size, clusters per index record becomes sectors per index + if(NewIndexRoot->SizeOfEntry < DeviceExt->NtfsInfo.BytesPerCluster) + NewIndexRoot->ClustersPerIndexRecord = NewIndexRoot->SizeOfEntry / DeviceExt->NtfsInfo.BytesPerSector; + else + NewIndexRoot->ClustersPerIndexRecord = NewIndexRoot->SizeOfEntry / DeviceExt->NtfsInfo.BytesPerCluster; + + // Setup the Index node header + NewIndexRoot->Header.FirstEntryOffset = 0x10; + NewIndexRoot->Header.Flags = INDEX_ROOT_SMALL; + // still need to calculate sizes + + // The first index node entry will be for the filename we're adding + IndexNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)NewIndexRoot + NewIndexRoot->Header.FirstEntryOffset + 0x10); + IndexNodeEntry->Data.Directory.IndexedFile = FileReferenceNumber; + IndexNodeEntry->Flags = INDEX_ROOT_SMALL; + IndexNodeEntry->KeyLength = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + (2 * FilenameAttribute->NameLength); + IndexNodeEntry->Length = ALIGN_UP_BY(IndexNodeEntry->KeyLength, 8) + FIELD_OFFSET(INDEX_ENTRY_ATTRIBUTE, FileName); + + // Now we can calculate the Node length (temp logic) + NewIndexRoot->Header.TotalSizeOfEntries = NewIndexRoot->Header.FirstEntryOffset + IndexNodeEntry->Length + 0x10; + NewIndexRoot->Header.AllocatedSize = NewIndexRoot->Header.TotalSizeOfEntries; + + DPRINT1("New Index Node Entry Stream Length: %u\nNew Inde Node Entry Length: %u\n", + IndexNodeEntry->KeyLength, + IndexNodeEntry->Length); + + // copy over the attribute proper + RtlCopyMemory(&IndexNodeEntry->FileName, FilenameAttribute, IndexNodeEntry->KeyLength); + + // Now setup the dummy key + IndexNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexNodeEntry + IndexNodeEntry->Length); + + IndexNodeEntry->Data.Directory.IndexedFile = 0; + IndexNodeEntry->Length = 0x10; + IndexNodeEntry->KeyLength = 0; + IndexNodeEntry->Flags = NTFS_INDEX_ENTRY_END; + + // This is when we'd normally setup the length (already done above) + + // Write back the new index root attribute to the parent directory file record + + // First, we need to make sure the attribute is large enough. + // We can't set the size as we normally would, because if we extend past the file record, + // we must create an index allocation and index bitmap (TODO). Also TODO: support file records with + // $ATTRIBUTE_LIST's. + AttributeLength = NewIndexRoot->Header.AllocatedSize + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header); + DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)ParentFileRecord + IndexRootOffset); + + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)DestinationAttribute + DestinationAttribute->Length); + if (NextAttribute->Type != AttributeEnd) + { + DPRINT1("FIXME: For now, only resizing index root at the end of a file record is supported!\n"); + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ReleaseAttributeContext(DirectoryContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return STATUS_NOT_IMPLEMENTED; + } + + // Update the length of the attribute in the file record of the parent directory + InternalSetResidentAttributeLength(DirectoryContext, + ParentFileRecord, + IndexRootOffset, + AttributeLength); + + Status = UpdateFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to update file record of directory with index: %llx\n", DirectoryMftIndex); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + return Status; + } + + // Update the parent directory with the new index root + Status = WriteAttribute(DeviceExt, + DirectoryContext, + 0, + (PUCHAR)NewIndexRoot, + AttributeLength, + &LengthWritten); + if (!NT_SUCCESS(Status) ) + { + DPRINT1("ERROR: Unable to write new index root attribute to parent directory!\n"); + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ReleaseAttributeContext(DirectoryContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + // re-read the parent file record, so we can dump it + Status = ReadFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't read parent directory after messing with it!\n"); + } + else + { + DPRINT1("Dumping new parent file record:\n"); + NtfsDumpFileRecord(DeviceExt, ParentFileRecord); + } + + // Cleanup + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ReleaseAttributeContext(DirectoryContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + + return Status; +} ULONGLONG NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt, 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 Jun 9 03:14:30 2017 @@ -1361,6 +1361,9 @@ * @param DeviceExt * Pointer to the DEVICE_EXTENSION of the target drive. * +* @param DestinationIndex +* Pointer to a ULONGLONG which will receive the MFT index where the file record was stored. +* * @return * STATUS_SUCCESS on success. * STATUS_OBJECT_NAME_NOT_FOUND if we can't find the MFT's $Bitmap or if we weren't able @@ -1371,7 +1374,8 @@ */ NTSTATUS AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, - PDEVICE_EXTENSION DeviceExt) + PDEVICE_EXTENSION DeviceExt, + PULONGLONG DestinationIndex) { NTSTATUS Status = STATUS_SUCCESS; ULONGLONG MftIndex; @@ -1453,6 +1457,8 @@ ReleaseAttributeContext(BitmapContext); return Status; } + + *DestinationIndex = MftIndex; ExFreePoolWithTag(BitmapData, TAG_NTFS); ReleaseAttributeContext(BitmapContext); 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 Jun 9 03:14:30 2017 @@ -534,7 +534,8 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, PNTFS_ATTR_RECORD AttributeAddress, PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject); + PFILE_OBJECT FileObject, + PULONGLONG ParentMftIndex); NTSTATUS AddStandardInformation(PFILE_RECORD_HEADER FileRecord, @@ -675,6 +676,12 @@ /* dirctl.c */ +NTSTATUS +NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, + ULONGLONG DirectoryMftIndex, + ULONGLONG FileMftIndex, + PFILENAME_ATTRIBUTE FilenameAttribute); + ULONGLONG NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, @@ -816,7 +823,8 @@ /* mft.c */ NTSTATUS AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, - PDEVICE_EXTENSION DeviceExt); + PDEVICE_EXTENSION DeviceExt, + PULONGLONG DestinationIndex); PNTFS_ATTR_CONTEXT PrepareAttributeContext(PNTFS_ATTR_RECORD AttrRecord); @@ -841,6 +849,12 @@ ULONGLONG AttributeDataLength(PNTFS_ATTR_RECORD AttrRecord); + +VOID +InternalSetResidentAttributeLength(PNTFS_ATTR_CONTEXT AttrContext, + PFILE_RECORD_HEADER FileRecord, + ULONG AttrOffset, + ULONG DataSize); NTSTATUS SetAttributeDataLength(PFILE_OBJECT FileObject,

7 years, 3 months

[mjansen] 74969: [NTOS:MM] Do not queue debugger events after notifying process exit. CORE-13393 Patch suggested by Thomas.

by mjansen＠svn.reactos.org

Author: mjansen Date: Thu Jun 8 20:34:47 2017 New Revision: 74969 URL: http://svn.reactos.org/svn/reactos?rev=74969&view=rev Log: [NTOS:MM] Do not queue debugger events after notifying process exit. CORE-13393 Patch suggested by Thomas. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Jun 8 20:34:47 2017 @@ -2104,7 +2104,7 @@ MiRosUnmapViewOfSection( IN PEPROCESS Process, IN PVOID BaseAddress, - IN ULONG Flags + IN BOOLEAN SkipDebuggerNotify ); VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Thu Jun 8 20:34:47 2017 @@ -834,7 +834,7 @@ if ((MemoryArea) && (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3)) { /* Call Mm API */ - return MiRosUnmapViewOfSection(Process, BaseAddress, Flags); + return MiRosUnmapViewOfSection(Process, BaseAddress, Process->ProcessExiting); } /* Check if we should attach to the process */ Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=74… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Jun 8 20:34:47 2017 @@ -545,7 +545,7 @@ if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) { - Status = MiRosUnmapViewOfSection(Process, BaseAddress, 0); + Status = MiRosUnmapViewOfSection(Process, BaseAddress, Process->ProcessExiting); } else if (MemoryArea->Type == MEMORY_AREA_CACHE) { Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Jun 8 20:34:47 2017 @@ -4142,7 +4142,7 @@ NTAPI MiRosUnmapViewOfSection(IN PEPROCESS Process, IN PVOID BaseAddress, - IN ULONG Flags) + IN BOOLEAN SkipDebuggerNotify) { NTSTATUS Status; PMEMORY_AREA MemoryArea; @@ -4230,7 +4230,7 @@ MmUnlockAddressSpace(AddressSpace); /* Notify debugger */ - if (ImageBaseAddress) DbgkUnMapViewOfSection(ImageBaseAddress); + if (ImageBaseAddress && !SkipDebuggerNotify) DbgkUnMapViewOfSection(ImageBaseAddress); return(STATUS_SUCCESS); }

7 years, 3 months

[gadamopoulos] 74968: [EXPLORER] -Revert a hack from r63304 that caused CORE-13388. This hid another bug and the correct way to fix this is to return MA_NOACTIVATE to WM_MOUSEACTIVATE.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Jun 8 20:31:49 2017 New Revision: 74968 URL: http://svn.reactos.org/svn/reactos?rev=74968&view=rev Log: [EXPLORER] -Revert a hack from r63304 that caused CORE-13388. This hid another bug and the correct way to fix this is to return MA_NOACTIVATE to WM_MOUSEACTIVATE. Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Thu Jun 8 20:31:49 2017 @@ -1403,11 +1403,8 @@ case HSHELL_RUDEAPPACTIVATED: case HSHELL_WINDOWACTIVATED: - if (lParam) - { - ActivateTask((HWND) lParam); - Ret = TRUE; - } + ActivateTask((HWND) lParam); + Ret = TRUE; break; case HSHELL_FLASH: @@ -1797,6 +1794,11 @@ return FALSE; } + LRESULT OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + return MA_NOACTIVATE; + } + LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { #if DUMP_TASKS != 0 @@ -1844,6 +1846,8 @@ MESSAGE_HANDLER(WM_SETFONT, OnSetFont) MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) MESSAGE_HANDLER(m_ShellHookMsg, HandleShellHookMsg) + MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate) + MESSAGE_HANDLER(WM_KLUDGEMINRECT, OnKludgeItemRect) END_MSG_MAP() HWND _Init(IN HWND hWndParent, IN OUT ITrayWindow *tray)

7 years, 3 months

[pschweitzer] 74967: [KMTESTS:MM] When testing noncached mapping, use MmAllocateNonCachedMemory() as suggested by Thomas to avoid later potential failures

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jun 8 20:16:34 2017 New Revision: 74967 URL: http://svn.reactos.org/svn/reactos?rev=74967&view=rev Log: [KMTESTS:MM] When testing noncached mapping, use MmAllocateNonCachedMemory() as suggested by Thomas to avoid later potential failures Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c [iso-8859-1] Thu Jun 8 20:16:34 2017 @@ -18,6 +18,7 @@ static PVOID CurrentBuffer; static PMDL CurrentMdl; static PVOID CurrentUser; +static SIZE_T NonCachedLength; NTSTATUS TestEntry( @@ -86,7 +87,14 @@ _SEH2_END; ok_eq_hex(SehStatus, STATUS_SUCCESS); IoFreeMdl(CurrentMdl); - ExFreePoolWithTag(CurrentBuffer, 'MLPC'); + if (NonCachedLength) + { + MmFreeNonCachedMemory(CurrentBuffer, NonCachedLength); + } + else + { + ExFreePoolWithTag(CurrentBuffer, 'MLPC'); + } CurrentMdl = NULL; } @@ -128,8 +136,22 @@ if (!skip(Length > 0, "Null size!\n")) { - CurrentBuffer = ExAllocatePoolWithTag(NonPagedPool, Length, 'MLPC'); - ok(CurrentBuffer != NULL, "ExAllocatePool failed!\n"); + if (QueryBuffer->Cached) + { + CurrentBuffer = ExAllocatePoolWithTag(NonPagedPool, Length, 'MLPC'); + ok(CurrentBuffer != NULL, "ExAllocatePool failed!\n"); + NonCachedLength = 0; + } + else + { + CurrentBuffer = MmAllocateNonCachedMemory(Length); + ok(CurrentBuffer != NULL, "MmAllocateNonCachedMemory failed!\n"); + if (CurrentBuffer) + { + RtlZeroMemory(CurrentBuffer, Length); + NonCachedLength = Length; + } + } if (!skip(CurrentBuffer != NULL, "ExAllocatePool failed!\n")) { CurrentMdl = IoAllocateMdl(CurrentBuffer, Length, FALSE, FALSE, NULL); @@ -163,17 +185,8 @@ SehStatus = _SEH2_GetExceptionCode(); } _SEH2_END; - - if (QueryBuffer->Cached) - { - ok_eq_hex(SehStatus, STATUS_SUCCESS); - ok(CurrentUser != NULL, "MmMapLockedPagesSpecifyCache failed!\n"); - } - else - { - ok_eq_hex(SehStatus, STATUS_INVALID_ADDRESS); - ok_eq_pointer(CurrentUser, NULL); - } + ok_eq_hex(SehStatus, STATUS_SUCCESS); + ok(CurrentUser != NULL, "MmMapLockedPagesSpecifyCache failed!\n"); } else { Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c [iso-8859-1] Thu Jun 8 20:16:34 2017 @@ -15,13 +15,35 @@ Var = (Length); \ } +#define FILL_QUERY_BUFFER(QueryBuffer, BufferLength, UseCache) \ +{ \ + QueryBuffer.Length = BufferLength; \ + QueryBuffer.Buffer = NULL; \ + QueryBuffer.Cached = UseCache; \ +} + +#define FILL_READ_BUFFER(QueryBuffer, ReadBuffer) \ +{ \ + PULONG Buffer; \ + ReadBuffer.Buffer = QueryBuffer.Buffer; \ + if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) \ + { \ + ReadBuffer.Pattern = WRITE_PATTERN; \ + ReadBuffer.Length = QueryBuffer.Length; \ + Buffer = QueryBuffer.Buffer; \ + for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) \ + { \ + Buffer[i] = ReadBuffer.Pattern; \ + } \ + } \ +} + START_TEST(MmMapLockedPagesSpecifyCache) { QUERY_BUFFER QueryBuffer; READ_BUFFER ReadBuffer; DWORD Length; USHORT i; - PULONG Buffer; USHORT BufferLength; KmtLoadDriver(L"MmMapLockedPagesSpecifyCache", FALSE); @@ -29,16 +51,104 @@ // Less than a page SET_BUFFER_LENGTH(BufferLength, 2048); + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, FALSE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // 1 page + SET_BUFFER_LENGTH(BufferLength, 4096); + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, FALSE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // more than 1 page + SET_BUFFER_LENGTH(BufferLength, 4096 + 2048); + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, FALSE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // 2 pages + SET_BUFFER_LENGTH(BufferLength, 2 * 4096); + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, FALSE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // more than 2 pages + SET_BUFFER_LENGTH(BufferLength, 2 * 4096 + 2048); QueryBuffer.Length = BufferLength; QueryBuffer.Buffer = NULL; QueryBuffer.Cached = FALSE; Length = sizeof(QUERY_BUFFER); ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); ok_eq_int(QueryBuffer.Length, BufferLength); - ok_eq_pointer(QueryBuffer.Buffer, NULL); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - ReadBuffer.Buffer = QueryBuffer.Buffer; Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); QueryBuffer.Length = BufferLength; @@ -49,167 +159,8 @@ ok_eq_int(QueryBuffer.Length, BufferLength); ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - ReadBuffer.Buffer = QueryBuffer.Buffer; - if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) - { - ReadBuffer.Pattern = WRITE_PATTERN; - ReadBuffer.Length = QueryBuffer.Length; - Buffer = QueryBuffer.Buffer; - for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) - { - Buffer[i] = ReadBuffer.Pattern; - } - } - Length = 0; - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - // 1 page - SET_BUFFER_LENGTH(BufferLength, 4096); - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = FALSE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok_eq_pointer(QueryBuffer.Buffer, NULL); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - Length = 0; - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = TRUE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) - { - ReadBuffer.Pattern = WRITE_PATTERN; - ReadBuffer.Length = QueryBuffer.Length; - Buffer = QueryBuffer.Buffer; - for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) - { - Buffer[i] = ReadBuffer.Pattern; - } - } - - Length = 0; - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - // more than 1 page - SET_BUFFER_LENGTH(BufferLength, 4096 + 2048); - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = FALSE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok_eq_pointer(QueryBuffer.Buffer, NULL); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - Length = 0; - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = TRUE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) - { - ReadBuffer.Pattern = WRITE_PATTERN; - ReadBuffer.Length = QueryBuffer.Length; - Buffer = QueryBuffer.Buffer; - for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) - { - Buffer[i] = ReadBuffer.Pattern; - } - } - - Length = 0; - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - // 2 pages - SET_BUFFER_LENGTH(BufferLength, 2 * 4096); - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = FALSE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok_eq_pointer(QueryBuffer.Buffer, NULL); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - Length = 0; - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = TRUE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) - { - ReadBuffer.Pattern = WRITE_PATTERN; - ReadBuffer.Length = QueryBuffer.Length; - Buffer = QueryBuffer.Buffer; - for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) - { - Buffer[i] = ReadBuffer.Pattern; - } - } - - Length = 0; - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - // more than 2 pages - SET_BUFFER_LENGTH(BufferLength, 2 * 4096 + 2048); - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = FALSE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok_eq_pointer(QueryBuffer.Buffer, NULL); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - Length = 0; - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = TRUE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) - { - ReadBuffer.Pattern = WRITE_PATTERN; - ReadBuffer.Length = QueryBuffer.Length; - Buffer = QueryBuffer.Buffer; - for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) - { - Buffer[i] = ReadBuffer.Pattern; - } - } - - Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); KmtCloseDriver();

7 years, 3 months

[hbelusca] 74966: [GDI32_APITEST]: Fix the "missing braces around initializer" GCC error that I've introduced in r74962.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 8 19:09:01 2017 New Revision: 74966 URL: http://svn.reactos.org/svn/reactos?rev=74966&view=rev Log: [GDI32_APITEST]: Fix the "missing braces around initializer" GCC error that I've introduced in r74962. Modified: trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c Modified: trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontMem… ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c [iso-8859-1] Thu Jun 8 19:09:01 2017 @@ -38,6 +38,7 @@ { { /* .FontName = */ "PanosePitchTest", + { /* .tm.tmHeight = */ 11, /* .tm.tmAscent = */ 11, /* .tm.tmDescent = */ 0, @@ -58,9 +59,11 @@ /* .tm.tmStruckOut = */ 0, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR, /* .tm.tmCharSet = */ SHIFTJIS_CHARSET, + } }, { /* .FontName = */ "@PanosePitchTest", + { /* .tm.tmHeight = */ 11, /* .tm.tmAscent = */ 11, /* .tm.tmDescent = */ 0, @@ -81,6 +84,7 @@ /* .tm.tmStruckOut = */ 0, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR, /* .tm.tmCharSet = */ SHIFTJIS_CHARSET, + } }, }, }, @@ -91,6 +95,7 @@ { { /* .FontName = */ "No1Of3in1", + { /* .tm.tmHeight = */ 12, /* .tm.tmAscent = */ 12, /* .tm.tmDescent = */ 0, @@ -111,9 +116,11 @@ /* .tm.tmStruckOut = */ 0, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, /* .tm.tmCharSet = */ ANSI_CHARSET, + } }, { /* .FontName = */ "No2Of3in1", + { /* .tm.tmHeight = */ 12, /* .tm.tmAscent = */ 12, /* .tm.tmDescent = */ 0, @@ -134,9 +141,11 @@ /* .tm.tmStruckOut = */ 0, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, /* .tm.tmCharSet = */ ANSI_CHARSET, + } }, { /* .FontName = */ "No3Of3in1V", + { /* .tm.tmHeight = */ 12, /* .tm.tmAscent = */ 12, /* .tm.tmDescent = */ 0, @@ -157,6 +166,7 @@ /* .tm.tmStruckOut = */ 0, /* .tm.tmPitchAndFamily = */ FF_MODERN | TMPF_TRUETYPE | TMPF_VECTOR, /* .tm.tmCharSet = */ ANSI_CHARSET, + } }, }, }, @@ -167,6 +177,7 @@ { { /* .FontName = */ "ufaXaAlLOxCUGYJ7KN51UP2Q==", + { /* .tm.tmHeight = */ 26, /* .tm.tmAscent = */ 19, /* .tm.tmDescent = */ 7, @@ -187,6 +198,7 @@ /* .tm.tmStruckOut = */ 0, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, /* .tm.tmCharSet = */ ANSI_CHARSET, + } }, }, },

7 years, 3 months

[gadamopoulos] 74965: [EXPLORER] -Open the start menu on mouse down. Patch by Joachim Henze (reactosfanboy). CORE-13375

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Jun 8 18:57:53 2017 New Revision: 74965 URL: http://svn.reactos.org/svn/reactos?rev=74965&view=rev Log: [EXPLORER] -Open the start menu on mouse down. Patch by Joachim Henze (reactosfanboy). CORE-13375 Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Thu Jun 8 18:57:53 2017 @@ -62,7 +62,7 @@ const GUID IID_IShellDesktopTray = { 0x213e2df9, 0x9a14, 0x4328, { 0x99, 0xb1, 0x69, 0x61, 0xf9, 0x14, 0x3c, 0xe9 } }; class CStartButton - : public CWindow + : public CWindowImpl<CStartButton> { HIMAGELIST m_ImageList; SIZE m_Size; @@ -125,6 +125,7 @@ VOID Initialize() { + SubclassWindow(m_hWnd); SetWindowTheme(m_hWnd, L"Start", NULL); m_ImageList = ImageList_LoadImageW(hExplorerInstance, @@ -167,6 +168,20 @@ return m_hWnd; } + + LRESULT OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (uMsg == WM_KEYUP && wParam != VK_SPACE) + return 0; + + GetParent().PostMessage(TWM_OPENSTARTMENU); + return 0; + } + + BEGIN_MSG_MAP(CStartButton) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + END_MSG_MAP() + }; class CTrayWindow : @@ -2696,7 +2711,6 @@ if ((HWND) lParam == m_StartButton.m_hWnd) { - PopupStartMenu(); return FALSE; }

7 years, 3 months

[hbelusca] 74964: [SETUPLIB][USETUP]: Minor code refactoring, consisting in renaming the "ntos boot loader" stuff into "boot store", since this happens to be functionality that is a bit more genera...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 8 17:30:23 2017 New Revision: 74964 URL: http://svn.reactos.org/svn/reactos?rev=74964&view=rev Log: [SETUPLIB][USETUP]: Minor code refactoring, consisting in renaming the "ntos boot loader" stuff into "boot store", since this happens to be functionality that is a bit more general than previously thought. - Fix the usage of the BootEntry's "Version" member. - Don't surround with too many quotation marks the "friendly" boot entry name in AddBootStoreEntry(). Modified: branches/setup_improvements/base/setup/lib/bldrsup.c branches/setup_improvements/base/setup/lib/bldrsup.h branches/setup_improvements/base/setup/lib/osdetect.c branches/setup_improvements/base/setup/usetup/bootsup.c Modified: branches/setup_improvements/base/setup/lib/bldrsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/bldrsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/bldrsup.c [iso-8859-1] Thu Jun 8 17:30:23 2017 @@ -2,8 +2,8 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/bldrsup.c - * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) - * boot loaders management. + * PURPOSE: Boot Stores Management functionality, with support for + * NT 5.x family (MS Windows <= 2003, and ReactOS) bootloaders. * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -27,7 +27,7 @@ (*POPEN_BOOT_STORE)( OUT PVOID* Handle, IN HANDLE PartitionDirectoryHandle, // OPTIONAL - IN NTOS_BOOT_LOADER_TYPE Type, + IN BOOT_STORE_TYPE Type, IN BOOLEAN CreateNew); typedef NTSTATUS @@ -43,7 +43,7 @@ typedef struct _NTOS_BOOT_LOADER_FILES { - NTOS_BOOT_LOADER_TYPE Type; + BOOT_STORE_TYPE Type; PCZZWSTR LoaderExecutables; PCWSTR LoaderConfigurationFile; POPEN_BOOT_STORE OpenBootStore; @@ -57,7 +57,7 @@ */ typedef struct _BOOT_STORE_CONTEXT { - NTOS_BOOT_LOADER_TYPE Type; + BOOT_STORE_TYPE Type; // PNTOS_BOOT_LOADER_FILES ?? /* PVOID PrivateData; @@ -96,7 +96,7 @@ OpenIniBootLoaderStore( OUT PVOID* Handle, IN HANDLE PartitionDirectoryHandle, // OPTIONAL - IN NTOS_BOOT_LOADER_TYPE Type, + IN BOOT_STORE_TYPE Type, IN BOOLEAN CreateNew); static NTSTATUS @@ -135,10 +135,10 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -FindNTOSBootLoader( // By handle +FindBootStore( // By handle IN HANDLE PartitionDirectoryHandle, // OPTIONAL - IN NTOS_BOOT_LOADER_TYPE Type, - OUT PULONG Version OPTIONAL) + IN BOOT_STORE_TYPE Type, + OUT PULONG VersionNumber OPTIONAL) // OUT PHANDLE ConfigFileHande OPTIONAL ???? { PCWSTR LoaderExecutable; @@ -147,8 +147,8 @@ if (Type >= BldrTypeMax) return STATUS_INVALID_PARAMETER; - if (Version) - *Version = 0; + if (VersionNumber) + *VersionNumber = 0; /* Check whether any of the loader executables exist */ LoaderExecutable = NtosBootLoaders[Type].LoaderExecutables; @@ -173,10 +173,10 @@ } /* Check for loader version if needed */ - if (Version) - { - *Version = 0; - // TODO: Check for BLDR version ONLY if Version != NULL + if (VersionNumber) + { + *VersionNumber = 0; + // TODO: Check for BLDR version! } /* Check whether the loader configuration file exists */ @@ -340,7 +340,7 @@ OpenIniBootLoaderStore( OUT PVOID* Handle, IN HANDLE PartitionDirectoryHandle, // OPTIONAL - IN NTOS_BOOT_LOADER_TYPE Type, + IN BOOT_STORE_TYPE Type, IN BOOLEAN CreateNew) { NTSTATUS Status; @@ -733,10 +733,10 @@ NTSTATUS -OpenNTOSBootLoaderStoreByHandle( +OpenBootStoreByHandle( OUT PVOID* Handle, IN HANDLE PartitionDirectoryHandle, // OPTIONAL - IN NTOS_BOOT_LOADER_TYPE Type, + IN BOOT_STORE_TYPE Type, IN BOOLEAN CreateNew) { /* @@ -760,10 +760,10 @@ } NTSTATUS -OpenNTOSBootLoaderStore_UStr( +OpenBootStore_UStr( OUT PVOID* Handle, IN PUNICODE_STRING SystemPartitionPath, - IN NTOS_BOOT_LOADER_TYPE Type, + IN BOOT_STORE_TYPE Type, IN BOOLEAN CreateNew) { NTSTATUS Status; @@ -803,7 +803,7 @@ return Status; } - Status = OpenNTOSBootLoaderStoreByHandle(Handle, PartitionDirectoryHandle, Type, CreateNew); + Status = OpenBootStoreByHandle(Handle, PartitionDirectoryHandle, Type, CreateNew); /* Done! */ NtClose(PartitionDirectoryHandle); @@ -811,19 +811,19 @@ } NTSTATUS -OpenNTOSBootLoaderStore( +OpenBootStore( OUT PVOID* Handle, IN PCWSTR SystemPartition, - IN NTOS_BOOT_LOADER_TYPE Type, + IN BOOT_STORE_TYPE Type, IN BOOLEAN CreateNew) { UNICODE_STRING SystemPartitionPath; RtlInitUnicodeString(&SystemPartitionPath, SystemPartition); - return OpenNTOSBootLoaderStore_UStr(Handle, &SystemPartitionPath, Type, CreateNew); + return OpenBootStore_UStr(Handle, &SystemPartitionPath, Type, CreateNew); } NTSTATUS -CloseNTOSBootLoaderStore( +CloseBootStore( IN PVOID Handle) { PBOOT_STORE_CONTEXT BootStore = (PBOOT_STORE_CONTEXT)Handle; @@ -855,7 +855,7 @@ CreateNTOSEntry( IN PBOOT_STORE_INI_CONTEXT BootStore, IN ULONG_PTR BootEntryKey, - IN PNTOS_BOOT_ENTRY BootEntry) + IN PBOOT_STORE_ENTRY BootEntry) { PINICACHESECTION IniSection; PWCHAR Section = (PWCHAR)BootEntryKey; @@ -867,7 +867,6 @@ /* Create a new section */ IniSection = IniCacheAppendSection(BootStore->IniCache, Section); - // if (_wcsicmp(BootEntry->Version, L"Windows2003") == 0) if (BootEntry->OsOptionsLength >= sizeof(NTOS_OPTIONS) && RtlCompareMemory(&BootEntry->OsOptions /* Signature */, NTOS_OPTIONS_SIGNATURE, @@ -889,7 +888,6 @@ L"Options", (PWSTR)Options->OsLoadOptions); } else - // if (_wcsicmp(BootEntry->Version, L"BootSector") == 0) if (BootEntry->OsOptionsLength >= sizeof(BOOT_SECTOR_OPTIONS) && RtlCompareMemory(&BootEntry->OsOptions /* Signature */, BOOT_SECTOR_OPTIONS_SIGNATURE, @@ -916,16 +914,18 @@ } else { - DPRINT1("Unsupported BootType '%S'\n", BootEntry->Version); + // DPRINT1("Unsupported BootType %lu/'%*.s'\n", + // BootEntry->OsOptionsLength, 8, &BootEntry->OsOptions); + DPRINT1("Unsupported BootType %lu\n", BootEntry->OsOptionsLength); } return STATUS_SUCCESS; } NTSTATUS -AddNTOSBootEntry( +AddBootStoreEntry( IN PVOID Handle, - IN PNTOS_BOOT_ENTRY BootEntry, + IN PBOOT_STORE_ENTRY BootEntry, IN ULONG_PTR BootEntryKey) { PBOOT_STORE_CONTEXT BootStore = (PBOOT_STORE_CONTEXT)Handle; @@ -949,6 +949,9 @@ if (BootStore->Type == FreeLdr) { + if (BootEntry->Version != FreeLdr) + return STATUS_INVALID_PARAMETER; + return CreateNTOSEntry((PBOOT_STORE_INI_CONTEXT)BootStore, BootEntryKey, BootEntry); } @@ -960,15 +963,19 @@ ULONG BufferLength; PCWSTR InstallName, OsOptions; // ULONG InstallNameLength, OsOptionsLength; - - // if (_wcsicmp(BootEntry->Version, L"Windows2003") != 0) + BOOLEAN IsNameNotQuoted; + + if (BootEntry->Version != NtLdr) + return STATUS_INVALID_PARAMETER; + if (BootEntry->OsOptionsLength < sizeof(NTOS_OPTIONS) || RtlCompareMemory(&BootEntry->OsOptions /* Signature */, NTOS_OPTIONS_SIGNATURE, RTL_FIELD_SIZE(NTOS_OPTIONS, Signature)) != RTL_FIELD_SIZE(NTOS_OPTIONS, Signature)) { - DPRINT1("Unsupported BootType '%S'\n", BootEntry->Version); + // DPRINT1("Unsupported BootType '%S'\n", BootEntry->Version); + DPRINT1("Unsupported BootType %lu\n", BootEntry->OsOptionsLength); return STATUS_SUCCESS; // STATUS_NOT_SUPPORTED; } @@ -978,7 +985,9 @@ // if (InstallNameLength == 0) InstallName = NULL; // if (OsOptionsLength == 0) OsOptions = NULL; - BufferLength = 2 /* Quotes for FriendlyName*/ + wcslen(InstallName); + IsNameNotQuoted = (InstallName[0] != L'\"' || InstallName[wcslen(InstallName)-1] != L'\"'); + + BufferLength = (IsNameNotQuoted ? 2 /* Quotes for FriendlyName*/ : 0) + wcslen(InstallName); if (OsOptions) BufferLength += 1 /* Space between FriendlyName and options */ + wcslen(OsOptions); BufferLength++; /* NULL-termination */ @@ -987,9 +996,10 @@ if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; - wcscpy(Buffer, L"\""); + *Buffer = UNICODE_NULL; + if (IsNameNotQuoted) wcscat(Buffer, L"\""); wcscat(Buffer, InstallName); - wcscat(Buffer, L"\""); + if (IsNameNotQuoted) wcscat(Buffer, L"\""); if (OsOptions) { wcscat(Buffer, L" "); @@ -1011,7 +1021,7 @@ } NTSTATUS -DeleteNTOSBootEntry( +DeleteBootStoreEntry( IN PVOID Handle, IN ULONG_PTR BootEntryKey) { @@ -1045,9 +1055,9 @@ } NTSTATUS -ModifyNTOSBootEntry( +ModifyBootStoreEntry( IN PVOID Handle, - IN PNTOS_BOOT_ENTRY BootEntry) + IN PBOOT_STORE_ENTRY BootEntry) { PBOOT_STORE_CONTEXT BootStore = (PBOOT_STORE_CONTEXT)Handle; @@ -1079,10 +1089,10 @@ } NTSTATUS -QueryNTOSBootEntry( +QueryBootStoreEntry( IN PVOID Handle, IN ULONG_PTR BootEntryKey, - OUT PNTOS_BOOT_ENTRY BootEntry) // Technically this should be PNTOS_BOOT_ENTRY* + OUT PBOOT_STORE_ENTRY BootEntry) // Technically this should be PBOOT_STORE_ENTRY* { PBOOT_STORE_CONTEXT BootStore = (PBOOT_STORE_CONTEXT)Handle; @@ -1114,9 +1124,9 @@ } NTSTATUS -QueryNTOSBootOptions( +QueryBootStoreOptions( IN PVOID Handle, - IN OUT PNTOS_BOOT_OPTIONS BootOptions + IN OUT PBOOT_STORE_OPTIONS BootOptions /* , IN PULONG BootOptionsLength */ ) { NTSTATUS Status = STATUS_SUCCESS; @@ -1147,6 +1157,8 @@ if (BootStore->Type == FreeLdr) { + BootOptions->Version = FreeLdr; + Status = IniCacheGetKey(((PBOOT_STORE_INI_CONTEXT)BootStore)->OptionsIniSection, L"DefaultOS", (PWCHAR*)&BootOptions->CurrentBootEntryKey); if (!NT_SUCCESS(Status)) @@ -1161,6 +1173,8 @@ } else if (BootStore->Type == NtLdr) { + BootOptions->Version = NtLdr; + Status = IniCacheGetKey(((PBOOT_STORE_INI_CONTEXT)BootStore)->OptionsIniSection, L"default", (PWCHAR*)&BootOptions->CurrentBootEntryKey); if (!NT_SUCCESS(Status)) @@ -1178,9 +1192,9 @@ } NTSTATUS -SetNTOSBootOptions( +SetBootStoreOptions( IN PVOID Handle, - IN PNTOS_BOOT_OPTIONS BootOptions, + IN PBOOT_STORE_OPTIONS BootOptions, IN ULONG FieldsToChange) { PBOOT_STORE_CONTEXT BootStore = (PBOOT_STORE_CONTEXT)Handle; @@ -1208,6 +1222,9 @@ return STATUS_NOT_SUPPORTED; } + if (BootOptions->Version != FreeLdr) + return STATUS_INVALID_PARAMETER; + // // TODO: Depending on the flags set in 'FieldsToChange', // change either one or both these bootloader options. @@ -1237,9 +1254,9 @@ PINICACHEITERATOR Iterator; PINICACHESECTION OsIniSection; PWCHAR SectionName, KeyData; - UCHAR xxBootEntry[FIELD_OFFSET(NTOS_BOOT_ENTRY, OsOptions) + + UCHAR xxBootEntry[FIELD_OFFSET(BOOT_STORE_ENTRY, OsOptions) + max(sizeof(NTOS_OPTIONS), sizeof(BOOT_SECTOR_OPTIONS))]; - PNTOS_BOOT_ENTRY BootEntry = (PNTOS_BOOT_ENTRY)&xxBootEntry; + PBOOT_STORE_ENTRY BootEntry = (PBOOT_STORE_ENTRY)&xxBootEntry; PWCHAR Buffer; /* Enumerate all the valid installations listed in the "Operating Systems" section */ @@ -1291,7 +1308,7 @@ DPRINT1("Boot entry '%S' in OS section '%S'\n", InstallName, SectionName); - BootEntry->Version = NULL; + BootEntry->Version = FreeLdr; BootEntry->BootEntryKey = MAKESTRKEY(SectionName); BootEntry->FriendlyName = InstallName; BootEntry->BootFilePath = NULL; @@ -1318,8 +1335,7 @@ /* BootType is Windows2003 */ PNTOS_OPTIONS Options = (PNTOS_OPTIONS)&BootEntry->OsOptions; - BootEntry->Version = L"Windows2003"; - DPRINT1("This is a '%S' boot entry\n", BootEntry->Version); + DPRINT1("This is a '%S' boot entry\n", KeyData); BootEntry->OsOptionsLength = sizeof(NTOS_OPTIONS); RtlCopyMemory(Options->Signature, @@ -1350,8 +1366,7 @@ /* BootType is BootSector */ PBOOT_SECTOR_OPTIONS Options = (PBOOT_SECTOR_OPTIONS)&BootEntry->OsOptions; - BootEntry->Version = L"BootSector"; - DPRINT1("This is a '%S' boot entry\n", BootEntry->Version); + DPRINT1("This is a '%S' boot entry\n", KeyData); BootEntry->OsOptionsLength = sizeof(BOOT_SECTOR_OPTIONS); RtlCopyMemory(Options->Signature, @@ -1384,7 +1399,6 @@ else { DPRINT1("Unrecognized BootType value '%S'\n", KeyData); - // BootEntry->Version = KeyData; // goto DoEnum; } @@ -1416,8 +1430,8 @@ NTSTATUS Status = STATUS_SUCCESS; PINICACHEITERATOR Iterator; PWCHAR SectionName, KeyData; - UCHAR xxBootEntry[FIELD_OFFSET(NTOS_BOOT_ENTRY, OsOptions) + sizeof(NTOS_OPTIONS)]; - PNTOS_BOOT_ENTRY BootEntry = (PNTOS_BOOT_ENTRY)&xxBootEntry; + UCHAR xxBootEntry[FIELD_OFFSET(BOOT_STORE_ENTRY, OsOptions) + sizeof(NTOS_OPTIONS)]; + PBOOT_STORE_ENTRY BootEntry = (PBOOT_STORE_ENTRY)&xxBootEntry; PNTOS_OPTIONS Options = (PNTOS_OPTIONS)&BootEntry->OsOptions; PWCHAR Buffer; ULONG BufferLength; @@ -1510,7 +1524,7 @@ DPRINT1("Boot entry '%S' in OS section (path) '%S'\n", InstallName, SectionName); // SectionName == SystemRoot; - BootEntry->Version = L"Windows2003"; + BootEntry->Version = NtLdr; BootEntry->BootEntryKey = 0; // FIXME?? BootEntry->FriendlyName = InstallName; BootEntry->BootFilePath = NULL; @@ -1541,7 +1555,7 @@ } NTSTATUS -EnumerateNTOSBootEntries( +EnumerateBootStoreEntries( IN PVOID Handle, // IN ULONG Flags, // Determine which data to retrieve IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, Modified: branches/setup_improvements/base/setup/lib/bldrsup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/bldrsup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/bldrsup.h [iso-8859-1] Thu Jun 8 17:30:23 2017 @@ -2,8 +2,8 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/bldrsup.h - * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) - * boot loaders management. + * PURPOSE: Boot Stores Management functionality, with support for + * NT 5.x family (MS Windows <= 2003, and ReactOS) bootloaders. * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -11,13 +11,13 @@ #pragma once -typedef enum _NTOS_BOOT_LOADER_TYPE // _BOOT_STORE_TYPE +typedef enum _BOOT_STORE_TYPE { FreeLdr, // ReactOS' FreeLoader NtLdr, // Windows <= 2k3 NT "FlexBoot" OS Loader NTLDR // BootMgr, // Vista+ BCD-oriented BOOTMGR BldrTypeMax -} NTOS_BOOT_LOADER_TYPE; +} BOOT_STORE_TYPE; /* * Some references about EFI boot entries: @@ -29,25 +29,25 @@ * This structure is inspired from the EFI boot entry structure * BOOT_OPTIONS that is defined in ndk/iotypes.h . */ -typedef struct _NTOS_BOOT_OPTIONS // _BOOT_STORE_OPTIONS +typedef struct _BOOT_STORE_OPTIONS { - // ULONG Version; + ULONG Version; // BOOT_STORE_TYPE value // ULONG Length; ULONG Timeout; ULONG_PTR CurrentBootEntryKey; // ULONG_PTR NextBootEntryKey; // WCHAR HeadlessRedirection[1]; -} NTOS_BOOT_OPTIONS, *PNTOS_BOOT_OPTIONS; +} BOOT_STORE_OPTIONS, *PBOOT_STORE_OPTIONS; /* * These macros are used to set a value for the BootEntryKey member of a - * NTOS_BOOT_ENTRY structure, much in the same idea as MAKEINTRESOURCE and + * BOOT_STORE_ENTRY structure, much in the same idea as MAKEINTRESOURCE and * IS_INTRESOURCE macros for Win32 resources. * - * A key consists of either a boot ID number, - * comprised between 0 and MAX_USHORT == 0xFFFF == 65535, or can be a pointer - * to a human-readable string (section name), as in the case of FreeLDR, or - * to a GUID, as in the case of BOOTMGR. + * A key consists of either a boot ID number, comprised between 0 and + * MAX_USHORT == 0xFFFF == 65535, or can be a pointer to a human-readable + * string (section name), as in the case of FreeLDR, or to a GUID, as in the + * case of BOOTMGR. * * If IS_INTKEY(BootEntryKey) == TRUE, i.e. the key is <= 65535, this means * the key is a boot ID number, otherwise it is typically a pointer to a string. @@ -60,10 +60,9 @@ * This structure is inspired from the EFI boot entry structures * BOOT_ENTRY and FILE_PATH that are defined in ndk/iotypes.h . */ -typedef struct _NTOS_BOOT_ENTRY // _BOOT_STORE_ENTRY +typedef struct _BOOT_STORE_ENTRY { - // ULONG Version; // Equivalent of the "BootType" in FreeLdr - PWCHAR Version; // HACK!!! + ULONG Version; // BOOT_STORE_TYPE value // ULONG Length; ULONG_PTR BootEntryKey; // Boot entry "key" PCWSTR FriendlyName; // Human-readable boot entry description // LoadIdentifier @@ -78,7 +77,7 @@ * WCHAR FriendlyName[ANYSIZE_ARRAY]; * FILE_PATH BootFilePath; */ -} NTOS_BOOT_ENTRY, *PNTOS_BOOT_ENTRY; +} BOOT_STORE_ENTRY, *PBOOT_STORE_ENTRY; /* "NTOS" (aka. ReactOS or MS Windows NT) <= 5.x options */ typedef struct _NTOS_OPTIONS @@ -86,8 +85,8 @@ UCHAR Signature[8]; // "NTOS_5\0\0" // ULONG Version; // ULONG Length; - PCWSTR OsLoadPath; // The OS SystemRoot path // OsLoaderFilePath // OsFilePath - PCWSTR OsLoadOptions; // OsLoadOptions + PCWSTR OsLoadPath; // The OS SystemRoot path // OsLoaderFilePath // OsFilePath + PCWSTR OsLoadOptions; // OsLoadOptions /* * In packed form, this structure would contain an offset to the 'OsLoadPath' * string, and the 'OsLoadOptions' member would be: @@ -115,79 +114,79 @@ typedef NTSTATUS (NTAPI *PENUM_BOOT_ENTRIES_ROUTINE)( - IN NTOS_BOOT_LOADER_TYPE Type, - IN PNTOS_BOOT_ENTRY BootEntry, + IN BOOT_STORE_TYPE Type, + IN PBOOT_STORE_ENTRY BootEntry, IN PVOID Parameter OPTIONAL); NTSTATUS -FindNTOSBootLoader( // By handle +FindBootStore( // By handle IN HANDLE PartitionDirectoryHandle, // OPTIONAL - IN NTOS_BOOT_LOADER_TYPE Type, - OUT PULONG Version); + IN BOOT_STORE_TYPE Type, + OUT PULONG VersionNumber OPTIONAL); NTSTATUS -OpenNTOSBootLoaderStoreByHandle( +OpenBootStoreByHandle( OUT PVOID* Handle, IN HANDLE PartitionDirectoryHandle, // OPTIONAL - IN NTOS_BOOT_LOADER_TYPE Type, + IN BOOT_STORE_TYPE Type, IN BOOLEAN CreateNew); NTSTATUS -OpenNTOSBootLoaderStore_UStr( +OpenBootStore_UStr( OUT PVOID* Handle, IN PUNICODE_STRING SystemPartitionPath, - IN NTOS_BOOT_LOADER_TYPE Type, + IN BOOT_STORE_TYPE Type, IN BOOLEAN CreateNew); NTSTATUS -OpenNTOSBootLoaderStore( +OpenBootStore( OUT PVOID* Handle, IN PCWSTR SystemPartition, - IN NTOS_BOOT_LOADER_TYPE Type, + IN BOOT_STORE_TYPE Type, IN BOOLEAN CreateNew); NTSTATUS -CloseNTOSBootLoaderStore( +CloseBootStore( IN PVOID Handle); NTSTATUS -AddNTOSBootEntry( +AddBootStoreEntry( IN PVOID Handle, - IN PNTOS_BOOT_ENTRY BootEntry, + IN PBOOT_STORE_ENTRY BootEntry, IN ULONG_PTR BootEntryKey); NTSTATUS -DeleteNTOSBootEntry( +DeleteBootStoreEntry( IN PVOID Handle, IN ULONG_PTR BootEntryKey); NTSTATUS -ModifyNTOSBootEntry( +ModifyBootStoreEntry( IN PVOID Handle, - IN PNTOS_BOOT_ENTRY BootEntry); + IN PBOOT_STORE_ENTRY BootEntry); NTSTATUS -QueryNTOSBootEntry( +QueryBootStoreEntry( IN PVOID Handle, IN ULONG_PTR BootEntryKey, - OUT PNTOS_BOOT_ENTRY BootEntry); // Technically this should be PNTOS_BOOT_ENTRY* + OUT PBOOT_STORE_ENTRY BootEntry); // Technically this should be PBOOT_STORE_ENTRY* NTSTATUS -QueryNTOSBootOptions( +QueryBootStoreOptions( IN PVOID Handle, - IN OUT PNTOS_BOOT_OPTIONS BootOptions + IN OUT PBOOT_STORE_OPTIONS BootOptions /* , IN PULONG BootOptionsLength */ ); NTSTATUS -SetNTOSBootOptions( +SetBootStoreOptions( IN PVOID Handle, - IN PNTOS_BOOT_OPTIONS BootOptions, + IN PBOOT_STORE_OPTIONS BootOptions, IN ULONG FieldsToChange); NTSTATUS -EnumerateNTOSBootEntries( +EnumerateBootStoreEntries( IN PVOID Handle, // IN ULONG Flags, // Determine which data to retrieve IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, Modified: branches/setup_improvements/base/setup/lib/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] Thu Jun 8 17:30:23 2017 @@ -69,8 +69,8 @@ static NTSTATUS NTAPI EnumerateInstallations( - IN NTOS_BOOT_LOADER_TYPE Type, - IN PNTOS_BOOT_ENTRY BootEntry, + IN BOOT_STORE_TYPE Type, + IN PBOOT_STORE_ENTRY BootEntry, IN PVOID Parameter OPTIONAL) { PENUM_INSTALLS_DATA Data = (PENUM_INSTALLS_DATA)Parameter; @@ -96,8 +96,10 @@ RTL_FIELD_SIZE(NTOS_OPTIONS, Signature)) { /* This is not a ReactOS entry */ - DPRINT1(" An installation '%S' of unsupported type '%S'\n", - BootEntry->FriendlyName, BootEntry->Version ? BootEntry->Version : L"n/a"); + // DPRINT1(" An installation '%S' of unsupported type '%S'\n", + // BootEntry->FriendlyName, BootEntry->Version ? BootEntry->Version : L"n/a"); + DPRINT1(" An installation '%S' of unsupported type %lu\n", + BootEntry->FriendlyName, BootEntry->OsOptionsLength); /* Continue the enumeration */ return STATUS_SUCCESS; } @@ -635,7 +637,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING PartitionRootPath; - NTOS_BOOT_LOADER_TYPE Type; + BOOT_STORE_TYPE Type; PVOID BootStoreHandle; ENUM_INSTALLS_DATA Data; ULONG Version; @@ -672,7 +674,7 @@ /* Try to see whether we recognize some NT boot loaders */ for (Type = FreeLdr; Type < BldrTypeMax; ++Type) { - Status = FindNTOSBootLoader(PartitionDirectoryHandle, Type, &Version); + Status = FindBootStore(PartitionDirectoryHandle, Type, &Version); if (!NT_SUCCESS(Status)) { /* The loader does not exist, continue with another one */ @@ -685,15 +687,15 @@ DPRINT1("Analyse the OS installations for loader type '%d' in disk #%d, partition #%d\n", Type, DiskNumber, PartitionNumber); - Status = OpenNTOSBootLoaderStoreByHandle(&BootStoreHandle, PartitionDirectoryHandle, Type, FALSE); + Status = OpenBootStoreByHandle(&BootStoreHandle, PartitionDirectoryHandle, Type, FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("Could not open the NTOS boot store of type '%d' (Status 0x%08lx), continue with another one...\n", Type, Status); continue; } - EnumerateNTOSBootEntries(BootStoreHandle, EnumerateInstallations, &Data); - CloseNTOSBootLoaderStore(BootStoreHandle); + EnumerateBootStoreEntries(BootStoreHandle, EnumerateInstallations, &Data); + CloseBootStore(BootStoreHandle); } /* Close the partition */ Modified: branches/setup_improvements/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] Thu Jun 8 17:30:23 2017 @@ -127,12 +127,12 @@ IN PVOID BootStoreHandle, IN PCWSTR ArcPath) { - UCHAR xxBootEntry[FIELD_OFFSET(NTOS_BOOT_ENTRY, OsOptions) + sizeof(NTOS_OPTIONS)]; - PNTOS_BOOT_ENTRY BootEntry = (PNTOS_BOOT_ENTRY)&xxBootEntry; + UCHAR xxBootEntry[FIELD_OFFSET(BOOT_STORE_ENTRY, OsOptions) + sizeof(NTOS_OPTIONS)]; + PBOOT_STORE_ENTRY BootEntry = (PBOOT_STORE_ENTRY)&xxBootEntry; PNTOS_OPTIONS Options = (PNTOS_OPTIONS)&BootEntry->OsOptions; - NTOS_BOOT_OPTIONS BootOptions; - - BootEntry->Version = L"Windows2003"; + BOOT_STORE_OPTIONS BootOptions; + + BootEntry->Version = FreeLdr; BootEntry->BootFilePath = NULL; BootEntry->OsOptionsLength = sizeof(NTOS_OPTIONS); @@ -146,20 +146,20 @@ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS"); BootEntry->FriendlyName = L"\"ReactOS\""; Options->OsLoadOptions = NULL; // L""; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS")); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS")); /* ReactOS_Debug */ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_Debug"); BootEntry->FriendlyName = L"\"ReactOS (Debug)\""; Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_Debug")); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_Debug")); #ifdef _WINKD_ /* ReactOS_VBoxDebug */ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_VBoxDebug"); BootEntry->FriendlyName = L"\"ReactOS (VBoxDebug)\""; Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=VBOX /SOS"; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_VBoxDebug")); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_VBoxDebug")); #endif #if DBG #ifndef _WINKD_ @@ -167,34 +167,34 @@ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_KdSerial"); BootEntry->FriendlyName = L"\"ReactOS (RosDbg)\""; Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_KdSerial")); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_KdSerial")); #endif /* ReactOS_Screen */ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_Screen"); BootEntry->FriendlyName = L"\"ReactOS (Screen)\""; Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=SCREEN /SOS"; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_Screen")); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_Screen")); /* ReactOS_LogFile */ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_LogFile"); BootEntry->FriendlyName = L"\"ReactOS (Log file)\""; Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=FILE /SOS"; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_LogFile")); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_LogFile")); /* ReactOS_Ram */ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_Ram"); BootEntry->FriendlyName = L"\"ReactOS (RAM Disk)\""; Options->OsLoadPath = L"ramdisk(0)\\ReactOS"; Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDPATH=reactos.img /RDIMAGEOFFSET=32256"; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_Ram")); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_Ram")); /* ReactOS_EMS */ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_EMS"); BootEntry->FriendlyName = L"\"ReactOS (Emergency Management Services)\""; Options->OsLoadPath = ArcPath; Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /redirect=com2 /redirectbaudrate=115200"; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_EMS")); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_EMS")); #endif @@ -230,7 +230,8 @@ } #endif - SetNTOSBootOptions(BootStoreHandle, &BootOptions, 2 | 1); + BootOptions.Version = FreeLdr; + SetBootStoreOptions(BootStoreHandle, &BootOptions, 2 | 1); } static NTSTATUS @@ -242,7 +243,7 @@ PVOID BootStoreHandle; /* Initialize the INI file and create the common FreeLdr sections */ - Status = OpenNTOSBootLoaderStore(&BootStoreHandle, IniPath, FreeLdr, TRUE); + Status = OpenBootStore(&BootStoreHandle, IniPath, FreeLdr, TRUE); if (!NT_SUCCESS(Status)) return Status; @@ -250,7 +251,7 @@ CreateFreeLoaderReactOSEntries(BootStoreHandle, ArcPath); /* Close the INI file */ - CloseNTOSBootLoaderStore(BootStoreHandle); + CloseBootStore(BootStoreHandle); return STATUS_SUCCESS; } @@ -266,19 +267,19 @@ { NTSTATUS Status; PVOID BootStoreHandle; - UCHAR xxBootEntry[FIELD_OFFSET(NTOS_BOOT_ENTRY, OsOptions) + sizeof(BOOT_SECTOR_OPTIONS)]; - PNTOS_BOOT_ENTRY BootEntry = (PNTOS_BOOT_ENTRY)&xxBootEntry; + UCHAR xxBootEntry[FIELD_OFFSET(BOOT_STORE_ENTRY, OsOptions) + sizeof(BOOT_SECTOR_OPTIONS)]; + PBOOT_STORE_ENTRY BootEntry = (PBOOT_STORE_ENTRY)&xxBootEntry; PBOOT_SECTOR_OPTIONS Options = (PBOOT_SECTOR_OPTIONS)&BootEntry->OsOptions; /* Initialize the INI file and create the common FreeLdr sections */ - Status = OpenNTOSBootLoaderStore(&BootStoreHandle, IniPath, FreeLdr, TRUE); + Status = OpenBootStore(&BootStoreHandle, IniPath, FreeLdr, TRUE); if (!NT_SUCCESS(Status)) return Status; /* Add the ReactOS entries */ CreateFreeLoaderReactOSEntries(BootStoreHandle, ArcPath); - /**/BootEntry->Version = L"BootSector";/**/ + BootEntry->Version = FreeLdr; BootEntry->BootFilePath = NULL; BootEntry->OsOptionsLength = sizeof(BOOT_SECTOR_OPTIONS); @@ -292,10 +293,10 @@ // BootEntry->BootEntryKey = MAKESTRKEY(Section); BootEntry->FriendlyName = Description; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(Section)); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(Section)); /* Close the INI file */ - CloseNTOSBootLoaderStore(BootStoreHandle); + CloseBootStore(BootStoreHandle); return STATUS_SUCCESS; } @@ -318,8 +319,8 @@ static NTSTATUS NTAPI EnumerateReactOSEntries( - IN NTOS_BOOT_LOADER_TYPE Type, - IN PNTOS_BOOT_ENTRY BootEntry, + IN BOOT_STORE_TYPE Type, + IN PBOOT_STORE_ENTRY BootEntry, IN PVOID Parameter OPTIONAL) { PENUM_REACTOS_ENTRIES_DATA Data = (PENUM_REACTOS_ENTRIES_DATA)Parameter; @@ -336,9 +337,10 @@ RTL_FIELD_SIZE(NTOS_OPTIONS, Signature)) { /* This is not a ReactOS entry */ - DPRINT1(" An installation '%S' of unsupported type '%S'\n", - BootEntry->FriendlyName, - BootEntry->Version ? BootEntry->Version : L"n/a"); + // DPRINT1(" An installation '%S' of unsupported type '%S'\n", + // BootEntry->FriendlyName, BootEntry->Version ? BootEntry->Version : L"n/a"); + DPRINT1(" An installation '%S' of unsupported type %lu\n", + BootEntry->FriendlyName, BootEntry->OsOptionsLength); /* Continue the enumeration */ goto SkipThisEntry; } @@ -397,12 +399,12 @@ NTSTATUS Status; PVOID BootStoreHandle; ENUM_REACTOS_ENTRIES_DATA Data; - UCHAR xxBootEntry[FIELD_OFFSET(NTOS_BOOT_ENTRY, OsOptions) + sizeof(NTOS_OPTIONS)]; - PNTOS_BOOT_ENTRY BootEntry = (PNTOS_BOOT_ENTRY)&xxBootEntry; + UCHAR xxBootEntry[FIELD_OFFSET(BOOT_STORE_ENTRY, OsOptions) + sizeof(NTOS_OPTIONS)]; + PBOOT_STORE_ENTRY BootEntry = (PBOOT_STORE_ENTRY)&xxBootEntry; PNTOS_OPTIONS Options = (PNTOS_OPTIONS)&BootEntry->OsOptions; /* Open the INI file */ - Status = OpenNTOSBootLoaderStore(&BootStoreHandle, IniPath, FreeLdr, /*TRUE*/ FALSE); + Status = OpenBootStore(&BootStoreHandle, IniPath, FreeLdr, /*TRUE*/ FALSE); if (!NT_SUCCESS(Status)) return Status; @@ -414,10 +416,10 @@ StringCchCopyW(Data.OsName, ARRAYSIZE(Data.OsName), L"\"ReactOS\""); // - // FIXME: We temporarily use EnumerateNTOSBootEntries, until - // both QueryNTOSBootEntry and ModifyNTOSBootEntry get implemented. + // FIXME: We temporarily use EnumerateBootStoreEntries, until + // both QueryBootStoreEntry and ModifyBootStoreEntry get implemented. // - Status = EnumerateNTOSBootEntries(BootStoreHandle, EnumerateReactOSEntries, &Data); + Status = EnumerateBootStoreEntries(BootStoreHandle, EnumerateReactOSEntries, &Data); /* Create a new "ReactOS" entry if there is none already existing that suits us */ if (!Data.UseExistingEntry) @@ -425,7 +427,7 @@ // StringCchPrintfW(Data.SectionName, ARRAYSIZE(Data.SectionName), L"ReactOS_%lu", Data.i); // StringCchPrintfW(Data.OsName, ARRAYSIZE(Data.OsName), L"\"ReactOS %lu\"", Data.i); - BootEntry->Version = L"Windows2003"; + BootEntry->Version = FreeLdr; BootEntry->BootFilePath = NULL; BootEntry->OsOptionsLength = sizeof(NTOS_OPTIONS); @@ -438,11 +440,11 @@ // BootEntry->BootEntryKey = MAKESTRKEY(Data.SectionName); BootEntry->FriendlyName = Data.OsName; Options->OsLoadOptions = NULL; // L""; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(Data.SectionName)); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(Data.SectionName)); } /* Close the INI file */ - CloseNTOSBootLoaderStore(BootStoreHandle); + CloseBootStore(BootStoreHandle); return STATUS_SUCCESS; } @@ -458,12 +460,12 @@ ENUM_REACTOS_ENTRIES_DATA Data; // NOTE: Technically it would be "BootSector"... - UCHAR xxBootEntry[FIELD_OFFSET(NTOS_BOOT_ENTRY, OsOptions) + sizeof(NTOS_OPTIONS)]; - PNTOS_BOOT_ENTRY BootEntry = (PNTOS_BOOT_ENTRY)&xxBootEntry; + UCHAR xxBootEntry[FIELD_OFFSET(BOOT_STORE_ENTRY, OsOptions) + sizeof(NTOS_OPTIONS)]; + PBOOT_STORE_ENTRY BootEntry = (PBOOT_STORE_ENTRY)&xxBootEntry; PNTOS_OPTIONS Options = (PNTOS_OPTIONS)&BootEntry->OsOptions; /* Open the INI file */ - Status = OpenNTOSBootLoaderStore(&BootStoreHandle, IniPath, NtLdr, FALSE); + Status = OpenBootStore(&BootStoreHandle, IniPath, NtLdr, FALSE); if (!NT_SUCCESS(Status)) return Status; @@ -475,16 +477,16 @@ StringCchCopyW(Data.OsName, ARRAYSIZE(Data.OsName), L"\"ReactOS\""); // - // FIXME: We temporarily use EnumerateNTOSBootEntries, until - // both QueryNTOSBootEntry and ModifyNTOSBootEntry get implemented. + // FIXME: We temporarily use EnumerateBootStoreEntries, until + // both QueryBootStoreEntry and ModifyBootStoreEntry get implemented. // - Status = EnumerateNTOSBootEntries(BootStoreHandle, EnumerateReactOSEntries, &Data); + Status = EnumerateBootStoreEntries(BootStoreHandle, EnumerateReactOSEntries, &Data); /* If either the key was not found, or contains something else, add a new one */ if (!Data.UseExistingEntry /* || ( (Status == STATUS_NO_MORE_ENTRIES) && wcscmp(Data.OsName, EntryValue) ) */) { - BootEntry->Version = L"Windows2003"; // NOTE: See remark above + BootEntry->Version = NtLdr; BootEntry->BootFilePath = NULL; BootEntry->OsOptionsLength = sizeof(NTOS_OPTIONS); @@ -498,11 +500,11 @@ // BootEntry->FriendlyName = Data.OsName; BootEntry->FriendlyName = EntryValue; Options->OsLoadOptions = NULL; // L""; - AddNTOSBootEntry(BootStoreHandle, BootEntry, MAKESTRKEY(0 /*Data.SectionName*/)); + AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(0 /*Data.SectionName*/)); } /* Close the INI file */ - CloseNTOSBootLoaderStore(BootStoreHandle); + CloseBootStore(BootStoreHandle); return STATUS_SUCCESS; // Status; } @@ -1777,8 +1779,8 @@ /* Check for NT and other bootloaders */ // FIXME: Check for Vista+ bootloader! - /*** Status = FindNTOSBootLoader(PartitionHandle, NtLdr, &Version); ***/ - /*** Status = FindNTOSBootLoader(PartitionHandle, BootMgr, &Version); ***/ + /*** Status = FindBootStore(PartitionHandle, NtLdr, &Version); ***/ + /*** Status = FindBootStore(PartitionHandle, BootMgr, &Version); ***/ if (DoesFileExist_2(SystemRootPath->Buffer, L"NTLDR") == TRUE || DoesFileExist_2(SystemRootPath->Buffer, L"BOOT.INI") == TRUE) {

7 years, 3 months

[hbelusca] 74963: [ADVAPI32_WINETEST]: Fix compilation with MSVC 2010 (guarded via __REACTOS__).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 8 17:04:24 2017 New Revision: 74963 URL: http://svn.reactos.org/svn/reactos?rev=74963&view=rev Log: [ADVAPI32_WINETEST]: Fix compilation with MSVC 2010 (guarded via __REACTOS__). Modified: trunk/rostests/winetests/advapi32/eventlog.c Modified: trunk/rostests/winetests/advapi32/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/eventl… ============================================================================== --- trunk/rostests/winetests/advapi32/eventlog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/eventlog.c [iso-8859-1] Thu Jun 8 17:04:24 2017 @@ -1209,7 +1209,11 @@ ret = StartTraceA(&handle, sessionname, properties); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); +#ifndef __REACTOS__ properties->Wnode.Guid = (GUID){0}; +#else + memset(&properties->Wnode.Guid, 0, sizeof(properties->Wnode.Guid)); +#endif properties->LogFileNameOffset = 0; ret = StartTraceA(&handle, sessionname, properties);

7 years, 3 months

[hbelusca] 74962: [GDI32_APITEST]: Fix compilation under MSVC 2010.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 8 17:00:55 2017 New Revision: 74962 URL: http://svn.reactos.org/svn/reactos?rev=74962&view=rev Log: [GDI32_APITEST]: Fix compilation under MSVC 2010. Modified: trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c Modified: trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontMem… ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c [iso-8859-1] Thu Jun 8 17:00:55 2017 @@ -32,161 +32,161 @@ static fnt_test test_data[] = { { - .ResourceName = "PanosePitchTest.ttf", - .NumFaces = 2, - .res = - { - { - .FontName = "PanosePitchTest", - .tm.tmHeight = 11, - .tm.tmAscent = 11, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -5, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = 8, - .tm.tmMaxCharWidth = 11, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 165, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR, - .tm.tmCharSet = SHIFTJIS_CHARSET, - }, - { - .FontName = "@PanosePitchTest", - .tm.tmHeight = 11, - .tm.tmAscent = 11, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -5, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = 8, - .tm.tmMaxCharWidth = 11, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 165, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR, - .tm.tmCharSet = SHIFTJIS_CHARSET, + /* .ResourceName = */ "PanosePitchTest.ttf", + /* .NumFaces = */ 2, + /* .res = */ + { + { + /* .FontName = */ "PanosePitchTest", + /* .tm.tmHeight = */ 11, + /* .tm.tmAscent = */ 11, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -5, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ 8, + /* .tm.tmMaxCharWidth = */ 11, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 165, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR, + /* .tm.tmCharSet = */ SHIFTJIS_CHARSET, + }, + { + /* .FontName = */ "@PanosePitchTest", + /* .tm.tmHeight = */ 11, + /* .tm.tmAscent = */ 11, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -5, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ 8, + /* .tm.tmMaxCharWidth = */ 11, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 165, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR, + /* .tm.tmCharSet = */ SHIFTJIS_CHARSET, }, }, }, { - .ResourceName = "TTCTestV.ttc", - .NumFaces = 3, - .res = - { - { - .FontName = "No1Of3in1", - .tm.tmHeight = 12, - .tm.tmAscent = 12, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -4, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = -525, - .tm.tmMaxCharWidth = 6, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 64, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, - .tm.tmCharSet = ANSI_CHARSET, - }, - { - .FontName = "No2Of3in1", - .tm.tmHeight = 12, - .tm.tmAscent = 12, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -4, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = 8, - .tm.tmMaxCharWidth = 7, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 64, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, - .tm.tmCharSet = ANSI_CHARSET, - }, - { - .FontName = "No3Of3in1V", - .tm.tmHeight = 12, - .tm.tmAscent = 12, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -4, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = 8, - .tm.tmMaxCharWidth = 13, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 64, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = FF_MODERN | TMPF_TRUETYPE | TMPF_VECTOR, - .tm.tmCharSet = ANSI_CHARSET, + /* .ResourceName = */ "TTCTestV.ttc", + /* .NumFaces = */ 3, + /* .res = */ + { + { + /* .FontName = */ "No1Of3in1", + /* .tm.tmHeight = */ 12, + /* .tm.tmAscent = */ 12, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -4, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ -525, + /* .tm.tmMaxCharWidth = */ 6, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 64, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, + /* .tm.tmCharSet = */ ANSI_CHARSET, + }, + { + /* .FontName = */ "No2Of3in1", + /* .tm.tmHeight = */ 12, + /* .tm.tmAscent = */ 12, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -4, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ 8, + /* .tm.tmMaxCharWidth = */ 7, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 64, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, + /* .tm.tmCharSet = */ ANSI_CHARSET, + }, + { + /* .FontName = */ "No3Of3in1V", + /* .tm.tmHeight = */ 12, + /* .tm.tmAscent = */ 12, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -4, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ 8, + /* .tm.tmMaxCharWidth = */ 13, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 64, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ FF_MODERN | TMPF_TRUETYPE | TMPF_VECTOR, + /* .tm.tmCharSet = */ ANSI_CHARSET, }, }, }, { - .ResourceName = "Shadows_Into_Light.ttf", - .NumFaces = 1, - .res = - { - { - .FontName = "ufaXaAlLOxCUGYJ7KN51UP2Q==", - .tm.tmHeight = 26, - .tm.tmAscent = 19, - .tm.tmDescent = 7, - .tm.tmInternalLeading = 10, - .tm.tmExternalLeading = 0, - .tm.tmAveCharWidth = 7, - .tm.tmMaxCharWidth = 23, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 30, - .tm.tmLastChar = 255, - .tm.tmDefaultChar = 31, - .tm.tmBreakChar = 32, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, - .tm.tmCharSet = ANSI_CHARSET, + /* .ResourceName = */ "Shadows_Into_Light.ttf", + /* .NumFaces = */ 1, + /* .res = */ + { + { + /* .FontName = */ "ufaXaAlLOxCUGYJ7KN51UP2Q==", + /* .tm.tmHeight = */ 26, + /* .tm.tmAscent = */ 19, + /* .tm.tmDescent = */ 7, + /* .tm.tmInternalLeading = */ 10, + /* .tm.tmExternalLeading = */ 0, + /* .tm.tmAveCharWidth = */ 7, + /* .tm.tmMaxCharWidth = */ 23, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 30, + /* .tm.tmLastChar = */ 255, + /* .tm.tmDefaultChar = */ 31, + /* .tm.tmBreakChar = */ 32, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, + /* .tm.tmCharSet = */ ANSI_CHARSET, }, }, },

7 years, 3 months

← Newer
1
...
26
27
28
29
30
31
32
...
53
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 June 2017