diff options
| -rw-r--r-- | EdkModulePkg/Core/DxeIplPeim/DxeIpl.h | 6 | ||||
| -rw-r--r-- | EdkModulePkg/Core/DxeIplPeim/DxeLoad.c | 21 | ||||
| -rw-r--r-- | EdkModulePkg/Core/DxeIplPeim/DxeLoadX64.c | 21 |
3 files changed, 31 insertions, 17 deletions
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.h b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.h index bc50666..5e35042 100644 --- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.h +++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.h @@ -102,9 +102,9 @@ DxeLoadCore ( EFI_STATUS
PeiProcessFile (
- IN UINT16 SectionType,
- IN EFI_FFS_FILE_HEADER *FfsFileHeader,
- OUT VOID **Pe32Data
+ IN UINT16 SectionType,
+ IN OUT EFI_FFS_FILE_HEADER **RealFfsFileHeader,
+ OUT VOID **Pe32Data
);
EFI_STATUS
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c index 7800841..4492376 100644 --- a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c +++ b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c @@ -470,12 +470,12 @@ Returns: &FfsFileHeader
);
if (!EFI_ERROR (Status)) {
- CopyMem (FileName, &FfsFileHeader->Name, sizeof (EFI_GUID));
Status = PeiProcessFile (
SectionType,
- FfsFileHeader,
+ &FfsFileHeader,
Pe32Data
);
+ CopyMem (FileName, &FfsFileHeader->Name, sizeof (EFI_GUID));
return Status;
}
Hob.Raw = GET_NEXT_HOB (Hob);
@@ -683,7 +683,7 @@ Returns: //
Status = PeiProcessFile (
EFI_SECTION_PE32,
- FfsHeader,
+ &FfsHeader,
&Pe32Data
);
@@ -706,9 +706,9 @@ Returns: EFI_STATUS
PeiProcessFile (
- IN UINT16 SectionType,
- IN EFI_FFS_FILE_HEADER *FfsFileHeader,
- OUT VOID **Pe32Data
+ IN UINT16 SectionType,
+ IN OUT EFI_FFS_FILE_HEADER **RealFfsFileHeader,
+ OUT VOID **Pe32Data
)
/*++
@@ -756,6 +756,9 @@ Returns: EFI_GUID TempGuid;
EFI_FIRMWARE_VOLUME_HEADER *FvHeader;
EFI_COMPRESSION_SECTION *CompressionSection;
+ EFI_FFS_FILE_HEADER *FfsFileHeader;
+
+ FfsFileHeader = *RealFfsFileHeader;
Status = PeiServicesFfsFindSectionData (
EFI_SECTION_COMPRESSION,
@@ -950,7 +953,11 @@ Returns: return EFI_NOT_FOUND;
}
- return PeiProcessFile (SectionType, FfsFileHeader, Pe32Data);
+ //
+ // Reture the FfsHeader that contain Pe32Data.
+ //
+ *RealFfsFileHeader = FfsFileHeader;
+ return PeiProcessFile (SectionType, RealFfsFileHeader, Pe32Data);
}
}
//
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeLoadX64.c b/EdkModulePkg/Core/DxeIplPeim/DxeLoadX64.c index 451d239..cbb7595 100644 --- a/EdkModulePkg/Core/DxeIplPeim/DxeLoadX64.c +++ b/EdkModulePkg/Core/DxeIplPeim/DxeLoadX64.c @@ -445,12 +445,12 @@ Returns: &FfsFileHeader
);
if (!EFI_ERROR (Status)) {
- CopyMem (FileName, &FfsFileHeader->Name, sizeof (EFI_GUID));
Status = PeiProcessFile (
SectionType,
- FfsFileHeader,
+ &FfsFileHeader,
Pe32Data
);
+ CopyMem (FileName, &FfsFileHeader->Name, sizeof (EFI_GUID));
return Status;
}
Hob.Raw = GET_NEXT_HOB (Hob);
@@ -662,7 +662,7 @@ Returns: //
Status = PeiProcessFile (
EFI_SECTION_PE32,
- FfsHeader,
+ &FfsHeader,
&Pe32Data
);
@@ -686,9 +686,9 @@ Returns: EFI_STATUS
PeiProcessFile (
- IN UINT16 SectionType,
- IN EFI_FFS_FILE_HEADER *FfsFileHeader,
- OUT VOID **Pe32Data
+ IN UINT16 SectionType,
+ IN OUT EFI_FFS_FILE_HEADER **RealFfsFileHeader,
+ OUT VOID **Pe32Data
)
/*++
@@ -736,6 +736,9 @@ Returns: EFI_GUID TempGuid;
EFI_FIRMWARE_VOLUME_HEADER *FvHeader;
EFI_COMPRESSION_SECTION *CompressionSection;
+ EFI_FFS_FILE_HEADER *FfsFileHeader;
+
+ FfsFileHeader = *RealFfsFileHeader;
Status = PeiServicesFfsFindSectionData (
EFI_SECTION_COMPRESSION,
@@ -930,7 +933,11 @@ Returns: return EFI_NOT_FOUND;
}
- return PeiProcessFile (SectionType, FfsFileHeader, Pe32Data);
+ //
+ // Reture the FfsHeader that contain Pe32Data.
+ //
+ *RealFfsFileHeader = FfsFileHeader;
+ return PeiProcessFile (SectionType, RealFfsFileHeader, Pe32Data);
}
}
//
|