Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mbosma] 25555: More applications by EmuandCo.
by mbosma＠svn.reactos.org 21 Jan '07

21 Jan '07

Author: mbosma Date: Sun Jan 21 18:12:03 2007 New Revision: 25555 URL: http://svn.reactos.org/svn/reactos?rev=25555&view=rev Log: More applications by EmuandCo. Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml (original) +++ trunk/reactos/base/applications/downloader/downloader.xml Sun Jan 21 18:12:03 2007 @@ -1,11 +1,11 @@ <tree Version="1">  <category name="Internet & Network" icon="1"> <application name="Firefox"> - <description>The most popular free webbrowser out there.</description> + <description>The most popular and one of the best free WebBrowsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> <application name="Thunderbird"> - <description>The most popular free Mail Client out there.</description> + <description>The most popular and one of the best free MailClients out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> </application> <application name="SeaMonkey"> @@ -13,11 +13,11 @@ <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> </application> <application name="Samba TNG"> - <description>This tool allows you to access your Windows shared folders and printers.</description> + <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> <location>http://svn.reactos.org/packages/samba-tng.exe</location> </application> <application name="Mozilla ActiveX Control"> - <description>Essential Component to get ReactOS Explorer's and other applications Internet Browsing feature running.</description> + <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> </application> <application name="Miranda IM"> @@ -45,7 +45,7 @@ <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> </application> <application name="IrfanView Plugins"> - <description>Additional Plugins for supporting more File types.</description> + <description>Additional Plugins for supporting more file types.</description> <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> </application> <application name="TuxPaint"> @@ -57,7 +57,7 @@ </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment"> - <description>Allows you to build the ReactOS Source. For more instructions see our wiki.</description> + <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.3.exe</location> </application> </category> @@ -66,10 +66,14 @@ <description>SamNMax, Day of Tentacle, etc on ReactOS</description> <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> </application> + <application name="Tile World"> + <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> + <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> + </application> </category> <category name="Tools" icon="7"> <application name="7-Zip"> - <description>Utility to create and open zip, tar, rar and other archive files.</description> + <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> </application> <application name="uTorrent"> @@ -77,10 +81,14 @@ <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location> </application> <application name="Audio Grabber"> - <description>A very good CD Ripper/File Converter.</description> + <description>A very good CD Ripper/Audio File Converter.</description> <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location> </application> </category> <category name="Others" icon="8"> + <application name="Simple Direct Media Layer (SDL) Runtime"> + <description>Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/libsdl/SDL-1.2.11-win32.zip</location> + </application> </category> </tree>

1 0

[mbosma] 25554: Merge xml changes to 0.3.1 branch.
by mbosma＠svn.reactos.org 21 Jan '07

21 Jan '07

Author: mbosma Date: Sun Jan 21 18:12:00 2007 New Revision: 25554 URL: http://svn.reactos.org/svn/reactos?rev=25554&view=rev Log: Merge xml changes to 0.3.1 branch. Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml Sun Jan 21 18:12:00 2007 @@ -1,11 +1,11 @@ <tree Version="1">  <category name="Internet & Network" icon="1"> <application name="Firefox"> - <description>The most popular free webbrowser out there.</description> + <description>The most popular and one of the best free WebBrowsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> <application name="Thunderbird"> - <description>The most popular free Mail Client out there.</description> + <description>The most popular and one of the best free MailClients out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> </application> <application name="SeaMonkey"> @@ -13,11 +13,11 @@ <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> </application> <application name="Samba TNG"> - <description>This tool allows you to access your Windows shared folders and printers.</description> + <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> <location>http://svn.reactos.org/packages/samba-tng.exe</location> </application> <application name="Mozilla ActiveX Control"> - <description>Essential Component to get ReactOS Explorer's and other applications Internet Browsing feature running.</description> + <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> </application> <application name="Miranda IM"> @@ -45,7 +45,7 @@ <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> </application> <application name="IrfanView Plugins"> - <description>Additional Plugins for supporting more File types.</description> + <description>Additional Plugins for supporting more file types.</description> <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> </application> <application name="TuxPaint"> @@ -57,7 +57,7 @@ </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment"> - <description>Allows you to build the ReactOS Source. For more instructions see our wiki.</description> + <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.3.exe</location> </application> </category> @@ -66,10 +66,14 @@ <description>SamNMax, Day of Tentacle, etc on ReactOS</description> <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> </application> + <application name="Tile World"> + <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> + <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> + </application> </category> <category name="Tools" icon="7"> <application name="7-Zip"> - <description>Utility to create and open zip, tar, rar and other archive files.</description> + <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> </application> <application name="uTorrent"> @@ -77,10 +81,14 @@ <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location> </application> <application name="Audio Grabber"> - <description>A very good CD Ripper/File Converter.</description> + <description>A very good CD Ripper/Audio File Converter.</description> <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location> </application> </category> <category name="Others" icon="8"> + <application name="Simple Direct Media Layer (SDL) Runtime"> + <description>Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/libsdl/SDL-1.2.11-win32.zip</location> + </application> </category> </tree>

1 0

[greatlrd] 25553: fixing a small disambler bug for mr
by greatlrd＠svn.reactos.org 21 Jan '07

21 Jan '07

Author: greatlrd Date: Sun Jan 21 18:06:57 2007 New Revision: 25553 URL: http://svn.reactos.org/svn/reactos?rev=25553&view=rev Log: fixing a small disambler bug for mr Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToI… ============================================================================== --- trunk/rosapps/devutils/cputointel/CpuToIntel.c (original) +++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Sun Jan 21 18:06:57 2007 @@ -98,9 +98,11 @@ // mode 1 convert to intel // mode 2 convert to ppc //return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode); - return LoadPFileImage("e:\\testppc.exe","e:\\cputointel.asm",0,0,0,1); + LoadPFileImage("e:\\testppc.exe","e:\\cputoppc.asm",0,0,0,1); + LoadPFileImage("e:\\testppc.exe","e:\\cputointel.asm",0,0,0,2); + // return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,1); // convert - + return 0; } Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h Sun Jan 21 18:06:57 2007 @@ -15,6 +15,19 @@ CPU_BYTE cpuPPCInit_stw[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2}; CPU_BYTE cpuPPCInit_stwu[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,1,2,2}; CPU_BYTE cpuPPCInit_mr[32] = {0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,1,2,2,2,2,2,2,2,2,0,1,1,1,1,1,2,2}; + + +/* +CPU_BYTE cpuPPCInit_stw[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2}; +CPU_BYTE cpuPPCInit_stwu[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,1,2,2}; +CPU_BYTE cpuPPCInit_mr[32] = {0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,1,2,2,2,2,2,2,2,2,0,1,1,1,1,1,2,2}; + +00: 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,1,2,2 stwu r1,-32(r1) +04: 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2 stw r31,28(r1) +08: 0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,1,2,2,2,2,2,2,2,2,0,1,1,1,1,1,2,2 mr r31,r1 +0c: 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2 stw r3,8(r31) +10: 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,0,0,0,2,2 lwz r9,8(r31) +*/ /* mask */ /* * no mask we implement function getting the reg right Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Sun Jan 21 18:06:57 2007 @@ -110,7 +110,7 @@ return -1; } pMyBrainAnalys->op = OP_ANY_mov; - pMyBrainAnalys->type= 2 + 8 + 16; /* 8 dst reg, 2 src reg */ + pMyBrainAnalys->type= 2 + 8; /* 8 dst reg, 2 src reg */ pMyBrainAnalys->src_size = 32; pMyBrainAnalys->src = PPC_GetBitArraySrcReg(opcode); pMyBrainAnalys->dst = PPC_GetBitArrayBto31xx(opcode);

1 0

[fireball] 25552: [AUDIT] (thanks to "Ventron" for help in checking this file) Result: clean, reasons: 1) Alex cites legal sources for his magic numbers 2) The callers to the Hal don't know what they want to ask the Hal for (they pass NULLs) 3) It looks a bit incomplete in general
by fireball＠svn.reactos.org 21 Jan '07

21 Jan '07

Author: fireball Date: Sun Jan 21 14:38:05 2007 New Revision: 25552 URL: http://svn.reactos.org/svn/reactos?rev=25552&view=rev Log: [AUDIT] (thanks to "Ventron" for help in checking this file) Result: clean, reasons: 1) Alex cites legal sources for his magic numbers 2) The callers to the Hal don't know what they want to ask the Hal for (they pass NULLs) 3) It looks a bit incomplete in general Modified: trunk/reactos/ntoskrnl/ke/profile.c (props changed) Propchange: trunk/reactos/ntoskrnl/ke/profile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 25551: comment out packmgr for it can not be build at moment. some should take a look at it.
by greatlrd＠svn.reactos.org 21 Jan '07

21 Jan '07

Author: greatlrd Date: Sun Jan 21 14:32:28 2007 New Revision: 25551 URL: http://svn.reactos.org/svn/reactos?rev=25551&view=rev Log: comment out packmgr for it can not be build at moment. some should take a look at it. Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=25551… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sun Jan 21 14:32:28 2007 @@ -30,9 +30,11 @@ <xi:include href="notevil/notevil.rbuild" /> </directory> + <directory name="sysutils"> <xi:include href="sysutils/sysutils.rbuild" />

1 0

21 Jan '07

