Author: mpiulachs Date: Tue Nov 6 04:43:43 2007 New Revision: 30210
URL: http://svn.reactos.org/svn/reactos?rev=30210&view=rev Log: create a new specialized property type "baseadress" and convert baseaddress.rbuild content to true metadata (see http://www.codexchange.net/rosdoc/baseaddresses.htm)
Modified: branches/rbuild/reactos/baseaddress.rbuild branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h
Modified: branches/rbuild/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/baseaddress.rbuil... ============================================================================== --- branches/rbuild/reactos/baseaddress.rbuild (original) +++ branches/rbuild/reactos/baseaddress.rbuild Tue Nov 6 04:43:43 2007 @@ -1,151 +1,151 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> - <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> - <property name="BASEADDRESS_COMCAT" value="0x20A50000" /> - <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> - <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> - <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> - <property name="BASEADDRESS_JOY" value="0x589b0000" /> - <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> - <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> - <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> - <property name="BASEADDRESS_TAPIUI" value="0x5b770000" /> - <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> - <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> - <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> - <property name="BASEADDRESS_DPLAYX" value="0x5e080000" /> - <property name="BASEADDRESS_INPUT" value ="0x5e400000" /> - <property name="BASEADDRESS_DINPUT" value="0x5f580000" /> - <property name="BASEADDRESS_NETID" value="0x5f660000" /> - <property name="BASEADDRESS_MAPI32" value="0x62250000" /> - <property name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> - <property name="BASEADDRESS_TIMEDATE" value="0x64da0000" /> - <property name="BASEADDRESS_SYSDM" value="0x64dd0000" /> - <property name="BASEADDRESS_NCPL" value="0x64ea0000" /> - <property name="BASEADDRESS_MAIN" value="0x64f40000" /> - <property name="BASEADDRESS_INTL" value="0x64fb0000" /> - <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> - <property name="BASEADDRESS_DESK" value="0x65080000" /> - <property name="BASEADDRESS_APPWIZ" value="0x65100000" /> - <property name="BASEADDRESS_MLANG" value="0x65140000" /> - <property name="BASEADDRESS_ACCESS" value="0x65180000" /> - <property name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> - <property name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> - <property name="BASEADDRESS_HID" value="0x688f0000" /> - <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> - <property name="BASEADDRESS_PSAPI" value="0x68f70000" /> - <property name="BASEADDRESS_OLEACC" value="0x69640000" /> - <property name="BASEADDRESS_WINMM" value="0x697d0000" /> - <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> - <property name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> - <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> - <property name="BASEADDRESS_SHELL32" value="0x6a360000" /> - <property name="BASEADDRESS_UNICODE" value="0x6b200000" /> - <property name="BASEADDRESS_ADVPACK" value="0x6b300000" /> - <property name="BASEADDRESS_CONTROL" value="0x6b310000" /> - <property name="BASEADDRESS_NCPA" value="0x6b320000" /> - <property name="BASEADDRESS_DBGHELP" value="0x6b330000" /> - <property name="BASEADDRESS_DINPUT8" value="0x6b340000" /> - <property name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> - <property name="BASEADDRESS_DSOUND" value="0x6b360000" /> - <property name="BASEADDRESS_GLU32" value="0x6b370000" /> - <property name="BASEADDRESS_MESA32" value="0x6b380000" /> - <property name="BASEADDRESS_OPENGL32" value="0x6b390000" /> - <property name="BASEADDRESS_SECUR32" value="0x6b3a0000" /> - <property name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> - <property name="BASEADDRESS_URLMON" value="0x6b3c0000" /> - <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> - <property name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> - <property name="BASEADDRESS_DESKMON" value="0x6d400000" /> - <property name="BASEADDRESS_DESKADP" value="0x6d410000" /> - <property name="BASEADDRESS_WLDAP32" value="0x6e130000" /> - <property name="BASEADDRESS_CLB" value="0x6f2b0000" /> - <property name="BASEADDRESS_CARDS" value="0x701a0000" /> - <property name="BASEADDRESS_WININET" value="0x70200000" /> - <property name="BASEADDRESS_ACLUI" value="0x71550000" /> - <property name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> - <property name="BASEADDRESS_SHDOCVW" value="0x71700000" /> - <property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> - <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> - <property name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> - <property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> - <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> - <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> - <property name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> - <property name="BASEADDRESS_WINFAX" value="0x722C0000" /> - <property name="BASEADDRESS_WINSCARD" value="0x723d0000" /> - <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> - <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> - <property name="BASEADDRESS_LZ32" value="0x73d80000" /> - <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> - <property name="BASEADDRESS_ICMP" value="0x741f0000" /> - <property name="BASEADDRESS_UFAT" value="0x741f0000" /> - <property name="BASEADDRESS_USERENV" value="0x74850000" /> - <property name="BASEADDRESS_WS2_32" value="0x74aa0000" /> - <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> - <property name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> - <property name="BASEADDRESS_MMDRV" value="0x74c30000" /> - <property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> - <property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> - <property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> - <property name="BASEADDRESS_CABINET" value="0x75120000" /> - <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> - <property name="BASEADDRESS_MSGINA" value="0x75970000" /> - <property name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> - <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> - <property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> - <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> - <property name="BASEADDRESS_COMDLG32" value="0x76210000" /> - <property name="BASEADDRESS_OLEAUT32" value="0x76290000" /> - <property name="BASEADDRESS_RICHED32" value="0x76340000" /> - <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> - <property name="BASEADDRESS_RICHED20" value="0x76360000" /> - <property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> - <property name="BASEADDRESS_IMM32" value="0x76390000" /> - <property name="BASEADDRESS_LSASRV" value="0x76540000" /> - <property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> - <property name="BASEADDRESS_ODBC32" value="0x76660000" /> - <property name="BASEADDRESS_ODBCCP32" value="0x76380000" /> - <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> - <property name="BASEADDRESS_MPR" value="0x76620000" /> - <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> - <property name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> - <property name="BASEADDRESS_SHFOLDER" value="0x76780000" /> - <property name="BASEADDRESS_NTMARTA" value="0x768A0000" /> - <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> - <property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> - <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> - <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> - <property name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> - <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> - <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> - <property name="BASEADDRESS_MSVFW32" value="0x77400000" /> - <property name="BASEADDRESS_MSACM32" value="0x77400000" /> - <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> - <property name="BASEADDRESS_AUTHZ" value="0x77690000" /> - <property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> - <property name="BASEADDRESS_SENSAPI" value="0x77700000" /> - <property name="BASEADDRESS_PACKET" value="0x77780000" /> - <property name="BASEADDRESS_MSAFD" value="0x77780000" /> - <property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> - <property name="BASEADDRESS_MSI" value="0x77790000" /> - <property name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> - <property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> - <property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> - <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> - <property name="BASEADDRESS_VERSION" value="0x77a40000" /> - <property name="BASEADDRESS_OLE32" value="0x77a50000" /> - <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> - <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> - <property name="BASEADDRESS_USER32" value="0x77e30000" /> - <property name="BASEADDRESS_GDI32" value="0x77f70000" /> - <property name="BASEADDRESS_DNSAPI" value="0x77fb0000" /> - <property name="BASEADDRESS_MSVCRT" value="0x78000000" /> - <property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> - <property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> - <property name="BASEADDRESS_NTDLL" value="0x7c900000" /> - <property name="BASEADDRESS_HHCTRL" value="0x7e410000" /> - <property name="BASEADDRESS_FREETYPE" value="0x7f000000" /> + <baseadress name="BASEADDRESS_REGTESTS" value="0x07000000" /> + <baseadress name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> + <baseadress name="BASEADDRESS_COMCAT" value="0x20A50000" /> + <baseadress name="BASEADDRESS_DEVENUM" value="0x35680000" /> + <baseadress name="BASEADDRESS_PWRCFG" value="0x587e0000" /> + <baseadress name="BASEADDRESS_MMSYS" value="0x588a0000" /> + <baseadress name="BASEADDRESS_JOY" value="0x589b0000" /> + <baseadress name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> + <baseadress name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> + <baseadress name="BASEADDRESS_OBJSEL" value="0x5b400000" /> + <baseadress name="BASEADDRESS_TAPIUI" value="0x5b770000" /> + <baseadress name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> + <baseadress name="BASEADDRESS_USRMGR" value="0x5c900000" /> + <baseadress name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> + <baseadress name="BASEADDRESS_DPLAYX" value="0x5e080000" /> + <baseadress name="BASEADDRESS_INPUT" value ="0x5e400000" /> + <baseadress name="BASEADDRESS_DINPUT" value="0x5f580000" /> + <baseadress name="BASEADDRESS_NETID" value="0x5f660000" /> + <baseadress name="BASEADDRESS_MAPI32" value="0x62250000" /> + <baseadress name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> + <baseadress name="BASEADDRESS_TIMEDATE" value="0x64da0000" /> + <baseadress name="BASEADDRESS_SYSDM" value="0x64dd0000" /> + <baseadress name="BASEADDRESS_NCPL" value="0x64ea0000" /> + <baseadress name="BASEADDRESS_MAIN" value="0x64f40000" /> + <baseadress name="BASEADDRESS_INTL" value="0x64fb0000" /> + <baseadress name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> + <baseadress name="BASEADDRESS_DESK" value="0x65080000" /> + <baseadress name="BASEADDRESS_APPWIZ" value="0x65100000" /> + <baseadress name="BASEADDRESS_MLANG" value="0x65140000" /> + <baseadress name="BASEADDRESS_ACCESS" value="0x65180000" /> + <baseadress name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> + <baseadress name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> + <baseadress name="BASEADDRESS_HID" value="0x688f0000" /> + <baseadress name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> + <baseadress name="BASEADDRESS_PSAPI" value="0x68f70000" /> + <baseadress name="BASEADDRESS_OLEACC" value="0x69640000" /> + <baseadress name="BASEADDRESS_WINMM" value="0x697d0000" /> + <baseadress name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> + <baseadress name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> + <baseadress name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> + <baseadress name="BASEADDRESS_SHELL32" value="0x6a360000" /> + <baseadress name="BASEADDRESS_UNICODE" value="0x6b200000" /> + <baseadress name="BASEADDRESS_ADVPACK" value="0x6b300000" /> + <baseadress name="BASEADDRESS_CONTROL" value="0x6b310000" /> + <baseadress name="BASEADDRESS_NCPA" value="0x6b320000" /> + <baseadress name="BASEADDRESS_DBGHELP" value="0x6b330000" /> + <baseadress name="BASEADDRESS_DINPUT8" value="0x6b340000" /> + <baseadress name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> + <baseadress name="BASEADDRESS_DSOUND" value="0x6b360000" /> + <baseadress name="BASEADDRESS_GLU32" value="0x6b370000" /> + <baseadress name="BASEADDRESS_MESA32" value="0x6b380000" /> + <baseadress name="BASEADDRESS_OPENGL32" value="0x6b390000" /> + <baseadress name="BASEADDRESS_SECUR32" value="0x6b3a0000" /> + <baseadress name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> + <baseadress name="BASEADDRESS_URLMON" value="0x6b3c0000" /> + <baseadress name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> + <baseadress name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> + <baseadress name="BASEADDRESS_DESKMON" value="0x6d400000" /> + <baseadress name="BASEADDRESS_DESKADP" value="0x6d410000" /> + <baseadress name="BASEADDRESS_WLDAP32" value="0x6e130000" /> + <baseadress name="BASEADDRESS_CLB" value="0x6f2b0000" /> + <baseadress name="BASEADDRESS_CARDS" value="0x701a0000" /> + <baseadress name="BASEADDRESS_WININET" value="0x70200000" /> + <baseadress name="BASEADDRESS_ACLUI" value="0x71550000" /> + <baseadress name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> + <baseadress name="BASEADDRESS_SHDOCVW" value="0x71700000" /> + <baseadress name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> + <baseadress name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> + <baseadress name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> + <baseadress name="BASEADDRESS_NETAPI32" value="0x71c00000" /> + <baseadress name="BASEADDRESS_DPLAY" value="0x71e80000" /> + <baseadress name="BASEADDRESS_SECURITY" value="0x71f10000" /> + <baseadress name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> + <baseadress name="BASEADDRESS_WINFAX" value="0x722C0000" /> + <baseadress name="BASEADDRESS_WINSCARD" value="0x723d0000" /> + <baseadress name="BASEADDRESS_DEVMGR" value="0x72a90000" /> + <baseadress name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> + <baseadress name="BASEADDRESS_LZ32" value="0x73d80000" /> + <baseadress name="BASEADDRESS_COREDLL" value="0x73d80000" /> + <baseadress name="BASEADDRESS_ICMP" value="0x741f0000" /> + <baseadress name="BASEADDRESS_UFAT" value="0x741f0000" /> + <baseadress name="BASEADDRESS_USERENV" value="0x74850000" /> + <baseadress name="BASEADDRESS_WS2_32" value="0x74aa0000" /> + <baseadress name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> + <baseadress name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> + <baseadress name="BASEADDRESS_MMDRV" value="0x74c30000" /> + <baseadress name="BASEADDRESS_OLEDLG" value="0x74d00000" /> + <baseadress name="BASEADDRESS_SAMSRV" value="0x74f30000" /> + <baseadress name="BASEADDRESS_SAMLIB" value="0x750C0000" /> + <baseadress name="BASEADDRESS_CABINET" value="0x75120000" /> + <baseadress name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> + <baseadress name="BASEADDRESS_MSGINA" value="0x75970000" /> + <baseadress name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> + <baseadress name="BASEADDRESS_RPCRT4" value="0x76000000" /> + <baseadress name="BASEADDRESS_SHLWAPI" value="0x76120000" /> + <baseadress name="BASEADDRESS_COMCTL32" value="0x76160000" /> + <baseadress name="BASEADDRESS_COMDLG32" value="0x76210000" /> + <baseadress name="BASEADDRESS_OLEAUT32" value="0x76290000" /> + <baseadress name="BASEADDRESS_RICHED32" value="0x76340000" /> + <baseadress name="BASEADDRESS_D3D8THK" value="0x76340000" /> + <baseadress name="BASEADDRESS_RICHED20" value="0x76360000" /> + <baseadress name="BASEADDRESS_TWAIN_32" value="0x76380000" /> + <baseadress name="BASEADDRESS_IMM32" value="0x76390000" /> + <baseadress name="BASEADDRESS_LSASRV" value="0x76540000" /> + <baseadress name="BASEADDRESS_MIDIMAP" value="0x76600000" /> + <baseadress name="BASEADDRESS_ODBC32" value="0x76660000" /> + <baseadress name="BASEADDRESS_ODBCCP32" value="0x76380000" /> + <baseadress name="BASEADDRESS_WAVEMAP" value="0x76610000" /> + <baseadress name="BASEADDRESS_MPR" value="0x76620000" /> + <baseadress name="BASEADDRESS_SETUPAPI" value="0x76660000" /> + <baseadress name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> + <baseadress name="BASEADDRESS_SHFOLDER" value="0x76780000" /> + <baseadress name="BASEADDRESS_NTMARTA" value="0x768A0000" /> + <baseadress name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> + <baseadress name="BASEADDRESS_WINTRUST" value="0x76c30000" /> + <baseadress name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> + <baseadress name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> + <baseadress name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> + <baseadress name="BASEADDRESS_FMIFS" value="0x76df0000" /> + <baseadress name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> + <baseadress name="BASEADDRESS_MSVFW32" value="0x77400000" /> + <baseadress name="BASEADDRESS_MSACM32" value="0x77400000" /> + <baseadress name="BASEADDRESS_CRTDLL" value="0x77630000" /> + <baseadress name="BASEADDRESS_AUTHZ" value="0x77690000" /> + <baseadress name="BASEADDRESS_CFGMGR32" value="0x77700000" /> + <baseadress name="BASEADDRESS_SENSAPI" value="0x77700000" /> + <baseadress name="BASEADDRESS_PACKET" value="0x77780000" /> + <baseadress name="BASEADDRESS_MSAFD" value="0x77780000" /> + <baseadress name="BASEADDRESS_WINSPOOL" value="0x77800000" /> + <baseadress name="BASEADDRESS_MSI" value="0x77790000" /> + <baseadress name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> + <baseadress name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> + <baseadress name="BASEADDRESS_WS2HELP" value="0x777e0000" /> + <baseadress name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> + <baseadress name="BASEADDRESS_VERSION" value="0x77a40000" /> + <baseadress name="BASEADDRESS_OLE32" value="0x77a50000" /> + <baseadress name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> + <baseadress name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> + <baseadress name="BASEADDRESS_USER32" value="0x77e30000" /> + <baseadress name="BASEADDRESS_GDI32" value="0x77f70000" /> + <baseadress name="BASEADDRESS_DNSAPI" value="0x77fb0000" /> + <baseadress name="BASEADDRESS_MSVCRT" value="0x78000000" /> + <baseadress name="BASEADDRESS_MSVCRT20" value="0x78500000" /> + <baseadress name="BASEADDRESS_KERNEL32" value="0x7c800000" /> + <baseadress name="BASEADDRESS_NTDLL" value="0x7c900000" /> + <baseadress name="BASEADDRESS_HHCTRL" value="0x7e410000" /> + <baseadress name="BASEADDRESS_FREETYPE" value="0x7f000000" /> </group>
Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/modu... ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Tue Nov 6 04:43:43 2007 @@ -1895,15 +1895,13 @@ Property::Property ( const XMLElement& node_, const Project& project_, const Module* module_ ) - : project(project_), module(module_) -{ - const XMLAttribute* att; - - att = node_.GetAttribute ( "name", true ); + : node (&node_) , project(project_), module(module_) +{ + const XMLAttribute* att = node->GetAttribute ( "name", true ); assert(att); name = project.ResolveProperties ( att->value );
- att = node_.GetAttribute ( "value", true ); + att = node->GetAttribute ( "value", true ); assert(att); value = att->value; } @@ -1921,6 +1919,13 @@ { }
+BaseAdress::BaseAdress ( const XMLElement& node_, + const Project& project_, + const Module* module_ ) + : Property( node_ , project_, module_) +{ + //TODO: Add code to validate baseadress +}
PchFile::PchFile ( const XMLElement& node_,
Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/proj... ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Tue Nov 6 04:43:43 2007 @@ -582,6 +582,14 @@ else non_if_data.properties.push_back ( property ); } + else if ( e.name == "baseadress" ) + { + BaseAdress* baseadress = new BaseAdress ( e, *this, NULL ); + if ( parseContext.ifData ) + parseContext.ifData->data.properties.push_back ( baseadress ); + else + non_if_data.properties.push_back ( baseadress ); + } if ( subs_invalid && e.subElements.size() ) { throw XMLInvalidBuildFileException (
Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbui... ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Tue Nov 6 04:43:43 2007 @@ -119,6 +119,7 @@ class AutoResource; class InstallComponent; class InstallFolder; +class BaseAdress;
typedef std::mapstd::string,Directory* directory_map;
@@ -808,6 +809,7 @@ class Property { public: + const XMLElement* node; const Project& project; const Module* module; std::string name, value; @@ -824,6 +826,13 @@ void ProcessXML(); };
+class BaseAdress : public Property +{ +public: + BaseAdress ( const XMLElement& node_, + const Project& project_, + const Module* module_ ); +};
class TestSupportCode {