From cf0d7f0a4027bb15c7d8c0085ffe82514077f907 Mon Sep 17 00:00:00 2001 From: Aiken Harris Date: Fri, 12 Jun 2026 12:54:53 +0200 Subject: [PATCH] Update trampoline size output parameter to PULONG across bootloader and kernel --- boot/xtldr/includes/libxtos.hh | 2 +- boot/xtldr/modules/xtos_o/amd64/memory.cc | 2 +- sdk/xtdk/bltypes.h | 2 +- xtoskrnl/ar/amd64/procsup.cc | 2 +- xtoskrnl/ar/i686/procsup.cc | 2 +- xtoskrnl/includes/ar/amd64/procsup.hh | 2 +- xtoskrnl/includes/ar/i686/procsup.hh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/xtldr/includes/libxtos.hh b/boot/xtldr/includes/libxtos.hh index bcedaa119..ba67c7c9b 100644 --- a/boot/xtldr/includes/libxtos.hh +++ b/boot/xtldr/includes/libxtos.hh @@ -30,7 +30,7 @@ namespace AR public: STATIC XTAPI VOID GetTrampolineInformation(IN TRAMPOLINE_TYPE TrampolineType, OUT PVOID *TrampolineCode, - OUT PULONG_PTR TrampolineSize); + OUT PULONG TrampolineSize); }; } diff --git a/boot/xtldr/modules/xtos_o/amd64/memory.cc b/boot/xtldr/modules/xtos_o/amd64/memory.cc index 3755ff840..70e1bb996 100644 --- a/boot/xtldr/modules/xtos_o/amd64/memory.cc +++ b/boot/xtldr/modules/xtos_o/amd64/memory.cc @@ -116,7 +116,7 @@ Xtos::EnablePaging(IN PXTBL_PAGE_MAPPING PageMap) EFI_STATUS Status; EFI_PHYSICAL_ADDRESS TrampolineAddress; PXT_TRAMPOLINE_ENTRY TrampolineEntry; - ULONG_PTR TrampolineSize; + ULONG TrampolineSize; PVOID TrampolineCode; /* Check the configured page map level to set the LA57 state accordingly */ diff --git a/sdk/xtdk/bltypes.h b/sdk/xtdk/bltypes.h index 32bbeae8d..2d8ad5b2b 100644 --- a/sdk/xtdk/bltypes.h +++ b/sdk/xtdk/bltypes.h @@ -57,7 +57,7 @@ typedef EFI_STATUS (XTCDECL *PBL_ALLOCATE_PAGES)(IN EFI_ALLOCATE_TYPE Allocation typedef EFI_STATUS (XTCDECL *PBL_ALLOCATE_POOL)(IN UINT_PTR Size, OUT PVOID *Memory); typedef EFI_STATUS (XTCDECL *PBL_BOOTMENU_INITIALIZE_OS_LIST)(IN ULONG MaxNameLength, OUT PXTBL_BOOTMENU_ITEM *MenuEntries, OUT PULONG EntriesCount, OUT PULONG DefaultId); typedef BOOLEAN (XTCDECL *PBL_BOOTUTILS_GET_BOOLEAN_PARAMETER)(IN PCWSTR Parameters, IN PCWSTR Needle); -typedef VOID (XTAPI *PBL_BOOTUTILS_GET_TRAMPOLINE_INFORMATION)(IN TRAMPOLINE_TYPE TrampolineType, OUT PVOID *TrampolineCode, OUT PULONG_PTR TrampolineSize); +typedef VOID (XTAPI *PBL_BOOTUTILS_GET_TRAMPOLINE_INFORMATION)(IN TRAMPOLINE_TYPE TrampolineType, OUT PVOID *TrampolineCode, OUT PULONG TrampolineSize); typedef EFI_STATUS (XTCDECL *PBL_BUILD_PAGE_MAP)(IN PXTBL_PAGE_MAPPING PageMap, IN ULONG_PTR SelfMapAddress); typedef EFI_STATUS (XTCDECL *PBL_COMMIT_PAGE_MAP)(IN PXTBL_PAGE_MAPPING PageMap); typedef EFI_STATUS (XTCDECL *PBL_CLOSE_VOLUME)(IN PEFI_HANDLE VolumeHandle); diff --git a/xtoskrnl/ar/amd64/procsup.cc b/xtoskrnl/ar/amd64/procsup.cc index ee6997457..0820df8f6 100644 --- a/xtoskrnl/ar/amd64/procsup.cc +++ b/xtoskrnl/ar/amd64/procsup.cc @@ -28,7 +28,7 @@ XTAPI VOID AR::ProcessorSupport::GetTrampolineInformation(IN TRAMPOLINE_TYPE TrampolineType, OUT PVOID *TrampolineCode, - OUT PULONG_PTR TrampolineSize) + OUT PULONG TrampolineSize) { /* Get trampoline information */ switch(TrampolineType) diff --git a/xtoskrnl/ar/i686/procsup.cc b/xtoskrnl/ar/i686/procsup.cc index 9b4d991b4..57312db8c 100644 --- a/xtoskrnl/ar/i686/procsup.cc +++ b/xtoskrnl/ar/i686/procsup.cc @@ -28,7 +28,7 @@ XTAPI VOID AR::ProcessorSupport::GetTrampolineInformation(IN TRAMPOLINE_TYPE TrampolineType, OUT PVOID *TrampolineCode, - OUT PULONG_PTR TrampolineSize) + OUT PULONG TrampolineSize) { /* Get trampoline information */ switch(TrampolineType) diff --git a/xtoskrnl/includes/ar/amd64/procsup.hh b/xtoskrnl/includes/ar/amd64/procsup.hh index 21404e46b..e18c65b2b 100644 --- a/xtoskrnl/includes/ar/amd64/procsup.hh +++ b/xtoskrnl/includes/ar/amd64/procsup.hh @@ -30,7 +30,7 @@ namespace AR STATIC XTAPI PVOID GetBootStack(VOID); STATIC XTAPI VOID GetTrampolineInformation(IN TRAMPOLINE_TYPE TrampolineType, OUT PVOID *TrampolineCode, - OUT PULONG_PTR TrampolineSize); + OUT PULONG TrampolineSize); STATIC XTAPI VOID InitializeProcessor(IN PVOID ProcessorStructures); STATIC XTAPI VOID InitializeProcessorStructures(IN PVOID ProcessorStructures, OUT PKGDTENTRY *Gdt, diff --git a/xtoskrnl/includes/ar/i686/procsup.hh b/xtoskrnl/includes/ar/i686/procsup.hh index d7cd16d8b..1886f1374 100644 --- a/xtoskrnl/includes/ar/i686/procsup.hh +++ b/xtoskrnl/includes/ar/i686/procsup.hh @@ -33,7 +33,7 @@ namespace AR STATIC XTAPI PVOID GetBootStack(VOID); STATIC XTAPI VOID GetTrampolineInformation(IN TRAMPOLINE_TYPE TrampolineType, OUT PVOID *TrampolineCode, - OUT PULONG_PTR TrampolineSize); + OUT PULONG TrampolineSize); STATIC XTAPI VOID InitializeProcessor(IN PVOID ProcessorStructures); STATIC XTAPI VOID InitializeProcessorStructures(IN PVOID ProcessorStructures, OUT PKGDTENTRY *Gdt,