[BASEADDRESSES]

Change base addresses of a few dlls (ntdll, kernel32, user32, gdi32, advapi32, msvcrt) to avoid conflicts with windows dlls.

svn path=/trunk/; revision=62119

diff --git a/reactos/cmake/baseaddress.cmake b/reactos/cmake/baseaddress.cmake
index 4fc420d..629c3e6 100644 (file)
--- a/reactos/cmake/baseaddress.cmake
+++ b/reactos/cmake/baseaddress.cmake
@@ -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)