Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 32298: Add Ext2Chkdsk() method (unimplemented at the moment)
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:50:10 2008 New Revision: 32298 URL: http://svn.reactos.org/svn/reactos?rev=32298&view=rev Log: Add Ext2Chkdsk() method (unimplemented at the moment) Modified: trunk/reactos/include/reactos/libs/fslib/ext2lib.h trunk/reactos/lib/fslib/ext2lib/Mke2fs.c Modified: trunk/reactos/include/reactos/libs/fslib/ext2lib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fslib… ============================================================================== --- trunk/reactos/include/reactos/libs/fslib/ext2lib.h (original) +++ trunk/reactos/include/reactos/libs/fslib/ext2lib.h Mon Feb 11 19:50:10 2008 @@ -7,20 +7,24 @@ #ifndef __EXT2LIB_H #define __EXT2LIB_H -#include <fmifs.h> +#include <fmifs/fmifs.h> -NTSTATUS -Ext2Initialize (VOID); +NTSTATUS NTAPI +Ext2Chkdsk( + IN PUNICODE_STRING DriveRoot, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback); -NTSTATUS -Ext2Cleanup (VOID); - -NTSTATUS -Ext2Format (PUNICODE_STRING DriveRoot, - ULONG MediaFlag, - PUNICODE_STRING Label, - BOOLEAN QuickFormat, - ULONG ClusterSize, - PFMIFSCALLBACK Callback); +NTSTATUS NTAPI +Ext2Format( + IN PUNICODE_STRING DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PUNICODE_STRING Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback); #endif /*__EXT2LIB_H */ Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.c (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.c Mon Feb 11 19:50:10 2008 @@ -796,13 +796,14 @@ } -NTSTATUS -Ext2Format(PUNICODE_STRING DriveRoot, - ULONG MediaFlag, - PUNICODE_STRING Label, - BOOLEAN QuickFormat, - ULONG ClusterSize, - PFMIFSCALLBACK Callback) +NTSTATUS NTAPI +Ext2Format( + IN PUNICODE_STRING DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PUNICODE_STRING Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) { BOOLEAN bRet = FALSE; NTSTATUS Status = STATUS_UNSUCCESSFUL; @@ -1008,3 +1009,16 @@ return Status; } + +NTSTATUS WINAPI +Ext2Chkdsk( + IN PUNICODE_STRING DriveRoot, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +}

1 0

[hpoussin] 32297: Bus number can also be stored in resource list header
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:49:05 2008 New Revision: 32297 URL: http://svn.reactos.org/svn/reactos?rev=32297&view=rev Log: Bus number can also be stored in resource list header Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c (original) +++ trunk/reactos/drivers/bus/pci/fdo.c Mon Feb 11 19:49:05 2008 @@ -356,7 +356,6 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - static BOOLEAN FoundBuggyAllocatedResourcesList = FALSE; PFDO_DEVICE_EXTENSION DeviceExtension; PCM_RESOURCE_LIST AllocatedResources; PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; @@ -383,6 +382,9 @@ return STATUS_REVISION_MISMATCH; ASSERT(DeviceExtension->State == dsStopped); + + /* By default, use the bus number in the resource list header */ + DeviceExtension->BusNumber = AllocatedResources->List[0].BusNumber; for (i = 0; i < AllocatedResources->List[0].PartialResourceList.Count; i++) { @@ -393,6 +395,8 @@ { if (FoundBusNumber || ResourceDescriptor->u.BusNumber.Length != 1) return STATUS_INVALID_PARAMETER; + /* Use this one instead */ + ASSERT(AllocatedResources->List[0].BusNumber == ResourceDescriptor->u.BusNumber.Start); DeviceExtension->BusNumber = ResourceDescriptor->u.BusNumber.Start; DPRINT("Found bus number resource: %lu\n", DeviceExtension->BusNumber); FoundBusNumber = TRUE; @@ -402,22 +406,7 @@ DPRINT("Unknown resource descriptor type 0x%x\n", ResourceDescriptor->Type); } } - /* HACK due to a bug in ACPI driver, which doesn't report the bus number */ - if (!FoundBuggyAllocatedResourcesList && !FoundBusNumber) - { - FoundBuggyAllocatedResourcesList = TRUE; - DPRINT1("No bus number resource found (bug in acpi.sys?), assuming bus number #0\n"); - DeviceExtension->BusNumber = 0; - goto next; - } - /* END HACK */ - if (!FoundBusNumber) - { - DPRINT("Some required resources were not found in allocated resources list\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - -next: + InitializeListHead(&DeviceExtension->DeviceListHead); KeInitializeSpinLock(&DeviceExtension->DeviceListLock); DeviceExtension->DeviceListCount = 0;

1 0

[hpoussin] 32296: Fix warnings
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:48:21 2008 New Revision: 32296 URL: http://svn.reactos.org/svn/reactos?rev=32296&view=rev Log: Fix warnings Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c Mon Feb 11 19:48:21 2008 @@ -765,7 +765,7 @@ --*/ { - UCHAR ntNameBuffer[64]; + CHAR ntNameBuffer[64]; UNICODE_STRING ntUnicodeString; NTSTATUS status; BOOLEAN changerDevice; @@ -2835,7 +2835,7 @@ } if ((startingOffset.QuadPart > deviceExtension->PartitionLength.QuadPart) || - (transferByteCount & deviceExtension->DiskGeometry->BytesPerSector - 1)) { + (transferByteCount & (deviceExtension->DiskGeometry->BytesPerSector - 1))) { DebugPrint((1,"ScsiCdRomRead: Invalid I/O parameters\n")); DebugPrint((1, "\toffset %x:%x, Length %x:%x\n", @@ -4871,8 +4871,8 @@ // to get this cdrom drive to work on scsi adapters that use PIO. // - if ((strncmp(InquiryData->VendorId, "HITACHI CDR-1750S", strlen("HITACHI CDR-1750S")) == 0 || - strncmp(InquiryData->VendorId, "HITACHI CDR-3650/1650S", strlen("HITACHI CDR-3650/1650S")) == 0) + if ((strncmp((PCHAR)InquiryData->VendorId, "HITACHI CDR-1750S", strlen("HITACHI CDR-1750S")) == 0 || + strncmp((PCHAR)InquiryData->VendorId, "HITACHI CDR-3650/1650S", strlen("HITACHI CDR-3650/1650S")) == 0) && PortCapabilities->AdapterUsesPio) { DebugPrint((1, "CdRom ScanForSpecial: Found Hitachi CDR-1750S.\n")); @@ -5993,7 +5993,7 @@ LONG tmp = 0; LONG doRun = 0; - UCHAR buf[32]; + CHAR buf[32]; ANSI_STRING paramNum; UNICODE_STRING paramStr;

1 0

[hpoussin] 32295: Add support for ext2.sys driver
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:47:21 2008 New Revision: 32295 URL: http://svn.reactos.org/svn/reactos?rev=32295&view=rev Log: Add support for ext2.sys driver Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Mon Feb 11 19:47:21 2008 @@ -739,6 +739,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 +; EXT2 Filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 + ; VBE SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Mon Feb 11 19:47:21 2008 @@ -33,6 +33,7 @@ scsiport.sys=,,,,,,x,,,,,,4 uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,,,,,,,4 +ext2.sys=,,,,,,,,,,,,4 [HardwareIdsDatabase] *PNP0C08 = acpi

