Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-20 01:24:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:MM] MiResolveImageReferences: Use boolean values for GdiLink and NormalLink.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2023-08-19 19:06:20 +02:00
parent df0349b49f
commit 5472c3e853
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ntoskrnl/mm/ARM3/sysldr.c
View file

@ -996,7 +996,8 @@ MiResolveImageReferences(IN PVOID ImageBase,
PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor, CurrentImport; PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor, CurrentImport;
ULONG ImportSize, ImportCount = 0, LoadedImportsSize, ExportSize; ULONG ImportSize, ImportCount = 0, LoadedImportsSize, ExportSize;
PLOAD_IMPORTS LoadedImports, NewImports; PLOAD_IMPORTS LoadedImports, NewImports;
ULONG GdiLink, NormalLink, i; ULONG i;
BOOLEAN GdiLink, NormalLink;
BOOLEAN ReferenceNeeded, Loaded; BOOLEAN ReferenceNeeded, Loaded;
ANSI_STRING TempString; ANSI_STRING TempString;
UNICODE_STRING NameString, DllName; UNICODE_STRING NameString, DllName;
@ -1006,7 +1007,9 @@ MiResolveImageReferences(IN PVOID ImageBase,
PIMAGE_EXPORT_DIRECTORY ExportDirectory; PIMAGE_EXPORT_DIRECTORY ExportDirectory;
NTSTATUS Status; NTSTATUS Status;
PIMAGE_THUNK_DATA OrigThunk, FirstThunk; PIMAGE_THUNK_DATA OrigThunk, FirstThunk;
PAGED_CODE(); PAGED_CODE();
DPRINT("%s - ImageBase: %p. ImageFileDirectory: %wZ\n", DPRINT("%s - ImageBase: %p. ImageFileDirectory: %wZ\n",
__FUNCTION__, ImageBase, ImageFileDirectory); __FUNCTION__, ImageBase, ImageFileDirectory);
@ -1054,25 +1057,26 @@ MiResolveImageReferences(IN PVOID ImageBase,
} }
/* Reset the import count and loop descriptors again */ /* Reset the import count and loop descriptors again */
ImportCount = GdiLink = NormalLink = 0; GdiLink = NormalLink = FALSE;
ImportCount = 0;
while ((ImportDescriptor->Name) && (ImportDescriptor->OriginalFirstThunk)) while ((ImportDescriptor->Name) && (ImportDescriptor->OriginalFirstThunk))
{ {
/* Get the name */ /* Get the name */
ImportName = (PCHAR)((ULONG_PTR)ImageBase + ImportDescriptor->Name); ImportName = (PCHAR)((ULONG_PTR)ImageBase + ImportDescriptor->Name);
/* Check if this is a GDI driver */ /* Check if this is a GDI driver */
GdiLink = GdiLink | GdiLink = GdiLink ||
!(_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)); !(_strnicmp(ImportName, "win32k", sizeof("win32k") - 1));
/* We can also allow dxapi (for Windows compat, allow IRT and coverage) */ /* We can also allow dxapi (for Windows compat, allow IRT and coverage) */
NormalLink = NormalLink | NormalLink = NormalLink ||
((_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)) && ((_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)) &&
(_strnicmp(ImportName, "dxapi", sizeof("dxapi") - 1)) && (_strnicmp(ImportName, "dxapi", sizeof("dxapi") - 1)) &&
(_strnicmp(ImportName, "coverage", sizeof("coverage") - 1)) && (_strnicmp(ImportName, "coverage", sizeof("coverage") - 1)) &&
(_strnicmp(ImportName, "irt", sizeof("irt") - 1))); (_strnicmp(ImportName, "irt", sizeof("irt") - 1)));
/* Check if this is a valid GDI driver */ /* Check if this is a valid GDI driver */
if ((GdiLink) && (NormalLink)) if (GdiLink && NormalLink)
{ {
/* It's not, it's importing stuff it shouldn't be! */ /* It's not, it's importing stuff it shouldn't be! */
Status = STATUS_PROCEDURE_NOT_FOUND; Status = STATUS_PROCEDURE_NOT_FOUND;