Author: fireball
Date: Fri Dec 9 21:43:03 2011
New Revision: 54629
URL:
http://svn.reactos.org/svn/reactos?rev=54629&view=rev
Log:
[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.
Modified:
trunk/reactos/dll/ntdll/ldr/ldrutils.c
Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Fri Dec 9 21:43:03 2011
@@ -1397,8 +1397,8 @@
}
}
- /* 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;