From f9533e5eba14e313a200aaa6ee86d14d9868d757 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Fri, 9 Dec 2011 21:43:03 +0000 Subject: [PATCH] [LDR] - Fix invalid errors about "system DLL kernel32.dll was relocated in memory". This reverts my previous fix suggested by rafalh and puts a better explanation there in comments. svn path=/trunk/; revision=54629 --- reactos/dll/ntdll/ldr/ldrutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/ntdll/ldr/ldrutils.c b/reactos/dll/ntdll/ldr/ldrutils.c index 768f25f5a87..5109e8011f0 100644 --- a/reactos/dll/ntdll/ldr/ldrutils.c +++ b/reactos/dll/ntdll/ldr/ldrutils.c @@ -1397,8 +1397,8 @@ SkipCheck: } } - /* Check if this was a non-relocatable DLL or a known dll */ - if (!RelocatableDll || KnownDll) + /* Known DLLs are not allowed to be relocated */ + if (KnownDll && !RelocatableDll) { /* Setup for hard error */ HardErrorParameters[0] = (ULONG_PTR)&IllegalDll;