Ros-diffs January 2016

ros-diffs@reactos.org

13 participants
192 discussions

[akhaldi] 70589: [0.4.0] * Merge the spec2def fix by Timo in r70454.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 13 16:11:35 2016 New Revision: 70589 URL: http://svn.reactos.org/svn/reactos?rev=70589&view=rev Log: [0.4.0] * Merge the spec2def fix by Timo in r70454. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/tools/spec2def/spec2def.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 16:11:35 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70545-70548,70552-70554,70557-70558,70576,70583 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70545-70548,70552-70554,70557-70558,70576,70583 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 16:11:35 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70545-70548,70552-70554,70557-70558,70576,70583 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70545-70548,70552-70554,70557-70558,70576,70583 Modified: branches/ros-branch-0_4_0/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/tools/spec2def/spec2def.c [iso-8859-1] Wed Jan 13 16:11:35 2016 @@ -688,12 +688,12 @@ fprintf(fileDest, " NONAME"); } + /* Either PRIVATE or DATA */ if (pexp->uFlags & FL_PRIVATE) { fprintf(fileDest, " PRIVATE"); } - - if (pexp->nCallingConvention == CC_EXTERN) + else if (pexp->nCallingConvention == CC_EXTERN) { fprintf(fileDest, " DATA"); }

8 years, 11 months

