Rebase against 98c2c9a9c98d174851fa7a87db79599dd7d8af89

This commit is contained in:
Alistair Leslie-Hughes
2019-10-22 08:28:23 +11:00
parent 9807a02bb3
commit a568bd3e79
5 changed files with 30 additions and 146 deletions

View File

@ -1,7 +1,7 @@
From 4ae8c8dcc501081481fd07302f7cba16d19ecda6 Mon Sep 17 00:00:00 2001
From fb0f6b366765e5cd7cf236d660a974541e85b100 Mon Sep 17 00:00:00 2001
From: Andrew Wesie <awesie@gmail.com>
Date: Fri, 12 Apr 2019 20:04:03 -0500
Subject: [PATCH 2/3] ntdll: Return ntdll.dll as the first entry for
Subject: [PATCH] ntdll: Return ntdll.dll as the first entry for
SystemModuleInformation.
---
@ -9,10 +9,10 @@ Subject: [PATCH 2/3] 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 7cc5d81b2..df3c40fcc 100644
index a9cec53e0b6..c7d4c804e2c 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -2352,6 +2352,33 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature )
@@ -2454,6 +2454,33 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature )
return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature];
}
@ -27,14 +27,14 @@ index 7cc5d81b2..df3c40fcc 100644
+ entry = NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList.Flink;
+ mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList);
+
+ sm->Reserved1 = 0;
+ sm->Reserved2 = 0;
+ sm->Section = 0;
+ sm->MappedBaseAddress = 0;
+ sm->ImageBaseAddress = mod->BaseAddress;
+ sm->ImageSize = mod->SizeOfImage;
+ sm->Flags = mod->Flags;
+ sm->Id = 0;
+ sm->Rank = 0;
+ sm->Unknown = 0;
+ sm->LoadOrderIndex = 0;
+ sm->InitOrderIndex = 0;
+ sm->LoadCount = 0;
+ str.Length = 0;
+ str.MaximumLength = MAXIMUM_FILENAME_LENGTH;
+ str.Buffer = (char*)sm->Name;
@ -46,7 +46,7 @@ index 7cc5d81b2..df3c40fcc 100644
/******************************************************************************
* NtQuerySystemInformation [NTDLL.@]
* ZwQuerySystemInformation [NTDLL.@]
@@ -2780,7 +2807,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2853,7 +2880,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
FIXME("returning fake driver list\n");
smi->ModulesCount = 1;
@ -56,5 +56,5 @@ index 7cc5d81b2..df3c40fcc 100644
}
break;
--
2.21.0
2.17.1