[CMAKE]

- Alter base addresses to prevent kernel32 relocation.
- Fixes 2nd stage hang.

svn path=/branches/cmake-bringup/; revision=51174

diff --git a/baseaddress.cmake b/baseaddress.cmake
index 9c787c7..9a3128c 100644 (file)
--- a/baseaddress.cmake
+++ b/baseaddress.cmake
@@ -239,23 +239,23 @@ set(baseaddress_msvcrt40          0x78700000)
 set(baseaddress_mscoree                        0x79000000)
 set(baseaddress_fusion                 0x79040000)
 set(baseaddress_ntdll                  0x7c900000)
-set(baseaddress_kernel32               0x7ca10000)
-set(baseaddress_user32                 0x7cbf0000)
-set(baseaddress_gdi32                  0x7cdd0000)
-set(baseaddress_comctl32               0x7ce60000)
-set(baseaddress_comdlg32               0x7d010000)
-set(baseaddress_shlwapi                        0x7d110000)
-set(baseaddress_urlmon                 0x7d1e0000)
-set(baseaddress_ws2_32                 0x7d2f0000)
-set(baseaddress_syssetup               0x7d340000)
-set(baseaddress_browseui               0x7d410000)
-set(baseaddress_dsound                 0x7d530000)
-set(baseaddress_quartz                 0x7d5e0000)
-set(baseaddress_msvfw32                        0x7d7a0000)
-set(baseaddress_mshtml                 0x7d7f0000)
-set(baseaddress_query                  0x7da30000)
-set(baseaddress_hhctrl                 0x7da60000)
-set(baseaddress_sxs                            0x7dad0000)
-set(baseaddress_beepmidi               0x7db00000)
-set(baseaddress_ntmarta                        0x7db20000)
+set(baseaddress_kernel32               0x7cb10000)
+set(baseaddress_user32                 0x7ccf0000)
+set(baseaddress_gdi32                  0x7ced0000)
+set(baseaddress_comctl32               0x7cf60000)
+set(baseaddress_comdlg32               0x7d110000)
+set(baseaddress_shlwapi                        0x7d210000)
+set(baseaddress_urlmon                 0x7d2e0000)
+set(baseaddress_ws2_32                 0x7d3f0000)
+set(baseaddress_syssetup               0x7d440000)
+set(baseaddress_browseui               0x7d510000)
+set(baseaddress_dsound                 0x7d630000)
+set(baseaddress_quartz                 0x7d6e0000)
+set(baseaddress_msvfw32                        0x7d8a0000)
+set(baseaddress_mshtml                 0x7d8f0000)
+set(baseaddress_query                  0x7db30000)
+set(baseaddress_hhctrl                 0x7db60000)
+set(baseaddress_sxs                            0x7dbd0000)
+set(baseaddress_beepmidi               0x7dc00000)
+set(baseaddress_ntmarta                        0x7dc20000)
 set(baseaddress_ftfd                   0x7f000000)