Ros-diffs July 2018

ros-diffs@reactos.org

17 participants
89 discussions

07/10: [DRIVERS][NTOS][NDK] Use IO_STACK_LOCATION instead of EXTENDED_IO_STACK_LOCATION and remove the latter from NDK

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca9fd861aa7e2eb6fd142… commit ca9fd861aa7e2eb6fd142a71ede1839ea70390ba Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Apr 3 16:58:44 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [DRIVERS][NTOS][NDK] Use IO_STACK_LOCATION instead of EXTENDED_IO_STACK_LOCATION and remove the latter from NDK --- drivers/filesystems/ext2/inc/ext2fs.h | 1 + drivers/filesystems/msfs/create.c | 4 +- drivers/filesystems/npfs/create.c | 8 +- drivers/filesystems/reiserfs/inc/rfsd.h | 1 + ntoskrnl/io/iomgr/file.c | 4 +- sdk/include/ndk/iotypes.h | 256 +------------------------------- 6 files changed, 11 insertions(+), 263 deletions(-) diff --git a/drivers/filesystems/ext2/inc/ext2fs.h b/drivers/filesystems/ext2/inc/ext2fs.h index 10ec2eab5f..08fd465f93 100644 --- a/drivers/filesystems/ext2/inc/ext2fs.h +++ b/drivers/filesystems/ext2/inc/ext2fs.h @@ -17,6 +17,7 @@ #ifdef __REACTOS__ #include <ndk/rtlfuncs.h> #include <pseh/pseh2.h> +typedef IO_STACK_LOCATION EXTENDED_IO_STACK_LOCATION, *PEXTENDED_IO_STACK_LOCATION; #endif #include <stdio.h> #include <time.h> diff --git a/drivers/filesystems/msfs/create.c b/drivers/filesystems/msfs/create.c index 1f47eb5c3d..45aa875481 100644 --- a/drivers/filesystems/msfs/create.c +++ b/drivers/filesystems/msfs/create.c @@ -107,7 +107,7 @@ NTSTATUS DEFAULTAPI MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PEXTENDED_IO_STACK_LOCATION IoStack; + PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PMSFS_DEVICE_EXTENSION DeviceExtension; PMSFS_FCB Fcb; @@ -119,7 +119,7 @@ MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, DPRINT("MsfsCreateMailslot(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); + IoStack = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Buffer = IoStack->Parameters.CreateMailslot.Parameters; diff --git a/drivers/filesystems/npfs/create.c b/drivers/filesystems/npfs/create.c index 96e60e306a..da2f967faf 100644 --- a/drivers/filesystems/npfs/create.c +++ b/drivers/filesystems/npfs/create.c @@ -361,7 +361,7 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { IO_STATUS_BLOCK IoStatus; - PEXTENDED_IO_STACK_LOCATION IoStack; + PIO_STACK_LOCATION IoStack; UNICODE_STRING FileName; PFILE_OBJECT FileObject; PFILE_OBJECT RelatedFileObject; @@ -375,7 +375,7 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, TRACE("Entered\n"); InitializeListHead(&DeferredList); - IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); + IoStack = IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; RelatedFileObject = FileObject->RelatedFileObject; FileName = FileObject->FileName; @@ -791,7 +791,7 @@ NTAPI NpFsdCreateNamedPipe(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PEXTENDED_IO_STACK_LOCATION IoStack; + PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PFILE_OBJECT RelatedFileObject; USHORT Disposition, ShareAccess; @@ -807,7 +807,7 @@ NpFsdCreateNamedPipe(IN PDEVICE_OBJECT DeviceObject, InitializeListHead(&DeferredList); Process = IoGetRequestorProcess(Irp); - IoStack = (PEXTENDED_IO_STACK_LOCATION) IoGetCurrentIrpStackLocation(Irp); + IoStack = IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; RelatedFileObject = FileObject->RelatedFileObject; diff --git a/drivers/filesystems/reiserfs/inc/rfsd.h b/drivers/filesystems/reiserfs/inc/rfsd.h index 2f36e786c4..5d8b200d01 100644 --- a/drivers/filesystems/reiserfs/inc/rfsd.h +++ b/drivers/filesystems/reiserfs/inc/rfsd.h @@ -26,6 +26,7 @@ #ifdef __REACTOS__ #include <ndk/rtlfuncs.h> #include <pseh/pseh2.h> +typedef IO_STACK_LOCATION EXTENDED_IO_STACK_LOCATION, *PEXTENDED_IO_STACK_LOCATION; #endif typedef struct reiserfs_super_block_v1 RFSD_SUPER_BLOCK, *PRFSD_SUPER_BLOCK; diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 71863ccb42..15504adaca 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -285,7 +285,7 @@ IopParseDevice(IN PVOID ParseObject, PFILE_OBJECT FileObject; PVPB Vpb = NULL; PIRP Irp; - PEXTENDED_IO_STACK_LOCATION StackLoc; + PIO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; IO_STATUS_BLOCK IoStatusBlock; BOOLEAN DirectOpen = FALSE, OpenCancelled, UseDummyFile; @@ -673,7 +673,7 @@ IopParseDevice(IN PVOID ParseObject, SecurityContext.FullCreateOptions = OpenPacket->CreateOptions; /* Get the I/O Stack location */ - StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); + StackLoc = IoGetNextIrpStackLocation(Irp); StackLoc->Control = 0; /* Check what kind of file this is */ diff --git a/sdk/include/ndk/iotypes.h b/sdk/include/ndk/iotypes.h index ed4a9facc2..b693b617e0 100644 --- a/sdk/include/ndk/iotypes.h +++ b/sdk/include/ndk/iotypes.h @@ -937,261 +937,7 @@ typedef struct _EXTENDED_DRIVER_EXTENSION PFS_FILTER_CALLBACKS FsFilterCallbacks; } EXTENDED_DRIVER_EXTENSION, *PEXTENDED_DRIVER_EXTENSION; -// -// Extended I/O Stack Location Structure -// -typedef struct _EXTENDED_IO_STACK_LOCATION -{ - UCHAR MajorFunction; - UCHAR MinorFunction; - UCHAR Flags; - UCHAR Control; - union - { - struct - { - PIO_SECURITY_CONTEXT SecurityContext; - ULONG Options; - USHORT POINTER_ALIGNMENT FileAttributes; - USHORT ShareAccess; - ULONG POINTER_ALIGNMENT EaLength; - } Create; - struct - { - PIO_SECURITY_CONTEXT SecurityContext; - ULONG Options; - USHORT POINTER_ALIGNMENT Reserved; - USHORT ShareAccess; - struct _NAMED_PIPE_CREATE_PARAMETERS *Parameters; - } CreatePipe; - struct - { - PIO_SECURITY_CONTEXT SecurityContext; - ULONG Options; - USHORT POINTER_ALIGNMENT Reserved; - USHORT ShareAccess; - struct _MAILSLOT_CREATE_PARAMETERS *Parameters; - } CreateMailslot; - struct - { - ULONG Length; - ULONG POINTER_ALIGNMENT Key; - LARGE_INTEGER ByteOffset; - } Read; - struct - { - ULONG Length; - ULONG POINTER_ALIGNMENT Key; - LARGE_INTEGER ByteOffset; - } Write; - struct - { - ULONG Length; - PUNICODE_STRING FileName; - FILE_INFORMATION_CLASS FileInformationClass; - ULONG POINTER_ALIGNMENT FileIndex; - } QueryDirectory; - struct - { - ULONG Length; - ULONG POINTER_ALIGNMENT CompletionFilter; - } NotifyDirectory; - struct - { - ULONG Length; - ULONG POINTER_ALIGNMENT CompletionFilter; - enum _DIRECTORY_NOTIFY_INFORMATION_CLASS POINTER_ALIGNMENT DirectoryNotifyInformationClass; - } NotifyDirectoryEx; - struct - { - ULONG Length; - FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass; - } QueryFile; - struct - { - ULONG Length; - FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass; - PFILE_OBJECT FileObject; - union - { - struct - { - BOOLEAN ReplaceIfExists; - BOOLEAN AdvanceOnly; - }; - ULONG ClusterCount; - HANDLE DeleteHandle; - }; - } SetFile; - struct - { - ULONG Length; - PVOID EaList; - ULONG EaListLength; - ULONG POINTER_ALIGNMENT EaIndex; - } QueryEa; - struct - { - ULONG Length; - } SetEa; - struct - { - ULONG Length; - FS_INFORMATION_CLASS POINTER_ALIGNMENT FsInformationClass; - } QueryVolume; - struct - { - ULONG Length; - FS_INFORMATION_CLASS POINTER_ALIGNMENT FsInformationClass; - } SetVolume; - struct - { - ULONG OutputBufferLength; - ULONG POINTER_ALIGNMENT InputBufferLength; - ULONG POINTER_ALIGNMENT FsControlCode; - PVOID Type3InputBuffer; - } FileSystemControl; - struct - { - PLARGE_INTEGER Length; - ULONG POINTER_ALIGNMENT Key; - LARGE_INTEGER ByteOffset; - } LockControl; - struct - { - ULONG OutputBufferLength; - ULONG POINTER_ALIGNMENT InputBufferLength; - ULONG POINTER_ALIGNMENT IoControlCode; - PVOID Type3InputBuffer; - } DeviceIoControl; - struct - { - SECURITY_INFORMATION SecurityInformation; - ULONG POINTER_ALIGNMENT Length; - } QuerySecurity; - struct - { - SECURITY_INFORMATION SecurityInformation; - PSECURITY_DESCRIPTOR SecurityDescriptor; - } SetSecurity; - struct - { - PVPB Vpb; - PDEVICE_OBJECT DeviceObject; - } MountVolume; - struct - { - PVPB Vpb; - PDEVICE_OBJECT DeviceObject; - } VerifyVolume; - struct - { - struct _SCSI_REQUEST_BLOCK *Srb; - } Scsi; - struct - { - ULONG Length; - PSID StartSid; - struct _FILE_GET_QUOTA_INFORMATION *SidList; - ULONG SidListLength; - } QueryQuota; - struct - { - ULONG Length; - } SetQuota; - struct - { - DEVICE_RELATION_TYPE Type; - } QueryDeviceRelations; - struct - { - CONST GUID *InterfaceType; - USHORT Size; - USHORT Version; - PINTERFACE Interface; - PVOID InterfaceSpecificData; - } QueryInterface; - struct - { - PDEVICE_CAPABILITIES Capabilities; - } DeviceCapabilities; - struct - { - PIO_RESOURCE_REQUIREMENTS_LIST IoResourceRequirementList; - } FilterResourceRequirements; - struct - { - ULONG WhichSpace; - PVOID Buffer; - ULONG Offset; - ULONG POINTER_ALIGNMENT Length; - } ReadWriteConfig; - struct - { - BOOLEAN Lock; - } SetLock; - struct - { - BUS_QUERY_ID_TYPE IdType; - } QueryId; - struct - { - DEVICE_TEXT_TYPE DeviceTextType; - LCID POINTER_ALIGNMENT LocaleId; - } QueryDeviceText; - struct - { - BOOLEAN InPath; - BOOLEAN Reserved[3]; - DEVICE_USAGE_NOTIFICATION_TYPE POINTER_ALIGNMENT Type; - } UsageNotification; - struct - { - SYSTEM_POWER_STATE PowerState; - } WaitWake; - struct - { - PPOWER_SEQUENCE PowerSequence; - } PowerSequence; - struct - { - union - { - ULONG SystemContext; -#if (NTDDI_VERSION >= NTDDI_VISTA) - SYSTEM_POWER_STATE_CONTEXT SystemPowerStateContext; -#endif // (NTDDI_VERSION >= NTDDI_VISTA) - }; - POWER_STATE_TYPE POINTER_ALIGNMENT Type; - POWER_STATE POINTER_ALIGNMENT State; - POWER_ACTION POINTER_ALIGNMENT ShutdownType; - } Power; - struct - { - PCM_RESOURCE_LIST AllocatedResources; - PCM_RESOURCE_LIST AllocatedResourcesTranslated; - } StartDevice; - struct - { - ULONG_PTR ProviderId; - PVOID DataPath; - ULONG BufferSize; - PVOID Buffer; - } WMI; - struct - { - PVOID Argument1; - PVOID Argument2; - PVOID Argument3; - PVOID Argument4; - } Others; - } Parameters; - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject; - PIO_COMPLETION_ROUTINE CompletionRoutine; - PVOID Context; -} EXTENDED_IO_STACK_LOCATION, *PEXTENDED_IO_STACK_LOCATION; -#endif +#endif // !NTOS_MODE_USER // // Firmware Boot File Path

