Author: tkreuzer
Date: Tue Feb 11 19:08:01 2014
New Revision: 62119
URL: http://svn.reactos.org/svn/reactos?rev=62119&view=rev
Log:
[BASEADDRESSES]
Change base addresses of a few dlls (ntdll, kernel32, user32, gdi32, advapi32,
msvcrt) to avoid conflicts with windows dlls.
Modified:
trunk/reactos/cmake/baseaddress.cmake
Modified: trunk/reactos/cmake/baseaddress.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?rev=62119&r1=62118&r2=62119&view=diff
==============================================================================
--- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Tue Feb 11
19:08:01 2014
@@ -1,9 +1,9 @@
-set(baseaddress_ntdll 0x77f10000)
-set(baseaddress_kernel32 0x77d80000)
-set(baseaddress_msvcrt 0x77cd0000)
-set(baseaddress_advapi32 0x77c20000)
-set(baseaddress_gdi32 0x77bb0000)
-set(baseaddress_user32 0x77a20000)
+set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000
+set(baseaddress_kernel32 0x7c800000) # matches w2k3 FRE/CHK @
0x7c800000
+set(baseaddress_user32 0x77e20000) # not relocatable, avoid
conflicts with win
+set(baseaddress_gdi32 0x77d80000)
+set(baseaddress_advapi32 0x77c80000)
+set(baseaddress_msvcrt 0x77b80000)
set(baseaddress_dhcpcsvc 0x779d0000)
set(baseaddress_dnsapi 0x77980000)
set(baseaddress_icmp 0x77950000)
