Skip to content

Update ntldr.h #2547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
diversenok wants to merge 11 commits into
base: master
Choose a base branch
from
+596 −333
Open

Update ntldr.h #2547

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
61e1b56
Update ntldr.h
diversenok May 6, 2025
257ab40
Restore untyped entry point context
diversenok May 7, 2025
cc0b9f4
Merge branch 'master' into update-ntldr
jxy-s May 7, 2025
a7112f5
Merge branch 'master' into update-ntldr
jxy-s May 7, 2025
5e1c8ca
Add missing annotation
diversenok May 8, 2025
91d0f53
Update parameter type
diversenok May 8, 2025
7a6866b
Keep the type information with the type
diversenok May 8, 2025
f9c52f7
Use arrays for resource paths
diversenok May 8, 2025
bd2e401
Merge branch 'master' into update-ntldr
jxy-s May 11, 2025
f8809a7
Revert "Use arrays for resource paths"
diversenok May 11, 2025
b4789b8
Restore LDR_RESOURCE_INFO's name
diversenok May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions phlib/mapldr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,18 +682,18 @@ NTSTATUS PhLoadResource(
)
{
NTSTATUS status;
LDR_RESOURCE_INFO resourceInfo;
LDR_RESOURCE_ID resourceId;
PIMAGE_RESOURCE_DATA_ENTRY resourceData = NULL;
PVOID resourceBuffer = NULL;
ULONG resourceLength;

resourceInfo.Type = (ULONG_PTR)Type;
resourceInfo.Name = (ULONG_PTR)Name;
resourceInfo.Language = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);
resourceId.Type = Type;
resourceId.Name = Name;
resourceId.Language = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);

__try
{
status = LdrFindResource_U(DllBase, &resourceInfo, RESOURCE_DATA_LEVEL, &resourceData);
status = LdrFindResource_U(DllBase, resourceId.ResourceIdPath, LDR_RESOURCE_ID_LENGTH_THROUGH_LANGUAGE, &resourceData);
}
__except (EXCEPTION_EXECUTE_HANDLER)
{
Expand Down Expand Up @@ -1188,7 +1188,7 @@ NTSTATUS PhGetLoaderEntryImageNtHeaders(
NTSTATUS PhGetLoaderEntryImageEntryPoint(
_In_ PVOID BaseAddress,
_In_ PIMAGE_NT_HEADERS ImageNtHeader,
_Out_ PLDR_INIT_ROUTINE *ImageEntryPoint
_Out_ PDLL_INIT_ROUTINE *ImageEntryPoint
)
{
if (ImageNtHeader->OptionalHeader.AddressOfEntryPoint == 0)
Expand Down Expand Up @@ -2642,7 +2642,7 @@ NTSTATUS PhLoaderEntryUnloadDll(
{
NTSTATUS status;
PIMAGE_NT_HEADERS imageNtHeaders;
PLDR_INIT_ROUTINE imageEntryRoutine;
PDLL_INIT_ROUTINE imageEntryRoutine;

status = PhGetLoaderEntryImageNtHeaders(
BaseAddress,
Expand Down Expand Up @@ -2718,7 +2718,7 @@ NTSTATUS PhLoadPluginImage(
NTSTATUS status;
PVOID imageBaseAddress;
PIMAGE_NT_HEADERS imageNtHeaders;
PLDR_INIT_ROUTINE imageEntryRoutine;
PDLL_INIT_ROUTINE imageEntryRoutine;

#if defined(PH_NATIVE_PLUGIN_IMAGE_LOAD)
UNICODE_STRING imageFileName;
Expand Down
Loading