Author: dcote Date: Sun Jan 21 07:46:38 2007 New Revision: 25550 URL: http://svn.reactos.org/svn/reactos?rev=25550&view=rev Log: =================================================================== cctypes.h ntoskrnl/cc/copy.c =================================================================== Added CcFastMdlReadNotPossible =================================================================== fastio.c =================================================================== Added #ifdef to allow the file to compile "as is" in my windows framework. This doesnt affect RosBE Brought back Alex's code for FsRtlMdlReadCompleteDev FsRtlMdlReadDev FsRtlMdlReadComplete after having code reviewed it. =================================================================== ntoskrnl/include/internal/cc.h ntoskrnl/cc/mdl.c =================================================================== Change the name of CcMdlReadCompleteDev to CcMdlReadComplete2 Modified: trunk/reactos/include/ndk/cctypes.h trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/mdl.c trunk/reactos/ntoskrnl/fsrtl/fastio.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cctypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cctypes.h (original) +++ trunk/reactos/include/ndk/cctypes.h Sun Jan 21 07:46:38 2007 @@ -33,6 +33,7 @@ extern ULONG NTSYSAPI CcFastReadWait; extern ULONG NTSYSAPI CcFastReadResourceMiss; extern ULONG NTSYSAPI CcFastReadNoWait; +extern ULONG NTSYSAPI CcFastMdlReadNotPossible; #ifdef _NTIFS_INCLUDED_ Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=255… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c (original) +++ trunk/reactos/ntoskrnl/cc/copy.c Sun Jan 21 07:46:38 2007 @@ -30,11 +30,11 @@ #endif ULONG CcFastMdlReadWait; +ULONG CcFastMdlReadNotPossible; ULONG CcFastReadNotPossible; ULONG CcFastReadWait; ULONG CcFastReadNoWait; ULONG CcFastReadResourceMiss; - /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/mdl.c?rev=2555… ============================================================================== --- trunk/reactos/ntoskrnl/cc/mdl.c (original) +++ trunk/reactos/ntoskrnl/cc/mdl.c Sun Jan 21 07:46:38 2007 @@ -51,15 +51,15 @@ */ VOID STDCALL -CcMdlReadCompleteDev(IN PMDL MdlChain, +CcMdlReadComplete2(IN PMDL MemoryDescriptorList, IN PFILE_OBJECT FileObject) { PMDL Mdl; /* Free MDLs */ - while ((Mdl = MdlChain)) + while ((Mdl = MemoryDescriptorList)) { - MdlChain = Mdl->Next; + MemoryDescriptorList = Mdl->Next; MmUnlockPages(Mdl); IoFreeMdl(Mdl); } @@ -103,7 +103,7 @@ } /* Use slow path */ - CcMdlReadCompleteDev(MdlChain, FileObject); + CcMdlReadComplete2(MdlChain, FileObject); } /* Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c Sun Jan 21 07:46:38 2007 @@ -8,11 +8,18 @@ /* INCLUDES ******************************************************************/ +#ifdef _WINDOWS_TESTING +#include <ntifs.h> +#include "ntndk.h" +#include "fsrtl_glue.h" +#else #include <ntoskrnl.h> #define NDEBUG #include <debug.h> #include <ntifs.h> #include <cctypes.h> +#endif /* _WINDOWS_TESTING */ + /* PUBLIC FUNCTIONS **********************************************************/ @@ -708,30 +715,56 @@ return FALSE; } -/* - * @implemented - */ BOOLEAN NTAPI FsRtlMdlReadComplete(IN PFILE_OBJECT FileObject, IN OUT PMDL MdlChain) { - KEBUGCHECK(0); - return FALSE; -} - -/* - * @implemented - */ -BOOLEAN -NTAPI + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlReadComplete) + { + /* Use the fast path */ + return FastDispatch->MdlReadComplete(FileObject, + MdlChain, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if ((BaseDeviceObject != DeviceObject) && FastDispatch + && FastDispatch->MdlReadComplete) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlReadCompleteDev(FileObject, MdlChain, DeviceObject); +} + +/* + * @implemented + */ + BOOLEAN + NTAPI FsRtlMdlReadCompleteDev(IN PFILE_OBJECT FileObject, - IN PMDL MdlChain, + IN PMDL MemoryDescriptorList, IN PDEVICE_OBJECT DeviceObject) { - KEBUGCHECK(0); - return FALSE; -} + /* Call the Cache Manager */ + CcMdlReadComplete2(MemoryDescriptorList, FileObject); + return TRUE; +} + /* * @implemented @@ -746,8 +779,114 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { - KEBUGCHECK(0); - return FALSE; + PFSRTL_COMMON_FCB_HEADER FcbHeader; + BOOLEAN Result = TRUE; + LARGE_INTEGER Offset; + PFAST_IO_DISPATCH FastIoDispatch; + PDEVICE_OBJECT Device; + PAGED_CODE(); + + /* No actual read */ + if (!Length) + { + /* Return success */ + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = 0; + return TRUE; + } + + /* Sanity check */ + ASSERT(MAXLONGLONG - FileOffset->QuadPart >= (LONGLONG)Length); + + /* Get the offset and FCB header */ + Offset.QuadPart = FileOffset->QuadPart + Length; + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext; + + /* Enter the FS */ + FsRtlEnterFileSystem(); + CcFastMdlReadWait++; + + /* Lock the FCB */ + ExAcquireResourceShared(FcbHeader->Resource, TRUE); + + /* Check if this is a fast I/O cached file */ + if (!(FileObject->PrivateCacheMap) || + (FcbHeader->IsFastIoPossible == FastIoIsNotPossible)) + { + /* It's not, so fail */ + CcFastMdlReadNotPossible += 1; + Result = FALSE; + goto Cleanup; + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + FileOffset, + Length, + TRUE, + LockKey, + TRUE, + IoStatus, + Device)) + { + /* It's not, fail */ + CcFastMdlReadNotPossible += 1; + Result = FALSE; + goto Cleanup; + } + } + + /* Check if we read too much */ + if (Offset.QuadPart > FcbHeader->FileSize.QuadPart) + { + /* We did, check if the file offset is past the end */ + if (FileOffset->QuadPart >= FcbHeader->FileSize.QuadPart) + { + /* Set end of file */ + IoStatus->Status = STATUS_END_OF_FILE; + IoStatus->Information = 0; + goto Cleanup; + } + + /* Otherwise, just normalize the length */ + Length = (ULONG)(FcbHeader->FileSize.QuadPart - FileOffset->QuadPart); + } + + /* Set this as top-level IRP */ + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + _SEH_TRY + { + /* Attempt a read */ + CcMdlRead(FileObject, FileOffset, Length, MdlChain, IoStatus); + FileObject->Flags |= FO_FILE_FAST_IO_READ; + } + _SEH_EXCEPT(FsRtlCcCopyFilter) + { + Result = FALSE; + } _SEH_END; + + + /* Remove the top-level IRP flag */ + PsGetCurrentThread()->TopLevelIrp = 0; + + /* Return to caller */ +Cleanup: + ExReleaseResourceLite(FcbHeader->Resource); + FsRtlExitFileSystem(); + return Result; } /* Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h Sun Jan 21 07:46:38 2007 @@ -63,8 +63,8 @@ VOID NTAPI -CcMdlReadCompleteDev( - IN PMDL MdlChain, +CcMdlReadComplete2( + IN PMDL MemoryDescriptorList, IN PFILE_OBJECT FileObject );

1 0

[dcote] 25549: Initial commit for the fsrtl lib test driver. This does not compile under ROS. You need some glue to compile and use it under windows.
by dcote＠svn.reactos.org 20 Jan '07

20 Jan '07

