Author: hbelusca Date: Fri May 26 02:15:54 2017 New Revision: 74662
URL: http://svn.reactos.org/svn/reactos?rev=74662&view=rev Log: [INCLUDEs:ARC]: Fix some structure members of LOADER_PARAMETER_EXTENSION and SETUP_LOADER_BLOCK. Add some documentation & links regarded these structures to document which members change/disappear starting some NT version. Also, turn some Win32 LPSTR into NT' PSTR or PCHAR types.
Modified: trunk/reactos/sdk/include/reactos/arc/arc.h trunk/reactos/sdk/include/reactos/arc/setupblk.h
Modified: trunk/reactos/sdk/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/arc/arc... ============================================================================== --- trunk/reactos/sdk/include/reactos/arc/arc.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/arc/arc.h [iso-8859-1] Fri May 26 02:15:54 2017 @@ -110,7 +110,7 @@ ULONG AffinityMask; ULONG ConfigurationDataLength; ULONG IdentifierLength; - LPSTR Identifier; + PCHAR Identifier; } CONFIGURATION_COMPONENT, *PCONFIGURATION_COMPONENT;
typedef struct _CONFIGURATION_COMPONENT_DATA @@ -338,19 +338,22 @@ // // Extended Loader Parameter Block // +// See http://www.geoffchappell.com/studies/windows/km/ntoskrnl/structs/loader_para... +// for more details. +// typedef struct _LOADER_PARAMETER_EXTENSION { ULONG Size; PROFILE_PARAMETER_BLOCK Profile; - ULONG MajorVersion; - ULONG MinorVersion; + ULONG MajorVersion; /* Not anymore present starting NT 6.1 */ + ULONG MinorVersion; /* Not anymore present starting NT 6.1 */ PVOID EmInfFileImage; ULONG EmInfFileSize; PVOID TriageDumpBlock; // // NT 5.1 // - ULONG LoaderPagesSpanned; + ULONG_PTR LoaderPagesSpanned; /* Not anymore present starting NT 6.2 */ PHEADLESS_LOADER_BLOCK HeadlessLoaderBlock; PSMBIOS_TABLE_HEADER SMBiosEPSHeader; PVOID DrvDBImage; @@ -359,18 +362,22 @@ // // NT 5.2+ // - PCHAR HalpIRQLToTPR; - PCHAR HalpVectorToIRQL; +#ifdef _X86_ + PUCHAR HalpIRQLToTPR; + PUCHAR HalpVectorToIRQL; +#endif LIST_ENTRY FirmwareDescriptorListHead; PVOID AcpiTable; ULONG AcpiTableSize; // // NT 5.2 SP1+ // +/** NT-version-dependent flags **/ ULONG BootViaWinload:1; ULONG BootViaEFI:1; ULONG Reserved:30; - LOADER_PERFORMANCE_DATA LoaderPerformanceData; +/********************************/ + PLOADER_PERFORMANCE_DATA LoaderPerformanceData; LIST_ENTRY BootApplicationPersistentData; PVOID WmdTestResult; GUID BootIdentifier; @@ -478,6 +485,9 @@ // // Loader Parameter Block // +// See http://www.geoffchappell.com/studies/windows/km/ntoskrnl/structs/loader_para... +// for more details. +// typedef struct _LOADER_PARAMETER_BLOCK { LIST_ENTRY LoadOrderListHead; @@ -490,11 +500,11 @@ ULONG RegistryLength; PVOID RegistryBase; PCONFIGURATION_COMPONENT_DATA ConfigurationRoot; - LPSTR ArcBootDeviceName; - LPSTR ArcHalDeviceName; - LPSTR NtBootPathName; - LPSTR NtHalPathName; - LPSTR LoadOptions; + PSTR ArcBootDeviceName; + PSTR ArcHalDeviceName; + PSTR NtBootPathName; + PSTR NtHalPathName; + PSTR LoadOptions; PNLS_DATA_BLOCK NlsData; PARC_DISK_INFORMATION ArcDiskInformation; PVOID OemFontFile;
Modified: trunk/reactos/sdk/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/arc/set... ============================================================================== --- trunk/reactos/sdk/include/reactos/arc/setupblk.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/arc/setupblk.h [iso-8859-1] Fri May 26 02:15:54 2017 @@ -126,7 +126,7 @@ ULONG UnsupDriversInfFileLength; PVOID BootFontFile; ULONG BootFontFileLength; - MONITOR_CONFIGURATION_DATA Monitor; + PMONITOR_CONFIGURATION_DATA Monitor; PCHAR MonitorId; PDETECTED_DEVICE BootBusExtenders; PDETECTED_DEVICE BusExtenders;