Author: tfaber
Date: Fri Sep 22 09:26:32 2017
New Revision: 75923
URL: http://svn.reactos.org/svn/reactos?rev=75923&view=rev
Log:
[CMAKE]
- Hackfix base addresses to avoid comctl32/rpcrt4 overlap. This makes use of
the fact that baseaddress_winspool.drv is not being used (it should be called
baseaddress_winspool).
Base addresses should be properly regenerated at some point, and the issues
exposed by the relocations are still bugs that need to be fixed. This should at
least make testbot reliable again though.
CORE-13804
Modified:
trunk/reactos/sdk/cmake/baseaddress.cmake
Modified: trunk/reactos/sdk/cmake/baseaddress.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/baseaddress.cmake?rev=75923&r1=75922&r2=75923&view=diff
==============================================================================
--- trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] (original)
+++ trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] Fri Sep 22
09:26:32 2017
@@ -11,10 +11,9 @@
set(baseaddress_ws2_32 0x7c280000)
set(baseaddress_ws2help 0x7c250000)
set(baseaddress_shlwapi 0x7c1a0000)
-set(baseaddress_rpcrt4 0x7c0d0000)
-set(baseaddress_comctl32 0x7bf40000)
-set(baseaddress_ole32 0x7bd60000)
-set(baseaddress_winspool.drv 0x7bd30000)
+set(baseaddress_rpcrt4 0x7c0e0000)
+set(baseaddress_comctl32 0x7bf20000)
+set(baseaddress_ole32 0x7bd20000)
set(baseaddress_winmm 0x7bc70000)
set(baseaddress_comdlg32 0x7bb70000)
set(baseaddress_shell32 0x7b1b0000)