1 0

[hpoussin] 32294: Load ext2.sys driver too
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:46:24 2008 New Revision: 32294 URL: http://svn.reactos.org/svn/reactos?rev=32294&view=rev Log: Load ext2.sys driver too Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch.h Mon Feb 11 19:46:24 2008 @@ -40,7 +40,7 @@ #define BIOSCALLBUFOFFSET 0x0000 /* Buffer to store temporary data for any Int386() call */ #define FILESYSBUFFER 0x80000 /* Buffer to store file system data (e.g. cluster buffer for FAT) */ #define DISKREADBUFFER 0x90000 /* Buffer to store data read in from the disk via the BIOS */ -#elif defined(_M_PPC) || defined(_M_ARM) +#elif defined(_M_PPC) || defined(_M_MIPS) || defined(_M_ARM) extern PVOID FsStaticBufferDisk, FsStaticBufferData; #define DISKREADBUFFER FsStaticBufferDisk #define FILESYSBUFFER FsStaticBufferData Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Mon Feb 11 19:46:24 2008 @@ -404,6 +404,10 @@ if (!LoadDriver(SourcePath, "fastfat.sys")) return; + /* Load ext2.sys (could be loaded by the setup prog!) */ + if (!LoadDriver(SourcePath, "ext2.sys")) + return; + /* Load additional files specified in txtsetup.inf */ if (InfFindFirstLine(InfHandle, "SourceDisksFiles",

1 0

