From 6a5aa2060e12ba99906594b8e9019b2c5cf38c6b Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sat, 1 Jan 2005 22:57:06 +0000 Subject: [PATCH] More LDR constants changes. svn path=/trunk/; revision=12711 --- reactos/ntoskrnl/ldr/rtl.c | 6 +++--- reactos/ntoskrnl/ldr/sysdll.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reactos/ntoskrnl/ldr/rtl.c b/reactos/ntoskrnl/ldr/rtl.c index b3b0ce26912..ee9a7aa20cc 100644 --- a/reactos/ntoskrnl/ldr/rtl.c +++ b/reactos/ntoskrnl/ldr/rtl.c @@ -1,4 +1,4 @@ -/* $Id: rtl.c,v 1.20 2004/08/15 16:39:06 chorns Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -28,9 +28,9 @@ RtlImageNtHeader (IN PVOID BaseAddress) DosHeader = (PIMAGE_DOS_HEADER)BaseAddress; NTHeaders = (PIMAGE_NT_HEADERS)((char*)BaseAddress + DosHeader->e_lfanew); - if ((DosHeader->e_magic != IMAGE_DOS_MAGIC) + if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || (DosHeader->e_lfanew == 0L) - || (*(PULONG) NTHeaders != IMAGE_PE_MAGIC)) + || (*(PULONG) NTHeaders != IMAGE_NT_SIGNATURE)) { return(NULL); } diff --git a/reactos/ntoskrnl/ldr/sysdll.c b/reactos/ntoskrnl/ldr/sysdll.c index f2842a0b168..8a2756b4d78 100644 --- a/reactos/ntoskrnl/ldr/sysdll.c +++ b/reactos/ntoskrnl/ldr/sysdll.c @@ -125,9 +125,9 @@ NTSTATUS LdrpMapSystemDll(HANDLE ProcessHandle, */ DosHeader = (PIMAGE_DOS_HEADER) BlockBuffer; NTHeaders = (PIMAGE_NT_HEADERS) (BlockBuffer + DosHeader->e_lfanew); - if ((DosHeader->e_magic != IMAGE_DOS_MAGIC) + if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || (DosHeader->e_lfanew == 0L) - || (*(PULONG) NTHeaders != IMAGE_PE_MAGIC)) + || (*(PULONG) NTHeaders != IMAGE_NT_SIGNATURE)) { DbgPrint("NTDLL format invalid\n"); ZwClose(FileHandle);