Author: dcote Date: Sat Jan 20 21:06:23 2007 New Revision: 25549 URL: http://svn.reactos.org/svn/reactos?rev=25549&view=rev Log: Initial commit for the fsrtl lib test driver. This does not compile under ROS. You need some glue to compile and use it under windows. Added: trunk/reactos/ntoskrnl/tests/fsrtl.c Added: trunk/reactos/ntoskrnl/tests/fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/fsrtl.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/tests/fsrtl.c (added) +++ trunk/reactos/ntoskrnl/tests/fsrtl.c Sat Jan 20 21:06:23 2007 @@ -1,0 +1,366 @@ +#include <ntifs.h> +#include "ntndk.h" +#include "fsrtl_glue.h" + +#include "fastio.h" +#include "fsrtl.h" + +/* + This is the main test function. It is called from DriverEntry. + + There is a DbgBreakPoint() call at the beginning of DriverEntry. + In order to run the test again, simply type + net stop fsrtl + net start fsrtl + + Author: Dom Cote +*/ + +BOOLEAN FsRtlTest_StartTest() { + HANDLE Fh = NULL; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Return = TRUE; + PFILE_OBJECT Pfo; + LONGLONG i = 0; + + PCHAR Buffer; + + LARGE_INTEGER Offset; + ULONG Length = 0; + LARGE_INTEGER OldSize; + + /* Parameters we are going to use in the test from the FCB */ + PFSRTL_COMMON_FCB_HEADER FcbHeader; + PLARGE_INTEGER AllocationSize; + PLARGE_INTEGER ValidDataLength; + PLARGE_INTEGER FileSize; + + /* Allocate a 100KB buffer to do IOs */ + Buffer = ExAllocatePool(PagedPool,100*_1KB); + + FsRtlTest_OpenTestFile(&Fh, &Pfo); + + /* Extract the test variable from the FCB struct */ + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)Pfo->FsContext; + AllocationSize = &FcbHeader->AllocationSize; + ValidDataLength = &FcbHeader->ValidDataLength; + FileSize = &FcbHeader->FileSize; + + /* Try to cache without caching having been initialized. This should fail.*/ + Length = 10*_1KB; + FSRTL_TEST("No cache map test.",!FsRtlCopyWrite(Pfo,AllocationSize,Length,TRUE,0,Buffer,&IoStatus,NULL)); + + /* We are going to build a 100k file */ + /* This will inititate caching and build some size */ + Offset.QuadPart = 0; + Length = 100*_1KB; + Return = FsRltTest_WritefileZw(Fh,&Offset,Length, Buffer, &IoStatus); + FSRTL_TEST("Building 100k filesize.",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + /* Extending the file by 1/2 sector, 256 bytes. */ + Offset.QuadPart = 0x7fffffffffff; + Length = 0x100; + Return = FsRltTest_WritefileZw(Fh,NULL,Length, Buffer, &IoStatus); + FSRTL_TEST("Extending by 1/2 sector.",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + /* Append to the file past the allocation size*/ + Offset.LowPart = 0xFFFFFFFF; + Offset.HighPart = 0xFFFFFFFF; + OldSize.QuadPart = FileSize->QuadPart; + Length = (ULONG) (AllocationSize->QuadPart -ValidDataLength->QuadPart); + FSRTL_TEST("Testing extending past allocation size",!FsRtlCopyWrite(Pfo,&Offset,Length+1,TRUE,0,Buffer,&IoStatus,NULL)); + FSRTL_TEST("Testing extending not past allocation size",FsRtlCopyWrite(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL)); + FSRTL_TEST("Check filesize",(FileSize->QuadPart = (OldSize.QuadPart+Length))); + + /* Try do write a 65kb IO and check that if fails. Maximum IO size for thus function is 64KB */ + Offset.QuadPart = 0; + Length = 65*_1KB; + FSRTL_TEST("65KB IO Test",!FsRtlCopyWrite(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL)); + + /* Try do write a 64kb IO. Maximum IO size for thus function is 64KB */ + Length = 64*_1KB; + FSRTL_TEST("64KB IO Test",FsRtlCopyWrite(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL)) + + /* Test the fast Io questionable flag + This test fails and should succeed. I am not sure why. When FsRtlCopyWrite() queries the FastIoTable of the related + device object, it comes back with no. + FcbHeader->IsFastIoPossible = FastIoIsQuestionable; + FSRTL_TEST("FastIo is questionable flag",FsRtlCopyWrite(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL)) + */ + + /* Test the fast Io not possible flag */ + FcbHeader->IsFastIoPossible = FastIoIsNotPossible; + FSRTL_TEST("FastIo is not possible flag",!FsRtlCopyWrite(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL)) + /* Set the flag back to what it was */ + FcbHeader->IsFastIoPossible = FastIoIsPossible; + FSRTL_TEST("FastIo is possbile flag",FsRtlCopyWrite(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL)) + + if (Pfo) + { + ObDereferenceObject(Pfo); + Pfo = NULL; + } + + if (Fh) + { + ZwClose(Fh); + Fh = NULL; + } + + + /* ------------------------------------------------------------------------*/ + /* ------------------------------------------------------------------------*/ + /* ------------------------------------------------------------------------*/ + + /* We are going to repeat the same bunch of tests but with Wait = FALSE. So we exercise the second part of the function. */ + FsRtlTest_OpenTestFile(&Fh, &Pfo); + + /* Extract the test variable from the FCB struct */ + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)Pfo->FsContext; + AllocationSize = &FcbHeader->AllocationSize; + ValidDataLength = &FcbHeader->ValidDataLength; + FileSize = &FcbHeader->FileSize; + + /* Try to cache without caching having been initialized. This should fail.*/ + Length = 10*_1KB; + FSRTL_TEST("No cache map test. Wait = FALSE",!FsRtlCopyWrite(Pfo,AllocationSize,Length,FALSE,0,Buffer,&IoStatus,NULL)); + + /* We are going to build a 100k file */ + /* This will inititate caching and build some size */ + Offset.QuadPart = 0; + Length = 100*_1KB; + Return = FsRltTest_WritefileZw(Fh,&Offset,Length, Buffer, &IoStatus); + FSRTL_TEST("Building 100k filesize. Wait = FALSE",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + /* Extending the file by 1/2 sector, 256 bytes. */ + Offset.QuadPart = 0x7fffffffffff; + Length = 0x100; + Return = FsRltTest_WritefileZw(Fh,NULL,Length, Buffer, &IoStatus); + FSRTL_TEST("Extending by 1/2 sector. Wait = FALSE",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + /* Append to the file past the allocation size*/ + Offset.LowPart = 0xFFFFFFFF; + Offset.HighPart = 0xFFFFFFFF; + OldSize.QuadPart = FileSize->QuadPart; + Length = (ULONG) (AllocationSize->QuadPart -ValidDataLength->QuadPart); + FSRTL_TEST("Testing extending past allocation size Wait = FALSE",!FsRtlCopyWrite(Pfo,&Offset,Length+1,FALSE,0,Buffer,&IoStatus,NULL)); + FSRTL_TEST("Testing extending not past allocation size. Wait = FALSE",FsRtlCopyWrite(Pfo,&Offset,Length,FALSE,0,Buffer,&IoStatus,NULL)); + FSRTL_TEST("Check filesize",(FileSize->QuadPart = (OldSize.QuadPart+Length))); + + /* Try do write a 65kb IO and check that if fails. Maximum IO size for thus function is 64KB */ + Offset.QuadPart = 0; + Length = 65*_1KB; + FSRTL_TEST("65KB IO Test. Wait = FALSE",!FsRtlCopyWrite(Pfo,&Offset,Length,FALSE,0,Buffer,&IoStatus,NULL)); + + /* Try do write a 64kb IO. Maximum IO size for thus function is 64KB */ + Length = 64*_1KB; + FSRTL_TEST("64KB IO Test. Wait = FALSE",FsRtlCopyWrite(Pfo,&Offset,Length,FALSE,0,Buffer,&IoStatus,NULL)) + + /* Test the fast Io questionable flag + This test fails and should succeed. I am not sure why. When FsRtlCopyWrite() queries the FastIoTable of the related + device object, it comes back with no. + FcbHeader->IsFastIoPossible = FastIoIsQuestionable; + FSRTL_TEST("FastIo is questionable flag",FsRtlCopyWrite(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL)) + */ + + /* Test the fast Io not possible flag */ + FcbHeader->IsFastIoPossible = FastIoIsNotPossible; + FSRTL_TEST("FastIo is not possible flag. Wait = FALSE",!FsRtlCopyWrite(Pfo,&Offset,Length,FALSE,0,Buffer,&IoStatus,NULL)) + /* Set the flag back to what it was */ + FcbHeader->IsFastIoPossible = FastIoIsPossible; + FSRTL_TEST("FastIo is possbile flag. Wait = FALSE",FsRtlCopyWrite(Pfo,&Offset,Length,FALSE,0,Buffer,&IoStatus,NULL)) + + + /* ------------------------------------------------------------------------------------------ + ------------------------------------------------------------------------------------------ + ------------------------------------------------------------------------------------------ + */ + + /* Testing FsRtlCopyRead() function */ + + Offset.LowPart = 0x0; + Offset.HighPart = 0x0; + Length = 0x10000; + + /* Testing a 64KB read with Wait = TRUE */ + Return = FsRtlCopyRead(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL); + FSRTL_TEST("Testing 64k IO Wait=TRUE",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + /* Testing a 64KB read with Wait = FALSE */ + Return = FsRtlCopyRead(Pfo,&Offset,Length,FALSE,0,Buffer,&IoStatus,NULL); + FSRTL_TEST("Testing 64k IO Wait=FALSE",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + /* Testing read past the end of the file */ + Offset.QuadPart = FileSize->QuadPart - (5 * _1KB); + Length = 10 * _1KB; + Return = FsRtlCopyRead(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL); + FSRTL_TEST("Testing reading past end of file but starting before EOF",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status) && IoStatus.Information == (FileSize->QuadPart-Offset.QuadPart))); + + Offset.QuadPart = FileSize->QuadPart + 1; + Length = 10 * _1KB; + Return = FsRtlCopyRead(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL); + FSRTL_TEST("Testing reading past end of file but starting after EOF",(NT_SUCCESS(Return) && (IoStatus.Status == STATUS_END_OF_FILE) && IoStatus.Information == 0)); + + + /* Testing a 64KB read with Wait = TRUE */ + Offset.LowPart = 0x0; + Offset.HighPart = 0x0; + Length = 0x10000; + FcbHeader->IsFastIoPossible = FastIoIsNotPossible; + FSRTL_TEST("FastIo is not possible flag. Wait = FALSE",!FsRtlCopyRead(Pfo,&Offset,Length,FALSE,0,Buffer,&IoStatus,NULL)); + FSRTL_TEST("FastIo is not possible flag. Wait = TRUE",!FsRtlCopyRead(Pfo,&Offset,Length,TRUE,0,Buffer,&IoStatus,NULL)); + + Return = TRUE; + +Cleanup: + + if (Pfo) + { + ObDereferenceObject(Pfo); + Pfo = NULL; + } + + if (Fh) + { + ZwClose(Fh); + Fh = NULL; + } + + if (Buffer != NULL) { + ExFreePool(Buffer); + Buffer = NULL; + } + + return Return; + +} + +/* This function is just a wrapper around ZwWriteFile */ +NTSTATUS FsRltTest_WritefileZw(HANDLE fh, PLARGE_INTEGER Offset, ULONG Length, PVOID Buffer, PIO_STATUS_BLOCK pIoStatus){ + NTSTATUS Return; + + Return = ZwWriteFile( + fh, + NULL, + NULL, + NULL, + pIoStatus, + Buffer, + Length, + Offset, + NULL + ); + + return Return; +} + +/* This function fills the buffer with a test pattern */ +void FsRtlTest_FillBuffer(LARGE_INTEGER Start, ULONG Length, PVOID Buffer) { + ULONG i = 0; + PULONGLONG Index = (PULONGLONG) Buffer; + + for (i=0; i<Length/sizeof(ULONGLONG); i++) { + Index[i] = Start.QuadPart + i; + } + + return; + } + +/* This function opens a test file with the FILE_DELETE_ON_CLOSE flag + and reference the file object +*/ + NTSTATUS FsRtlTest_OpenTestFile(PHANDLE Pfh, PFILE_OBJECT *Ppfo) { + UNICODE_STRING FileName; + OBJECT_ATTRIBUTES oa; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Return; + + RtlInitUnicodeString(&FileName,L"\\??\\C:\\fsrtl.bin"); + + InitializeObjectAttributes( + &oa, + &FileName, + OBJ_KERNEL_HANDLE, + NULL, + NULL; + ); + + Return = IoCreateFile(Pfh, + GENERIC_WRITE, + &oa, + &IoStatus, + 0, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OVERWRITE_IF , + FILE_SYNCHRONOUS_IO_ALERT | FILE_DELETE_ON_CLOSE, + NULL, + 0, + CreateFileTypeNone, + NULL, + 0); + + Return = ObReferenceObjectByHandle( + *Pfh, + GENERIC_WRITE, + NULL, + KernelMode, + Ppfo, + NULL + ); +} + + +/* All the testing is done from driver entry */ +NTSTATUS DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ) +{ + PDEVICE_OBJECT DeviceObject; + NTSTATUS mStatus; + UNICODE_STRING uniName, uniDOSName; + PDEVOBJ_EXTENSION x; + + DbgPrint("Loading the FSRTL test driver.\n"); + DbgBreakPoint(); + + /* register device functions */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = FsRtlTest_DispatchCreateClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = FsRtlTest_DispatchCreateClose; + DriverObject->DriverUnload = FsRtlTest_Unload; + + if (!FsRtlTest_StartTest()) { + DbgPrint("FsRtl test failed.\n"); + } else { + DbgPrint("FsRtl test OK.\n"); + } + + return STATUS_SUCCESS; +} + + + + + + +NTSTATUS FsRtlTest_DispatchCreateClose( IN PDEVICE_OBJECT devObj, IN PIRP Irp ) +{ + DbgPrint(("FsRtl: Open / Close\n")); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( Irp, IO_NO_INCREMENT ); + + return STATUS_SUCCESS; +} + +VOID FsRtlTest_Unload( IN PDRIVER_OBJECT DriverObject ) +{ + DbgPrint(("FsRtl: Unloading.\n")); +} + +

