Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 39033: Alex Vlasov - Implement FAT operations (scanning, finding continuous runs). - Implement and plug in VCB initialization.
by fireball＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: fireball Date: Fri Jan 23 04:19:57 2009 New Revision: 39033 URL: http://svn.reactos.org/svn/reactos?rev=39033&view=rev Log: Alex Vlasov - Implement FAT operations (scanning, finding continuous runs). - Implement and plug in VCB initialization. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] Fri Jan 23 04:19:57 2009 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: drivers/filesystems/fastfat/fat.c * PURPOSE: FAT support routines - * PROGRAMMERS: + * PROGRAMMERS: Alexey Vlasov */ /* INCLUDES *****************************************************************/ @@ -11,7 +11,678 @@ #define NDEBUG #include "fastfat.h" +/* PROTOTYPES ***************************************************************/ +typedef struct _FAT_SCAN_CONTEXT +{ + PFILE_OBJECT FileObject; + LARGE_INTEGER PageOffset; + LONGLONG BeyoundLastEntryOffset; + PVOID PageBuffer; + PBCB PageBcb; +} FAT_SCAN_CONTEXT; + +#define FatEntryToDataOffset(xEntry, xVcb) \ + ((xVcb)->DataArea + (((LONGLONG) ((xEntry) - 0x02)) << (xVcb)->BytesPerClusterLog)) + +#define FatDataOffsetToEntry(xOffset, xVcb) \ + ((ULONG) ((xOffset - (xVcb)->DataArea) >> (xVcb)->BytesPerClusterLog) + 0x02) + +ULONG +FatScanFat12ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait); + +ULONG +FatSetFat12ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait); + +ULONG +FatScanFat12ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatSetFat12ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatScanFat16ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait); + +ULONG +FatSetFat16ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait); + +ULONG +FatScanFat16ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatSetFat16ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatScanFat32ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait); + +ULONG +FatSetFat32ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait); + +ULONG +FatScanFat32ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatSetFat32ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +BOOLEAN +NTAPI +FatValidBpb( + IN PBIOS_PARAMETER_BLOCK Bpb); + +/* VARIABLES ****************************************************************/ +FAT_METHODS Fat12Methods = { + FatScanFat12ForContinousRun, + FatSetFat12ContinousRun, + FatScanFat16ForValueRun, + FatSetFat12ValueRun +}; + +FAT_METHODS Fat16Methods = { + FatScanFat16ForContinousRun, + FatSetFat16ContinousRun, + FatScanFat16ForValueRun, + FatSetFat16ValueRun +}; + +FAT_METHODS Fat32Methods = { + FatScanFat32ForContinousRun, + FatSetFat32ContinousRun, + FatScanFat32ForValueRun, + FatSetFat32ValueRun +}; + /* FUNCTIONS ****************************************************************/ - +FORCEINLINE +ULONG +FatPowerOfTwo( + ULONG Number) +/* + * FUNCTION: + * Determines the index of the set bit. + * ARGUMENTS: + * Number = Number having a single bit set. + * RETURNS: Index of the set bit. + */ +{ + ULONG Temp; + Temp = Number + - ((Number >> 1) & 033333333333) + - ((Number >> 2) & 011111111111); + return (((Temp + (Temp >> 3)) & 030707070707) % 63); +} + +ULONG +FatScanFat12ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat12ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat12ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat12ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat16ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat16ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat16ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat16ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat32ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait) +/* + * FUNCTION: + * Scans FAT32 for continous chain of clusters + * ARGUMENTS: + * Context = Pointer to FAT_SCAN_CONTEXT. + * Index = Supplies the Index of the first cluster + * and receves the last index after the last + * cluster in the chain. + * CanWait = Indicates if the context allows blocking. + * RETURNS: Value of the last claster terminated the scan. + * NOTES: Raises STATUS_CANT_WAIT race condition. + */ +{ + LONGLONG PageOffset; + SIZE_T OffsetWithinPage, PageValidLength; + PULONG Entry, BeyoudLastEntry; + /* + * Determine page offset and the offset within page + * for the first cluster. + */ + PageValidLength = PAGE_SIZE; + PageOffset = ((LONGLONG) *Index) << 0x2; + OffsetWithinPage = (SIZE_T) (PageOffset & (PAGE_SIZE - 1)); + PageOffset -= OffsetWithinPage; + /* + * Check if the context already has the required page mapped. + * Map the first page is necessary. + */ + if (PageOffset != Context->PageOffset.QuadPart) + { + Context->PageOffset.QuadPart = PageOffset; + if (Context->PageBcb != NULL) + { + CcUnpinData(Context->PageBcb); + Context->PageBcb = NULL; + } + if (!CcMapData(Context->FileObject, &Context->PageOffset, + PAGE_SIZE, CanWait, &Context->PageBcb, &Context->PageBuffer)) + { + Context->PageOffset.QuadPart = 0LL; + ExRaiseStatus(STATUS_CANT_WAIT); + } + } + Entry = Add2Ptr(Context->PageBuffer, OffsetWithinPage, PULONG); + /* + * Next Page Offset. + */ + PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; + if (PageOffset > Context->BeyoundLastEntryOffset) + PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + - Context->PageOffset.QuadPart); + BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PULONG); + while (TRUE) + { + do + { + if ((*Entry & FAT_CLUSTER_LAST) != ++(*Index) ) + return (*Entry & FAT_CLUSTER_LAST); + } + while (++Entry < BeyoudLastEntry); + /* + * Check if this is the last available entry. + */ + if (PageValidLength < PAGE_SIZE) + break; + /* + * We are getting beyound current page and + * are still in the continous run, map the next page. + */ + Context->PageOffset.QuadPart = PageOffset; + CcUnpinData(Context->PageBcb); + if (!CcMapData(Context->FileObject, + &Context->PageOffset, PAGE_SIZE, CanWait, + &Context->PageBcb, &Context->PageBuffer)) + { + Context->PageBcb = NULL; + Context->PageOffset.QuadPart = 0LL; + ExRaiseStatus(STATUS_CANT_WAIT); + } + Entry = (PULONG) Context->PageBuffer; + /* + * Next Page Offset. + */ + PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; + if (PageOffset > Context->BeyoundLastEntryOffset) + PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + - Context->PageOffset.QuadPart); + BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PULONG); + } + return (*Index - 1); +} + +ULONG +FatSetFat32ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat32ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat32ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat( + IN PFCB Fcb, + IN LONGLONG Vbo, + OUT PLONGLONG Lbo, + IN OUT PLONGLONG Length, + OUT PULONG Index, + IN BOOLEAN CanWait +) +/* + * FUNCTION: + * Queries file MCB for the specified region [Vbo, Vbo + Length], + * returns the number of runs in the region as well as the first + * run of the range itself. + * If the specified region is not fully cached in MCB the routine + * scans FAT for the file and fills the MCB until the file offset + * (defined as Vbo + Length) is reached. + * ARGUMENTS: + * Fcb = Pointer to FCB structure for the file. + * Vbo = Virtual Byte Offset in the file. + * Lbo = Receives the Value of Logical Byte offset corresponding + * to supplied Vbo Value. + * Length = Supplies file range length to be examined and recieves + * the length of first run. + * OutIndex = Recieves the index (in MCB cache) of first run. + * RETURNS: Incremented index of the last run (+1). + * NOTES: Should be called by I/O routines to split the I/O operation + * into sequential or parallel I/O operations. + */ +{ + LONGLONG CurrentLbo, CurrentVbo, BeyoundLastVbo, CurrentLength; + ULONG Entry, NextEntry, NumberOfEntries, CurrentIndex; + FAT_SCAN_CONTEXT Context; + PVCB Vcb; + + /* + * Some often used values + */ + Vcb = Fcb->Vcb; + CurrentIndex = 0; + BeyoundLastVbo = Vbo + *Length; + CurrentLength = ((LONGLONG) Vcb->Clusters) << Vcb->BytesPerClusterLog; + if (BeyoundLastVbo > CurrentLength) + BeyoundLastVbo = CurrentLength; + /* + * Try to locate first run. + */ + if (FsRtlLookupLargeMcbEntry(&Fcb->Mcb, Vbo, Lbo, Length, NULL, NULL, Index)) + { + /* + * Check if we have a single mapped run. + */ + if (Vbo >= BeyoundLastVbo) + goto FatScanFcbFatExit; + } else { + *Length = 0L; + } + /* + * Get the first scan startup values. + */ + if (FsRtlLookupLastLargeMcbEntryAndIndex( + &Fcb->Mcb, &CurrentVbo, &CurrentLbo, &CurrentIndex)) + { + Entry = FatDataOffsetToEntry(CurrentLbo, Vcb); + } + else + { + /* + * Map is empty, set up initial values. + */ + Entry = Fcb->FirstCluster; + if (Entry <= 0x2) + ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); + if (Entry >= Vcb->Clusters) + { + if (Entry < FAT_CLUSTER_LAST) + ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); + BeyoundLastVbo = 0LL; + } + CurrentIndex = 0L; + CurrentVbo = 0LL; + } + RtlZeroMemory(&Context, sizeof(Context)); + Context.FileObject = Vcb->VolumeFileObject; + while (CurrentVbo < BeyoundLastVbo) + { + /* + * Locate Continous run starting with the current entry. + */ + NumberOfEntries = Entry; + NextEntry = Vcb->Methods.ScanContinousRun( + &Context, &NumberOfEntries, CanWait); + NumberOfEntries -= Entry; + /* + * Check value that terminated the for being valid for FAT. + */ + if (NextEntry <= 0x2) + ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); + if (NextEntry >= Vcb->Clusters) + { + if (NextEntry < FAT_CLUSTER_LAST) + ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); + break; + } + /* + * Add new run. + */ + CurrentLength = ((LONGLONG) NumberOfEntries) + << Vcb->BytesPerClusterLog; + FsRtlAddLargeMcbEntry(&Fcb->Mcb, + CurrentVbo, + FatEntryToDataOffset(Entry, Vcb), + CurrentLength); + /* + * Setup next iteration. + */ + Entry = NextEntry; + CurrentVbo += CurrentLength; + CurrentIndex ++; + } + if (*Length == 0LL && CurrentIndex > 0) + { + if (!FsRtlLookupLargeMcbEntry(&Fcb->Mcb, + Vbo, Lbo, Length, NULL, NULL, Index)) + { + *Index = 0L; + *Lbo = 0LL; + } + } +FatScanFcbFatExit: + return CurrentIndex; +} + +BOOLEAN +NTAPI +FatValidBpb( + IN PBIOS_PARAMETER_BLOCK Bpb) +{ + return (FatValidBytesPerSector(Bpb->BytesPerSector) + && FatValidSectorsPerCluster(Bpb->SectorsPerCluster) + && Bpb->ReservedSectors > 0 + && Bpb->Fats > 0 + && (Bpb->Sectors > 0 || Bpb->LargeSectors > 0) + && (Bpb->SectorsPerFat > 0 + || (Bpb->LargeSectorsPerFat > 0 && Bpb->FsVersion == 0)) + && (Bpb->Media == 0xf0 + || Bpb->Media == 0xf8 + || Bpb->Media == 0xf9 + || Bpb->Media == 0xfb + || Bpb->Media == 0xfc + || Bpb->Media == 0xfd + || Bpb->Media == 0xfe + || Bpb->Media == 0xff) + && (Bpb->SectorsPerFat == 0 || Bpb->RootEntries > 0) + && (Bpb->SectorsPerFat > 0 || !Bpb->MirrorDisabled)); +} + +VOID +FatiInitializeVcb( + PVCB Vcb) +{ + ULONG ClustersCapacity; + + /* Various characteristics needed for navigation in FAT */ + if ((Vcb->Sectors = Vcb->Bpb.Sectors) == 0) + Vcb->Sectors = Vcb->Bpb.LargeSectors; + if ((Vcb->SectorsPerFat = Vcb->Bpb.SectorsPerFat) == 0) + Vcb->SectorsPerFat = Vcb->Bpb.LargeSectorsPerFat; + Vcb->RootDirent = Vcb->Bpb.ReservedSectors + Vcb->Bpb.Fats * Vcb->SectorsPerFat; + Vcb->RootDirentSectors = BytesToSectors(Vcb, + Vcb->Bpb.RootEntries * sizeof(DIR_ENTRY)); + Vcb->DataArea = Vcb->RootDirent + Vcb->RootDirentSectors; + Vcb->Clusters = (Vcb->Sectors - Vcb->Bpb.ReservedSectors + - Vcb->Bpb.Fats * Vcb->SectorsPerFat + - Vcb->RootDirentSectors) / Vcb->Bpb.SectorsPerCluster; + if (Vcb->BytesPerClusterLog < 4087) + { + Vcb->IndexDepth = 0x0c; + Vcb->Methods = Fat12Methods; + } + else + { + Vcb->IndexDepth = 0x10; + Vcb->Methods = Fat16Methods; + } + /* Large Sectors are used for FAT32 */ + if (Vcb->Bpb.Sectors == 0) { + Vcb->IndexDepth = 0x20; + Vcb->Methods = Fat32Methods; + } + ClustersCapacity = (SectorsToBytes(Vcb, Vcb->Sectors) * 0x8 / Vcb->IndexDepth) - 1; + if (Vcb->Clusters > ClustersCapacity) + Vcb->Clusters = ClustersCapacity; + Vcb->BytesPerCluster = SectorsToBytes(Vcb, Vcb->Bpb.SectorsPerCluster); + Vcb->BytesPerClusterLog = FatPowerOfTwo(Vcb->BytesPerCluster); + Vcb->BeyoundLastClusterInFat = ((LONGLONG) Vcb->Clusters) * Vcb->IndexDepth / 0x8; +} + +NTSTATUS +FatInitializeVcb( + IN PVCB Vcb, + IN PDEVICE_OBJECT TargetDeviceObject, + IN PVPB Vpb) +{ + NTSTATUS Status; + PBCB Bcb; + PVOID Buffer; + LARGE_INTEGER Offset; + + RtlZeroMemory(Vcb, sizeof(*Vcb)); + + /* + * Initialize list head, so that it will + * not fail in cleanup. + */ + InitializeListHead(&Vcb->VcbLinks); + + /* Setup FCB Header. */ + Vcb->Header.NodeTypeCode = FAT_NTC_VCB; + Vcb->Header.NodeByteSize = sizeof(*Vcb); + + /* Setup Vcb fields */ + Vcb->TargetDeviceObject = TargetDeviceObject; + ObReferenceObject(TargetDeviceObject); + + /* Setup FCB Header. */ + ExInitializeFastMutex(&Vcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Vcb->Header, &Vcb->HeaderMutex); + + /* Create Volume File Object. */ + Vcb->VolumeFileObject = IoCreateStreamFileObject(NULL, + Vcb->TargetDeviceObject); + + /* We have to setup all FCB fields needed for CC. */ + Vcb->VolumeFileObject->FsContext = Vcb; + Vcb->VolumeFileObject->SectionObjectPointer = &Vcb->SectionObjectPointers; + + + /* At least full boot sector should be available. */ + Vcb->Header.FileSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); + Vcb->Header.AllocationSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); + Vcb->Header.ValidDataLength.HighPart = MAXLONG; + Vcb->Header.ValidDataLength.LowPart = MAXULONG; + + /* Initialize CC. */ + CcInitializeCacheMap(Vcb->VolumeFileObject, + (PCC_FILE_SIZES) &Vcb->Header.AllocationSize, + FALSE, + &FatGlobalData.CacheMgrNoopCallbacks, + Vcb); + + /* Read boot sector */ + Offset.QuadPart = 0; + Bcb = NULL; + /* + * Note: Volume Read path does not require + * any of the parameters set further + * in this routine. + */ + if (CcMapData(Vcb->VolumeFileObject, + &Offset, + sizeof(PACKED_BOOT_SECTOR), + TRUE, + &Bcb, + &Buffer)) + { + PPACKED_BOOT_SECTOR BootSector = (PPACKED_BOOT_SECTOR) Buffer; + FatUnpackBios(&Vcb->Bpb, &BootSector->PackedBpb); + if (!(FatBootSectorJumpValid(BootSector->Jump) + && FatValidBpb(&Vcb->Bpb))) + { + Status = STATUS_UNRECOGNIZED_VOLUME; + } + CopyUchar4( &Vpb->SerialNumber, BootSector->Id ); + CcUnpinData(Bcb); + } + else + { + Status = STATUS_UNRECOGNIZED_VOLUME; + goto FatInitializeVcbCleanup; + } + FatiInitializeVcb(Vcb); + /* Add this Vcb to grobal Vcb list. */ + InsertTailList(&FatGlobalData.VcbListHead, &Vcb->VcbLinks); + return STATUS_SUCCESS; + +FatInitializeVcbCleanup: + + /* Unwind the routine actions */ + FatUninitializeVcb(Vcb); + return Status; +} + +VOID +FatUninitializeVcb( + IN PVCB Vcb) +{ + LARGE_INTEGER ZeroSize; + + ZeroSize.QuadPart = 0LL; + + /* Close volume file */ + if (Vcb->VolumeFileObject != NULL) + { + /* Uninitialize CC. */ + CcUninitializeCacheMap(Vcb->VolumeFileObject, &ZeroSize, NULL); + ObDereferenceObject(Vcb->VolumeFileObject); + Vcb->VolumeFileObject = NULL; + } + /* Unlink from global Vcb list. */ + RemoveEntryList(&Vcb->VcbLinks); + + /* Release Target Device */ + ObReferenceObject(Vcb->TargetDeviceObject); + Vcb->TargetDeviceObject = NULL; +} /* EOF */ + + Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Fri Jan 23 04:19:57 2009 @@ -109,10 +109,20 @@ /* Save device object in a VPB */ Vpb->DeviceObject = (PDEVICE_OBJECT)VolumeDevice; - /* TODO: Initialize VCB for this volume */ + /* Initialize VCB for this volume */ + Status = FatInitializeVcb(&VolumeDevice->Vcb, TargetDeviceObject, Vpb); + if (!NT_SUCCESS(Status)) + goto FatMountVolumeCleanup; /* Return success */ return STATUS_SUCCESS; + + +FatMountVolumeCleanup: + + /* Unwind the routine actions */ + IoDeleteDevice((PDEVICE_OBJECT)VolumeDevice); + return Status; }

