[0.4.9][CMAKE] Fix MSVC2010SP1 x86 dbg configure-warning 'winspool has no base addres...

pick part of 0.4.10-dev-312-g a3ddb8a4c26bf392a3726a11ae9d53dc4a05ac0b to harmonize the
inconsistency in the base-address-files regarding winspool.
Since an ancient winspool-name-change
the baseaddress*.cmake files do reference the winspool module in an inconsistent style:
- 'baseaddress_winspool' in baseaddress.cmake 'was already' / 'is still' ok without
   the 'drv' in the older branches (unlike 0.4.10-dev-311)
- 'baseaddress_winspool.drv' in baseaddress_dwarf.cmake
- 'baseaddress_winspool.drv' in baseaddress_msvc.cmake

And therefore only GCC did properly set a base address, but MSVC failed at that.
No warnings afterwards anymore about 'winspool has no base address' during configure.

No false hopes though: The baseaddress-files do still remain a big mess afterwards,
especially in releases/0.4.9 for GCC dbg where we not only have the 'usual incomplete files'
but also still have and always had a lot of relocations between ros components at runtime
because some ros modules do overlap since some Wine-sync during 0.4.9-dev'ing, which
increased the binary sizes. But I just wanted to focus on the avoidable winspool-detail here for now.
Might deal with the other stuff later.

diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake
index 43b9fb7..37f363b 100644 (file)
--- a/sdk/cmake/baseaddress_dwarf.cmake
+++ b/sdk/cmake/baseaddress_dwarf.cmake
@@ -14,7 +14,7 @@ set(baseaddress_shlwapi              0x775a0000)
 set(baseaddress_rpcrt4               0x77490000)
 set(baseaddress_comctl32             0x772b0000)
 set(baseaddress_ole32                0x77020000)
-set(baseaddress_winspool.drv         0x76fe0000)
+set(baseaddress_winspool             0x76fe0000)
 set(baseaddress_winmm                0x76f20000)
 set(baseaddress_comdlg32             0x76e10000)
 set(baseaddress_shell32              0x76010000)

diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake
index 81139a2..2946161 100644 (file)
--- a/sdk/cmake/baseaddress_msvc.cmake
+++ b/sdk/cmake/baseaddress_msvc.cmake
@@ -14,7 +14,7 @@ set(baseaddress_shlwapi                0x7c350000)
 set(baseaddress_rpcrt4                 0x7c2c0000)
 set(baseaddress_comctl32               0x7c1a0000)
 set(baseaddress_ole32                  0x7c060000)
-set(baseaddress_winspool.drv           0x7c030000)
+set(baseaddress_winspool               0x7c030000)
 set(baseaddress_winmm                  0x7bf90000)
 set(baseaddress_comdlg32               0x7bec0000)
 set(baseaddress_shell32                0x7b5d0000)