Rebase against c44e0cf60ad1a967d80fafb427974332b35a0071.

This commit is contained in:
Zebediah Figura
2020-04-24 16:35:33 -05:00
parent 77d29cbee9
commit 4581daea3b
7 changed files with 89 additions and 90 deletions

View File

@ -1,4 +1,4 @@
From fb0f6b366765e5cd7cf236d660a974541e85b100 Mon Sep 17 00:00:00 2001
From 223c2c82eba0aacee744f6d9fcf9189cff2fd1e7 Mon Sep 17 00:00:00 2001
From: Andrew Wesie <awesie@gmail.com>
Date: Fri, 12 Apr 2019 20:04:03 -0500
Subject: [PATCH] ntdll: Return ntdll.dll as the first entry for
@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Return ntdll.dll as the first entry for
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index a9cec53e0b6..c7d4c804e2c 100644
index f44c232f4e9..ebb8c94bd11 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -2454,6 +2454,33 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature )
@@ -2546,6 +2546,33 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature )
return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature];
}
@ -21,15 +21,15 @@ index a9cec53e0b6..c7d4c804e2c 100644
+ char *ptr;
+ ANSI_STRING str;
+ PLIST_ENTRY entry;
+ PLDR_MODULE mod;
+ LDR_DATA_TABLE_ENTRY *mod;
+
+ /* The first entry must be ntdll. */
+ entry = NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList.Flink;
+ mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList);
+ mod = CONTAINING_RECORD(entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks);
+
+ sm->Section = 0;
+ sm->MappedBaseAddress = 0;
+ sm->ImageBaseAddress = mod->BaseAddress;
+ sm->ImageBaseAddress = mod->DllBase;
+ sm->ImageSize = mod->SizeOfImage;
+ sm->Flags = mod->Flags;
+ sm->LoadOrderIndex = 0;
@ -46,7 +46,7 @@ index a9cec53e0b6..c7d4c804e2c 100644
/******************************************************************************
* NtQuerySystemInformation [NTDLL.@]
* ZwQuerySystemInformation [NTDLL.@]
@@ -2853,7 +2880,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2882,7 +2909,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
FIXME("returning fake driver list\n");
smi->ModulesCount = 1;
@ -56,5 +56,5 @@ index a9cec53e0b6..c7d4c804e2c 100644
}
break;
--
2.17.1
2.26.0