1 0

[fireball] 39032: - Add TAG definition to be compatible with GCC multicharacter constants. - Change FAT_NTC_VCB to a TAG-based definition.
by fireball＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: fireball Date: Fri Jan 23 04:09:22 2009 New Revision: 39032 URL: http://svn.reactos.org/svn/reactos?rev=39032&view=rev Log: - Add TAG definition to be compatible with GCC multicharacter constants. - Change FAT_NTC_VCB to a TAG-based definition. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Fri Jan 23 04:09:22 2009 @@ -2,6 +2,11 @@ #include <ntdddisk.h> #include <reactos/helper.h> #include <debug.h> + +#ifndef TAG +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif + #include <fat.h> #include <fatstruc.h> Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Fri Jan 23 04:09:22 2009 @@ -78,7 +78,8 @@ PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; } FAT_METHODS, *PFAT_METHODS; -#define FAT_NTC_VCB (USHORT) 'VF' +#define FAT_NTC_VCB (USHORT)TAG('F', 'V', 0, 0); + /* Volume Control Block */ typedef struct _VCB {

1 0

[fireball] 39031: - Fix FatValidSectorsPerCluster, otherwise it ended up always being true for any sectors amount.
by fireball＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: fireball Date: Fri Jan 23 04:07:15 2009 New Revision: 39031 URL: http://svn.reactos.org/svn/reactos?rev=39031&view=rev Log: - Fix FatValidSectorsPerCluster, otherwise it ended up always being true for any sectors amount. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.h [iso-8859-1] Fri Jan 23 04:07:15 2009 @@ -132,7 +132,7 @@ (!((xBytes) & ((xBytes)-1)) && (xBytes)>=0x80 && (xBytes)<=0x1000) #define FatValidSectorsPerCluster(xSectors) \ - (!((xSectors) & ((xSectors)-1)) && (xSectors)>=0 && (xSectors)<=0x80) + (!((xSectors) & ((xSectors)-1)) && (xSectors)>0 && (xSectors)<=0x80) typedef struct _PACKED_BOOT_SECTOR {

