Set base address of modules

svn path=/branches/xmlbuildsystem/; revision=13757

diff --git a/reactos/baseaddress.xml b/reactos/baseaddress.xml
index 99a0fdd..cd44da4 100644 (file)
--- a/reactos/baseaddress.xml
+++ b/reactos/baseaddress.xml
@@ -1,89 +1,100 @@
-<property name="BASEADDRESS_DINPUT8" value="0x00400000" />\r
-<property name="BASEADDRESS_DXDIAGN" value="0x00400000" />\r
 <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" />\r
-<property name="BASEADDRESS_SECURE32" value="0x10000000" />\r
 <property name="BASEADDRESS_DEVENUM" value="0x35680000" />\r
-<property name="BASEADDRESS_DSOUND" value="0x50000000" />\r
-<property name="BASEADDRESS_GLU32" value="0x50000000" />\r
-<property name="BASEADDRESS_OPENGL32" value="0x50000000" />\r
-<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" />\r
 <property name="BASEADDRESS_DINPUT" value="0x5F580000" />\r
 <property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" />\r
 <property name="BASEADDRESS_SYSDM" value="0x64DD0000" />\r
-<property name="BASEADDRESS_NCPL" value="0x64EA0000" />\r
 <property name="BASEADDRESS_MAIN" value="0x64F40000" />\r
 <property name="BASEADDRESS_INTL" value="0x64FB0000" />\r
 <property name="BASEADDRESS_DESK" value="0x65080000" />\r
 <property name="BASEADDRESS_APPWIZ" value="0x65100000" />\r
 <property name="BASEADDRESS_ACCESS" value="0x65180000" />\r
-<property name="BASEADDRESS_HID" value="0x688F0000" />\r
-<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" />\r
 <property name="BASEADDRESS_PSAPI" value="0x68f70000" />\r
 <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" />\r
-<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" />\r
 <property name="BASEADDRESS_UNICODE" value="0x6b200000" />\r
-<property name="BASEADDRESS_DISPLAY" value="DISPLAY" />\r
+<property name="BASEADDRESS_ADVPACK" value="0x6b300000" />\r
+<property name="BASEADDRESS_CONTROL" value="0x6b310000" />\r
+<property name="BASEADDRESS_NCPA" value="0x6b320000" />\r
+<property name="BASEADDRESS_DBGHELP" value="0x6b330000" />\r
+<property name="BASEADDRESS_DINPUT8" value="0x6b340000" />\r
+<property name="BASEADDRESS_DXDIAGN" value="0x6b350000" />\r
+<property name="BASEADDRESS_DSOUND" value="0x6b360000" />\r
+<property name="BASEADDRESS_GLU32" value="0x6b370000" />\r
+<property name="BASEADDRESS_MESA32" value="0x6b380000" />\r
+<property name="BASEADDRESS_OPENGL32" value="0x6b390000" />\r
+<property name="BASEADDRESS_SECUR32" value="0x6b3A0000" />\r
+<property name="BASEADDRESS_SMDLL" value="0x6b3B0000" />\r
+<property name="BASEADDRESS_URLMON" value="0x6b3C0000" />\r
 <property name="BASEADDRESS_CARDS" value="0x701a0000" />\r
 <property name="BASEADDRESS_WININET" value="0x70200000" />\r
 <property name="BASEADDRESS_ACLUI" value="0x71550000" />\r
 <property name="BASEADDRESS_SHDOCVW" value="0x71700000" />\r
-<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" />\r
 <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" />\r
 <property name="BASEADDRESS_ACLEDIT" value="0x71b70000" />\r
 <property name="BASEADDRESS_NETAPI32" value="0x71c00000" />\r
-<property name="BASEADDRESS_WINFAX" value="0x722C0000" />\r
-<property name="BASEADDRESS_DEVMGR" value="0x72a90000" />\r
-<property name="BASEADDRESS_WINSCARD" value="0x723D0000" />\r
-<property name="BASEADDRESS_COREDLL" value="0x73d80000" />\r
-<property name="BASEADDRESS_LZEXPAND" value="0x73d80000" />\r
+<property name="BASEADDRESS_LZ32" value="0x73d80000" />\r
 <property name="BASEADDRESS_USERENV" value="0x74850000" />\r
 <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" />\r
-<property name="BASEADDRESS_OLEDLG" value="0x74d00000" />\r
 <property name="BASEADDRESS_SAMLIB" value="0x750C0000" />\r
 <property name="BASEADDRESS_CABINET" value="0x75120000" />\r
 <property name="BASEADDRESS_MSGINA" value="0x75970000" />\r
-<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" />\r
 <property name="BASEADDRESS_IMM32" value="0x75e60000" />\r
 <property name="BASEADDRESS_RPCRT4" value="0x76000000" />\r
-<property name="BASEADDRESS_MIDIMAP" value="0x76600000" />\r
 <property name="BASEADDRESS_SHLWAPI" value="0x76120000" />\r
 <property name="BASEADDRESS_COMCTL32" value="0x76160000" />\r
 <property name="BASEADDRESS_COMDLG32" value="0x76200000" />\r
 <property name="BASEADDRESS_OLEAUT32" value="0x76260000" />\r
-<property name="BASEADDRESS_D3D8THK" value="0x76340000" />\r
-<property name="BASEADDRESS_RICHEDIT" value="0x76340000" />\r
+<property name="BASEADDRESS_RICHED32" value="0x76340000" />\r
 <property name="BASEADDRESS_TWAIN_32" value="0x76380000" />\r
-<property name="BASEADDRESS_LSASRV" value="0x76540000" />\r
+<property name="BASEADDRESS_MIDIMAP" value="0x76600000" />\r
 <property name="BASEADDRESS_MPR" value="0x76620000" />\r
-<property name="BASEADDRESS_ODBC32" value="0x76660000" />\r
 <property name="BASEADDRESS_SETUPAPI" value="0x76660000" />\r
 <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" />\r
 <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" />\r
 <property name="BASEADDRESS_FMIFS" value="0x76df0000" />\r
 <property name="BASEADDRESS_SHELL32" value="0x77260000" />\r
 <property name="BASEADDRESS_IPHLPAPI" value="0x77300000" />\r