6 years, 5 months

06/10: [XDK][NDK] Fix IO_STACK_LOCATION alignments

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8719252e48efe62e9c8c9… commit 8719252e48efe62e9c8c9af0c0e70b2c2981fb9b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Feb 16 21:32:46 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [XDK][NDK] Fix IO_STACK_LOCATION alignments * Also add missing DIRECTORY_NOTIFY_INFORMATION_CLASS --- sdk/include/ndk/iotypes.h | 74 +++++++++++++++++++++++++---------------------- sdk/include/xdk/iotypes.h | 41 ++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 40 deletions(-) diff --git a/sdk/include/ndk/iotypes.h b/sdk/include/ndk/iotypes.h index 0124da6125..ed4a9facc2 100644 --- a/sdk/include/ndk/iotypes.h +++ b/sdk/include/ndk/iotypes.h @@ -940,9 +940,6 @@ typedef struct _EXTENDED_DRIVER_EXTENSION // // Extended I/O Stack Location Structure // -#if !defined(_ALPHA_) -#include <pshpack4.h> -#endif typedef struct _EXTENDED_IO_STACK_LOCATION { UCHAR MajorFunction; @@ -955,15 +952,15 @@ typedef struct _EXTENDED_IO_STACK_LOCATION { PIO_SECURITY_CONTEXT SecurityContext; ULONG Options; - USHORT FileAttributes; + USHORT POINTER_ALIGNMENT FileAttributes; USHORT ShareAccess; - ULONG EaLength; + ULONG POINTER_ALIGNMENT EaLength; } Create; struct { PIO_SECURITY_CONTEXT SecurityContext; ULONG Options; - USHORT Reserved; + USHORT POINTER_ALIGNMENT Reserved; USHORT ShareAccess; struct _NAMED_PIPE_CREATE_PARAMETERS *Parameters; } CreatePipe; @@ -971,20 +968,20 @@ typedef struct _EXTENDED_IO_STACK_LOCATION { PIO_SECURITY_CONTEXT SecurityContext; ULONG Options; - USHORT Reserved; + USHORT POINTER_ALIGNMENT Reserved; USHORT ShareAccess; struct _MAILSLOT_CREATE_PARAMETERS *Parameters; } CreateMailslot; struct { ULONG Length; - ULONG Key; + ULONG POINTER_ALIGNMENT Key; LARGE_INTEGER ByteOffset; } Read; struct { ULONG Length; - ULONG Key; + ULONG POINTER_ALIGNMENT Key; LARGE_INTEGER ByteOffset; } Write; struct @@ -992,23 +989,29 @@ typedef struct _EXTENDED_IO_STACK_LOCATION ULONG Length; PUNICODE_STRING FileName; FILE_INFORMATION_CLASS FileInformationClass; - ULONG FileIndex; + ULONG POINTER_ALIGNMENT FileIndex; } QueryDirectory; struct { ULONG Length; - ULONG CompletionFilter; + ULONG POINTER_ALIGNMENT CompletionFilter; } NotifyDirectory; struct { ULONG Length; - FILE_INFORMATION_CLASS FileInformationClass; + ULONG POINTER_ALIGNMENT CompletionFilter; + enum _DIRECTORY_NOTIFY_INFORMATION_CLASS POINTER_ALIGNMENT DirectoryNotifyInformationClass; + } NotifyDirectoryEx; + struct + { + ULONG Length; + FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass; } QueryFile; struct { ULONG Length; - FILE_INFORMATION_CLASS FileInformationClass; - PFILE_OBJECT FileObject; + FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass; + PFILE_OBJECT FileObject; union { struct @@ -1025,7 +1028,7 @@ typedef struct _EXTENDED_IO_STACK_LOCATION ULONG Length; PVOID EaList; ULONG EaListLength; - ULONG EaIndex; + ULONG POINTER_ALIGNMENT EaIndex; } QueryEa; struct { @@ -1034,31 +1037,31 @@ typedef struct _EXTENDED_IO_STACK_LOCATION struct { ULONG Length; - FS_INFORMATION_CLASS FsInformationClass; + FS_INFORMATION_CLASS POINTER_ALIGNMENT FsInformationClass; } QueryVolume; struct { ULONG Length; - FS_INFORMATION_CLASS FsInformationClass; + FS_INFORMATION_CLASS POINTER_ALIGNMENT FsInformationClass; } SetVolume; struct { ULONG OutputBufferLength; - ULONG InputBufferLength; - ULONG FsControlCode; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; PVOID Type3InputBuffer; } FileSystemControl; struct { PLARGE_INTEGER Length; - ULONG Key; + ULONG POINTER_ALIGNMENT Key; LARGE_INTEGER ByteOffset; } LockControl; struct { ULONG OutputBufferLength; - ULONG InputBufferLength; - ULONG IoControlCode; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; PVOID Type3InputBuffer; } DeviceIoControl; struct @@ -1121,7 +1124,7 @@ typedef struct _EXTENDED_IO_STACK_LOCATION ULONG WhichSpace; PVOID Buffer; ULONG Offset; - ULONG Length; + ULONG POINTER_ALIGNMENT Length; } ReadWriteConfig; struct { @@ -1134,28 +1137,34 @@ typedef struct _EXTENDED_IO_STACK_LOCATION struct { DEVICE_TEXT_TYPE DeviceTextType; - LCID LocaleId; + LCID POINTER_ALIGNMENT LocaleId; } QueryDeviceText; struct { BOOLEAN InPath; BOOLEAN Reserved[3]; - DEVICE_USAGE_NOTIFICATION_TYPE Type; + DEVICE_USAGE_NOTIFICATION_TYPE POINTER_ALIGNMENT Type; } UsageNotification; struct { - SYSTEM_POWER_STATE PowerState; + SYSTEM_POWER_STATE PowerState; } WaitWake; struct { - PPOWER_SEQUENCE PowerSequence; + PPOWER_SEQUENCE PowerSequence; } PowerSequence; struct { - ULONG SystemContext; - POWER_STATE_TYPE Type; - POWER_STATE State; - POWER_ACTION ShutdownType; + union + { + ULONG SystemContext; +#if (NTDDI_VERSION >= NTDDI_VISTA) + SYSTEM_POWER_STATE_CONTEXT SystemPowerStateContext; +#endif // (NTDDI_VERSION >= NTDDI_VISTA) + }; + POWER_STATE_TYPE POINTER_ALIGNMENT Type; + POWER_STATE POINTER_ALIGNMENT State; + POWER_ACTION POINTER_ALIGNMENT ShutdownType; } Power; struct { @@ -1182,9 +1191,6 @@ typedef struct _EXTENDED_IO_STACK_LOCATION PIO_COMPLETION_ROUTINE CompletionRoutine; PVOID Context; } EXTENDED_IO_STACK_LOCATION, *PEXTENDED_IO_STACK_LOCATION; -#if !defined(_ALPHA_) -#include <poppack.h> -#endif #endif // diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h index d9032b7255..d2a76b8451 100644 --- a/sdk/include/xdk/iotypes.h +++ b/sdk/include/xdk/iotypes.h @@ -1272,6 +1272,11 @@ typedef enum _FILE_INFORMATION_CLASS { FileMaximumInformation } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; +typedef enum _DIRECTORY_NOTIFY_INFORMATION_CLASS { + DirectoryNotifyInformation = 1, + DirectoryNotifyExtendedInformation +} DIRECTORY_NOTIFY_INFORMATION_CLASS, *PDIRECTORY_NOTIFY_INFORMATION_CLASS; + typedef struct _FILE_POSITION_INFORMATION { LARGE_INTEGER CurrentByteOffset; } FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION; @@ -2754,6 +2759,20 @@ typedef struct _IO_STACK_LOCATION { USHORT ShareAccess; ULONG POINTER_ALIGNMENT EaLength; } Create; + struct { + struct _IO_SECURITY_CONTEXT *SecurityContext; + ULONG Options; + USHORT POINTER_ALIGNMENT Reserved; + USHORT ShareAccess; + struct _NAMED_PIPE_CREATE_PARAMETERS *Parameters; + } CreatePipe; + struct { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT POINTER_ALIGNMENT Reserved; + USHORT ShareAccess; + struct _MAILSLOT_CREATE_PARAMETERS *Parameters; + } CreateMailslot; struct { ULONG Length; ULONG POINTER_ALIGNMENT Key; @@ -2768,12 +2787,17 @@ typedef struct _IO_STACK_LOCATION { ULONG Length; PUNICODE_STRING FileName; FILE_INFORMATION_CLASS FileInformationClass; - ULONG FileIndex; + ULONG POINTER_ALIGNMENT FileIndex; } QueryDirectory; struct { ULONG Length; - ULONG CompletionFilter; + ULONG POINTER_ALIGNMENT CompletionFilter; } NotifyDirectory; + struct { + ULONG Length; + ULONG POINTER_ALIGNMENT CompletionFilter; + DIRECTORY_NOTIFY_INFORMATION_CLASS POINTER_ALIGNMENT DirectoryNotifyInformationClass; + } NotifyDirectoryEx; struct { ULONG Length; FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass; @@ -2795,7 +2819,7 @@ typedef struct _IO_STACK_LOCATION { ULONG Length; PVOID EaList; ULONG EaListLength; - ULONG EaIndex; + ULONG POINTER_ALIGNMENT EaIndex; } QueryEa; struct { ULONG Length; @@ -2806,7 +2830,7 @@ typedef struct _IO_STACK_LOCATION { } QueryVolume; struct { ULONG Length; - FS_INFORMATION_CLASS FsInformationClass; + FS_INFORMATION_CLASS POINTER_ALIGNMENT FsInformationClass; } SetVolume; struct { ULONG OutputBufferLength; @@ -2816,7 +2840,7 @@ typedef struct _IO_STACK_LOCATION { } FileSystemControl; struct { PLARGE_INTEGER Length; - ULONG Key; + ULONG POINTER_ALIGNMENT Key; LARGE_INTEGER ByteOffset; } LockControl; struct { @@ -2897,7 +2921,12 @@ typedef struct _IO_STACK_LOCATION { PPOWER_SEQUENCE PowerSequence; } PowerSequence; struct { - ULONG SystemContext; + union { + ULONG SystemContext; +#if (NTDDI_VERSION >= NTDDI_VISTA) + SYSTEM_POWER_STATE_CONTEXT SystemPowerStateContext; +#endif // (NTDDI_VERSION >= NTDDI_VISTA) + }; POWER_STATE_TYPE POINTER_ALIGNMENT Type; POWER_STATE POINTER_ALIGNMENT State; POWER_ACTION POINTER_ALIGNMENT ShutdownType;

