Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[chorns] 13084: Clean intermediate files.

by chorns＠svn.reactos.com

Clean intermediate files. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 18:14:04 UTC (rev 13083) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 18:30:40 UTC (rev 13084) @@ -559,6 +559,10 @@ GetLinkerMacro ( module ).c_str () ); fprintf ( fMakefile, + "\t${rm} %s\n", + junk_tmp.c_str () ); + + fprintf ( fMakefile, "\t${dlltool} --dllname %s --base-file %s --def %s --output-exp %s --kill-at\n", targetName.c_str (), base_tmp.c_str (), @@ -566,6 +570,10 @@ temp_exp.c_str () ); fprintf ( fMakefile, + "\t${rm} %s\n", + base_tmp.c_str () ); + + fprintf ( fMakefile, "\t%s %s %s -o %s %s %s %s\n\n", linker.c_str (), linkerParameters.c_str (), @@ -574,6 +582,10 @@ objectFilenames.c_str (), importLibraryDependencies.c_str (), GetLinkerMacro ( module ).c_str () ); + + fprintf ( fMakefile, + "\t${rm} %s\n\n", + temp_exp.c_str () ); } else {

19 years, 10 months

[chorns] 13083: Build filesystems

by chorns＠svn.reactos.com

Build filesystems Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml Added: branches/xmlbuildsystem/reactos/drivers/fs/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/fs/fs_rec/fs_rec.xml Added: branches/xmlbuildsystem/reactos/drivers/fs/ms/msfs.xml Added: branches/xmlbuildsystem/reactos/drivers/fs/mup/mup.xml Added: branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.xml Added: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml Added: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml _____ Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml --- branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 17:24:37 UTC (rev 13082) +++ branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 18:14:04 UTC (rev 13083) @@ -4,6 +4,9 @@ <directory name="dd"> <xi:include href="dd/directory.xml" /> </directory> +<directory name="fs"> + <xi:include href="fs/directory.xml" /> +</directory> <directory name="lib"> <xi:include href="lib/directory.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml 2005-01-16 17:24:37 UTC (rev 13082) +++ branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml 2005-01-16 18:14:04 UTC (rev 13083) @@ -0,0 +1,18 @@ +<module name="cdfs" type="kernelmodedriver"> + <include base="cdfs">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>cdfs.c</file> + <file>cleanup.c</file> + <file>close.c</file> + <file>common.c</file> + <file>create.c</file> + <file>dirctl.c</file> + <file>fcb.c</file> + <file>finfo.c</file> + <file>fsctl.c</file> + <file>misc.c</file> + <file>rw.c</file> + <file>volinfo.c</file> + <file>cdfs.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/fs/directory.xml --- branches/xmlbuildsystem/reactos/drivers/fs/directory.xml 2005-01-16 17:24:37 UTC (rev 13082) +++ branches/xmlbuildsystem/reactos/drivers/fs/directory.xml 2005-01-16 18:14:04 UTC (rev 13083) @@ -0,0 +1,21 @@ +<directory name="cdfs"> + <xi:include href="cdfs/cdfs.xml" /> +</directory> +<directory name="fs_rec"> + <xi:include href="fs_rec/fs_rec.xml" /> +</directory> +<directory name="ms"> + <xi:include href="ms/msfs.xml" /> +</directory> +<directory name="mup"> + <xi:include href="mup/mup.xml" /> +</directory> +<directory name="np"> + <xi:include href="np/npfs.xml" /> +</directory> +<directory name="ntfs"> + <xi:include href="ntfs/ntfs.xml" /> +</directory> +<directory name="vfat"> + <xi:include href="vfat/vfatfs.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/fs/fs_rec/fs_rec.xml --- branches/xmlbuildsystem/reactos/drivers/fs/fs_rec/fs_rec.xml 2005-01-16 17:24:37 UTC (rev 13082) +++ branches/xmlbuildsystem/reactos/drivers/fs/fs_rec/fs_rec.xml 2005-01-16 18:14:04 UTC (rev 13083) @@ -0,0 +1,12 @@ +<module name="fs_rec" type="kernelmodedriver"> + <include base="fs_rec">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>blockdev.c</file> + <file>cdfs.c</file> + <file>fat.c</file> + <file>fs_rec.c</file> + <file>ntfs.c</file> + <file>udfs.c</file> + <file>fs_rec.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/fs/ms/msfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/ms/msfs.xml 2005-01-16 17:24:37 UTC (rev 13082) +++ branches/xmlbuildsystem/reactos/drivers/fs/ms/msfs.xml 2005-01-16 18:14:04 UTC (rev 13083) @@ -0,0 +1,11 @@ +<module name="msfs" type="kernelmodedriver"> + <include base="msfs">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>create.c</file> + <file>finfo.c</file> + <file>fsctrl.c</file> + <file>msfs.c</file> + <file>rw.c</file> + <file>msfs.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/fs/mup/mup.xml --- branches/xmlbuildsystem/reactos/drivers/fs/mup/mup.xml 2005-01-16 17:24:37 UTC (rev 13082) +++ branches/xmlbuildsystem/reactos/drivers/fs/mup/mup.xml 2005-01-16 18:14:04 UTC (rev 13083) @@ -0,0 +1,8 @@ +<module name="mup" type="kernelmodedriver"> + <include base="mup">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>create.c</file> + <file>mup.c</file> + <file>mup.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.xml 2005-01-16 17:24:37 UTC (rev 13082) +++ branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.xml 2005-01-16 18:14:04 UTC (rev 13083) @@ -0,0 +1,12 @@ +<module name="npfs" type="kernelmodedriver"> + <include base="npfs">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>create.c</file> + <file>finfo.c</file> + <file>fsctrl.c</file> + <file>npfs.c</file> + <file>rw.c</file> + <file>volume.c</file> + <file>npfs.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml 2005-01-16 17:24:37 UTC (rev 13082) +++ branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml 2005-01-16 18:14:04 UTC (rev 13083) @@ -0,0 +1,18 @@ +<module name="ntfs" type="kernelmodedriver"> + <include base="ntfs">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>attrib.c</file> + <file>blockdev.c</file> + <file>close.c</file> + <file>create.c</file> + <file>dirctl.c</file> + <file>fcb.c</file> + <file>finfo.c</file> + <file>fsctl.c</file> + <file>mft.c</file> + <file>ntfs.c</file> + <file>rw.c</file> + <file>volinfo.c</file> + <file>ntfs.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml 2005-01-16 17:24:37 UTC (rev 13082) +++ branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml 2005-01-16 18:14:04 UTC (rev 13083) @@ -0,0 +1,25 @@ +<module name="vfatfs" type="kernelmodedriver"> + <include base="vfatfs">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>blockdev.c</file> + <file>cleanup.c</file> + <file>close.c</file> + <file>create.c</file> + <file>dir.c</file> + <file>direntry.c</file> + <file>dirwr.c</file> + <file>ea.c</file> + <file>fat.c</file> + <file>fcb.c</file> + <file>finfo.c</file> + <file>flush.c</file> + <file>fsctl.c</file> + <file>iface.c</file> + <file>misc.c</file> + <file>rw.c</file> + <file>shutdown.c</file> + <file>string.c</file> + <file>volume.c</file> + <file>vfatfs.rc</file> +</module>

19 years, 10 months

[chorns] 13082: Build device drivers

by chorns＠svn.reactos.com

Build device drivers Added: branches/xmlbuildsystem/reactos/drivers/dd/beep/beep.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/bootvid/bootvid.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/debugout/debugout.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/mpu401/mpu401.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/parallel/parallel.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/ramdrv.rc Added: branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/ramdrv.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.xml Added: branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.xml Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml Modified: branches/xmlbuildsystem/reactos/drivers/lib/directory.xml _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/beep/beep.xml --- branches/xmlbuildsystem/reactos/drivers/dd/beep/beep.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/beep/beep.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,6 @@ +<module name="beep" type="kernelmodedriver"> + <library>ntoskrnl</library> + <library>hal</library> + <file>beep.c</file> + <file>beep.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml --- branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,6 @@ +<module name="blue" type="kernelmodedriver"> + <library>ntoskrnl</library> + <library>hal</library> + <file>blue.c</file> + <file>blue.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/bootvid/bootvid.xml --- branches/xmlbuildsystem/reactos/drivers/dd/bootvid/bootvid.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/bootvid/bootvid.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,8 @@ +<module name="bootvid" type="kernelmodedriver"> + <include base="bootvid">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>bootvid.c</file> + <file>pixelsup_i386.S</file> + <file>bootvid.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/debugout/debugout.xml --- branches/xmlbuildsystem/reactos/drivers/dd/debugout/debugout.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/debugout/debugout.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,7 @@ +<module name="debugout" type="kernelmodedriver"> + <include base="debugout">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>debugout.c</file> + <file>debugout.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/directory.xml --- branches/xmlbuildsystem/reactos/drivers/dd/directory.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/directory.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,33 @@ +<directory name="beep"> + <xi:include href="beep/beep.xml" /> +</directory> +<directory name="blue"> + <xi:include href="blue/blue.xml" /> +</directory> +<directory name="bootvid"> + <xi:include href="bootvid/bootvid.xml" /> +</directory> +<directory name="debugout"> + <xi:include href="debugout/debugout.xml" /> +</directory> +<directory name="mpu401"> + <xi:include href="mpu401/mpu401.xml" /> +</directory> +<directory name="null"> + <xi:include href="null/null.xml" /> +</directory> +<directory name="parallel"> + <xi:include href="parallel/parallel.xml" /> +</directory> +<directory name="ramdrv"> + <xi:include href="ramdrv/ramdrv.xml" /> +</directory> +<directory name="serial"> + <xi:include href="serial/serial.xml" /> +</directory> +<directory name="sndblst"> + <xi:include href="sndblst/sndblst.xml" /> +</directory> +<directory name="sound"> + <xi:include href="sound/sound.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/mpu401/mpu401.xml --- branches/xmlbuildsystem/reactos/drivers/dd/mpu401/mpu401.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/mpu401/mpu401.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,9 @@ +<module name="mpu401" type="kernelmodedriver"> + <include base="mpu401">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>mpu401.c</file> + <file>portio.c</file> + <file>settings.c</file> + <file>mpu401.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml --- branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,9 @@ +<module name="null" type="kernelmodedriver"> + <include base="null">.</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <library>pseh</library> + <file>null.c</file> + <file>null.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/parallel/parallel.xml --- branches/xmlbuildsystem/reactos/drivers/dd/parallel/parallel.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/parallel/parallel.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,7 @@ +<module name="parallel" type="kernelmodedriver"> + <include base="parallel">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>parallel.c</file> + <file>parallel.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/ramdrv.rc --- branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/ramdrv.rc 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/ramdrv.rc 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "RAM Disk Device Driver\0" +#define REACTOS_STR_INTERNAL_NAME "ramdrv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ramdrv.sys\0" +#include <reactos/version.rc> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/ramdrv.xml --- branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/ramdrv.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/ramdrv.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,8 @@ +<module name="ramdrv" type="kernelmodedriver"> + <include base="ramdrv">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>bzip2</library> + <file>ramdrv.c</file> + <file>ramdrv.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml --- branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,6 @@ +<module name="serial" type="kernelmodedriver"> + <library>ntoskrnl</library> + <library>hal</library> + <file>serial.c</file> + <file>serial.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.xml --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,12 @@ +<module name="sndblst" type="kernelmodedriver"> + <include base="sndblst">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>card.c</file> + <file>dma.c</file> + <file>irq.c</file> + <file>portio.c</file> + <file>settings.c</file> + <file>sndblst.c</file> + <file>sndblst.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.xml --- branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,11 @@ +<module name="sound" type="kernelmodedriver"> + <library>ntoskrnl</library> + <library>hal</library> + <file>dsp.c</file> + <file>mixer.c</file> + <file>sb16.c</file> + <file>sb_waveout.c</file> + <file>sound.c</file> + <file>wave.c</file> + <file>sb16.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml --- branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -1,6 +1,9 @@ <directory name="bus"> <xi:include href="bus/directory.xml" /> </directory> +<directory name="dd"> + <xi:include href="dd/directory.xml" /> +</directory> <directory name="lib"> <xi:include href="lib/directory.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml --- branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -0,0 +1,14 @@ +<module name="bzip2" type="kernelmodedll"> + <importlibrary definition="unbzip2.def" /> + <define name="BZ_NO_STDIO" /> + <define name="BZ_DECOMPRESS_ONLY" /> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>bzlib.c</file> + <file>randtable.c</file> + <file>crctable.c</file> + <file>decompress.c</file> + <file>huffman.c</file> + <file>dllmain.c</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/drivers/lib/directory.xml --- branches/xmlbuildsystem/reactos/drivers/lib/directory.xml 2005-01-16 16:45:53 UTC (rev 13081) +++ branches/xmlbuildsystem/reactos/drivers/lib/directory.xml 2005-01-16 17:24:37 UTC (rev 13082) @@ -1,3 +1,6 @@ +<directory name="bzip2"> + <xi:include href="bzip2/bzip2.xml" /> +</directory> <directory name="csq"> <xi:include href="csq/csq.xml" /> </directory> @@ -6,4 +9,4 @@ </directory> <directory name="oskittcp"> <xi:include href="oskittcp/oskittcp.xml" /> -</directory> \ No newline at end of file +</directory>

19 years, 10 months

[chorns] 13081: Build bus drivers

by chorns＠svn.reactos.com

Build bus drivers Added: branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml Added: branches/xmlbuildsystem/reactos/drivers/bus/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/bus/isapnp/isapnp.xml Added: branches/xmlbuildsystem/reactos/drivers/bus/pci/pci.xml Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml _____ Added: branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml --- branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml 2005-01-16 16:18:52 UTC (rev 13080) +++ branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml 2005-01-16 16:45:53 UTC (rev 13081) @@ -0,0 +1,136 @@ +<module name="acpi" type="kernelmodedriver"> + <include base="acpi">include</include> + <include base="acpi">ospm/include</include> + <library>ntoskrnl</library> + <library>hal</library> + <directory name="dispatcher"> + <file>dsfield.c</file> + <file>dsmethod.c</file> + <file>dsmthdat.c</file> + <file>dsobject.c</file> + <file>dsopcode.c</file> + <file>dsutils.c</file> + <file>dswexec.c</file> + <file>dswload.c</file> + <file>dswscope.c</file> + <file>dswstate.c</file> + </directory> + <directory name="events"> + <file>evevent.c</file> + <file>evmisc.c</file> + <file>evregion.c</file> + <file>evrgnini.c</file> + <file>evsci.c</file> + <file>evxface.c</file> + <file>evxfevnt.c</file> + <file>evxfregn.c</file> + </directory> + <directory name="executer"> + <file>amconfig.c</file> + <file>amconvrt.c</file> + <file>amcreate.c</file> + <file>amdump.c</file> + <file>amdyadic.c</file> + <file>amfield.c</file> + <file>amfldio.c</file> + <file>ammisc.c</file> + <file>ammonad.c</file> + <file>ammutex.c</file> + <file>amnames.c</file> + <file>amprep.c</file> + <file>amregion.c</file> + <file>amresnte.c</file> + <file>amresolv.c</file> + <file>amresop.c</file> + <file>amstore.c</file> + <file>amstoren.c</file> + <file>amstorob.c</file> + <file>amsystem.c</file> + <file>amutils.c</file> + <file>amxface.c</file> + </directory> + <directory name="hardware"> + <file>hwacpi.c</file> + <file>hwgpe.c</file> + <file>hwregs.c</file> + <file>hwsleep.c</file> + <file>hwtimer.c</file> + </directory> + <directory name="namespace"> + <file>nsaccess.c</file> + <file>nsalloc.c</file> + <file>nseval.c</file> + <file>nsinit.c</file> + <file>nsload.c</file> + <file>nsnames.c</file> + <file>nsobject.c</file> + <file>nssearch.c</file> + <file>nsutils.c</file> + <file>nswalk.c</file> + <file>nsxfname.c</file> + <file>nsxfobj.c</file> + </directory> + <directory name="ospm"> + <directory name="busmgr"> + <file>bm.c</file> + <file>bmnotify.c</file> + <file>bmpm.c</file> + <file>bmpower.c</file> + <file>bmrequest.c</file> + <file>bmsearch.c</file> + <file>bmutils.c</file> + <file>bmxface.c</file> + </directory> + <file>acpienum.c</file> + <file>acpisys.c</file> + <file>bn.c</file> + <file>fdo.c</file> + <file>osl.c</file> + <file>pdo.c</file> + </directory> + <directory name="parser"> + <file>psargs.c</file> + <file>psopcode.c</file> + <file>psparse.c</file> + <file>psscope.c</file> + <file>pstree.c</file> + <file>psutils.c</file> + <file>pswalk.c</file> + <file>psxface.c</file> + </directory> + <directory name="resource"> + <file>rsaddr.c</file> + <file>rscalc.c</file> + <file>rscreate.c</file> + <file>rsdump.c</file> + <file>rsio.c</file> + <file>rsirq.c</file> + <file>rslist.c</file> + <file>rsmemory.c</file> + <file>rsmisc.c</file> + <file>rsutils.c</file> + <file>rsxface.c</file> + </directory> + <directory name="tables"> + <file>tbconvrt.c</file> + <file>tbget.c</file> + <file>tbinstal.c</file> + <file>tbutils.c</file> + <file>tbxface.c</file> + <file>tbxfroot.c</file> + </directory> + <directory name="utils"> + <file>cmalloc.c</file> + <file>cmclib.c</file> + <file>cmcopy.c</file> + <file>cmdebug.c</file> + <file>cmdelete.c</file> + <file>cmeval.c</file> + <file>cmglobal.c</file> + <file>cminit.c</file> + <file>cmobject.c</file> + <file>cmutils.c</file> + <file>cmxface.c</file> + </directory> + <file>acpi.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/bus/directory.xml --- branches/xmlbuildsystem/reactos/drivers/bus/directory.xml 2005-01-16 16:18:52 UTC (rev 13080) +++ branches/xmlbuildsystem/reactos/drivers/bus/directory.xml 2005-01-16 16:45:53 UTC (rev 13081) @@ -0,0 +1,9 @@ +<directory name="acpi"> + <xi:include href="acpi/acpi.xml" /> +</directory> +<directory name="isapnp"> + <xi:include href="isapnp/isapnp.xml" /> +</directory> +<directory name="pci"> + <xi:include href="pci/pci.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/bus/isapnp/isapnp.xml --- branches/xmlbuildsystem/reactos/drivers/bus/isapnp/isapnp.xml 2005-01-16 16:18:52 UTC (rev 13080) +++ branches/xmlbuildsystem/reactos/drivers/bus/isapnp/isapnp.xml 2005-01-16 16:45:53 UTC (rev 13081) @@ -0,0 +1,7 @@ +<module name="isapnp" type="kernelmodedriver"> + <include base="isapnp">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>isapnp.c</file> + <file>isapnp.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/bus/pci/pci.xml --- branches/xmlbuildsystem/reactos/drivers/bus/pci/pci.xml 2005-01-16 16:18:52 UTC (rev 13080) +++ branches/xmlbuildsystem/reactos/drivers/bus/pci/pci.xml 2005-01-16 16:45:53 UTC (rev 13081) @@ -0,0 +1,9 @@ +<module name="pci" type="kernelmodedriver"> + <include base="pci">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>fdo.c</file> + <file>pci.c</file> + <file>pdo.c</file> + <file>pci.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml --- branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 16:18:52 UTC (rev 13080) +++ branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 16:45:53 UTC (rev 13081) @@ -1,3 +1,6 @@ +<directory name="bus"> + <xi:include href="bus/directory.xml" /> +</directory> <directory name="lib"> <xi:include href="lib/directory.xml" /> </directory>

19 years, 10 months

[chorns] 13080: Export functions in .def files

by chorns＠svn.reactos.com

Export functions in .def files Deleted: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.def Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.def Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml Modified: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml Modified: branches/xmlbuildsystem/reactos/lib/ntdll/rtl/i386/exception.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Deleted: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.def --- branches/xmlbuildsystem/reactos/drivers/net/afd/afd.def 2005-01-16 14:23:35 UTC (rev 13079) +++ branches/xmlbuildsystem/reactos/drivers/net/afd/afd.def 2005-01-16 16:18:52 UTC (rev 13080) @@ -1,7 +0,0 @@ -; Ancillary Function Driver - ReactOS Operating System - -LIBRARY AFDTEST.SYS - -EXPORTS - -; EOF _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml --- branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml 2005-01-16 14:23:35 UTC (rev 13079) +++ branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml 2005-01-16 16:18:52 UTC (rev 13080) @@ -1,5 +1,4 @@ <module name="afd" type="kernelmodedriver"> - <importlibrary definition="afd.def" /> <include base="afd">include</include> <include base="ReactOS">include/afd</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.def --- branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.def 2005-01-16 14:23:35 UTC (rev 13079) +++ branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.def 2005-01-16 16:18:52 UTC (rev 13080) @@ -178,7 +178,7 @@ EnumCalendarInfoA@16 EnumCalendarInfoExA@16 EnumCalendarInfoExW@16 -EnumCalendarInfoW@16 +;EnumCalendarInfoW@16 EnumDateFormatsA@12 EnumDateFormatsExA@12 EnumDateFormatsExW@12 @@ -657,7 +657,7 @@ OpenMutexA@12 OpenMutexW@12 OpenProcess@12 -OpenProfileUserMapping@0 +;OpenProfileUserMapping@0 OpenSemaphoreA@12 OpenSemaphoreW@12 OpenThread@12 @@ -689,7 +689,7 @@ QueryPerformanceFrequency@4 QueueUserAPC@12 QueueUserWorkItem@12 -QueryWin31IniFilesMappedToRegistry@16 +;QueryWin31IniFilesMappedToRegistry@16 RaiseException@16 ReadConsoleA@20 ReadConsoleInputA@16 _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml --- branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-01-16 14:23:35 UTC (rev 13079) +++ branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-01-16 16:18:52 UTC (rev 13080) @@ -9,6 +9,9 @@ <library>pseh</library> <library>rosrtl</library> <library>ntdll</library> + <linkerflag>-lgcc</linkerflag> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> <invoke module="wmc"> <input> <inputfile>kernel32.mc</inputfile> _____ Modified: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml --- branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-01-16 14:23:35 UTC (rev 13079) +++ branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-01-16 16:18:52 UTC (rev 13080) @@ -6,6 +6,7 @@ <library>rosrtl</library> <library>rtl</library> <library>string</library> + <linkerflag>-lgcc</linkerflag> <directory name="csr"> <file>capture.c</file> <file>lpc.c</file> _____ Modified: branches/xmlbuildsystem/reactos/lib/ntdll/rtl/i386/exception.c --- branches/xmlbuildsystem/reactos/lib/ntdll/rtl/i386/exception.c 2005-01-16 14:23:35 UTC (rev 13079) +++ branches/xmlbuildsystem/reactos/lib/ntdll/rtl/i386/exception.c 2005-01-16 16:18:52 UTC (rev 13080) @@ -251,23 +251,6 @@ * @implemented */ VOID STDCALL -RtlRaiseStatus(NTSTATUS Status) -{ - EXCEPTION_RECORD ExceptionRecord; - - DPRINT("RtlRaiseStatus(Status 0x%.08x)\n", Status); - - ExceptionRecord.ExceptionCode = Status; - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.NumberParameters = 0; - ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - RtlRaiseException (& ExceptionRecord); -} - -/* - * @implemented - */ -VOID STDCALL RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame, PVOID ReturnAddress, PEXCEPTION_RECORD ExceptionRecord, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 14:23:35 UTC (rev 13079) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 16:18:52 UTC (rev 13080) @@ -532,21 +532,60 @@ sourceFilename.c_str () ); } -string +void MingwModuleHandler::GenerateLinkerCommand ( const Module& module, const string& linker, const string& linkerParameters, const string& objectFilenames ) const { + string targetName ( module.GetTargetName () ); string target ( FixupTargetFilename ( module.GetPath () ) ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); - return ssprintf ( "%s %s -o %s %s %s %s\n", - linker.c_str (), - linkerParameters.c_str (), - target.c_str (), - objectFilenames.c_str (), - importLibraryDependencies.c_str (), - GetLinkerMacro ( module ).c_str () ); + if ( module.importLibrary != NULL ) + { + static string ros_junk ( "$(ROS_TEMPORARY)" ); + string base_tmp = ros_junk + module.name + ".base.tmp"; + string junk_tmp = ros_junk + module.name + ".junk.tmp"; + string temp_exp = ros_junk + module.name + ".temp.exp"; + + fprintf ( fMakefile, + "\t%s %s -Wl,--base-file,%s -o %s %s %s %s\n", + linker.c_str (), + linkerParameters.c_str (), + base_tmp.c_str (), + junk_tmp.c_str (), + objectFilenames.c_str (), + importLibraryDependencies.c_str (), + GetLinkerMacro ( module ).c_str () ); + + fprintf ( fMakefile, + "\t${dlltool} --dllname %s --base-file %s --def %s --output-exp %s --kill-at\n", + targetName.c_str (), + base_tmp.c_str (), + FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), + temp_exp.c_str () ); + + fprintf ( fMakefile, + "\t%s %s %s -o %s %s %s %s\n\n", + linker.c_str (), + linkerParameters.c_str (), + temp_exp.c_str (), + target.c_str (), + objectFilenames.c_str (), + importLibraryDependencies.c_str (), + GetLinkerMacro ( module ).c_str () ); + } + else + { + fprintf ( fMakefile, + "\t%s %s -o %s %s %s %s\n\n", + linker.c_str (), + linkerParameters.c_str (), + target.c_str (), + objectFilenames.c_str (), + importLibraryDependencies.c_str (), + GetLinkerMacro ( module ).c_str () ); + } } void @@ -1060,13 +1099,10 @@ importLibraryDependencies.c_str () ); string linkerParameters ( "-Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll" ); - string linkerCommand = GenerateLinkerCommand ( module, - "${gcc}", - linkerParameters, - archiveFilename ); - fprintf ( fMakefile, - "\t%s\n\n", - linkerCommand.c_str () ); + GenerateLinkerCommand ( module, + "${gcc}", + linkerParameters, + archiveFilename ); } else { @@ -1117,13 +1153,10 @@ importLibraryDependencies.c_str () ); string linkerParameters ( "-Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll" ); - string linkerCommand = GenerateLinkerCommand ( module, - "${gcc}", - linkerParameters, - archiveFilename ); - fprintf ( fMakefile, - "\t%s\n\n", - linkerCommand.c_str () ); + GenerateLinkerCommand ( module, + "${gcc}", + linkerParameters, + archiveFilename ); } else { @@ -1156,6 +1189,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); + string objectFilenames = GetObjectFilenames ( module ); string archiveFilename = GetModuleArchiveFilename ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); @@ -1171,13 +1205,10 @@ importLibraryDependencies.c_str () ); string linkerParameters ( "-Wl,--subsystem,native -Wl,--entry,_DllMainCRTStartup@12 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll" ); - string linkerCommand = GenerateLinkerCommand ( module, - "${gcc}", - linkerParameters, - archiveFilename ); - fprintf ( fMakefile, - "\t%s\n\n", - linkerCommand.c_str () ); + GenerateLinkerCommand ( module, + "${gcc}", + linkerParameters, + objectFilenames ); } else { @@ -1225,13 +1256,10 @@ importLibraryDependencies.c_str () ); string linkerParameters ( "-Wl,--subsystem,console -Wl,--entry,_DllMain@12 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll" ); - string linkerCommand = GenerateLinkerCommand ( module, - "${gcc}", - linkerParameters, - archiveFilename ); - fprintf ( fMakefile, - "\t%s\n\n", - linkerCommand.c_str () ); + GenerateLinkerCommand ( module, + "${gcc}", + linkerParameters, + archiveFilename ); } else { @@ -1279,13 +1307,10 @@ importLibraryDependencies.c_str () ); string linkerParameters ( "-Wl,--subsystem,windows -Wl,--entry,_WinMainCRTStartup -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000" ); - string linkerCommand = GenerateLinkerCommand ( module, - "${gcc}", - linkerParameters, - objectFilenames ); - fprintf ( fMakefile, - "\t%s\n\n", - linkerCommand.c_str () ); + GenerateLinkerCommand ( module, + "${gcc}", + linkerParameters, + objectFilenames ); } else { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-16 14:23:35 UTC (rev 13079) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-16 16:18:52 UTC (rev 13080) @@ -41,10 +41,10 @@ std::string GetCFlagsMacro ( const Module& module ) const; std::string GetObjectsMacro ( const Module& module ) const; std::string GetLinkerMacro ( const Module& module ) const; - std::string GenerateLinkerCommand ( const Module& module, - const std::string& linker, - const std::string& linkerParameters, - const std::string& objectFilenames ) const; + void GenerateLinkerCommand ( const Module& module, + const std::string& linker, + const std::string& linkerParameters, + const std::string& objectFilenames ) const; void GenerateImportLibraryTargetIfNeeded ( const Module& module ) const; static FILE* fMakefile; private:

19 years, 10 months

[chorns] 13079: Don't include full path for --dllname

by chorns＠svn.reactos.com

Don't include full path for --dllname Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 13:51:33 UTC (rev 13078) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 14:23:35 UTC (rev 13079) @@ -950,6 +950,7 @@ MingwKernelModuleHandler::GenerateKernelModuleTarget ( const Module& module ) { static string ros_junk ( "$(ROS_TEMPORARY)" ); + string targetName ( module.GetTargetName () ); string target ( FixupTargetFilename (module.GetPath ()) ); string workingDirectory = GetWorkingDirectory (); string objectsMacro = GetObjectsMacro ( module ); @@ -981,7 +982,7 @@ junk_tmp.c_str () ); fprintf ( fMakefile, "\t${dlltool} --dllname %s --base-file %s --def ntoskrnl/ntoskrnl.def --output-exp %s --kill-at\n", - target.c_str (), + targetName.c_str (), base_tmp.c_str (), temp_exp.c_str () ); fprintf ( fMakefile,

19 years, 10 months

[chorns] 13078: * KernelModeDriver module support

by chorns＠svn.reactos.com

* KernelModeDriver module support * Build afd.sys Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml Added: branches/xmlbuildsystem/reactos/drivers/net/directory.xml Modified: branches/xmlbuildsystem/reactos/include/ndis.h Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/include.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-16 13:51:33 UTC (rev 13078) @@ -19,6 +19,7 @@ <include>include</include> <include>w32api/include</include> + <include>w32api/include/ddk</include> <directory name="drivers"> <xi:include href="drivers/directory.xml" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml --- branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 13:51:33 UTC (rev 13078) @@ -1,3 +1,6 @@ <directory name="lib"> <xi:include href="lib/directory.xml" /> -</directory> \ No newline at end of file +</directory> +<directory name="net"> + <xi:include href="net/directory.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml --- branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml 2005-01-16 13:51:33 UTC (rev 13078) @@ -0,0 +1,24 @@ +<module name="afd" type="kernelmodedriver"> + <importlibrary definition="afd.def" /> + <include base="afd">include</include> + <include base="ReactOS">include/afd</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <library>pseh</library> + <directory name="afd"> + <file>bind.c</file> + <file>connect.c</file> + <file>context.c</file> + <file>info.c</file> + <file>listen.c</file> + <file>lock.c</file> + <file>main.c</file> + <file>read.c</file> + <file>select.c</file> + <file>tdi.c</file> + <file>tdiconn.c</file> + <file>write.c</file> + </directory> + <file>afd.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/net/directory.xml --- branches/xmlbuildsystem/reactos/drivers/net/directory.xml 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/drivers/net/directory.xml 2005-01-16 13:51:33 UTC (rev 13078) @@ -0,0 +1,3 @@ +<directory name="afd"> + <xi:include href="afd/afd.xml" /> +</directory> _____ Modified: branches/xmlbuildsystem/reactos/include/ndis.h --- branches/xmlbuildsystem/reactos/include/ndis.h 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/include/ndis.h 2005-01-16 13:51:33 UTC (rev 13078) @@ -1 +1,5 @@ +#ifdef __USE_W32API +#include_next <ndis.h> +#else #include "net/ndis.h" +#endif _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-16 13:51:33 UTC (rev 13078) @@ -1,4 +1,5 @@ <module name="ntoskrnl" type="kernel"> + <importlibrary definition="ntoskrnl.def" /> <dependency>buildno</dependency> <dependency>genntdll</dependency> <dependency>wmc</dependency> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 13:51:33 UTC (rev 13078) @@ -641,6 +641,13 @@ } string +MingwModuleHandler::GetCFlagsMacro ( const Module& module ) const +{ + return ssprintf ( "$(%s_CFLAGS)", + module.name.c_str () ); +} + +string MingwModuleHandler::GetObjectsMacro ( const Module& module ) const { return ssprintf ( "$(%s_OBJS)", @@ -658,7 +665,8 @@ MingwModuleHandler::GenerateMacrosAndTargets ( const Module& module, const string& cc, - const string& ar ) const + const string& ar, + const string* cflags ) const { string cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); string nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); @@ -673,12 +681,20 @@ linkerFlagsMacro, objectsMacro ); + if ( cflags != NULL ) + { + fprintf ( fMakefile, + "%s += %s\n\n", + cflagsMacro.c_str (), + cflags->c_str () ); + } + // generate phony target for module name fprintf ( fMakefile, ".PHONY: %s\n", - module.name.c_str() ); + module.name.c_str () ); fprintf ( fMakefile, "%s: %s\n\n", - module.name.c_str(), - module.GetPath().c_str() ); + module.name.c_str (), + module.GetPath ().c_str () ); // future references to the macros will be to get their values cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ()); @@ -710,15 +726,23 @@ void MingwModuleHandler::GenerateMacrosAndTargetsHost ( const Module& module ) const { - GenerateMacrosAndTargets ( module, "${host_gcc}", "${host_ar}" ); + GenerateMacrosAndTargets ( module, "${host_gcc}", "${host_ar}", NULL ); } void MingwModuleHandler::GenerateMacrosAndTargetsTarget ( const Module& module ) const { - GenerateMacrosAndTargets ( module, "${gcc}", "${ar}" ); + GenerateMacrosAndTargetsTarget ( module, + NULL ); } +void +MingwModuleHandler::GenerateMacrosAndTargetsTarget ( const Module& module, + const string* clags ) const +{ + GenerateMacrosAndTargets ( module, "${gcc}", "${ar}", clags ); +} + string MingwModuleHandler::GetInvocationDependencies ( const Module& module ) const { @@ -857,7 +881,23 @@ fprintf ( fMakefile, "\n" ); } +void +MingwModuleHandler::GenerateImportLibraryTargetIfNeeded ( const Module& module ) const +{ + if ( module.importLibrary != NULL ) + { + fprintf ( fMakefile, "%s:\n", + module.GetDependencyPath ().c_str () ); + fprintf ( fMakefile, + "\t${dlltool} --dllname %s --def %s --output-lib %s --kill-at\n\n", + module.GetTargetName ().c_str (), + FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), + FixupTargetFilename ( module.GetDependencyPath () ).c_str () ); + } +} + + static MingwBuildToolModuleHandler buildtool_handler; MingwBuildToolModuleHandler::MingwBuildToolModuleHandler() @@ -922,6 +962,8 @@ GenerateMacrosAndTargetsTarget ( module ); + GenerateImportLibraryTargetIfNeeded ( module ); + fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), objectsMacro.c_str (), @@ -1005,21 +1047,68 @@ string archiveFilename = GetModuleArchiveFilename ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); - if (module.importLibrary != NULL) + GenerateImportLibraryTargetIfNeeded ( module ); + + if ( module.files.size () > 0 ) { - fprintf ( fMakefile, "%s:\n", - module.GetDependencyPath ().c_str () ); + GenerateMacrosAndTargetsTarget ( module ); + fprintf ( fMakefile, "%s: %s %s\n", + target.c_str (), + archiveFilename.c_str (), + importLibraryDependencies.c_str () ); + + string linkerParameters ( "-Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll" ); + string linkerCommand = GenerateLinkerCommand ( module, + "${gcc}", + linkerParameters, + archiveFilename ); fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-lib %s --kill-at\n\n", - module.GetTargetName ().c_str (), - FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), - FixupTargetFilename ( module.GetDependencyPath () ).c_str () ); + "\t%s\n\n", + linkerCommand.c_str () ); } + else + { + fprintf ( fMakefile, "%s:\n", + target.c_str ()); + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str ()); + } +} - if (module.files.size () > 0) + +static MingwKernelModeDriverModuleHandler kernelmodedriver_handler; + +MingwKernelModeDriverModuleHandler::MingwKernelModeDriverModuleHandler () + : MingwModuleHandler ( KernelModeDriver ) +{ +} + +void +MingwKernelModeDriverModuleHandler::Process ( const Module& module ) +{ + GeneratePreconditionDependencies ( module ); + GenerateKernelModeDriverModuleTarget ( module ); + GenerateInvocations ( module ); +} + +void +MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarge t ( const Module& module ) +{ + static string ros_junk ( "$(ROS_TEMPORARY)" ); + string target ( FixupTargetFilename ( module.GetPath () ) ); + string workingDirectory = GetWorkingDirectory ( ); + string archiveFilename = GetModuleArchiveFilename ( module ); + string importLibraryDependencies = GetImportLibraryDependencies ( module ); + + GenerateImportLibraryTargetIfNeeded ( module ); + + if ( module.files.size () > 0 ) { - GenerateMacrosAndTargetsTarget ( module ); + string* cflags = new string ( "-D__NTDRIVER__" ); + GenerateMacrosAndTargetsTarget ( module, + cflags ); + delete cflags; fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), @@ -1068,21 +1157,11 @@ string workingDirectory = GetWorkingDirectory ( ); string archiveFilename = GetModuleArchiveFilename ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); + + GenerateImportLibraryTargetIfNeeded ( module ); - if (module.importLibrary != NULL) + if ( module.files.size () > 0 ) { - fprintf ( fMakefile, "%s:\n", - module.GetDependencyPath ().c_str () ); - - fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-lib %s --kill-at\n\n", - module.GetTargetName ().c_str (), - FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), - FixupTargetFilename ( module.GetDependencyPath () ).c_str () ); - } - - if (module.files.size () > 0) - { GenerateMacrosAndTargetsTarget ( module ); fprintf ( fMakefile, "%s: %s %s\n", @@ -1133,19 +1212,9 @@ string archiveFilename = GetModuleArchiveFilename ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); - if (module.importLibrary != NULL) - { - fprintf ( fMakefile, "%s:\n", - module.GetDependencyPath ().c_str () ); + GenerateImportLibraryTargetIfNeeded ( module ); - fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-lib %s --kill-at\n\n", - module.GetTargetName ().c_str (), - FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), - FixupTargetFilename ( module.GetDependencyPath () ).c_str () ); - } - - if (module.files.size () > 0) + if ( module.files.size () > 0 ) { GenerateMacrosAndTargetsTarget ( module ); @@ -1197,7 +1266,9 @@ string objectFilenames = GetObjectFilenames ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); - if (module.files.size () > 0) + GenerateImportLibraryTargetIfNeeded ( module ); + + if ( module.files.size () > 0 ) { GenerateMacrosAndTargetsTarget ( module ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-16 13:51:33 UTC (rev 13078) @@ -32,16 +32,20 @@ std::string GetObjectFilenames ( const Module& module ) const; void GenerateMacrosAndTargetsHost ( const Module& module ) const; void GenerateMacrosAndTargetsTarget ( const Module& module ) const; + void GenerateMacrosAndTargetsTarget ( const Module& module, + const std::string* clags ) const; std::string GetInvocationDependencies ( const Module& module ) const; std::string GetInvocationParameters ( const Invoke& invoke ) const; void GenerateInvocations ( const Module& module ) const; void GeneratePreconditionDependencies ( const Module& module ) const; + std::string GetCFlagsMacro ( const Module& module ) const; std::string GetObjectsMacro ( const Module& module ) const; std::string GetLinkerMacro ( const Module& module ) const; std::string GenerateLinkerCommand ( const Module& module, const std::string& linker, const std::string& linkerParameters, const std::string& objectFilenames ) const; + void GenerateImportLibraryTargetIfNeeded ( const Module& module ) const; static FILE* fMakefile; private: std::string ConcatenatePaths ( const std::string& path1, @@ -115,7 +119,8 @@ const std::string& objs_macro ) const; void GenerateMacrosAndTargets ( const Module& module, const std::string& cc, - const std::string& ar ) const; + const std::string& ar, + const std::string* clags ) const; std::string GetPreconditionDependenciesName ( const Module& module ) const; }; @@ -160,6 +165,16 @@ }; +class MingwKernelModeDriverModuleHandler : public MingwModuleHandler +{ +public: + MingwKernelModeDriverModuleHandler (); + virtual void Process ( const Module& module ); +private: + void GenerateKernelModeDriverModuleTarget ( const Module& module ); +}; + + class MingwNativeDLLModuleHandler : public MingwModuleHandler { public: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/include.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/include.cpp 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/tools/rbuild/include.cpp 2005-01-16 13:51:33 UTC (rev 13078) @@ -8,10 +8,9 @@ Include::Include ( const Project& project_, const XMLElement& includeNode ) - : project(project_), - module(NULL), - node(includeNode), - base(NULL) + : project (project_), + module (NULL), + node (includeNode) { Initialize(); } @@ -19,10 +18,9 @@ Include::Include ( const Project& project_, const Module* module_, const XMLElement& includeNode ) - : project(project_), - module(module_), - node(includeNode), - base(NULL) + : project (project_), + module (module_), + node (includeNode) { Initialize(); } @@ -48,13 +46,27 @@ throw InvalidBuildFileException ( node.location, "'base' attribute illegal from global <include>" ); - base = project.LocateModule ( att->value ); - if ( !base ) + bool referenceResolved = false; + if ( att->value == project.name ) + { + basePath = "."; + referenceResolved = true; + } + else + { + const Module* base = project.LocateModule ( att->value ); + if ( base != NULL ) + { + basePath = base->GetBasePath (); + referenceResolved = true; + } + } + if ( !referenceResolved ) throw InvalidBuildFileException ( node.location, - "<include> attribute 'base' references non-existant module '%s'", + "<include> attribute 'base' references non-existant project or module '%s'", att->value.c_str() ); - directory = FixSeparator ( base->GetBasePath() + "/" + node.value ); + directory = FixSeparator ( basePath + "/" + node.value ); } else directory = FixSeparator ( node.value ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-16 13:51:33 UTC (rev 13078) @@ -214,6 +214,8 @@ return Kernel; if ( attribute.value == "kernelmodedll" ) return KernelModeDLL; + if ( attribute.value == "kernelmodedriver" ) + return KernelModeDriver; if ( attribute.value == "nativedll" ) return NativeDLL; if ( attribute.value == "win32dll" ) @@ -241,6 +243,8 @@ case NativeDLL: case Win32DLL: return ".dll"; + case KernelModeDriver: + return ".sys"; } throw InvalidOperationException ( __FILE__, __LINE__ ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-16 11:52:30 UTC (rev 13077) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-16 13:51:33 UTC (rev 13078) @@ -73,6 +73,7 @@ StaticLibrary, Kernel, KernelModeDLL, + KernelModeDriver, NativeDLL, Win32DLL, Win32GUI @@ -128,7 +129,7 @@ const Module* module; const XMLElement& node; std::string directory; - const Module* base; + std::string basePath; Include ( const Project& project, const XMLElement& includeNode );

19 years, 10 months

[chorns] 13077: Add resources to existing modules.

by chorns＠svn.reactos.com

Add resources to existing modules. Modified: branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml Modified: branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml Modified: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml Modified: branches/xmlbuildsystem/reactos/lib/user32/user32.xml Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml --- branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml 2005-01-16 11:29:03 UTC (rev 13076) +++ branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml 2005-01-16 11:52:30 UTC (rev 13077) @@ -44,4 +44,5 @@ <file>privilege.c</file> <file>token.c</file> </directory> + <file>advapi32.rc</file> </module> _____ Modified: branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml --- branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml 2005-01-16 11:29:03 UTC (rev 13076) +++ branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml 2005-01-16 11:52:30 UTC (rev 13077) @@ -32,4 +32,5 @@ <file>region.c</file> <file>text.c</file> </directory> + <file>gdi32.rc</file> </module> _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml --- branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-01-16 11:29:03 UTC (rev 13076) +++ branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-01-16 11:52:30 UTC (rev 13077) @@ -1,12 +1,23 @@ <module name="kernel32" type="win32dll"> + <dependency>wmc</dependency> <importlibrary definition="kernel32.def" /> <include base="kernel32">.</include> <include base="kernel32">include</include> <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> + <define name="WINVER">0x0500</define> <library>pseh</library> <library>rosrtl</library> <library>ntdll</library> + <invoke module="wmc"> + <input> + <inputfile>kernel32.mc</inputfile> + </input> + <output> + <outputfile switches="-H">../../include/reactos/errcodes.h</outputfile> + <outputfile switches="-o">errcodes.rc</outputfile> + </output> + </invoke> <directory name="debug"> <file>break.c</file> <file>debugger.c</file> @@ -104,4 +115,5 @@ <file>thread.c</file> <file>tls.c</file> </directory> + <file>kernel32.rc</file> </module> _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml --- branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-01-16 11:29:03 UTC (rev 13076) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-01-16 11:52:30 UTC (rev 13077) @@ -440,4 +440,5 @@ <file>wcsxfrm.c</file> <file>wlasttok.c</file> </directory> + <file>msvcrt.rc</file> </module> _____ Modified: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml --- branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-01-16 11:29:03 UTC (rev 13076) +++ branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-01-16 11:52:30 UTC (rev 13077) @@ -104,5 +104,8 @@ <file>strupr.c</file> <file>wstring.c</file> </directory> + <directory name="def"> + <file>ntdll.rc</file> + </directory> <file>napi.c</file> </module> _____ Modified: branches/xmlbuildsystem/reactos/lib/user32/user32.xml --- branches/xmlbuildsystem/reactos/lib/user32/user32.xml 2005-01-16 11:29:03 UTC (rev 13076) +++ branches/xmlbuildsystem/reactos/lib/user32/user32.xml 2005-01-16 11:52:30 UTC (rev 13077) @@ -1,6 +1,7 @@ <module name="user32" type="win32dll"> <dependency>addsys</dependency> <importlibrary definition="user32.def" /> + <include base="user32">.</include> <include base="user32">include</include> <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> @@ -71,4 +72,5 @@ <file>window.c</file> <file>winpos.c</file> </directory> + <file>user32.rc</file> </module> _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-16 11:29:03 UTC (rev 13076) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-16 11:52:30 UTC (rev 13077) @@ -378,4 +378,5 @@ <file>sid.c</file> <file>token.c</file> </directory> + <file>ntoskrnl.rc</file> </module>

19 years, 10 months

[gvg] 13076: Use native BOOLEAN instead of win32k BOOL

by gvg＠svn.reactos.com

Use native BOOLEAN instead of win32k BOOL Modified: trunk/reactos/include/ntdll/ldr.h Modified: trunk/reactos/lib/ntdll/ldr/res.c Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c _____ Modified: trunk/reactos/include/ntdll/ldr.h --- trunk/reactos/include/ntdll/ldr.h 2005-01-16 11:02:12 UTC (rev 13075) +++ trunk/reactos/include/ntdll/ldr.h 2005-01-16 11:29:03 UTC (rev 13076) @@ -102,7 +102,7 @@ PIMAGE_NT_HEADERS NTHeaders); NTSTATUS LdrMapNTDllForProcess(HANDLE ProcessHandle, PHANDLE NTDllSectionHandle); -BOOL LdrMappedAsDataFile(PVOID *BaseAddress); +BOOLEAN LdrMappedAsDataFile(PVOID *BaseAddress); NTSTATUS STDCALL LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress); _____ Modified: trunk/reactos/lib/ntdll/ldr/res.c --- trunk/reactos/lib/ntdll/ldr/res.c 2005-01-16 11:02:12 UTC (rev 13075) +++ trunk/reactos/lib/ntdll/ldr/res.c 2005-01-16 11:29:03 UTC (rev 13076) @@ -110,7 +110,7 @@ int j, pos = 0; LCID UserLCID, SystemLCID; LANGID UserLangID, SystemLangID; - BOOL MappedAsDataFile; + BOOLEAN MappedAsDataFile; MappedAsDataFile = LdrMappedAsDataFile(&BaseAddress); DPRINT("LdrFindResource_U(%08x, %08x, %d, %08x)\n", BaseAddress, ResourceInfo, Level, ResourceDataEntry); @@ -280,7 +280,7 @@ ULONG DataSize; ULONG Offset = 0; ULONG Data; - BOOL MappedAsDataFile; + BOOLEAN MappedAsDataFile; if(!ResourceDataEntry) return STATUS_RESOURCE_DATA_NOT_FOUND; _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-16 11:02:12 UTC (rev 13075) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-16 11:29:03 UTC (rev 13076) @@ -42,7 +42,7 @@ #define VALUE_BUFFER_SIZE 256 -BOOL FASTCALL +BOOLEAN FASTCALL ReadCompatibilitySetting(HANDLE Key, LPWSTR Value, PKEY_VALUE_PARTIAL_INFORMATION ValueInfo, DWORD *Buffer) { UNICODE_STRING ValueName; @@ -105,7 +105,7 @@ -BOOL FASTCALL +BOOLEAN FASTCALL LoadCompatibilitySettings(PPEB Peb) { NTSTATUS Status; _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-16 11:02:12 UTC (rev 13075) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-16 11:29:03 UTC (rev 13076) @@ -55,7 +55,7 @@ /* PROTOTYPES ****************************************************************/ -static NTSTATUS LdrFindEntryForName(PUNICODE_STRING Name, PLDR_MODULE *Module, BOOL Ref); +static NTSTATUS LdrFindEntryForName(PUNICODE_STRING Name, PLDR_MODULE *Module, BOOLEAN Ref); static PVOID LdrFixupForward(PCHAR ForwardName); static PVOID LdrGetExportByName(PVOID BaseAddress, PUCHAR SymbolName, USHORT Hint); static NTSTATUS LdrpLoadModule(IN PWSTR SearchPath OPTIONAL, @@ -64,7 +64,7 @@ OUT PLDR_MODULE *Module, OUT PVOID *BaseAddress OPTIONAL); static NTSTATUS LdrpAttachProcess(VOID); -static VOID LdrpDetachProcess(BOOL UnloadAll); +static VOID LdrpDetachProcess(BOOLEAN UnloadAll); /* FUNCTIONS *****************************************************************/ @@ -84,7 +84,7 @@ #endif /* DBG || KDBG */ -BOOL +BOOLEAN LdrMappedAsDataFile(PVOID *BaseAddress) { if (0 != ((DWORD_PTR) *BaseAddress & (PAGE_SIZE - 1))) @@ -96,7 +96,7 @@ return FALSE; } -static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOL Locked) +static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOLEAN Locked) { LONG LoadCount; if (!Locked) @@ -115,7 +115,7 @@ return LoadCount; } -static inline LONG LdrpIncrementLoadCount(PLDR_MODULE Module, BOOL Locked) +static inline LONG LdrpIncrementLoadCount(PLDR_MODULE Module, BOOLEAN Locked) { LONG LoadCount; if (!Locked) @@ -134,7 +134,7 @@ return LoadCount; } -static inline VOID LdrpAcquireTlsSlot(PLDR_MODULE Module, ULONG Size, BOOL Locked) +static inline VOID LdrpAcquireTlsSlot(PLDR_MODULE Module, ULONG Size, BOOLEAN Locked) { if (!Locked) { @@ -168,7 +168,7 @@ } } -static BOOL LdrpCallDllEntry(PLDR_MODULE Module, DWORD dwReason, PVOID lpReserved) +static BOOLEAN LdrpCallDllEntry(PLDR_MODULE Module, DWORD dwReason, PVOID lpReserved) { if (!(Module->Flags & IMAGE_DLL) || Module->EntryPoint == 0) @@ -561,7 +561,7 @@ LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL, IN PUNICODE_STRING DllName, OUT PUNICODE_STRING FullDosName, - IN BOOL MapAsDataFile, + IN BOOLEAN MapAsDataFile, OUT PHANDLE SectionHandle) { WCHAR SearchPathBuffer[MAX_PATH]; @@ -834,7 +834,7 @@ static NTSTATUS LdrFindEntryForName(PUNICODE_STRING Name, PLDR_MODULE *Module, - BOOL Ref) + BOOLEAN Ref) { PLIST_ENTRY ModuleListHead; PLIST_ENTRY Entry; @@ -1338,7 +1338,7 @@ LdrpGetOrLoadModule(PWCHAR SerachPath, PCHAR Name, PLDR_MODULE* Module, - BOOL Load) + BOOLEAN Load) { UNICODE_STRING DllName; NTSTATUS Status; @@ -1717,7 +1717,7 @@ } else { - BOOL WrongForwarder; + BOOLEAN WrongForwarder; WrongForwarder = FALSE; if (ImportedModule->Flags & IMAGE_NOT_AT_BASE) { @@ -1997,7 +1997,7 @@ ULONG ViewSize; PVOID ImageBase; PIMAGE_NT_HEADERS NtHeaders; - BOOL MappedAsDataFile; + BOOLEAN MappedAsDataFile; if (Module == NULL) { @@ -2130,7 +2130,7 @@ static NTSTATUS LdrpUnloadModule(PLDR_MODULE Module, - BOOL Unload) + BOOLEAN Unload) { PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory; PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundImportDescriptor; @@ -2400,7 +2400,7 @@ * The loader lock must be held on enty. */ static VOID -LdrpDetachProcess(BOOL UnloadAll) +LdrpDetachProcess(BOOLEAN UnloadAll) { PLIST_ENTRY ModuleListHead; PLIST_ENTRY Entry; @@ -2499,7 +2499,7 @@ PLIST_ENTRY ModuleListHead; PLIST_ENTRY Entry; PLDR_MODULE Module; - BOOL Result; + BOOLEAN Result; NTSTATUS Status = STATUS_SUCCESS; DPRINT("LdrpAttachProcess() called for %wZ\n",

19 years, 10 months

[arty] 13075: Added xml for ip libs.

by arty＠svn.reactos.com

Added xml for ip libs. Modified: branches/xmlbuildsystem/reactos/drivers/lib/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/lib/ip/ip.xml Added: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml _____ Modified: branches/xmlbuildsystem/reactos/drivers/lib/directory.xml --- branches/xmlbuildsystem/reactos/drivers/lib/directory.xml 2005-01-16 09:44:07 UTC (rev 13074) +++ branches/xmlbuildsystem/reactos/drivers/lib/directory.xml 2005-01-16 11:02:12 UTC (rev 13075) @@ -1,3 +1,9 @@ <directory name="csq"> <xi:include href="csq/csq.xml" /> +</directory> +<directory name="ip"> + <xi:include href="ip/ip.xml" /> +</directory> +<directory name="oskittcp"> + <xi:include href="oskittcp/oskittcp.xml" /> </directory> \ No newline at end of file _____ Added: branches/xmlbuildsystem/reactos/drivers/lib/ip/ip.xml --- branches/xmlbuildsystem/reactos/drivers/lib/ip/ip.xml 2005-01-16 09:44:07 UTC (rev 13074) +++ branches/xmlbuildsystem/reactos/drivers/lib/ip/ip.xml 2005-01-16 11:02:12 UTC (rev 13075) @@ -0,0 +1,45 @@ +<module name="ip" type="staticlibrary"> + <define name="__NTDRIVER__"/> + <define name="_SEH_NO_NATIVE_NLG"/> + <define name="__USE_W32API"/> + <include>drivers/net/tcpip/include</include> + <include>drivers/lib/oskittcp/include</include> + <directory name="network"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>checksum.S</file> + </directory> + </if> + <file>address.c</file> + <file>arp.c</file> + <file>checksum.c</file> + <file>icmp.c</file> + <file>interface.c</file> + <file>ip.c</file> + <file>loopback.c</file> + <file>memtrack.c</file> + <file>neighbor.c</file> + <file>ports.c</file> + <file>receive.c</file> + <file>router.c</file> + <file>routines.c</file> + <file>transmit.c</file> + </directory> + <directory name="transport"> + <directory name="datagram"> + <file>datagram.c</file> + </directory> + <directory name="rawip"> + <file>rawip.c</file> + </directory> + <directory name="tcp"> + <file>accept.c</file> + <file>event.c</file> + <file>if.c</file> + <file>tcp.c</file> + </directory> + <directory name="udp"> + <file>udp.c</file> + </directory> + </directory> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml --- branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml 2005-01-16 09:44:07 UTC (rev 13074) +++ branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml 2005-01-16 11:02:12 UTC (rev 13075) @@ -0,0 +1,46 @@ +<module name="oskittcp" type="staticlibrary"> + <define name="__REACTOS__">1</define> + <define name="__NTDRIVER__"/> + <define name="KERNEL"/> + <define name="_DISABLE_TIDENTS"/> + <include>drivers/lib/oskittcp/include/freebsd</include> + <include>drivers/lib/oskittcp/include/freebsd/sys/include</include> + <include>drivers/lib/oskittcp/include/freebsd/src/sys</include> + <include>drivers/lib/oskittcp/include/freebsd/dev/include</include> + <include>drivers/lib/oskittcp/include/freebsd/net/include</include> + <include>drivers/lib/oskittcp/include</include> + <directory name="oskittcp"> + <file>defaults.c</file> + <file>in.c</file> + <file>in_cksum.c</file> + <file>in_pcb.c</file> + <file>in_proto.c</file> + <file>in_rmx.c</file> + <file>inet_ntoa.c</file> + <file>interface.c</file> + <file>ip_input.c</file> + <file>ip_output.c</file> + <file>kern_clock.c</file> + <file>kern_subr.c</file> + <file>param.c</file> + <file>radix.c</file> + <file>random.c</file> + <file>raw_cb.c</file> + <file>raw_ip.c</file> + <file>raw_usrreq.c</file> + <file>route.c</file> + <file>rtsock.c</file> + <file>scanc.c</file> + <file>sleep.c</file> + <file>tcp_input.c</file> + <file>tcp_output.c</file> + <file>tcp_subr.c</file> + <file>tcp_usrreq.c</file> + <file>tcp_debug.c</file> + <file>tcp_timer.c</file> + <file>uipc_domain.c</file> + <file>uipc_mbuf.c</file> + <file>uipc_socket.c</file> + <file>uipc_socket2.c</file> + </directory> +</module>

19 years, 10 months

← Newer
1
...
27
28
29
30
31
32
33
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005