1 0

[dcote] 25548: * Adding FsRtlCopyRead(), FsRtlCopyWrite() * Added #ifdef _NTIFS_INCLUDED_ typedef struct _SHARED_CACHE_MAP { definition to cctypes.h header file.
by dcote＠svn.reactos.org 20 Jan '07

20 Jan '07

Author: dcote Date: Sat Jan 20 20:43:46 2007 New Revision: 25548 URL: http://svn.reactos.org/svn/reactos?rev=25548&view=rev Log: * Adding FsRtlCopyRead(), FsRtlCopyWrite() * Added #ifdef _NTIFS_INCLUDED_ typedef struct _SHARED_CACHE_MAP { definition to cctypes.h header file. Modified: trunk/reactos/include/ndk/cctypes.h trunk/reactos/ntoskrnl/fsrtl/fastio.c Modified: trunk/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cctypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cctypes.h (original) +++ trunk/reactos/include/ndk/cctypes.h Sat Jan 20 20:43:46 2007 @@ -34,6 +34,56 @@ extern ULONG NTSYSAPI CcFastReadResourceMiss; extern ULONG NTSYSAPI CcFastReadNoWait; -#endif -#endif // _CCTYPES_H +#ifdef _NTIFS_INCLUDED_ + +typedef struct _SHARED_CACHE_MAP { + SHORT NodeTypeCode; + SHORT NodeByteSize; + ULONG OpenCount; + LARGE_INTEGER FileSize; + LIST_ENTRY BcbList; + LARGE_INTEGER SectionSize; + LARGE_INTEGER ValidDataLength; + LARGE_INTEGER ValidDataGoal; + PVACB InitialVacbs[4]; + PVACB Vacbs; + PFILE_OBJECT FileObject; + PVACB ActiveVacb; + PVOID NeedToZero; + ULONG ActivePage; + ULONG NeedToZeroPage; + ULONG ActiveVacbSpinLock; + ULONG VacbActiveCount; + ULONG DirtyPages; + LIST_ENTRY SharedCacheMapLinks; + ULONG Flags; + ULONG Status; + PMCB Mbcb; + PVOID Section; + PKEVENT CreateEvent; + PKEVENT WaitOnActiveCount; + ULONG PagesToWrite; + LONGLONG BeyondLastFlush; + PCACHE_MANAGER_CALLBACKS Callbacks; + PVOID LazyWriteContext; + PLIST_ENTRY PrivateList; + PVOID LogHandle; + PVOID FlushToLsnRoutine; + ULONG DirtyPageThreshold; + ULONG LazyWritePassCount; + PCACHE_UNINITIALIZE_EVENT UninitializeEvent; + PVACB NeedToZeroVacb; + ULONG BcbSpinLock; + PVOID Reserved; + KEVENT Event; + /* FIX ME: This should be PEX_PUSH_LOCK */ + PVOID VacbPushLock; + PPRIVATE_CACHE_MAP PrivateCacheMap; + } SHARED_CACHE_MAP; + + +#endif /* _NTIFS_INCLUDED_ */ +#endif /* NTOS_MODE_USER */ +#endif /* _CCTYPES_H */ + Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c Sat Jan 20 20:43:46 2007 @@ -11,6 +11,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> +#include <ntifs.h> +#include <cctypes.h> /* PUBLIC FUNCTIONS **********************************************************/ @@ -27,11 +29,21 @@ /* * @implemented */ +VOID +NTAPI +FsRtlIncrementCcFastReadNotPossible(VOID) +{ + CcFastReadNotPossible++; +} + +/* + * @implemented + */ VOID NTAPI -FsRtlIncrementCcFastReadNotPossible(VOID) -{ - CcFastReadNotPossible++; +FsRtlIncrementCcFastReadWait(VOID) +{ + CcFastReadWait++; } /* @@ -39,24 +51,25 @@ */ VOID NTAPI -FsRtlIncrementCcFastReadWait(VOID) -{ - CcFastReadWait++; -} - -/* - * @implemented - */ -VOID -NTAPI FsRtlIncrementCcFastReadNoWait(VOID) { CcFastReadNoWait++; } -/* - * @unimplemented - */ +_SEH_FILTER(FsRtlCcCopyFilter) +{ + LONG ExceptionDisposition; + + /* Check if this was an expected exception */ + ExceptionDisposition = FsRtlIsNtstatusExpected(_SEH_GetExceptionCode() ? + EXCEPTION_EXECUTE_HANDLER : + EXCEPTION_CONTINUE_SEARCH); + + /* Continue execution if we expected it, otherwise fail the call */ + return ExceptionDisposition; +} + + BOOLEAN NTAPI FsRtlCopyRead(IN PFILE_OBJECT FileObject, @@ -68,13 +81,162 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { - KEBUGCHECK(0); - return FALSE; -} - -/* - * @unimplemented - */ + + PFSRTL_COMMON_FCB_HEADER FcbHeader; + LARGE_INTEGER Offset; + PFAST_IO_DISPATCH FastIoDispatch; + PDEVICE_OBJECT Device; + BOOLEAN Result = TRUE; + ULONG PageCount = COMPUTE_PAGES_SPANNED(FileOffset,Length); + + PAGED_CODE(); + ASSERT(FileObject); + ASSERT(FileObject->FsContext); + + /* No actual read */ + if (!Length) + { + /* Return success */ + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = 0; + return TRUE; + } + + if (MAXLONGLONG < (LONGLONG) FileOffset->QuadPart + Length) { + IoStatus->Status = STATUS_INVALID_PARAMETER; + IoStatus->Information = 0; + return FALSE; + } + + /* Get the offset and FCB header */ + Offset.QuadPart = FileOffset->QuadPart + Length; + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext; + + + if (Wait) { + /* Use a Resource Acquire */ + FsRtlEnterFileSystem(); + CcFastReadWait++; + ExAcquireResourceSharedLite(FcbHeader->Resource, TRUE); + } else { + /* Acquire the resource without blocking */ + /* Return false and the I/O manager will retry using the standard IRP method. */ + /* Use a Resource Acquire */ + FsRtlEnterFileSystem(); + if (!ExAcquireResourceSharedLite(FcbHeader->Resource, FALSE)) { + FsRtlExitFileSystem(); + FsRtlIncrementCcFastReadResourceMiss(); + return FALSE; + } + } + + + /* Check if this is a fast I/O cached file */ + if (!(FileObject->PrivateCacheMap) || + (FcbHeader->IsFastIoPossible == FastIoIsNotPossible)) { + /* It's not, so fail */ + Result = FALSE; + goto Cleanup; + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); + + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + FileOffset, + Length, + TRUE, + LockKey, + TRUE, + IoStatus, + Device)) + { + /* It's not, fail */ + Result = FALSE; + goto Cleanup; + } + } + + /* Check if we read too much */ + if (Offset.QuadPart > FcbHeader->FileSize.QuadPart){ + /* We did, check if the file offset is past the end */ + if (FileOffset->QuadPart >= FcbHeader->FileSize.QuadPart){ + /* Set end of file */ + IoStatus->Status = STATUS_END_OF_FILE; + IoStatus->Information = 0; + goto Cleanup; + } + + /* Otherwise, just normalize the length */ + Length = (ULONG)(FcbHeader->FileSize.QuadPart - FileOffset->QuadPart); + } + + /* Set this as top-level IRP */ + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + _SEH_TRY { + /* Make sure the IO and file size is below 4GB */ + if (Wait && !(Offset.HighPart | FcbHeader->FileSize.HighPart )) { + + /* Call the cache controller */ + CcFastCopyRead (FileObject,FileOffset->LowPart,Length,PageCount,Buffer,IoStatus); + /* File was accessed */ + FileObject->Flags |= FO_FILE_FAST_IO_READ; + if (IoStatus->Status != STATUS_END_OF_FILE) { + ASSERT(( FcbHeader->FileSize.QuadPart) >= (FileOffset->QuadPart + IoStatus->Information)); + } + + } else { + + /* Call the cache controller */ + Result = CcCopyRead(FileObject, FileOffset, Length, Wait,Buffer, IoStatus); + /* File was accessed */ + FileObject->Flags |= FO_FILE_FAST_IO_READ; + if (Result == TRUE) { + ASSERT( (IoStatus->Status == STATUS_END_OF_FILE) || + ((LONGLONG)(FileOffset->QuadPart + IoStatus->Information) <= FcbHeader->FileSize.QuadPart) + ); + } + } + + /* Update the current file offset */ + if (Result == TRUE) { + FileObject->CurrentByteOffset.QuadPart += IoStatus->Information; + } + } + _SEH_EXCEPT(FsRtlCcCopyFilter) { + Result = FALSE; + } _SEH_END; + + PsGetCurrentThread()->TopLevelIrp = 0; + + /* Return to caller */ +Cleanup: + + ExReleaseResourceLite(FcbHeader->Resource); + FsRtlExitFileSystem(); + + if (Result == FALSE) { + CcFastReadNotPossible += 1; + } + + return Result; + +} + + BOOLEAN NTAPI FsRtlCopyWrite(IN PFILE_OBJECT FileObject, @@ -86,9 +248,437 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { - KEBUGCHECK(0); - return FALSE; -} + + BOOLEAN Result = TRUE; + PFAST_IO_DISPATCH FastIoDispatch; + PDEVICE_OBJECT Device; + PFSRTL_COMMON_FCB_HEADER FcbHeader; + + /* WDK doc. Offset=0xffffffffffffffff indicates append to the end of file */ + BOOLEAN FileOffsetAppend = ((FileOffset->HighPart == 0xffffffff) && (FileOffset->LowPart == 0xffffffff)); + BOOLEAN ResourceAquiredShared = FALSE; + + BOOLEAN b_4GB = FALSE; + + BOOLEAN FileSizeModified = FALSE; + LARGE_INTEGER OldFileSize; + LARGE_INTEGER OldValidDataLength; + + LARGE_INTEGER NewSize; + LARGE_INTEGER Offset; + + PAGED_CODE(); + + ASSERT(FileObject); + ASSERT(FileObject->FsContext); + + /* Initialize some of the vars and pointers */ + NewSize.QuadPart = 0; + Offset.QuadPart = FileOffset->QuadPart + Length; + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext; + + /* Nagar p.544 -- Check with Cc if we can write and check if the IO > 64kB (WDK macro) */ + if ( (CcCanIWrite(FileObject, Length,Wait, FALSE) == FALSE) || + (CcCopyWriteWontFlush(FileObject,FileOffset,Length) == FALSE) || + ((FileObject->Flags & FO_WRITE_THROUGH )== TRUE) + ) + { + return FALSE; + } + + /* No actual read */ + if (!Length) + { + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = Length; + return TRUE; + } + + FsRtlEnterFileSystem(); + + /* Nagar p.544/545 -- The CcFastCopyWrite doesn't deal with filesize beyond 4GB*/ + if (Wait && (FcbHeader->AllocationSize.HighPart == 0)) + { + /* If the file offset is not past the file size, then we can acquire the lock shared */ + if ((FileOffsetAppend == FALSE) && (Offset.LowPart <= FcbHeader->ValidDataLength.LowPart)){ + ExAcquireResourceSharedLite(FcbHeader->Resource,TRUE); + ResourceAquiredShared = TRUE; + } else { + ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); + } + + /* Nagar p.544/545 -- If we append, use the file size as offset. Also, check that we aren't crossing the 4GB boundary */ + if ((FileOffsetAppend == TRUE)) { + Offset.LowPart = FcbHeader->FileSize.LowPart; + NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; + b_4GB = (NewSize.LowPart < FcbHeader->FileSize.LowPart); + + } else { + Offset.LowPart = FileOffset->LowPart; + NewSize.LowPart = FileOffset->LowPart + Length; + b_4GB = ((NewSize.LowPart < FileOffset->LowPart) || (FileOffset->HighPart != 0)); + } + + /* Nagar p.544/545 + Make sure that caching is initated. + That fast are allowed for this file stream. + That we are not extending past the allocated size + That we are not creating a hole bigger than 8k + That we are not crossing the 4GB boundary + */ + if ( (FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && + (Offset.LowPart < (FcbHeader->ValidDataLength.LowPart + 0x2000) ) && + !b_4GB + ) + { + /* If we are extending past the file size, we need to release the lock and acquire it + exclusively, because we are going to need to update the FcbHeader */ + if (ResourceAquiredShared && (NewSize.LowPart > (FcbHeader->ValidDataLength.LowPart + 0x2000))) { + /* Then we need to acquire the resource exclusive */ + ExReleaseResourceLite(FcbHeader->Resource); + ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); + if (FileOffsetAppend == TRUE) { + Offset.LowPart = FcbHeader->FileSize.LowPart; // ?? + NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; + /* Make sure we don't cross the 4GB boundary */ + b_4GB = (NewSize.LowPart < Offset.LowPart); + } + + /* Recheck some of the conditions since we let the lock go */ + if ( (FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && + (FcbHeader->AllocationSize.HighPart == 0) && + !b_4GB + ) { + } else { + goto FailAndCleanup; + } + } + + }else { + goto FailAndCleanup; + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; + + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); + + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + FileOffsetAppend? &FcbHeader->FileSize:FileOffset, + Length, + TRUE, + LockKey, + FALSE, + &FastIoCheckIfPossibleStatus, + Device)) + { + /* It's not, fail */ + goto FailAndCleanup; + } + } + + /* If we are going to extend the file then save the old file size + in case the operation fails + */ + if (NewSize.LowPart > FcbHeader->FileSize.LowPart) { + FileSizeModified = TRUE; + OldFileSize.LowPart = FcbHeader->FileSize.LowPart; + OldValidDataLength.LowPart = FcbHeader->ValidDataLength.LowPart; + FcbHeader->FileSize.LowPart = NewSize.LowPart; + } + + /* Set this as top-level IRP */ + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + _SEH_TRY { + if (Offset.LowPart > FcbHeader->ValidDataLength.LowPart) { + LARGE_INTEGER OffsetVar; + OffsetVar.LowPart = Offset.LowPart; + OffsetVar.HighPart = 0; + CcZeroData(FileObject,&FcbHeader->ValidDataLength,&OffsetVar,TRUE); + } + + /* Call the cache manager */ + CcFastCopyWrite(FileObject,Offset.LowPart,Length,Buffer); + } + _SEH_EXCEPT(FsRtlCcCopyFilter) { + Result = FALSE; + } _SEH_END; + + /* Remove ourselves at the top level component after the IO is done */ + PsGetCurrentThread()->TopLevelIrp = 0; + + /* Did the operation succeed ? */ + if (Result == TRUE) { + /* Update the valid file size if necessary */ + if (NewSize.LowPart > FcbHeader->ValidDataLength.LowPart){ + FcbHeader->ValidDataLength.LowPart = NewSize.LowPart ; + } + + /* Flag the file as modified */ + FileObject->Flags |= FO_FILE_MODIFIED; + + /* Update the strucutres if the file size changed */ + if (FileSizeModified) { + ((SHARED_CACHE_MAP*) FileObject->SectionObjectPointer->SharedCacheMap)->FileSize.LowPart = NewSize.LowPart; + FileObject->Flags |= FO_FILE_SIZE_CHANGED; + } + + /* Update the file object current file offset */ + FileObject->CurrentByteOffset.QuadPart = NewSize.LowPart; + + } else { + + /* Result == FALSE if we get here. */ + if (FileSizeModified) { + /* If the file size was modified then restore the old file size */ + if(FcbHeader->PagingIoResource != NULL) { + // Nagar P.544 Restore the old file size if operation didn't succeed. + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource,TRUE); + FcbHeader->FileSize.LowPart = OldFileSize.LowPart; + FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); + } else { + /* If there is no lock and do it without */ + FcbHeader->FileSize.LowPart = OldFileSize.LowPart; + FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; + } + } else { + } + } + + goto Cleanup; + + } else { + + LARGE_INTEGER OldFileSize; + + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); + + // Nagar P.544 + /* Check if we need to acquire the resource exclusive */ + if ( (FileOffsetAppend == FALSE) && + ( (FileOffset->QuadPart + Length) <= FcbHeader->ValidDataLength.QuadPart ) + ) + { + /* Acquire the resource shared */ + if (!ExAcquireResourceSharedLite(FcbHeader->Resource,Wait)) { + goto FailAndCleanup; + } + ResourceAquiredShared =TRUE; + } else { + /* Acquire the resource exclusive */ + if (!ExAcquireResourceExclusiveLite(FcbHeader->Resource,Wait)) { + goto FailAndCleanup; + } + } + + /* Check if we are appending */ + if (FileOffsetAppend == TRUE) { + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + } else { + Offset.QuadPart = FileOffset->QuadPart; + NewSize.QuadPart += FileOffset->QuadPart + Length; + } + + /* Nagar p.544/545 + Make sure that caching is initated. + That fast are allowed for this file stream. + That we are not extending past the allocated size + That we are not creating a hole bigger than 8k + */ + if ( (FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + ((FcbHeader->ValidDataLength.QuadPart + 0x2000) > Offset.QuadPart) && + (MAXLONGLONG > (Offset.QuadPart + Length)) && + (FcbHeader->AllocationSize.QuadPart >= NewSize.QuadPart) + ) + { + /* Check if we can keep the lock shared */ + if (ResourceAquiredShared && (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart) ) { + ExReleaseResourceLite(FcbHeader->Resource); + if(!ExAcquireResourceExclusiveLite(FcbHeader->Resource,Wait)) { + goto LeaveCriticalAndFail; + } + + /* Compute the offset and the new filesize */ + if (FileOffsetAppend) { + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + } + + /* Recheck the above points since we released and reacquire the lock */ + if ( (FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + (FcbHeader->AllocationSize.QuadPart > NewSize.QuadPart) + ) { + /* Do nothing */ + } else { + goto FailAndCleanup; + } + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; + + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); + + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + FileOffsetAppend? &FcbHeader->FileSize:FileOffset, + Length, + TRUE, + LockKey, + FALSE, + &FastIoCheckIfPossibleStatus, + Device)) + { + /* It's not, fail */ + goto FailAndCleanup; + } + } + + + /* If we are going to modify the filesize, save the old fs in case the operation fails */ + if (NewSize.QuadPart > FcbHeader->FileSize.QuadPart) { + FileSizeModified = TRUE; + OldFileSize.QuadPart = FcbHeader->FileSize.QuadPart; + OldValidDataLength.QuadPart = FcbHeader->ValidDataLength.QuadPart; + + /* If the high part of the filesize is going to change, grab the Paging IoResouce */ + if (NewSize.HighPart != FcbHeader->FileSize.HighPart && FcbHeader->PagingIoResource) { + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); + } else { + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + } + } + + /* Nagar p.544 */ + /* Set ourselves as top component */ + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + _SEH_TRY { + BOOLEAN CallCc = TRUE; + /* Check if there is a gap between the end of the file and the offset + If yes, then we have to zero the data + */ + if (Offset.QuadPart > FcbHeader->ValidDataLength.QuadPart) { + if (!(Result = CcZeroData(FileObject,&FcbHeader->ValidDataLength,&Offset,Wait))) { + /* If this operation fails, then we have to exit + We can jump outside the SEH, so I a using a variable to exit + normally + */ + CallCc = FALSE; + } + } + + /* Unless the CcZeroData failed, call the cache manager */ + if (CallCc) { + Result = CcCopyWrite(FileObject,&Offset,Length, Wait, Buffer); + } + }_SEH_EXCEPT(FsRtlCcCopyFilter) { + Result = FALSE; + } _SEH_END; + + /* Reset the top component */ + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + /* Did the operation suceeded */ + if (Result) { + /* Check if we need to update the filesize */ + if (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart) { + if (NewSize.HighPart != FcbHeader->ValidDataLength.HighPart && FcbHeader->PagingIoResource) { + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); + } else { + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + } + + /* Flag the file as modified */ + FileObject->Flags |= FO_FILE_MODIFIED; + /* Check if the filesize has changed */ + if (FileSizeModified) { + /* Update the file sizes */ + ((SHARED_CACHE_MAP*) FileObject->SectionObjectPointer->SharedCacheMap)->FileSize.QuadPart = NewSize.QuadPart; + FileObject->Flags |= FO_FILE_SIZE_CHANGED; + } + /* Update the current FO byte offset */ + FileObject->CurrentByteOffset.QuadPart = NewSize.QuadPart; + } + } + else + { + /* The operation did not succeed + Reset the file size to what it should be + */ + if (FileSizeModified) { + if (FcbHeader->PagingIoResource) { + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); + }else{ + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + } + } + } + goto Cleanup; + } else { + goto FailAndCleanup; + } + + ASSERT(0); + } + +LeaveCriticalAndFail: + FsRtlExitFileSystem(); + return FALSE; + + +FailAndCleanup: + + ExReleaseResourceLite(FcbHeader->Resource); + FsRtlExitFileSystem(); + return FALSE; + +Cleanup: + + ExReleaseResourceLite(FcbHeader->Resource); + FsRtlExitFileSystem(); + return Result; +} /* * @implemented