[akhaldi] 70588: [0.4.0] * Merge the fatten work by Hermès in revisions 70545 => 70548.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 13 16:09:48 2016 New Revision: 70588 URL: http://svn.reactos.org/svn/reactos?rev=70588&view=rev Log: [0.4.0] * Merge the fatten work by Hermès in revisions 70545 => 70548. Added: branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/00history.txt - copied unchanged from r70548, trunk/reactos/tools/fatten/fatfs/00history.txt Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/00readme.txt branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/diskio.c branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/diskio.h branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/ff.c branches/ros-branch-0_4_0/reactos/tools/fatten/fatten.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 16:09:48 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70552-70554,70557-70558,70576,70583 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70545-70548,70552-70554,70557-70558,70576,70583 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 16:09:48 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70552-70554,70557-70558,70576,70583 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70545-70548,70552-70554,70557-70558,70576,70583 Modified: branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/00readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/00readme.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/00readme.txt [iso-8859-1] Wed Jan 13 16:09:48 2016 @@ -1,155 +1,21 @@ -FatFs Module Source Files R0.10a (C)ChaN, 2014 +FatFs Module Source Files R0.11 FILES - ffconf.h Configuration file for FatFs module. - ff.h Common include file for FatFs and application module. - ff.c FatFs module. - diskio.h Common include file for FatFs and disk I/O module. - diskio.c An example of glue function to attach existing disk I/O module to FatFs. - integer.h Integer type definitions for FatFs. - option Optional external functions. + 00readme.txt This file. + history.txt Revision history. + ffconf.h Configuration file for FatFs module. + ff.h Common include file for FatFs and application module. + ff.c FatFs module. + diskio.h Common include file for FatFs and disk I/O module. + diskio.c An example of glue function to attach existing disk I/O module to FatFs. + integer.h Integer type definitions for FatFs. + option Optional external functions. + Low level disk I/O module is not included in this archive because the FatFs module is only a generic file system layer and not depend on any specific storage device. You have to provide a low level disk I/O module that written - to control your storage device. + to control the target storage device. - - -AGREEMENTS - - FatFs module is an open source software to implement FAT file system to - small embedded systems. This is a free software and is opened for education, - research and commercial developments under license policy of following trems. - - Copyright (C) 2014, ChaN, all right reserved. - - * The FatFs module is a free software and there is NO WARRANTY. - * No restriction on use. You can use, modify and redistribute it for - personal, non-profit or commercial product UNDER YOUR RESPONSIBILITY. - * Redistributions of source code must retain the above copyright notice. - - - -REVISION HISTORY - - Feb 26, 2006 R0.00 Prototype - - Apr 29, 2006 R0.01 First release. - - Jun 01, 2006 R0.02 Added FAT12. - Removed unbuffered mode. - Fixed a problem on small (<32M) patition. - - Jun 10, 2006 R0.02a Added a configuration option _FS_MINIMUM. - - Sep 22, 2006 R0.03 Added f_rename. - Changed option _FS_MINIMUM to _FS_MINIMIZE. - - Dec 11, 2006 R0.03a Improved cluster scan algolithm to write files fast. - Fixed f_mkdir creates incorrect directory on FAT32. - - Feb 04, 2007 R0.04 Supported multiple drive system. (FatFs) - Changed some APIs for multiple drive system. - Added f_mkfs. (FatFs) - Added _USE_FAT32 option. (Tiny-FatFs) - - Apr 01, 2007 R0.04a Supported multiple partitions on a plysical drive. (FatFs) - Fixed an endian sensitive code in f_mkfs. (FatFs) - Added a capability of extending the file size to f_lseek. - Added minimization level 3. - Fixed a problem that can collapse a sector when recreate an - existing file in any sub-directory at non FAT32 cfg. (Tiny-FatFs) - - May 05, 2007 R0.04b Added _USE_NTFLAG option. - Added FSInfo support. - Fixed some problems corresponds to FAT32. (Tiny-FatFs) - Fixed DBCS name can result FR_INVALID_NAME. - Fixed short seek (0 < ofs <= csize) collapses the file object. - - Aug 25, 2007 R0.05 Changed arguments of f_read, f_write. - Changed arguments of f_mkfs. (FatFs) - Fixed f_mkfs on FAT32 creates incorrect FSInfo. (FatFs) - Fixed f_mkdir on FAT32 creates incorrect directory. (FatFs) - - Feb 03, 2008 R0.05a Added f_truncate(). - Added f_utime(). - Fixed off by one error at FAT sub-type determination. - Fixed btr in f_read() can be mistruncated. - Fixed cached sector is not flushed when create and close without write. - - Apr 01, 2008 R0.06 Added f_forward(). (Tiny-FatFs) - Added string functions: fputc(), fputs(), fprintf() and fgets(). - Improved performance of f_lseek() on move to the same or following cluster. - - Apr 01, 2009, R0.07 Merged Tiny-FatFs as a buffer configuration option. - Added long file name support. - Added multiple code page support. - Added re-entrancy for multitask operation. - Added auto cluster size selection to f_mkfs(). - Added rewind option to f_readdir(). - Changed result code of critical errors. - Renamed string functions to avoid name collision. - - Apr 14, 2009, R0.07a Separated out OS dependent code on reentrant cfg. - Added multiple sector size support. - - Jun 21, 2009, R0.07c Fixed f_unlink() may return FR_OK on error. - Fixed wrong cache control in f_lseek(). - Added relative path feature. - Added f_chdir(). - Added f_chdrive(). - Added proper case conversion for extended characters. - - Nov 03, 2009 R0.07e Separated out configuration options from ff.h to ffconf.h. - Added a configuration option, _LFN_UNICODE. - Fixed f_unlink() fails to remove a sub-dir on _FS_RPATH. - Fixed name matching error on the 13 char boundary. - Changed f_readdir() to return the SFN with always upper case on non-LFN cfg. - - May 15, 2010, R0.08 Added a memory configuration option. (_USE_LFN) - Added file lock feature. (_FS_SHARE) - Added fast seek feature. (_USE_FASTSEEK) - Changed some types on the API, XCHAR->TCHAR. - Changed fname member in the FILINFO structure on Unicode cfg. - String functions support UTF-8 encoding files on Unicode cfg. - - Aug 16,'10 R0.08a Added f_getcwd(). (_FS_RPATH = 2) - Added sector erase feature. (_USE_ERASE) - Moved file lock semaphore table from fs object to the bss. - Fixed a wrong directory entry is created on non-LFN cfg when the given name contains ';'. - Fixed f_mkfs() creates wrong FAT32 volume. - - Jan 15,'11 R0.08b Fast seek feature is also applied to f_read() and f_write(). - f_lseek() reports required table size on creating CLMP. - Extended format syntax of f_printf function. - Ignores duplicated directory separators in given path names. - - Sep 06,'11 R0.09 f_mkfs() supports multiple partition to finish the multiple partition feature. - Added f_fdisk(). (_MULTI_PARTITION = 2) - - Aug 27,'12 R0.09a Fixed assertion failure due to OS/2 EA on FAT12/16. - Changed f_open() and f_opendir() reject null object pointer to avoid crash. - Changed option name _FS_SHARE to _FS_LOCK. - - Jan 23,'13 R0.09b Added f_getlabel() and f_setlabel(). (_USE_LABEL) - - Oct 02,'13 R0.10 Added selection of character encoding on the file. (_STRF_ENCODE) - Added f_closedir(). - Added forced full FAT scan for f_getfree(). (_FS_NOFSINFO) - Added forced mount feature with changes of f_mount(). - Improved behavior of volume auto detection. - Improved write throughput of f_puts() and f_printf(). - Changed argument of f_chdrive(), f_mkfs(), disk_read() and disk_write(). - Fixed f_write() can be truncated when the file size is close to 4GB. - Fixed f_open(), f_mkdir() and f_setlabel() can return incorrect error code. - - Jan 15,'14 R0.10a Added arbitrary strings as drive number in the path name. (_STR_VOLUME_ID) - Added a configuration option of minimum sector size. (_MIN_SS) - 2nd argument of f_rename() can have a drive number and it will be ignored. - Fixed f_mount() with forced mount fails when drive number is >= 1. - Fixed f_close() invalidates the file object without volume lock. - Fixed f_closedir() returns but the volume lock is left acquired. - Fixed creation of an entry with LFN fails on too many SFN collisions. Modified: branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/diskio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/diskio.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/diskio.c [iso-8859-1] Wed Jan 13 16:09:48 2016 @@ -1,12 +1,13 @@ /*-----------------------------------------------------------------------*/ -/* Low level disk I/O module skeleton for FatFs (C)ChaN, 2013 */ +/* Low level disk I/O module skeleton for FatFs (C)ChaN, 2014 */ /*-----------------------------------------------------------------------*/ /* If a working storage control module is available, it should be */ /* attached to the FatFs via a glue function rather than modifying it. */ /* This is an example of glue functions to attach various exsisting */ -/* storage control module to the FatFs module with a defined API. */ -/*-----------------------------------------------------------------------*/ -#include "diskio.h" +/* storage control modules to the FatFs module with a defined API. */ +/*-----------------------------------------------------------------------*/ + +#include "diskio.h" /* FatFs lower layer API */ #include <stdio.h> /*-----------------------------------------------------------------------*/ Modified: branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/diskio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/diskio.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/diskio.h [iso-8859-1] Wed Jan 13 16:09:48 2016 @@ -1,5 +1,5 @@ /*-----------------------------------------------------------------------/ -/ Low level disk interface modlue include file (C)ChaN, 2013 / +/ Low level disk interface modlue include file (C)ChaN, 2014 / /-----------------------------------------------------------------------*/ #ifndef _DISKIO_DEFINED @@ -50,12 +50,12 @@ /* Command code for disk_ioctrl fucntion */ -/* Generic command (used by FatFs) */ -#define CTRL_SYNC 0 /* Flush disk cache (for write functions) */ -#define GET_SECTOR_COUNT 1 /* Get media size (for only f_mkfs()) */ -#define GET_SECTOR_SIZE 2 /* Get sector size (for multiple sector size (_MAX_SS >= 1024)) */ -#define GET_BLOCK_SIZE 3 /* Get erase block size (for only f_mkfs()) */ -#define CTRL_ERASE_SECTOR 4 /* Force erased a block of sectors (for only _USE_ERASE) */ +/* Generic command (Used by FatFs) */ +#define CTRL_SYNC 0 /* Complete pending write process (needed at _FS_READONLY == 0) */ +#define GET_SECTOR_COUNT 1 /* Get media size (needed at _USE_MKFS == 1) */ +#define GET_SECTOR_SIZE 2 /* Get sector size (needed at _MAX_SS != _MIN_SS) */ +#define GET_BLOCK_SIZE 3 /* Get erase block size (needed at _USE_MKFS == 1) */ +#define CTRL_TRIM 4 /* Inform device that the data on the block of sectors is no longer used (needed at _USE_TRIM == 1) */ /* Custom command for image file resizing */ #define SET_SECTOR_COUNT 126 Modified: branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/ff.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/ff.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/tools/fatten/fatfs/ff.c [iso-8859-1] Wed Jan 13 16:09:48 2016 @@ -3626,6 +3626,7 @@ mem_set(dir + DIR_Name, ' ', 11); /* Create "." entry */ dir[DIR_Name] = '.'; dir[DIR_Attr] = AM_DIR; + ST_DWORD(dir + DIR_CrtTime, tm); ST_DWORD(dir + DIR_WrtTime, tm); st_clust(dir, dcl); mem_cpy(dir + SZ_DIRE, dir, SZ_DIRE); /* Create ".." entry */ @@ -3647,7 +3648,8 @@ } else { dir = dj.dir; dir[DIR_Attr] = AM_DIR; /* Attribute */ - ST_DWORD(dir + DIR_WrtTime, tm); /* Created time */ + ST_DWORD(dir + DIR_CrtTime, tm); /* Created time */ + ST_DWORD(dir + DIR_WrtTime, tm); /* Modified time */ st_clust(dir, dcl); /* Table start cluster */ dj.fs->wflag = 1; res = sync_fs(dj.fs); @@ -3959,6 +3961,7 @@ if (vn[0]) { mem_cpy(dj.dir, vn, 11); /* Change the volume label name */ tm = GET_FATTIME(); + ST_DWORD(dj.dir + DIR_CrtTime, tm); ST_DWORD(dj.dir + DIR_WrtTime, tm); } else { dj.dir[0] = DDEM; /* Remove the volume label */ @@ -3975,6 +3978,7 @@ mem_cpy(dj.dir, vn, 11); dj.dir[DIR_Attr] = AM_VOL; tm = GET_FATTIME(); + ST_DWORD(dj.dir + DIR_CrtTime, tm); ST_DWORD(dj.dir + DIR_WrtTime, tm); dj.fs->wflag = 1; res = sync_fs(dj.fs); @@ -4056,8 +4060,8 @@ /*-----------------------------------------------------------------------*/ /* Create file system on the logical drive */ /*-----------------------------------------------------------------------*/ -#define N_ROOTDIR12 224 /* Number of root directory entries for FAT12/16 */ -#define N_ROOTDIR16 512 /* Number of root directory entries for FAT12/16 */ +#define N_ROOTDIR12 224 /* Number of root directory entries for FAT12 */ +#define N_ROOTDIR16 512 /* Number of root directory entries for FAT16 */ #define N_FATS 2 /* Number of FATs (1 or 2) */ @@ -4141,10 +4145,10 @@ n_fat = (fmt == FS_FAT12) ? (n_clst * 3 + 1) / 2 + 3 : (n_clst * 2) + 4; n_fat = (n_fat + SS(fs) - 1) / SS(fs); n_rsv = 1; - if(fmt == FS_FAT12) - n_dir = (DWORD)N_ROOTDIR12 * SZ_DIRE / SS(fs); - else - n_dir = (DWORD)N_ROOTDIR16 * SZ_DIRE / SS(fs); + if (fmt == FS_FAT12) + n_dir = (DWORD)N_ROOTDIR12 * SZ_DIRE / SS(fs); + else + n_dir = (DWORD)N_ROOTDIR16 * SZ_DIRE / SS(fs); } b_fat = b_vol + n_rsv; /* FAT area start sector */ b_dir = b_fat + n_fat * N_FATS; /* Directory area start sector */ @@ -4158,9 +4162,9 @@ if (fmt == FS_FAT32) { /* FAT32: Move FAT offset */ n_rsv += n; b_fat += n; - } else { /* FAT12/16: Expand FAT size */ + } else if (fmt == FS_FAT16) { /* FAT16: Expand FAT size */ n_fat += n; - } + } // else /* if (fmt == FS_FAT12) */ {} /* FAT12: Do nothing */ /* Determine number of clusters and final check of validity of the FAT sub-type */ n_clst = (n_vol - n_rsv - n_fat * N_FATS - n_dir) / au; @@ -4226,20 +4230,11 @@ ST_DWORD(tbl + BPB_TotSec32, n_vol); } tbl[BPB_Media] = md; /* Media descriptor */ - ST_DWORD(tbl + BPB_HiddSec, b_vol); /* Hidden sectors */ + ST_DWORD(tbl + BPB_HiddSec, b_vol); /* Hidden sectors */ n = GET_FATTIME(); /* Use current time as VSN */ - if (fmt == FS_FAT12) { - /* Assume floppy characteristics */ - ST_WORD(tbl + BPB_SecPerTrk, 0x12); /* Number of sectors per track */ - ST_WORD(tbl + BPB_NumHeads, 0x02); /* Number of heads */ - ST_DWORD(tbl + BS_VolID, n); /* VSN */ - ST_WORD(tbl + BPB_FATSz16, n_fat); /* Number of sectors per FAT */ - tbl[BS_DrvNum] = 0x00; /* Drive number */ - tbl[BS_BootSig] = 0x29; /* Extended boot signature */ - mem_cpy(tbl + BS_VolLab, "NO NAME " "FAT12 ", 19); /* Volume label, FAT signature */ - } else if (fmt == FS_FAT32) { - ST_WORD(tbl + BPB_SecPerTrk, 63); /* Number of sectors per track */ - ST_WORD(tbl + BPB_NumHeads, 255); /* Number of heads */ + if (fmt == FS_FAT32) { + ST_WORD(tbl + BPB_SecPerTrk, 63); /* Number of sectors per track */ + ST_WORD(tbl + BPB_NumHeads, 255); /* Number of heads */ ST_DWORD(tbl + BS_VolID32, n); /* VSN */ ST_DWORD(tbl + BPB_FATSz32, n_fat); /* Number of sectors per FAT */ ST_DWORD(tbl + BPB_RootClus, 2); /* Root directory start cluster (2) */ @@ -4248,15 +4243,24 @@ tbl[BS_DrvNum32] = 0x80; /* Drive number */ tbl[BS_BootSig32] = 0x29; /* Extended boot signature */ mem_cpy(tbl + BS_VolLab32, "NO NAME " "FAT32 ", 19); /* Volume label, FAT signature */ - } else { - ST_WORD(tbl + BPB_SecPerTrk, 63); /* Number of sectors per track */ - ST_WORD(tbl + BPB_NumHeads, 255); /* Number of heads */ - ST_DWORD(tbl + BS_VolID, n); /* VSN */ - ST_WORD(tbl + BPB_FATSz16, n_fat); /* Number of sectors per FAT */ - tbl[BS_DrvNum] = 0x80; /* Drive number */ - tbl[BS_BootSig] = 0x29; /* Extended boot signature */ - mem_cpy(tbl + BS_VolLab, "NO NAME " "FAT ", 19); /* Volume label, FAT signature */ - } + } else if (fmt == FS_FAT16) { + ST_WORD(tbl + BPB_SecPerTrk, 63); /* Number of sectors per track */ + ST_WORD(tbl + BPB_NumHeads, 255); /* Number of heads */ + ST_DWORD(tbl + BS_VolID, n); /* VSN */ + ST_WORD(tbl + BPB_FATSz16, n_fat); /* Number of sectors per FAT */ + tbl[BS_DrvNum] = 0x80; /* Drive number */ + tbl[BS_BootSig] = 0x29; /* Extended boot signature */ + mem_cpy(tbl + BS_VolLab, "NO NAME " "FAT16 ", 19); /* Volume label, FAT signature */ + } else /* if (fmt == FS_FAT12) */ { + /* Assume floppy characteristics */ + ST_WORD(tbl + BPB_SecPerTrk, 0x12); /* Number of sectors per track */ + ST_WORD(tbl + BPB_NumHeads, 0x02); /* Number of heads */ + ST_DWORD(tbl + BS_VolID, n); /* VSN */ + ST_WORD(tbl + BPB_FATSz16, n_fat); /* Number of sectors per FAT */ + tbl[BS_DrvNum] = 0x00; /* Drive number */ + tbl[BS_BootSig] = 0x29; /* Extended boot signature */ + mem_cpy(tbl + BS_VolLab, "NO NAME " "FAT12 ", 19); /* Volume label, FAT signature */ + } ST_WORD(tbl + BS_55AA, 0xAA55); /* Signature (Offset is fixed here regardless of sector size) */ if (disk_write(pdrv, tbl, b_vol, 1) != RES_OK) /* Write it to the VBR sector */ return FR_DISK_ERR; Modified: branches/ros-branch-0_4_0/reactos/tools/fatten/fatten.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/tools/fatten/fatten.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/tools/fatten/fatten.c [iso-8859-1] Wed Jan 13 16:09:48 2016 @@ -45,7 +45,7 @@ timeinfo->tm_min, timeinfo->tm_hour, timeinfo->tm_mday, - timeinfo->tm_mon, + timeinfo->tm_mon + 1, timeinfo->tm_year - 80, } }; @@ -208,13 +208,15 @@ // Arg 2: custom header label (optional) if (nargs > 1) { - char label[11]; +#define FAT_VOL_LABEL_LEN 11 + char vol_label[2 + FAT_VOL_LABEL_LEN + 1]; // Null-terminated buffer + char* label = vol_label + 2; // The first two characters are reserved for the drive number "0:" char ch; int i, invalid = 0; int len = strlen(argv[1]); - if (len <= sizeof(label)) + if (len <= FAT_VOL_LABEL_LEN) { // Verify each character (should be printable ASCII) // and copy it in uppercase. @@ -233,7 +235,7 @@ if (!invalid) { // Pad the label with spaces - while (len < sizeof(label)) + while (len < FAT_VOL_LABEL_LEN) { label[len++] = ' '; } @@ -260,11 +262,11 @@ if (g_Filesystem.fs_type == FS_FAT32) { - memcpy(buff + 71, label, sizeof(label)); + memcpy(buff + 71, label, FAT_VOL_LABEL_LEN); } else { - memcpy(buff + 43, label, sizeof(label)); + memcpy(buff + 43, label, FAT_VOL_LABEL_LEN); } if (disk_write(0, buff, 0, 1)) @@ -273,6 +275,11 @@ ret = 1; goto exit; } + + // Set also the directory volume label + memcpy(vol_label, "0:", 2); + vol_label[2 + FAT_VOL_LABEL_LEN] = '\0'; + f_setlabel(vol_label); } } else if (strcmp(parg, "boot") == 0)