6 years, 5 months

05/10: [XDK] Stop randomly packing structures half throughout ntifs.h / wdm.h Nothing in there should be packed!

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03c86af7d55d4e249e493… commit 03c86af7d55d4e249e493d61f4b110859085e400 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 21:48:36 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [XDK] Stop randomly packing structures half throughout ntifs.h / wdm.h Nothing in there should be packed! --- sdk/include/xdk/iotypes.h | 10 ++-------- sdk/include/xdk/ntifs.template.h | 4 ---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h index 7f074f5199..d9032b7255 100644 --- a/sdk/include/xdk/iotypes.h +++ b/sdk/include/xdk/iotypes.h @@ -2741,9 +2741,6 @@ typedef struct _ACPI_INTERFACE_STANDARD2 { PUNREGISTER_FOR_DEVICE_NOTIFICATIONS2 UnregisterForDeviceNotifications; } ACPI_INTERFACE_STANDARD2, *PACPI_INTERFACE_STANDARD2; -#if !defined(_AMD64_) && !defined(_IA64_) -#include <pshpack4.h> -#endif typedef struct _IO_STACK_LOCATION { UCHAR MajorFunction; UCHAR MinorFunction; @@ -2813,8 +2810,8 @@ typedef struct _IO_STACK_LOCATION { } SetVolume; struct { ULONG OutputBufferLength; - ULONG InputBufferLength; - ULONG FsControlCode; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; PVOID Type3InputBuffer; } FileSystemControl; struct { @@ -2927,9 +2924,6 @@ typedef struct _IO_STACK_LOCATION { PIO_COMPLETION_ROUTINE CompletionRoutine; PVOID Context; } IO_STACK_LOCATION, *PIO_STACK_LOCATION; -#if !defined(_AMD64_) && !defined(_IA64_) -#include <poppack.h> -#endif /* IO_STACK_LOCATION.Control */ diff --git a/sdk/include/xdk/ntifs.template.h b/sdk/include/xdk/ntifs.template.h index 7ad62ca88d..c38bf08ddb 100644 --- a/sdk/include/xdk/ntifs.template.h +++ b/sdk/include/xdk/ntifs.template.h @@ -1282,8 +1282,6 @@ typedef struct _QUERY_PATH_RESPONSE { #define IOCTL_VOLSNAP_FLUSH_AND_HOLD_WRITES CTL_CODE(VOLSNAPCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) /* FIXME : These definitions below don't belong here (or anywhere in ddk really) */ -#pragma pack(push,4) - #ifndef VER_PRODUCTBUILD #define VER_PRODUCTBUILD 10000 #endif @@ -1789,8 +1787,6 @@ RtlSetSaclSecurityDescriptor ( #endif -#pragma pack(pop) - #ifdef __cplusplus } #endif

