Ros-diffs

ros-diffs@reactos.org

16 participants
80957 discussions

[reactos] 06/07: [FREELDR] Implement PeLdrLoadBootImage

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=393b1f89982804b2bd307… commit 393b1f89982804b2bd3074d773096ebbcf2fcd6d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:18:00 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Implement PeLdrLoadBootImage --- boot/freeldr/freeldr/include/peloader.h | 7 +++++ boot/freeldr/freeldr/lib/peloader.c | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index a2bf617463d..b2374f74ceb 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -70,3 +70,10 @@ PeLdrCheckForLoadedDll( PVOID PeLdrInitSecurityCookie( _In_ PLDR_DATA_TABLE_ENTRY LdrEntry); + +BOOLEAN +PeLdrLoadBootImage( + _In_ PCSTR FilePath, + _In_ PCSTR BaseDllName, + _Out_ PVOID* ImageBase, + _Out_ PLDR_DATA_TABLE_ENTRY* DataTableEntry); diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 0511738164c..b2477c7e1a2 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -1044,3 +1044,51 @@ PeLdrLoadImage( { return PeLdrLoadImageEx(FilePath, MemoryType, ImageBasePA, TRUE); } + +BOOLEAN +PeLdrLoadBootImage( + _In_ PCSTR FilePath, + _In_ PCSTR BaseDllName, + _Out_ PVOID* ImageBase, + _Out_ PLDR_DATA_TABLE_ENTRY* DataTableEntry) +{ + BOOLEAN Success; + + /* Load the image as a bootloader image */ + Success = PeLdrLoadImageEx(FilePath, + LoaderLoadedProgram, + ImageBase, + FALSE); + if (!Success) + { + WARN("Failed to load boot image '%s'\n", FilePath); + return FALSE; + } + + /* Allocate a DTE */ + Success = PeLdrAllocateDataTableEntry(&FrLdrModuleList, + BaseDllName, + FilePath, + *ImageBase, + DataTableEntry); + if (!Success) + { + /* Cleanup and bail out */ + ERR("Failed to allocate DTE for '%s'\n", FilePath); + MmFreeMemory(*ImageBase); + return FALSE; + } + + /* Resolve imports */ + Success = PeLdrScanImportDescriptorTable(&FrLdrModuleList, "", *DataTableEntry); + if (!Success) + { + /* Cleanup and bail out */ + ERR("Failed to resolve imports for '%s'\n", FilePath); + PeLdrFreeDataTableEntry(*DataTableEntry); + MmFreeMemory(*ImageBase); + return FALSE; + } + + return TRUE; +}

1 month, 3 weeks

[reactos] 05/07: [FREELDR] Initialize a global module list head for freeldr

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9849f7cc4801be3a4297… commit f9849f7cc4801be3a42972449174aac736caf14b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:14:59 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Initialize a global module list head for freeldr --- boot/freeldr/freeldr/freeldr.c | 7 +++++++ boot/freeldr/freeldr/include/peloader.h | 3 +++ boot/freeldr/freeldr/lib/peloader.c | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index bbed7a4139a..d533061fb5d 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -64,6 +64,13 @@ VOID __cdecl BootMain(IN PCCH CmdLine) /* Initialize I/O subsystem */ FsInit(); + /* Initialize the module list */ + if (!PeLdrInitializeModuleList()) + { + UiMessageBoxCritical("Unable to initialize module list."); + goto Quit; + } + RunLoader(); Quit: diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index 4e7901e8b89..a2bf617463d 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -26,6 +26,9 @@ typedef VOID extern PELDR_IMPORTDLL_LOAD_CALLBACK PeLdrImportDllLoadCallback; +BOOLEAN +PeLdrInitializeModuleList(VOID); + BOOLEAN PeLdrLoadImage( _In_ PCSTR FilePath, diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 7d404b09a0b..0511738164c 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -25,6 +25,8 @@ DBG_DEFAULT_CHANNEL(PELOADER); /* GLOBALS *******************************************************************/ +LIST_ENTRY FrLdrModuleList; + PELDR_IMPORTDLL_LOAD_CALLBACK PeLdrImportDllLoadCallback = NULL; #ifdef _WIN64 @@ -518,6 +520,29 @@ PeLdrpScanImportAddressTable( /* FUNCTIONS *****************************************************************/ +BOOLEAN +PeLdrInitializeModuleList(VOID) +{ + PLDR_DATA_TABLE_ENTRY FreeldrDTE; + + InitializeListHead(&FrLdrModuleList); + + /* Allocate a data table entry for freeldr.sys. + The base name is scsiport.sys for imports from ntbootdd.sys */ + if (!PeLdrAllocateDataTableEntry(&FrLdrModuleList, + "scsiport.sys", + "freeldr.sys", + &__ImageBase, + &FreeldrDTE)) + { + /* Cleanup and bail out */ + ERR("Failed to allocate DTE for freeldr\n"); + return FALSE; + } + + return TRUE; +} + PVOID PeLdrInitSecurityCookie(PLDR_DATA_TABLE_ENTRY LdrEntry) {

1 month, 3 weeks

[reactos] 04/07: [FREELDR] Pass VA instead of PA to PeLdrAllocateDataTableEntry

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6eac9b58913780ec0dd5f… commit 6eac9b58913780ec0dd5f0d8b8bb81ed9fcf27e4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 3 10:12:29 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Pass VA instead of PA to PeLdrAllocateDataTableEntry This allows to create DTEs for loader modules. --- boot/freeldr/freeldr/include/peloader.h | 2 +- boot/freeldr/freeldr/lib/peloader.c | 6 +++--- boot/freeldr/freeldr/ntldr/winldr.c | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index 05214be9621..4e7901e8b89 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -44,7 +44,7 @@ PeLdrAllocateDataTableEntry( IN OUT PLIST_ENTRY ModuleListHead, IN PCCH BaseDllName, IN PCCH FullDllName, - IN PVOID BasePA, + IN PVOID BaseVA, OUT PLDR_DATA_TABLE_ENTRY *NewEntry); VOID diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 13b6895f38b..7d404b09a0b 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -418,7 +418,7 @@ PeLdrpLoadAndScanReferencedDll( Success = PeLdrAllocateDataTableEntry(Parent ? Parent->Blink : ModuleListHead, ImportName, FullDllName, - BasePA, + PaToVa(BasePA), DataTableEntry); if (!Success) { @@ -682,10 +682,10 @@ PeLdrAllocateDataTableEntry( IN OUT PLIST_ENTRY ModuleListHead, IN PCCH BaseDllName, IN PCCH FullDllName, - IN PVOID BasePA, + IN PVOID BaseVA, OUT PLDR_DATA_TABLE_ENTRY *NewEntry) { - PVOID BaseVA = PaToVa(BasePA); + PVOID BasePA = VaToPa(BaseVA); PWSTR BaseDllNameBuffer, Buffer; PLDR_DATA_TABLE_ENTRY DataTableEntry; PIMAGE_NT_HEADERS NtHeaders; diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 4b4d46204ae..f3405b70ba3 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -342,7 +342,11 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, } // Allocate a DTE for it - Success = PeLdrAllocateDataTableEntry(LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); + Success = PeLdrAllocateDataTableEntry(LoadOrderListHead, + DllName, + DllName, + PaToVa(DriverBase), + DriverDTE); if (!Success) { /* Cleanup and bail out */ @@ -542,7 +546,7 @@ LoadModule( Success = PeLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, ImportName, FullFileName, - BaseAddress, + PaToVa(BaseAddress), Dte); if (!Success) {

1 month, 3 weeks

[reactos] 03/07: [FREELDR] Implement PeLdrLoadImageEx

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a5ef4c1cc40d4649cbdc… commit 8a5ef4c1cc40d4649cbdc77b4e9b394b3ff111c9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 14 09:32:05 2024 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Implement PeLdrLoadImageEx This allows to load an image as freeldr extension code. TODO: - Add global bootloader DTE list - Add wrapper function that also processes imports - Use this for scsiport --- boot/freeldr/freeldr/include/peloader.h | 7 +++++++ boot/freeldr/freeldr/lib/peloader.c | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index 00a387ef7a0..05214be9621 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -32,6 +32,13 @@ PeLdrLoadImage( _In_ TYPE_OF_MEMORY MemoryType, _Out_ PVOID* ImageBasePA); +BOOLEAN +PeLdrLoadImageEx( + _In_ PCSTR FilePath, + _In_ TYPE_OF_MEMORY MemoryType, + _Out_ PVOID* ImageBasePA, + _In_ BOOLEAN KernelMapping); + BOOLEAN PeLdrAllocateDataTableEntry( IN OUT PLIST_ENTRY ModuleListHead, diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 857dba43258..13b6895f38b 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -820,10 +820,11 @@ PeLdrFreeDataTableEntry( * Addressing mode: physical. **/ BOOLEAN -PeLdrLoadImage( +PeLdrLoadImageEx( _In_ PCSTR FilePath, _In_ TYPE_OF_MEMORY MemoryType, - _Out_ PVOID* ImageBasePA) + _Out_ PVOID* ImageBasePA, + _In_ BOOLEAN KernelMapping) { ULONG FileId; PVOID PhysicalBase; @@ -895,7 +896,7 @@ PeLdrLoadImage( } /* This is the real image base, in form of a virtual address */ - VirtualBase = PaToVa(PhysicalBase); + VirtualBase = KernelMapping ? PaToVa(PhysicalBase) : PhysicalBase; TRACE("Base PA: 0x%p, VA: 0x%p\n", PhysicalBase, VirtualBase); @@ -1009,3 +1010,12 @@ Failure: MmFreeMemory(PhysicalBase); return FALSE; } + +BOOLEAN +PeLdrLoadImage( + _In_ PCSTR FilePath, + _In_ TYPE_OF_MEMORY MemoryType, + _Out_ PVOID* ImageBasePA) +{ + return PeLdrLoadImageEx(FilePath, MemoryType, ImageBasePA, TRUE); +}

1 month, 3 weeks

[reactos] 02/07: [FREELDR] Move IoReadPartitionTable to ntoskrnl.c

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bee8e81d5a7e70c4e71f9… commit bee8e81d5a7e70c4e71f9b07d464544b672a19e1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:38:17 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Move IoReadPartitionTable to ntoskrnl.c --- boot/freeldr/freeldr/arch/i386/ntoskrnl.c | 163 ++++++++++++++++++++++++++++-- boot/freeldr/freeldr/disk/partition.c | 148 --------------------------- 2 files changed, 152 insertions(+), 159 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c index d14d822c8e3..7695daee3b4 100644 --- a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c +++ b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c @@ -11,6 +11,10 @@ #include <freeldr.h> #include <ntoskrnl.h> +#ifndef UNIMPLEMENTED +#define UNIMPLEMENTED ASSERT(FALSE) +#endif + /* FUNCTIONS *****************************************************************/ VOID @@ -52,17 +56,154 @@ IoSetPartitionInformation( return STATUS_NOT_IMPLEMENTED; } -/* - * NTSTATUS - * FASTCALL - * IoReadPartitionTable( - * IN PDEVICE_OBJECT DeviceObject, - * IN ULONG SectorSize, - * IN BOOLEAN ReturnRecognizedPartitions, - * OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); - * - * See boot/freeldr/freeldr/disk/partition.c - */ +#ifndef _M_AMD64 +NTSTATUS +NTAPI +IopReadBootRecord( + IN PDEVICE_OBJECT DeviceObject, + IN ULONGLONG LogicalSectorNumber, + IN ULONG SectorSize, + OUT PMASTER_BOOT_RECORD BootRecord) +{ + ULONG_PTR FileId = (ULONG_PTR)DeviceObject; + LARGE_INTEGER Position; + ULONG BytesRead; + ARC_STATUS Status; + + Position.QuadPart = LogicalSectorNumber * SectorSize; + Status = ArcSeek(FileId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + return STATUS_IO_DEVICE_ERROR; + + Status = ArcRead(FileId, BootRecord, SectorSize, &BytesRead); + if (Status != ESUCCESS || BytesRead != SectorSize) + return STATUS_IO_DEVICE_ERROR; + + return STATUS_SUCCESS; +} + +BOOLEAN +NTAPI +IopCopyPartitionRecord( + IN BOOLEAN ReturnRecognizedPartitions, + IN ULONG SectorSize, + IN PPARTITION_TABLE_ENTRY PartitionTableEntry, + OUT PARTITION_INFORMATION *PartitionEntry) +{ + BOOLEAN IsRecognized; + + IsRecognized = TRUE; /* FIXME */ + if (!IsRecognized && ReturnRecognizedPartitions) + return FALSE; + + PartitionEntry->StartingOffset.QuadPart = (ULONGLONG)PartitionTableEntry->SectorCountBeforePartition * SectorSize; + PartitionEntry->PartitionLength.QuadPart = (ULONGLONG)PartitionTableEntry->PartitionSectorCount * SectorSize; + PartitionEntry->HiddenSectors = 0; + PartitionEntry->PartitionNumber = 0; /* Will be filled later */ + PartitionEntry->PartitionType = PartitionTableEntry->SystemIndicator; + PartitionEntry->BootIndicator = (PartitionTableEntry->BootIndicator & 0x80) ? TRUE : FALSE; + PartitionEntry->RecognizedPartition = IsRecognized; + PartitionEntry->RewritePartition = FALSE; + + return TRUE; +} + +NTSTATUS +FASTCALL +IoReadPartitionTable( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) +{ + NTSTATUS Status; + PMASTER_BOOT_RECORD MasterBootRecord; + PDRIVE_LAYOUT_INFORMATION Partitions; + ULONG NbPartitions, i, Size; + + *PartitionBuffer = NULL; + + if (SectorSize < sizeof(MASTER_BOOT_RECORD)) + return STATUS_NOT_SUPPORTED; + + MasterBootRecord = ExAllocatePool(NonPagedPool, SectorSize); + if (!MasterBootRecord) + return STATUS_NO_MEMORY; + + /* Read disk MBR */ + Status = IopReadBootRecord(DeviceObject, 0, SectorSize, MasterBootRecord); + if (!NT_SUCCESS(Status)) + { + ExFreePool(MasterBootRecord); + return Status; + } + + /* Check validity of boot record */ + if (MasterBootRecord->MasterBootRecordMagic != 0xaa55) + { + ExFreePool(MasterBootRecord); + return STATUS_NOT_SUPPORTED; + } + + /* Count number of partitions */ + NbPartitions = 0; + for (i = 0; i < 4; i++) + { + NbPartitions++; + + if (MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_EXTENDED || + MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_XINT13_EXTENDED) + { + /* FIXME: unhandled case; count number of partitions */ + UNIMPLEMENTED; + } + } + + if (NbPartitions == 0) + { + ExFreePool(MasterBootRecord); + return STATUS_NOT_SUPPORTED; + } + + /* Allocation space to store partitions */ + Size = FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION, PartitionEntry) + + NbPartitions * sizeof(PARTITION_INFORMATION); + Partitions = ExAllocatePool(NonPagedPool, Size); + if (!Partitions) + { + ExFreePool(MasterBootRecord); + return STATUS_NO_MEMORY; + } + + /* Count number of partitions */ + NbPartitions = 0; + for (i = 0; i < 4; i++) + { + if (IopCopyPartitionRecord(ReturnRecognizedPartitions, + SectorSize, + &MasterBootRecord->PartitionTable[i], + &Partitions->PartitionEntry[NbPartitions])) + { + Partitions->PartitionEntry[NbPartitions].PartitionNumber = NbPartitions + 1; + NbPartitions++; + } + + if (MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_EXTENDED || + MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_XINT13_EXTENDED) + { + /* FIXME: unhandled case; copy partitions */ + UNIMPLEMENTED; + } + } + + Partitions->PartitionCount = NbPartitions; + Partitions->Signature = MasterBootRecord->Signature; + ExFreePool(MasterBootRecord); + + *PartitionBuffer = Partitions; + return STATUS_SUCCESS; +} +#endif // _M_AMD64 NTSTATUS FASTCALL diff --git a/boot/freeldr/freeldr/disk/partition.c b/boot/freeldr/freeldr/disk/partition.c index 7afb6e1edbc..6b3fe87c615 100644 --- a/boot/freeldr/freeldr/disk/partition.c +++ b/boot/freeldr/freeldr/disk/partition.c @@ -438,152 +438,4 @@ DiskGetPartitionEntry( return FALSE; } -#ifndef _M_AMD64 -NTSTATUS -NTAPI -IopReadBootRecord( - IN PDEVICE_OBJECT DeviceObject, - IN ULONGLONG LogicalSectorNumber, - IN ULONG SectorSize, - OUT PMASTER_BOOT_RECORD BootRecord) -{ - ULONG_PTR FileId = (ULONG_PTR)DeviceObject; - LARGE_INTEGER Position; - ULONG BytesRead; - ARC_STATUS Status; - - Position.QuadPart = LogicalSectorNumber * SectorSize; - Status = ArcSeek(FileId, &Position, SeekAbsolute); - if (Status != ESUCCESS) - return STATUS_IO_DEVICE_ERROR; - - Status = ArcRead(FileId, BootRecord, SectorSize, &BytesRead); - if (Status != ESUCCESS || BytesRead != SectorSize) - return STATUS_IO_DEVICE_ERROR; - - return STATUS_SUCCESS; -} - -BOOLEAN -NTAPI -IopCopyPartitionRecord( - IN BOOLEAN ReturnRecognizedPartitions, - IN ULONG SectorSize, - IN PPARTITION_TABLE_ENTRY PartitionTableEntry, - OUT PARTITION_INFORMATION *PartitionEntry) -{ - BOOLEAN IsRecognized; - - IsRecognized = TRUE; /* FIXME */ - if (!IsRecognized && ReturnRecognizedPartitions) - return FALSE; - - PartitionEntry->StartingOffset.QuadPart = (ULONGLONG)PartitionTableEntry->SectorCountBeforePartition * SectorSize; - PartitionEntry->PartitionLength.QuadPart = (ULONGLONG)PartitionTableEntry->PartitionSectorCount * SectorSize; - PartitionEntry->HiddenSectors = 0; - PartitionEntry->PartitionNumber = 0; /* Will be filled later */ - PartitionEntry->PartitionType = PartitionTableEntry->SystemIndicator; - PartitionEntry->BootIndicator = (PartitionTableEntry->BootIndicator & 0x80) ? TRUE : FALSE; - PartitionEntry->RecognizedPartition = IsRecognized; - PartitionEntry->RewritePartition = FALSE; - - return TRUE; -} - -NTSTATUS -FASTCALL -IoReadPartitionTable( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN BOOLEAN ReturnRecognizedPartitions, - OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) -{ - NTSTATUS Status; - PMASTER_BOOT_RECORD MasterBootRecord; - PDRIVE_LAYOUT_INFORMATION Partitions; - ULONG NbPartitions, i, Size; - - *PartitionBuffer = NULL; - - if (SectorSize < sizeof(MASTER_BOOT_RECORD)) - return STATUS_NOT_SUPPORTED; - - MasterBootRecord = ExAllocatePool(NonPagedPool, SectorSize); - if (!MasterBootRecord) - return STATUS_NO_MEMORY; - - /* Read disk MBR */ - Status = IopReadBootRecord(DeviceObject, 0, SectorSize, MasterBootRecord); - if (!NT_SUCCESS(Status)) - { - ExFreePool(MasterBootRecord); - return Status; - } - - /* Check validity of boot record */ - if (MasterBootRecord->MasterBootRecordMagic != 0xaa55) - { - ExFreePool(MasterBootRecord); - return STATUS_NOT_SUPPORTED; - } - - /* Count number of partitions */ - NbPartitions = 0; - for (i = 0; i < 4; i++) - { - NbPartitions++; - - if (MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_EXTENDED || - MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_XINT13_EXTENDED) - { - /* FIXME: unhandled case; count number of partitions */ - UNIMPLEMENTED; - } - } - - if (NbPartitions == 0) - { - ExFreePool(MasterBootRecord); - return STATUS_NOT_SUPPORTED; - } - - /* Allocation space to store partitions */ - Size = FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION, PartitionEntry) + - NbPartitions * sizeof(PARTITION_INFORMATION); - Partitions = ExAllocatePool(NonPagedPool, Size); - if (!Partitions) - { - ExFreePool(MasterBootRecord); - return STATUS_NO_MEMORY; - } - - /* Count number of partitions */ - NbPartitions = 0; - for (i = 0; i < 4; i++) - { - if (IopCopyPartitionRecord(ReturnRecognizedPartitions, - SectorSize, - &MasterBootRecord->PartitionTable[i], - &Partitions->PartitionEntry[NbPartitions])) - { - Partitions->PartitionEntry[NbPartitions].PartitionNumber = NbPartitions + 1; - NbPartitions++; - } - - if (MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_EXTENDED || - MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_XINT13_EXTENDED) - { - /* FIXME: unhandled case; copy partitions */ - UNIMPLEMENTED; - } - } - - Partitions->PartitionCount = NbPartitions; - Partitions->Signature = MasterBootRecord->Signature; - ExFreePool(MasterBootRecord); - - *PartitionBuffer = Partitions; - return STATUS_SUCCESS; -} -#endif // _M_AMD64 #endif

1 month, 3 weeks

[reactos] 01/07: [FREELDR] Fix some trace prints

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77ba2d496bf9065983622… commit 77ba2d496bf90659836226d1695a9f11adeb3d41 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 3 10:16:21 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Fix some trace prints --- boot/freeldr/freeldr/lib/peloader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 7596da490db..857dba43258 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -153,7 +153,7 @@ PeLdrpBindImportName( PCHAR ExportName, ForwarderName; BOOLEAN Success; - //TRACE("PeLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", + //TRACE("PeLdrpBindImportName(): DllBase 0x%p, ImageBase 0x%p, ThunkData 0x%p, ExportDirectory 0x%p, ExportSize %d, ProcessForwards 0x%X\n", // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); /* Check passed DllBase param */ @@ -462,8 +462,8 @@ PeLdrpScanImportAddressTable( BOOLEAN Success; ULONG ExportSize; - TRACE("PeLdrpScanImportAddressTable(): DllBase 0x%X, " - "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData); + TRACE("PeLdrpScanImportAddressTable(): DllBase 0x%p, " + "ImageBase 0x%p, ThunkData 0x%p\n", DllBase, ImageBase, ThunkData); /* Obtain the export table from the DLL's base */ if (DllBase == NULL) @@ -480,7 +480,7 @@ PeLdrpScanImportAddressTable( &ExportSize); } - TRACE("PeLdrpScanImportAddressTable(): ExportDirectory 0x%X\n", ExportDirectory); + TRACE("PeLdrpScanImportAddressTable(): ExportDirectory 0x%p\n", ExportDirectory); /* If pointer to Export Directory is */ if (ExportDirectory == NULL) @@ -589,7 +589,7 @@ PeLdrCheckForLoadedDll( to the caller and increase load count for it */ *LoadedEntry = DataTableEntry; DataTableEntry->LoadCount++; - TRACE("PeLdrCheckForLoadedDll: LoadedEntry %X\n", DataTableEntry); + TRACE("PeLdrCheckForLoadedDll: LoadedEntry 0x%p\n", DataTableEntry); return TRUE; } @@ -623,7 +623,7 @@ PeLdrScanImportDescriptorTable( BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; BaseName.Length = ScanDTE->BaseDllName.Length; - TRACE("PeLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", + TRACE("PeLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%p\n", &BaseName, ImportTable); } #endif @@ -897,7 +897,7 @@ PeLdrLoadImage( /* This is the real image base, in form of a virtual address */ VirtualBase = PaToVa(PhysicalBase); - TRACE("Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); + TRACE("Base PA: 0x%p, VA: 0x%p\n", PhysicalBase, VirtualBase); /* Copy headers from already read data */ RtlCopyMemory(PhysicalBase, HeadersBuffer, min(NtHeaders->OptionalHeader.SizeOfHeaders, sizeof(HeadersBuffer)));

1 month, 3 weeks

[reactos] 01/01: [NTOS:MM] Implement MmAllocate/FreeMappingAddress (#7260)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83d74e74338874a107894… commit 83d74e74338874a107894bb0ba5159ee6a0608c8 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sat Nov 2 15:10:51 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 15:10:51 2024 +0100 [NTOS:MM] Implement MmAllocate/FreeMappingAddress (#7260) Implement MmAllocateMappingAddress and MmFreeMappingAddress routines. Based on mm-implement-mappingaddress.patch by Thomas Faber with some changes from me. Required by Microsoft NTFS driver (from Windows Server 2003 SP2 only, the one from Windows XP SP3 does not need them) and by NDIS & TDI drivers (both from Windows XP SP3 and Windows Server 2003 SP2). Also they are called when using Dr. Web Security Space 8 filter drivers together with MS FltMgr & TDI. Fortunately, this part (these two routines) are enough to get the drivers working in both cases, and others (partially incomplete) routines are not badly required, so they can be finished and committed later. CORE-10147, CORE-14635, CORE-17409, CORE-19318 --- ntoskrnl/mm/ARM3/miarm.h | 8 +++ ntoskrnl/mm/ARM3/pool.c | 132 ++++++++++++++++++++++++++++++++++++++++++---- sdk/include/xdk/mmfuncs.h | 4 +- 3 files changed, 131 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 3f32bced9a3..7515b4c506b 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -154,6 +154,14 @@ C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE); #error Define these please! #endif +// +// Some internal SYSTEM_PTE_MISUSE bugcheck subcodes +// +#define PTE_MAPPING_NONE 0x100 +#define PTE_MAPPING_NOT_OWNED 0x101 +#define PTE_MAPPING_EMPTY 0x102 +#define PTE_MAPPING_RESERVED 0x103 + // // Mask for image section page protection // diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index 8ab8ae293a4..badc8a3e4d7 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -1552,27 +1552,137 @@ MmReturnPoolQuota( /* PUBLIC FUNCTIONS ***********************************************************/ -/* - * @unimplemented +/** + * @brief + * Reserves the specified amount of memory in system virtual address space. + * + * @param[in] NumberOfBytes + * Size, in bytes, of memory to reserve. + * + * @param[in] PoolTag + * Pool Tag identifying the buffer. Usually consists from 4 characters in reversed order. + * + * @return + * A pointer to the 1st memory block of the reserved buffer in case of success, NULL otherwise. + * + * @remarks Must be called at IRQL <= APC_LEVEL */ +_Must_inspect_result_ +_IRQL_requires_max_(APC_LEVEL) +_Ret_maybenull_ PVOID NTAPI -MmAllocateMappingAddress(IN SIZE_T NumberOfBytes, - IN ULONG PoolTag) +MmAllocateMappingAddress( + _In_ SIZE_T NumberOfBytes, + _In_ ULONG PoolTag) { - UNIMPLEMENTED; - return NULL; + PFN_NUMBER SizeInPages; + PMMPTE PointerPte; + MMPTE TempPte; + + /* How many PTEs does the caller want? */ + SizeInPages = BYTES_TO_PAGES(NumberOfBytes); + if (SizeInPages == 0) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_NONE, /* Requested 0 mappings */ + SizeInPages, + PoolTag, + (ULONG_PTR)_ReturnAddress()); + } + + /* We need two extra PTEs to store size and pool tag in */ + SizeInPages += 2; + + /* Reserve our PTEs */ + PointerPte = MiReserveSystemPtes(SizeInPages, SystemPteSpace); + if (!PointerPte) + { + /* Failed to reserve PTEs */ + DPRINT1("Failed to reserve system PTEs\n"); + return NULL; + } + + ASSERT(SizeInPages <= MM_EMPTY_PTE_LIST); + TempPte.u.Long = 0; + TempPte.u.List.NextEntry = SizeInPages; + MI_WRITE_INVALID_PTE(&PointerPte[0], TempPte); + TempPte.u.Long = PoolTag; + TempPte.u.Hard.Valid = 0; + MI_WRITE_INVALID_PTE(&PointerPte[1], TempPte); + return MiPteToAddress(PointerPte + 2); } -/* - * @unimplemented +/** + * @brief + * Frees previously reserved amount of memory in system virtual address space. + * + * @param[in] BaseAddress + * A pointer to the 1st memory block of the reserved buffer. + * + * @param[in] PoolTag + * Pool Tag identifying the buffer. Usually consists from 4 characters in reversed order. + * + * @return + * Nothing. + * + * @see MmAllocateMappingAddress + * + * @remarks Must be called at IRQL <= APC_LEVEL */ +_IRQL_requires_max_(APC_LEVEL) VOID NTAPI -MmFreeMappingAddress(IN PVOID BaseAddress, - IN ULONG PoolTag) +MmFreeMappingAddress( + _In_ __drv_freesMem(Mem) _Post_invalid_ PVOID BaseAddress, + _In_ ULONG PoolTag) { - UNIMPLEMENTED; + PMMPTE PointerPte; + MMPTE TempPte; + PFN_NUMBER SizeInPages; + PFN_NUMBER i; + + /* Get the first PTE we reserved */ + PointerPte = MiAddressToPte(BaseAddress) - 2; + + /* Verify that the pool tag matches */ + TempPte.u.Long = PoolTag; + TempPte.u.Hard.Valid = 0; + if (PointerPte[1].u.Long != TempPte.u.Long) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_NOT_OWNED, /* Trying to free an address it does not own */ + (ULONG_PTR)BaseAddress, + PoolTag, + PointerPte[1].u.Long); + } + + /* We must have a size */ + SizeInPages = PointerPte[0].u.List.NextEntry; + if (SizeInPages < 3) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_EMPTY, /* Mapping apparently empty */ + (ULONG_PTR)BaseAddress, + PoolTag, + (ULONG_PTR)_ReturnAddress()); + } + + /* Enumerate all PTEs and make sure they are empty */ + for (i = 2; i < SizeInPages; i++) + { + if (PointerPte[i].u.Long != 0) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_RESERVED, /* Mapping address still reserved */ + (ULONG_PTR)PointerPte, + PoolTag, + SizeInPages - 2); + } + } + + /* Release the PTEs */ + MiReleaseSystemPtes(PointerPte, SizeInPages, SystemPteSpace); } /* EOF */ diff --git a/sdk/include/xdk/mmfuncs.h b/sdk/include/xdk/mmfuncs.h index 478763fbc6e..da9734c046b 100644 --- a/sdk/include/xdk/mmfuncs.h +++ b/sdk/include/xdk/mmfuncs.h @@ -633,7 +633,7 @@ MmAdvanceMdl( _Must_inspect_result_ _IRQL_requires_max_(APC_LEVEL) -_When_ (return != NULL, _Out_writes_bytes_opt_ (NumberOfBytes)) +_Ret_maybenull_ NTKERNELAPI PVOID NTAPI @@ -646,7 +646,7 @@ NTKERNELAPI VOID NTAPI MmFreeMappingAddress( - _In_ PVOID BaseAddress, + _In_ __drv_freesMem(Mem) _Post_invalid_ PVOID BaseAddress, _In_ ULONG PoolTag); _IRQL_requires_max_ (APC_LEVEL)

1 month, 3 weeks

[reactos] 06/06: [VCRUNTIME] Stop including crtdefs.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abbc78401095be4d94dfa… commit abbc78401095be4d94dfa0050b4d307e83b1b7b4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 12 17:09:32 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 12:52:59 2024 +0200 [VCRUNTIME] Stop including crtdefs.h --- sdk/include/vcruntime/emmintrin.h | 2 +- sdk/include/vcruntime/excpt.h | 2 +- sdk/include/vcruntime/intrin.h | 2 +- sdk/include/vcruntime/limits.h | 2 +- sdk/include/vcruntime/mmintrin.h | 4 ++-- sdk/include/vcruntime/rtcapi.h | 2 +- sdk/include/vcruntime/setjmp.h | 2 +- sdk/include/vcruntime/stdarg.h | 2 +- sdk/include/vcruntime/stdint.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sdk/include/vcruntime/emmintrin.h b/sdk/include/vcruntime/emmintrin.h index 21e6ece0c6a..2fbb5bd0c9f 100644 --- a/sdk/include/vcruntime/emmintrin.h +++ b/sdk/include/vcruntime/emmintrin.h @@ -11,7 +11,7 @@ #ifndef _INCLUDED_EMM #define _INCLUDED_EMM -#include <crtdefs.h> +#include <vcruntime.h> #include <xmmintrin.h> #if defined(_MSC_VER) && !defined(__clang__) diff --git a/sdk/include/vcruntime/excpt.h b/sdk/include/vcruntime/excpt.h index 62841cbda23..798b19180f1 100644 --- a/sdk/include/vcruntime/excpt.h +++ b/sdk/include/vcruntime/excpt.h @@ -6,7 +6,7 @@ #ifndef _INC_EXCPT #define _INC_EXCPT -#include <crtdefs.h> +#include <vcruntime.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/vcruntime/intrin.h b/sdk/include/vcruntime/intrin.h index 3a03d02fe3e..513c2667786 100644 --- a/sdk/include/vcruntime/intrin.h +++ b/sdk/include/vcruntime/intrin.h @@ -4,7 +4,7 @@ #ifndef RC_INVOKED -#include <crtdefs.h> +#include <vcruntime.h> #include <setjmp.h> #include <stddef.h> diff --git a/sdk/include/vcruntime/limits.h b/sdk/include/vcruntime/limits.h index 9fad49b873d..f571e1d208e 100644 --- a/sdk/include/vcruntime/limits.h +++ b/sdk/include/vcruntime/limits.h @@ -4,7 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ #pragma once -#include <crtdefs.h> +#include <vcruntime.h> #ifndef _INC_LIMITS #define _INC_LIMITS diff --git a/sdk/include/vcruntime/mmintrin.h b/sdk/include/vcruntime/mmintrin.h index 61a1427e6dc..28124c91fda 100644 --- a/sdk/include/vcruntime/mmintrin.h +++ b/sdk/include/vcruntime/mmintrin.h @@ -22,7 +22,7 @@ #ifndef _MMINTRIN_H_INCLUDED #define _MMINTRIN_H_INCLUDED -#include <crtdefs.h> +#include <vcruntime.h> #ifdef __cplusplus extern "C" { @@ -42,7 +42,7 @@ extern "C" { float m64_f32[2]; __int8 m64_i8[8]; __int16 m64_i16[4]; - __int32 m64_i32[2]; + __int32 m64_i32[2]; __int64 m64_i64; unsigned __int8 m64_u8[8]; unsigned __int16 m64_u16[4]; diff --git a/sdk/include/vcruntime/rtcapi.h b/sdk/include/vcruntime/rtcapi.h index 0aeb8afa431..adf058abeab 100644 --- a/sdk/include/vcruntime/rtcapi.h +++ b/sdk/include/vcruntime/rtcapi.h @@ -6,7 +6,7 @@ #ifndef _INC_RTCAPI #define _INC_RTCAPI -#include <crtdefs.h> +#include <vcruntime.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/vcruntime/setjmp.h b/sdk/include/vcruntime/setjmp.h index 80e90f75b9b..e7d80129a8b 100644 --- a/sdk/include/vcruntime/setjmp.h +++ b/sdk/include/vcruntime/setjmp.h @@ -6,7 +6,7 @@ #ifndef _INC_SETJMP #define _INC_SETJMP -#include <crtdefs.h> +#include <vcruntime.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/vcruntime/stdarg.h b/sdk/include/vcruntime/stdarg.h index 54e54779c2d..f56ca0ce33a 100644 --- a/sdk/include/vcruntime/stdarg.h +++ b/sdk/include/vcruntime/stdarg.h @@ -33,7 +33,7 @@ Boston, MA 02110-1301, USA. */ #ifndef _INC_STDARG #define _INC_STDARG -#include <crtdefs.h> +#include <vcruntime.h> #include <vadefs.h> #ifndef _WIN32 diff --git a/sdk/include/vcruntime/stdint.h b/sdk/include/vcruntime/stdint.h index 4c99ed04414..3246acf00bf 100644 --- a/sdk/include/vcruntime/stdint.h +++ b/sdk/include/vcruntime/stdint.h @@ -25,7 +25,7 @@ #ifndef _STDINT_H #define _STDINT_H -#include <crtdefs.h> +#include <vcruntime.h> #define __need_wint_t #define __need_wchar_t

1 month, 3 weeks

[reactos] 05/06: [VCRUNTIME] Add some missing definitions to vcruntime*.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2955b1f0e95ec66e5f7f7… commit 2955b1f0e95ec66e5f7f7156bb437e980667566c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 12 13:32:45 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 12:52:59 2024 +0200 [VCRUNTIME] Add some missing definitions to vcruntime*.h --- sdk/include/vcruntime/vcruntime.h | 88 ++++++++++++++++++++++++ sdk/include/vcruntime/vcruntime_startup.h | 15 +++++ sdk/include/vcruntime/vcruntime_string.h | 107 ++++++++++++++++++++++++++++++ 3 files changed, 210 insertions(+) diff --git a/sdk/include/vcruntime/vcruntime.h b/sdk/include/vcruntime/vcruntime.h index aef28c5d0b7..3344cec75ee 100644 --- a/sdk/include/vcruntime/vcruntime.h +++ b/sdk/include/vcruntime/vcruntime.h @@ -11,6 +11,32 @@ #define _CRT_WIDE_(_String) L ## _String #define _CRT_WIDE(_String) _CRT_WIDE_(_String) +#define _CRT_CONCATENATE_(a, b) a ## b +#define _CRT_CONCATENATE(a, b) _CRT_CONCATENATE_(a, b) + +#define _CRT_UNPARENTHESIZE_(...) __VA_ARGS__ +#define _CRT_UNPARENTHESIZE(...) _CRT_UNPARENTHESIZE_ __VA_ARGS__ + +#ifndef _MSC_VER +#define __pragma(x) _Pragma(_CRT_STRINGIZE(x)) +#endif + +#ifdef __cplusplus + #define _CRT_BEGIN_C_HEADER \ + __pragma(pack(push, _CRT_PACKING_IDENTIFIER, _CRT_PACKING)) \ + extern "C" { + #define _CRT_END_C_HEADER \ + } \ + __pragma(pack(pop, _CRT_PACKING_IDENTIFIER)) +#else + #define _CRT_BEGIN_C_HEADER \ + __pragma(pack(push, _CRT_PACKING_IDENTIFIER, _CRT_PACKING)) + #define _CRT_END_C_HEADER \ + __pragma(pack(pop, _CRT_PACKING_IDENTIFIER)) +#endif + +_CRT_BEGIN_C_HEADER + #ifndef _CRTIMP #ifdef CRTDLL /* Defined for ntdll, crtdll, msvcrt, etc */ #define _CRTIMP @@ -21,6 +47,16 @@ #endif /* CRTDLL || _DLL */ #endif /* !_CRTIMP */ +#ifndef _VCRTIMP + #ifndef _VCRT_DEFINED_CRTIMP + #define _VCRTIMP _CRTIMP + #elif defined(_VCRT_BUILD) && defined(CRTDLL) && !defined(_VCRT_SAT_1) + #define _VCRTIMP __declspec(dllexport) + #else + #define _VCRTIMP + #endif +#endif + #ifndef __CRTDECL #define __CRTDECL __cdecl #endif @@ -118,3 +154,55 @@ #define _CRT_ALIGN(x) __attribute__ ((aligned(x))) #endif #endif + +#if defined (__midl) || defined(__WIDL__) + #define _VCRT_ALIGN(x) +#elif defined(_MSC_VER) + #define _CRT_ALIGN(x) __declspec(align(x)) +#else + #define _VCRT_ALIGN(x) __attribute__ ((aligned(x))) +#endif + +#if defined __cplusplus + typedef bool __vcrt_bool; +#elif defined __midl + typedef char __vcrt_bool; +#else + typedef _Bool __vcrt_bool; +#endif + +#ifndef _HAS_NODISCARD + #ifndef __has_cpp_attribute + #define _HAS_NODISCARD 0 + #elif __has_cpp_attribute(nodiscard) >= 201603L + #define _HAS_NODISCARD 1 + #else + #define _HAS_NODISCARD 0 + #endif +#endif // _HAS_NODISCARD + +#if _HAS_NODISCARD + #define _NODISCARD [[nodiscard]] +#else + #define _NODISCARD +#endif // _HAS_NODISCARD + +#if defined _M_X64 || defined _M_ARM || defined _M_ARM64 + #define _UNALIGNED __unaligned +#else + #define _UNALIGNED +#endif + +#ifdef __cplusplus + // Safer than the C definition, as it ensures that the argument is not a pointer + extern "C++" template<typename _T, size_t _Size> + char (*__crt_countof_helper(_UNALIGNED _T(&_Array)[_Size]))[_Size]; + #define __crt_countof(_Array) sizeof(*__crt_countof_helper(_Array)) +#else + #define __crt_countof(_Array) (sizeof(_Array) / sizeof(_Array[0])) +#endif + +void __cdecl __security_init_cookie(void); +extern uintptr_t __security_cookie; + +_CRT_END_C_HEADER diff --git a/sdk/include/vcruntime/vcruntime_startup.h b/sdk/include/vcruntime/vcruntime_startup.h index 646ca4e82d4..f84012e542e 100644 --- a/sdk/include/vcruntime/vcruntime_startup.h +++ b/sdk/include/vcruntime/vcruntime_startup.h @@ -7,3 +7,18 @@ typedef enum _crt_argv_mode _crt_argv_unexpanded_arguments, _crt_argv_expanded_arguments, } _crt_argv_mode; + +typedef enum _crt_exit_cleanup_mode +{ + _crt_exit_full_cleanup, + _crt_exit_quick_cleanup, + _crt_exit_no_cleanup +} _crt_exit_cleanup_mode; + +typedef enum _crt_exit_return_mode +{ + _crt_exit_terminate_process, + _crt_exit_return_to_caller +} _crt_exit_return_mode; + +__vcrt_bool __cdecl __vcrt_uninitialize(_In_ __vcrt_bool _Terminating); diff --git a/sdk/include/vcruntime/vcruntime_string.h b/sdk/include/vcruntime/vcruntime_string.h index 3dfac8d4bd1..ce5c2bbfc4c 100644 --- a/sdk/include/vcruntime/vcruntime_string.h +++ b/sdk/include/vcruntime/vcruntime_string.h @@ -2,3 +2,110 @@ #pragma once #include <vcruntime.h> + +_CRT_BEGIN_C_HEADER + +void* +__cdecl +memset( + _Out_writes_bytes_all_(_Size) void *_Dst, + _In_ int _Val, + _In_ size_t _Size); + +_CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) +_Post_equal_to_(_Dst) +_At_buffer_((unsigned char*)_Dst, _Iter_, _Size, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == ((unsigned char*)_Src)[_Iter_])) +void* +__cdecl +memcpy( + _Out_writes_bytes_all_(_Size) void *_Dst, + _In_reads_bytes_(_Size) void const *_Src, + _In_ size_t _Size); + +_CRT_INSECURE_DEPRECATE_MEMORY(memmove_s) +_VCRTIMP +void* +__cdecl +memmove( + _Out_writes_bytes_all_opt_(_Size) void *_Dst, + _In_reads_bytes_opt_(_Size) void const *_Src, + _In_ size_t _Size); + +_NODISCARD +_Check_return_ +_VCRTIMP +char _CONST_RETURN* +__cdecl +strchr( + _In_z_ const char *_Str, + _In_ int _Val); + +_NODISCARD +_Check_return_ +_When_(return != NULL, _Ret_range_(_Str, _Str + _String_length_(_Str) - 1)) +_VCRTIMP +wchar_t _CONST_RETURN* +__cdecl +wcschr( + _In_z_ const wchar_t *_Str, + _In_ wchar_t _Ch); + +_NODISCARD +_Check_return_ +_VCRTIMP +char _CONST_RETURN* +__cdecl strrchr( + _In_z_ const char *_Str, + _In_ int _Ch); + +_NODISCARD +_Check_return_ +_Ret_maybenull_ +_VCRTIMP +char _CONST_RETURN* +__cdecl +strstr( + _In_z_ const char *_Str, + _In_z_ const char *_SubStr); + +_NODISCARD +_Check_return_ +int +__cdecl +memcmp( + _In_reads_bytes_(_Size) const void *_Buf1, + _In_reads_bytes_(_Size) const void *_Buf2, + _In_ size_t _Size); + +_NODISCARD +_Check_return_ +_Ret_maybenull_ +_When_(return != NULL, _Ret_range_(_Str, _Str + _String_length_(_Str) - 1)) +_VCRTIMP +wchar_t _CONST_RETURN* +__cdecl +wcsstr( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_SubStr); + +_NODISCARD +_Check_return_ +_VCRTIMP +void _CONST_RETURN* +__cdecl +memchr( + _In_reads_bytes_opt_(_MaxCount) const void *_Buf, + _In_ int _Val, + _In_ size_t _MaxCount); + +_NODISCARD +_Check_return_ +_VCRTIMP +wchar_t _CONST_RETURN* +__cdecl +wcsrchr( + _In_z_ const wchar_t *_Str, + _In_ wchar_t _Ch); + +_CRT_END_C_HEADER

1 month, 3 weeks

[reactos] 04/06: [VCRUNTIME] Move some definitions from crtdefs.h to vadefs.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90e95d15a2851f577e98d… commit 90e95d15a2851f577e98d5d42522587f16b25f09 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 11 10:20:48 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 12:52:59 2024 +0200 [VCRUNTIME] Move some definitions from crtdefs.h to vadefs.h --- sdk/include/vcruntime/crtdefs.h | 33 --------------------------------- sdk/include/vcruntime/vadefs.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/sdk/include/vcruntime/crtdefs.h b/sdk/include/vcruntime/crtdefs.h index da025e5d0b6..5068c265b34 100644 --- a/sdk/include/vcruntime/crtdefs.h +++ b/sdk/include/vcruntime/crtdefs.h @@ -211,45 +211,12 @@ extern "C" { #endif -#ifndef _UINTPTR_T_DEFINED -#define _UINTPTR_T_DEFINED -#ifndef __uintptr_t_defined -#define __uintptr_t_defined -#undef uintptr_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef unsigned int uintptr_t __attribute__ ((mode (DI))); -#else - __MINGW_EXTENSION typedef unsigned __int64 uintptr_t; -#endif -#else - typedef unsigned int uintptr_t; -#endif -#endif -#endif - #ifndef _WCTYPE_T_DEFINED #define _WCTYPE_T_DEFINED typedef unsigned short wint_t; typedef unsigned short wctype_t; #endif -#ifdef __GNUC__ -#ifndef __GNUC_VA_LIST -#define __GNUC_VA_LIST - typedef __builtin_va_list __gnuc_va_list; -#endif -#endif - -#ifndef _VA_LIST_DEFINED -#define _VA_LIST_DEFINED -#if defined(__GNUC__) - typedef __gnuc_va_list va_list; -#elif defined(_MSC_VER) - typedef _Writable_bytes_(_Inexpressible_("length varies")) char * va_list; -#endif -#endif - #ifndef _ERRCODE_DEFINED #define _ERRCODE_DEFINED typedef int errcode; diff --git a/sdk/include/vcruntime/vadefs.h b/sdk/include/vcruntime/vadefs.h index f01e67e496b..57761f6858a 100644 --- a/sdk/include/vcruntime/vadefs.h +++ b/sdk/include/vcruntime/vadefs.h @@ -18,6 +18,39 @@ extern "C" { #endif +#ifdef __GNUC__ +#ifndef __GNUC_VA_LIST +#define __GNUC_VA_LIST + typedef __builtin_va_list __gnuc_va_list; +#endif +#endif + +#ifndef _VA_LIST_DEFINED +#define _VA_LIST_DEFINED +#if defined(__GNUC__) + typedef __gnuc_va_list va_list; +#elif defined(_MSC_VER) + typedef _Writable_bytes_(_Inexpressible_("length varies")) char * va_list; +#endif +#endif + +#ifndef _UINTPTR_T_DEFINED +#define _UINTPTR_T_DEFINED +#ifndef __uintptr_t_defined +#define __uintptr_t_defined +#undef uintptr_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef unsigned int uintptr_t __attribute__ ((mode (DI))); +#else + typedef unsigned __int64 uintptr_t; +#endif +#else + typedef unsigned int uintptr_t; +#endif +#endif +#endif + #ifdef __cplusplus #define _ADDRESSOF(v) (&reinterpret_cast<const char &>(v)) #else

1 month, 3 weeks

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