Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 71421: [INCLUDES] probe.h: use ExFreePoolWithTag for releasing unicode strings capture, and fully clear up said strings.
by hbelusca＠svn.reactos.org 26 May '16

26 May '16

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 */

1 0

[hbelusca] 71420: [WIN32K]: it can be useful to have a TAG_USTR for unicode strings.
by hbelusca＠svn.reactos.org 26 May '16

26 May '16

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 */

1 0

[hbelusca] 71419: [NETSHELL]: Fix french orthograph.
by hbelusca＠svn.reactos.org 26 May '16

26 May '16

Author: hbelusca Date: Thu May 26 22:36:57 2016 New Revision: 71419 URL: http://svn.reactos.org/svn/reactos?rev=71419&view=rev Log: [NETSHELL]: Fix french orthograph. Modified: trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc Modified: trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc [iso-8859-1] Thu May 26 22:36:57 2016 @@ -85,7 +85,7 @@ LTEXT "Faut-il utiliser des paramÃ¨tres par dÃ©faut ou des spÃ©cifiques :", IDC_STATIC, 53, 7, 240, 20 AUTORADIOBUTTON "ParamÃ¨tres par dÃ©faut", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "ParamÃ¨tres spÃ©cifiques", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "CrÃ©e les connexion rÃ©seau en utilisant le client pour les rÃ©seaux ReactOS, le partage des fichiers et des imprimantes pour les rÃ©seaux ReactOS, et le protocole de transport TCP/IP avec adressage automatique.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "CrÃ©e les connexions rÃ©seau en utilisant le client pour les rÃ©seaux ReactOS, le partage des fichiers et des imprimantes pour les rÃ©seaux ReactOS, et le protocole de transport TCP/IP avec adressage automatique.", IDC_STATIC, 65, 45, 240, 30 LTEXT "Cela vous autorise Ã configurer manuellement les composants rÃ©seau.", IDC_STATIC, 65, 90, 243, 20 END @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Pour le pÃ©riphÃ©rique :", IDC_STATIC, 33, 2, 100, 50 - LTEXT "s. o.", IDC_NETWORK_DEVICE, 105, 2, 253, 20 + LTEXT "n/a", IDC_NETWORK_DEVICE, 105, 2, 253, 20 LTEXT "Les composants sÃ©lectionnÃ©s sont utilisÃ©s par cette connexion :", IDC_STATIC, 33, 12, 253, 20 CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 22, 250, 50 PUSHBUTTON "&Installer...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP @@ -110,12 +110,12 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Voulez-vous que cet ordinateur soit membre d'un domaine ?\n\ -(Vous pouvez obtenir cette information de votre administrateur rÃ©seau.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "Non, cet ordinateur fera parti d'un groupe de travail.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Oui, cet ordinateur fera parti d'un domaine.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP +(Vous pouvez obtenir cette information de votre administrateur rÃ©seau).", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "Non, cet ordinateur fera partie d'un groupe de travail.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Oui, cet ordinateur fera partie d'un domaine.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Nom du groupe de travail ou du domaine :", IDC_STATIC, 33, 72, 150, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "NOTE : Si cet ordinateur ne fera pas parti d'un rÃ©seau, si vous n'avez pas assez de droits pour rejoindre un rÃ©seau, ou si vous ne savez pas quoi entrer, choisissez groupe de travail pour l'instant. Ces options peuvent Ãªtre changÃ©es ultÃ©rieurement.", IDC_STATIC, 33, 107, 263, 50 + LTEXT "NOTE : Si cet ordinateur ne fera pas partie d'un rÃ©seau, si vous n'avez pas assez de droits pour rejoindre un rÃ©seau, ou si vous ne savez pas quoi entrer, choisissez groupe de travail pour l'instant. Ces options peuvent Ãªtre changÃ©es ultÃ©rieurement.", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE

1 0

[pschweitzer] 71418: [USETUP] Don't override the hidden sectors value set during format when seting up bootsector. This allows installing ReactOS on a FAT partition that doesn't start on sector 63....
by pschweitzer＠svn.reactos.org 26 May '16

26 May '16

Author: pschweitzer Date: Thu May 26 20:50:44 2016 New Revision: 71418 URL: http://svn.reactos.org/svn/reactos?rev=71418&view=rev Log: [USETUP] Don't override the hidden sectors value set during format when seting up bootsector. This allows installing ReactOS on a FAT partition that doesn't start on sector 63. Successfully tested with a partition starting on sector 2048, for instance. Patch by Wim Hueskes CORE-8825 #resolve #comment Committed in r71418. Thanks for the debugging and the patch! Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Thu May 26 20:50:44 2016 @@ -1582,8 +1582,6 @@ FIELD_OFFSET(FAT_BOOTSECTOR, BootCodeAndData) - FIELD_OFFSET(FAT_BOOTSECTOR, OemName)); - NewBootSector->HiddenSectors = PartitionList->CurrentDisk->SectorsPerTrack; - /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1739,8 +1737,6 @@ &OrigBootSector->OemName, FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); - - NewBootSector->HiddenSectors = PartitionList->CurrentDisk->SectorsPerTrack; /* Get the location of the backup boot sector */ BackupBootSector = OrigBootSector->BackupBootSector;

1 0

[pschweitzer] 71417: [FS_REC] Add support for ReiserFS volumes. Patch by Peter Hater. This is done for ReiserFS support! Enjoy :-) CORE-11005 #resolve
by pschweitzer＠svn.reactos.org 26 May '16

26 May '16

Author: pschweitzer Date: Thu May 26 18:17:19 2016 New Revision: 71417 URL: http://svn.reactos.org/svn/reactos?rev=71417&view=rev Log: [FS_REC] Add support for ReiserFS volumes. Patch by Peter Hater. This is done for ReiserFS support! Enjoy :-) CORE-11005 #resolve Added: trunk/reactos/drivers/filesystems/fs_rec/reiserfs.c (with props) trunk/reactos/drivers/filesystems/fs_rec/reiserfs.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] Thu May 26 18:17:19 2016 @@ -6,6 +6,7 @@ fat.c fs_rec.c ntfs.c + reiserfs.c udfs.c fs_rec.h) 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] Thu May 26 18:17:19 2016 @@ -168,6 +168,12 @@ /* Send BTRFS command */ Status = FsRecBtrfsFsControl(DeviceObject, Irp); + break; + + case FS_TYPE_REISERFS: + + /* Send REISERFS command */ + Status = FsRecReiserfsFsControl(DeviceObject, Irp); break; default: @@ -398,6 +404,16 @@ FILE_DEVICE_DISK_FILE_SYSTEM); if (NT_SUCCESS(Status)) DeviceCount++; + /* Register REISERFS */ + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\Reiserfs", + L"\\FileSystem\\ReiserfsRecognizer", + FS_TYPE_REISERFS, + 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] Thu May 26 18:17:19 2016 @@ -175,6 +175,7 @@ FS_TYPE_UDFS, FS_TYPE_EXT2, FS_TYPE_BTRFS, + FS_TYPE_REISERFS, } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE; /* FS Recognizer State */ @@ -232,6 +233,13 @@ NTSTATUS NTAPI FsRecBtrfsFsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +NTAPI +FsRecReiserfsFsControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); Added: trunk/reactos/drivers/filesystems/fs_rec/reiserfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/reiserfs.c (added) +++ trunk/reactos/drivers/filesystems/fs_rec/reiserfs.c [iso-8859-1] Thu May 26 18:17:19 2016 @@ -0,0 +1,122 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/btrfs.c + * PURPOSE: Btrfs Recognizer + * PROGRAMMER: Peter Hater + * Pierre Schweitzer (pierre(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include "fs_rec.h" +#include "reiserfs.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +FsRecIsReiserfsVolume(IN PRFSD_SUPER_BLOCK sb) +{ + UCHAR sz_MagicKey[] = REISER2FS_SUPER_MAGIC_STRING; + UCHAR currentChar; + int i; + + // If any characters read from disk don't match the expected magic key, we don't have a ReiserFS volume. + for (i = 0; i < MAGIC_KEY_LENGTH; i++) + { + currentChar = sb->s_magic[i]; + if (currentChar != sz_MagicKey[i]) + { + return FALSE; + } + } + + return TRUE; +} + +NTSTATUS +NTAPI +FsRecReiserfsFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + PRFSD_SUPER_BLOCK Spb = NULL; + 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 superblock */ + Offset.QuadPart = REISERFS_DISK_OFFSET_IN_BYTES; + if (FsRecReadBlock(MountDevice, + &Offset, + SectorSize, + SectorSize, + (PVOID)&Spb, + &DeviceError)) + { + /* Check if it's an actual BTRFS volume */ + if (FsRecIsReiserfsVolume(Spb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + /* Free the boot sector if we have one */ + ExFreePool(Spb); + } + 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\\reiserfs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Return Status */ + return Status; +} Propchange: trunk/reactos/drivers/filesystems/fs_rec/reiserfs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/fs_rec/reiserfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/reiserfs.h (added) +++ trunk/reactos/drivers/filesystems/fs_rec/reiserfs.h [iso-8859-1] Thu May 26 18:17:19 2016 @@ -0,0 +1,76 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/btrfs.h + * PURPOSE: BTRFS Header File + * PROGRAMMER: Peter Hater + * Pierre Schweitzer (pierre(a)reactos.org) + */ + +#include <pshpack1.h> +struct journal_params { + // Block number of the block containing the first journal node. + UINT32 jp_journal_1st_block; /* where does journal start from on its device */ + + // Journal device number (?? for if the journal is on a seperate drive ??) + UINT32 jp_journal_dev; /* journal device st_rdev */ + + // Original journal size. (Needed when using partition on systems w/ different default journal sizes). + UINT32 jp_journal_size; /* size of the journal */ + + UINT32 jp_journal_trans_max; /* max number of blocks in a transaction. */ + UINT32 jp_journal_magic; /* random value made on fs creation (this was sb_journal_block_count) */ + UINT32 jp_journal_max_batch; /* max number of blocks to batch into a trans */ + UINT32 jp_journal_max_commit_age; /* in seconds, how old can an async commit be */ + UINT32 jp_journal_max_trans_age; /* in seconds, how old can a transaction be */ +}; + +typedef struct _RFSD_SUPER_BLOCK +{ + // The number of blocks in the partition + UINT32 s_blocks_count; /* blocks count */ //[mark] was _s_blocks_count + + // The number of free blocks in the partition + UINT32 s_free_blocks_count; /* free blocks count */ //[mark] was _s_free_blocks + + // Block number of the block containing the root node + UINT32 s_root_block; /* root block number */ + + struct journal_params s_journal; + + // The size (in bytes) of a block + UINT16 s_blocksize; /* block size */ + + UINT16 s_oid_maxsize; /* max size of object id array, see get_objectid() commentary */ + UINT16 s_oid_cursize; /* current size of object id array */ + UINT16 s_umount_state; /* this is set to 1 when filesystem was umounted, to 2 - when not */ + char s_magic[10]; /* reiserfs magic string indicates that + * file system is reiserfs: + * "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */ + + // State of the partition: valid(1), error (2) + UINT16 s_fs_state; /* it is set to used by fsck to mark which phase of rebuilding is done */ + + UINT32 s_hash_function_code; /* indicate, what hash function is being use + * to sort names in a directory*/ + UINT16 s_tree_height; /* height of disk tree */ + UINT16 s_bmap_nr; /* amount of bitmap blocks needed to address + * each block of file system */ + + // The reiserfs version number + UINT16 s_version; /* this field is only reliable on filesystem + * with non-standard journal */ + UINT16 s_reserved_for_journal; /* size in blocks of journal area on main + * device, we need to keep after + * making fs with non-standard journal */ +} RFSD_SUPER_BLOCK, *PRFSD_SUPER_BLOCK; +#include <poppack.h> + +C_ASSERT(FIELD_OFFSET(RFSD_SUPER_BLOCK, s_blocksize) == 44); +C_ASSERT(FIELD_OFFSET(RFSD_SUPER_BLOCK, s_magic) == 52); + +#define REISERFS_DISK_OFFSET_IN_BYTES (64 * 1024) +#define REISERFS_SUPER_MAGIC_STRING "ReIsErFs" +#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" +#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" +#define MAGIC_KEY_LENGTH 9 Propchange: trunk/reactos/drivers/filesystems/fs_rec/reiserfs.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 71416: [REISERFS] Enable the ReiserFS support. Patch by Peter Hater. CORE-11005
by pschweitzer＠svn.reactos.org 26 May '16

26 May '16

Author: pschweitzer Date: Thu May 26 18:14:52 2016 New Revision: 71416 URL: http://svn.reactos.org/svn/reactos?rev=71416&view=rev Log: [REISERFS] Enable the ReiserFS support. Patch by Peter Hater. CORE-11005 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] Thu May 26 18:14:52 2016 @@ -1986,6 +1986,15 @@ HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Type",0x00010001,0x00000002 +; REISER Filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\Reiserfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Reiserfs","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Reiserfs","ImagePath",0x00020000,"system32\drivers\reiserfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Reiserfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Reiserfs","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Reiserfs\Parameters","CodePage",0x00000000,"default" +HKLM,"SYSTEM\CurrentControlSet\Services\Reiserfs\Parameters","WritingSupport",0x00010001,0x00000001 + ; 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] Thu May 26 18:14:52 2016 @@ -68,6 +68,7 @@ ksecdd.sys=,,,,,,,,,,,,4 mountmgr.sys=,,,,,,x,,,,,,4 btrfs.sys=,,,,,,x,,,,,,4 +reiserfs.sys=,,,,,,x,,,,,,4 [SystemPartitionFiles]

1 0

[pschweitzer] 71415: [AUTOCHK] Add support for ReiserFS CORE-11005
by pschweitzer＠svn.reactos.org 26 May '16

26 May '16

Author: pschweitzer Date: Thu May 26 18:12:36 2016 New Revision: 71415 URL: http://svn.reactos.org/svn/reactos?rev=71415&view=rev Log: [AUTOCHK] Add support for ReiserFS CORE-11005 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] Thu May 26 18:12:36 2016 @@ -275,6 +275,10 @@ { RtlInitUnicodeString(&ProviderDll, L"ubtrfs.dll"); } + else if (wcscmp(FileSystem, L"RFSD") == 0) + { + RtlInitUnicodeString(&ProviderDll, L"ureiserfs.dll"); + } else { return NULL;

1 0

[pschweitzer] 71414: [REISERFS] Enable ReiserFS FSD build CORE-11005
by pschweitzer＠svn.reactos.org 26 May '16

26 May '16

Author: pschweitzer Date: Thu May 26 18:11:57 2016 New Revision: 71414 URL: http://svn.reactos.org/svn/reactos?rev=71414&view=rev Log: [REISERFS] Enable ReiserFS FSD build CORE-11005 Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/CMakeL… ============================================================================== --- trunk/reactos/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/CMakeLists.txt [iso-8859-1] Thu May 26 18:11:57 2016 @@ -9,5 +9,5 @@ add_subdirectory(mup) add_subdirectory(npfs) add_subdirectory(ntfs) -#add_subdirectory(reiserfs) +add_subdirectory(reiserfs) add_subdirectory(udfs)

1 0

[pschweitzer] 71413: [UREISERFS] Add the ReiserFS DLL CORE-11005
by pschweitzer＠svn.reactos.org 26 May '16

26 May '16

Author: pschweitzer Date: Thu May 26 18:10:20 2016 New Revision: 71413 URL: http://svn.reactos.org/svn/reactos?rev=71413&view=rev Log: [UREISERFS] Add the ReiserFS DLL CORE-11005 Added: trunk/reactos/dll/win32/ureiserfs/ trunk/reactos/dll/win32/ureiserfs/CMakeLists.txt (with props) trunk/reactos/dll/win32/ureiserfs/ureiserfs.c (with props) trunk/reactos/dll/win32/ureiserfs/ureiserfs.rc (with props) trunk/reactos/dll/win32/ureiserfs/ureiserfs.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] Thu May 26 18:10:20 2016 @@ -214,6 +214,7 @@ add_subdirectory(ufatx) add_subdirectory(untfs) add_subdirectory(updspapi) +add_subdirectory(ureiserfs) add_subdirectory(url) add_subdirectory(urlmon) add_subdirectory(userenv) Added: trunk/reactos/dll/win32/ureiserfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ureiserfs/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/ureiserfs/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/ureiserfs/CMakeLists.txt [iso-8859-1] Thu May 26 18:10:20 2016 @@ -0,0 +1,13 @@ + +spec2def(ureiserfs.dll ureiserfs.spec) + +list(APPEND SOURCE + ureiserfs.c + ureiserfs.rc + ${CMAKE_CURRENT_BINARY_DIR}/ureiserfs.def) + +add_library(ureiserfs SHARED ${SOURCE}) +set_module_type(ureiserfs nativedll) +target_link_libraries(ureiserfs reiserfslib) +add_importlibs(ureiserfs ntdll) +add_cd_file(TARGET ureiserfs DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/ureiserfs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ureiserfs/ureiserfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ureiserfs/ureise… ============================================================================== --- trunk/reactos/dll/win32/ureiserfs/ureiserfs.c (added) +++ trunk/reactos/dll/win32/ureiserfs/ureiserfs.c [iso-8859-1] Thu May 26 18:10:20 2016 @@ -0,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: BTRFS File System Management + * FILE: dll/win32/ubtrfs/ubtrfs.c + * PURPOSE: ubtrfs 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/ureiserfs/ureiserfs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ureiserfs/ureiserfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ureiserfs/ureise… ============================================================================== --- trunk/reactos/dll/win32/ureiserfs/ureiserfs.rc (added) +++ trunk/reactos/dll/win32/ureiserfs/ureiserfs.rc [iso-8859-1] Thu May 26 18:10:20 2016 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReiserFS File System Management" +#define REACTOS_STR_INTERNAL_NAME "ureiserfs" +#define REACTOS_STR_ORIGINAL_FILENAME "ureiserfs.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/ureiserfs/ureiserfs.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ureiserfs/ureiserfs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ureiserfs/ureise… ============================================================================== --- trunk/reactos/dll/win32/ureiserfs/ureiserfs.spec (added) +++ trunk/reactos/dll/win32/ureiserfs/ureiserfs.spec [iso-8859-1] Thu May 26 18:10:20 2016 @@ -0,0 +1,2 @@ +@ stdcall ChkdskEx(ptr long long long long ptr) ReiserfsChkdsk +@ stdcall FormatEx(ptr long ptr long long ptr) ReiserfsFormat Propchange: trunk/reactos/dll/win32/ureiserfs/ureiserfs.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 71412: [REISERFSLIB] Stub the ReiserFS lib CORE-11005
by pschweitzer＠svn.reactos.org 26 May '16

26 May '16

Author: pschweitzer Date: Thu May 26 18:08:42 2016 New Revision: 71412 URL: http://svn.reactos.org/svn/reactos?rev=71412&view=rev Log: [REISERFSLIB] Stub the ReiserFS lib CORE-11005 Added: trunk/reactos/sdk/lib/fslib/reiserfslib/ trunk/reactos/sdk/lib/fslib/reiserfslib/CMakeLists.txt (with props) trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c (with props) trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.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] Thu May 26 18:08:42 2016 @@ -2,5 +2,6 @@ add_subdirectory(btrfslib) add_subdirectory(ext2lib) add_subdirectory(ntfslib) +add_subdirectory(reiserfslib) add_subdirectory(vfatlib) add_subdirectory(vfatxlib) Added: trunk/reactos/sdk/lib/fslib/reiserfslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/reiserfslib/… ============================================================================== --- trunk/reactos/sdk/lib/fslib/reiserfslib/CMakeLists.txt (added) +++ trunk/reactos/sdk/lib/fslib/reiserfslib/CMakeLists.txt [iso-8859-1] Thu May 26 18:08:42 2016 @@ -0,0 +1,3 @@ + +add_library(reiserfslib reiserfslib.c) +add_dependencies(reiserfslib psdk) Propchange: trunk/reactos/sdk/lib/fslib/reiserfslib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/reiserfslib/… ============================================================================== --- trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c (added) +++ trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c [iso-8859-1] Thu May 26 18:08:42 2016 @@ -0,0 +1,36 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReiserFS library + * FILE: lib/fslib/reiserfslib/reiserfslib.c + * PURPOSE: ReiserFS lib + * PROGRAMMERS: Pierre Schweitzer + */ +#include "reiserfslib.h" + +#define NDEBUG +#include <debug.h> + +NTSTATUS NTAPI +ReiserfsFormat(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 +ReiserfsChkdsk(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/reiserfslib/reiserfslib.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/reiserfslib/… ============================================================================== --- trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.h (added) +++ trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.h [iso-8859-1] Thu May 26 18:08:42 2016 @@ -0,0 +1,8 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReiserFS library + * FILE: lib/fslib/reiserfslib/reiserfslib.h + */ +#define NTOS_MODE_USER +#include <ndk/umtypes.h> +#include <fmifs/fmifs.h> Propchange: trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.h ------------------------------------------------------------------------------ svn:eol-style = native

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