6 years, 5 months

04/10: [NDK] Fix the type of KPROCESS::ActiveProcessors Also fix related logic in KiSwapProcess

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de1b195837867be375766… commit de1b195837867be3757660f236d07e4f0cdf206a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Feb 10 20:30:14 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [NDK] Fix the type of KPROCESS::ActiveProcessors Also fix related logic in KiSwapProcess --- ntoskrnl/ke/amd64/stubs.c | 8 +++----- sdk/include/ndk/ketypes.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index f63485eb78..9f8ed16e0d 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -278,13 +278,11 @@ KiSwapProcess(IN PKPROCESS NewProcess, IN PKPROCESS OldProcess) { PKIPCR Pcr = (PKIPCR)KeGetPcr(); -#ifdef CONFIG_SMP - LONG SetMember; +#ifdef CONFIG_SMP /* Update active processor mask */ - SetMember = (LONG)Pcr->SetMember; - InterlockedXor((PLONG)&NewProcess->ActiveProcessors, SetMember); - InterlockedXor((PLONG)&OldProcess->ActiveProcessors, SetMember); + InterlockedXor64((PLONG64)&NewProcess->ActiveProcessors, Pcr->Prcb.SetMember); + InterlockedXor64((PLONG64)&OldProcess->ActiveProcessors, Pcr->Prcb.SetMember); #endif /* Update CR3 */ diff --git a/sdk/include/ndk/ketypes.h b/sdk/include/ndk/ketypes.h index 839a0d77d7..7a8c614a8d 100644 --- a/sdk/include/ndk/ketypes.h +++ b/sdk/include/ndk/ketypes.h @@ -1988,7 +1988,7 @@ typedef struct _KPROCESS UCHAR Iopl; UCHAR Unused; #endif - volatile ULONG ActiveProcessors; + volatile KAFFINITY ActiveProcessors; ULONG KernelTime; ULONG UserTime; LIST_ENTRY ReadyListHead;

6 years, 5 months

03/10: [NDK] Update x64 version of KEXCEPTION_FRAME

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=158812409d3914f1a5066… commit 158812409d3914f1a5066ca86d8d2941e952e1e3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Feb 9 20:51:28 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [NDK] Update x64 version of KEXCEPTION_FRAME --- sdk/include/ndk/amd64/ketypes.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index e7afc9d7df..0609dac137 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -930,7 +930,11 @@ typedef struct _KEXCEPTION_FRAME ULONG64 P3Home; ULONG64 P4Home; ULONG64 P5; +#if (NTDDI_VERSION >= NTDDI_WIN8) ULONG64 Spare1; +#else + ULONG64 InitialStack; +#endif M128A Xmm6; M128A Xmm7; M128A Xmm8; @@ -942,10 +946,14 @@ typedef struct _KEXCEPTION_FRAME M128A Xmm14; M128A Xmm15; ULONG64 TrapFrame; - //ULONG64 CallbackStack; +#if (NTDDI_VERSION < NTDDI_WIN8) + ULONG64 CallbackStack; +#endif ULONG64 OutputBuffer; ULONG64 OutputLength; +#if (NTDDI_VERSION >= NTDDI_WIN8) ULONG64 Spare2; +#endif ULONG64 MxCsr; ULONG64 Rbp; ULONG64 Rbx; @@ -973,7 +981,7 @@ typedef struct _MACHINE_FRAME // // Defines the Callback Stack Layout for User Mode Callbacks // -typedef KEXCEPTION_FRAME KCALLOUT_FRAME, PKCALLOUT_FRAME; +typedef KEXCEPTION_FRAME KCALLOUT_FRAME, *PKCALLOUT_FRAME; // // User side callout frame

6 years, 5 months

02/10: [LIBUSB] Add additional operator new/delete This is required, since newer versions of MSVC demand that non-member operator new/delete are in the global namespace and neither static nor inline. See https://msdn.microsoft.com/en-us/library/mt723604.aspx ("Overloaded operator new and operator delete")

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a262e8da2d5a4ea474b8a… commit a262e8da2d5a4ea474b8a31a649775aea66276d6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Feb 24 11:20:27 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [LIBUSB] Add additional operator new/delete This is required, since newer versions of MSVC demand that non-member operator new/delete are in the global namespace and neither static nor inline. See https://msdn.microsoft.com/en-us/library/mt723604.aspx ("Overloaded operator new and operator delete") --- sdk/lib/drivers/libusb/libusb.cpp | 30 ++++++++++++++++++++++++++++++ sdk/lib/drivers/libusb/libusb.h | 9 +++++++++ 2 files changed, 39 insertions(+) diff --git a/sdk/lib/drivers/libusb/libusb.cpp b/sdk/lib/drivers/libusb/libusb.cpp index f5dc0f17f4..632614803d 100644 --- a/sdk/lib/drivers/libusb/libusb.cpp +++ b/sdk/lib/drivers/libusb/libusb.cpp @@ -18,6 +18,36 @@ // DRIVER_ADD_DEVICE USBLIB_AddDevice; +PVOID +__cdecl +operator new( + size_t iSize, + POOL_TYPE poolType, + ULONG tag) +{ + PVOID result = ExAllocatePoolWithTag(poolType, iSize, tag); + if (result) { + RtlZeroMemory(result, iSize); + } + return result; +} + +void +__cdecl +operator delete( + PVOID pVoid) +{ + if (pVoid) ExFreePool(pVoid); +} + +void +__cdecl +operator delete( + PVOID pVoid, UINT_PTR) +{ + if (pVoid) ExFreePool(pVoid); +} + extern "C" { diff --git a/sdk/lib/drivers/libusb/libusb.h b/sdk/lib/drivers/libusb/libusb.h index f24190183a..004c2f0a25 100644 --- a/sdk/lib/drivers/libusb/libusb.h +++ b/sdk/lib/drivers/libusb/libusb.h @@ -22,8 +22,17 @@ extern "C" // the following includes are required to get kcom to compile // #include <portcls.h> +#define _NEW_DELETE_OPERATORS_ #include <kcom.h> +PVOID +__cdecl +operator new( + size_t iSize, + POOL_TYPE poolType, + ULONG tag); + + #include "common_interfaces.h" //

6 years, 5 months

01/10: [CMAKE] winspool.drv -> winspool in baseaddress_msvc.cmake

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03830f67a7cbdd2a0c583… commit 03830f67a7cbdd2a0c5839c11b8083ad55bf78c9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Mar 7 14:46:59 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [CMAKE] winspool.drv -> winspool in baseaddress_msvc.cmake --- sdk/cmake/baseaddress_msvc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index 81139a268b..2946161f49 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -14,7 +14,7 @@ set(baseaddress_shlwapi 0x7c350000) set(baseaddress_rpcrt4 0x7c2c0000) set(baseaddress_comctl32 0x7c1a0000) set(baseaddress_ole32 0x7c060000) -set(baseaddress_winspool.drv 0x7c030000) +set(baseaddress_winspool 0x7c030000) set(baseaddress_winmm 0x7bf90000) set(baseaddress_comdlg32 0x7bec0000) set(baseaddress_shell32 0x7b5d0000)

6 years, 5 months

02/02: [FREELDR] PcMemGetBiosMemoryMap(): Add a default handling of entry with "EA.ErrorLog = 1". CORE-14150

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1d0d409e7c2dfea17f83… commit c1d0d409e7c2dfea17f83272c1332936967dffa5 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Jan 12 06:30:53 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 12:03:50 2018 +0200 [FREELDR] PcMemGetBiosMemoryMap(): Add a default handling of entry with "EA.ErrorLog = 1". CORE-14150 This FIXME is meant as a reminder/help to actually use this data. --- boot/freeldr/freeldr/arch/i386/pcmem.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index b6024ff73a..28d6e06e4c 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -351,6 +351,18 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi TRACE("Type: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Type); TRACE("ExtendedAttributesAsULONG: 0x%08lx\n", PcBiosMemoryMap[PcBiosMapCount].ExtendedAttributesAsULONG); + if (PcBiosMemoryMap[PcBiosMapCount].ExtendedAttributes.ErrorLog == 1) + { + FIXME("EA.ErrorLog = 1. Please report this to CORE-14150. " + "(PcBiosMapCount = %lu, BaseAddress = 0x%llx, Length = 0x%llx, Type = 0x%lx, ExtendedAttributesAsULONG = 0x%08lx)\n", + PcBiosMapCount, + PcBiosMemoryMap[PcBiosMapCount].BaseAddress, + PcBiosMemoryMap[PcBiosMapCount].Length, + PcBiosMemoryMap[PcBiosMapCount].Type, + PcBiosMemoryMap[PcBiosMapCount].ExtendedAttributesAsULONG); + // NotWantedForPublicBuilds: ASSERTMSG("EA.ErrorLog = 1. Check/Report then CONTinue.", FALSE); + } + if (PcBiosMemoryMap[PcBiosMapCount].Length == 0) { TRACE("Discard empty range. (would-be-PcBiosMapCount = %lu, BaseAddress = 0x%llx, Length = 0)\n",

6 years, 5 months

01/02: [FREELDR] pcmem.c: Improve output strings. No functional changes. CORE-13332

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0313c750f1df882cdbad… commit a0313c750f1df882cdbadd749f72d575065b2a3d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Jan 12 06:19:14 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 12:03:50 2018 +0200 [FREELDR] pcmem.c: Improve output strings. No functional changes. CORE-13332 - Plus: Add missing email address in 74f92c3d867a2d827e00e70dcf6e0295c40465c0. - Remove superfluous blank lines. - Add 2 TRACE("FunctionName()\n"). - Use "0x%llx", not "%lu", for BaseAddress and Length. (Copypasta in my recent commits.) - Add "0x" to 1 "%p" and 1 "%lx". --- boot/freeldr/freeldr/arch/i386/pcmem.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index af4d73cd2c..b6024ff73a 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -2,7 +2,7 @@ * FreeLoader * * Copyright ... ... (See below.) - * Copyright 2017 Serge Gautherie + * Copyright 2017 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -82,7 +82,7 @@ GetExtendedMemoryConfiguration(ULONG* pMemoryAtOneMB /* in KB */, ULONG* pMemory TRACE("BX = 0x%x\n", RegsOut.w.bx); TRACE("CX = 0x%x\n", RegsOut.w.cx); TRACE("DX = 0x%x\n", RegsOut.w.dx); - TRACE("CF set = %s\n\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); + TRACE("CF set = %s\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); if (INT386_SUCCESS(RegsOut)) { @@ -121,7 +121,7 @@ GetExtendedMemoryConfiguration(ULONG* pMemoryAtOneMB /* in KB */, ULONG* pMemory TRACE("Int15h AH=88h\n"); TRACE("AX = 0x%x\n", RegsOut.w.ax); - TRACE("CF set = %s\n\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); + TRACE("CF set = %s\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); if (INT386_SUCCESS(RegsOut) && RegsOut.w.ax != 0) { @@ -168,7 +168,7 @@ PcMemGetConventionalMemorySize(VOID) Int386(0x12, &Regs, &Regs); TRACE("Int12h\n"); - TRACE("AX = 0x%x\n\n", Regs.w.ax); + TRACE("AX = 0x%x\n", Regs.w.ax); return (ULONG)Regs.w.ax; } @@ -181,6 +181,8 @@ GetEbdaLocation( { REGS Regs; + TRACE("GetEbdaLocation()\n"); + /* Get the address of the Extended BIOS Data Area (EBDA). * Int 15h, AH=C1h * SYSTEM - RETURN EXTENDED-BIOS DATA-AREA SEGMENT ADDRESS (PS) @@ -211,6 +213,8 @@ PcMemCheckUsableMemorySize(VOID) { ULONG Size, RequiredSize; + TRACE("PcMemCheckUsableMemorySize()\n"); + /* Make sure the usable memory is large enough. To do this we check the 16 bit value at address 0x413 inside the BDA, which gives us the usable size in KB */ @@ -287,7 +291,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi * it doesn't support this call. */ if (Regs.x.eax != 0x534D4150) { - WARN("BIOS doesn't support Int15h AX=E820h!\n\n"); + WARN("BIOS doesn't support Int15h AX=E820h!\n"); break; } @@ -295,7 +299,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi * then this call was past the last entry, so we're done. */ if (!INT386_SUCCESS(Regs)) { - TRACE("End of System Memory Map! (Past last)\n\n"); + TRACE("End of System Memory Map! (Past last)\n"); break; } @@ -313,7 +317,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi if (Regs.x.ecx < RTL_SIZEOF_THROUGH_FIELD(BIOS_MEMORY_MAP, Type) || Regs.x.ecx > sizeof(BIOS_MEMORY_MAP)) { - ERR("Int 15h AX=E820h returned an invalid entry length! (would-be-PcBiosMapCount = %lu, Entry length = (%Iu <=) %lu (<= %Iu))\n\n", + ERR("Int 15h AX=E820h returned an invalid entry length! (would-be-PcBiosMapCount = %lu, Entry length = (%Iu <=) %lu (<= %Iu))\n", PcBiosMapCount, RTL_SIZEOF_THROUGH_FIELD(BIOS_MEMORY_MAP, Type), Regs.x.ecx, sizeof(BIOS_MEMORY_MAP)); /* Warn user, unless wrong case is "first and not too big entry", which is otherwise harmless. */ if (PcBiosMapCount > 0 || Regs.x.ecx > sizeof(BIOS_MEMORY_MAP)) @@ -349,7 +353,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi if (PcBiosMemoryMap[PcBiosMapCount].Length == 0) { - TRACE("Discard empty range. (would-be-PcBiosMapCount = %lu, BaseAddress = %lu, Length = 0)\n", + TRACE("Discard empty range. (would-be-PcBiosMapCount = %lu, BaseAddress = 0x%llx, Length = 0)\n", PcBiosMapCount, PcBiosMemoryMap[PcBiosMapCount].BaseAddress); goto nextRange; } @@ -373,7 +377,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi if (EndAddress <= RealBaseAddress) { /* This doesn't span any page, so continue with next range */ - TRACE("Skipping aligned range < PAGE_SIZE. (would-be-PcBiosMapCount = %lu, BaseAddress = %lu, Length = %lu)\n", + TRACE("Skipping aligned range < PAGE_SIZE. (would-be-PcBiosMapCount = %lu, BaseAddress = 0x%llx, Length = 0x%llx)\n", PcBiosMapCount, PcBiosMemoryMap[PcBiosMapCount].BaseAddress, PcBiosMemoryMap[PcBiosMapCount].Length); @@ -408,7 +412,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi /* Check if we can add this descriptor */ if (RealSize < MM_PAGE_SIZE) { - TRACE("Skipping aligned range < MM_PAGE_SIZE. (PcBiosMapCount = %lu, BaseAddress = %lu, Length = %lu)\n", + TRACE("Skipping aligned range < MM_PAGE_SIZE. (PcBiosMapCount = %lu, BaseAddress = 0x%llx, Length = 0x%llx)\n", PcBiosMapCount, PcBiosMemoryMap[PcBiosMapCount].BaseAddress, PcBiosMemoryMap[PcBiosMapCount].Length); @@ -437,13 +441,11 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi PcBiosMapCount++; nextRange: - TRACE("\n"); - /* If the continuation value is zero, * then this was the last entry, so we're done. */ if (Regs.x.ebx == 0x00000000) { - TRACE("End of System Memory Map! (Reset)\n\n"); + TRACE("End of System Memory Map! (Reset)\n"); break; } } @@ -610,7 +612,7 @@ PcMemGetMemoryMap(ULONG *MemoryMapSize) } } - TRACE("DiskReadBuffer=%p, DiskReadBufferSize=%lx\n", + TRACE("DiskReadBuffer=0x%p, DiskReadBufferSize=0x%lx\n", DiskReadBuffer, DiskReadBufferSize); /* Now reserve the range for the disk read buffer */

6 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2018