1 0

[fireball] 25547: Merge 25454, 25455, 25457, 25458.
by fireball＠svn.reactos.org 20 Jan '07

20 Jan '07

Author: fireball Date: Sat Jan 20 18:29:52 2007 New Revision: 25547 URL: http://svn.reactos.org/svn/reactos?rev=25547&view=rev Log: Merge 25454, 25455, 25457, 25458. Modified: branches/ros-branch-0_3_1/reactos/lib/rtl/unicode.c branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/dependencymap.h Modified: branches/ros-branch-0_3_1/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/lib/rt… ============================================================================== --- branches/ros-branch-0_3_1/reactos/lib/rtl/unicode.c (original) +++ branches/ros-branch-0_3_1/reactos/lib/rtl/unicode.c Sat Jan 20 18:29:52 2007 @@ -2105,7 +2105,7 @@ if (SourceString == NULL || DestinationString == NULL || SourceString->Length > SourceString->MaximumLength || (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) || - Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4 || Flags < 0) { + Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4) { return STATUS_INVALID_PARAMETER; } Modified: branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp (original) +++ branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp Sat Jan 20 18:29:52 2007 @@ -23,6 +23,7 @@ #include <fstream> #include <string> #include <vector> +#include <map> #include <stdio.h> @@ -31,6 +32,7 @@ using std::string; using std::vector; +using std::map; using std::ifstream; #ifdef OUT @@ -83,15 +85,18 @@ remove ( "dependencymap.xml" ); } + void DepMapBackend::_generate_depmap ( FILE* OUT ) { - /* add dependencies */ + + typedef map<string, module_data*> ModuleMap; + ModuleMap module_map; + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) { Module& module = *ProjectNode.modules[i]; - if ((module.type != Iso) && (module.type != LiveIso) && (module.type != IsoRegTest) && @@ -100,6 +105,21 @@ vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); ifs_list.push_back ( &module.non_if_data ); + + module_data * current_data; + ModuleMap::iterator mod_it = module_map.find ( module.name ); + if (mod_it != module_map.end ()) + { + current_data = mod_it->second; + } + else + { + current_data = new module_data(); + if (current_data) + { + module_map.insert (std::make_pair<string, module_data*>(module.name, current_data)); + } + } while ( ifs_list.size() ) { const IfableData& data = *ifs_list.back(); @@ -107,15 +127,68 @@ const vector<Library*>& libs = data.libraries; for ( size_t j = 0; j < libs.size(); j++ ) { - //add module.name and libs[j]->name + ModuleMap::iterator it = module_map.find ( libs[j]->name ); + + if ( it != module_map.end ()) + { + module_data * data = it->second; + data->references.push_back ( module.name ); + } + else + { + module_data * data = new module_data(); + if ( data ) + { + data->references.push_back ( module.name ); + } + module_map.insert ( std::make_pair<string, module_data*>( libs[j]->name, data ) ); + } + current_data->libraries.push_back ( libs[j]->name ); } } } } - -/* save data to file - fprintf ( OUT, "\r\n" ); -*/ + + fprintf ( m_DepMapFile, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\r\n" ); + fprintf ( m_DepMapFile, "<?xml-stylesheet type=\"text/xsl\" href=\"depmap.xsl\"?>\r\n" ); + fprintf ( m_DepMapFile, "<components>" ); + + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) + { + Module& module = *ProjectNode.modules[i]; + + ModuleMap::iterator it = module_map.find ( module.name ); + if ( it != module_map.end () ) + { + module_data * data = it->second; + + fprintf ( m_DepMapFile, "<component name=\"%s\" base=\"%s\" ref_count=\"%u\" library_count=\"%u\">\r\n", module.name.c_str(), module.GetBasePath ().c_str (), data->references.size (), data->libraries.size () ); + + if ( data->references.size () ) + { + fprintf ( m_DepMapFile, "\t<references>\r\n" ); + for ( size_t j = 0; j < data->references.size (); j++ ) + { + fprintf ( m_DepMapFile, "\t\t<reference name =\"%s\" />\r\n", data->references[j].c_str () ); + } + fprintf ( m_DepMapFile, "\t</references>\r\n" ); + } + + if ( data->libraries.size () ) + { + fprintf ( m_DepMapFile, "\t<libraries>\r\n" ); + for ( size_t j = 0; j < data->libraries.size (); j++ ) + { + fprintf ( m_DepMapFile, "\t\t<library name =\"%s\" />\r\n", data->libraries[j].c_str () ); + } + fprintf ( m_DepMapFile, "\t</libraries>\r\n" ); + } + + fprintf ( m_DepMapFile, "</component>\r\n" ); + } + } + + fprintf ( m_DepMapFile, "</components>" ); } Modified: branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/dependencymap.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/dependencymap.h (original) +++ branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/dependencymap.h Sat Jan 20 18:29:52 2007 @@ -50,6 +50,17 @@ void _generate_depmap ( FILE* OUT ); void _clean_project_files ( void ); + struct module_data + { + std::vector <std::string> libraries; + std::vector <std::string> references; + + module_data() + {} + ~module_data() + {} + }; + };

