[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

svn path=/trunk/; revision=75923

diff --git a/reactos/sdk/cmake/baseaddress.cmake b/reactos/sdk/cmake/baseaddress.cmake
index 7885a7e..c92762b 100644 (file)
--- a/reactos/sdk/cmake/baseaddress.cmake
+++ b/reactos/sdk/cmake/baseaddress.cmake
@@ -11,10 +11,9 @@ set(baseaddress_iphlpapi               0x7c2c0000)
 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)