1 0

[fireball] 39030: Alex Vlasov - Move and rewrite FAT in-memory structures to fatstruc.h. - Remove PACKED_LFN_ENTRY structure. - Add declarations of VCB functions (init, uninit), and FAT scanning.
by fireball＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: fireball Date: Fri Jan 23 03:49:45 2009 New Revision: 39030 URL: http://svn.reactos.org/svn/reactos?rev=39030&view=rev Log: Alex Vlasov - Move and rewrite FAT in-memory structures to fatstruc.h. - Remove PACKED_LFN_ENTRY structure. - Add declarations of VCB functions (init, uninit), and FAT scanning. Added: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h (with props) Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fat.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Fri Jan 23 03:49:45 2009 @@ -84,7 +84,7 @@ NULL, NULL, 0, - sizeof(VFATFCB), + sizeof(FCB), TAG_FCB, 0); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Fri Jan 23 03:49:45 2009 @@ -2,189 +2,11 @@ #include <ntdddisk.h> #include <reactos/helper.h> #include <debug.h> +#include <fat.h> +#include <fatstruc.h> -/* FAT on-disk data structures */ -#include <fat.h> - -/* File system types */ -#define FAT16 (1) -#define FAT12 (2) -#define FAT32 (3) -#define FATX16 (4) -#define FATX32 (5) - -/* VCB Flags */ -#define VCB_VOLUME_LOCKED 0x0001 -#define VCB_DISMOUNT_PENDING 0x0002 -#define VCB_IS_FATX 0x0004 -#define VCB_IS_DIRTY 0x4000 /* Volume is dirty */ -#define VCB_CLEAR_DIRTY 0x8000 /* Clean dirty flag at shutdown */ - -typedef struct -{ - ULONG VolumeID; - ULONG FATStart; - ULONG FATCount; - ULONG FATSectors; - ULONG rootDirectorySectors; - ULONG rootStart; - ULONG dataStart; - ULONG RootCluster; - ULONG SectorsPerCluster; - ULONG BytesPerSector; - ULONG BytesPerCluster; - ULONG NumberOfClusters; - ULONG FatType; - ULONG Sectors; - BOOLEAN FixedMedia; -} FATINFO, *PFATINFO; - -struct _VFATFCB; -struct _VFAT_DIRENTRY_CONTEXT; - -typedef struct DEVICE_EXTENSION *PDEVICE_EXTENSION; - -typedef struct _DEVICE_EXTENSION -{ - ERESOURCE DirResource; - ERESOURCE FatResource; - - KSPIN_LOCK FcbListLock; - LIST_ENTRY FcbListHead; - ULONG HashTableSize; - struct _HASHENTRY** FcbHashTable; - - PDEVICE_OBJECT StorageDevice; - PFILE_OBJECT FATFileObject; - FATINFO FatInfo; - ULONG LastAvailableCluster; - ULONG AvailableClusters; - BOOLEAN AvailableClustersValid; - ULONG Flags; - struct _VFATFCB * VolumeFcb; - - ULONG BaseDateYear; - - LIST_ENTRY VolumeListEntry; -} DEVICE_EXTENSION; - -typedef struct _FAT_GLOBAL_DATA -{ - ERESOURCE Resource; - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DiskDeviceObject; - NPAGED_LOOKASIDE_LIST NonPagedFcbList; - NPAGED_LOOKASIDE_LIST ResourceList; - NPAGED_LOOKASIDE_LIST IrpContextList; - FAST_IO_DISPATCH FastIoDispatch; - CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; - CACHE_MANAGER_CALLBACKS CacheMgrNoopCallbacks; -} FAT_GLOBAL_DATA, *VFAT_GLOBAL_DATA; - -extern FAT_GLOBAL_DATA FatGlobalData; - -/* FCB flags */ -#define FCB_CACHE_INITIALIZED 0x0001 -#define FCB_DELETE_PENDING 0x0002 -#define FCB_IS_FAT 0x0004 -#define FCB_IS_PAGE_FILE 0x0008 -#define FCB_IS_VOLUME 0x0010 -#define FCB_IS_DIRTY 0x0020 -#define FCB_IS_FATX_ENTRY 0x0040 - -typedef struct _VFATFCB -{ - /* FCB header required by ROS/NT */ - FSRTL_COMMON_FCB_HEADER RFCB; - SECTION_OBJECT_POINTERS SectionObjectPointers; - ERESOURCE MainResource; - ERESOURCE PagingIoResource; - /* end FCB header required by ROS/NT */ - - /* Pointer to attributes in entry */ - PUCHAR Attributes; - - /* long file name, points into PathNameBuffer */ - UNICODE_STRING LongNameU; - - /* short file name */ - UNICODE_STRING ShortNameU; - - /* directory name, points into PathNameBuffer */ - UNICODE_STRING DirNameU; - - /* path + long file name 260 max*/ - UNICODE_STRING PathNameU; - - /* buffer for PathNameU */ - PWCHAR PathNameBuffer; - - /* buffer for ShortNameU */ - WCHAR ShortNameBuffer[13]; - - /* */ - LONG RefCount; - - /* List of FCB's for this volume */ - LIST_ENTRY FcbListEntry; - - /* pointer to the parent fcb */ - struct _VFATFCB* parentFcb; - - /* Flags for the fcb */ - ULONG Flags; - - /* pointer to the file object which has initialized the fcb */ - PFILE_OBJECT FileObject; - - /* Directory index for the short name entry */ - ULONG dirIndex; - - /* Directory index where the long name starts */ - ULONG startIndex; - - /* Share access for the file object */ - SHARE_ACCESS FCBShareAccess; - - /* Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLEANUP */ - ULONG OpenHandleCount; - - /* List of byte-range locks for this file */ - FILE_LOCK FileLock; - - /* - * Optimalization: caching of last read/write cluster+offset pair. Can't - * be in VFATCCB because it must be reset everytime the allocated clusters - * change. - */ - FAST_MUTEX LastMutex; - ULONG LastCluster; - ULONG LastOffset; -} VFATFCB, *PVFATFCB; - -typedef struct _VFATCCB -{ - LARGE_INTEGER CurrentByteOffset; - /* for DirectoryControl */ - ULONG Entry; - /* for DirectoryControl */ - UNICODE_STRING SearchPattern; -} VFATCCB, *PVFATCCB; - -/* Volume Control Block */ -typedef struct _VCB -{ - FSRTL_ADVANCED_FCB_HEADER VolumeFileHeader; -} VCB, *PVCB; - -/* Volume Device Object */ -typedef struct _VOLUME_DEVICE_OBJECT -{ - DEVICE_OBJECT DeviceObject; - FSRTL_COMMON_FCB_HEADER VolumeHeader; - VCB Vcb; /* Must be the last entry! */ -} VOLUME_DEVICE_OBJECT, *PVOLUME_DEVICE_OBJECT; - +#define Add2Ptr(P,I,T) ((T)((PUCHAR)(P) + (I))) +#define PtrOffset(B,O) ((ULONG)((ULONG_PTR)(O) - (ULONG_PTR)(B))) #ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) @@ -194,50 +16,6 @@ #define TAG_FCB TAG('V', 'F', 'C', 'B') #define TAG_IRP TAG('V', 'I', 'R', 'P') #define TAG_VFAT TAG('V', 'F', 'A', 'T') - -typedef struct __DOSTIME -{ - USHORT Second:5; - USHORT Minute:6; - USHORT Hour:5; -} -DOSTIME, *PDOSTIME; - -typedef struct __DOSDATE -{ - USHORT Day:5; - USHORT Month:4; - USHORT Year:5; -} -DOSDATE, *PDOSDATE; - -#define IRPCONTEXT_CANWAIT 0x0001 -#define IRPCONTEXT_PENDINGRETURNED 0x0002 -#define IRPCONTEXT_STACK_IO_CONTEXT 0x0004 - -typedef struct _FAT_IRP_CONTEXT -{ - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - UCHAR MajorFunction; - UCHAR MinorFunction; - PFILE_OBJECT FileObject; - ULONG Flags; - PVCB Vcb; - ULONG PinCount; - struct _FAT_IO_CONTEXT *FatIoContext; - - PDEVICE_EXTENSION DeviceExt; - WORK_QUEUE_ITEM WorkQueueItem; - PIO_STACK_LOCATION Stack; - KEVENT Event; -} FAT_IRP_CONTEXT, *PFAT_IRP_CONTEXT; - -typedef struct _FAT_IO_CONTEXT -{ - PMDL ZeroMdl; -} _FAT_IO_CONTEXT, *PFAT_IO_CONTEXT; - /* ------------------------------------------------------ shutdown.c */ DRIVER_DISPATCH FatShutdown; @@ -337,6 +115,24 @@ /* ----------------------------------------------------------- fat.c */ +NTSTATUS +FatInitializeVcb( + IN PVCB Vcb, + IN PDEVICE_OBJECT TargetDeviceObject, + IN PVPB Vpb); + +VOID +FatUninitializeVcb( + IN PVCB Vcb); + +ULONG +FatScanFat( + IN PFCB Fcb, + IN LONGLONG Vbo, OUT PLONGLONG Lbo, + IN OUT PLONGLONG Length, + OUT PULONG Index, + IN BOOLEAN CanWait); + /* ------------------------------------------------------ device.c */ NTSTATUS NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.h [iso-8859-1] Fri Jan 23 03:49:45 2009 @@ -283,15 +283,4 @@ FAT_DIRENT_ATTR_SYSTEM | \ FAT_DIRENT_ATTR_VOLUME_ID) -typedef struct _PACKED_LFN_DIRENT { - UCHAR Ordinal; // offset = 0 - UCHAR Name1[10]; // offset = 1 (Really 5 chars, but not WCHAR aligned) - UCHAR Attributes; // offset = 11 - UCHAR Type; // offset = 12 - UCHAR Checksum; // offset = 13 - WCHAR Name2[6]; // offset = 14 - USHORT MustBeZero; // offset = 26 - WCHAR Name3[2]; // offset = 28 -} PACKED_LFN_DIRENT; // sizeof = 32 - #endif//__FAT_H__ Added: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h (added) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Fri Jan 23 03:49:45 2009 @@ -1,0 +1,202 @@ +#ifndef __STRUCT_H__ +#define __STRUCT_H__ + +typedef struct _FAT_SCAN_CONTEXT *PFAT_SCAN_CONTEXT; +typedef struct _FAT_IO_CONTEXT *PFAT_IO_CONTEXT; +typedef PVOID PBCB; + +typedef struct _FAT_GLOBAL_DATA +{ + ERESOURCE Resource; + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DiskDeviceObject; + LIST_ENTRY VcbListHead; + NPAGED_LOOKASIDE_LIST NonPagedFcbList; + NPAGED_LOOKASIDE_LIST ResourceList; + NPAGED_LOOKASIDE_LIST IrpContextList; + FAST_IO_DISPATCH FastIoDispatch; + CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; + CACHE_MANAGER_CALLBACKS CacheMgrNoopCallbacks; + BOOLEAN Win31FileSystem; + /* Jan 1, 1980 System Time */ + LARGE_INTEGER DefaultFileTime; +} FAT_GLOBAL_DATA; + +#define IRPCONTEXT_CANWAIT 0x0001 +#define IRPCONTEXT_PENDINGRETURNED 0x0002 +#define IRPCONTEXT_STACK_IO_CONTEXT 0x0004 +#define IRPCONTEXT_WRITETHROUGH 0x0008 +#define IRPCONTEXT_TOPLEVEL 0x0010 + +typedef struct _FAT_IRP_CONTEXT +{ + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + UCHAR MajorFunction; + UCHAR MinorFunction; + PFILE_OBJECT FileObject; + ULONG Flags; + struct _VCB *Vcb; + ULONG PinCount; + struct _FAT_IO_CONTEXT *FatIoContext; + + WORK_QUEUE_ITEM WorkQueueItem; + PIO_STACK_LOCATION Stack; + KEVENT Event; +} FAT_IRP_CONTEXT, *PFAT_IRP_CONTEXT; + +typedef struct _FAT_IO_CONTEXT +{ + PMDL ZeroMdl; + PIRP MasterIrp; + LONG IrpCount; + union + { + struct + { + PERESOURCE Resource; + PERESOURCE PagingIoResource; + ERESOURCE_THREAD ResourceThreadId; + ULONG RequestedByteCount; + PFILE_OBJECT FileObject; + BOOLEAN ReadOperation; + } Async; + KEVENT SyncEvent; + } Wait; + PIRP Irp[0]; +} FAT_IO_CONTEXT; + +typedef ULONG (*PFAT_SCANFAT_FOR_CONTINOUS_RUN_ROUTINE) (struct _FAT_SCAN_CONTEXT*, PULONG, BOOLEAN); +typedef ULONG (*PFAT_SETFAT_CONTINOUS_RUN_ROUTINE) (PFAT_SCAN_CONTEXT, ULONG, ULONG, BOOLEAN); +typedef ULONG (*PFAT_SCANFAT_FOR_VALUE_RUN_ROUTINE) (PFAT_SCAN_CONTEXT, PULONG, ULONG, BOOLEAN); +typedef ULONG (*PFAT_SETFAT_VALUE_RUN_ROUTINE) (PFAT_SCAN_CONTEXT, ULONG, ULONG, ULONG, BOOLEAN); + +typedef struct _FAT_METHODS { + PFAT_SCANFAT_FOR_CONTINOUS_RUN_ROUTINE ScanContinousRun; + PFAT_SETFAT_CONTINOUS_RUN_ROUTINE SetContinousRun; + PFAT_SCANFAT_FOR_VALUE_RUN_ROUTINE ScanValueRun; + PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; +} FAT_METHODS, *PFAT_METHODS; + +#define FAT_NTC_VCB (USHORT) 'VF' +/* Volume Control Block */ +typedef struct _VCB +{ + FSRTL_ADVANCED_FCB_HEADER Header; + FAST_MUTEX HeaderMutex; + SECTION_OBJECT_POINTERS SectionObjectPointers; + + PFILE_OBJECT VolumeFileObject; + PDEVICE_OBJECT TargetDeviceObject; + LIST_ENTRY VcbLinks; + + /* Volume Characteristics: */ + ULONG SerialNumber; + BIOS_PARAMETER_BLOCK Bpb; + ULONG BytesPerClusterLog; + ULONG BytesPerCluster; + ULONG SectorsPerFat; + ULONG DataArea; + ULONG Sectors; + ULONG Clusters; + ULONG IndexDepth; + ULONG RootDirent; + ULONG RootDirentSectors; + LONGLONG BeyoundLastClusterInFat; + FAT_METHODS Methods; + /* Root Directory Fcb: */ + struct _FCB *RootFcb; +} VCB, *PVCB; + +#define VcbToVolumeDeviceObject(xVcb) \ + CONTAINING_RECORD((xVcb), VOLUME_DEVICE_OBJECT, Vcb)) + +#define VcbToDeviceObject(xVcb) \ + &(VcbToVolumeDeviceObject(xVcb)->DeviceObject) + + +#define SectorsToBytes(xVcb, xSectrors) \ + ((xVcb)->Bpb.BytesPerSector * (xSectrors)) + +#define BytesToSectors(xVcb, xBytes) \ + ((xBytes + (xVcb)->Bpb.BytesPerSector - 1) / (xVcb)->Bpb.BytesPerSector) + +#define SectorsToClusters(xVcb, xSectors) \ + ((xSectors + (xVcb)->Bpb.SectorsPerCluster - 1) / (xVcb)->Bpb.SectorsPerCluster) + +#define VCB_FAT_BITMAP_SIZE 0x10000 +#define VcbFatBitmapIndex(xCluster) ((xCluster)/VCB_FAT_BITMAP_SIZE) + +/* Volume Device Object */ +typedef struct _VOLUME_DEVICE_OBJECT +{ + DEVICE_OBJECT DeviceObject; + union { + FSRTL_COMMON_FCB_HEADER VolumeHeader; + VCB Vcb; /* Must be the last entry! */ + }; +} VOLUME_DEVICE_OBJECT, *PVOLUME_DEVICE_OBJECT; +// +// Short name always exists in FAT +// +enum _FCB_NAME_TYPE { + FcbShortName = 0x0, + FcbLongName +} FCB_NAME_TYPE; + +typedef struct _FCB_NAME_LINK { + RTL_SPLAY_LINKS Links; + UNICODE_STRING String; + UCHAR Type; +} FCB_NAME_LINK, *PFCB_NAME_LINK; + +#define FAT_NTC_FCB (USHORT) 'CF' +#define FAT_NTC_DCB (USHORT) 'DF' + +typedef struct _FCB +{ + FSRTL_ADVANCED_FCB_HEADER Header; + /* + * Later we might want to move the next four fields + * into a separate structureif we decide to split + * FCB into paged and non paged parts + * (as it is done in MS implementation + */ + FAST_MUTEX HeaderMutex; + SECTION_OBJECT_POINTERS SectionObjectPointers; + ERESOURCE Resource; + ERESOURCE PagingIoResource; + + FILE_LOCK Lock; + /* Reference to the Parent Dcb*/ + struct _FCB *ParentFcb; + /* Pointer to a Vcb */ + PVCB Vcb; + /* Mcb mapping Vbo->Lbo */ + LARGE_MCB Mcb; + ULONG FirstCluster; + /* Links into FCB Trie */ + FCB_NAME_LINK FileName[0x2]; + /* Buffer for the short name */ + WCHAR ShortNameBuffer[0xc]; + union + { + struct + { + /* Bitmap to search for free dirents. */ + /* RTL_BITMAP Bitmap; */ + PRTL_SPLAY_LINKS SplayLinks; + } Dcb; + }; +} FCB, *PFCB; + +typedef struct _CCB +{ + LARGE_INTEGER CurrentByteOffset; + ULONG Entry; + UNICODE_STRING SearchPattern; +} CCB, *PCCB; + +extern FAT_GLOBAL_DATA FatGlobalData; + +#endif//__STRUCT_H__ Propchange: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 39029: Alex Vlasov - Implement FatRead as a wrapper around internal helper FatiRead. - Stubplement FatiRead.
by fireball＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: fireball Date: Fri Jan 23 03:41:30 2009 New Revision: 39029 URL: http://svn.reactos.org/svn/reactos?rev=39029&view=rev Log: Alex Vlasov - Implement FatRead as a wrapper around internal helper FatiRead. - Stubplement FatiRead. Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Fri Jan 23 03:41:30 2009 @@ -4,6 +4,7 @@ * FILE: drivers/filesystems/fastfat/rw.c * PURPOSE: Read/write support * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * Alexey Vlasov */ /* INCLUDES *****************************************************************/ @@ -15,10 +16,66 @@ NTSTATUS NTAPI +FatiRead(PFAT_IRP_CONTEXT IrpContext) +{ + CSHORT FcbType; + ULONG NumberOfBytes; + + FcbType = *((PCSHORT) IrpContext->FileObject->FsContext); + NumberOfBytes = IrpContext->Stack->Parameters.Read.Length; + if (NumberOfBytes == 0) + { + FatCompleteRequest(IrpContext, IrpContext->Irp, STATUS_SUCCESS); + return STATUS_SUCCESS; + } + //if (FcbType == FAT_NTC_VCB) + + DPRINT1("FatiRead()\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI FatRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + NTSTATUS Status; + BOOLEAN TopLevel, CanWait; + PFAT_IRP_CONTEXT IrpContext; + + CanWait = TRUE; + TopLevel = FALSE; + Status = STATUS_INVALID_DEVICE_REQUEST; + /* Get CanWait flag */ + if (IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL) + CanWait = IoIsOperationSynchronous(Irp); + + /* Enter FsRtl critical region */ + FsRtlEnterFileSystem(); + + if (DeviceObject != FatGlobalData.DiskDeviceObject) + { + /* Set Top Level IRP if not set */ + if (IoGetTopLevelIrp() == NULL) + { + IoSetTopLevelIrp(Irp); + TopLevel = TRUE; + } + + /* Build an irp context */ + IrpContext = FatBuildIrpContext(Irp, CanWait); + + /* Perform the actual read */ + Status = FatiRead(IrpContext); + + /* Restore top level Irp */ + if (TopLevel) + IoSetTopLevelIrp(NULL); + } + /* Leave FsRtl critical region */ + FsRtlExitFileSystem(); + DPRINT1("FatRead()\n"); - return STATUS_NOT_IMPLEMENTED; + return Status; } NTSTATUS

1 0

[fireball] 39028: - Bring FatPerformDevIoCtrl to our coding standards (tabs->spaces, comments). - Change WaitReason to Executive ("A driver should set this value to Executive, ..." (c) WDK)
by fireball＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: fireball Date: Fri Jan 23 03:28:03 2009 New Revision: 39028 URL: http://svn.reactos.org/svn/reactos?rev=39028&view=rev Log: - Bring FatPerformDevIoCtrl to our coding standards (tabs->spaces, comments). - Change WaitReason to Executive ("A driver should set this value to Executive, ..." (c) WDK) Modified: trunk/reactos/drivers/filesystems/fastfat_new/device.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/device.c [iso-8859-1] Fri Jan 23 03:28:03 2009 @@ -23,12 +23,12 @@ NTSTATUS FatPerformDevIoCtrl(PDEVICE_OBJECT DeviceObject, - ULONG ControlCode, - PVOID InputBuffer, - ULONG InputBufferSize, - PVOID OutputBuffer, - ULONG OutputBufferSize, - BOOLEAN Override) + ULONG ControlCode, + PVOID InputBuffer, + ULONG InputBufferSize, + PVOID OutputBuffer, + ULONG OutputBufferSize, + BOOLEAN Override) { PIRP Irp; KEVENT Event; @@ -36,32 +36,37 @@ PIO_STACK_LOCATION Stack; IO_STATUS_BLOCK IoStatus; + /* Initialize the event for waiting */ KeInitializeEvent(&Event, NotificationEvent, FALSE); + /* Build the device I/O control request */ Irp = IoBuildDeviceIoControlRequest(ControlCode, - DeviceObject, - InputBuffer, - InputBufferSize, - OutputBuffer, - OutputBufferSize, - FALSE, - &Event, - &IoStatus); - if (Irp == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } + DeviceObject, + InputBuffer, + InputBufferSize, + OutputBuffer, + OutputBufferSize, + FALSE, + &Event, + &IoStatus); + /* Fail if IRP hasn't been allocated */ + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set verify override flag if requested */ if (Override) { Stack = IoGetNextIrpStackLocation(Irp); Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; } + /* Call the driver */ Status = IoCallDriver(DeviceObject, Irp); + + /* Wait if needed */ if (Status == STATUS_PENDING) { - KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = IoStatus.Status; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Fri Jan 23 03:28:03 2009 @@ -344,12 +344,12 @@ NTSTATUS FatPerformDevIoCtrl(PDEVICE_OBJECT DeviceObject, - ULONG ControlCode, - PVOID InputBuffer, - ULONG InputBufferSize, - PVOID OutputBuffer, - ULONG OutputBufferSize, - BOOLEAN Override); + ULONG ControlCode, + PVOID InputBuffer, + ULONG InputBufferSize, + PVOID OutputBuffer, + ULONG OutputBufferSize, + BOOLEAN Override); /* ------------------------------------------------------ direntry.c */

1 0

[cfinck] 39027: Output the string indicating the test which is going to be run in one call. This should prevent a race condition, when another application also outputs something over the debug line.
by cfinck＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: cfinck Date: Thu Jan 22 16:12:13 2009 New Revision: 39027 URL: http://svn.reactos.org/svn/reactos?rev=39027&view=rev Log: Output the string indicating the test which is going to be run in one call. This should prevent a race condition, when another application also outputs something over the debug line. Modified: trunk/rostests/rosautotest/winetests.c Modified: trunk/rostests/rosautotest/winetests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/winetests.c?r… ============================================================================== --- trunk/rostests/rosautotest/winetests.c [iso-8859-1] (original) +++ trunk/rostests/rosautotest/winetests.c [iso-8859-1] Thu Jan 22 16:12:13 2009 @@ -49,13 +49,14 @@ LogLength = BUFFER_BLOCKSIZE; } + /* Allocate a buffer with the exact size of the output string. + We have to output this string in one call to prevent a race condition, when another application also outputs a string over the debug line. */ + Buffer = HeapAlloc(hProcessHeap, 0, 27 + strlen(GetSuiteIDData->Module) + 8 + strlen(GetSuiteIDData->Test) + 2); + sprintf(Buffer, "Running Wine Test, Module: %s, Test: %s\n", GetSuiteIDData->Module, GetSuiteIDData->Test); + StringOut(Buffer); + HeapFree(hProcessHeap, 0, Buffer); + /* Execute the test */ - StringOut("Running Wine Test, Module: "); - StringOut(GetSuiteIDData->Module); - StringOut(", Test: "); - StringOut(GetSuiteIDData->Test); - StringOut("\n"); - if(!CreateProcessW(NULL, CommandLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &ProcessInfo)) { StringOut("CreateProcessW for running the test failed\n");

1 0

[pschweitzer] 39026: Updated French translations for input.dll and shell32.dll
by pschweitzer＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: pschweitzer Date: Thu Jan 22 13:52:25 2009 New Revision: 39026 URL: http://svn.reactos.org/svn/reactos?rev=39026&view=rev Log: Updated French translations for input.dll and shell32.dll Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] Thu Jan 22 13:52:25 2009 @@ -2,17 +2,17 @@ IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 +CAPTION "Paramètres" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sélectionnez les service que vous désirez pour chaque langue de saisie affichée dans la liste.\nUtiliser les boutons Ajouter et Supprimer pour modifier la liste.", -1, 9, 6, 238, 25 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 - PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 - PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 142, 70, 14 - GROUPBOX "Preferences", -1, 7, 185, 240, 36 - PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + PUSHBUTTON "Ajouter...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "Supp&rimer...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "&Propriétés...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "Préférences", -1, 7, 185, 240, 36 + PUSHBUTTON "Paramètres des touches...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 @@ -47,22 +47,22 @@ IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Changer les séquences de touches" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", -1, 9, 5, 155, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 - LTEXT "Shift", -1, 73, 37, 27, 12 + AUTOCHECKBOX "Changer le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Maj", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 - AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 - LTEXT "Shift", -1, 74, 87, 27, 12 + AUTORADIOBUTTON "&ALT Gauche", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "Changer les dispositions clavier", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Maj", -1, 74, 87, 27, 12 CTEXT "+", -1, 63, 87, 8, 9 AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 - AUTORADIOBUTTON "Left A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + AUTORADIOBUTTON "A&LT Gauche", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 172, 27, 50, 14 END IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -87,15 +87,15 @@ IDS_UNKNOWN "(Inconnu)" IDS_RESTART "Désirez-vous redémarrer votre ordinateur maintenant ?" IDS_WHATS_THIS "Qu'est-ce que c'est ?" - IDS_LANGUAGE "Language" - IDS_LAYOUT "Keyboard Layout" - IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_LANGUAGE "Langue" + IDS_LAYOUT "Disposition du clavier" + IDS_REM_QUESTION "Êtes-vous sûr de vouloir supprimer la disposition sélectionnée ?" IDS_CONFIRMATION "Confirmation" - IDS_LAYOUT_EXISTS "This layout already exists." - IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." - IDS_CTRL_SHIFT "Ctrl+Shift" - IDS_LEFT_ALT_SHIFT "Left Alt+Shift" - IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_LAYOUT_EXISTS "Cette disposition existe déjà." + IDS_LAYOUT_EXISTS2 "Cette disposition existe déjà et ne peut être ajoutée." + IDS_CTRL_SHIFT "Ctrl+Maj" + IDS_LEFT_ALT_SHIFT "Alt Gauche+Maj" + IDS_SWITCH_BET_INLANG "Changer les langues de saisie" END /* FIXME : To improve/complete */ Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Thu Jan 22 13:52:25 2009 @@ -569,14 +569,14 @@ CHKDSK_DLG DIALOGEX 50, 50, 194, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Check Disk" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 - PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 +CAPTION "Vérifier le disque" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Démarrer", IDOK, 53, 100, 60, 14 + GROUPBOX "Options de vérification", -1, 7, 6, 179, 50 + PUSHBUTTON "Annuler", IDCANCEL, 118, 100, 60, 14 + AUTOCHECKBOX "Réparer automatiquement les erreurs du système de fichiers", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "&Scanner pour rechercher et réparer les secteurs défectueux", 14001, 16, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -627,7 +627,7 @@ IDS_MYCOMPUTER "Poste de travail" IDS_RECYCLEBIN_FOLDER_NAME "Corbeille" IDS_CONTROLPANEL "Panneau de configuration" - IDS_ADMINISTRATIVETOOLS "Administrative Tools" + IDS_ADMINISTRATIVETOOLS "Outils d'administration" /* context menus */ IDS_VIEW_LARGE "&Grandes icônes" @@ -642,9 +642,9 @@ IDS_PROPERTIES "&Propriétés" IDS_CUT "C&ouper" IDS_RESTORE "Res&taurer" - IDS_FORMATDRIVE "Format..." - IDS_RENAME "Rename" - IDS_INSERT "Insert" + IDS_FORMATDRIVE "Formater..." + IDS_RENAME "Renommer" + IDS_INSERT "Insérer" IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier"