1 0

[fireball] 25546: Merge 25429:25431, 25437, 25441:25443.
by fireball＠svn.reactos.org 20 Jan '07

20 Jan '07

Author: fireball Date: Sat Jan 20 18:15:54 2007 New Revision: 25546 URL: http://svn.reactos.org/svn/reactos?rev=25546&view=rev Log: Merge 25429:25431, 25437, 25441:25443. Added: branches/ros-branch-0_3_1/reactos/base/shell/cmd/it-IT.rc - copied unchanged from r25443, trunk/reactos/base/shell/cmd/it-IT.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/it.rc - copied unchanged from r25443, trunk/reactos/dll/cpl/intl/it.rc branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/It.rc - copied unchanged from r25443, trunk/reactos/dll/cpl/liccpa/It.rc branches/ros-branch-0_3_1/reactos/dll/cpl/main/It.rc - copied unchanged from r25443, trunk/reactos/dll/cpl/main/It.rc branches/ros-branch-0_3_1/reactos/dll/keyboard/kbdth/ - copied from r25431, trunk/reactos/dll/keyboard/kbdth/ branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/ - copied from r25431, trunk/reactos/tools/rbuild/backend/dependencymap/ Modified: branches/ros-branch-0_3_1/reactos/Makefile branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.rc branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesys.inf branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff branches/ros-branch-0_3_1/reactos/boot/bootdata/txtsetup.sif branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/liccpa.rc branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc branches/ros-branch-0_3_1/reactos/dll/keyboard/keyboard.rbuild branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.h branches/ros-branch-0_3_1/reactos/tools/rbuild/rbuild.mak branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.cpp branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.h branches/ros-branch-0_3_1/reactos/tools/sysreg/pipe_reader.cpp branches/ros-branch-0_3_1/reactos/tools/sysreg/rosboot_test.cpp branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.cpp branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.mak branches/ros-branch-0_3_1/reactos/tools/sysreg/txtmode.cfg Modified: branches/ros-branch-0_3_1/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/Makefi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/Makefile (original) +++ branches/ros-branch-0_3_1/reactos/Makefile Sat Jan 20 18:15:54 2007 @@ -429,6 +429,10 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) cb +.PHONY: depmap +depmap: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) depmap .PHONY: msvc msvc: $(RBUILD_TARGET) Modified: branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.rc Sat Jan 20 18:15:54 2007 @@ -17,6 +17,7 @@ #include "hu-HU.rc" #include "nb-NO.rc" #include "uk-UA.rc" +#include "it-IT.rc" STRINGTABLE DISCARDABLE { Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesys.inf (original) +++ branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesys.inf Sat Jan 20 18:15:54 2007 @@ -57,6 +57,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout Text",0x00000000,"Russian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdse.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout File",0x00000000,"kbdth.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout Text",0x00000000,"Thai" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout File",0x00000000,"kbduk.dll" @@ -321,7 +323,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1" Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff (original) +++ branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff Sat Jan 20 18:15:54 2007 @@ -142,6 +142,7 @@ dll\keyboard\kbdse\kbdse.dll 1 dll\keyboard\kbdsg\kbdsg.dll 1 dll\keyboard\kbdsk\kbdsk.dll 1 +dll\keyboard\kbdth\kbdth.dll 1 dll\keyboard\kbduk\kbduk.dll 1 dll\keyboard\kbdur\kbdur.dll 1 dll\keyboard\kbdus\kbdus.dll 1 Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_1/reactos/boot/bootdata/txtsetup.sif (original) +++ branches/ros-branch-0_3_1/reactos/boot/bootdata/txtsetup.sif Sat Jan 20 18:15:54 2007 @@ -110,6 +110,7 @@ 0000041B = "Slovak (QWERTZ)" 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" +0000041E = "Thai (traditional)" 00000422 = "Ukrainian" [Files.KeyboardLayout] @@ -122,6 +123,7 @@ 0000040E = kbdhu.dll 00000419 = kbdru.dll 0000041D = kbdse.dll +0000041E = kbdth.dll 00000422 = kbdur.dll 00000809 = kbduk.dll 00000807 = kbdsg.dll Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc Sat Jan 20 18:15:54 2007 @@ -32,3 +32,4 @@ #include "Fr.rc" #include "ru.rc" #include "uk.rc" +#include "it.rc" Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/liccpa.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/liccpa.rc Sat Jan 20 18:15:54 2007 @@ -17,3 +17,4 @@ #include "Ja.rc" #include "Es.rc" #include "Ru.rc" +#include "It.rc" Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc Sat Jan 20 18:15:54 2007 @@ -19,3 +19,4 @@ #include "Ru.rc" #include "Uk.rc" #include "Cz.rc" +#include "It.rc" Modified: branches/ros-branch-0_3_1/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/ke… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/keyboard/keyboard.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/dll/keyboard/keyboard.rbuild Sat Jan 20 18:15:54 2007 @@ -35,6 +35,9 @@ <directory name="kbdsk"> <xi:include href="kbdsk/kbdsk.rbuild" /> </directory> + <directory name="kbdth"> + <xi:include href="kbdth/kbdth.rbuild" /> + </directory> <directory name="kbduk"> <xi:include href="kbduk/kbduk.rbuild" /> </directory> Modified: branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Sat Jan 20 18:15:54 2007 @@ -347,6 +347,7 @@ string CompilerVar; string baseaddr; string windres_defines; + string widl_options; string project_linker_flags = "-Wl,--enable-stdcall-fixup "; project_linker_flags += GenerateProjectLinkerFlags(); @@ -358,7 +359,20 @@ vector<string> source_files, resource_files, includes, libraries, libpaths; vector<string> header_files, common_defines, compiler_flags; vector<string> vars, values; - + + /* do not create project files for these targets + use virtual targets instead */ + switch (module.type) + { + case Iso: + case LiveIso: + case IsoRegTest: + case LiveIsoRegTest: + return; + default: + break; + } + compiler_flags.push_back ( "-Wall" ); // Always force disabling of sibling calls optimisation for GCC @@ -419,6 +433,7 @@ module.GetBasePath() ); includes.push_back ( path ); + widl_options += "-I" + path + " "; } const vector<Library*>& libs = data.libraries; for ( i = 0; i < libs.size(); i++ ) @@ -472,12 +487,13 @@ fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\r\n" ); fprintf ( OUT, "<CodeBlocks_project_file>\r\n" ); - fprintf ( OUT, "\t<FileVersion major=\"1\" minor=\"5\" />\r\n" ); + fprintf ( OUT, "\t<FileVersion major=\"1\" minor=\"6\" />\r\n" ); fprintf ( OUT, "\t<Project>\r\n" ); fprintf ( OUT, "\t\t<Option title=\"%s\" />\r\n", module.name.c_str() ); fprintf ( OUT, "\t\t<Option pch_mode=\"2\" />\r\n" ); fprintf ( OUT, "\t\t<Option default_target=\"\" />\r\n" ); fprintf ( OUT, "\t\t<Option compiler=\"gcc\" />\r\n" ); + fprintf ( OUT, "\t\t<Option extended_obj_names=\"1\" />\r\n" ); fprintf ( OUT, "\t\t<Option virtualFolders=\"\" />\r\n" ); fprintf ( OUT, "\t\t<Build>\r\n" ); @@ -506,7 +522,9 @@ } if ( lib ) + { fprintf ( OUT, "\t\t\t\t<Option type=\"2\" />\r\n" ); + } else if ( dll ) fprintf ( OUT, "\t\t\t\t<Option type=\"3\" />\r\n" ); else if ( sys ) @@ -527,6 +545,7 @@ } fprintf ( OUT, "\t\t\t\t<Option compiler=\"gcc\" />\r\n" ); + if ( module_type == ".cpl" ) { fprintf ( OUT, "\t\t\t\t<Option parameters=\"shell32,Control_RunDLL "$exe_output",@\" />\r\n" ); @@ -637,12 +656,25 @@ if ( module.type == StaticLibrary && module.importLibrary ) fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s --output-lib $exe_output; %s -U\" />\r\n", module.importLibrary->dllname.c_str (), module.importLibrary->definition.c_str(), module.mangledSymbols ? "" : "--kill-at" ); else if ( module.importLibrary != NULL ) - fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s --output-lib "%s\\%s\\lib$(TARGET_OUTPUT_BASENAME).a" %s\" />\r\n", module.GetTargetName ().c_str(), module.importLibrary->definition.c_str(), intdir.c_str(), module.GetBasePath().c_str(), module.mangledSymbols ? "" : "--kill-at" ); - //fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s --output-lib "$(TARGET_OBJECT_DIR)lib$(TARGET_OUTPUT_BASENAME).a" %s\" />\r\n", module.GetTargetName ().c_str(), module.importLibrary->definition.c_str(), module.mangledSymbols ? "" : "--kill-at" ); + fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s --output-lib "$(TARGET_OBJECT_DIR)lib$(TARGET_OUTPUT_BASENAME).a" %s\" />\r\n", module.GetTargetName ().c_str(), module.importLibrary->definition.c_str(), module.mangledSymbols ? "" : "--kill-at" ); + + + for ( i = 0; i < resource_files.size(); i++ ) + { + const string& resource_file = resource_files[i]; +#ifdef WIN32 + fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del $(TARGET_OBJECT_DIR)\\%s.rci.tmp 2>NUL\" />\r\n", resource_file.c_str() ); + fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del $(TARGET_OBJECT_DIR)\\%s.res.tmp 2>NUL\" />\r\n", resource_file.c_str() ); +#else + fprintf ( OUT, "\t\t\t\t\t<Add after=\"rm $(TARGET_OBJECT_DIR)/%s.rci.tmp 2>/dev/null\" />\r\n", resource_file.c_str() ); + fprintf ( OUT, "\t\t\t\t\t<Add after=\"rm $(TARGET_OBJECT_DIR)/%s.res.tmp 2>/dev/null\" />\r\n", resource_file.c_str() ); +#endif + } if ( dll ) { - + if (IsWineModule( module )) + fprintf ( OUT, "\t\t\t\t\t<Add before=\"%s\\tools\\winebuild\\winebuild.exe -o %s --def -E %s.spec\" />\r\n", outdir.c_str(), module.importLibrary->definition.c_str(), module.name.c_str()); fprintf ( OUT, "\t\t\t\t\t<Add before=\"dlltool --dllname %s --def %s --output-exp %s.temp.exp %s\" />\r\n", module.GetTargetName ().c_str(), module.importLibrary->definition.c_str(), module.name.c_str(), module.mangledSymbols ? "" : "--kill-at" ); fprintf ( OUT, "\t\t\t\t\t<Add after=\"%s\\tools\\pefixup $exe_output -exports\" />\r\n", outdir.c_str() ); #ifdef WIN32 @@ -701,9 +733,28 @@ string extension = GetExtension ( source_file ); if ( extension == ".s" || extension == ".S" ) + { + fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" ); + fprintf ( OUT, "\t\t\t<Option link=\"1\" />\r\n" ); fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"gcc -x assembler-with-cpp -c $file -o $link_objects $includes -D__ASM__ $options\" />\r\n" ); - if ( extension == ".asm" || extension == ".ASM" ) + } + else if ( extension == ".asm" || extension == ".ASM" ) + { + fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" ); + fprintf ( OUT, "\t\t\t<Option link=\"1\" />\r\n" ); fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"nasm -f win32 $file -o $link_objects\" />\r\n" ); + } + else if ( extension == ".idl" || extension == ".IDL" ) + { + fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s\\tools\\widl\\widl.exe %s %s -h -H "$(TARGET_OUTPUT_DIR)$filetitle_c.h" -c -C "$(TARGET_OUTPUT_DIR)$filetitle_c.c" $file\\ngcc %s -c "$(TARGET_OUTPUT_DIR)$filetitle_c.c" -o "$(TARGET_OUTPUT_DIR)$file_c.o"\" />\r\n", outdir.c_str(), widl_options.c_str(), windres_defines.c_str(), widl_options.c_str() ); + } + else if ( extension == ".spec" || extension == ".SPEC" ) + { + fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" ); + fprintf ( OUT, "\t\t\t<Option link=\"1\" />\r\n" ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s\\tools\\winebuild\\winebuild.exe -o $file.stubs.c --pedll $file\\n$compiler -c $options $includes $file.stubs.c -o $(TARGET_OBJECT_DIR)\\$file.o\" />\r\n", outdir.c_str() ); + } for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) { @@ -720,7 +771,7 @@ fprintf ( OUT, "\t\t<Unit filename=\"%s\">\r\n", resource_file.c_str() ); fprintf ( OUT, "\t\t\t<Option compilerVar=\"WINDRES\" />\r\n" ); string extension = GetExtension ( resource_file ); - fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"gcc -xc -E -DRC_INVOKED $includes %s $file -o kernel32.kernel32.rci.tmp\\n%s\\tools\\wrc\\wrc.exe $includes %s kernel32.kernel32.rci.tmp kernel32.kernel32.res.tmp\\n$rescomp --output-format=coff kernel32.kernel32.res.tmp -o $resource_output\" />\r\n" , windres_defines.c_str(), outdir.c_str(), windres_defines.c_str() ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"gcc -xc -E -DRC_INVOKED $includes %s $file -o $(TARGET_OBJECT_DIR)\\$file.rci.tmp\\n%s\\tools\\wrc\\wrc.exe $includes %s $(TARGET_OBJECT_DIR)\\$file.rci.tmp $(TARGET_OBJECT_DIR)\\$file.res.tmp\\n$rescomp --output-format=coff $(TARGET_OBJECT_DIR)\\$file.res.tmp -o $resource_output\" />\r\n" , windres_defines.c_str(), outdir.c_str(), windres_defines.c_str() ); for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) { const CBConfiguration& cfg = *m_configurations[icfg]; @@ -832,3 +883,13 @@ // TODO FIXME - should we check global if-ed properties? return NULL; } + +bool +CBBackend::IsWineModule ( const Module& module ) const +{ + if ( module.importLibrary == NULL) + return false; + + size_t index = module.importLibrary->definition.rfind ( ".spec.def" ); + return ( index != string::npos ); +} Modified: branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.h (original) +++ branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.h Sat Jan 20 18:15:54 2007 @@ -74,6 +74,7 @@ std::string DependFileName ( const Module& module ) const; std::string GenerateProjectLinkerFlags () const; void MingwAddImplicitLibraries( Module &module ); + bool IsWineModule ( const Module& module ) const; std::vector<CBConfiguration*> m_configurations; std::vector<FileUnit> m_fileUnits; Modified: branches/ros-branch-0_3_1/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/rbuild/rbuild.mak (original) +++ branches/ros-branch-0_3_1/reactos/tools/rbuild/rbuild.mak Sat Jan 20 18:15:54 2007 @@ -119,6 +119,23 @@ ${mkdir} $@ endif +RBUILD_DEPMAP_BASE = $(RBUILD_BACKEND_BASE_)dependencymap +RBUILD_DEPMAP_BASE_ = $(RBUILD_DEPMAP_BASE)$(SEP) +RBUILD_DEPMAP_INT = $(INTERMEDIATE_)$(RBUILD_DEPMAP_BASE) +RBUILD_DEPMAP_INT_ = $(RBUILD_DEPMAP_INT)$(SEP) +RBUILD_DEPMAP_OUT = $(OUTPUT_)$(RBUILD_DEPMAP_BASE) +RBUILD_DEPMAP_OUT_ = $(RBUILD_DEPMAP_OUT)$(SEP) + +$(RBUILD_DEPMAP_INT): | $(RBUILD_BACKEND_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(RBUILD_DEPMAP_OUT): | $(RBUILD_BACKEND_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + RBUILD_MSVC_BASE = $(RBUILD_BACKEND_BASE_)msvc RBUILD_MSVC_BASE_ = $(RBUILD_MSVC_BASE)$(SEP) @@ -158,6 +175,11 @@ codeblocks.cpp \ ) +RBUILD_BACKEND_DEPMAP_BASE_SOURCES = $(addprefix $(RBUILD_DEPMAP_BASE_), \ + dependencymap.cpp \ + ) + + RBUILD_BACKEND_MSVC_BASE_SOURCES = $(addprefix $(RBUILD_MSVC_BASE_), \ genguid.cpp \ msvc.cpp \ @@ -170,6 +192,7 @@ $(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \ $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ $(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \ + $(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \ $(RBUILD_BACKEND_BASE_)backend.cpp RBUILD_COMMON_SOURCES = \ @@ -225,6 +248,9 @@ RBUILD_BACKEND_CODEBLOCKS_HEADERS = \ codeblocks.h +RBUILD_BACKEND_DEPMAP_HEADERS = \ + dependencymap.h + RBUILD_BACKEND_MINGW_HEADERS = \ mingw.h \ modulehandler.h @@ -234,7 +260,8 @@ $(addprefix devcpp$(SEP), $(RBUILD_BACKEND_DEVCPP_HEADERS)) \ $(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \ - $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) + $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \ + $(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS)) RBUILD_HEADERS = \ $(addprefix $(RBUILD_BASE_), \ @@ -403,6 +430,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp $(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_MSVC_INT_)genguid.o: $(RBUILD_MSVC_BASE_)genguid.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.cpp (original) +++ branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.cpp Sat Jan 20 18:15:54 2007 @@ -57,7 +57,7 @@ free(command); return pid; } -#elif defined (__LINUX__) +#else /********************************************************************************************************************/ OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) { @@ -66,10 +66,23 @@ if ((pid = fork()) < 0) { cerr << "OsSupport::createProcess> fork failed" << endl; - return pid; + return 0; } + if (pid == 0) + { + execv(procname, procargs); + return 0; + } + + return pid; + } + bool OsSupport::terminateProcess(OsSupport::ProcessID pid) + { + kill(pid, SIGKILL); + return true; } + #endif Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.h (original) +++ branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.h Sat Jan 20 18:15:54 2007 @@ -10,10 +10,12 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) */ -#ifdef WIN32 +#if 0 #include <windows.h> -#elif defined(__LINUX__) +#else #include <unistd.h> +#include <sys/types.h> +#include <signal.h> #endif #include "user_types.h" @@ -34,14 +36,10 @@ #ifdef WIN32 typedef DWORD ProcessID; - -#elif defined(__LINUX__) +#else typedef pid_t ProcessID; - -#else -#error you need to define pid handle type for your platform -#endif + #endif //--------------------------------------------------------------------------------------- /// Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/sysreg/pipe_reader.cpp (original) +++ branches/ros-branch-0_3_1/reactos/tools/sysreg/pipe_reader.cpp Sat Jan 20 18:15:54 2007 @@ -36,7 +36,7 @@ return false; } // - m_File = _tpopen(PipeCmd.c_str(), AccessMode.c_str()); + m_File = popen(PipeCmd.c_str(), "r"); //AccessMode.c_str()); if (m_File) { cerr << "PipeReader::openPipe> successfully opened pipe" << endl; @@ -57,7 +57,7 @@ return false; } - int res = _pclose(m_File); + int res = pclose(m_File); if (res == INT_MAX) { Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/sysreg/rosboot_test.cpp (original) +++ branches/ros-branch-0_3_1/reactos/tools/sysreg/rosboot_test.cpp Sat Jan 20 18:15:54 2007 @@ -11,8 +11,8 @@ #include "rosboot_test.h" #include "pipe_reader.h" -#include "namedpipe_reader.h" -#include "sym_file.h" +//#include "namedpipe_reader.h" +//#include "sym_file.h" #include "file_reader.h" #include "os_support.h" @@ -24,14 +24,17 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> +#include <math.h> - + namespace Sysreg_ { using std::vector; using System_::PipeReader; +#if 0 using System_::NamedPipeReader; using System_::SymbolFile; +#endif using System_::FileReader; using System_::OsSupport; @@ -93,7 +96,8 @@ { TCHAR * stop; m_Timeout = _tcstod(timeout.c_str (), &stop); - if (_isnan(m_Timeout) || m_Timeout == 0.0) + + if (isnan(m_Timeout) || m_Timeout == 0.0) { cerr << "Warning: overriding timeout with default of 60 sec" << endl; m_Timeout = 60.0; @@ -289,10 +293,10 @@ /// string result; result.reserve (200); - +#if 0 SymbolFile::resolveAddress (modulename, address, result); cerr << result << endl; - +#endif /// /// TODO /// @@ -338,17 +342,18 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::fetchDebugByPipe(string boot_cmd) { - NamedPipeReader namedpipe_reader; string pipecmd = _T(""); + bool ret = true; /// /// FIXME /// split up arguments OsSupport::ProcessID pid = OsSupport::createProcess ((TCHAR*)boot_cmd.c_str (), 0, NULL); - +#if 0 string::size_type pipe_pos = boot_cmd.find (_T("serial pipe:")); + NamedPipeReader namedpipe_reader; if (pipe_pos != string::npos) { pipe_pos += 12; @@ -371,7 +376,7 @@ /// delay reading until emulator is ready /// - _sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); + sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); } if (!namedpipe_reader.openPipe(pipecmd)) @@ -382,7 +387,6 @@ string Buffer; Buffer.reserve (500); - bool ret = true; vector<string> vect; size_t lines = 0; bool write_log; @@ -436,7 +440,7 @@ } _sleep(3* CLOCKS_PER_SEC); OsSupport::terminateProcess (pid); - +#endif return ret; } //--------------------------------------------------------------------------------------- @@ -457,7 +461,7 @@ /// delay reading until emulator is ready /// - _sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); + sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); } OsSupport::ProcessID pid = 0; Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.cpp (original) +++ branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.cpp Sat Jan 20 18:15:54 2007 @@ -20,7 +20,9 @@ using Sysreg_::RegressionTest; using Sysreg_::RosBootTest; +#if 0 using System_::SymbolFile; +#endif typedef ComponentFactoryTemplate<RegressionTest, string> ComponentFactory; @@ -87,9 +89,9 @@ string envvar; string ros = _T("ROS_OUTPUT"); config.getStringValue (ros, envvar); - +#if 0 SymbolFile::initialize (config, envvar); - +#endif if (regtest->execute (config)) { cout << "The regression test " << regtest->getName () << " completed successfully" << endl; Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.mak (original) +++ branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.mak Sat Jan 20 18:15:54 2007 @@ -22,9 +22,7 @@ conf_parser.cpp \ env_var.cpp \ pipe_reader.cpp \ - namedpipe_reader.cpp \ rosboot_test.cpp \ - sym_file.cpp \ sysreg.cpp \ file_reader.cpp \ os_support.cpp \ Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/sysreg/txtmode.cfg (original) +++ branches/ros-branch-0_3_1/reactos/tools/sysreg/txtmode.cfg Sat Jan 20 18:15:54 2007 @@ -27,7 +27,9 @@ ; This value is the command which is executed to gain debugging data ; this value is mandatory -ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot d -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt +;ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot d -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -cdrom ; D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt + +ROSBOOT_CMD=/usr/bin/qemu -serial file:/home/freenet/reactos/tools/sysreg/txtmode.log -boot d -m 64 -L /home/freenet/reactos/qemu /home/freenet/reactos/qemu/c.img -cdrom /home/freenet/reactos/ReactOS.iso ; ; ROSBOOT_PIDFILE @@ -47,8 +49,8 @@ ; If the value is set to pipe, then sysreg will read from pipe created by the ; ROSBOOT_CMD ; -;ROSBOOT_DEBUG_PORT=file -ROSBOOT_DEBUG_PORT=pipe +ROSBOOT_DEBUG_PORT=file +;ROSBOOT_DEBUG_PORT=pipe ; ; ROSBOOT_DEBUG_FILE @@ -60,7 +62,8 @@ ; debug data to the specified debug file ; -ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\txtmode.log +;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\txtmode.log +ROSBOOT_DEBUG_FILE=/home/freenet/reactos/tools/sysreg/txtmode.log ; ROSBOOT_DELAY_READ; ; @@ -94,9 +97,9 @@ ; ; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable -ROSBOOT_CHECK_POINT=USETUP_COMPLETE -;ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE -;ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE +;ROSBOOT_CHECK_POINT=USETUP_COMPLETE +ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE +ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE ; ROSBOOT_CRITICAL_APP ; @@ -114,5 +117,4 @@ ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe -;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe - +;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs