Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.9][CMAKE] Fix MSVC2010SP1 x86 dbg configure-warning 'winspool has no base address' CORE-18104

Browse source 
pick part of 0.4.10-dev-312-g a3ddb8a4c2 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.
This commit is contained in:
Joachim Henze 2022-04-07 01:07:52 +02:00
parent 2da5e4b97b
commit 9c34433cd7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sdk/cmake/baseaddress_dwarf.cmake
View file

@ -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)

2
sdk/cmake/baseaddress_msvc.cmake
View file

@ -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)