1 0

[pschweitzer] 39025: - Implemented FatPerformDevIoCtrl - Use it while mounting new volume to get the right sector size. This fixes a TODO (that was looking as a hack :p)
by pschweitzer＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: pschweitzer Date: Thu Jan 22 11:25:28 2009 New Revision: 39025 URL: http://svn.reactos.org/svn/reactos?rev=39025&view=rev Log: - Implemented FatPerformDevIoCtrl - Use it while mounting new volume to get the right sector size. This fixes a TODO (that was looking as a hack :p) Modified: trunk/reactos/drivers/filesystems/fastfat_new/device.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/device.c [iso-8859-1] Thu Jan 22 11:25:28 2009 @@ -21,4 +21,51 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +FatPerformDevIoCtrl(PDEVICE_OBJECT DeviceObject, + ULONG ControlCode, + PVOID InputBuffer, + ULONG InputBufferSize, + PVOID OutputBuffer, + ULONG OutputBufferSize, + BOOLEAN Override) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + PIO_STACK_LOCATION Stack; + IO_STATUS_BLOCK IoStatus; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = IoBuildDeviceIoControlRequest(ControlCode, + DeviceObject, + InputBuffer, + InputBufferSize, + OutputBuffer, + OutputBufferSize, + FALSE, + &Event, + &IoStatus); + if (Irp == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (Override) + { + Stack = IoGetNextIrpStackLocation(Irp); + Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; + } + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + return Status; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Thu Jan 22 11:25:28 2009 @@ -342,6 +342,15 @@ NTSTATUS NTAPI FatDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS +FatPerformDevIoCtrl(PDEVICE_OBJECT DeviceObject, + ULONG ControlCode, + PVOID InputBuffer, + ULONG InputBufferSize, + PVOID OutputBuffer, + ULONG OutputBufferSize, + BOOLEAN Override); + /* ------------------------------------------------------ direntry.c */ /* ----------------------------------------------------------- fcb.c */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Thu Jan 22 11:25:28 2009 @@ -55,6 +55,7 @@ PDEVICE_OBJECT FsDeviceObject) { NTSTATUS Status; + DISK_GEOMETRY DiskGeometry; PVOLUME_DEVICE_OBJECT VolumeDevice; DPRINT1("FatMountVolume()\n"); @@ -89,8 +90,18 @@ /* Init stack size */ VolumeDevice->DeviceObject.StackSize = TargetDeviceObject->StackSize + 1; - /* TODO: IOCTL_DISK_GET_DRIVE_GEOMETRY to obtain BytesPerSector */ - VolumeDevice->DeviceObject.SectorSize = 512; + /* Get sector size */ + Status = FatPerformDevIoCtrl(TargetDeviceObject, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY), + TRUE); + + if (!NT_SUCCESS(Status)) return Status; + + VolumeDevice->DeviceObject.SectorSize = DiskGeometry.BytesPerSector; /* Signal we're done with initializing */ VolumeDevice->DeviceObject.Flags &= ~DO_DEVICE_INITIALIZING;

1 0

[sginsberg] 39024: - Fix a crash when menu allocation fails
by sginsberg＠svn.reactos.org 22 Jan '09

22 Jan '09

Author: sginsberg Date: Thu Jan 22 11:04:06 2009 New Revision: 39024 URL: http://svn.reactos.org/svn/reactos?rev=39024&view=rev Log: - Fix a crash when menu allocation fails Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Thu Jan 22 11:04:06 2009 @@ -1566,15 +1566,14 @@ return (HMENU)0; } Menu = IntCreateMenu(&Handle, !PopupMenu); - UserDereferenceObject(Menu); ObDereferenceObject(WinStaObject); } else { Menu = IntCreateMenu(&Handle, !PopupMenu); - UserDereferenceObject(Menu); - } - + } + + if (Menu) UserDereferenceObject(Menu); return (HMENU)Handle; }

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