[hpoussin] 32293: Fix ext2 driver compilation. NOT TESTED YET!
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:42:10 2008 New Revision: 32293 URL: http://svn.reactos.org/svn/reactos?rev=32293&view=rev Log: Fix ext2 driver compilation. NOT TESTED YET! Added: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild (with props) Modified: trunk/reactos/drivers/filesystems/directory.rbuild trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h trunk/reactos/drivers/filesystems/ext2/inc/struct.h trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c trunk/reactos/drivers/filesystems/ext2/src/cleanup.c trunk/reactos/drivers/filesystems/ext2/src/close.c trunk/reactos/drivers/filesystems/ext2/src/create.c trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c trunk/reactos/drivers/filesystems/ext2/src/ext2init.c trunk/reactos/drivers/filesystems/ext2/src/fastio.c trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c trunk/reactos/drivers/filesystems/ext2/src/flush.c trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c trunk/reactos/drivers/filesystems/ext2/src/io.c trunk/reactos/drivers/filesystems/ext2/src/metadata.c trunk/reactos/drivers/filesystems/ext2/src/misc.c trunk/reactos/drivers/filesystems/ext2/src/read.c trunk/reactos/drivers/filesystems/ext2/src/shutdown.c trunk/reactos/drivers/filesystems/ext2/src/volinfo.c trunk/reactos/drivers/filesystems/ext2/src/write.c Modified: trunk/reactos/drivers/filesystems/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/direct… ============================================================================== --- trunk/reactos/drivers/filesystems/directory.rbuild (original) +++ trunk/reactos/drivers/filesystems/directory.rbuild Mon Feb 11 19:42:10 2008 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="cdfs"> <xi:include href="cdfs/cdfs.rbuild" /> +</directory> +<directory name="ext2"> + <xi:include href="ext2/ext2.rbuild" /> </directory> <directory name="fs_rec"> <xi:include href="fs_rec/fs_rec.rbuild" /> Added: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild (added) +++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild Mon Feb 11 19:42:10 2008 @@ -1,0 +1,31 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys" allowwarnings="true"> + <bootstrap installbase="$(CDOUTPUT)" /> + <include base="ext2fs">inc</include> + <linkerflag>-lgcc</linkerflag> + <library>ntoskrnl</library> + <library>hal</library> + <directory name="src"> + <file>cleanup.c</file> + <file>close.c</file> + <file>create.c</file> + <file>devcntrl.c</file> + <file>dircntrl.c</file> + <file>DiskIO.c</file> + <file>ext2init.c</file> + <file>fastio.c</file> + <file>fileinfo.c</file> + <file>flush.c</file> + <file>fsctrl.c</file> + <file>io.c</file> + <file>metadata.c</file> + <file>misc.c</file> + <file>read.c</file> + <file>shutdown.c</file> + <file>volinfo.c</file> + <file>write.c</file> + </directory> + <file>ext2fs.rc</file> + <pch>inc/ext2fsd.h</pch> +</module> Propchange: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h Mon Feb 11 19:42:10 2008 @@ -185,7 +185,7 @@ { \ if( ( TYPE ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ { \ - DbgPrint("\n "); \ + DbgPrint(" "); \ DbgPrint(X,Y); \ if( ( DEBUG_TRACE_IRQL ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ { \ @@ -195,6 +195,7 @@ { \ DbgPrint( " [%s] Line No = %ld", __FILE__, __LINE__ ); \ } \ + DbgPrint("\n"); \ } \ } Modified: trunk/reactos/drivers/filesystems/ext2/inc/struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/struct.h (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/struct.h Mon Feb 11 19:42:10 2008 @@ -21,24 +21,22 @@ /************************************************************************** some useful definitions **************************************************************************/ -#ifdef _CPU_X86_ -typedef char int8; -typedef short int16; -typedef int int32; - -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef unsigned int uint32; - -typedef PVOID PBCB; +typedef CHAR int8; +typedef SHORT int16; +typedef LONG int32; + +typedef UCHAR uint8; +typedef USHORT uint16; +typedef ULONG uint32; + +typedef PVOID PBCB; + +#define try if (1) +#define except(x) if (0 && (x)) +#define finally if (1) +#define GetExceptionInformation() 0 // we will use the LARGE_INTEGER structure as defined by NT - -#else // Please define appropriate types here - -!!!! You must define your types here for compilation to proceed !!!! - -#endif // if _CPU_X86_ /************************************************************************** some empty typedefs defined here so we can reference them easily Modified: trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c Mon Feb 11 19:42:10 2008 @@ -38,7 +38,7 @@ * Return Value: The Status of the Read IO * *************************************************************************/ -NTSTATUS Ext2ReadLogicalBlocks ( +NTSTATUS NTAPI Ext2ReadLogicalBlocks ( PDEVICE_OBJECT PtrTargetDeviceObject, // the Target Device Object VOID *Buffer, // The Buffer that takes the data read in LARGE_INTEGER StartLogicalBlock, // The logical block from which reading is to start @@ -108,7 +108,7 @@ * Return Value: The Status of the Read IO * *************************************************************************/ -NTSTATUS Ext2ReadPhysicalBlocks ( +NTSTATUS NTAPI Ext2ReadPhysicalBlocks ( PDEVICE_OBJECT PtrTargetDeviceObject, // the Target Device Object VOID *Buffer, // The Buffer that takes the data read in LARGE_INTEGER StartPhysicalBlock, // The block from which reading is to start Modified: trunk/reactos/drivers/filesystems/ext2/src/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/cleanup.c Mon Feb 11 19:42:10 2008 @@ -37,7 +37,7 @@ * Return Value: Does not matter! * *************************************************************************/ -NTSTATUS Ext2Cleanup( +NTSTATUS NTAPI Ext2Cleanup( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -99,7 +99,7 @@ * Return Value: Does not matter! * *************************************************************************/ -NTSTATUS Ext2CommonCleanup( +NTSTATUS NTAPI Ext2CommonCleanup( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ) Modified: trunk/reactos/drivers/filesystems/ext2/src/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/close.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/close.c Mon Feb 11 19:42:10 2008 @@ -38,7 +38,7 @@ * Return Value: Does not matter! * *************************************************************************/ -NTSTATUS Ext2Close( +NTSTATUS NTAPI Ext2Close( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -102,7 +102,7 @@ * Return Value: Does not matter! * *************************************************************************/ -NTSTATUS Ext2CommonClose( +NTSTATUS NTAPI Ext2CommonClose( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ) Modified: trunk/reactos/drivers/filesystems/ext2/src/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/create.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/create.c Mon Feb 11 19:42:10 2008 @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2Create( +NTSTATUS NTAPI Ext2Create( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -124,7 +124,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonCreate( +NTSTATUS NTAPI Ext2CommonCreate( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt) @@ -986,7 +986,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2OpenVolume( +NTSTATUS NTAPI Ext2OpenVolume( PtrExt2VCB PtrVCB, // volume to be opened PtrExt2IrpContext PtrIrpContext, // IRP context PIRP PtrIrp, // original/user IRP @@ -1121,7 +1121,7 @@ * Return Value: None * *************************************************************************/ -NTSTATUS Ext2OpenRootDirectory( +NTSTATUS NTAPI Ext2OpenRootDirectory( PtrExt2VCB PtrVCB, // volume PtrExt2IrpContext PtrIrpContext, // IRP context PIRP PtrIrp, // original/user IRP @@ -1156,7 +1156,7 @@ -PtrExt2FCB Ext2LocateChildFCBInCore( +PtrExt2FCB NTAPI Ext2LocateChildFCBInCore( PtrExt2VCB PtrVCB, PUNICODE_STRING PtrName, ULONG ParentInodeNo ) @@ -1187,7 +1187,7 @@ return NULL; } -PtrExt2FCB Ext2LocateFCBInCore( +PtrExt2FCB NTAPI Ext2LocateFCBInCore( PtrExt2VCB PtrVCB, ULONG InodeNo ) { @@ -1215,7 +1215,7 @@ } -ULONG Ext2LocateFileInDisk ( +ULONG NTAPI Ext2LocateFileInDisk ( PtrExt2VCB PtrVCB, PUNICODE_STRING PtrCurrentName, PtrExt2FCB PtrParentFCB, @@ -1439,7 +1439,7 @@ * Return Value: None * *************************************************************************/ -ULONG Ext2CreateFile( +ULONG NTAPI Ext2CreateFile( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, PUNICODE_STRING PtrName, @@ -1568,7 +1568,7 @@ * Return Value: None * *************************************************************************/ -BOOLEAN Ext2OverwriteFile( +BOOLEAN NTAPI Ext2OverwriteFile( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext) { @@ -1631,7 +1631,7 @@ * Return Value: None * *************************************************************************/ -BOOLEAN Ext2SupersedeFile( +BOOLEAN NTAPI Ext2SupersedeFile( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext) { Modified: trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c Mon Feb 11 19:42:10 2008 @@ -52,7 +52,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2DeviceControl( +NTSTATUS NTAPI Ext2DeviceControl( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -113,7 +113,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonDeviceControl( +NTSTATUS NTAPI Ext2CommonDeviceControl( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -197,7 +197,7 @@ * Return Value: STATUS_SUCCESS * *************************************************************************/ -NTSTATUS Ext2DevIoctlCompletion( +NTSTATUS NTAPI Ext2DevIoctlCompletion( PDEVICE_OBJECT PtrDeviceObject, PIRP PtrIrp, void *Context) Modified: trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c Mon Feb 11 19:42:10 2008 @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2DirControl( +NTSTATUS NTAPI Ext2DirControl( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -100,7 +100,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonDirControl( +NTSTATUS NTAPI Ext2CommonDirControl( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -176,7 +176,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2QueryDirectory( +NTSTATUS NTAPI Ext2QueryDirectory( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, #ifdef _GNU_NTIFS_ @@ -814,7 +814,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2NotifyChangeDirectory( +NTSTATUS NTAPI Ext2NotifyChangeDirectory( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, #ifdef _GNU_NTIFS_ Modified: trunk/reactos/drivers/filesystems/ext2/src/ext2init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/ext2init.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/ext2init.c Mon Feb 11 19:42:10 2008 @@ -43,7 +43,7 @@ * Return Value: STATUS_SUCCESS/Error (will cause driver to be unloaded). * *************************************************************************/ -NTSTATUS DriverEntry( +NTSTATUS NTAPI DriverEntry( PDRIVER_OBJECT DriverObject, // created by the I/O sub-system PUNICODE_STRING RegistryPath) // path to the registry key { @@ -232,7 +232,7 @@ * Return Value: None * *************************************************************************/ -void Ext2FsdInitializeFunctionPointers( +void NTAPI Ext2FsdInitializeFunctionPointers( PDRIVER_OBJECT DriverObject) // created by the I/O sub-system { PFAST_IO_DISPATCH PtrFastIoDispatch = NULL; @@ -347,7 +347,7 @@ } -VOID Ext2QueueHandlerThread( +VOID NTAPI Ext2QueueHandlerThread( IN PVOID StartContext ) { Modified: trunk/reactos/drivers/filesystems/ext2/src/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fastio.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fastio.c Mon Feb 11 19:42:10 2008 @@ -35,7 +35,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoCheckIfPossible( +BOOLEAN NTAPI Ext2FastIoCheckIfPossible( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -134,7 +134,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoRead( +BOOLEAN NTAPI Ext2FastIoRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -218,7 +218,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoWrite( +BOOLEAN NTAPI Ext2FastIoWrite( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -287,7 +287,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoQueryBasicInfo( +BOOLEAN NTAPI Ext2FastIoQueryBasicInfo( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_BASIC_INFORMATION Buffer, @@ -350,7 +350,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoQueryStdInfo( +BOOLEAN NTAPI Ext2FastIoQueryStdInfo( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_STANDARD_INFORMATION Buffer, @@ -413,7 +413,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoLock( +BOOLEAN NTAPI Ext2FastIoLock( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -482,7 +482,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoUnlockSingle( +BOOLEAN NTAPI Ext2FastIoUnlockSingle( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -549,7 +549,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoUnlockAll( +BOOLEAN NTAPI Ext2FastIoUnlockAll( IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, OUT PIO_STATUS_BLOCK IoStatus, @@ -612,7 +612,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoUnlockAllByKey( +BOOLEAN NTAPI Ext2FastIoUnlockAllByKey( IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, ULONG Key, @@ -676,7 +676,7 @@ * Return Value: None (we must be prepared to handle VMM initiated calls) * *************************************************************************/ -void Ext2FastIoAcqCreateSec( +void NTAPI Ext2FastIoAcqCreateSec( IN PFILE_OBJECT FileObject) { PtrExt2FCB PtrFCB = NULL; @@ -745,7 +745,7 @@ * Return Value: None * *************************************************************************/ -void Ext2FastIoRelCreateSec( +void NTAPI Ext2FastIoRelCreateSec( IN PFILE_OBJECT FileObject) { @@ -813,7 +813,7 @@ * Return Value: TRUE/FALSE (Cache Manager does not tolerate FALSE well) * *************************************************************************/ -BOOLEAN Ext2AcqLazyWrite( +BOOLEAN NTAPI Ext2AcqLazyWrite( IN PVOID Context, IN BOOLEAN Wait) { @@ -927,7 +927,7 @@ * Return Value: None * *************************************************************************/ -void Ext2RelLazyWrite( +void NTAPI Ext2RelLazyWrite( IN PVOID Context) { @@ -1024,7 +1024,7 @@ * Return Value: TRUE/FALSE (Cache Manager does not tolerate FALSE well) * *************************************************************************/ -BOOLEAN Ext2AcqReadAhead( +BOOLEAN NTAPI Ext2AcqReadAhead( IN PVOID Context, IN BOOLEAN Wait) { @@ -1102,7 +1102,7 @@ * Return Value: None * *************************************************************************/ -void Ext2RelReadAhead( +void NTAPI Ext2RelReadAhead( IN PVOID Context) { BOOLEAN ReturnedStatus = TRUE; @@ -1175,7 +1175,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoQueryNetInfo( +BOOLEAN NTAPI Ext2FastIoQueryNetInfo( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, @@ -1240,7 +1240,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoMdlRead( +BOOLEAN NTAPI Ext2FastIoMdlRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -1309,7 +1309,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoMdlReadComplete( +BOOLEAN NTAPI Ext2FastIoMdlReadComplete( IN PFILE_OBJECT FileObject, OUT PMDL MdlChain, IN PDEVICE_OBJECT DeviceObject) @@ -1374,7 +1374,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoPrepareMdlWrite( +BOOLEAN NTAPI Ext2FastIoPrepareMdlWrite( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -1442,7 +1442,7 @@ * Return Value: TRUE/FALSE * *************************************************************************/ -BOOLEAN Ext2FastIoMdlWriteComplete( +BOOLEAN NTAPI Ext2FastIoMdlWriteComplete( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, OUT PMDL MdlChain, @@ -1506,7 +1506,7 @@ * Return Value: STATUS_SUCCESS/Error (try not to return an error, will 'ya ? :-) * *************************************************************************/ -NTSTATUS Ext2FastIoAcqModWrite( +NTSTATUS NTAPI Ext2FastIoAcqModWrite( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER EndingOffset, OUT PERESOURCE *ResourceToRelease, @@ -1586,7 +1586,7 @@ * Return Value: STATUS_SUCCESS/Error (an error returned here is really not expected!) * *************************************************************************/ -NTSTATUS Ext2FastIoRelModWrite( +NTSTATUS NTAPI Ext2FastIoRelModWrite( IN PFILE_OBJECT FileObject, IN PERESOURCE ResourceToRelease, IN PDEVICE_OBJECT DeviceObject) @@ -1652,7 +1652,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2FastIoAcqCcFlush( +NTSTATUS NTAPI Ext2FastIoAcqCcFlush( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { @@ -1712,7 +1712,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2FastIoRelCcFlush( +NTSTATUS NTAPI Ext2FastIoRelCcFlush( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { Modified: trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c Mon Feb 11 19:42:10 2008 @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2FileInfo( +NTSTATUS NTAPI Ext2FileInfo( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -101,7 +101,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonFileInfo( +NTSTATUS NTAPI Ext2CommonFileInfo( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -586,7 +586,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2GetBasicInformation( +NTSTATUS NTAPI Ext2GetBasicInformation( PtrExt2FCB PtrFCB, PFILE_BASIC_INFORMATION PtrBuffer, long *PtrReturnedLength ) @@ -646,7 +646,7 @@ return(RC); } -NTSTATUS Ext2GetStandardInformation( +NTSTATUS NTAPI Ext2GetStandardInformation( PtrExt2FCB PtrFCB, PFILE_STANDARD_INFORMATION PtrStdInformation, @@ -686,7 +686,7 @@ return(RC); } -NTSTATUS Ext2GetNetworkOpenInformation( +NTSTATUS NTAPI Ext2GetNetworkOpenInformation( PtrExt2FCB PtrFCB, PFILE_NETWORK_OPEN_INFORMATION PtrNetworkOpenInformation, long *PtrReturnedLength ) @@ -748,7 +748,7 @@ } -NTSTATUS Ext2GetFullNameInformation( +NTSTATUS NTAPI Ext2GetFullNameInformation( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PFILE_NAME_INFORMATION PtrNameInformation, @@ -811,7 +811,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2SetBasicInformation( +NTSTATUS NTAPI Ext2SetBasicInformation( PtrExt2IrpContext PtrIrpContext, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject, @@ -919,7 +919,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2SetDispositionInformation( +NTSTATUS NTAPI Ext2SetDispositionInformation( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PtrExt2VCB PtrVCB, @@ -1011,7 +1011,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2SetAllocationInformation( +NTSTATUS NTAPI Ext2SetAllocationInformation( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PtrExt2VCB PtrVCB, Modified: trunk/reactos/drivers/filesystems/ext2/src/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/flush.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/flush.c Mon Feb 11 19:42:10 2008 @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2Flush( +NTSTATUS NTAPI Ext2Flush( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -98,7 +98,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonFlush( +NTSTATUS NTAPI Ext2CommonFlush( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -254,7 +254,7 @@ * Return Value: None * *************************************************************************/ -void Ext2FlushAFile( +void NTAPI Ext2FlushAFile( PtrExt2NTRequiredFCB PtrReqdFCB, PIO_STATUS_BLOCK PtrIoStatus) { @@ -276,7 +276,7 @@ * Return Value: None * *************************************************************************/ -void Ext2FlushLogicalVolume( +void NTAPI Ext2FlushLogicalVolume( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PtrExt2VCB PtrVCB) @@ -330,7 +330,7 @@ * Return Value: None * *************************************************************************/ -NTSTATUS Ext2FlushCompletion( +NTSTATUS NTAPI Ext2FlushCompletion( PDEVICE_OBJECT PtrDeviceObject, PIRP PtrIrp, PVOID Context) Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c Mon Feb 11 19:42:10 2008 @@ -79,7 +79,7 @@ * NTSTATUS - The FSD status for the IRP * *************************************************************************/ -NTSTATUS +NTSTATUS NTAPI Ext2FileSystemControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -907,7 +907,7 @@ -NTSTATUS Ext2VerifyVolume ( +NTSTATUS NTAPI Ext2VerifyVolume ( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp ) { Modified: trunk/reactos/drivers/filesystems/ext2/src/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/io.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/io.c Mon Feb 11 19:42:10 2008 @@ -31,7 +31,7 @@ * Return Value: STATUS_SUCCESS / STATUS_PENDING / Error * *************************************************************************/ -NTSTATUS Ext2PassDownMultiReadWriteIRP( +NTSTATUS NTAPI Ext2PassDownMultiReadWriteIRP( PEXT2_IO_RUN PtrIoRuns, UINT Count, ULONG TotalReadWriteLength, @@ -230,7 +230,7 @@ return(RC); } -NTSTATUS Ext2PassDownSingleReadWriteIRP( +NTSTATUS NTAPI Ext2PassDownSingleReadWriteIRP( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PtrExt2VCB PtrVCB, @@ -374,7 +374,7 @@ * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2SingleSyncCompletionRoutine( +NTSTATUS NTAPI Ext2SingleSyncCompletionRoutine( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt @@ -409,7 +409,7 @@ * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2SingleAsyncCompletionRoutine( +NTSTATUS NTAPI Ext2SingleAsyncCompletionRoutine( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt @@ -443,7 +443,7 @@ * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2MultiSyncCompletionRoutine ( +NTSTATUS NTAPI Ext2MultiSyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt @@ -500,7 +500,7 @@ * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2MultiAsyncCompletionRoutine ( +NTSTATUS NTAPI Ext2MultiAsyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Contxt Modified: trunk/reactos/drivers/filesystems/ext2/src/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/metadata.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/metadata.c Mon Feb 11 19:42:10 2008 @@ -42,7 +42,7 @@ * *************************************************************************/ -NTSTATUS Ext2ReadInode ( +NTSTATUS NTAPI Ext2ReadInode ( PtrExt2VCB PtrVcb, // the Volume Control Block uint32 InodeNo, // The Inode no PEXT2_INODE PtrInode // The Inode Buffer @@ -174,7 +174,7 @@ * Return Value: None * *************************************************************************/ -void Ext2InitializeFCBInodeInfo ( +void NTAPI Ext2InitializeFCBInodeInfo ( PtrExt2FCB PtrFCB ) { PtrExt2VCB PtrVCB = NULL; @@ -262,7 +262,7 @@ * Return Value: The new i-node no or zero * *************************************************************************/ -ULONG Ext2AllocInode( +ULONG NTAPI Ext2AllocInode( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG ParentINodeNo ) @@ -502,7 +502,7 @@ * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2DeallocInode( +BOOLEAN NTAPI Ext2DeallocInode( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG INodeNo ) @@ -701,7 +701,7 @@ * Return Value: Success / Failure... * *************************************************************************/ -NTSTATUS Ext2WriteInode( +NTSTATUS NTAPI Ext2WriteInode( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVcb, // the Volume Control Block uint32 InodeNo, // The Inode no @@ -823,7 +823,7 @@ * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2MakeNewDirectoryEntry( +BOOLEAN NTAPI Ext2MakeNewDirectoryEntry( PtrExt2IrpContext PtrIrpContext, // The Irp context PtrExt2FCB PtrParentFCB, // Parent Folder FCB PFILE_OBJECT PtrFileObject, // Parent Folder Object @@ -1062,7 +1062,7 @@ } -BOOLEAN Ext2FreeDirectoryEntry( +BOOLEAN NTAPI Ext2FreeDirectoryEntry( PtrExt2IrpContext PtrIrpContext, PtrExt2FCB PtrParentFCB, PUNICODE_STRING PtrName) @@ -1193,7 +1193,7 @@ * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2AddBlockToFile( +BOOLEAN NTAPI Ext2AddBlockToFile( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, PtrExt2FCB PtrFCB, @@ -1664,7 +1664,7 @@ * Return Value: Success / Failure... * *************************************************************************/ -ULONG Ext2AllocBlock( +ULONG NTAPI Ext2AllocBlock( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG Count) @@ -1895,7 +1895,7 @@ * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2DeallocBlock( +BOOLEAN NTAPI Ext2DeallocBlock( PtrExt2IrpContext PtrIrpContext, PtrExt2VCB PtrVCB, ULONG BlockNo ) @@ -2076,7 +2076,7 @@ return RC; } -BOOLEAN Ext2UpdateFileSize( +BOOLEAN NTAPI Ext2UpdateFileSize( PtrExt2IrpContext PtrIrpContext, PFILE_OBJECT PtrFileObject, PtrExt2FCB PtrFCB) @@ -2122,7 +2122,7 @@ * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2DeleteFile( +BOOLEAN NTAPI Ext2DeleteFile( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext) { @@ -2208,7 +2208,7 @@ * Return Value: Success / Failure... * *************************************************************************/ -BOOLEAN Ext2ReleaseDataBlocks( +BOOLEAN NTAPI Ext2ReleaseDataBlocks( PtrExt2FCB PtrFCB, PtrExt2IrpContext PtrIrpContext) { @@ -2440,7 +2440,7 @@ } -BOOLEAN Ext2TruncateFileAllocationSize( +BOOLEAN NTAPI Ext2TruncateFileAllocationSize( PtrExt2IrpContext PtrIrpContext, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject, @@ -2550,7 +2550,7 @@ return TRUE; } -BOOLEAN Ext2IsDirectoryEmpty( +BOOLEAN NTAPI Ext2IsDirectoryEmpty( PtrExt2FCB PtrFCB, PtrExt2CCB PtrCCB, PtrExt2IrpContext PtrIrpContext) @@ -2650,7 +2650,7 @@ } -NTSTATUS Ext2RenameOrLinkFile( +NTSTATUS NTAPI Ext2RenameOrLinkFile( PtrExt2FCB PtrSourceFCB, PFILE_OBJECT PtrSourceFileObject, PtrExt2IrpContext PtrIrpContext, Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/misc.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/misc.c Mon Feb 11 19:42:10 2008 @@ -34,7 +34,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2InitializeZones( +NTSTATUS NTAPI Ext2InitializeZones( void) { NTSTATUS RC = STATUS_SUCCESS; @@ -186,7 +186,7 @@ * Return Value: None * *************************************************************************/ -void Ext2DestroyZones( +void NTAPI Ext2DestroyZones( void) { try { @@ -238,7 +238,7 @@ * Return Value: TRUE/FALSE (TRUE if top level was NULL when routine invoked) * *************************************************************************/ -BOOLEAN Ext2IsIrpTopLevel( +BOOLEAN NTAPI Ext2IsIrpTopLevel( PIRP Irp) // the IRP sent to our dispatch routine { BOOLEAN ReturnCode = FALSE; @@ -278,7 +278,7 @@ * Return Value: EXCEPTION_EXECUTE_HANDLER/EXECEPTION_CONTINUE_SEARCH * *************************************************************************/ -long Ext2ExceptionFilter( +long NTAPI Ext2ExceptionFilter( PtrExt2IrpContext PtrIrpContext, PEXCEPTION_POINTERS PtrExceptionPointers ) { @@ -341,7 +341,7 @@ * Return Value: Error code * *************************************************************************/ -NTSTATUS Ext2ExceptionHandler( +NTSTATUS NTAPI Ext2ExceptionHandler( PtrExt2IrpContext PtrIrpContext, PIRP Irp) { @@ -387,7 +387,7 @@ * Return Value: None * *************************************************************************/ -void Ext2LogEvent( +void NTAPI Ext2LogEvent( NTSTATUS Ext2EventLogId, // the Ext2 private message id NTSTATUS RC) // any NT error code we wish to log ... { @@ -424,7 +424,7 @@ * Return Value: A pointer to the ObjectName structure OR NULL. * *************************************************************************/ -PtrExt2ObjectName Ext2AllocateObjectName( +PtrExt2ObjectName NTAPI Ext2AllocateObjectName( void) { PtrExt2ObjectName PtrObjectName = NULL; @@ -488,7 +488,7 @@ * Return Value: None * *************************************************************************/ -void Ext2ReleaseObjectName( +void NTAPI Ext2ReleaseObjectName( PtrExt2ObjectName PtrObjectName) { KIRQL CurrentIrql; @@ -535,7 +535,7 @@ * Return Value: A pointer to the CCB structure OR NULL. * *************************************************************************/ -PtrExt2CCB Ext2AllocateCCB( +PtrExt2CCB NTAPI Ext2AllocateCCB( void) { PtrExt2CCB PtrCCB = NULL; @@ -605,7 +605,7 @@ * Return Value: None * *************************************************************************/ -void Ext2ReleaseCCB( +void NTAPI Ext2ReleaseCCB( PtrExt2CCB PtrCCB) { KIRQL CurrentIrql; @@ -660,7 +660,7 @@ * Return Value: A pointer to the FCB structure OR NULL. * *************************************************************************/ -PtrExt2FCB Ext2AllocateFCB( +PtrExt2FCB NTAPI Ext2AllocateFCB( void) { PtrExt2FCB PtrFCB = NULL; @@ -735,7 +735,7 @@ * Return Value: A pointer to the FCB structure OR NULL. * *************************************************************************/ -NTSTATUS Ext2CreateNewFCB( +NTSTATUS NTAPI Ext2CreateNewFCB( PtrExt2FCB *ReturnedFCB, LARGE_INTEGER AllocationSize, LARGE_INTEGER EndOfFile, @@ -859,7 +859,7 @@ * Return Value: None * *************************************************************************/ -void Ext2ReleaseFCB( +void NTAPI Ext2ReleaseFCB( PtrExt2FCB PtrFCB) { KIRQL CurrentIrql; @@ -919,7 +919,7 @@ * Return Value: A pointer to the Ext2ByteLocks structure OR NULL. * *************************************************************************/ -PtrExt2FileLockInfo Ext2AllocateByteLocks( +PtrExt2FileLockInfo NTAPI Ext2AllocateByteLocks( void) { PtrExt2FileLockInfo PtrByteLocks = NULL; @@ -978,7 +978,7 @@ * Return Value: None * *************************************************************************/ -void Ext2ReleaseByteLocks( +void NTAPI Ext2ReleaseByteLocks( PtrExt2FileLockInfo PtrByteLocks) { KIRQL CurrentIrql; @@ -1019,7 +1019,7 @@ * Return Value: A pointer to the IrpContext structure OR NULL. * *************************************************************************/ -PtrExt2IrpContext Ext2AllocateIrpContext( +PtrExt2IrpContext NTAPI Ext2AllocateIrpContext( PIRP Irp, PDEVICE_OBJECT PtrTargetDeviceObject) { @@ -1136,7 +1136,7 @@ * Return Value: None * *************************************************************************/ -void Ext2ReleaseIrpContext( +void NTAPI Ext2ReleaseIrpContext( PtrExt2IrpContext PtrIrpContext) { KIRQL CurrentIrql; @@ -1178,7 +1178,7 @@ * Return Value: STATUS_PENDING * *************************************************************************/ -NTSTATUS Ext2PostRequest( +NTSTATUS NTAPI Ext2PostRequest( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -1226,7 +1226,7 @@ * Return Value: None * *************************************************************************/ -void Ext2CommonDispatch( +void NTAPI Ext2CommonDispatch( void *Context ) // actually an IRPContext structure { NTSTATUS RC = STATUS_SUCCESS; @@ -1345,7 +1345,7 @@ * Return Value: None * *************************************************************************/ -void Ext2InitializeVCB( +void NTAPI Ext2InitializeVCB( PDEVICE_OBJECT PtrVolumeDeviceObject, PDEVICE_OBJECT PtrTargetDeviceObject, PVPB PtrVPB, @@ -1466,7 +1466,7 @@ * Return Value: none * *************************************************************************/ -void Ext2CompleteRequest( +void NTAPI Ext2CompleteRequest( IN PIRP Irp OPTIONAL, IN NTSTATUS Status ) @@ -1512,7 +1512,7 @@ * Return Value: A pointer to the CCB structure OR NULL. * *************************************************************************/ -NTSTATUS Ext2CreateNewCCB( +NTSTATUS NTAPI Ext2CreateNewCCB( PtrExt2CCB *ReturnedCCB, PtrExt2FCB PtrFCB, PFILE_OBJECT PtrFileObject ) @@ -1575,7 +1575,7 @@ * Return Value: NTSTATUS - STATUS_ACCESS_DENIED (always) * *************************************************************************/ -NTSTATUS Ext2DenyAccess( IN PIRP Irp ) +NTSTATUS NTAPI Ext2DenyAccess( IN PIRP Irp ) { ASSERT( Irp ); @@ -1605,7 +1605,7 @@ * Return Value: NTSTATUS - STATUS_SUCCESS(always) * *************************************************************************/ -NTSTATUS Ext2GetFCB_CCB_VCB_FromFileObject ( +NTSTATUS NTAPI Ext2GetFCB_CCB_VCB_FromFileObject ( IN PFILE_OBJECT PtrFileObject, OUT PtrExt2FCB *PPtrFCB, OUT PtrExt2CCB *PPtrCCB, @@ -1669,7 +1669,7 @@ } -void Ext2CopyUnicodeString( PUNICODE_STRING PtrDestinationString, PUNICODE_STRING PtrSourceString ) +void NTAPI Ext2CopyUnicodeString( PUNICODE_STRING PtrDestinationString, PUNICODE_STRING PtrSourceString ) { int Count; // Allcating space for Destination... @@ -1687,7 +1687,7 @@ } -void Ext2CopyWideCharToUnicodeString( +void NTAPI Ext2CopyWideCharToUnicodeString( PUNICODE_STRING PtrDestinationString, PCWSTR PtrSourceString ) { @@ -1712,7 +1712,7 @@ } -void Ext2CopyCharToUnicodeString( +void NTAPI Ext2CopyCharToUnicodeString( PUNICODE_STRING PtrDestinationString, PCSTR PtrSourceString, USHORT SourceStringLength ) @@ -1732,7 +1732,7 @@ } -void Ext2CopyZCharToUnicodeString( PUNICODE_STRING PtrDestinationString, PCSTR PtrSourceString ) +void NTAPI Ext2CopyZCharToUnicodeString( PUNICODE_STRING PtrDestinationString, PCSTR PtrSourceString ) { int Count; @@ -1754,14 +1754,14 @@ } } -void Ext2ZerooutUnicodeString( PUNICODE_STRING PtrUnicodeString ) +void NTAPI Ext2ZerooutUnicodeString( PUNICODE_STRING PtrUnicodeString ) { PtrUnicodeString->Length = 0; PtrUnicodeString->MaximumLength =0; PtrUnicodeString->Buffer = 0; } -void Ext2DeallocateUnicodeString( PUNICODE_STRING PtrUnicodeString ) +void NTAPI Ext2DeallocateUnicodeString( PUNICODE_STRING PtrUnicodeString ) { if( PtrUnicodeString && PtrUnicodeString->Buffer ) { @@ -1773,7 +1773,7 @@ PtrUnicodeString->Buffer = 0; } -PtrExt2FCB Ext2GetUsedFCB( +PtrExt2FCB NTAPI Ext2GetUsedFCB( PtrExt2VCB PtrVCB ) { @@ -1838,7 +1838,7 @@ return PtrFCB; } -BOOLEAN Ext2CloseClosableFCB( +BOOLEAN NTAPI Ext2CloseClosableFCB( PtrExt2FCB PtrFCB) { KIRQL Irql = 0; @@ -1917,7 +1917,7 @@ } -BOOLEAN Ext2SaveBCB( +BOOLEAN NTAPI Ext2SaveBCB( PtrExt2IrpContext PtrIrpContext, PBCB PtrBCB, PFILE_OBJECT PtrFileObject) @@ -1984,7 +1984,7 @@ } -BOOLEAN Ext2FlushSavedBCBs( +BOOLEAN NTAPI Ext2FlushSavedBCBs( PtrExt2IrpContext PtrIrpContext ) { @@ -2045,7 +2045,7 @@ return RC; } -BOOLEAN AssertBCB( PBCB PtrBCB ) +BOOLEAN NTAPI AssertBCB( PBCB PtrBCB ) { PFILE_OBJECT PtrFileObject = NULL; @@ -2069,7 +2069,7 @@ } -ULONG Ext2Align( ULONG NumberToBeAligned, ULONG Alignment ) +ULONG NTAPI Ext2Align( ULONG NumberToBeAligned, ULONG Alignment ) { if( Alignment & ( Alignment - 1 ) ) { @@ -2087,7 +2087,7 @@ return NumberToBeAligned; } -LONGLONG Ext2Align64( LONGLONG NumberToBeAligned, LONGLONG Alignment ) +LONGLONG NTAPI Ext2Align64( LONGLONG NumberToBeAligned, LONGLONG Alignment ) { if( Alignment & ( Alignment - 1 ) ) { Modified: trunk/reactos/drivers/filesystems/ext2/src/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/read.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/read.c Mon Feb 11 19:42:10 2008 @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2Read( +NTSTATUS NTAPI Ext2Read( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -101,7 +101,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonRead( +NTSTATUS NTAPI Ext2CommonRead( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, BOOLEAN FirstAttempt ) @@ -1329,7 +1329,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -void * Ext2GetCallersBuffer ( +void * NTAPI Ext2GetCallersBuffer ( PIRP PtrIrp ) { void * ReturnedBuffer = NULL; @@ -1363,7 +1363,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2LockCallersBuffer( +NTSTATUS NTAPI Ext2LockCallersBuffer( PIRP PtrIrp, BOOLEAN IsReadOperation, uint32 Length) @@ -1436,7 +1436,7 @@ * Return Value: None. * *************************************************************************/ -void Ext2MdlComplete( +void NTAPI Ext2MdlComplete( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp, PIO_STACK_LOCATION PtrIoStackLocation, Modified: trunk/reactos/drivers/filesystems/ext2/src/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/shutdown.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/shutdown.c Mon Feb 11 19:42:10 2008 @@ -40,7 +40,7 @@ * Return Value: Irrelevant. * *************************************************************************/ -NTSTATUS Ext2Shutdown( +NTSTATUS NTAPI Ext2Shutdown( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -102,7 +102,7 @@ * Return Value: Irrelevant * *************************************************************************/ -NTSTATUS Ext2CommonShutdown( +NTSTATUS NTAPI Ext2CommonShutdown( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { Modified: trunk/reactos/drivers/filesystems/ext2/src/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/volinfo.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/volinfo.c Mon Feb 11 19:42:10 2008 @@ -49,7 +49,7 @@ * NTSTATUS - The FSD status for the IRP * *************************************************************************/ -NTSTATUS Ext2QueryVolInfo ( +NTSTATUS NTAPI Ext2QueryVolInfo ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -192,7 +192,7 @@ -NTSTATUS Ext2SetVolInfo( +NTSTATUS NTAPI Ext2SetVolInfo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { Modified: trunk/reactos/drivers/filesystems/ext2/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/write.c (original) +++ trunk/reactos/drivers/filesystems/ext2/src/write.c Mon Feb 11 19:42:10 2008 @@ -36,7 +36,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2Write( +NTSTATUS NTAPI Ext2Write( PDEVICE_OBJECT DeviceObject, // the logical volume device object PIRP Irp) // I/O Request Packet { @@ -97,7 +97,7 @@ * Return Value: STATUS_SUCCESS/Error * *************************************************************************/ -NTSTATUS Ext2CommonWrite( +NTSTATUS NTAPI Ext2CommonWrite( PtrExt2IrpContext PtrIrpContext, PIRP PtrIrp) { @@ -1471,7 +1471,7 @@ * Return Value: None * *************************************************************************/ -void Ext2DeferredWriteCallBack ( +void NTAPI Ext2DeferredWriteCallBack ( void *Context1, // Should be PtrIrpContext void *Context2 ) // Should be PtrIrp {

1 0

[hpoussin] 32292: Fix ext2 recognizer compilation, but let it disabled atm
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:41:25 2008 New Revision: 32292 URL: http://svn.reactos.org/svn/reactos?rev=32292&view=rev Log: Fix ext2 recognizer compilation, but let it disabled atm Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.c trunk/reactos/drivers/filesystems/fs_rec/fat.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h trunk/reactos/drivers/filesystems/fs_rec/fs_rec.rbuild Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ext2.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ext2.c Mon Feb 11 19:41:25 2008 @@ -1,136 +1,107 @@ /* - * ReactOS kernel - * Copyright (C) 2002,2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id: fat.c 9284 2004-05-02 20:12:38Z hbirr $ - * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/fs_rec/ext2.c (based on vfat.c) - * PURPOSE: Filesystem recognizer driver + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/ext2.c + * PURPOSE: EXT2 Recognizer * PROGRAMMER: Eric Kohl */ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <rosrtl/string.h> - +#include "fs_rec.h" #define NDEBUG #include <debug.h> -#include "fs_rec.h" - - /* FUNCTIONS ****************************************************************/ -static NTSTATUS -FsRecIsExt2Volume(IN PDEVICE_OBJECT DeviceObject) +BOOLEAN +NTAPI +FsRecIsExt2Volume(IN PVOID PackedBootSector) { - NTSTATUS Status; - PARTITION_INFORMATION PartitionInfo; - DISK_GEOMETRY DiskGeometry; - ULONG Size; - BOOL RecognizedFS = FALSE; - Size = sizeof(DISK_GEOMETRY); - - Status = FsRecDeviceIoControl(DeviceObject, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT("FsRecDeviceIoControl faild (%x)\n", Status); - return Status; - } - if (DiskGeometry.MediaType == FixedMedia || DiskGeometry.MediaType == RemovableMedia) - { - // We have found a hard disk - Size = sizeof(PARTITION_INFORMATION); - Status = FsRecDeviceIoControl(DeviceObject, - IOCTL_DISK_GET_PARTITION_INFO, - NULL, - 0, - &PartitionInfo, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT("FsRecDeviceIoControl faild (%x)\n", Status); - return Status; - } - - if (PartitionInfo.PartitionType) - { - if (PartitionInfo.PartitionType == PARTITION_EXT2) - { - RecognizedFS = TRUE; - } - } - } - - return RecognizedFS ? STATUS_SUCCESS : STATUS_UNRECOGNIZED_VOLUME; + /* For now, always return failure... */ + return FALSE; } +NTSTATUS +NTAPI +FsRecExt2FsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + PVOID Bpb = NULL; + ULONG SectorSize; + LARGE_INTEGER Offset = {{0}}; + BOOLEAN DeviceError = FALSE; + PAGED_CODE(); -NTSTATUS -FsRecExt2FsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - UNICODE_STRING RegistryPath; - NTSTATUS Status; + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) + { + case IRP_MN_MOUNT_VOLUME: - Stack = IoGetCurrentIrpStackLocation(Irp); + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; - switch (Stack->MinorFunction) - { - case IRP_MN_MOUNT_VOLUME: - DPRINT("FAT: IRP_MN_MOUNT_VOLUME\n"); - Status = FsRecIsExt2Volume(Stack->Parameters.MountVolume.DeviceObject); - if (NT_SUCCESS(Status)) - { - DPRINT("Identified FAT volume\n"); - Status = STATUS_FS_DRIVER_REQUIRED; - } - break; + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) + { + /* Try to read the BPB */ + if (FsRecReadBlock(MountDevice, + &Offset, + 512, + SectorSize, + (PVOID)&Bpb, + &DeviceError)) + { + /* Check if it's an actual EXT2 volume */ + if (FsRecIsExt2Volume(Bpb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } - case IRP_MN_LOAD_FILE_SYSTEM: - DPRINT("FAT: IRP_MN_LOAD_FILE_SYSTEM\n"); - RtlRosInitUnicodeStringFromLiteral(&RegistryPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ext2"); - Status = ZwLoadDriver(&RegistryPath); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwLoadDriver failed (Status %x)\n", Status); - } - else - { - IoUnregisterFileSystem(DeviceObject); - } - break; + /* Free the boot sector if we have one */ + ExFreePool(Bpb); + } + else + { + /* We have some sort of failure in the storage stack */ + DeviceError = TRUE; + } - default: - DPRINT("FAT: Unknown minor function %lx\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; + /* Check if we have an error on the stack */ + if (DeviceError) + { + /* Was this because of a floppy? */ + if (MountDevice->Characteristics & FILE_FLOPPY_DISKETTE) + { + /* Let the FS try anyway */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + break; + + case IRP_MN_LOAD_FILE_SYSTEM: + + /* Load the file system */ + Status = FsRecLoadFileSystem(DeviceObject, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ext2"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; } - return(Status); + + /* Return Status */ + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fs_rec/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fat.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fat.c Mon Feb 11 19:41:25 2008 @@ -15,7 +15,7 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS +BOOLEAN NTAPI FsRecIsFatVolume(IN PPACKED_BOOT_SECTOR PackedBootSector) { @@ -163,7 +163,7 @@ /* Load the file system */ Status = FsRecLoadFileSystem(DeviceObject, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Vfatfs"); + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\fastfat"); break; default: Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c Mon Feb 11 19:41:25 2008 @@ -151,6 +151,12 @@ /* Send UDFS command */ Status = FsRecUdfsFsControl(DeviceObject, Irp); + break; + + case FS_TYPE_EXT2: + + /* Send EXT2 command */ + Status = FsRecExt2FsControl(DeviceObject, Irp); break; default: @@ -359,6 +365,16 @@ FILE_DEVICE_DISK_FILE_SYSTEM); if (NT_SUCCESS(Status)) DeviceCount++; + /* Register EXT2 */ + /*Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\Ext2", + L"\\FileSystem\\Ext2Recognizer", + FS_TYPE_EXT2, + FILE_DEVICE_DISK_FILE_SYSTEM); + if (NT_SUCCESS(Status)) DeviceCount++;*/ + /* Return appropriate Status */ return (DeviceCount > 0) ? STATUS_SUCCESS : STATUS_IMAGE_ALREADY_LOADED; } Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h Mon Feb 11 19:41:25 2008 @@ -180,7 +180,8 @@ FS_TYPE_VFAT, FS_TYPE_NTFS, FS_TYPE_CDFS, - FS_TYPE_UDFS + FS_TYPE_UDFS, + FS_TYPE_EXT2, } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE; // @@ -230,6 +231,13 @@ NTSTATUS NTAPI FsRecUdfsFsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +NTAPI +FsRecExt2FsControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.rbuild (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.rbuild Mon Feb 11 19:41:25 2008 @@ -6,6 +6,7 @@ <library>hal</library> <file>blockdev.c</file> <file>cdfs.c</file> + <file>ext2.c</file> <file>fat.c</file> <file>fs_rec.c</file> <file>ntfs.c</file>

1 0

[hpoussin] 32291: Those a __stdcall functions
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 19:27:30 2008 New Revision: 32291 URL: http://svn.reactos.org/svn/reactos?rev=32291&view=rev Log: Those a __stdcall functions Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def Mon Feb 11 19:27:30 2008 @@ -199,7 +199,7 @@ FsRtlDeleteTunnelCache FsRtlDeregisterUncProvider FsRtlDissectDbcs -FsRtlDissectName +FsRtlDissectName@16 FsRtlDoesDbcsContainWildCards FsRtlDoesNameContainWildCards@4 FsRtlFastCheckLockForRead @@ -230,7 +230,7 @@ FsRtlIsFatDbcsLegal FsRtlIsHpfsDbcsLegal FsRtlIsNameInExpression@16 -FsRtlIsNtstatusExpected +FsRtlIsNtstatusExpected@4 FsRtlIsPagingFile FsRtlIsTotalDeviceFailure FsRtlLegalAnsiCharacterArray=_FsRtlLegalAnsiCharacterArray @@ -255,7 +255,7 @@ FsRtlNotifyCleanup FsRtlNotifyFilterChangeDirectory FsRtlNotifyFilterReportChange -FsRtlNotifyFullChangeDirectory +FsRtlNotifyFullChangeDirectory@40 FsRtlNotifyFullReportChange FsRtlNotifyInitializeSync FsRtlNotifyReportChange

1 0

[hpoussin] 32290: Display a message when directories are created
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 17:06:37 2008 New Revision: 32290 URL: http://svn.reactos.org/svn/reactos?rev=32290&view=rev Log: Display a message when directories are created Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=32290&r1=3228… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Mon Feb 11 17:06:37 2008 @@ -365,15 +365,22 @@ RBUILD_FLAGS := -rReactOS-$(ARCH).rbuild -DARCH=$(ARCH) $(INTERMEDIATE): + $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) $(OUTPUT): + $(ECHO_MKDIR) ${mkdir} $@ endif +ifneq ($(TEMPORARY),$(INTERMEDIATE)) +ifneq ($(TEMPORARY),$(OUTPUT)) $(TEMPORARY): + $(ECHO_MKDIR) ${mkdir} $@ +endif +endif BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h

1 0

[hpoussin] 32289: Fix case when $(TEMPORARY) is not the current directory. Fixed with the help of nanotonne (nanotonne at free.fr) on IRC
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 16:43:27 2008 New Revision: 32289 URL: http://svn.reactos.org/svn/reactos?rev=32289&view=rev Log: Fix case when $(TEMPORARY) is not the current directory. Fixed with the help of nanotonne (nanotonne at free.fr) on IRC Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Feb 11 16:43:27 2008 @@ -1260,7 +1260,7 @@ "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAGS)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).coff: $(source) $(module_rbuild) $(WRC_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).coff: $(source) $(module_rbuild) $(WRC_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" "\t$(ECHO_WRC)\n" "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS} $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp\n" "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp\n"

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