-<property name="BASEADDRESS_MSACM" value="0x77400000" />\r
 <property name="BASEADDRESS_MMDRV" value="0x77500000" />\r
 <property name="BASEADDRESS_CRTDLL" value="0x77630000" />\r
-<property name="BASEADDRESS_PACKET" value="0x77780000" />\r
-<property name="BASEADDRESS_W2_32" value="0x77780000" />\r
 <property name="BASEADDRESS_MSAFD" value="0x777a0000" />\r
-<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" />\r
 <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" />\r
-<property name="BASEADDRESS_WINMM" value="0x777c0000" />\r
-<property name="BASEADDRESS_WS2HELP" value="0x777c0000" />\r
-<property name="BASEADDRESS_WSHIRDA" value="0x777c0000" />\r
-<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" />\r
+<property name="BASEADDRESS_WINMM" value="0x777d0000" />\r
+<property name="BASEADDRESS_WS2HELP" value="0x777e0000" />\r
+<property name="BASEADDRESS_WSHIRDA" value="0x777f0000" />\r
 <property name="BASEADDRESS_WINSPOOL" value="0x77800000" />\r
-<property name="BASEADDRESS_OLE32" value="0x77a50000" />\r
-<property name="BASEADDRESS_OLEPRO32" value="0x77a50000" />\r
 <property name="BASEADDRESS_VERSION" value="0x77a90000" />\r
+<property name="BASEADDRESS_WS2_32" value="0x777aa000" />\r
+<property name="BASEADDRESS_OLE32" value="0x77a50000" />\r
+<property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" />\r
 <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />\r
 <property name="BASEADDRESS_USER32" value="0x77e60000" />\r
 <property name="BASEADDRESS_GDI32" value="0x77ed0000" />\r
 <property name="BASEADDRESS_DNSAPI" value="0x77f00000" />\r
+<property name="BASEADDRESS_KERNEL32" value="0x77800000" />\r
 <property name="BASEADDRESS_MSVCRT" value="0x78000000" />\r
 <property name="BASEADDRESS_MSVCRT20" value="0x78500000" />\r
-<property name="BASEADDRESS_EXPAT" value="0x79000000" />\r
-<property name="BASEADDRESS_KERNEL32" value="0x7C800000" />\r
 <property name="BASEADDRESS_NTDLL" value="0x7C900000" />\r
+<property name="BASEADDRESS_FREETYPE" value="0x7F000000" />\r
+\r
+<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" />\r
+<property name="BASEADDRESS_NCPL" value="0x64EA0000" />\r
+<property name="BASEADDRESS_HID" value="0x688F0000" />\r
+<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" />\r
+<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" />\r
+<property name="BASEADDRESS_DISPLAY" value="DISPLAY" />\r
+<property name="BASEADDRESS_ACLUI" value="0x71550000" />\r
+<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" />\r
+<property name="BASEADDRESS_WINFAX" value="0x722C0000" />\r
+<property name="BASEADDRESS_DEVMGR" value="0x72a90000" />\r
+<property name="BASEADDRESS_WINSCARD" value="0x723D0000" />\r
+<property name="BASEADDRESS_COREDLL" value="0x73d80000" />\r
+<property name="BASEADDRESS_OLEDLG" value="0x74d00000" />\r
+<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" />\r
+<property name="BASEADDRESS_D3D8THK" value="0x76340000" />\r
+<property name="BASEADDRESS_LSASRV" value="0x76540000" />\r
+<property name="BASEADDRESS_ODBC32" value="0x76660000" />\r
+<property name="BASEADDRESS_MSACM" value="0x77400000" />\r
+<property name="BASEADDRESS_PACKET" value="0x77780000" />\r
+<property name="BASEADDRESS_W2_32" value="0x77780000" />\r
+<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" />\r
+<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" />\r
+<property name="BASEADDRESS_EXPAT" value="0x79000000" />\r

diff --git a/reactos/lib/acledit/acledit.xml b/reactos/lib/acledit/acledit.xml
index c897cf6..6403c93 100644 (file)
--- a/reactos/lib/acledit/acledit.xml
+++ b/reactos/lib/acledit/acledit.xml
@@ -1,4 +1,4 @@
-<module name="acledit" type="win32dll">\r
+<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}">\r
        <importlibrary definition="acledit.def" />\r
        <include base="acledit">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/aclui/aclui.xml b/reactos/lib/aclui/aclui.xml
index ab7a25b..0bc4e85 100644 (file)
--- a/reactos/lib/aclui/aclui.xml
+++ b/reactos/lib/aclui/aclui.xml
@@ -1,4 +1,4 @@
-<module name="aclui" type="win32dll">\r
+<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}">\r
        <importlibrary definition="aclui.def" />\r
        <include base="aclui">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/advapi32/advapi32.xml b/reactos/lib/advapi32/advapi32.xml
index 16b58fb..b6ca570 100644 (file)
--- a/reactos/lib/advapi32/advapi32.xml
+++ b/reactos/lib/advapi32/advapi32.xml
@@ -1,4 +1,4 @@
-<module name="advapi32" type="win32dll">\r
+<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}">\r
        <importlibrary definition="advapi32.def" />\r
        <include base="advapi32">.</include>\r
        <define name="__USE_W32API" />\r

diff --git a/reactos/lib/advpack/advpack.xml b/reactos/lib/advpack/advpack.xml
index eb16f12..351839b 100644 (file)
--- a/reactos/lib/advpack/advpack.xml
+++ b/reactos/lib/advpack/advpack.xml
@@ -1,4 +1,4 @@
-<module name="advpack" type="win32dll">\r
+<module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}">\r
        <importlibrary definition="advpack.def" />\r
        <include base="advpack">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/cabinet/cabinet.xml b/reactos/lib/cabinet/cabinet.xml
index a4c6178..cd7e758 100644 (file)
--- a/reactos/lib/cabinet/cabinet.xml
+++ b/reactos/lib/cabinet/cabinet.xml
@@ -1,4 +1,4 @@
-<module name="cabinet" type="win32dll">\r
+<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="cabinet.spec.def" />\r
        <include base="cabinet">.</include>\r

diff --git a/reactos/lib/cards/cards.xml b/reactos/lib/cards/cards.xml
index 9df8feb..cc014ed 100644 (file)
--- a/reactos/lib/cards/cards.xml
+++ b/reactos/lib/cards/cards.xml
@@ -1,4 +1,4 @@
-<module name="cards" type="win32dll">\r
+<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}">\r
        <importlibrary definition="cards.def" />\r
        <include base="cards">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/comctl32/comctl32.xml b/reactos/lib/comctl32/comctl32.xml
index e41873f..b331aaa 100644 (file)
--- a/reactos/lib/comctl32/comctl32.xml
+++ b/reactos/lib/comctl32/comctl32.xml
@@ -1,4 +1,4 @@
-<module name="comctl32" type="win32dll">\r
+<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="comctl32.spec.def" />\r
        <include base="comctl32">.</include>\r

diff --git a/reactos/lib/comdlg32/comdlg32.xml b/reactos/lib/comdlg32/comdlg32.xml
index 9377b70..096c4e7 100644 (file)
--- a/reactos/lib/comdlg32/comdlg32.xml
+++ b/reactos/lib/comdlg32/comdlg32.xml
@@ -1,4 +1,4 @@
-<module name="comdlg32" type="win32dll">\r
+<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="comdlg32.spec.def" />\r
        <include base="comdlg32">.</include>\r

diff --git a/reactos/lib/cpl/access/access.xml b/reactos/lib/cpl/access/access.xml
index fcefc57..e41547b 100644 (file)
--- a/reactos/lib/cpl/access/access.xml
+++ b/reactos/lib/cpl/access/access.xml
@@ -1,4 +1,4 @@
-<module name="access" type="win32dll" extension=".cpl">\r
+<module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}">\r
        <importlibrary definition="access.def" />\r
        <include base="access">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/cpl/appwiz/appwiz.xml b/reactos/lib/cpl/appwiz/appwiz.xml
index 3e2f9da..c304894 100644 (file)
--- a/reactos/lib/cpl/appwiz/appwiz.xml
+++ b/reactos/lib/cpl/appwiz/appwiz.xml
@@ -1,4 +1,4 @@
-<module name="appwiz" type="win32dll" extension=".cpl">\r
+<module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}">\r
        <importlibrary definition="appwiz.def" />\r
        <include base="appwiz">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/cpl/control/control.xml b/reactos/lib/cpl/control/control.xml
index 52a83a5..df48c38 100644 (file)
--- a/reactos/lib/cpl/control/control.xml
+++ b/reactos/lib/cpl/control/control.xml
@@ -1,4 +1,4 @@
-<module name="control" type="win32gui">\r
+<module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}">\r
        <include base="control">.</include>\r
        <define name="UNICODE" />\r
        <define name="_UNICODE" />\r

diff --git a/reactos/lib/cpl/desk/desk.xml b/reactos/lib/cpl/desk/desk.xml
index bf3faf4..b244054 100644 (file)
--- a/reactos/lib/cpl/desk/desk.xml
+++ b/reactos/lib/cpl/desk/desk.xml
@@ -1,4 +1,4 @@
-<module name="desk" type="win32dll" extension=".cpl">\r
+<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}">\r
        <importlibrary definition="desk.def" />\r
        <include base="desk">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/cpl/intl/intl.xml b/reactos/lib/cpl/intl/intl.xml
index 1beb751..23db082 100644 (file)
--- a/reactos/lib/cpl/intl/intl.xml
+++ b/reactos/lib/cpl/intl/intl.xml
@@ -1,4 +1,4 @@
-<module name="intl" type="win32dll" extension=".cpl">\r
+<module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}">\r
        <importlibrary definition="intl.def" />\r
        <include base="intl">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/cpl/main/main.xml b/reactos/lib/cpl/main/main.xml
index 837ebe7..bb86c92 100644 (file)
--- a/reactos/lib/cpl/main/main.xml
+++ b/reactos/lib/cpl/main/main.xml
@@ -1,4 +1,4 @@
-<module name="main" type="win32dll" extension=".cpl">\r
+<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}">\r
        <importlibrary definition="main.def" />\r
        <include base="main">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/cpl/ncpa/ncpa.xml b/reactos/lib/cpl/ncpa/ncpa.xml
index 7b0a3bb..3284003 100644 (file)
--- a/reactos/lib/cpl/ncpa/ncpa.xml
+++ b/reactos/lib/cpl/ncpa/ncpa.xml
@@ -1,4 +1,4 @@
-<module name="ncpa" type="win32dll" extension=".cpl">\r
+<module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}">\r
        <importlibrary definition="ncpa.def" />\r
        <include base="ncpa">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/cpl/sysdm/sysdm.xml b/reactos/lib/cpl/sysdm/sysdm.xml
index e81bc41..4b676e4 100644 (file)
--- a/reactos/lib/cpl/sysdm/sysdm.xml
+++ b/reactos/lib/cpl/sysdm/sysdm.xml
@@ -1,4 +1,4 @@
-<module name="sysdm" type="win32dll" extension=".cpl">\r
+<module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}">\r
        <importlibrary definition="sysdm.def" />\r
        <include base="sysdm">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/cpl/timedate/timedate.xml b/reactos/lib/cpl/timedate/timedate.xml
index ae8623c..2934305 100644 (file)
--- a/reactos/lib/cpl/timedate/timedate.xml
+++ b/reactos/lib/cpl/timedate/timedate.xml
@@ -1,4 +1,4 @@
-<module name="timedate" type="win32dll" extension=".cpl">\r
+<module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}">\r
        <importlibrary definition="timedate.def" />\r
        <include base="timedate">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/crtdll/crtdll.xml b/reactos/lib/crtdll/crtdll.xml
index 31accdf..a3609d1 100644 (file)
--- a/reactos/lib/crtdll/crtdll.xml
+++ b/reactos/lib/crtdll/crtdll.xml
@@ -1,4 +1,4 @@
-<module name="crtdll" type="win32dll" mangledsymbols="true">\r
+<module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true">\r
        <linkerflag>-nostartfiles</linkerflag>\r
        <linkerflag>-lgcc</linkerflag>\r
        <importlibrary definition="crtdll.def" />\r

diff --git a/reactos/lib/dbghelp/dbghelp.xml b/reactos/lib/dbghelp/dbghelp.xml
index 992669b..7e9ee7e 100644 (file)
--- a/reactos/lib/dbghelp/dbghelp.xml
+++ b/reactos/lib/dbghelp/dbghelp.xml
@@ -1,4 +1,4 @@
-<module name="dbghelp" type="win32dll">\r
+<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="dbghelp.spec.def" />\r
        <include base="dbghelp">.</include>\r

diff --git a/reactos/lib/devenum/devenum.xml b/reactos/lib/devenum/devenum.xml
index 68b5eed..20bb50d 100644 (file)
--- a/reactos/lib/devenum/devenum.xml
+++ b/reactos/lib/devenum/devenum.xml
@@ -1,4 +1,4 @@
-<module name="devenum" type="win32dll">\r
+<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="devenum.spec.def" />\r
        <include base="devenum">.</include>\r

diff --git a/reactos/lib/dinput/dinput.xml b/reactos/lib/dinput/dinput.xml
index e18d940..ddc3cf3 100644 (file)
--- a/reactos/lib/dinput/dinput.xml
+++ b/reactos/lib/dinput/dinput.xml
@@ -1,4 +1,4 @@
-<module name="dinput" type="win32dll">\r
+<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="dinput.spec.def" />\r
        <include base="dinput">.</include>\r

diff --git a/reactos/lib/dinput8/dinput8.xml b/reactos/lib/dinput8/dinput8.xml
index bb1fd88..afa2428 100644 (file)
--- a/reactos/lib/dinput8/dinput8.xml
+++ b/reactos/lib/dinput8/dinput8.xml
@@ -1,4 +1,4 @@
-<module name="dinput8" type="win32dll">\r
+<module name="dinput8" type="win32dll" baseaddress="${BASEADDRESS_DINPUT8}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="dinput8.spec.def" />\r
        <include base="dinput8">.</include>\r

diff --git a/reactos/lib/dnsapi/dnsapi.xml b/reactos/lib/dnsapi/dnsapi.xml
index 0818f02..84564b6 100644 (file)
--- a/reactos/lib/dnsapi/dnsapi.xml
+++ b/reactos/lib/dnsapi/dnsapi.xml
@@ -1,4 +1,4 @@
-<module name="dnsapi" type="win32dll">\r
+<module name="dnsapi" type="win32dll" baseaddress="${BASEADDRESS_DNSAPI}">\r
        <importlibrary definition="dnsapi.def" />\r
        <include base="dnsapi">include</include>\r
        <include base="adns">src</include>\r

diff --git a/reactos/lib/dsound/dsound.xml b/reactos/lib/dsound/dsound.xml
index e31a0c0..a25adaa 100644 (file)
--- a/reactos/lib/dsound/dsound.xml
+++ b/reactos/lib/dsound/dsound.xml
@@ -1,4 +1,4 @@
-<module name="dsound" type="win32dll">\r
+<module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}">\r
        <importlibrary definition="dsound.def" />\r
        <include base="dsound">.</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/dxdiagn/dxdiagn.xml b/reactos/lib/dxdiagn/dxdiagn.xml
index 159ee7e..a68b758 100644 (file)
--- a/reactos/lib/dxdiagn/dxdiagn.xml
+++ b/reactos/lib/dxdiagn/dxdiagn.xml
@@ -1,4 +1,4 @@
-<module name="dxdiagn" type="win32dll">\r
+<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="dxdiagn.spec.def" />\r
        <include base="dxdiagn">.</include>\r

diff --git a/reactos/lib/fmifs/fmifs.xml b/reactos/lib/fmifs/fmifs.xml
index 67fb734..36b6bc4 100644 (file)
--- a/reactos/lib/fmifs/fmifs.xml
+++ b/reactos/lib/fmifs/fmifs.xml
@@ -1,4 +1,4 @@
-<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12">\r
+<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}">\r
        <importlibrary definition="fmifs.def" />\r
        <include base="fmifs">.</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/freetype/freetype.xml b/reactos/lib/freetype/freetype.xml
index f80a4cd..130cdeb 100644 (file)
--- a/reactos/lib/freetype/freetype.xml
+++ b/reactos/lib/freetype/freetype.xml
@@ -1,4 +1,4 @@
-<module name="freetype" type="kernelmodedll">\r
+<module name="freetype" type="kernelmodedll" baseaddress="${BASEADDRESS_FREETYPE}">\r
        <importlibrary definition="freetype.def" />\r
        <include base="freetype">include</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/gdi32/gdi32.xml b/reactos/lib/gdi32/gdi32.xml
index fd058e7..2b67cc7 100644 (file)
--- a/reactos/lib/gdi32/gdi32.xml
+++ b/reactos/lib/gdi32/gdi32.xml
@@ -1,4 +1,4 @@
-<module name="gdi32" type="win32dll">\r
+<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}">\r
        <importlibrary definition="gdi32.def" />\r
        <include base="gdi32">include</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/gdiplus/gdiplus.xml b/reactos/lib/gdiplus/gdiplus.xml
index 5a61d1f..a41f8b1 100644 (file)
--- a/reactos/lib/gdiplus/gdiplus.xml
+++ b/reactos/lib/gdiplus/gdiplus.xml
@@ -1,4 +1,4 @@
-<module name="gdiplus" type="win32dll">\r
+<module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}">\r
        <importlibrary definition="gdiplus.def" />\r
        <include base="gdiplus">include</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/glu32/glu32.xml b/reactos/lib/glu32/glu32.xml
index b8cff2b..0b7fc0d 100644 (file)
--- a/reactos/lib/glu32/glu32.xml
+++ b/reactos/lib/glu32/glu32.xml
@@ -1,4 +1,4 @@
-<module name="glu32" type="win32dll">\r
+<module name="glu32" type="win32dll" baseaddress="${BASEADDRESS_GLU32}">\r
        <importlibrary definition="glu32.def" />\r
        <include base="glu32">include</include>\r
        <include base="glu32">libnurbs/internals</include>\r

diff --git a/reactos/lib/imagehlp/imagehlp.xml b/reactos/lib/imagehlp/imagehlp.xml
index c5742d5..8a046a8 100644 (file)
--- a/reactos/lib/imagehlp/imagehlp.xml
+++ b/reactos/lib/imagehlp/imagehlp.xml
@@ -1,4 +1,4 @@
-<module name="imagehlp" type="win32dll">\r
+<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="imagehlp.def" />\r
        <include base="imagehlp">.</include>\r

diff --git a/reactos/lib/imm32/imm32.xml b/reactos/lib/imm32/imm32.xml
index 067d9e3..428cf24 100644 (file)
--- a/reactos/lib/imm32/imm32.xml
+++ b/reactos/lib/imm32/imm32.xml
@@ -1,4 +1,4 @@
-<module name="imm32" type="win32dll">\r
+<module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}">\r
        <importlibrary definition="imm32.def" />\r
        <include base="imm32">.</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/iphlpapi/iphlpapi.xml b/reactos/lib/iphlpapi/iphlpapi.xml
index d0b706b..9ed229e 100644 (file)
--- a/reactos/lib/iphlpapi/iphlpapi.xml
+++ b/reactos/lib/iphlpapi/iphlpapi.xml
@@ -1,4 +1,4 @@
-<module name="iphlpapi" type="win32dll">\r
+<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="iphlpapi.spec.def" />\r
        <include base="iphlpapi">include</include>\r

diff --git a/reactos/lib/kernel32/kernel32.xml b/reactos/lib/kernel32/kernel32.xml
index 66db2c0..4f3b9cb 100644 (file)
--- a/reactos/lib/kernel32/kernel32.xml
+++ b/reactos/lib/kernel32/kernel32.xml
@@ -1,4 +1,4 @@
-<module name="kernel32" type="win32dll">\r
+<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}">\r
        <importlibrary definition="kernel32.def" />\r
        <include base="kernel32">.</include>\r
        <include base="kernel32">include</include>\r

diff --git a/reactos/lib/lzexpand/lz32.xml b/reactos/lib/lzexpand/lz32.xml
index 616c46e..f51faa0 100644 (file)
--- a/reactos/lib/lzexpand/lz32.xml
+++ b/reactos/lib/lzexpand/lz32.xml
@@ -1,4 +1,4 @@
-<module name="lz32" type="win32dll">\r
+<module name="lz32" type="win32dll" baseaddress="${BASEADDRESS_LZ32}">\r
        <importlibrary definition="lz32.def" />\r
        <include base="lz32">.</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/mesa32/mesa32.xml b/reactos/lib/mesa32/mesa32.xml
index 5234e16..182ae89 100644 (file)
--- a/reactos/lib/mesa32/mesa32.xml
+++ b/reactos/lib/mesa32/mesa32.xml
@@ -1,4 +1,4 @@
-<module name="mesa32" type="win32dll">\r
+<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}">\r
        <importlibrary definition="mesa32.def" />\r
        <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag>\r
        <include base="mesa32">include</include>\r

diff --git a/reactos/lib/midimap/midimap.xml b/reactos/lib/midimap/midimap.xml
index 99f1fdd..dc451f5 100644 (file)
--- a/reactos/lib/midimap/midimap.xml
+++ b/reactos/lib/midimap/midimap.xml
@@ -1,4 +1,4 @@
-<module name="midimap" type="win32dll">\r
+<module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="midimap.spec.def" />\r
        <include base="midimap">.</include>\r

diff --git a/reactos/lib/mmdrv/mmdrv.xml b/reactos/lib/mmdrv/mmdrv.xml
index ea32609..c923b70 100644 (file)
--- a/reactos/lib/mmdrv/mmdrv.xml
+++ b/reactos/lib/mmdrv/mmdrv.xml
@@ -1,4 +1,4 @@
-<module name="mmdrv" type="win32dll">\r
+<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}">\r
        <importlibrary definition="mmdrv.def" />\r
        <include base="mmdrv">.</include>\r
        <define name="__USE_W32API" />\r

diff --git a/reactos/lib/mpr/mpr.xml b/reactos/lib/mpr/mpr.xml
index 33f7a74..04a5f27 100644 (file)
--- a/reactos/lib/mpr/mpr.xml
+++ b/reactos/lib/mpr/mpr.xml
@@ -1,4 +1,4 @@
-<module name="mpr" type="win32dll">\r
+<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="mpr.spec.def" />\r
        <include base="mpr">.</include>\r

diff --git a/reactos/lib/msafd/msafd.xml b/reactos/lib/msafd/msafd.xml
index d615bdc..eca6176 100644 (file)
--- a/reactos/lib/msafd/msafd.xml
+++ b/reactos/lib/msafd/msafd.xml
@@ -1,4 +1,4 @@
-<module name="msafd" type="win32dll">\r
+<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}">\r
        <importlibrary definition="msafd.def" />\r
        <include base="msafd">include</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/msgina/msgina.xml b/reactos/lib/msgina/msgina.xml
index e5e383a..1ec9481 100644 (file)
--- a/reactos/lib/msgina/msgina.xml
+++ b/reactos/lib/msgina/msgina.xml
@@ -1,4 +1,4 @@
-<module name="msgina" type="win32dll">\r
+<module name="msgina" type="win32dll" baseaddress="${BASEADDRESS_MSGINA}">\r
        <importlibrary definition="msgina.def" />\r
        <include base="msgina">.</include>\r
        <include base="msgina">include</include>\r

diff --git a/reactos/lib/msimg32/msimg32.xml b/reactos/lib/msimg32/msimg32.xml
index 0e22827..9851fb7 100644 (file)
--- a/reactos/lib/msimg32/msimg32.xml
+++ b/reactos/lib/msimg32/msimg32.xml
@@ -1,4 +1,4 @@
-<module name="msimg32" type="win32dll">\r
+<module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}">\r
        <importlibrary definition="msimg32.spec.def" />\r
        <include base="msimg32">.</include>\r
        <include base="msimg32">include</include>\r

diff --git a/reactos/lib/msvcrt/msvcrt.xml b/reactos/lib/msvcrt/msvcrt.xml
index a9bfbdc..4e23941 100644 (file)
--- a/reactos/lib/msvcrt/msvcrt.xml
+++ b/reactos/lib/msvcrt/msvcrt.xml
@@ -1,4 +1,4 @@
-<module name="msvcrt" type="win32dll" mangledsymbols="true">\r
+<module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true">\r
        <linkerflag>-nostartfiles</linkerflag>\r
        <linkerflag>--enable-stdcall-fixup</linkerflag>\r
        <linkerflag>-lgcc</linkerflag>\r

diff --git a/reactos/lib/msvcrt20/msvcrt20.xml b/reactos/lib/msvcrt20/msvcrt20.xml
index 6978145..a10da15 100644 (file)
--- a/reactos/lib/msvcrt20/msvcrt20.xml
+++ b/reactos/lib/msvcrt20/msvcrt20.xml
@@ -1,4 +1,4 @@
-<module name="msvcrt20" type="win32dll" mangledsymbols="yes">\r
+<module name="msvcrt20" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT20}" mangledsymbols="yes">\r
        <importlibrary definition="msvcrt20.def" />\r
        <include base="msvcrt20">.</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/netapi32/netapi32.xml b/reactos/lib/netapi32/netapi32.xml
index 8ce2e1d..cec7180 100644 (file)
--- a/reactos/lib/netapi32/netapi32.xml
+++ b/reactos/lib/netapi32/netapi32.xml
@@ -1,4 +1,4 @@
-<module name="netapi32" type="win32dll">\r
+<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="netapi32.spec.def" />\r
        <include base="netapi32">.</include>\r

diff --git a/reactos/lib/ntdll/ntdll.xml b/reactos/lib/ntdll/ntdll.xml
index d6b6727..97ddb89 100644 (file)
--- a/reactos/lib/ntdll/ntdll.xml
+++ b/reactos/lib/ntdll/ntdll.xml
@@ -1,4 +1,4 @@
-<module name="ntdll" type="nativedll">\r
+<module name="ntdll" type="nativedll" baseaddress="${BASEADDRESS_NTDLL}">\r
        <importlibrary definition="def/ntdll.def" />\r
        <define name="__NTDLL__" />\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/ole32/ole32.xml b/reactos/lib/ole32/ole32.xml
index b534d0d..e4c0e08 100644 (file)
--- a/reactos/lib/ole32/ole32.xml
+++ b/reactos/lib/ole32/ole32.xml
@@ -1,4 +1,4 @@
-<module name="ole32" type="win32dll">\r
+<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="ole32.spec.def" />\r
        <include base="ole32">.</include>\r

diff --git a/reactos/lib/oleaut32/oleaut32.xml b/reactos/lib/oleaut32/oleaut32.xml
index 66d790a..32720af 100644 (file)
--- a/reactos/lib/oleaut32/oleaut32.xml
+++ b/reactos/lib/oleaut32/oleaut32.xml
@@ -1,4 +1,4 @@
-<module name="oleaut32" type="win32dll">\r
+<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="oleaut32.spec.def" />\r
        <include base="oleaut32">.</include>\r

diff --git a/reactos/lib/olepro32/olepro32.xml b/reactos/lib/olepro32/olepro32.xml
index 551123d..d46409e 100644 (file)
--- a/reactos/lib/olepro32/olepro32.xml
+++ b/reactos/lib/olepro32/olepro32.xml
@@ -1,4 +1,4 @@
-<module name="olepro32" type="win32dll">\r
+<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="olepro32.spec.def" />\r
        <include base="olepro32">.</include>\r

diff --git a/reactos/lib/opengl32/opengl32.xml b/reactos/lib/opengl32/opengl32.xml
index 3b96483..42e5652 100644 (file)
--- a/reactos/lib/opengl32/opengl32.xml
+++ b/reactos/lib/opengl32/opengl32.xml
@@ -1,4 +1,4 @@
-<module name="opengl32" type="win32dll">\r
+<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}">\r
        <importlibrary definition="opengl32.def" />\r
        <include base="wsock32">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/psapi/psapi.xml b/reactos/lib/psapi/psapi.xml
index 84f5630..0332854 100644 (file)
--- a/reactos/lib/psapi/psapi.xml
+++ b/reactos/lib/psapi/psapi.xml
@@ -1,4 +1,4 @@
-<module name="psapi" type="win32dll">\r
+<module name="psapi" type="win32dll" baseaddress="${BASEADDRESS_PSAPI}">\r
        <importlibrary definition="psapi.def" />\r
        <include base="psapi">.</include>\r
        <include base="psapi">include</include>\r

diff --git a/reactos/lib/richedit/riched32.xml b/reactos/lib/richedit/riched32.xml
index 5cb75ef..564958b 100644 (file)
--- a/reactos/lib/richedit/riched32.xml
+++ b/reactos/lib/richedit/riched32.xml
@@ -1,4 +1,4 @@
-<module name="riched32" type="win32dll">\r
+<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="riched32.spec.def" />\r
        <include base="riched32">.</include>\r

diff --git a/reactos/lib/rpcrt4/rpcrt4.xml b/reactos/lib/rpcrt4/rpcrt4.xml
index ffc3963..0a190c5 100644 (file)
--- a/reactos/lib/rpcrt4/rpcrt4.xml
+++ b/reactos/lib/rpcrt4/rpcrt4.xml
@@ -1,4 +1,4 @@
-<module name="rpcrt4" type="win32dll">\r
+<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="rpcrt4.spec.def" />\r
        <include base="rpcrt4">.</include>\r

diff --git a/reactos/lib/samlib/samlib.xml b/reactos/lib/samlib/samlib.xml
index f41ce58..643a073 100644 (file)
--- a/reactos/lib/samlib/samlib.xml
+++ b/reactos/lib/samlib/samlib.xml
@@ -1,4 +1,4 @@
-<module name="samlib" type="win32dll">\r
+<module name="samlib" type="win32dll" baseaddress="${BASEADDRESS_SAMLIB}">\r
        <importlibrary definition="samlib.def" />\r
        <include base="samlib">.</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/secur32/secur32.xml b/reactos/lib/secur32/secur32.xml
index 2b3b690..7d0dd2d 100644 (file)
--- a/reactos/lib/secur32/secur32.xml
+++ b/reactos/lib/secur32/secur32.xml
@@ -1,4 +1,4 @@
-<module name="secur32" type="win32dll">\r
+<module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}">\r
        <importlibrary definition="secur32.def" />\r
        <include base="secur32">.</include>\r
        <define name="__SECUR32__" />\r

diff --git a/reactos/lib/setupapi/setupapi.xml b/reactos/lib/setupapi/setupapi.xml
index 7e0c2aa..697ccb3 100644 (file)
--- a/reactos/lib/setupapi/setupapi.xml
+++ b/reactos/lib/setupapi/setupapi.xml
@@ -1,4 +1,4 @@
-<module name="setupapi" type="win32dll">\r
+<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="setupapi.spec.def" />\r
        <include base="setupapi">.</include>\r

diff --git a/reactos/lib/shdocvw/shdocvw.xml b/reactos/lib/shdocvw/shdocvw.xml
index 6a49e60..31c21d2 100644 (file)
--- a/reactos/lib/shdocvw/shdocvw.xml
+++ b/reactos/lib/shdocvw/shdocvw.xml
@@ -1,4 +1,4 @@
-<module name="shdocvw" type="win32dll">\r
+<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="shdocvw.spec.def" />\r
        <include base="shdocvw">.</include>\r

diff --git a/reactos/lib/shell32/shell32.xml b/reactos/lib/shell32/shell32.xml
index 0ae38e8..4e8848a 100644 (file)
--- a/reactos/lib/shell32/shell32.xml
+++ b/reactos/lib/shell32/shell32.xml
@@ -1,4 +1,4 @@
-<module name="shell32" type="win32dll">\r
+<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="shell32.spec.def" />\r
        <include base="shell32">.</include>\r

diff --git a/reactos/lib/shlwapi/shlwapi.xml b/reactos/lib/shlwapi/shlwapi.xml
index 5a86ddb..357e683 100644 (file)
--- a/reactos/lib/shlwapi/shlwapi.xml
+++ b/reactos/lib/shlwapi/shlwapi.xml
@@ -1,4 +1,4 @@
-<module name="shlwapi" type="win32dll">\r
+<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="shlwapi.spec.def" />\r
        <include base="shlwapi">.</include>\r

diff --git a/reactos/lib/smdll/smdll.xml b/reactos/lib/smdll/smdll.xml
index 9351233..4288a36 100644 (file)
--- a/reactos/lib/smdll/smdll.xml
+++ b/reactos/lib/smdll/smdll.xml
@@ -1,4 +1,4 @@
-<module name="smdll" type="win32dll">\r
+<module name="smdll" type="win32dll" baseaddress="${BASEADDRESS_SMDLL}">\r
        <importlibrary definition="smdll.def" />\r
        <include base="smdll">.</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/snmpapi/snmpapi.xml b/reactos/lib/snmpapi/snmpapi.xml
index f1193e6..9d7b63e 100644 (file)
--- a/reactos/lib/snmpapi/snmpapi.xml
+++ b/reactos/lib/snmpapi/snmpapi.xml
@@ -1,4 +1,4 @@
-<module name="snmpapi" type="win32dll">\r
+<module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}">\r
        <importlibrary definition="snmpapi.def" />\r
        <include base="snmpapi">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/syssetup/syssetup.xml b/reactos/lib/syssetup/syssetup.xml
index b8e0c18..f1d5de5 100644 (file)
--- a/reactos/lib/syssetup/syssetup.xml
+++ b/reactos/lib/syssetup/syssetup.xml
@@ -1,4 +1,4 @@
-<module name="syssetup" type="win32dll">\r
+<module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}">\r
        <importlibrary definition="syssetup.def" />\r
        <include base="syssetup">.</include>\r
        <define name="__USE_W32API" />\r

diff --git a/reactos/lib/twain/twain_32.xml b/reactos/lib/twain/twain_32.xml
index 8e32e1e..d9497d8 100644 (file)
--- a/reactos/lib/twain/twain_32.xml
+++ b/reactos/lib/twain/twain_32.xml
@@ -1,4 +1,4 @@
-<module name="twain_32" type="win32dll">\r
+<module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}">\r
        <importlibrary definition="twain_32.def" />\r
        <include base="twain_32">.</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/unicode/unicode.xml b/reactos/lib/unicode/unicode.xml
index 37459e5..b9e78be 100644 (file)
--- a/reactos/lib/unicode/unicode.xml
+++ b/reactos/lib/unicode/unicode.xml
@@ -1,4 +1,4 @@
-<module name="wine_unicode" type="win32dll">\r
+<module name="wine_unicode" type="win32dll" baseaddress="${BASEADDRESS_UNICODE}">\r
        <importlibrary definition="wine_unicode.def" />\r
        <include base="wine_unicode">.</include>\r
        <include base="ReactOS">include/wine</include>\r

diff --git a/reactos/lib/urlmon/urlmon.xml b/reactos/lib/urlmon/urlmon.xml
index 85cba9f..f049e64 100644 (file)
--- a/reactos/lib/urlmon/urlmon.xml
+++ b/reactos/lib/urlmon/urlmon.xml
@@ -1,4 +1,4 @@
-<module name="urlmon" type="win32dll">\r
+<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="urlmon.spec.def" />\r
        <include base="urlmon">.</include>\r

diff --git a/reactos/lib/user32/user32.xml b/reactos/lib/user32/user32.xml
index 50fe1c1..bc0d753 100644 (file)
--- a/reactos/lib/user32/user32.xml
+++ b/reactos/lib/user32/user32.xml
@@ -1,4 +1,4 @@
-<module name="user32" type="win32dll">\r
+<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}">\r
        <importlibrary definition="user32.def" />\r
        <include base="user32">.</include>\r
        <include base="user32">include</include>\r

diff --git a/reactos/lib/userenv/userenv.xml b/reactos/lib/userenv/userenv.xml
index 38db6da..77e4b36 100644 (file)
--- a/reactos/lib/userenv/userenv.xml
+++ b/reactos/lib/userenv/userenv.xml
@@ -1,4 +1,4 @@
-<module name="userenv" type="win32dll">\r
+<module name="userenv" type="win32dll" baseaddress="${BASEADDRESS_USERENV}">\r
        <importlibrary definition="userenv.def" />\r
        <include base="userenv">.</include>\r
        <define name="__USE_W32API" />\r

diff --git a/reactos/lib/version/version.xml b/reactos/lib/version/version.xml
index 1adfb2d..8481de4 100644 (file)
--- a/reactos/lib/version/version.xml
+++ b/reactos/lib/version/version.xml
@@ -1,4 +1,4 @@
-<module name="version" type="win32dll">\r
+<module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="version.def" />\r
        <include base="ReactOS">include/wine</include>\r

diff --git a/reactos/lib/wininet/wininet.xml b/reactos/lib/wininet/wininet.xml
index 4232ab6..bc83eff 100644 (file)
--- a/reactos/lib/wininet/wininet.xml
+++ b/reactos/lib/wininet/wininet.xml
@@ -1,4 +1,4 @@
-<module name="wininet" type="win32dll">\r
+<module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}">\r
        <importlibrary definition="wininet.def" />\r
        <include base="wininet">.</include>\r
        <library>ntdll</library>\r

diff --git a/reactos/lib/winmm/winmm.xml b/reactos/lib/winmm/winmm.xml
index 24fc786..b8c1ce2 100644 (file)
--- a/reactos/lib/winmm/winmm.xml
+++ b/reactos/lib/winmm/winmm.xml
@@ -1,4 +1,4 @@
-<module name="winmm" type="win32dll">\r
+<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}">\r
        <dependency>winebuild</dependency>\r
        <importlibrary definition="winmm.spec.def" />\r
        <include base="winmm">.</include>\r

diff --git a/reactos/lib/winspool/winspool.xml b/reactos/lib/winspool/winspool.xml
index 510ef81..9cb6d15 100644 (file)
--- a/reactos/lib/winspool/winspool.xml
+++ b/reactos/lib/winspool/winspool.xml
@@ -1,4 +1,4 @@
-<module name="winspool" type="win32dll" extension=".drv">\r
+<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}">\r
        <importlibrary definition="winspool.def" />\r
        <include base="winspool">.</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/ws2_32/ws2_32.xml b/reactos/lib/ws2_32/ws2_32.xml
index 09e54a9..446fee5 100644 (file)
--- a/reactos/lib/ws2_32/ws2_32.xml
+++ b/reactos/lib/ws2_32/ws2_32.xml
@@ -1,4 +1,4 @@
-<module name="ws2_32" type="win32dll">\r
+<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}">\r
        <importlibrary definition="ws2_32.def" />\r
        <include base="ws2_32">include</include>\r
        <define name="_DISABLE_TIDENTS" />\r

diff --git a/reactos/lib/ws2help/ws2help.xml b/reactos/lib/ws2help/ws2help.xml
index 96f3bfb..0b664c7 100644 (file)
--- a/reactos/lib/ws2help/ws2help.xml
+++ b/reactos/lib/ws2help/ws2help.xml
@@ -1,4 +1,4 @@
-<module name="ws2help" type="win32dll">\r
+<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}">\r
        <importlibrary definition="ws2help.def" />\r
        <include base="ws2help">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/wshirda/wshirda.xml b/reactos/lib/wshirda/wshirda.xml
index 6ea732b..e8f74ad 100644 (file)
--- a/reactos/lib/wshirda/wshirda.xml
+++ b/reactos/lib/wshirda/wshirda.xml
@@ -1,4 +1,4 @@
-<module name="wshirda" type="win32dll">\r
+<module name="wshirda" type="win32dll" baseaddress="${BASEADDRESS_WSHIRDA}">\r
        <importlibrary definition="wshirda.def" />\r
        <include base="wshirda">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/lib/wsock32/wsock32.xml b/reactos/lib/wsock32/wsock32.xml
index 1c09cc1..8ce4059 100644 (file)
--- a/reactos/lib/wsock32/wsock32.xml
+++ b/reactos/lib/wsock32/wsock32.xml
@@ -1,4 +1,4 @@
-<module name="wsock32" type="win32dll">\r
+<module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}">\r
        <importlibrary definition="wsock32.def" />\r
        <include base="wsock32">.</include>\r
        <define name="UNICODE" />\r

diff --git a/reactos/subsys/system/explorer/notifyhook/notifyhook.xml b/reactos/subsys/system/explorer/notifyhook/notifyhook.xml
index cbcedcf..c40ae32 100644 (file)
--- a/reactos/subsys/system/explorer/notifyhook/notifyhook.xml
+++ b/reactos/subsys/system/explorer/notifyhook/notifyhook.xml
@@ -1,4 +1,4 @@
-<module name="notifyhook" type="win32dll">\r
+<module name="notifyhook" type="win32dll" baseaddress="${BASEADDRESS_NOTIFYHOOK}">\r
        <importlibrary definition="notifyhook.def" />\r
        <include base="notifyhook">.</include>\r
        <define name="__USE_W32API" />\r