8 years, 11 months

[akhaldi] 70587: [0.4.0] * Merge the cdmake work by Hermès in revisions 70552, 70553 and 70554.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 13 16:08:08 2016 New Revision: 70587 URL: http://svn.reactos.org/svn/reactos?rev=70587&view=rev Log: [0.4.0] * Merge the cdmake work by Hermès in revisions 70552, 70553 and 70554. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/tools/cdmake/cdmake.c branches/ros-branch-0_4_0/reactos/tools/cdmake/dirhash.c branches/ros-branch-0_4_0/reactos/tools/cdmake/dirhash.h Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 16:08:08 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70557-70558,70576,70583 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70552-70554,70557-70558,70576,70583 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 16:08:08 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70557-70558,70576,70583 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70552-70554,70557-70558,70576,70583 Modified: branches/ros-branch-0_4_0/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/tools/cdmake/cdmake.c [iso-8859-1] Wed Jan 13 16:08:08 2016 @@ -619,7 +619,7 @@ #if defined(_WIN32) && !defined(strcasecmp) #define strcasecmp stricmp -#endif//_WIN32 +#endif // _WIN32 static BOOL cdname_exists(PDIR_RECORD d) { @@ -696,7 +696,7 @@ filename_counter = 1; while (cdname_exists(d)) { - // the file name must be least 8 char long + // the file name must be at least 8 chars long if (strlen(d->name_on_cd)<8) error_exit("'%s' is a duplicate file name, aborting...", filename); @@ -704,7 +704,9 @@ error_exit("'%s' is a duplicate file name, aborting...", filename); // max 255 times for equal short filename - if (filename_counter>255) error_exit("'%s' is a duplicate file name, aborting...", filename); + if (filename_counter>255) + error_exit("'%s' is a duplicate file name, aborting...", filename); + d->name_on_cd[8] = '~'; memset(&d->name_on_cd[9],0,5); sprintf(&d->name_on_cd[9],"%d",filename_counter); @@ -729,7 +731,7 @@ for the specified parent and returns a pointer to the new record. -----------------------------------------------------------------------------*/ -#if _WIN32 +#ifdef _WIN32 /* Win32 version */ PDIR_RECORD @@ -1167,7 +1169,7 @@ return new_d; } -#if _WIN32 +#ifdef _WIN32 static BOOL get_cd_file_time(HANDLE handle, PDATE_AND_TIME cd_time_info) { @@ -1195,7 +1197,7 @@ scan_specified_files(PDIR_RECORD d, struct target_dir_entry *dir) { PDIR_RECORD new_d; -#if _WIN32 +#ifdef _WIN32 HANDLE open_file; LARGE_INTEGER file_size; #else @@ -1210,7 +1212,7 @@ { if (strcmp(file->target_name, DIRECTORY_TIMESTAMP) == 0) { -#if _WIN32 +#ifdef _WIN32 if ((open_file = CreateFileA(file->source_name, GENERIC_READ, FILE_SHARE_READ, @@ -1246,7 +1248,7 @@ } new_d = new_empty_dirrecord(d, FALSE); parse_filename_into_dirrecord(file->target_name, new_d, FALSE); -#if _WIN32 +#ifdef _WIN32 if ((open_file = CreateFileA(file->source_name, GENERIC_READ, FILE_SHARE_READ, @@ -1271,7 +1273,7 @@ #else if (stat(file->source_name, &stbuf) == -1) { - error_exit("Cannot find '%s' (target %s)\n", + error_exit("Cannot find '%s' (target '%s')\n", file->source_name, file->target_name); } @@ -2241,13 +2243,13 @@ } else { - char *trimmedline, *targetname, *srcname, *eq, *normdir; + char *trimmedline, *targetname, *normdir, *srcname, *eq; char lineread[1024]; FILE *f = fopen(source+1, "r"); if (!f) { - error_exit("Cannot open cd description %s\n", source+1); + error_exit("Cannot open CD-ROM file description %s\n", source+1); } while (fgets(lineread, sizeof(lineread), f)) { @@ -2268,17 +2270,17 @@ targetname = strtok(lineread, "="); srcname = strtok(NULL, ""); -#if _WIN32 +#ifdef _WIN32 if (_access(srcname, R_OK) == 0) - dir_hash_add_file(&specified_files, srcname, targetname); - else - error_exit("Cannot access file '%s' (target %s)\n", srcname, targetname); #else if (access(srcname, R_OK) == 0) - dir_hash_add_file(&specified_files, srcname, targetname); +#endif + { + if (!dir_hash_add_file(&specified_files, srcname, targetname)) + error_exit("Target '%s' (file '%s') is invalid\n", targetname, srcname); + } else - error_exit("Cannot access file '%s' (target %s)\n", srcname, targetname); -#endif + error_exit("Cannot access file '%s' (target '%s')\n", srcname, targetname); } } fclose(f); Modified: branches/ros-branch-0_4_0/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/tools/cdmake/dirhash.c [iso-8859-1] Wed Jan 13 16:08:08 2016 @@ -5,12 +5,17 @@ * PURPOSE: CD-ROM Premastering Utility - Directory names hashing * PROGRAMMERS: Art Yerkes */ + #include <string.h> #include <stdlib.h> #include <ctype.h> #include "config.h" #include "dirhash.h" +#ifndef max +#define max(a, b) ((a) > (b) ? (a) : (b)) +#endif + /* This is the famous DJB hash */ static unsigned int djb_hash(const char *name) @@ -26,59 +31,33 @@ return val; } -static const char * -chop_filename(const char *target) -{ - char *last_slash = strrchr(target, '/'); - if (!last_slash) - last_slash = strrchr(target, '\\'); - if (last_slash) - return last_slash + 1; +static void +split_path(const char *path, char **dirname, char **filename /* OPTIONAL */) +{ + const char *result; + + /* Retrieve the file name */ + char *last_slash_1 = strrchr(path, '/'); + char *last_slash_2 = strrchr(path, '\\'); + + if (last_slash_1 || last_slash_2) + result = max(last_slash_1, last_slash_2) + 1; else - return target; -} - -static void -chop_dirname(const char *name, char **dirname) -{ - char *last_slash = strrchr(name, '/'); - if (!last_slash) - last_slash = strrchr(name, '\\'); - if (!last_slash) - { - *dirname = malloc(1); - **dirname = 0; - } - else - { - char *newdata = malloc(last_slash - name + 1); - memcpy(newdata, name, last_slash - name); - newdata[last_slash - name] = 0; - *dirname = newdata; - } -} - -static struct target_dir_entry * -get_entry_by_normname(struct target_dir_hash *dh, const char *norm) -{ - unsigned int hashcode; - struct target_dir_entry *de; - hashcode = djb_hash(norm); - de = dh->buckets[hashcode % NUM_DIR_HASH_BUCKETS]; - while (de && strcmp(de->normalized_name, norm)) - de = de->next_dir_hash_entry; - return de; -} - -static void -delete_entry(struct target_dir_hash *dh, struct target_dir_entry *de) -{ - struct target_dir_entry **ent; - ent = &dh->buckets[de->hashcode % NUM_DIR_HASH_BUCKETS]; - while (*ent && ((*ent) != de)) - ent = &(*ent)->next_dir_hash_entry; - if (*ent) - *ent = (*ent)->next_dir_hash_entry; + result = path; + + /* Duplicate the file name for the user if needed */ + if (filename) + *filename = strdup(result); + + /* Remove any trailing directory separators */ + while (result > path && (*(result-1) == '/' || *(result-1) == '\\')) + result--; + + /* Retrieve and duplicate the directory */ + *dirname = malloc(result - path + 1); + if (result > path) + memcpy(*dirname, path, result - path); + (*dirname)[result - path] = '\0'; // NULL-terminate } void normalize_dirname(char *filename) @@ -109,20 +88,39 @@ } } } - filename[tgt] = 0; - - while (tgt && (filename[--tgt] == DIR_SEPARATOR_CHAR)) - { - filename[tgt] = 0; - } + filename[tgt] = '\0'; // NULL-terminate +} + +static struct target_dir_entry * +get_entry_by_normname(struct target_dir_hash *dh, const char *norm) +{ + unsigned int hashcode; + struct target_dir_entry *de; + hashcode = djb_hash(norm); + de = dh->buckets[hashcode % NUM_DIR_HASH_BUCKETS]; + while (de && strcmp(de->normalized_name, norm)) + de = de->next_dir_hash_entry; + return de; +} + +static void +delete_entry(struct target_dir_hash *dh, struct target_dir_entry *de) +{ + struct target_dir_entry **ent; + ent = &dh->buckets[de->hashcode % NUM_DIR_HASH_BUCKETS]; + while (*ent && ((*ent) != de)) + ent = &(*ent)->next_dir_hash_entry; + if (*ent) + *ent = (*ent)->next_dir_hash_entry; } struct target_dir_entry * dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char *targetnorm) { struct target_dir_entry *de, *parent_de; + char *parentcase = NULL; + char *case_name = NULL; char *parentname = NULL; - char *parentcase = NULL; struct target_dir_entry **ent; if (!dh->root.normalized_name) @@ -133,20 +131,36 @@ dh->buckets[dh->root.hashcode % NUM_DIR_HASH_BUCKETS] = &dh->root; } + /* Check whether the directory was already created and just return it if so */ de = get_entry_by_normname(dh, targetnorm); if (de) return de; - chop_dirname(targetnorm, &parentname); - chop_dirname(casename, &parentcase); + /* + * If *case_name == '\0' after the following call to split_path(...), + * for example in the case where casename == "subdir/dir/", then just + * create the directories "subdir" and "dir" by a recursive call to + * dir_hash_create_dir(...) and return 'parent_de' instead (see after). + * We do not (and we never) create a no-name directory inside it. + */ + split_path(casename, &parentcase, &case_name); + split_path(targetnorm, &parentname, NULL); parent_de = dir_hash_create_dir(dh, parentcase, parentname); free(parentname); free(parentcase); + /* See the remark above */ + if (!*case_name) + { + free(case_name); + return parent_de; + } + + /* Now create the directory */ de = calloc(1, sizeof(*de)); de->parent = parent_de; de->normalized_name = strdup(targetnorm); - de->case_name = strdup(chop_filename(casename)); + de->case_name = case_name; de->hashcode = djb_hash(targetnorm); de->next = parent_de->child; @@ -154,33 +168,43 @@ ent = &dh->buckets[de->hashcode % NUM_DIR_HASH_BUCKETS]; while (*ent) - { ent = &(*ent)->next_dir_hash_entry; - } *ent = de; return de; } -void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target) +struct target_file * +dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target) { struct target_file *tf; struct target_dir_entry *de; - char *targetdir = NULL; + char *targetdir = NULL; + char *targetfile = NULL; char *targetnorm; - chop_dirname(target, &targetdir); + /* First create the directory; check whether the file name is valid and bail out if not */ + split_path(target, &targetdir, &targetfile); + if (!*targetfile) + { + free(targetdir); + free(targetfile); + return NULL; + } targetnorm = strdup(targetdir); normalize_dirname(targetnorm); de = dir_hash_create_dir(dh, targetdir, targetnorm); free(targetnorm); free(targetdir); + /* Now add the file */ tf = calloc(1, sizeof(*tf)); tf->next = de->head; de->head = tf; tf->source_name = strdup(source); - tf->target_name = strdup(chop_filename(target)); + tf->target_name = targetfile; + + return tf; } static void Modified: branches/ros-branch-0_4_0/reactos/tools/cdmake/dirhash.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/tools/cdmake/dirhash.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/tools/cdmake/dirhash.h [iso-8859-1] Wed Jan 13 16:08:08 2016 @@ -5,6 +5,7 @@ * PURPOSE: CD-ROM Premastering Utility - Directory names hashing * PROGRAMMERS: Art Yerkes */ + #ifndef _DIRHASH_H_ #define _DIRHASH_H_ @@ -37,9 +38,13 @@ }; void normalize_dirname(char *filename); -void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target); + struct target_dir_entry * dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char *targetnorm); + +struct target_file * +dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target); + void dir_hash_destroy(struct target_dir_hash *dh); #endif // _DIRHASH_H_

8 years, 11 months

[akhaldi] 70586: [0.4.0] * Merge the usetup work by Hermès in revisions 70468, 70557 and 70558.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 13 16:06:09 2016 New Revision: 70586 URL: http://svn.reactos.org/svn/reactos?rev=70586&view=rev Log: [0.4.0] * Merge the usetup work by Hermès in revisions 70468, 70557 and 70558. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/setup/usetup/inicache.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 16:06:09 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70576,70583 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70557-70558,70576,70583 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 16:06:09 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70470,70480,70497,70501,70507-70510,70523,70527-70530,70576,70583 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70557-70558,70576,70583 Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/inicache.c [iso-8859-1] Wed Jan 13 16:06:09 2016 @@ -42,9 +42,7 @@ PINICACHEKEY Next; if (Key == NULL) - { - return NULL; - } + return NULL; Next = Key->Next; if (Key->Name != NULL) @@ -73,9 +71,7 @@ PINICACHESECTION Next; if (Section == NULL) - { - return NULL; - } + return NULL; Next = Section->Next; while (Section->FirstKey != NULL) @@ -146,16 +142,13 @@ } Key = (PINICACHEKEY)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHEKEY)); if (Key == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - RtlZeroMemory(Key, - sizeof(INICACHEKEY)); Key->Name = (WCHAR*)RtlAllocateHeap(ProcessHeap, 0, @@ -207,42 +200,6 @@ return Key; } - - -#if 0 -static -PINICACHESECTION -IniCacheFindSection( - PINICACHE Cache, - PWCHAR Name, - ULONG NameLength) -{ - PINICACHESECTION Section = NULL; - - if (Cache == NULL || Name == NULL || NameLength == 0) - { - return NULL; - } - - Section = Cache->FirstSection; - - /* iterate through list of sections */ - while (Section != NULL) - { - if (NameLength == wcslen(Section->Name)) - { - /* are the contents the same too? */ - if (_wcsnicmp(Section->Name, Name, NameLength) == 0) - break; - } - - /* get the next section*/ - Section = Section->Next; - } - - return Section; -} -#endif static @@ -262,15 +219,13 @@ } Section = (PINICACHESECTION)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHESECTION)); if (Section == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - RtlZeroMemory(Section, sizeof(INICACHESECTION)); /* Allocate and initialize section name */ Section->Name = (WCHAR*)RtlAllocateHeap(ProcessHeap, @@ -351,7 +306,7 @@ *NamePtr = NULL; *NameSize = 0; - /* skip whitespace */ + /* Skip whitespace */ while (*Ptr != 0 && isspace(*Ptr)) { Ptr++; @@ -401,7 +356,7 @@ *NameSize = 0; Size = 0; - /* skip whitespace and empty lines */ + /* Skip whitespace and empty lines */ while (isspace(*Ptr) || *Ptr == '\n' || *Ptr == '\r') { Ptr++; @@ -579,7 +534,7 @@ DPRINT("File size: %lu\n", FileLength); - /* Allocate file buffer */ + /* Allocate file buffer with NULL-terminator */ FileBuffer = (CHAR*)RtlAllocateHeap(ProcessHeap, 0, FileLength + 1); @@ -602,7 +557,7 @@ &FileOffset, NULL); - /* Append string terminator */ + /* Append NULL-terminator */ FileBuffer[FileLength] = 0; NtClose(FileHandle); @@ -616,16 +571,13 @@ /* Allocate inicache header */ *Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHE)); if (*Cache == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } - - /* Initialize inicache header */ - RtlZeroMemory(*Cache, sizeof(INICACHE)); /* Parse ini file */ Section = NULL; @@ -700,9 +652,7 @@ PINICACHE Cache) { if (Cache == NULL) - { return; - } while (Cache->FirstSection != NULL) { @@ -881,15 +831,13 @@ /* Allocate key buffer */ Key = (PINICACHEKEY)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHEKEY)); if (Key == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - RtlZeroMemory(Key, sizeof(INICACHEKEY)); /* Allocate name buffer */ Key->Name = (WCHAR*)RtlAllocateHeap(ProcessHeap, @@ -969,16 +917,13 @@ /* Allocate inicache header */ Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHE)); if (Cache == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - /* Initialize inicache header */ - RtlZeroMemory(Cache, sizeof(INICACHE)); return Cache; } @@ -1023,23 +968,20 @@ Section = Section->Next; if (Section != NULL) - BufferSize += 2; /* extra "\r\n" at end of each section */ - } - BufferSize++; /* Null-terminator */ + BufferSize += 2; /* Extra "\r\n" at end of each section */ + } DPRINT("BufferSize: %lu\n", BufferSize); - /* Allocate file buffer */ + /* Allocate file buffer with NULL-terminator */ Buffer = (CHAR*)RtlAllocateHeap(ProcessHeap, - 0, - BufferSize); + HEAP_ZERO_MEMORY, + BufferSize + 1); if (Buffer == NULL) { DPRINT1("RtlAllocateHeap() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } - - RtlZeroMemory(Buffer, BufferSize); /* Fill file buffer */ Ptr = Buffer; @@ -1133,15 +1075,13 @@ } Section = (PINICACHESECTION)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHESECTION)); if (Section == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - RtlZeroMemory(Section, sizeof(INICACHESECTION)); /* Allocate and initialize section name */ Section->Name = (WCHAR*)RtlAllocateHeap(ProcessHeap,

8 years, 11 months

[akhaldi] 70585: [0.4.0] * Merge the smss fixes by Hermès in r70530.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 13 15:59:39 2016 New Revision: 70585 URL: http://svn.reactos.org/svn/reactos?rev=70585&view=rev Log: [0.4.0] * Merge the smss fixes by Hermès in r70530. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/system/smss/sminit.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 15:59:39 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70529,70576,70583 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70576,70583 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 15:59:39 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70470,70480,70497,70501,70507-70510,70523,70527-70529,70576,70583 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70470,70480,70497,70501,70507-70510,70523,70527-70530,70576,70583 Modified: branches/ros-branch-0_4_0/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/system/smss/sminit.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/system/smss/sminit.c [iso-8859-1] Wed Jan 13 15:59:39 2016 @@ -608,7 +608,7 @@ { SmpConfigureAllowProtectedRenames, - 0, //RTL_QUERY_REGISTRY_DELETE, + RTL_QUERY_REGISTRY_DELETE, L"AllowProtectedRenames", NULL, REG_DWORD, @@ -648,7 +648,7 @@ { SmpConfigureFileRenames, - 0, //RTL_QUERY_REGISTRY_DELETE, + RTL_QUERY_REGISTRY_DELETE, L"PendingFileRenameOperations", &SmpFileRenameList, REG_NONE, @@ -658,7 +658,7 @@ { SmpConfigureFileRenames, - 0, //RTL_QUERY_REGISTRY_DELETE, + RTL_QUERY_REGISTRY_DELETE, L"PendingFileRenameOperations2", &SmpFileRenameList, REG_NONE, @@ -1989,6 +1989,10 @@ Status = RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE, TRUE, FALSE, &OldState); if (NT_SUCCESS(Status)) HavePrivilege = TRUE; + // FIXME: Handle SFC-protected file renames! + if (SmpAllowProtectedRenames) + DPRINT1("SMSS: FIXME: Handle SFC-protected file renames!\n"); + /* Process pending files to rename */ Head = &SmpFileRenameList; while (!IsListEmpty(Head)) @@ -2073,10 +2077,10 @@ InformationClass); /* Check if we seem to have failed because the file was readonly */ - if ((!NT_SUCCESS(Status) && + if (!NT_SUCCESS(Status) && (InformationClass == FileRenameInformation) && (Status == STATUS_OBJECT_NAME_COLLISION) && - (Buffer->ReplaceIfExists))) + Buffer->ReplaceIfExists) { /* Open the file for write attribute access this time... */ DPRINT1("\nSMSS: '%wZ' => '%wZ' failed - Status == %x, Possible readonly target\n",

8 years, 11 months

[akhaldi] 70584: [0.4.0] * Merge the vfatlib work by Hermès and Eric in revisions 70433 => 70435, 70445 => 70449, 70576 and 70583.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 13 15:40:37 2016 New Revision: 70584 URL: http://svn.reactos.org/svn/reactos?rev=70584&view=rev Log: [0.4.0] * Merge the vfatlib work by Hermès and Eric in revisions 70433 => 70435, 70445 => 70449, 70576 and 70583. Added: branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/common.c - copied, changed from r70435, trunk/reactos/lib/fslib/vfatlib/common.c branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/common.h - copied, changed from r70435, trunk/reactos/lib/fslib/vfatlib/common.h Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/CMakeLists.txt branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat12.c branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat16.c branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat32.c branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/vfatlib.c branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/vfatlib.h Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 15:40:37 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70529 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70529,70576,70583 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 15:40:37 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497,70501,70507-70510,70523,70527-70529 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70464,70470,70480,70497,70501,70507-70510,70523,70527-70529,70576,70583 Modified: branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/fs… ============================================================================== --- branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Wed Jan 13 15:40:37 2016 @@ -7,6 +7,7 @@ check/file.c check/io.c check/lfn.c + common.c fat12.c fat16.c fat32.c Copied: branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/common.c (from r70435, trunk/reactos/lib/fslib/vfatlib/common.c) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/fs… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] Wed Jan 13 15:40:37 2016 @@ -50,36 +50,36 @@ return Serial; } -/***** Wipe function for FAT12 and FAT16 formats, adapted from FAT32 code *****/ +/***** Wipe function for FAT12, FAT16 and FAT32 formats *****/ NTSTATUS -Fat1216WipeSectors( +FatWipeSectors( IN HANDLE FileHandle, - IN PFAT16_BOOT_SECTOR BootSector, + IN ULONG TotalSectors, + IN ULONG SectorsPerCluster, + IN ULONG BytesPerSector, IN OUT PFORMAT_CONTEXT Context) { IO_STATUS_BLOCK IoStatusBlock; PUCHAR Buffer; LARGE_INTEGER FileOffset; ULONGLONG Sector; - ULONG SectorsHuge; ULONG Length; NTSTATUS Status; + + Length = SectorsPerCluster * BytesPerSector; /* Allocate buffer for the cluster */ Buffer = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - BootSector->SectorsPerCluster * BootSector->BytesPerSector); + Length); if (Buffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; + /* Wipe all clusters */ Sector = 0; - Length = BootSector->SectorsPerCluster * BootSector->BytesPerSector; - - SectorsHuge = (BootSector->SectorsHuge != 0 ? BootSector->SectorsHuge : BootSector->Sectors); - - while (Sector + BootSector->SectorsPerCluster < SectorsHuge) + while (Sector + SectorsPerCluster < TotalSectors) { - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; + FileOffset.QuadPart = Sector * BytesPerSector; Status = NtWriteFile(FileHandle, NULL, @@ -96,17 +96,18 @@ goto done; } - UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); + UpdateProgress(Context, SectorsPerCluster); - Sector += BootSector->SectorsPerCluster; + Sector += SectorsPerCluster; } - if (Sector + BootSector->SectorsPerCluster > SectorsHuge) + /* Wipe the trailing space behind the last cluster */ + if (Sector < TotalSectors) { - DPRINT("Remaining sectors %lu\n", SectorsHuge - Sector); + DPRINT("Remaining sectors %lu\n", TotalSectors - Sector); - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; - Length = (SectorsHuge - Sector) * BootSector->BytesPerSector; + FileOffset.QuadPart = Sector * BytesPerSector; + Length = (TotalSectors - Sector) * BytesPerSector; Status = NtWriteFile(FileHandle, NULL, @@ -123,13 +124,12 @@ goto done; } - UpdateProgress(Context, SectorsHuge - Sector); + UpdateProgress(Context, TotalSectors - Sector); } done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } Copied: branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/common.h (from r70435, trunk/reactos/lib/fslib/vfatlib/common.h) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/fs… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/common.h [iso-8859-1] Wed Jan 13 15:40:37 2016 @@ -14,9 +14,11 @@ ULONG CalcVolumeSerialNumber(VOID); NTSTATUS -Fat1216WipeSectors( +FatWipeSectors( IN HANDLE FileHandle, - IN PFAT16_BOOT_SECTOR BootSector, + IN ULONG TotalSectors, + IN ULONG SectorsPerCluster, + IN ULONG BytesPerSector, IN OUT PFORMAT_CONTEXT Context); #endif /* _VFATCOMMON_H_ */ Modified: branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/fs… ============================================================================== --- branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Wed Jan 13 15:40:37 2016 @@ -5,49 +5,17 @@ * PURPOSE: Fat12 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Eric Kohl - * REVISIONS: - * EK 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> -static ULONG -GetShiftCount(IN ULONG Value) -{ - ULONG i = 1; - - while (Value > 0) - { - i++; - Value /= 2; - } - - return i - 2; -} - - -static ULONG -CalcVolumeSerialNumber(VOID) -{ - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - ULONG Serial; - PUCHAR Buffer; - - NtQuerySystemTime(&SystemTime); - RtlTimeToTimeFields(&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&Serial; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - return Serial; -} - + +/* FUNCTIONS ******************************************************************/ static NTSTATUS Fat12WriteBootSector(IN HANDLE FileHandle, @@ -67,12 +35,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, BootSector->BytesPerSector); + RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); + /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; @@ -91,15 +60,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; - } - - /* Free the new boot sector */ + goto done; + } + + UpdateProgress(Context, 1); + +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - - UpdateProgress(Context, 1); - return Status; } @@ -126,7 +94,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); /* FAT cluster 0 & 1*/ Buffer[0] = 0xf8; /* Media type */ @@ -147,14 +115,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, 1); /* Zero the begin of the buffer */ - memset(Buffer, 0, 3); + RtlZeroMemory(Buffer, 3); /* Zero the rest of the FAT */ Sectors = 32 * 1024 / BootSector->BytesPerSector; @@ -180,16 +147,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -230,7 +196,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); Sectors = 32 * 1024 / BootSector->BytesPerSector; for (i = 0; i < RootDirSectors; i += Sectors) @@ -257,16 +223,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -309,7 +274,7 @@ DPRINT("SectorCount = %lu\n", SectorCount); - memset(&BootSector, 0, sizeof(FAT16_BOOT_SECTOR)); + RtlZeroMemory(&BootSector, sizeof(FAT16_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; @@ -323,7 +288,7 @@ BootSector.Heads = DiskGeometry->TracksPerCylinder; BootSector.HiddenSectors = PartitionInfo->HiddenSectors; BootSector.SectorsHuge = (SectorCount >= 0x10000) ? (unsigned long)SectorCount : 0; - BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00; + BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; BootSector.VolumeID = CalcVolumeSerialNumber(); if ((Label == NULL) || (Label->Buffer == NULL)) @@ -333,7 +298,7 @@ else { RtlUnicodeStringToOemString(&VolumeLabel, Label, TRUE); - memset(&BootSector.VolumeLabel[0], ' ', 11); + RtlFillMemory(&BootSector.VolumeLabel[0], 11, ' '); memcpy(&BootSector.VolumeLabel[0], VolumeLabel.Buffer, VolumeLabel.Length < 11 ? VolumeLabel.Length : 11); RtlFreeOemString(&VolumeLabel); @@ -357,6 +322,22 @@ Context->TotalSectorCount = 1 + (BootSector.FATSectors * 2) + RootDirSectors; + if (!QuickFormat) + { + Context->TotalSectorCount += SectorCount; + + Status = FatWipeSectors(FileHandle, + SectorCount, + (ULONG)BootSector.SectorsPerCluster, + (ULONG)BootSector.BytesPerSector, + Context); + if (!NT_SUCCESS(Status)) + { + DPRINT("FatWipeSectors() failed with status 0x%.08x\n", Status); + return Status; + } + } + Status = Fat12WriteBootSector(FileHandle, &BootSector, Context); @@ -396,10 +377,5 @@ DPRINT("Fat12WriteRootDirectory() failed with status 0x%.08x\n", Status); } - if (!QuickFormat) - { - /* FIXME: Fill remaining sectors */ - } - return Status; } Modified: branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/fs… ============================================================================== --- branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Wed Jan 13 15:40:37 2016 @@ -5,49 +5,17 @@ * PURPOSE: Fat16 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Eric Kohl - * REVISIONS: - * EK 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> -static ULONG -GetShiftCount(IN ULONG Value) -{ - ULONG i = 1; - - while (Value > 0) - { - i++; - Value /= 2; - } - - return i - 2; -} - - -static ULONG -CalcVolumeSerialNumber(VOID) -{ - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - ULONG Serial; - PUCHAR Buffer; - - NtQuerySystemTime (&SystemTime); - RtlTimeToTimeFields (&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&Serial; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - return Serial; -} - + +/* FUNCTIONS ******************************************************************/ static NTSTATUS Fat16WriteBootSector(IN HANDLE FileHandle, @@ -67,12 +35,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, BootSector->BytesPerSector); + RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); + /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; @@ -91,15 +60,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; + goto done; } UpdateProgress(Context, 1); - /* Free the new boot sector */ +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; } @@ -125,7 +93,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); /* FAT cluster 0 */ Buffer[0] = 0xf8; /* Media type */ @@ -149,14 +117,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, 1); /* Zero the begin of the buffer */ - memset(Buffer, 0, 4); + RtlZeroMemory(Buffer, 4); /* Zero the rest of the FAT */ Sectors = 32 * 1024 / BootSector->BytesPerSector; @@ -182,16 +149,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -231,7 +197,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); Sectors = 32 * 1024 / BootSector->BytesPerSector; for (i = 0; i < RootDirSectors; i += Sectors) @@ -256,16 +222,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -316,7 +281,7 @@ SectorCount = PartitionInfo->PartitionLength.QuadPart >> GetShiftCount(DiskGeometry->BytesPerSector); /* Use shifting to avoid 64-bit division */ - memset(&BootSector, 0, sizeof(FAT16_BOOT_SECTOR)); + RtlZeroMemory(&BootSector, sizeof(FAT16_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; @@ -330,7 +295,7 @@ BootSector.Heads = DiskGeometry->TracksPerCylinder; BootSector.HiddenSectors = PartitionInfo->HiddenSectors; BootSector.SectorsHuge = (SectorCount >= 0x10000) ? (unsigned long)SectorCount : 0; - BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00; + BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; BootSector.VolumeID = CalcVolumeSerialNumber(); if ((Label == NULL) || (Label->Buffer == NULL)) @@ -340,7 +305,7 @@ else { RtlUnicodeStringToOemString(&VolumeLabel, Label, TRUE); - memset(&BootSector.VolumeLabel[0], ' ', 11); + RtlFillMemory(&BootSector.VolumeLabel[0], 11, ' '); memcpy(&BootSector.VolumeLabel[0], VolumeLabel.Buffer, VolumeLabel.Length < 11 ? VolumeLabel.Length : 11); RtlFreeOemString(&VolumeLabel); @@ -365,6 +330,22 @@ Context->TotalSectorCount = 1 + (BootSector.FATSectors * 2) + RootDirSectors; + if (!QuickFormat) + { + Context->TotalSectorCount += SectorCount; + + Status = FatWipeSectors(FileHandle, + SectorCount, + (ULONG)BootSector.SectorsPerCluster, + (ULONG)BootSector.BytesPerSector, + Context); + if (!NT_SUCCESS(Status)) + { + DPRINT("FatWipeSectors() failed with status 0x%.08x\n", Status); + return Status; + } + } + Status = Fat16WriteBootSector(FileHandle, &BootSector, Context); @@ -404,10 +385,5 @@ DPRINT("Fat16WriteRootDirectory() failed with status 0x%.08x\n", Status); } - if (!QuickFormat) - { - /* FIXME: Fill remaining sectors */ - } - return Status; } Modified: branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/fs… ============================================================================== --- branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Wed Jan 13 15:40:37 2016 @@ -5,49 +5,17 @@ * PURPOSE: Fat32 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Eric Kohl - * REVISIONS: - * EK 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> -static ULONG -GetShiftCount(IN ULONG Value) -{ - ULONG i = 1; - - while (Value > 0) - { - i++; - Value /= 2; - } - - return i - 2; -} - - -static ULONG -CalcVolumeSerialNumber(VOID) -{ - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - ULONG Serial; - PUCHAR Buffer; - - NtQuerySystemTime (&SystemTime); - RtlTimeToTimeFields (&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&Serial; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - return Serial; -} - + +/* FUNCTIONS ******************************************************************/ static NTSTATUS Fat32WriteBootSector(IN HANDLE FileHandle, @@ -67,12 +35,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, BootSector->BytesPerSector); + RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT32 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, OEMName)); /* FAT32 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, OEMName)); + /* FAT32 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; @@ -91,8 +60,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; + goto done; } UpdateProgress(Context, 1); @@ -113,16 +81,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; + goto done; } UpdateProgress(Context, 1); } - /* Free the new boot sector */ +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; } @@ -136,6 +103,7 @@ NTSTATUS Status; PFAT32_FSINFO FsInfo; LARGE_INTEGER FileOffset; + ULONGLONG FirstDataSector; /* Allocate buffer for new sector */ FsInfo = (PFAT32_FSINFO)RtlAllocateHeap(RtlGetProcessHeap(), @@ -144,16 +112,19 @@ if (FsInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; - /* Zero the new sector */ - memset(FsInfo, 0, BootSector->BytesPerSector); - - FsInfo->LeadSig = 0x41615252; - FsInfo->StrucSig = 0x61417272; - FsInfo->FreeCount = 0xffffffff; - FsInfo->NextFree = 0xffffffff; - FsInfo->TrailSig = 0xaa550000; - - /* Write sector */ + /* Zero the first FsInfo sector */ + RtlZeroMemory(FsInfo, BootSector->BytesPerSector); + + FirstDataSector = BootSector->ReservedSectors + + (BootSector->FATCount * BootSector->FATSectors32) + 0 /* RootDirSectors */; + + FsInfo->LeadSig = FSINFO_SECTOR_BEGIN_SIGNATURE; + FsInfo->StrucSig = FSINFO_SIGNATURE; + FsInfo->FreeCount = (BootSector->SectorsHuge - FirstDataSector) / BootSector->SectorsPerCluster - 1; + FsInfo->NextFree = 0xffffffff; + FsInfo->TrailSig = FSINFO_SECTOR_END_SIGNATURE; + + /* Write the first FsInfo sector */ FileOffset.QuadPart = BootSector->FSInfoSector * BootSector->BytesPerSector; Status = NtWriteFile(FileHandle, NULL, @@ -167,15 +138,84 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, FsInfo); - return Status; + goto done; } UpdateProgress(Context, 1); - /* Free the new sector buffer */ + /* Write backup of the first FsInfo sector */ + if (BootSector->BootBackup != 0x0000) + { + /* Reset the free cluster count for the backup */ + FsInfo->FreeCount = 0xffffffff; + + FileOffset.QuadPart = (ULONGLONG)(((ULONG)BootSector->BootBackup + (ULONG)BootSector->FSInfoSector) * BootSector->BytesPerSector); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FsInfo, + BootSector->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, 1); + } + + /* Zero the second FsInfo sector */ + RtlZeroMemory(FsInfo, BootSector->BytesPerSector); + FsInfo->TrailSig = FSINFO_SECTOR_END_SIGNATURE; + + /* Write the second FsInfo sector */ + FileOffset.QuadPart = (BootSector->FSInfoSector + 1) * BootSector->BytesPerSector; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FsInfo, + BootSector->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, 1); + + /* Write backup of the second FsInfo sector */ + if (BootSector->BootBackup != 0x0000) + { + FileOffset.QuadPart = (ULONGLONG)(((ULONG)BootSector->BootBackup + (ULONG)BootSector->FSInfoSector + 1) * BootSector->BytesPerSector); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FsInfo, + BootSector->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, 1); + } + +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, FsInfo); - return Status; } @@ -201,7 +241,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 64 * 1024); + RtlZeroMemory(Buffer, 64 * 1024); /* FAT cluster 0 */ Buffer[0] = 0xf8; /* Media type */ @@ -235,14 +275,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, 1); /* Zero the begin of the buffer */ - memset(Buffer, 0, 12); + RtlZeroMemory(Buffer, 12); /* Zero the rest of the FAT */ Sectors = 64 * 1024 / BootSector->BytesPerSector; @@ -268,16 +307,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -302,7 +340,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, BootSector->SectorsPerCluster * BootSector->BytesPerSector); + RtlZeroMemory(Buffer, BootSector->SectorsPerCluster * BootSector->BytesPerSector); DPRINT("BootSector->ReservedSectors = %lu\n", BootSector->ReservedSectors); DPRINT("BootSector->FATSectors32 = %lu\n", BootSector->FATSectors32); @@ -333,96 +371,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); - - /* Free the buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - - return Status; -} - - -static -NTSTATUS -Fat32WipeSectors( - IN HANDLE FileHandle, - IN PFAT32_BOOT_SECTOR BootSector, - IN OUT PFORMAT_CONTEXT Context) -{ - IO_STATUS_BLOCK IoStatusBlock; - PUCHAR Buffer; - LARGE_INTEGER FileOffset; - ULONGLONG Sector; - ULONG Length; - NTSTATUS Status; - - /* Allocate buffer for the cluster */ - Buffer = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - BootSector->SectorsPerCluster * BootSector->BytesPerSector); - if (Buffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Sector = 0; - Length = BootSector->SectorsPerCluster * BootSector->BytesPerSector; - - while (Sector + BootSector->SectorsPerCluster < BootSector->SectorsHuge) - { - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; - - Status = NtWriteFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - Buffer, - Length, - &FileOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - goto done; - } - - UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); - - Sector += BootSector->SectorsPerCluster; - } - - if (Sector + BootSector->SectorsPerCluster > BootSector->SectorsHuge) - { - DPRINT("Remaining sectors %lu\n", BootSector->SectorsHuge - Sector); - - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; - Length = (BootSector->SectorsHuge - Sector) * BootSector->BytesPerSector; - - Status = NtWriteFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - Buffer, - Length, - &FileOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - goto done; - } - - UpdateProgress(Context, BootSector->SectorsHuge - Sector); - } done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -467,7 +423,7 @@ } } - memset(&BootSector, 0, sizeof(FAT32_BOOT_SECTOR)); + RtlZeroMemory(&BootSector, sizeof(FAT32_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; @@ -490,7 +446,7 @@ BootSector.BootBackup = 6; BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; - BootSector.VolumeID = CalcVolumeSerialNumber (); + BootSector.VolumeID = CalcVolumeSerialNumber(); if ((Label == NULL) || (Label->Buffer == NULL)) { memcpy(&BootSector.VolumeLabel[0], "NO NAME ", 11); @@ -498,7 +454,7 @@ else { RtlUnicodeStringToOemString(&VolumeLabel, Label, TRUE); - memset(&BootSector.VolumeLabel[0], ' ', 11); + RtlFillMemory(&BootSector.VolumeLabel[0], 11, ' '); memcpy(&BootSector.VolumeLabel[0], VolumeLabel.Buffer, VolumeLabel.Length < 11 ? VolumeLabel.Length : 11); RtlFreeOemString(&VolumeLabel); @@ -521,12 +477,14 @@ { Context->TotalSectorCount += BootSector.SectorsHuge; - Status = Fat32WipeSectors(FileHandle, - &BootSector, - Context); + Status = FatWipeSectors(FileHandle, + BootSector.SectorsHuge, + (ULONG)BootSector.SectorsPerCluster, + (ULONG)BootSector.BytesPerSector, + Context); if (!NT_SUCCESS(Status)) { - DPRINT("Fat32WipeSectors() failed with status 0x%.08x\n", Status); + DPRINT("FatWipeSectors() failed with status 0x%.08x\n", Status); return Status; } } Modified: branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/fs… ============================================================================== --- branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Wed Jan 13 15:40:37 2016 @@ -4,13 +4,17 @@ * FILE: lib\fslib\vfatlib\vfatlib.c * PURPOSE: Main API * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> + + +/* GLOBALS & FUNCTIONS ********************************************************/ PFMIFSCALLBACK ChkdskCallback = NULL; PVOID FsCheckMemQueue; @@ -261,7 +265,6 @@ DPRINT1("Failed to umount volume (Status: 0x%x)\n", LockStatus); } - LockStatus = NtFsControlFile(FileHandle, NULL, NULL, @@ -282,7 +285,7 @@ if (Callback != NULL) { Context.Success = (BOOLEAN)(NT_SUCCESS(Status)); - Callback (DONE, 0, (PVOID)&Context.Success); + Callback(DONE, 0, (PVOID)&Context.Success); } DPRINT("VfatFormat() done. Status 0x%.08x\n", Status); @@ -299,7 +302,6 @@ Context->CurrentSectorCount += (ULONGLONG)Increment; - NewPercent = (Context->CurrentSectorCount * 100ULL) / Context->TotalSectorCount; if (NewPercent > Context->Percent) @@ -307,7 +309,7 @@ Context->Percent = NewPercent; if (Context->Callback != NULL) { - Context->Callback (PROGRESS, 0, &Context->Percent); + Context->Callback(PROGRESS, 0, &Context->Percent); } } } @@ -327,6 +329,8 @@ /* Prepare parameters */ TextOut.Lines = 1; TextOut.Output = TextBuf; + + DPRINT1("VfatPrint -- %s", TextBuf); /* Do the callback */ if (ChkdskCallback) @@ -368,7 +372,7 @@ if (CheckOnlyIfDirty && !fs_isdirty()) { /* No need to check FS */ - return fs_close(FALSE); + return (fs_close(FALSE) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); } read_boot(&fs); @@ -414,7 +418,7 @@ } VfatPrint("%wZ: %u files, %lu/%lu clusters\n", DriveRoot, - FsCheckTotalFiles, fs.clusters - free_clusters, fs.clusters ); + FsCheckTotalFiles, fs.clusters - free_clusters, fs.clusters); if (FixErrors) { @@ -426,7 +430,7 @@ } /* Close the volume */ - return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + return (fs_close(FixErrors) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); } /* EOF */ Modified: branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/fs… ============================================================================== --- branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] Wed Jan 13 15:40:37 2016 @@ -57,7 +57,6 @@ unsigned long Signature1; // 508 } FAT16_BOOT_SECTOR, *PFAT16_BOOT_SECTOR; - typedef struct _FAT32_BOOT_SECTOR { unsigned char magic0; // 0 @@ -105,6 +104,10 @@ } FAT32_FSINFO, *PFAT32_FSINFO; #include <poppack.h> +#define FSINFO_SECTOR_BEGIN_SIGNATURE 0x41615252 // 'RRaA' +#define FSINFO_SECTOR_END_SIGNATURE 0xAA550000 +#define FSINFO_SIGNATURE 0x61417272 // 'rrAa' + typedef struct _FORMAT_CONTEXT { PFMIFSCALLBACK Callback; @@ -113,6 +116,8 @@ BOOLEAN Success; ULONG Percent; } FORMAT_CONTEXT, *PFORMAT_CONTEXT; + +#include "common.h" NTSTATUS

8 years, 11 months

[hbelusca] 70583: [VFATLIB]: Comments (and DPRINT) fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 13 14:12:04 2016 New Revision: 70583 URL: http://svn.reactos.org/svn/reactos?rev=70583&view=rev Log: [VFATLIB]: Comments (and DPRINT) fixes only. Modified: trunk/reactos/lib/fslib/vfatlib/common.c trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c Modified: trunk/reactos/lib/fslib/vfatlib/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.c… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] Wed Jan 13 14:12:04 2016 @@ -50,7 +50,7 @@ return Serial; } -/***** Wipe function for FAT12, FAT16 and FAT32 formats, adapted from FAT32 code *****/ +/***** Wipe function for FAT12, FAT16 and FAT32 formats *****/ NTSTATUS FatWipeSectors( IN HANDLE FileHandle, Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Wed Jan 13 14:12:04 2016 @@ -333,7 +333,7 @@ Context); if (!NT_SUCCESS(Status)) { - DPRINT("Fat12WipeSectors() failed with status 0x%.08x\n", Status); + DPRINT("FatWipeSectors() failed with status 0x%.08x\n", Status); return Status; } } Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Wed Jan 13 14:12:04 2016 @@ -341,7 +341,7 @@ Context); if (!NT_SUCCESS(Status)) { - DPRINT("Fat16WipeSectors() failed with status 0x%.08x\n", Status); + DPRINT("FatWipeSectors() failed with status 0x%.08x\n", Status); return Status; } } Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Wed Jan 13 14:12:04 2016 @@ -484,7 +484,7 @@ Context); if (!NT_SUCCESS(Status)) { - DPRINT("Fat32WipeSectors() failed with status 0x%.08x\n", Status); + DPRINT("FatWipeSectors() failed with status 0x%.08x\n", Status); return Status; } }

8 years, 11 months

[hbelusca] 70582: [CMLIB] - Fix HBLOCK_SIZE vs. HSECTOR_SIZE mix-ups in HvpGetHiveHeader. - Add a function to create cluster-aligned hive base blocks (HBASE_BLOCK) based on the existing code of Hvp...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 13 01:40:58 2016 New Revision: 70582 URL: http://svn.reactos.org/svn/reactos?rev=70582&view=rev Log: [CMLIB] - Fix HBLOCK_SIZE vs. HSECTOR_SIZE mix-ups in HvpGetHiveHeader. - Add a function to create cluster-aligned hive base blocks (HBASE_BLOCK) based on the existing code of HvpGetHiveHeader, and use it everytime we need to allocate HBASE_BLOCKs. - Keep the actual base block size in the BaseBlockAlloc member, and use this value for the "quota" parameter when we free the blocks. - Introduce & use a function to initialize the hive file name array (mainly used for debugging purposes). - "HvpInitializeMemoryInplaceHive" should read "HvpInitializeFlatHive" instead since this function is used to initialize a flat hive. Memory-in-place hives are a different thing. - Fix some memory leaks in the error paths of HvLoadHive. - Initialize some additional hive members in HvInitialize(Hive). Modified: trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Wed Jan 13 01:40:58 2016 @@ -14,10 +14,9 @@ * * Internal function to verify that a hive header has valid format. */ - BOOLEAN CMAPI HvpVerifyHiveHeader( - PHBASE_BLOCK BaseBlock) + IN PHBASE_BLOCK BaseBlock) { if (BaseBlock->Signature != HV_SIGNATURE || BaseBlock->Major != HSYS_MAJOR || @@ -28,10 +27,10 @@ BaseBlock->Sequence1 != BaseBlock->Sequence2 || HvpHiveHeaderChecksum(BaseBlock) != BaseBlock->CheckSum) { - DPRINT1("Verify Hive Header failed: \n"); + DPRINT1("Verify Hive Header failed:\n"); DPRINT1(" Signature: 0x%x, expected 0x%x; Major: 0x%x, expected 0x%x\n", BaseBlock->Signature, HV_SIGNATURE, BaseBlock->Major, HSYS_MAJOR); - DPRINT1(" Minor: 0x%x is not >= 0x%x; Type: 0x%x, expected 0x%x\n", + DPRINT1(" Minor: 0x%x expected to be >= 0x%x; Type: 0x%x, expected 0x%x\n", BaseBlock->Minor, HSYS_MINOR, BaseBlock->Type, HFILE_TYPE_PRIMARY); DPRINT1(" Format: 0x%x, expected 0x%x; Cluster: 0x%x, expected 1\n", BaseBlock->Format, HBASE_FORMAT_MEMORY, BaseBlock->Cluster); @@ -48,10 +47,8 @@ /** * @name HvpFreeHiveBins * - * Internal function to free all bin storage associated with hive - * descriptor. - */ - + * Internal function to free all bin storage associated with a hive descriptor. + */ VOID CMAPI HvpFreeHiveBins( PHHIVE Hive) @@ -82,27 +79,98 @@ } /** + * @name HvpAllocBaseBlockAligned + * + * Internal helper function to allocate cluster-aligned hive base blocks. + */ +static __inline PHBASE_BLOCK +HvpAllocBaseBlockAligned( + IN PHHIVE Hive, + IN BOOLEAN Paged, + IN ULONG Tag) +{ + PHBASE_BLOCK BaseBlock; + ULONG Alignment; + + ASSERT(sizeof(HBASE_BLOCK) >= (HSECTOR_SIZE * Hive->Cluster)); + + /* Allocate the buffer */ + BaseBlock = Hive->Allocate(Hive->BaseBlockAlloc, Paged, Tag); + if (!BaseBlock) return NULL; + + /* Check for, and enforce, alignment */ + Alignment = Hive->Cluster * HSECTOR_SIZE -1; + if ((ULONG_PTR)BaseBlock & Alignment) + { + /* Free the old header and reallocate a new one, always paged */ + Hive->Free(BaseBlock, Hive->BaseBlockAlloc); + BaseBlock = Hive->Allocate(PAGE_SIZE, TRUE, Tag); + if (!BaseBlock) return NULL; + + Hive->BaseBlockAlloc = PAGE_SIZE; + } + + return BaseBlock; +} + +/** + * @name HvpInitFileName + * + * Internal function to initialize the UNICODE NULL-terminated hive file name + * member of a hive header by copying the last 31 characters of the file name. + * Mainly used for debugging purposes. + */ +static VOID +HvpInitFileName( + IN OUT PHBASE_BLOCK BaseBlock, + IN PCUNICODE_STRING FileName OPTIONAL) +{ + ULONG_PTR Offset; + SIZE_T Length; + + /* Always NULL-initialize */ + RtlZeroMemory(BaseBlock->FileName, (HIVE_FILENAME_MAXLEN + 1) * sizeof(WCHAR)); + + /* Copy the 31 last characters of the hive file name if any */ + if (!FileName) return; + + if (FileName->Length / sizeof(WCHAR) <= HIVE_FILENAME_MAXLEN) + { + Offset = 0; + Length = FileName->Length; + } + else + { + Offset = FileName->Length / sizeof(WCHAR) - HIVE_FILENAME_MAXLEN; + Length = HIVE_FILENAME_MAXLEN * sizeof(WCHAR); + } + + RtlCopyMemory(BaseBlock->FileName, FileName->Buffer + Offset, Length); +} + +/** * @name HvpCreateHive * - * Internal helper function to initialize hive descriptor structure for - * newly created hive. + * Internal helper function to initialize a hive descriptor structure + * for a newly created hive in memory. * * @see HvInitialize */ - NTSTATUS CMAPI HvpCreateHive( - PHHIVE RegistryHive, - PCUNICODE_STRING FileName OPTIONAL) + IN OUT PHHIVE RegistryHive, + IN PCUNICODE_STRING FileName OPTIONAL) { PHBASE_BLOCK BaseBlock; ULONG Index; - BaseBlock = RegistryHive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); + /* Allocate the base block */ + BaseBlock = HvpAllocBaseBlockAligned(RegistryHive, FALSE, TAG_CM); if (BaseBlock == NULL) return STATUS_NO_MEMORY; - RtlZeroMemory(BaseBlock, sizeof(HBASE_BLOCK)); + /* Clear it */ + RtlZeroMemory(BaseBlock, RegistryHive->BaseBlockAlloc); BaseBlock->Signature = HV_SIGNATURE; BaseBlock->Major = HSYS_MAJOR; @@ -114,37 +182,29 @@ BaseBlock->Length = 0; BaseBlock->Sequence1 = 1; BaseBlock->Sequence2 = 1; - - /* Copy the 31 last characters of the hive file name if any */ - if (FileName) - { - if (FileName->Length / sizeof(WCHAR) <= HIVE_FILENAME_MAXLEN) - { - RtlCopyMemory(BaseBlock->FileName, - FileName->Buffer, - FileName->Length); - } - else - { - RtlCopyMemory(BaseBlock->FileName, - FileName->Buffer + - FileName->Length / sizeof(WCHAR) - HIVE_FILENAME_MAXLEN, - HIVE_FILENAME_MAXLEN * sizeof(WCHAR)); - } - - /* NULL-terminate */ - BaseBlock->FileName[HIVE_FILENAME_MAXLEN] = L'\0'; - } - - BaseBlock->CheckSum = HvpHiveHeaderChecksum(BaseBlock); - + BaseBlock->TimeStamp.QuadPart = 0ULL; + + /* + * No need to compute the checksum since + * the hive resides only in memory so far. + */ + BaseBlock->CheckSum = 0; + + /* Set default boot type */ + BaseBlock->BootType = 0; + + /* Setup hive data */ RegistryHive->BaseBlock = BaseBlock; + RegistryHive->Version = BaseBlock->Minor; // == HSYS_MINOR + for (Index = 0; Index < 24; Index++) { RegistryHive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; RegistryHive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; } + HvpInitFileName(BaseBlock, FileName); + return STATUS_SUCCESS; } @@ -152,16 +212,16 @@ * @name HvpInitializeMemoryHive * * Internal helper function to initialize hive descriptor structure for - * a hive stored in memory. The data of the hive are copied and it is - * prepared for read/write access. + * an existing hive stored in memory. The data of the hive is copied + * and it is prepared for read/write access. * * @see HvInitialize */ - NTSTATUS CMAPI HvpInitializeMemoryHive( PHHIVE Hive, - PVOID ChunkBase) + PHBASE_BLOCK ChunkBase, + IN PCUNICODE_STRING FileName OPTIONAL) { SIZE_T BlockIndex; PHBIN Bin, NewBin; @@ -170,23 +230,26 @@ PULONG BitmapBuffer; SIZE_T ChunkSize; - ChunkSize = ((PHBASE_BLOCK)ChunkBase)->Length; + ChunkSize = ChunkBase->Length; DPRINT("ChunkSize: %lx\n", ChunkSize); if (ChunkSize < sizeof(HBASE_BLOCK) || - !HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) + !HvpVerifyHiveHeader(ChunkBase)) { DPRINT1("Registry is corrupt: ChunkSize %lu < sizeof(HBASE_BLOCK) %lu, " - "or HvpVerifyHiveHeader() failed\n", ChunkSize, (SIZE_T)sizeof(HBASE_BLOCK)); + "or HvpVerifyHiveHeader() failed\n", ChunkSize, sizeof(HBASE_BLOCK)); return STATUS_REGISTRY_CORRUPT; } - Hive->BaseBlock = Hive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); + /* Allocate the base block */ + Hive->BaseBlock = HvpAllocBaseBlockAligned(Hive, FALSE, TAG_CM); if (Hive->BaseBlock == NULL) - { return STATUS_NO_MEMORY; - } + RtlCopyMemory(Hive->BaseBlock, ChunkBase, sizeof(HBASE_BLOCK)); + + /* Setup hive data */ + Hive->Version = ChunkBase->Minor; /* * Build a block list from the in-memory chunk and copy the data as @@ -200,7 +263,7 @@ if (Hive->Storage[Stable].BlockList == NULL) { DPRINT1("Allocating block list failed\n"); - Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_NO_MEMORY; } @@ -212,16 +275,16 @@ { DPRINT1("Invalid bin at BlockIndex %lu, Signature 0x%x, Size 0x%x\n", (unsigned long)BlockIndex, (unsigned)Bin->Signature, (unsigned)Bin->Size); - Hive->Free(Hive->BaseBlock, 0); Hive->Free(Hive->Storage[Stable].BlockList, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_REGISTRY_CORRUPT; } NewBin = Hive->Allocate(Bin->Size, TRUE, TAG_CM); if (NewBin == NULL) { - Hive->Free(Hive->BaseBlock, 0); Hive->Free(Hive->Storage[Stable].BlockList, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_NO_MEMORY; } @@ -246,7 +309,7 @@ if (HvpCreateHiveFreeCellList(Hive)) { HvpFreeHiveBins(Hive); - Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_NO_MEMORY; } @@ -256,18 +319,20 @@ if (BitmapBuffer == NULL) { HvpFreeHiveBins(Hive); - Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc); return STATUS_NO_MEMORY; } RtlInitializeBitMap(&Hive->DirtyVector, BitmapBuffer, BitmapSize * 8); RtlClearAllBits(&Hive->DirtyVector); + HvpInitFileName(Hive->BaseBlock, FileName); + return STATUS_SUCCESS; } /** - * @name HvpInitializeMemoryInplaceHive + * @name HvpInitializeFlatHive * * Internal helper function to initialize hive descriptor structure for * a hive stored in memory. The in-memory data of the hive are directly @@ -275,20 +340,22 @@ * * @see HvInitialize */ - NTSTATUS CMAPI -HvpInitializeMemoryInplaceHive( +HvpInitializeFlatHive( PHHIVE Hive, - PVOID ChunkBase) -{ - if (!HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) - { + PHBASE_BLOCK ChunkBase) +{ + if (!HvpVerifyHiveHeader(ChunkBase)) return STATUS_REGISTRY_CORRUPT; - } - - Hive->BaseBlock = (PHBASE_BLOCK)ChunkBase; + + /* Setup hive data */ + Hive->BaseBlock = ChunkBase; + Hive->Version = ChunkBase->Minor; + Hive->Flat = TRUE; Hive->ReadOnly = TRUE; - Hive->Flat = TRUE; + + /* Set default boot type */ + ChunkBase->BootType = 0; return STATUS_SUCCESS; } @@ -310,25 +377,15 @@ IN PLARGE_INTEGER TimeStamp) { PHBASE_BLOCK BaseBlock; - ULONG Alignment; ULONG Result; ULONG Offset = 0; - ASSERT(sizeof(HBASE_BLOCK) >= (HBLOCK_SIZE * Hive->Cluster)); - - /* Assume failure and allocate the buffer */ - *HiveBaseBlock = 0; - BaseBlock = Hive->Allocate(sizeof(HBASE_BLOCK), TRUE, TAG_CM); + + ASSERT(sizeof(HBASE_BLOCK) >= (HSECTOR_SIZE * Hive->Cluster)); + + /* Assume failure and allocate the base block */ + *HiveBaseBlock = NULL; + BaseBlock = HvpAllocBaseBlockAligned(Hive, TRUE, TAG_CM); if (!BaseBlock) return NoMemory; - - /* Check for, and enforce, alignment */ - Alignment = Hive->Cluster * HBLOCK_SIZE -1; - if ((ULONG_PTR)BaseBlock & Alignment) - { - /* Free the old header */ - Hive->Free(BaseBlock, 0); - BaseBlock = Hive->Allocate(PAGE_SIZE, TRUE, TAG_CM); - if (!BaseBlock) return NoMemory; - } /* Clear it */ RtlZeroMemory(BaseBlock, sizeof(HBASE_BLOCK)); @@ -338,7 +395,7 @@ HFILE_TYPE_PRIMARY, &Offset, BaseBlock, - Hive->Cluster * HBLOCK_SIZE); + Hive->Cluster * HSECTOR_SIZE); /* Couldn't read: assume it's not a hive */ if (!Result) return NotHive; @@ -353,8 +410,10 @@ } NTSTATUS CMAPI -HvLoadHive(IN PHHIVE Hive) -{ +HvLoadHive(IN PHHIVE Hive, + IN PCUNICODE_STRING FileName OPTIONAL) +{ + NTSTATUS Status; PHBASE_BLOCK BaseBlock = NULL; ULONG Result; LARGE_INTEGER TimeStamp; @@ -391,12 +450,16 @@ /* Setup hive data */ Hive->BaseBlock = BaseBlock; - Hive->Version = Hive->BaseBlock->Minor; + Hive->Version = BaseBlock->Minor; /* Allocate a buffer large enough to hold the hive */ - FileSize = HBLOCK_SIZE + BaseBlock->Length; + FileSize = HBLOCK_SIZE + BaseBlock->Length; // == sizeof(HBASE_BLOCK) + BaseBlock->Length; HiveData = Hive->Allocate(FileSize, TRUE, TAG_CM); - if (!HiveData) return STATUS_INSUFFICIENT_RESOURCES; + if (!HiveData) + { + Hive->Free(BaseBlock, Hive->BaseBlockAlloc); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Now read the whole hive */ Result = Hive->FileRead(Hive, @@ -404,14 +467,23 @@ &Offset, HiveData, FileSize); - if (!Result) return STATUS_NOT_REGISTRY_FILE; + if (!Result) + { + Hive->Free(HiveData, FileSize); + Hive->Free(BaseBlock, Hive->BaseBlockAlloc); + return STATUS_NOT_REGISTRY_FILE; + } // This is a HACK! /* Free our base block... it's usless in this implementation */ - Hive->Free(BaseBlock, 0); + Hive->Free(BaseBlock, Hive->BaseBlockAlloc); /* Initialize the hive directly from memory */ - return HvpInitializeMemoryHive(Hive, HiveData); + Status = HvpInitializeMemoryHive(Hive, HiveData, FileName); + if (!NT_SUCCESS(Status)) + Hive->Free(HiveData, FileSize); + + return Status; } /** @@ -444,7 +516,6 @@ * * @see HvFree */ - NTSTATUS CMAPI HvInitialize( PHHIVE RegistryHive, @@ -464,8 +535,6 @@ NTSTATUS Status; PHHIVE Hive = RegistryHive; - UNREFERENCED_PARAMETER(FileType); - /* * Create a new hive structure that will hold all the maintenance data. */ @@ -474,13 +543,18 @@ Hive->Allocate = Allocate; Hive->Free = Free; + Hive->FileSetSize = FileSetSize; + Hive->FileWrite = FileWrite; Hive->FileRead = FileRead; - Hive->FileWrite = FileWrite; - Hive->FileSetSize = FileSetSize; Hive->FileFlush = FileFlush; + + Hive->RefreshCount = 0; Hive->StorageTypeCount = HTYPE_COUNT; - Hive->Cluster = 1; + Hive->Cluster = Cluster; + Hive->BaseBlockAlloc = sizeof(HBASE_BLOCK); // == HBLOCK_SIZE + Hive->Version = HSYS_MINOR; + Hive->Log = (FileType == HFILE_TYPE_LOG); Hive->HiveFlags = HiveFlags & ~HIVE_NOLAZYFLUSH; switch (OperationType) @@ -490,16 +564,16 @@ break; case HINIT_MEMORY: - Status = HvpInitializeMemoryHive(Hive, HiveData); + Status = HvpInitializeMemoryHive(Hive, HiveData, FileName); break; case HINIT_FLAT: - Status = HvpInitializeMemoryInplaceHive(Hive, HiveData); + Status = HvpInitializeFlatHive(Hive, HiveData); break; case HINIT_FILE: { - Status = HvLoadHive(Hive); + Status = HvLoadHive(Hive, FileName); if ((Status != STATUS_SUCCESS) && (Status != STATUS_REGISTRY_RECOVERED)) { @@ -512,6 +586,12 @@ break; } + case HINIT_MEMORY_INPLACE: + // Status = HvpInitializeMemoryInplaceHive(Hive, HiveData); + // break; + + case HINIT_MAPFILE: + default: /* FIXME: A better return status value is needed */ Status = STATUS_NOT_IMPLEMENTED; @@ -520,6 +600,9 @@ if (!NT_SUCCESS(Status)) return Status; + /* HACK: ROS: Init root key cell and prepare the hive */ + // r31253 + // if (OperationType == HINIT_CREATE) CmCreateRootNode(Hive, L""); if (OperationType != HINIT_CREATE) CmPrepareHive(Hive); return Status; @@ -531,7 +614,6 @@ * Free all stroage and handles associated with hive descriptor. * But do not free the hive descriptor itself. */ - VOID CMAPI HvFree( PHHIVE RegistryHive) @@ -549,7 +631,7 @@ /* Free the BaseBlock */ if (RegistryHive->BaseBlock) { - RegistryHive->Free(RegistryHive->BaseBlock, 0); + RegistryHive->Free(RegistryHive->BaseBlock, RegistryHive->BaseBlockAlloc); RegistryHive->BaseBlock = NULL; } }

8 years, 11 months

[hbelusca] 70581: [CMLIB]: Better fix for r70580.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 12 22:22:18 2016 New Revision: 70581 URL: http://svn.reactos.org/svn/reactos?rev=70581&view=rev Log: [CMLIB]: Better fix for r70580. Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7058… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Tue Jan 12 22:22:18 2016 @@ -18,7 +18,14 @@ #include <stdio.h> #include <string.h> - #define NTDDI_VERSION 0x05020400 // NTDDI_WS03SP4 // This is the NT kernel version + // NTDDI_xxx versions we allude to in the library (see psdk/sdkddkver.h) + #define NTDDI_WS03SP4 0x05020400 + #define NTDDI_WIN6 0x06000000 + #define NTDDI_LONGHORN NTDDI_WIN6 + #define NTDDI_VISTA NTDDI_WIN6 + #define NTDDI_WIN7 0x06010000 + + #define NTDDI_VERSION NTDDI_WS03SP4 // This is the ReactOS NT kernel version /* C_ASSERT Definition */ #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1]

8 years, 11 months

[hbelusca] 70580: [CMLIB]: Fix host-tool compilation (+ add a comment).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 12 22:17:39 2016 New Revision: 70580 URL: http://svn.reactos.org/svn/reactos?rev=70580&view=rev Log: [CMLIB]: Fix host-tool compilation (+ add a comment). Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7058… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Tue Jan 12 22:17:39 2016 @@ -17,6 +17,8 @@ #include <typedefs.h> #include <stdio.h> #include <string.h> + + #define NTDDI_VERSION 0x05020400 // NTDDI_WS03SP4 // This is the NT kernel version /* C_ASSERT Definition */ #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] @@ -100,6 +102,9 @@ #define PKEVENT PVOID #define PWORK_QUEUE_ITEM PVOID #define EX_PUSH_LOCK PULONG_PTR + + // Definitions copied from <ntifs.h> + // We only want to include host headers, so we define them manually typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL;

8 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
20
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 January 2016