Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[pschweitzer] 71429: [FS_REC] Add support for FFS volumes. Patch by Peter Hater. This is done for FFS support! Enjoy :-) CORE-11040 #resolve

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 27 12:18:47 2016 New Revision: 71429 URL: http://svn.reactos.org/svn/reactos?rev=71429&view=rev Log: [FS_REC] Add support for FFS volumes. Patch by Peter Hater. This is done for FFS support! Enjoy :-) CORE-11040 #resolve Added: trunk/reactos/drivers/filesystems/fs_rec/ffs.c (with props) trunk/reactos/drivers/filesystems/fs_rec/ffs.h (with props) Modified: trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h Modified: trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] Fri May 27 12:18:47 2016 @@ -4,6 +4,7 @@ cdfs.c ext2.c fat.c + ffs.c fs_rec.c ntfs.c reiserfs.c Added: trunk/reactos/drivers/filesystems/fs_rec/ffs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ffs.c (added) +++ trunk/reactos/drivers/filesystems/fs_rec/ffs.c [iso-8859-1] Fri May 27 12:18:47 2016 @@ -0,0 +1,220 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/ffs.c + * PURPOSE: FFS Recognizer + * PROGRAMMER: Peter Hater + * Pierre Schweitzer (pierre(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include "fs_rec.h" +#include "ffs.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +FsRecIsFfsDiskLabel(IN PFFSD_DISKLABEL dl) +{ + return (dl->d_magic == DISKMAGIC); +} + +BOOLEAN +NTAPI +FsRecIsFfs1Volume(IN PFFSD_SUPER_BLOCK sb) +{ + return (sb->fs_magic == FS_UFS1_MAGIC); +} + +BOOLEAN +NTAPI +FsRecIsFfs2Volume(IN PFFSD_SUPER_BLOCK sb) +{ + return (sb->fs_magic == FS_UFS2_MAGIC); +} + +NTSTATUS +NTAPI +FsRecFfsFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + PFFSD_SUPER_BLOCK Spb = NULL; + PFFSD_DISKLABEL DiskLabel = NULL; + ULONGLONG FSOffset = 0; + int i; + ULONG SectorSize; + LARGE_INTEGER Offset; + BOOLEAN DeviceError = FALSE; + PAGED_CODE(); + + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) + { + case IRP_MN_MOUNT_VOLUME: + + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; + + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) + { + /* Try to read the disklabel */ + Offset.QuadPart = LABELSECTOR*SectorSize; + if (FsRecReadBlock(MountDevice, + &Offset, + SectorSize, + SectorSize, + (PVOID)&DiskLabel, + &DeviceError)) + { + /* Check if it's an actual FFS disk label */ + if (FsRecIsFfsDiskLabel(DiskLabel)) + { + /* It is! */ + for (i = 0; i < MAXPARTITIONS; i++) + { + if (DiskLabel->d_partitions[i].p_fstype == FS_BSDFFS) + { + /* Important */ + FSOffset = DiskLabel->d_partitions[i].p_offset; + FSOffset = FSOffset * SectorSize; + /* Try to read the superblock */ + Offset.QuadPart = FSOffset+SBLOCK_UFS1; + if (FsRecReadBlock(MountDevice, + &Offset, + SBLOCKSIZE, + SectorSize, + (PVOID)&Spb, + &DeviceError)) + { + /* Check if it's an actual FFS volume */ + if (FsRecIsFfs1Volume(Spb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + else + { + /* Free the boot sector if we have one */ + ExFreePool(Spb); + Spb = NULL; + + Offset.QuadPart = FSOffset+SBLOCK_UFS2; + if (FsRecReadBlock(MountDevice, + &Offset, + SBLOCKSIZE, + SectorSize, + (PVOID)&Spb, + &DeviceError)) + { + /* Check if it's an actual FFS volume */ + if (FsRecIsFfs2Volume(Spb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + } + } + + /* Free the boot sector if we have one */ + ExFreePool(Spb); + Spb = NULL; + } + } + } + else + { + /* Try to read the superblock */ + Offset.QuadPart = FSOffset+SBLOCK_UFS1; + if (FsRecReadBlock(MountDevice, + &Offset, + SBLOCKSIZE, + SectorSize, + (PVOID)&Spb, + &DeviceError)) + { + /* Check if it's an actual FFS volume */ + if (FsRecIsFfs1Volume(Spb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + else + { + /* Free the boot sector if we have one */ + ExFreePool(Spb); + Spb = NULL; + + Offset.QuadPart = FSOffset+SBLOCK_UFS2; + if (FsRecReadBlock(MountDevice, + &Offset, + SBLOCKSIZE, + SectorSize, + (PVOID)&Spb, + &DeviceError)) + { + /* Check if it's an actual FFS volume */ + if (FsRecIsFfs2Volume(Spb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + } + } + + /* Free the boot sector if we have one */ + ExFreePool(Spb); + Spb = NULL; + } + } + + /* Free the boot sector if we have one */ + ExFreePool(DiskLabel); + } + else + { + /* We have some sort of failure in the storage stack */ + DeviceError = TRUE; + } + + /* 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\\ffs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Return Status */ + return Status; +} Propchange: trunk/reactos/drivers/filesystems/fs_rec/ffs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/fs_rec/ffs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ffs.h (added) +++ trunk/reactos/drivers/filesystems/fs_rec/ffs.h [iso-8859-1] Fri May 27 12:18:47 2016 @@ -0,0 +1,297 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/ffs.h + * PURPOSE: FFS Header File + * PROGRAMMER: Peter Hater + * Pierre Schweitzer (pierre(a)reactos.org) + */ + +#include <pshpack1.h> + +/* + * The path name on which the file system is mounted is maintained + * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in + * the super block for this name. + */ +#define MAXMNTLEN 468 + +/* + * The volume name for this filesystem is maintained in fs_volname. + * MAXVOLLEN defines the length of the buffer allocated. + * This space used to be part of of fs_fsmnt. + */ +#define MAXVOLLEN 32 + +/* + * Unused value currently, FreeBSD compat. + */ +#define FSMAXSNAP 20 + +/* + * There is a 128-byte region in the superblock reserved for in-core + * pointers to summary information. Originally this included an array + * of pointers to blocks of struct csum; now there are just four + * pointers and the remaining space is padded with fs_ocsp[]. + * NOCSPTRS determines the size of this padding. One pointer (fs_csp) + * is taken away to point to a contiguous array of struct csum for + * all cylinder groups; a second (fs_maxcluster) points to an array + * of cluster sizes that is computed as cylinder groups are inspected; + * the third (fs_contigdirs) points to an array that tracks the + * creation of new directories; and the fourth (fs_active) is used + * by snapshots. + */ +#define NOCSPTRS ((128 / sizeof(void *)) - 4) + +/* + * Per cylinder group information; summarized in blocks allocated + * from first cylinder group data blocks. These blocks have to be + * read in from fs_csaddr (size fs_cssize) in addition to the + * super block. + */ +struct csum { + INT32 cs_ndir; /* number of directories */ + INT32 cs_nbfree; /* number of free blocks */ + INT32 cs_nifree; /* number of free inodes */ + INT32 cs_nffree; /* number of free frags */ +}; + +struct csum_total { + INT64 cs_ndir; /* number of directories */ + INT64 cs_nbfree; /* number of free blocks */ + INT64 cs_nifree; /* number of free inodes */ + INT64 cs_nffree; /* number of free frags */ + INT64 cs_spare[4]; /* future expansion */ +}; + +/* + * Super block for an FFS file system in memory. + */ +typedef struct fs { + INT32 fs_firstfield; /* historic file system linked list, */ + INT32 fs_unused_1; /* used for incore super blocks */ + INT32 fs_sblkno; /* addr of super-block in filesys */ + INT32 fs_cblkno; /* offset of cyl-block in filesys */ + INT32 fs_iblkno; /* offset of inode-blocks in filesys */ + INT32 fs_dblkno; /* offset of first data after cg */ + INT32 fs_old_cgoffset; /* cylinder group offset in cylinder */ + INT32 fs_old_cgmask; /* used to calc mod fs_ntrak */ + INT32 fs_old_time; /* last time written */ + INT32 fs_old_size; /* number of blocks in fs */ + INT32 fs_old_dsize; /* number of data blocks in fs */ + INT32 fs_ncg; /* number of cylinder groups */ + INT32 fs_bsize; /* size of basic blocks in fs */ + INT32 fs_fsize; /* size of frag blocks in fs */ + INT32 fs_frag; /* number of frags in a block in fs */ +/* these are configuration parameters */ + INT32 fs_minfree; /* minimum percentage of free blocks */ + INT32 fs_old_rotdelay; /* num of ms for optimal next block */ + INT32 fs_old_rps; /* disk revolutions per second */ +/* these fields can be computed from the others */ + INT32 fs_bmask; /* ``blkoff'' calc of blk offsets */ + INT32 fs_fmask; /* ``fragoff'' calc of frag offsets */ + INT32 fs_bshift; /* ``lblkno'' calc of logical blkno */ + INT32 fs_fshift; /* ``numfrags'' calc number of frags */ +/* these are configuration parameters */ + INT32 fs_maxcontig; /* max number of contiguous blks */ + INT32 fs_maxbpg; /* max number of blks per cyl group */ +/* these fields can be computed from the others */ + INT32 fs_fragshift; /* block to frag shift */ + INT32 fs_fsbtodb; /* fsbtodb and dbtofsb shift constant */ + INT32 fs_sbsize; /* actual size of super block */ + INT32 fs_spare1[2]; /* old fs_csmask */ + /* old fs_csshift */ + INT32 fs_nindir; /* value of NINDIR */ + INT32 fs_inopb; /* value of INOPB */ + INT32 fs_old_nspf; /* value of NSPF */ +/* yet another configuration parameter */ + INT32 fs_optim; /* optimization preference, see below */ +/* these fields are derived from the hardware */ + INT32 fs_old_npsect; /* # sectors/track including spares */ + INT32 fs_old_interleave; /* hardware sector interleave */ + INT32 fs_old_trackskew; /* sector 0 skew, per track */ +/* fs_id takes the space of the unused fs_headswitch and fs_trkseek fields */ + INT32 fs_id[2]; /* unique file system id */ +/* sizes determined by number of cylinder groups and their sizes */ + INT32 fs_old_csaddr; /* blk addr of cyl grp summary area */ + INT32 fs_cssize; /* size of cyl grp summary area */ + INT32 fs_cgsize; /* cylinder group size */ +/* these fields are derived from the hardware */ + INT32 fs_spare2; /* old fs_ntrak */ + INT32 fs_old_nsect; /* sectors per track */ + INT32 fs_old_spc; /* sectors per cylinder */ + INT32 fs_old_ncyl; /* cylinders in file system */ + INT32 fs_old_cpg; /* cylinders per group */ + INT32 fs_ipg; /* inodes per group */ + INT32 fs_fpg; /* blocks per group * fs_frag */ +/* this data must be re-computed after crashes */ + struct csum fs_old_cstotal; /* cylinder summary information */ +/* these fields are cleared at mount time */ + INT8 fs_fmod; /* super block modified flag */ + INT8 fs_clean; /* file system is clean flag */ + INT8 fs_ronly; /* mounted read-only flag */ + UINT8 fs_old_flags; /* see FS_ flags below */ + UCHAR fs_fsmnt[MAXMNTLEN]; /* name mounted on */ + UCHAR fs_volname[MAXVOLLEN]; /* volume name */ + UINT64 fs_swuid; /* system-wide uid */ + INT32 fs_pad; +/* these fields retain the current block allocation info */ + INT32 fs_cgrotor; /* last cg searched (UNUSED) */ + void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */ + UINT8 *fs_contigdirs; /* # of contiguously allocated dirs */ + struct csum *fs_csp; /* cg summary info buffer for fs_cs */ + INT32 *fs_maxcluster; /* max cluster in each cyl group */ + INT32 *fs_active; /* used by snapshots to track fs */ + INT32 fs_old_cpc; /* cyl per cycle in postbl */ +/* this area is otherwise allocated unless fs_old_flags & FS_FLAGS_UPDATED */ + INT32 fs_maxbsize; /* maximum blocking factor permitted */ + INT64 fs_sparecon64[17]; /* old rotation block list head */ + INT64 fs_sblockloc; /* byte offset of standard superblock */ + struct csum_total fs_cstotal; /* cylinder summary information */ + INT64 fs_time; /* last time written */ + INT64 fs_size; /* number of blocks in fs */ + INT64 fs_dsize; /* number of data blocks in fs */ + INT64 fs_csaddr; /* blk addr of cyl grp summary area */ + INT64 fs_pendingblocks; /* blocks in process of being freed */ + INT32 fs_pendinginodes; /* inodes in process of being freed */ + INT32 fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */ +/* back to stuff that has been around a while */ + INT32 fs_avgfilesize; /* expected average file size */ + INT32 fs_avgfpdir; /* expected # of files per directory */ + INT32 fs_save_cgsize; /* save real cg size to use fs_bsize */ + INT32 fs_sparecon32[26]; /* reserved for future constants */ + INT32 fs_flags; /* see FS_ flags below */ +/* back to stuff that has been around a while (again) */ + INT32 fs_contigsumsize; /* size of cluster summary array */ + INT32 fs_maxsymlinklen; /* max length of an internal symlink */ + INT32 fs_old_inodefmt; /* format of on-disk inodes */ + UINT64 fs_maxfilesize; /* maximum representable file size */ + INT64 fs_qbmask; /* ~fs_bmask for use with 64-bit size */ + INT64 fs_qfmask; /* ~fs_fmask for use with 64-bit size */ + INT32 fs_state; /* validate fs_clean field (UNUSED) */ + INT32 fs_old_postblformat; /* format of positional layout tables */ + INT32 fs_old_nrpos; /* number of rotational positions */ + INT32 fs_spare5[2]; /* old fs_postbloff */ + /* old fs_rotbloff */ + INT32 fs_magic; /* magic number */ +} FFSD_SUPER_BLOCK, *PFFSD_SUPER_BLOCK; + +#define MAXPARTITIONS 16 /* number of partitions */ +#define NDDATA 5 +#define NSPARE 5 + +typedef struct disklabel { + UINT32 d_magic; /* the magic number */ + UINT16 d_type; /* drive type */ + UINT16 d_subtype; /* controller/d_type specific */ + char d_typename[16]; /* type name, e.g. "eagle" */ + + /* + * d_packname contains the pack identifier and is returned when + * the disklabel is read off the disk or in-core copy. + * d_boot0 and d_boot1 are the (optional) names of the + * primary (block 0) and secondary (block 1-15) bootstraps + * as found in /usr/mdec. These are returned when using + * getdiskbyname(3) to retrieve the values from /etc/disktab. + */ + union { + char un_d_packname[16]; /* pack identifier */ + struct { + char *un_d_boot0; /* primary bootstrap name */ + char *un_d_boot1; /* secondary bootstrap name */ + } un_b; + } d_un; + + /* disk geometry: */ + UINT32 d_secsize; /* # of bytes per sector */ + UINT32 d_nsectors; /* # of data sectors per track */ + UINT32 d_ntracks; /* # of tracks per cylinder */ + UINT32 d_ncylinders; /* # of data cylinders per unit */ + UINT32 d_secpercyl; /* # of data sectors per cylinder */ + UINT32 d_secperunit; /* # of data sectors per unit */ + + /* + * Spares (bad sector replacements) below are not counted in + * d_nsectors or d_secpercyl. Spare sectors are assumed to + * be physical sectors which occupy space at the end of each + * track and/or cylinder. + */ + UINT16 d_sparespertrack; /* # of spare sectors per track */ + UINT16 d_sparespercyl; /* # of spare sectors per cylinder */ + /* + * Alternative cylinders include maintenance, replacement, + * configuration description areas, etc. + */ + UINT32 d_acylinders; /* # of alt. cylinders per unit */ + + /* hardware characteristics: */ + /* + * d_interleave, d_trackskew and d_cylskew describe perturbations + * in the media format used to compensate for a slow controller. + * Interleave is physical sector interleave, set up by the + * formatter or controller when formatting. When interleaving is + * in use, logically adjacent sectors are not physically + * contiguous, but instead are separated by some number of + * sectors. It is specified as the ratio of physical sectors + * traversed per logical sector. Thus an interleave of 1:1 + * implies contiguous layout, while 2:1 implies that logical + * sector 0 is separated by one sector from logical sector 1. + * d_trackskew is the offset of sector 0 on track N relative to + * sector 0 on track N-1 on the same cylinder. Finally, d_cylskew + * is the offset of sector 0 on cylinder N relative to sector 0 + * on cylinder N-1. + */ + UINT16 d_rpm; /* rotational speed */ + UINT16 d_interleave; /* hardware sector interleave */ + UINT16 d_trackskew; /* sector 0 skew, per track */ + UINT16 d_cylskew; /* sector 0 skew, per cylinder */ + UINT32 d_headswitch; /* head switch time, usec */ + UINT32 d_trkseek; /* track-to-track seek, usec */ + UINT32 d_flags; /* generic flags */ + UINT32 d_drivedata[NDDATA]; /* drive-type specific information */ + UINT32 d_spare[NSPARE]; /* reserved for future use */ + UINT32 d_magic2; /* the magic number (again) */ + UINT16 d_checksum; /* xor of data incl. partitions */ + + /* filesystem and partition information: */ + UINT16 d_npartitions; /* number of partitions in following */ + UINT32 d_bbsize; /* size of boot area at sn0, bytes */ + UINT32 d_sbsize; /* max size of fs superblock, bytes */ + struct partition { /* the partition table */ + UINT32 p_size; /* number of sectors in partition */ + UINT32 p_offset; /* starting sector */ + union { + UINT32 fsize; /* FFS, ADOS: + filesystem basic fragment size */ + UINT32 cdsession; /* ISO9660: session offset */ + } __partition_u2; + UINT8 p_fstype; /* filesystem type, see below */ + UINT8 p_frag; /* filesystem fragments per block */ + union { + UINT16 cpg; /* UFS: FS cylinders per group */ + UINT16 sgs; /* LFS: FS segment shift */ + } __partition_u1; + } d_partitions[MAXPARTITIONS]; /* actually may be more */ +} FFSD_DISKLABEL, *PFFSD_DISKLABEL; +#include <poppack.h> + +C_ASSERT(FIELD_OFFSET(FFSD_SUPER_BLOCK, fs_cgsize) == 160); +C_ASSERT(FIELD_OFFSET(FFSD_SUPER_BLOCK, fs_fmod) == 208); +C_ASSERT(FIELD_OFFSET(FFSD_SUPER_BLOCK, fs_ocsp) == 728); + +#define SBLOCK_UFS1 8192 +#define SBLOCK_UFS2 65536 + +#define SBLOCKSIZE 8192 + +/* + * File system identification + */ +#define FS_UFS1_MAGIC 0x011954 /* UFS1 fast file system magic number */ +#define FS_UFS2_MAGIC 0x19540119 /* UFS2 fast file system magic number */ + +#define DISKMAGIC ((UINT32)0x82564557) /* The disk magic number */ + +#define LABELSECTOR 1 /* sector containing label */ + +#define FS_BSDFFS 7 /* 4.2BSD fast file system */ Propchange: trunk/reactos/drivers/filesystems/fs_rec/ffs.h ------------------------------------------------------------------------------ svn:eol-style = native 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] Fri May 27 12:18:47 2016 @@ -174,6 +174,12 @@ /* Send REISERFS command */ Status = FsRecReiserfsFsControl(DeviceObject, Irp); + break; + + case FS_TYPE_FFS: + + /* Send FFS command */ + Status = FsRecFfsFsControl(DeviceObject, Irp); break; default: @@ -414,6 +420,16 @@ FILE_DEVICE_DISK_FILE_SYSTEM); if (NT_SUCCESS(Status)) DeviceCount++; + /* Register FFS */ + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\ffs", + L"\\FileSystem\\FfsRecognizer", + FS_TYPE_FFS, + 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Fri May 27 12:18:47 2016 @@ -176,6 +176,7 @@ FS_TYPE_EXT2, FS_TYPE_BTRFS, FS_TYPE_REISERFS, + FS_TYPE_FFS, } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE; /* FS Recognizer State */ @@ -240,6 +241,13 @@ NTSTATUS NTAPI FsRecReiserfsFsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +NTAPI +FsRecFfsFsControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp );

8 years, 7 months

[pschweitzer] 71428: [PSDK] Now, ReactOS recognizes the FFS partition :-) CORE-11040

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 27 12:13:49 2016 New Revision: 71428 URL: http://svn.reactos.org/svn/reactos?rev=71428&view=rev Log: [PSDK] Now, ReactOS recognizes the FFS partition :-) CORE-11040 Modified: trunk/reactos/sdk/include/psdk/ntdddisk.h trunk/reactos/sdk/include/psdk/winioctl.h Modified: trunk/reactos/sdk/include/psdk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ntdddisk.… ============================================================================== --- trunk/reactos/sdk/include/psdk/ntdddisk.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ntdddisk.h [iso-8859-1] Fri May 27 12:13:49 2016 @@ -223,6 +223,9 @@ #ifdef __REACTOS__ #define PARTITION_OLD_LINUX 0x43 #define PARTITION_LINUX 0x83 +#define PARTITION_FREEBSD 0xA5 +#define PARTITION_OPENBSD 0xA6 +#define PARTITION_NETBSD 0xA9 #endif #define IsFTPartition( PartitionType ) \ @@ -248,8 +251,11 @@ ((PartitionType) == PARTITION_FAT32) || \ ((PartitionType) == PARTITION_FAT32_XINT13) || \ ((PartitionType) == PARTITION_XINT13) || \ - ((PartitionType) == PARTITION_LINUX) || \ - ((PartitionType) == PARTITION_OLD_LINUX)) + ((PartitionType) == PARTITION_LINUX) || \ + ((PartitionType) == PARTITION_OLD_LINUX) || \ + ((PartitionType) == PARTITION_FREEBSD) || \ + ((PartitionType) == PARTITION_OPENBSD) || \ + ((PartitionType) == PARTITION_NETBSD)) #else #define IsRecognizedPartition(PartitionType) ( \ (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT_12)) || \ Modified: trunk/reactos/sdk/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winioctl.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] Fri May 27 12:13:49 2016 @@ -197,6 +197,9 @@ #ifdef __REACTOS__ #define PARTITION_OLD_LINUX 0x43 #define PARTITION_LINUX 0x83 +#define PARTITION_FREEBSD 0xA5 +#define PARTITION_OPENBSD 0xA6 +#define PARTITION_NETBSD 0xA9 #endif #define SERIAL_LSRMST_ESCAPE 0 #define SERIAL_LSRMST_LSR_DATA 1 @@ -597,7 +600,10 @@ ((t&~PARTITION_NTFT)==PARTITION_FAT32_XINT13)||\ ((t&~PARTITION_NTFT)==PARTITION_XINT13)||\ ((t&~PARTITION_NTFT)==PARTITION_LINUX)||\ - ((t&~PARTITION_NTFT)==PARTITION_OLD_LINUX)) + ((t&~PARTITION_NTFT)==PARTITION_OLD_LINUX)||\ + ((t&~PARTITION_NTFT)==PARTITION_FREEBSD)||\ + ((t&~PARTITION_NTFT)==PARTITION_OPENBSD)||\ + ((t&~PARTITION_NTFT)==PARTITION_NETBSD)) #else #define IsRecognizedPartition(t)\ (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_12))||\

8 years, 7 months

[pschweitzer] 71427: [FFS] Enable the FFS support. Patch by Peter Hater. CORE-11040

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 27 12:12:18 2016 New Revision: 71427 URL: http://svn.reactos.org/svn/reactos?rev=71427&view=rev Log: [FFS] Enable the FFS support. Patch by Peter Hater. CORE-11040 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 [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Fri May 27 12:12:18 2016 @@ -1995,6 +1995,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Reiserfs\Parameters","CodePage",0x00000000,"default" HKLM,"SYSTEM\CurrentControlSet\Services\Reiserfs\Parameters","WritingSupport",0x00010001,0x00000001 +; FFS Filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\ffs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\ffs","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\ffs","ImagePath",0x00020000,"system32\drivers\ffs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\ffs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\ffs","Type",0x00010001,0x00000002 + ; Filesystem Filter Manager driver HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ErrorControl",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"Boot File System" 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 [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri May 27 12:12:18 2016 @@ -69,6 +69,7 @@ mountmgr.sys=,,,,,,x,,,,,,4 btrfs.sys=,,,,,,x,,,,,,4 reiserfs.sys=,,,,,,x,,,,,,4 +ffs.sys=,,,,,,x,,,,,,4 [SystemPartitionFiles]

8 years, 7 months

[pschweitzer] 71426: [AUTOCHK] Add support for FFS CORE-11040

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 27 12:11:15 2016 New Revision: 71426 URL: http://svn.reactos.org/svn/reactos?rev=71426&view=rev Log: [AUTOCHK] Add support for FFS CORE-11040 Modified: trunk/reactos/base/system/autochk/autochk.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Fri May 27 12:11:15 2016 @@ -279,6 +279,10 @@ { RtlInitUnicodeString(&ProviderDll, L"ureiserfs.dll"); } + else if (wcscmp(FileSystem, L"FFS") == 0) + { + RtlInitUnicodeString(&ProviderDll, L"uffs.dll"); + } else { return NULL;

8 years, 7 months

[pschweitzer] 71425: [FFS] Import the FFS driver by Jae-Hong Lee. Patch by Peter Hater CORE-11040

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 27 12:08:38 2016 New Revision: 71425 URL: http://svn.reactos.org/svn/reactos?rev=71425&view=rev Log: [FFS] Import the FFS driver by Jae-Hong Lee. Patch by Peter Hater CORE-11040 Added: trunk/reactos/drivers/filesystems/ffs/ trunk/reactos/drivers/filesystems/ffs/CMakeLists.txt (with props) trunk/reactos/drivers/filesystems/ffs/inc/ trunk/reactos/drivers/filesystems/ffs/inc/bootblock.h (with props) trunk/reactos/drivers/filesystems/ffs/inc/dinode.h (with props) trunk/reactos/drivers/filesystems/ffs/inc/dir.h (with props) trunk/reactos/drivers/filesystems/ffs/inc/disklabel.h (with props) trunk/reactos/drivers/filesystems/ffs/inc/ffsdrv.h (with props) trunk/reactos/drivers/filesystems/ffs/inc/fs.h (with props) trunk/reactos/drivers/filesystems/ffs/inc/gplntifs.h (with props) trunk/reactos/drivers/filesystems/ffs/inc/type.h (with props) trunk/reactos/drivers/filesystems/ffs/src/ trunk/reactos/drivers/filesystems/ffs/src/block.c (with props) trunk/reactos/drivers/filesystems/ffs/src/cleanup.c (with props) trunk/reactos/drivers/filesystems/ffs/src/close.c (with props) trunk/reactos/drivers/filesystems/ffs/src/cmcb.c (with props) trunk/reactos/drivers/filesystems/ffs/src/create.c (with props) trunk/reactos/drivers/filesystems/ffs/src/debug.c (with props) trunk/reactos/drivers/filesystems/ffs/src/devctl.c (with props) trunk/reactos/drivers/filesystems/ffs/src/dirctl.c (with props) trunk/reactos/drivers/filesystems/ffs/src/dispatch.c (with props) trunk/reactos/drivers/filesystems/ffs/src/except.c (with props) trunk/reactos/drivers/filesystems/ffs/src/fastio.c (with props) trunk/reactos/drivers/filesystems/ffs/src/ffs.c (with props) trunk/reactos/drivers/filesystems/ffs/src/ffsdrv.rc (with props) trunk/reactos/drivers/filesystems/ffs/src/fileinfo.c (with props) trunk/reactos/drivers/filesystems/ffs/src/flush.c (with props) trunk/reactos/drivers/filesystems/ffs/src/fsctl.c (with props) trunk/reactos/drivers/filesystems/ffs/src/init.c (with props) trunk/reactos/drivers/filesystems/ffs/src/lock.c (with props) trunk/reactos/drivers/filesystems/ffs/src/memory.c (with props) trunk/reactos/drivers/filesystems/ffs/src/misc.c (with props) trunk/reactos/drivers/filesystems/ffs/src/pnp.c (with props) trunk/reactos/drivers/filesystems/ffs/src/read.c (with props) trunk/reactos/drivers/filesystems/ffs/src/shutdown.c (with props) trunk/reactos/drivers/filesystems/ffs/src/volinfo.c (with props) trunk/reactos/drivers/filesystems/ffs/src/write.c (with props) Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/CMakeL… Added: trunk/reactos/drivers/filesystems/ffs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/CM… Added: trunk/reactos/drivers/filesystems/ffs/inc/bootblock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/in… Added: trunk/reactos/drivers/filesystems/ffs/inc/dinode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/in… Added: trunk/reactos/drivers/filesystems/ffs/inc/dir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/in… Added: trunk/reactos/drivers/filesystems/ffs/inc/disklabel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/in… Added: trunk/reactos/drivers/filesystems/ffs/inc/ffsdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/in… Added: trunk/reactos/drivers/filesystems/ffs/inc/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/in… Added: trunk/reactos/drivers/filesystems/ffs/inc/gplntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/in… Added: trunk/reactos/drivers/filesystems/ffs/inc/type.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/in… Added: trunk/reactos/drivers/filesystems/ffs/src/block.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/cmcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/devctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/ffs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/ffsdrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr… Added: trunk/reactos/drivers/filesystems/ffs/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ffs/sr…

8 years, 7 months

[pschweitzer] 71424: [UFFS] Add the FFS DLL CORE-11040

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 27 12:05:40 2016 New Revision: 71424 URL: http://svn.reactos.org/svn/reactos?rev=71424&view=rev Log: [UFFS] Add the FFS DLL CORE-11040 Added: trunk/reactos/dll/win32/uffs/ trunk/reactos/dll/win32/uffs/CMakeLists.txt (with props) trunk/reactos/dll/win32/uffs/uffs.c (with props) trunk/reactos/dll/win32/uffs/uffs.rc (with props) trunk/reactos/dll/win32/uffs/uffs.spec (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Fri May 27 12:05:40 2016 @@ -212,6 +212,7 @@ add_subdirectory(uext2) add_subdirectory(ufat) add_subdirectory(ufatx) +add_subdirectory(uffs) add_subdirectory(untfs) add_subdirectory(updspapi) add_subdirectory(ureiserfs) Added: trunk/reactos/dll/win32/uffs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uffs/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/uffs/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/uffs/CMakeLists.txt [iso-8859-1] Fri May 27 12:05:40 2016 @@ -0,0 +1,13 @@ + +spec2def(uffs.dll uffs.spec) + +list(APPEND SOURCE + uffs.c + uffs.rc + ${CMAKE_CURRENT_BINARY_DIR}/uffs.def) + +add_library(uffs SHARED ${SOURCE}) +set_module_type(uffs nativedll) +target_link_libraries(uffs ffslib) +add_importlibs(uffs ntdll) +add_cd_file(TARGET uffs DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/uffs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/uffs/uffs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uffs/uffs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/uffs/uffs.c (added) +++ trunk/reactos/dll/win32/uffs/uffs.c [iso-8859-1] Fri May 27 12:05:40 2016 @@ -0,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: FFS File System Management + * FILE: dll/win32/uffs/uffs.c + * PURPOSE: uffs DLL initialisation + * + * PROGRAMMERS: Pierre Schweitzer + */ + +#include <windef.h> + +INT WINAPI +DllMain( + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); + + return TRUE; +} Propchange: trunk/reactos/dll/win32/uffs/uffs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/uffs/uffs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uffs/uffs.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/uffs/uffs.rc (added) +++ trunk/reactos/dll/win32/uffs/uffs.rc [iso-8859-1] Fri May 27 12:05:40 2016 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "FFS File System Management" +#define REACTOS_STR_INTERNAL_NAME "uffs" +#define REACTOS_STR_ORIGINAL_FILENAME "uffs.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/uffs/uffs.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/uffs/uffs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uffs/uffs.spec?r… ============================================================================== --- trunk/reactos/dll/win32/uffs/uffs.spec (added) +++ trunk/reactos/dll/win32/uffs/uffs.spec [iso-8859-1] Fri May 27 12:05:40 2016 @@ -0,0 +1,2 @@ +@ stdcall ChkdskEx(ptr long long long long ptr) FfsChkdsk +@ stdcall FormatEx(ptr long ptr long long ptr) FfsFormat Propchange: trunk/reactos/dll/win32/uffs/uffs.spec ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 7 months

[pschweitzer] 71423: [FFSLIB] Stub the FFS lib CORE-11040

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 27 12:04:45 2016 New Revision: 71423 URL: http://svn.reactos.org/svn/reactos?rev=71423&view=rev Log: [FFSLIB] Stub the FFS lib CORE-11040 Added: trunk/reactos/sdk/lib/fslib/ffslib/ trunk/reactos/sdk/lib/fslib/ffslib/CMakeLists.txt (with props) trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c (with props) trunk/reactos/sdk/lib/fslib/ffslib/ffslib.h (with props) Modified: trunk/reactos/sdk/lib/fslib/CMakeLists.txt Modified: trunk/reactos/sdk/lib/fslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/CMakeLists.t… ============================================================================== --- trunk/reactos/sdk/lib/fslib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/CMakeLists.txt [iso-8859-1] Fri May 27 12:04:45 2016 @@ -1,6 +1,7 @@ add_subdirectory(btrfslib) add_subdirectory(ext2lib) +add_subdirectory(ffslib) add_subdirectory(ntfslib) add_subdirectory(reiserfslib) add_subdirectory(vfatlib) Added: trunk/reactos/sdk/lib/fslib/ffslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/ffslib/CMake… ============================================================================== --- trunk/reactos/sdk/lib/fslib/ffslib/CMakeLists.txt (added) +++ trunk/reactos/sdk/lib/fslib/ffslib/CMakeLists.txt [iso-8859-1] Fri May 27 12:04:45 2016 @@ -0,0 +1,3 @@ + +add_library(ffslib ffslib.c) +add_dependencies(ffslib psdk) Propchange: trunk/reactos/sdk/lib/fslib/ffslib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/ffslib/ffsli… ============================================================================== --- trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c (added) +++ trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c [iso-8859-1] Fri May 27 12:04:45 2016 @@ -0,0 +1,36 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FFS library + * FILE: lib/fslib/ffslib/ffslib.c + * PURPOSE: FFS lib + * PROGRAMMERS: Pierre Schweitzer + */ +#include "ffslib.h" + +#define NDEBUG +#include <debug.h> + +NTSTATUS NTAPI +FfsFormat(IN PUNICODE_STRING DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PUNICODE_STRING Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + + +NTSTATUS WINAPI +FfsChkdsk(IN PUNICODE_STRING DriveRoot, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} Propchange: trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/sdk/lib/fslib/ffslib/ffslib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/ffslib/ffsli… ============================================================================== --- trunk/reactos/sdk/lib/fslib/ffslib/ffslib.h (added) +++ trunk/reactos/sdk/lib/fslib/ffslib/ffslib.h [iso-8859-1] Fri May 27 12:04:45 2016 @@ -0,0 +1,8 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FFS library + * FILE: lib/fslib/ffslib/ffslib.h + */ +#define NTOS_MODE_USER +#include <ndk/umtypes.h> +#include <fmifs/fmifs.h> Propchange: trunk/reactos/sdk/lib/fslib/ffslib/ffslib.h ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 7 months

[hbelusca] 71422: [REACTOS]: Add a desktop shortcut to the ReadMe file of ReactOS, on both the livecd and installation. Useful for people discovering ReactOS for the first time.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 27 01:06:35 2016 New Revision: 71422 URL: http://svn.reactos.org/svn/reactos?rev=71422&view=rev Log: [REACTOS]: Add a desktop shortcut to the ReadMe file of ReactOS, on both the livecd and installation. Useful for people discovering ReactOS for the first time. Modified: trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Fri May 27 01:06:35 2016 @@ -51,6 +51,7 @@ ## NOTE: What would be nice is to create this list using /media/inf/shortcuts.inf ## and taking their default english translation! add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/livecd_start.cmd" DESTINATION "Profiles/Default User/My Documents" FOR livecd) +add_livecd_shortcut("Read Me" readme.txt "Profiles/All Users/Desktop") add_livecd_shortcut("Command Prompt" cmd.exe "Profiles/All Users/Desktop") add_livecd_shortcut("Device Manager" devmgmt.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") add_livecd_shortcut("Event Viewer" eventvwr.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Fri May 27 01:06:35 2016 @@ -14,6 +14,7 @@ GamesShortcuts=2, %GAMES% [DesktopShortcuts] +%SystemRoot%\readme.txt, %README_TITLE%, %README_DESC%, 0 %SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\rapps.exe, %RAPPS_TITLE_SHORT%, %RAPPS_DESC%, 0 @@ -69,6 +70,9 @@ ENTERTAINMENT=Entertainment COMMUNICATIONS=Communications GAMES=Games + +README_TITLE=Read Me +README_DESC=ReactOS Read Me CMD_TITLE=Command Prompt CMD_DESC=Open command prompt @@ -511,6 +515,9 @@ COMMUNICATIONS=Communications GAMES=Jeux +README_TITLE=Lisez-Moi +README_DESC=Fichier Lisez-Moi pour ReactOS + CMD_TITLE=Invite de commandes CMD_DESC=Ouvrir l'invite de commandes EXPLORER_TITLE=Explorateur ReactOS

8 years, 7 months

[hbelusca] 71421: [INCLUDES] probe.h: use ExFreePoolWithTag for releasing unicode strings capture, and fully clear up said strings.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 26 23:17:59 2016 New Revision: 71421 URL: http://svn.reactos.org/svn/reactos?rev=71421&view=rev Log: [INCLUDES] probe.h: use ExFreePoolWithTag for releasing unicode strings capture, and fully clear up said strings. Modified: trunk/reactos/sdk/include/reactos/probe.h Modified: trunk/reactos/sdk/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/probe.… ============================================================================== --- trunk/reactos/sdk/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/probe.h [iso-8859-1] Thu May 26 23:17:59 2016 @@ -53,9 +53,9 @@ #define ProbeForReadGenericType(Ptr, Type, Default) \ (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ - (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ - ExRaiseAccessViolation(), Default : \ - *(const volatile Type *)(Ptr)) + (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ + ExRaiseAccessViolation(), Default : \ + *(const volatile Type *)(Ptr)) #define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) #define ProbeForReadUchar(Ptr) ProbeForReadGenericType(Ptr, UCHAR, 0) @@ -144,7 +144,7 @@ IN const UNICODE_STRING *UnsafeSrc) { NTSTATUS Status = STATUS_SUCCESS; - WCHAR *Buffer = NULL; + PWCHAR Buffer = NULL; ASSERT(Dest != NULL); /* Probe the structure and buffer*/ @@ -162,9 +162,7 @@ { if (Dest->Length != 0) { - ProbeForRead(Dest->Buffer, - Dest->Length, - sizeof(WCHAR)); + ProbeForRead(Dest->Buffer, Dest->Length, sizeof(WCHAR)); /* Allocate space for the buffer */ Buffer = (PWCHAR)ExAllocatePoolWithTag(PagedPool, @@ -186,14 +184,14 @@ } else { - /* sanitize structure */ + /* Sanitize structure */ Dest->MaximumLength = 0; Dest->Buffer = NULL; } } else { - /* sanitize structure */ + /* Sanitize structure */ Dest->Length = 0; Dest->MaximumLength = 0; } @@ -203,7 +201,7 @@ /* Free allocated resources and zero the destination string */ if (Buffer != NULL) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, 'RTSU'); } Dest->Length = 0; Dest->MaximumLength = 0; @@ -232,8 +230,12 @@ { if(CurrentMode != KernelMode && CapturedString->Buffer != NULL) { - ExFreePool(CapturedString->Buffer); - } + ExFreePoolWithTag(CapturedString->Buffer, 'RTSU'); + } + + CapturedString->Length = 0; + CapturedString->MaximumLength = 0; + CapturedString->Buffer = NULL; } #endif /* INCLUDE_REACTOS_CAPTURE_H */

8 years, 7 months

[hbelusca] 71420: [WIN32K]: it can be useful to have a TAG_USTR for unicode strings.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 26 23:16:10 2016 New Revision: 71420 URL: http://svn.reactos.org/svn/reactos?rev=71420&view=rev Log: [WIN32K]: it can be useful to have a TAG_USTR for unicode strings. Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/user/ntuser/tags.h Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Thu May 26 23:16:10 2016 @@ -900,7 +900,7 @@ SafeFileNames.MaximumLength = SafeFileNames.Length = (USHORT)cbStringSize - sizeof(WCHAR); SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool, cbStringSize, - 'RTSU'); + TAG_USTR); if (!SafeFileNames.Buffer) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -926,7 +926,7 @@ { SetLastNtError(Status); /* Free the string buffer for the safe filename */ - ExFreePoolWithTag(SafeFileNames.Buffer,'RTSU'); + ExFreePoolWithTag(SafeFileNames.Buffer, TAG_USTR); return FALSE; } @@ -957,7 +957,7 @@ } /* Free the string for the safe filenames */ - ExFreePoolWithTag(SafeFileNames.Buffer,'RTSU'); + ExFreePoolWithTag(SafeFileNames.Buffer, TAG_USTR); return bRet; } Modified: trunk/reactos/win32ss/user/ntuser/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/tags.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/tags.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/tags.h [iso-8859-1] Thu May 26 23:16:10 2016 @@ -1,6 +1,7 @@ #pragma once #define TAG_STRING ' RTS' /* String */ +#define TAG_USTR 'RTSU' /* Unicode String */ #define TAG_HOOK 'ohsU' /* Hook */ #define TAG_MENUITEM 'emsU' /* Menu item */ #define TAG_MSG 'GSEM' /* Message */

8 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2016