Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [VFATLIB] Addendum to 469289e
by Pierre Schweitzer 28 May '18

28 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e4e772e6cac89c12be95… commit 6e4e772e6cac89c12be9571fd58aaacb854bff7c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 28 23:38:00 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 28 23:38:00 2018 +0200 [VFATLIB] Addendum to 469289e --- sdk/lib/fslib/vfatlib/check/ChangeLog | 1125 +++++++++++++++++++++++++++++++++ sdk/lib/fslib/vfatlib/check/README | 14 + 2 files changed, 1139 insertions(+) diff --git a/sdk/lib/fslib/vfatlib/check/ChangeLog b/sdk/lib/fslib/vfatlib/check/ChangeLog index f6a1e3da95..9e0665afc2 100644 --- a/sdk/lib/fslib/vfatlib/check/ChangeLog +++ b/sdk/lib/fslib/vfatlib/check/ChangeLog @@ -1,3 +1,1128 @@ +commit cad2c17 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Jan 23 03:10:56 2017 +0100 + + fatlabel: Make sure printf style patterns in label are not expanded + + Writing a label to an unlabeled filesystem involves creating a root + directory entry to contain the label. For this, the + alloc_rootdir_entry() function used for creating new directory nodes for + recovered orphan cluster chains is reused. However, this expects the + filename to be a printf style pattern to generate a unique name. + + If the filesystem is unlabeled and the new label contains a printf + specifier other than %d or similar, the attempted expansion of the + pattern might crash fatlabel. + + Change alloc_rootdir_entry() to take an additional argument gen_name and + only expand the name if its value is true. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 77371e2 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Nov 4 13:10:58 2016 +0100 + + testsuite: Add missing fsck test files to dist_check_DATA + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit d6df1d4 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Thu Nov 3 20:03:25 2016 +0100 + + testsuite: Test for bad characters in file names + + The FAT16 test image contains four files with three errors. One has a + space in the name, one a space in the extension and one contains '>' in + the name. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 307966c +Author: Andreas Bombe <aeb(a)debian.org> +Date: Sun Sep 18 00:11:43 2016 +0200 + + fsck: Fix reporting of length to truncate with shared clusters + + When files share clusters and one of the two files has been selected to + truncate fsck reports which file has been selected and the length to + which it will be truncated. All code paths erronously printed the length + of the file that was not going to be truncated, leading to possible user + confusion. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit b33424e +Author: Andreas Bombe <aeb(a)debian.org> +Date: Sat Sep 17 23:34:07 2016 +0200 + + testsuite: Test for files sharing clusters + + The FAT32 test image contains three files. One shares a cluster with the + root directory and the other two share clusters among themselves. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit db5ec04 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Sat Sep 17 22:41:07 2016 +0200 + + testsuite: Run fsck in test-mkfs + + Now the test-mkfs script also runs fsck on the created image to test its + basic operation. The test fails if fsck reports seeing an error. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 4ac17ae +Author: Andreas Bombe <aeb(a)debian.org> +Date: Sat Sep 17 22:25:06 2016 +0200 + + Fix FAT32 FSInfo signature checking + + In commit 7444694 the definition of struct info_sector was corrected to + match the FSInfo sector specification. The initialization was adapted, + but other places were missed. All runs of fsck would then incorrectly + report a signature error on the FSInfo sector. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit e883d07 +Author: Nico Roeser <nico(a)n1c0.de> +Date: Fri Sep 16 20:05:08 2016 +0200 + + mkfs: Bring back ability to set sector size. + + This had accidently been broken when the code was overhauled, resulting + in unconditionally setting the sector size when devinfo detected it. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 4ef83db +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Sep 16 03:32:12 2016 +0200 + + Request minimum automake version 1.11 and add workaround for <1.13 + + Before automake 1.13, parallel-tests wasn't the default set it + explicitly in the automake options list. The parallel test harness was + introduced in 1.11 therefore that is the minimum now. + + However, the AM_TESTS_ENVIRONMENT variable was only starting to work in + 1.13, so there is now a version check and a conditional assignment to + TESTS_ENVIRONMENT (which should be for user setting only) in case + automake is 1.11 or 1.12. + + Without it, the fact of xxd being found is not passed to the test + scripts which then skip all tests due to perceived lack of xxd. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 6a8c8b7 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Sep 16 01:45:17 2016 +0200 + + Add missing autoreconf step to Travis CI configuration + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 54f7aef +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Sep 16 01:39:08 2016 +0200 + + Add configuration for the Travis CI build service + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 5421752 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Sep 14 20:37:57 2016 +0200 + + Check and fix printf style arguments to die() and pdie() + + Add the "format" gcc style attribute to the declarations of die() and + pdie() so that the compiler knows how to check their arguments for + correctness. + + Fix all problematic calls detected by this. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 83e5ec5 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Sep 14 03:38:08 2016 +0200 + + Make some implicit integer conversions safer + + Coverity reports a few places where signed or short integers are + promoted to int and then extended to long which might cause unintended + sign extension. Given the context (being sector sizes and similar) the + values should never actually reach unsafe values, but this patch cleans + it up anyway. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit ff5e718 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Tue Sep 13 20:25:34 2016 +0200 + + mkfs: Remove redundant unreachable warning message + + At some point the check for too many clusters for user requested FAT16 + was moved a few lines above. The original location can only be reached + when the cluster count is too low for FAT16 which means the too many + clusters message can not be triggered there. + + Found through the dead code detection of Coverity Scan. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit e359a33 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Tue Sep 13 20:12:21 2016 +0200 + + Fix octal character parsing in file_cvt() + + Apparently the octal code parsing got rewritten into a loop at some + point while the rest of the code was not removed. It was impossible to + specify an octal character code without the function returning an error. + + This affected the -u and -d options for fsck. + + Found through the dead code detection of Coverity Scan. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit ccd0a9d +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Sep 12 20:21:53 2016 +0200 + + testsuite: Test for circular cluster chain + + The test image contains a file four clusters in length where the third + cluster has been modified to point back to the second cluster. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit fab40f8 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Sep 12 19:51:10 2016 +0200 + + Fix truncation logic in circular chain check + + When scanning for circular chains, the first FAT entry that appeared a + second time in a chain should cause the previous cluster to be the + termination of the chain. + + To that end, test_file() keeps variables to point to the previous + cluster and the current number of clusters. When the -t option is given, + all clusters are checked to be readable and skipped (variables not + updates) in test_file() when they are not. + + The problem was that the variables were updated only when the read check + succeeded. If the -t option is not given, that check does not happen and + the variables keep their initial value. The circular chain fix would + then always truncate to zero length and fail to update the free cluster + count, requiring a second fsck run. + + Fix by updating these variables unconditionally when -t option is not + given. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 8394ceb +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Sep 12 14:39:11 2016 +0200 + + testsuite: Test for too long cluster chain + + The test image contains a file marked as 7 bytes in length (just a small + part of 1 cluster) in the directory entry that has 2 clusters assigned + to it in the FAT. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 7444694 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Sep 7 21:09:41 2016 +0200 + + Fix definition and initialization of fsinfo sector + + Change the definition of the fsinfo struct to be more in line with the + official definition, in particular make the trailing signature field 32 + bit instead of 16 bit. During initialization in init_fsinfo(), first + clear the whole struct to zero before setting fields, to make sure + reserved fields are zeroed. + + Fixes #33. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit f78cb68 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Sep 7 20:45:29 2016 +0200 + + Add fsck testsuite + + Add the framework for a fsck testsuite and a few tests, including a test + for the yet unimplemented check for misordered dot/dotdot directory + entries. + + The test driver runs fsck twice on a given image and fails the test if + the first run does not detect an error or the second run still detects + an error. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 7667295 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Tue May 31 03:32:42 2016 +0200 + + Add testsuite foundations + + Add testsuite on the basis of the automake framework. As a start, three + tests for basic mkfs functionality compare mkfs generated images against + references images. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit f881195 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Sep 7 03:48:16 2016 +0200 + + Append +git to version number in configure.ac + + Don't let dosfstools compiled from git with additional commits show the + exact release version number. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 8788615 +Author: Álvaro Fernández Rojas <noltari(a)gmail.com> +Date: Thu Jun 30 08:43:50 2016 +0200 + + Add config.guess and config.sub to gitignore + + Signed-off-by: Álvaro Fernández Rojas <noltari(a)gmail.com> + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 39ab842 +Author: Álvaro Fernández Rojas <noltari(a)gmail.com> +Date: Thu Jun 30 08:41:51 2016 +0200 + + Use autoconf to look for OS X endian include. + + Signed-off-by: Álvaro Fernández Rojas <noltari(a)gmail.com> + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 69ac2b0 +Author: Alessio Sergi <al3hex(a)gmail.com> +Date: Fri May 6 18:18:18 2016 +0200 + + src/device_info.c: Fix undefined PATH_MAX under musl + + In musl libc, PATH_MAX is defined in <limits.h>. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 744db84 +Author: Lars Wendler <polynomial-c(a)gentoo.org> +Date: Tue May 10 09:47:57 2016 +0200 + + Don't link to udev via LDFLAGS. There's LDADD for such a task. + + See also: + https://www.gnu.org/software/automake/manual/html_node/Linking.html + + Signed-off-by: Lars Wendler <polynomial-c(a)gentoo.org> + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 1e76e57 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed May 11 03:44:58 2016 +0200 + + mkfs: Default to 64/32 heads/sectors for targets smaller than 512 MB + + This may put defaults in certain use cases a little bit more in line + with the old defaults in versions up to 3.0.28. It has mostly aesthetic + value in most cases. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 786e66e (tag: v4.0) +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri May 6 03:19:07 2016 +0200 + + Releasing version 4.0. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit a79ff90 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri May 6 02:34:42 2016 +0200 + + src/Makefile.am: Fix CPPFLAGS for VPATH builds + + The -I flag to add the blkdev subdir to the include search path is now + relative to $(srcdir) to allow VPATH builds to work. Additionally move + the -I flag from the mkfs_fat and testdevinfo CFLAGS to CPPFLAGS where + it actually belongs. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit e8eff14 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Apr 27 21:38:37 2016 +0200 + + read_boot(): Handle excessive FAT size specifications + + The variable used for storing the FAT size (in bytes) was an unsigned + int. Since the size in sectors read from the BPB was not sufficiently + checked, this could end up being zero after multiplying it with the + sector size while some offsets still stayed excessive. Ultimately it + would cause segfaults when accessing FAT entries for which no memory + was allocated. + + Make it more robust by changing the types used to store FAT size to + off_t and abort if there is no room for data clusters. Additionally + check that FAT size is not specified as zero. + + Fixes #25 and fixes #26. + + Reported-by: Hanno Böck + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 016800e +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Apr 27 14:16:53 2016 +0200 + + Use variable total_fat_entries in read_boot() for readability + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit a6478d8 +Author: Álvaro Fernández Rojas <noltari(a)gmail.com> +Date: Fri Apr 8 12:20:46 2016 +0200 + + Add missing iconv library for OS X + + Signed-off-by: Álvaro Fernández Rojas <noltari(a)gmail.com> + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit ce67dc6 +Author: Álvaro Fernández Rojas <noltari(a)gmail.com> +Date: Fri Apr 8 12:20:27 2016 +0200 + + Add endian support for OS X + + Signed-off-by: Álvaro Fernández Rojas <noltari(a)gmail.com> + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 08f3869 +Author: Joel Holdsworth <joel.holdsworth(a)vcatechnology.com> +Date: Thu Mar 10 00:53:07 2016 +0000 + + Configure option to disable building with libudev + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit ed4e47b +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Feb 22 03:47:14 2016 +0100 + + Remove use of PATH_MAX in path_name() + + The length of a file path on the checked filesystem has no relation to + the maximum path length of the system fsck is running on. So replace it + with a constant of our own. + + As a bonus this will not fail compilation on a system without PATH_MAX. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit b1a38ab +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 17 21:04:35 2016 +0100 + + Add preliminary entry for release 4.0 to NEWS + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 4ad3e9e +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 17 21:02:06 2016 +0100 + + Adjust ridiculous source indentation in io.c + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit b96acb2 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 17 20:51:53 2016 +0100 + + Document ./configure --enable-compat-symlinks in README + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit de39c5c +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 17 15:16:27 2016 +0100 + + Add include paths.h in the HAVE_DECL_GETMNTENT case + + _PATH_MOUNTED is now used for getmntent() in place of MOUNTED because + the latter was marked as a deprecated alias in glibc's mntent.h. The + mntent.h of musl libc does not include the _PATH_MOUNTED however. Fix + this by including paths.h alongside mntent.h + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 86c7acd +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 17 15:06:56 2016 +0100 + + man fsck: Document the -c option + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit ef9a73c +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Feb 15 02:10:57 2016 +0100 + + Add NEWS file with changes of the last two releases + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit bda6551 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Feb 12 03:56:16 2016 +0100 + + Make filesystem mounted check portable + + A new function is_device_mounted() in device_info.c is now used by + check_mount() in mkfs.fat.c. It contains the getmntent() using code + used before in check_mount() and now an alternative using getmntinfo() + as found on the BSDs. + + In case neither function is available, is_device_mounted() defaults to + reporting that the device isn't mounted. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 4b8c9cc +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Feb 12 01:57:33 2016 +0100 + + Make use of endian.h portable to BSD + + The endian.h found on Linux and the BSDs appear to be compatible, but + they are found in different locations. Add tests in configure.ac and a + new endian_compat.h file that has the logic to include the correct + files. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit d7665f2 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 10 21:30:06 2016 +0100 + + Fix format string in check_file() (%lu → %llu) + + The cluster chain length printing needs a 64 bit calculation, so we can + just use unsigned long long instead of uint64_t and use the format + string %llu. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 6225e59 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Feb 5 14:39:00 2016 +0100 + + blkdev.c: Prevent unused parameter warnings in fallback code + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 34cdded +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Feb 5 14:36:14 2016 +0100 + + blkdev_get_size(): Remove unused variable ch + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 5571d29 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 10 03:22:19 2016 +0100 + + Reinstate alignment of FAT32 structures to cluster size + + This reverts commits 17c956cb9 and d63e0d627 where the alignment was + removed because it created problems with a device that refused to read + the aligned filesystem. The option -a is already provided to disable + alignment in order to handle such cases. + + This change brings it back in line with FAT12/16 where alignment wasn't + disabled and brings consistency with the current command line options, + where only the option to disable alignment exists but no opposite option + to enable it. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 2c71ace +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 3 03:38:33 2016 +0100 + + Makefile.am: Add historic documentation to distribution + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit bcbae63 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 3 02:38:24 2016 +0100 + + src/Makefile.am: Add forgotten msdos_fs.h to mkfs_fat_SOURCES + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 19d1a13 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 3 02:34:51 2016 +0100 + + Remove sys/ioctl.h and linux/fd.h include from io.c + + These weren't used anymore and the linux/fd.h include would + gratuitously cause compilation to fail on non-Linux environments. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit f691660 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Feb 3 02:31:00 2016 +0100 + + Reinstate some #include <sys/types.h> + + These shouldn't have been removed in commit 245d0cce5. Put them back for + correctness even though the definitions were pulled in implicitly. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 51afd41 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Jan 27 21:38:29 2016 +0100 + + src/Makefile.am: Put all header files in appropriate _SOURCES variables + + With the headers missing the dist targets of the automake generated + Makefiles would not include them and make the resulting dist + unbuildable. + + Also combine sources collections into common variables for + deduplication. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit bf6f142 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Jan 27 15:28:42 2016 +0100 + + mkfs man: Note that sector sizes > 4096 are non-standard + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit ea96c32 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Jan 25 21:30:23 2016 +0100 + + mkfs: Improve parsing of bad blocks file + + The bad blocks file that can be given to mkfs via the -l option had a + very simplistic design. It failed to notice it was parsing an empty + line and would report errors for that. + + Replace it with a more robust version that ignores empty lines as well + as leading and trailing white space. Additionally it produces meaningful + error messages. + + GitHub: Fixes #17 + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit dfb5bea +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Jan 25 02:47:12 2016 +0100 + + mkfs: Limit filesystem size on targets that are too large + + For FAT filesystems, the number of sectors has to fit into a 32 bit + variable. Previously this was not checked possibly causing invalid + filesystems to be generated. + + Now there is a check for that case which will limit the number of + sectors if needed and print a warning that disk space will be left + unused in that case. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit fc0343f +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Jan 22 21:29:20 2016 +0100 + + mkfs: Improved bounds checking in mark_FAT_sector()/mark_FAT_cluster() + + In mark_FAT_sector() the sector number itself is now checked against + limits instead of the computed cluster number. Even with sector number + before the start of the data area, the cluster number may be valid for + the first cluster due to dividing by the cluster size. + + Both functions now check for upper limits and should prevent writing + past the valid end of the FAT. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 9211c8a +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Jan 15 02:17:16 2016 +0100 + + mkfs: Fix offset error in FAT12/16 bad cluster marking + + The root directory wasn't factored in to the calculation of the data + area start sector. On FAT32 the root directory is in the data area, but + for FAT12 and FAT16 it is a reserved space before the start of the data + area. + + On FAT12 and FAT16, this resulted in the wrong clusters being marked + during bad blocks mapping, whether from check_blocks() or from reading + the user supplied bad blocks file. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 0627a62 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Jan 15 01:59:59 2016 +0100 + + mkfs: Fix off-by-2 error in bad cluster marking + + mark_FAT_sector(), which has the mark_sector_bad() macro as its sole + user, computed the cluster number corresponding to the sector by taking + its offset from the first data sector and dividing by sectors per + cluster. + + What it missed was that the first data cluster is number 2 and not 0. + This meant all marks were off by 2 and when the first two clusters are + supposed to be marked, it would overwrite the reserved cluster values + and create an invalid filesystem. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 2dca9aa +Author: Andreas Bombe <aeb(a)debian.org> +Date: Thu Jan 14 14:43:00 2016 +0100 + + .gitignore: Add .dirstamp + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 6a966fb +Author: Andreas Bombe <aeb(a)debian.org> +Date: Thu Jan 14 14:38:53 2016 +0100 + + mkfs: Reword non-standard sector size warning + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit bebc9ac +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Dec 30 15:10:35 2015 +0100 + + Clean up includes in mkfs.fat.c + + Moving the device probing out into device_info.c removed the need for a + number of includes in mkfs.fat.c. Remove them and add a define for + BLOCK_SIZE, which was the only thing used from linux/fs.h. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 12a1d46 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Sun Nov 29 01:59:10 2015 +0100 + + Don't use pointer to first member when more of the struct gets copied + + Where a fs_write() of "first 13 bytes of directory entry" is intended, + actually use pointer to directory entry structure instead of the 11 + byte name field at the beginning. + + This does not change how the code works, it is just a clean up. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit d38bd2d +Author: Andreas Bombe <aeb(a)debian.org> +Date: Sun Nov 29 00:44:48 2015 +0100 + + Remove name/extension split in directory entry structures + + Both the DIR_ENT structure in fsck.fat.h and the msdos_dir_entry in + msdos_fs.h - these represent the on disk format of directory entries - + had the name field split into name[8] followed by ext[3]. + + By far the most operations on name are on the full name including + extension and they treated the name field as an 11 byte array. This is + an array overflow that worked because the structs have the attribute + packed and the extension field is following right after. + + Nevertheless, this is not clean C and the merging of both fields + actually simplified the code in a few places. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 0847e4c +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Nov 27 21:29:49 2015 +0100 + + Free allocated strings after use + + There are multiple calls to cnv_unicode() in lfn.c which returns an + allocated string. Most had the appropriate free() calls after printing + the strings. Add the missing two calls where memory was leaked. + + Found by Coverity. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 1b7d91e +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Nov 27 03:34:51 2015 +0100 + + Add test for and include linux/hdreg.h in blkdev.c + + Before, blkdev did not include it and depended on its own fallback + definition of the ioctl and struct hd_geometry. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 5024372 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Nov 27 03:28:14 2015 +0100 + + Add FDGETPRM attempt to blkdev_get_geometry() + + If HDIO_GETGEO isn't available or has failed, try FDGETPRM. This should + get the geometry from floppy drivers where HDIO_GETGEO isn't supported. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 4a146d7 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Nov 27 03:25:55 2015 +0100 + + Add blkdev_get_start() for getting partition start offset + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 254f8ab +Author: Andreas Bombe <aeb(a)debian.org> +Date: Thu Nov 26 23:33:02 2015 +0100 + + Remove use of libblkid again + + It appears libblkid is not as widely available as presumed, since some + platforms only have the original libblkid included in e2fsprogs which + lacks the needed functionality. This commit removes the requirement and + use of libblkid. + + As a replacement, blkdev.c from util-linux is included, which offers the + required basic functionality in a portable way. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit c9fb33c +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Oct 21 21:32:30 2015 +0200 + + Use just device size not major number in Atari mode + + In Atari mode, read_boot() in boot.c used the device major number to + determine whether to use FAT12. It would always use FAT12 for a floppy, + otherwise only if it is a RAM disk or loopback device and has a size + corresponding to standard floppy formats. + + Since this check was already broken for a long time (another place that + assumed 8 bit major numbers) and there is no real point to make the + distinction based on device, this commit reduces the check to just + compare against standard floppy sizes. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 64486ad +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Oct 21 00:18:22 2015 +0200 + + Remove loff_t and llseek() + + There appear to have been multiple conversions to 64 bit file offsets on + 32 bit architectures in dosfstools over the years, but today with the + proper setup off_t is 64 bits and simple lseek() can be used. The + AC_SYS_LARGEFILE macro in configure.ac does what is required to make + that happen. + + Given this, convert all uses of loff_t to off_t, remove llseek() + definitions and change llseek() calls to plain lseek(). + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit e03a5f4 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Oct 16 21:47:04 2015 +0200 + + Remove DJGPP support + + These macros have been added back when dosfstools was around version 2. + It is difficult to say whether these are still working correctly or + whether they are in use at all. FreeDOS appears to still show version + 2.11 of dosfstools in their software directory. + + Supporting actual MS-DOS or compatible may need more work in the + current state of things and this DJGPP support can be removed until + then. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 5b9a88d +Author: Andreas Bombe <aeb(a)debian.org> +Date: Thu Oct 8 16:17:22 2015 +0200 + + mkfs.fat: Complete overhaul of device probing + + The device probing in mkfs.fat is used to get device parameters where + needed and also to decide whether to refuse overwriting a device due to + possible user error. This code has suffered severe bitrot and is highly + Linux specific. Highlights include using hardcoded major/minor device + numbers to classify a device, and using 8 bits major/minor numbers that + have become obsolete a long time ago and thus often misidentifying a + device. + + The overhauled implementation is now in src/device_info.c and makes use + of libudev (optional, recommended) and libblkid (required) to probe the + device and where Linux ioctls are required it provides fallbacks and + does not attempt to call these on non-Linux systems. The FAT parameter + selection has been unified and simplified in the process. + + A new executable testdevinfo has been added that gets built but not + automatically installed. It takes one file name, uses the same probing + as mkfs.fat would with verbose messages enabled and displays the + results. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 53eddfc +Author: Andreas Bombe <aeb(a)debian.org> +Date: Sat Sep 12 02:54:33 2015 +0200 + + Die on out of range cluster values in set_fat()/get_fat() + + To prevent bugs caused by FAT corruption inside fsck to go unnoticed, + add a check against out of range requested cluster values in get_fat() + and against out of range cluster to change and new cluster value in + set_fat(). + + When an invalid cluster value is detected, these functions now die() + with an "internal error" message. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 456767b +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Sep 14 00:33:49 2015 +0200 + + configure.ac: Use AS_HELP_STRING to format option help + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 3cfb479 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Sep 14 00:30:40 2015 +0200 + + version.h: Use @configure_input@ autoconf variable in boilerplate + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 41ef834 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Mon Sep 14 00:29:27 2015 +0200 + + .gitignore: Add TAGS in addition to tags + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit bdc3d2a +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Sep 11 20:28:12 2015 +0200 + + Rename clusters field in DOS_FS struct + + Rename it to data_clusters to prevent mistaking the clusters field of + the DOS_FS struct as the total number of FAT entries instead of the + number of data clusters (two less than the number of entries). + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 0790812 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Sep 11 19:47:29 2015 +0200 + + set_fat(): Fix off-by-2 error leading to corruption in FAT12 + + In FAT12 two 12 bit entries are combined to a 24 bit value (three + bytes). Therefore, when an even numbered FAT entry is set in FAT12, it + must be be combined with the following entry. To prevent accessing + beyond the end of the FAT array, it must be checked that the cluster is + not the last one. + + Previously, the check tested that the requested cluster was equal to + fs->clusters - 1. However, fs->clusters is the number of data clusters + not including the two reserved FAT entries at the start so the test + triggered two clusters early. + + If the third to last entry was written on a FAT12 filesystem with an + odd number of clusters, the second to last entry would be corrupted. + This corruption may also lead to invalid memory accesses when the + corrupted entry becomes out of bounds and is used later. + + Change the test to fs->clusters + 1 to fix. + + Reported-by: Hanno Böck + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 39ce90f +Author: Andreas Bombe <aeb(a)debian.org> +Date: Fri Sep 11 19:34:10 2015 +0200 + + set_fat(): Move FAT12 next cluster check up + + In FAT12 two 12 bit entries are combined to a 24 bit value (three + bytes). Therefore, when an even numbered FAT entry is set in FAT12, it + must be be combined with the following entry. To prevent accessing + beyond the end of the FAT array, it must be checked that the cluster is + not the last one. + + This check was broken in ff1b24e9 (first included in 3.0.3) as the + lookup was done unconditionally and the check influenced only using the + looked up value. + + Move the check up to fix. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 2aad1c8 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Tue Sep 8 03:58:29 2015 +0200 + + Prevent out of bound array read in date_dos2unix() + + The function date_dos2unix() is called during fsck while showing + information about duplicate file names. In case the date field of a + directory entry contains the invalid value 0 for the month, + date_dos2unix would read index -1 of the day_n array. + + Add a check to prevent that and also make the day_n array const on this + occasion. + + Reported-by: Hanno Böck + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 3b95786 +Author: Yann E. MORIN <yann.morin.1998(a)free.fr> +Date: Sun Aug 16 15:55:43 2015 +0200 + + mkfs.fat: fix incorrect int type + + u_int32_t is not a stanard type, while uint32_t is. This fixes builds + with the musl C library, which only defines so-called "clean" headers; + build failures are like (back-quotes and elision manually added for + readability): + + http://autobuild.buildroot.org/results/a09/a0923d7f6d4dbae02eba4c5024bbdae3… + + /home/peko/autobuild/instance-1/output/host/usr/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE \ + -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -D_LARGEFILE_SOURCE \ + -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -c -o mkfs.fat.o src/mkfs.fat.c + src/mkfs.fat.c: In function 'main': + src/mkfs.fat.c:1415:18: error: 'u_int32_t' undeclared (first use in this function) + volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); [...] + ^ + src/mkfs.fat.c:1415:18: note: each undeclared identifier is reported only once for each + function it appears in + + Signed-off-by: "Yann E. MORIN" <yann.morin.1998(a)free.fr> + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 2b1c4d1 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Jun 3 03:33:10 2015 +0200 + + Add README.md, remove Markdown formatting from README + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit b720acc +Author: Andreas Bombe <aeb(a)debian.org> +Date: Wed Jun 3 03:27:24 2015 +0200 + + Add simple README in Markdown format + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 2b255e6 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Tue Jun 2 18:25:06 2015 +0200 + + Configure option for legacy names symlinks + + The symlinks from the old names (mkdosfs, dosfsck, etc.) are now only + created on "make install" when the --enable-compat-symlinks option was + given to configure. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 0643db7 +Author: Andreas Bombe <aeb(a)debian.org> +Date: Sun May 31 02:40:19 2015 +0200 + + Convert build system to autoconf/automake + + In preparation for fixing the horribly outdated and broken device + checking - which will likely involve using additional libraries like + libblkid - as well as making this package portable to other operating + systems, the build system is now the tried and true autoconf/automake + combination which should make both goals a little more straightforward. + + The release version number and date are now in configure.ac and + substituted by configure where they are needed. Now it is no longer + necessary to change the number in multiple places for a release and the + man pages get the number substituted directly into them, making the + update-version.sh script and the VERSION file obsolete. + + The English man pages are moved back up one directory to mark their + status as the master copy for all translations. At the moment the po4a + translation infrastructure is defunct since it isn't integrated into + the automake environment yet. So far it hasn't been used, so that is + not an actual regression. + + The date in the man pages is not automatically updated anymore. This is + as it should be, since the date is supposed to signify the time of the + last nontrivial change and not the release date of the software. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + +commit 85022fe (tag: v3.0.28) +Author: Andreas Bombe <aeb(a)debian.org> +Date: Sat May 16 02:56:17 2015 +0200 + + Releasing version 3.0.28. + + Signed-off-by: Andreas Bombe <aeb(a)debian.org> + commit ad1342e Author: Andreas Bombe <aeb(a)debian.org> Date: Sat May 16 02:10:18 2015 +0200 diff --git a/sdk/lib/fslib/vfatlib/check/README b/sdk/lib/fslib/vfatlib/check/README index 8fe824937f..8ce3d88def 100644 --- a/sdk/lib/fslib/vfatlib/check/README +++ b/sdk/lib/fslib/vfatlib/check/README @@ -9,6 +9,9 @@ dosfstools recommends libudev. It is used in mkfs.fat to collect additional information about the device to format in order to refuse potentially unsafe operations without additional confirmation. +The test suite requires the tool xxd (available as part of the vim +distribution). + ### Installing @@ -28,6 +31,17 @@ installation. These are dosfsck, fsck.msdos and fsck.vfat for fsck.fat, mkdosfs, mkfs.msdos and mkfs.vfat for mkfs.fat and dosfslabel for fatlabel. +### Running the test suite + +The test suite can be run with "make check" after configuring. Note that if +xxd isn't available, all tests will be skipped and nothing actually tested. + +During the tests temporary files of multiple GB in size will be created, but the +actual data content is not more than a few MB. The operating system and the +filesystem the tests are executed on should support sparse files, otherwise the +tests will be resource intensive. + + ### Building from the VCS repository If you are working directly from a git clone of the official dosfstools

1 0

01/01: [VFATLIB] Fix MSVC build?
by Pierre Schweitzer 28 May '18

28 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86198abd6749d4cb89623… commit 86198abd6749d4cb896238ccf76c856ac25c57c1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 28 23:29:06 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 28 23:29:06 2018 +0200 [VFATLIB] Fix MSVC build? --- sdk/lib/fslib/vfatlib/check/lfn.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sdk/lib/fslib/vfatlib/check/lfn.c b/sdk/lib/fslib/vfatlib/check/lfn.c index a30ed57919..17832f80c7 100644 --- a/sdk/lib/fslib/vfatlib/check/lfn.c +++ b/sdk/lib/fslib/vfatlib/check/lfn.c @@ -66,13 +66,27 @@ static unsigned char fat_uni2esc[64] = { /* for maxlen param */ #define UNTIL_0 INT_MAX +#ifdef __REACTOS__ +static void copy_lfn_part(unsigned char *dst, LFN_ENT * lfn); +static char *cnv_unicode(const unsigned char *uni, int maxlen, int use_q); +#endif + /* Convert name part in 'lfn' from unicode to ASCII */ +#ifndef __REACTOS__ #define CNV_THIS_PART(lfn) \ ({ \ unsigned char __part_uni[CHARS_PER_LFN*2]; \ copy_lfn_part( __part_uni, lfn ); \ cnv_unicode( __part_uni, CHARS_PER_LFN, 0 ); \ }) +#else +static __inline char* CNV_THIS_PART(LFN_ENT * lfn) +{ + unsigned char __part_uni[CHARS_PER_LFN*2]; + copy_lfn_part(__part_uni, lfn); + return cnv_unicode(__part_uni, CHARS_PER_LFN, 0); +} +#endif /* Convert name parts collected so far (from previous slots) from unicode to * ASCII */

1 0

01/01: [VFATLIB] Upgrade fsck.fat to 4.1
by Pierre Schweitzer 28 May '18

28 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=469289ed5c5f91849ef1c… commit 469289ed5c5f91849ef1c35ce95a1115ecb18f24 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 28 23:18:25 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 28 23:18:25 2018 +0200 [VFATLIB] Upgrade fsck.fat to 4.1 Also make it easier to sync in the future. --- media/doc/README.FSD | 3 + sdk/lib/fslib/vfatlib/check/boot.c | 237 ++++++++++++++----- sdk/lib/fslib/vfatlib/check/boot.h | 2 + sdk/lib/fslib/vfatlib/check/check.c | 400 +++++++++++++++++++++------------ sdk/lib/fslib/vfatlib/check/check.h | 12 +- sdk/lib/fslib/vfatlib/check/common.c | 73 ++++-- sdk/lib/fslib/vfatlib/check/common.h | 29 ++- sdk/lib/fslib/vfatlib/check/fat.c | 65 +++--- sdk/lib/fslib/vfatlib/check/file.c | 25 ++- sdk/lib/fslib/vfatlib/check/fsck.fat.h | 61 +++-- sdk/lib/fslib/vfatlib/check/io.c | 98 ++++---- sdk/lib/fslib/vfatlib/check/io.h | 20 +- sdk/lib/fslib/vfatlib/check/lfn.c | 19 +- sdk/lib/fslib/vfatlib/check/msdos_fs.h | 8 + 14 files changed, 677 insertions(+), 375 deletions(-) diff --git a/media/doc/README.FSD b/media/doc/README.FSD index c4afbdc1f8..8d9993d40f 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -20,3 +20,6 @@ The following FSD are shared with: https://github.com/Microsoft/Windows-driver-s reactos/drivers/filesystems/fastfat_new # Synced to 2817004 reactos/drivers/filesystems/cdfs_new # Synced to f73e552 + +The following FS libs are shared with: https://github.com/dosfstools/dosfstools +reactos/sdk/lib/fslib/vfatlib/check # Synced to 4.1 diff --git a/sdk/lib/fslib/vfatlib/check/boot.c b/sdk/lib/fslib/vfatlib/check/boot.c index 8596e2bb23..2c8681bbce 100644 --- a/sdk/lib/fslib/vfatlib/check/boot.c +++ b/sdk/lib/fslib/vfatlib/check/boot.c @@ -30,7 +30,6 @@ #define NDEBUG #include <debug.h> - #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0) /* don't divide by zero */ @@ -42,29 +41,21 @@ static struct { uint8_t media; const char *descr; } mediabytes[] = { - { 0xf0, "5.25\" or 3.5\" HD floppy" }, - { 0xf8, "hard disk" }, - { 0xf9, "3.5\" 720k floppy 2s/80tr/9sec or " - "5.25\" 1.2M floppy 2s/80tr/15sec" }, - { 0xfa, "5.25\" 320k floppy 1s/80tr/8sec" }, - { 0xfb, "3.5\" 640k floppy 2s/80tr/8sec" }, - { 0xfc, "5.25\" 180k floppy 1s/40tr/9sec" }, - { 0xfd, "5.25\" 360k floppy 2s/40tr/9sec" }, - { 0xfe, "5.25\" 160k floppy 1s/40tr/8sec" }, - { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" }, -}; - -#if defined __alpha || defined __ia64__ || defined __x86_64__ || defined __ppc64__ -/* Unaligned fields must first be copied byte-wise (little endian) */ -#define GET_UNALIGNED_W(u) \ - (((unsigned char*)(&u))[0] | (((unsigned char*)&(u))[1] << 8)) -#elif defined __s390x__ -/* Unaligned fields must first be copied byte-wise (big endian) */ -#define GET_UNALIGNED_W(pu) \ - (((unsigned char*)&(u))[1] | (((unsigned char*)&(u))[0] << 8)) -#else -#define GET_UNALIGNED_W(f) le16toh( *(unsigned short *)&f ) -#endif + { + 0xf0, "5.25\" or 3.5\" HD floppy"}, { + 0xf8, "hard disk"}, { + 0xf9, "3,5\" 720k floppy 2s/80tr/9sec or " + "5.25\" 1.2M floppy 2s/80tr/15sec"}, { + 0xfa, "5.25\" 320k floppy 1s/80tr/8sec"}, { + 0xfb, "3.5\" 640k floppy 2s/80tr/8sec"}, { + 0xfc, "5.25\" 180k floppy 1s/40tr/9sec"}, { + 0xfd, "5.25\" 360k floppy 2s/40tr/9sec"}, { + 0xfe, "5.25\" 160k floppy 1s/40tr/8sec"}, { +0xff, "5.25\" 320k floppy 2s/40tr/8sec"},}; + +/* Unaligned fields must first be accessed byte-wise */ +#define GET_UNALIGNED_W(f) \ + ( (uint16_t)f[0] | ((uint16_t)f[1]<<8) ) static const char *get_media_descr(unsigned char media) { @@ -103,8 +94,8 @@ static void dump_boot(DOS_FS * fs, struct boot_sector *b, unsigned lss) (unsigned long long)fs->fat_start, (unsigned long long)fs->fat_start / lss); printf("%10d FATs, %d bit entries\n", b->fats, fs->fat_bits); - printf("%10d bytes per FAT (= %u sectors)\n", fs->fat_size, - fs->fat_size / lss); + printf("%10lld bytes per FAT (= %llu sectors)\n", (long long)fs->fat_size, + (long long)fs->fat_size / lss); if (!fs->root_cluster) { printf("Root directory starts at byte %llu (sector %llu)\n", (unsigned long long)fs->root_start, @@ -130,7 +121,7 @@ static void dump_boot(DOS_FS * fs, struct boot_sector *b, unsigned lss) printf("%10u sectors total\n", sectors ? sectors : le32toh(b->total_sect)); } -static void check_backup_boot(DOS_FS * fs, struct boot_sector *b, int lss) +static void check_backup_boot(DOS_FS * fs, struct boot_sector *b, unsigned int lss) { struct boot_sector b2; @@ -145,7 +136,7 @@ static void check_backup_boot(DOS_FS * fs, struct boot_sector *b, int lss) else printf(" Auto-creating backup boot block.\n"); if (!interactive || get_key("12", "?") == '1') { - int bbs; + unsigned int bbs; /* The usual place for the backup boot sector is sector 6. Choose * that or the last reserved sector. */ if (le16toh(b->reserved) >= 7 && le16toh(b->info_sector) != 6) @@ -210,14 +201,15 @@ static void check_backup_boot(DOS_FS * fs, struct boot_sector *b, int lss) static void init_fsinfo(struct info_sector *i) { + memset(i, 0, sizeof (struct info_sector)); i->magic = htole32(0x41615252); i->signature = htole32(0x61417272); i->free_clusters = htole32(-1); i->next_cluster = htole32(2); - i->boot_sign = htole16(0xaa55); + i->boot_sign = htole32(0xaa550000); } -static void read_fsinfo(DOS_FS * fs, struct boot_sector *b, int lss) +static void read_fsinfo(DOS_FS * fs, struct boot_sector *b, unsigned int lss) { struct info_sector i; @@ -257,7 +249,7 @@ static void read_fsinfo(DOS_FS * fs, struct boot_sector *b, int lss) fs_read(fs->fsinfo_start, sizeof(i), &i); if (i.magic != htole32(0x41615252) || - i.signature != htole32(0x61417272) || i.boot_sign != htole16(0xaa55)) { + i.signature != htole32(0x61417272) || i.boot_sign != htole32(0xaa550000)) { printf("FSINFO sector has bad magic number(s):\n"); if (i.magic != htole32(0x41615252)) printf(" Offset %llu: 0x%08x != expected 0x%08x\n", @@ -267,10 +259,10 @@ static void read_fsinfo(DOS_FS * fs, struct boot_sector *b, int lss) printf(" Offset %llu: 0x%08x != expected 0x%08x\n", (unsigned long long)offsetof(struct info_sector, signature), le32toh(i.signature), 0x61417272); - if (i.boot_sign != htole16(0xaa55)) - printf(" Offset %llu: 0x%04x != expected 0x%04x\n", + if (i.boot_sign != htole32(0xaa550000)) + printf(" Offset %llu: 0x%08x != expected 0x%08x\n", (unsigned long long)offsetof(struct info_sector, boot_sign), - le16toh(i.boot_sign), 0xaa55); + le32toh(i.boot_sign), 0xaa550000); if (interactive) printf("1) Correct\n2) Don't correct (FSINFO invalid then)\n"); else @@ -294,11 +286,17 @@ static char print_fat_dirty_state(void) if (interactive) { printf("1) Remove dirty bit\n" "2) No action\n"); return get_key("12", "?"); +#ifndef __REACTOS__ + } else +#else } else if (rw) { +#endif printf(" Automatically removing dirty bit.\n"); return '1'; +#ifdef __REACTOS__ } return '2'; +#endif } static void check_fat_state_bit(DOS_FS * fs, void *b) @@ -330,8 +328,9 @@ void read_boot(DOS_FS * fs) { struct boot_sector b; unsigned total_sectors; - unsigned short logical_sector_size, sectors; - unsigned fat_length; + unsigned int logical_sector_size, sectors; + off_t fat_length; + unsigned total_fat_entries; off_t data_size; fs_read(0, sizeof(b), &b); @@ -359,8 +358,12 @@ void read_boot(DOS_FS * fs) /* Can't access last odd sector anyway, so round down */ fs_test((off_t)((total_sectors & ~1) - 1) * logical_sector_size, logical_sector_size); + fat_length = le16toh(b.fat_length) ? le16toh(b.fat_length) : le32toh(b.fat32_length); + if (!fat_length) + die("FAT size is zero."); + fs->fat_start = (off_t)le16toh(b.reserved) * logical_sector_size; fs->root_start = ((off_t)le16toh(b.reserved) + b.fats * fat_length) * logical_sector_size; @@ -368,7 +371,11 @@ void read_boot(DOS_FS * fs) fs->data_start = fs->root_start + ROUND_TO_MULTIPLE(fs->root_entries << MSDOS_DIR_BITS, logical_sector_size); + data_size = (off_t)total_sectors * logical_sector_size - fs->data_start; + if (data_size < fs->cluster_size) + die("Filesystem has no space for any data clusters"); + fs->data_clusters = data_size / fs->cluster_size; fs->root_cluster = 0; /* indicates standard, pre-FAT32 root dir */ fs->fsinfo_start = 0; /* no FSINFO structure */ @@ -408,7 +415,8 @@ void read_boot(DOS_FS * fs) * much clusers otherwise. */ fs->fat_bits = (fs->data_clusters >= FAT12_THRESHOLD) ? 16 : 12; if (fs->data_clusters >= FAT16_THRESHOLD) - die("Too many clusters (%lu) for FAT16 filesystem.", fs->data_clusters); + die("Too many clusters (%lu) for FAT16 filesystem.", + (unsigned long)fs->data_clusters); check_fat_state_bit(fs, &b); } else { /* On Atari, things are more difficult: GEMDOS always uses 12bit FATs @@ -428,34 +436,43 @@ void read_boot(DOS_FS * fs) fs->label = calloc(12, sizeof(uint8_t)); if (fs->fat_bits == 12 || fs->fat_bits == 16) { - struct boot_sector_16 *b16 = (struct boot_sector_16 *)&b; - if (b16->extended_sig == 0x29) - memmove(fs->label, b16->label, 11); - else { - free(fs->label); - fs->label = NULL; - } + struct boot_sector_16 *b16 = (struct boot_sector_16 *)&b; + if (b16->extended_sig == 0x29) + memmove(fs->label, b16->label, 11); + else +#ifdef __REACTOS__ + { + free(fs->label); +#endif + fs->label = NULL; +#ifdef __REACTOS__ + } +#endif } else if (fs->fat_bits == 32) { - if (b.extended_sig == 0x29) - memmove(fs->label, &b.label, 11); - else { - free(fs->label); - fs->label = NULL; - } + if (b.extended_sig == 0x29) + memmove(fs->label, &b.label, 11); + else +#ifdef __REACTOS__ + { + free(fs->label); +#endif + fs->label = NULL; +#ifdef __REACTOS__ + } +#endif } - if (fs->data_clusters > - ((uint64_t)fs->fat_size * 8 / fs->fat_bits) - 2) - die("Filesystem has %d clusters but only space for %d FAT entries.", - fs->data_clusters, - ((unsigned long long)fs->fat_size * 8 / fs->fat_bits) - 2); + total_fat_entries = (uint64_t)fs->fat_size * 8 / fs->fat_bits; + if (fs->data_clusters > total_fat_entries - 2) + die("Filesystem has %u clusters but only space for %u FAT entries.", + fs->data_clusters, total_fat_entries - 2); if (!fs->root_entries && !fs->root_cluster) die("Root directory has zero size."); if (fs->root_entries & (MSDOS_DPS - 1)) die("Root directory (%d entries) doesn't span an integral number of " "sectors.", fs->root_entries); if (logical_sector_size & (SECTOR_SIZE - 1)) - die("Logical sector size (%d bytes) is not a multiple of the physical " + die("Logical sector size (%u bytes) is not a multiple of the physical " "sector size.", logical_sector_size); #if 0 /* linux kernel doesn't check that either */ /* ++roman: On Atari, these two fields are often left uninitialized */ @@ -465,3 +482,111 @@ void read_boot(DOS_FS * fs) if (verbose) dump_boot(fs, &b, logical_sector_size); } + +#ifndef __REACTOS__ +static void write_boot_label(DOS_FS * fs, char *label) +{ + if (fs->fat_bits == 12 || fs->fat_bits == 16) { + struct boot_sector_16 b16; + + fs_read(0, sizeof(b16), &b16); + if (b16.extended_sig != 0x29) { + b16.extended_sig = 0x29; + b16.serial = 0; + memmove(b16.fs_type, fs->fat_bits == 12 ? "FAT12 " : "FAT16 ", + 8); + } + memmove(b16.label, label, 11); + fs_write(0, sizeof(b16), &b16); + } else if (fs->fat_bits == 32) { + struct boot_sector b; + + fs_read(0, sizeof(b), &b); + if (b.extended_sig != 0x29) { + b.extended_sig = 0x29; + b.serial = 0; + memmove(b.fs_type, "FAT32 ", 8); + } + memmove(b.label, label, 11); + fs_write(0, sizeof(b), &b); + if (fs->backupboot_start) + fs_write(fs->backupboot_start, sizeof(b), &b); + } +} + +off_t find_volume_de(DOS_FS * fs, DIR_ENT * de) +{ + uint32_t cluster; + off_t offset; + int i; + + if (fs->root_cluster) { + for (cluster = fs->root_cluster; + cluster != 0 && cluster != -1; + cluster = next_cluster(fs, cluster)) { + offset = cluster_start(fs, cluster); + for (i = 0; i * sizeof(DIR_ENT) < fs->cluster_size; i++) { + fs_read(offset, sizeof(DIR_ENT), de); + if (de->attr != VFAT_LN_ATTR && de->attr & ATTR_VOLUME) + return offset; + offset += sizeof(DIR_ENT); + } + } + } else { + for (i = 0; i < fs->root_entries; i++) { + offset = fs->root_start + i * sizeof(DIR_ENT); + fs_read(offset, sizeof(DIR_ENT), de); + if (de->attr != VFAT_LN_ATTR && de->attr & ATTR_VOLUME) + return offset; + } + } + + return 0; +} + +static void write_volume_label(DOS_FS * fs, char *label) +{ + time_t now = time(NULL); + struct tm *mtime = localtime(&now); + off_t offset; + int created; + DIR_ENT de; + + created = 0; + offset = find_volume_de(fs, &de); + if (offset == 0) { + created = 1; + offset = alloc_rootdir_entry(fs, &de, label, 0); + } + memcpy(de.name, label, 11); + de.time = htole16((unsigned short)((mtime->tm_sec >> 1) + + (mtime->tm_min << 5) + + (mtime->tm_hour << 11))); + de.date = htole16((unsigned short)(mtime->tm_mday + + ((mtime->tm_mon + 1) << 5) + + ((mtime->tm_year - 80) << 9))); + if (created) { + de.attr = ATTR_VOLUME; + de.ctime_ms = 0; + de.ctime = de.time; + de.cdate = de.date; + de.adate = de.date; + de.starthi = 0; + de.start = 0; + de.size = 0; + } + + fs_write(offset, sizeof(DIR_ENT), &de); +} + +void write_label(DOS_FS * fs, char *label) +{ + int l = strlen(label); + + while (l < 11) + label[l++] = ' '; + + write_boot_label(fs, label); + write_volume_label(fs, label); +} +#endif diff --git a/sdk/lib/fslib/vfatlib/check/boot.h b/sdk/lib/fslib/vfatlib/check/boot.h index e962939404..dd9404fcd5 100644 --- a/sdk/lib/fslib/vfatlib/check/boot.h +++ b/sdk/lib/fslib/vfatlib/check/boot.h @@ -24,6 +24,8 @@ #define _BOOT_H void read_boot(DOS_FS * fs); +void write_label(DOS_FS * fs, char *label); +off_t find_volume_de(DOS_FS * fs, DIR_ENT * de); /* Reads the boot sector from the currently open device and initializes *FS */ diff --git a/sdk/lib/fslib/vfatlib/check/check.c b/sdk/lib/fslib/vfatlib/check/check.c index dcf1808687..ae6f5cb8bd 100644 --- a/sdk/lib/fslib/vfatlib/check/check.c +++ b/sdk/lib/fslib/vfatlib/check/check.c @@ -32,7 +32,7 @@ /* the longest path on the filesystem that can be handled by path_name() */ -#define PATH_NAME_MAX 1023 // MAX_PATH +#define PATH_NAME_MAX 1023 static DOS_FILE *root; @@ -71,7 +71,7 @@ static DOS_FILE *root; } \ } while(0) -off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern) +off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern, int gen_name) { static int curr_num = 0; off_t offset; @@ -125,32 +125,36 @@ off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern) fs_write(offset + i, sizeof(d2), &d2); } memset(de, 0, sizeof(DIR_ENT)); - while (1) { - char expanded[12]; - sprintf(expanded, pattern, curr_num); - memcpy(de->name, expanded, MSDOS_NAME); - clu_num = fs->root_cluster; - i = 0; - offset2 = cluster_start(fs, clu_num); - while (clu_num > 0 && clu_num != -1) { - fs_read(offset2, sizeof(DIR_ENT), &d2); - if (offset2 != offset && - !strncmp((const char *)d2.name, (const char *)de->name, - MSDOS_NAME)) - break; - i += sizeof(DIR_ENT); - offset2 += sizeof(DIR_ENT); - if ((i % fs->cluster_size) == 0) { - if ((clu_num = next_cluster(fs, clu_num)) == 0 || - clu_num == -1) + if (gen_name) { + while (1) { + char expanded[12]; + sprintf(expanded, pattern, curr_num); + memcpy(de->name, expanded, MSDOS_NAME); + clu_num = fs->root_cluster; + i = 0; + offset2 = cluster_start(fs, clu_num); + while (clu_num > 0 && clu_num != -1) { + fs_read(offset2, sizeof(DIR_ENT), &d2); + if (offset2 != offset && + !strncmp((const char *)d2.name, (const char *)de->name, + MSDOS_NAME)) break; - offset2 = cluster_start(fs, clu_num); + i += sizeof(DIR_ENT); + offset2 += sizeof(DIR_ENT); + if ((i % fs->cluster_size) == 0) { + if ((clu_num = next_cluster(fs, clu_num)) == 0 || + clu_num == -1) + break; + offset2 = cluster_start(fs, clu_num); + } } + if (clu_num == 0 || clu_num == -1) + break; + if (++curr_num >= 10000) + die("Unable to create unique name"); } - if (clu_num == 0 || clu_num == -1) - break; - if (++curr_num >= 10000) - die("Unable to create unique name"); + } else { + memcpy(de->name, pattern, MSDOS_NAME); } } else { DIR_ENT *root; @@ -169,19 +173,23 @@ off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern) die("Root directory is full."); offset = fs->root_start + next_free * sizeof(DIR_ENT); memset(de, 0, sizeof(DIR_ENT)); - while (1) { - char expanded[12]; - sprintf(expanded, pattern, curr_num); - memcpy(de->name, expanded, MSDOS_NAME); - for (scan = 0; scan < fs->root_entries; scan++) - if (scan != next_free && - !strncmp((const char *)root[scan].name, - (const char *)de->name, MSDOS_NAME)) + if (gen_name) { + while (1) { + char expanded[12]; + sprintf(expanded, pattern, curr_num); + memcpy(de->name, expanded, MSDOS_NAME); + for (scan = 0; scan < fs->root_entries; scan++) + if (scan != next_free && + !strncmp((const char *)root[scan].name, + (const char *)de->name, MSDOS_NAME)) + break; + if (scan == fs->root_entries) break; - if (scan == fs->root_entries) - break; - if (++curr_num >= 10000) - die("Unable to create unique name"); + if (++curr_num >= 10000) + die("Unable to create unique name"); + } + } else { + memcpy(de->name, pattern, MSDOS_NAME); } free(root); } @@ -243,7 +251,7 @@ static time_t date_dos2unix(unsigned short time, unsigned short date) return secs; } -#if 1 // Old version! +#ifdef __REACTOS__ // Old version! static char *file_stat(DOS_FILE * file) { @@ -341,7 +349,7 @@ static int bad_name(DOS_FILE * file) if (atari_format && suspicious) return 1; -#if 1 // Old !!!!!!!!!!!!!!! +#ifdef __REACTOS__ // Old !!!!!!!!!!!!!!! /* Only complain about too much suspicious chars in interactive mode, * never correct them automatically. The chars are all basically ok, so we @@ -451,27 +459,46 @@ static void auto_rename(DOS_FILE * file) die("Can't generate a unique name."); } -static void rename_file(DOS_FILE *file) +static void rename_file(DOS_FILE * file) { - //unsigned char name[46]; - //unsigned char *walk,*here; +#ifndef __REACTOS__ + unsigned char name[46]; + unsigned char *walk, *here; +#endif if (!file->offset) { +#ifndef __REACTOS__ + printf("Cannot rename FAT32 root dir\n"); +#else VfatPrint( "Cannot rename FAT32 root dir\n" ); - return; /* cannot rename FAT32 root dir */ +#endif + return; /* cannot rename FAT32 root dir */ } while (1) { - VfatPrint("New name: "); -#if 0 +#ifndef __REACTOS__ + printf("New name: "); fflush(stdout); - if (fgets((char*)name,45,stdin)) { - if ((here = (unsigned char*)strchr((char*)name,'\n'))) *here = 0; - for (walk = (unsigned char*)strrchr((char*)name,0); walk >= name && (*walk == ' ' || - *walk == '\t'); walk--); + if (fgets((char *)name, 45, stdin)) { + if ((here = (unsigned char *)strchr((const char *)name, '\n'))) + *here = 0; + for (walk = (unsigned char *)strrchr((const char *)name, 0); + walk >= name && (*walk == ' ' || *walk == '\t'); walk--) ; walk[1] = 0; - for (walk = name; *walk == ' ' || *walk == '\t'; walk++); - if (file_cvt(walk,file->dir_ent.name)) { - fs_write(file->offset,MSDOS_NAME,file->dir_ent.name); + for (walk = name; *walk == ' ' || *walk == '\t'; walk++) ; + if (file_cvt(walk, file->dir_ent.name)) { + if (file->dir_ent.lcase & FAT_NO_83NAME) { + /* as we only assign a new 8.3 filename, reset flag that 8.3 name is not + present */ + file->dir_ent.lcase &= ~FAT_NO_83NAME; + /* reset the attributes, only keep DIR and VOLUME */ + file->dir_ent.attr &= ~(ATTR_DIR | ATTR_VOLUME); + fs_write(file->offset, MSDOS_NAME + 2, &file->dir_ent); + } else { + fs_write(file->offset, MSDOS_NAME, file->dir_ent.name); + } + if (file->lfn) + lfn_fix_checksum(file->lfn_offset, file->offset, + (const char *)file->dir_ent.name); return; } } @@ -493,25 +520,33 @@ static int handle_dot(DOS_FS * fs, DOS_FILE * file, int dots) if (interactive) printf("1) Drop it\n2) Auto-rename\n3) Rename\n" "4) Convert to directory\n"); +#ifndef __REACTOS__ + else +#else else if (rw) +#endif printf(" Auto-renaming it.\n"); +#ifdef __REACTOS__ if (rw || interactive) { - switch (interactive ? get_key("1234", "?") : '2') { - case '1': - drop_file(fs, file); - return 1; - case '2': - auto_rename(file); - printf(" Renamed to %s\n", file_name(file->dir_ent.name)); - return 0; - case '3': - rename_file(file); +#endif + switch (interactive ? get_key("1234", "?") : '2') { + case '1': + drop_file(fs, file); + return 1; + case '2': + auto_rename(file); + printf(" Renamed to %s\n", file_name(file->dir_ent.name)); return 0; - case '4': - MODIFY(file, size, htole32(0)); - MODIFY(file, attr, file->dir_ent.attr | ATTR_DIR); - break; + case '3': + rename_file(file); + return 0; + case '4': + MODIFY(file, size, htole32(0)); + MODIFY(file, attr, file->dir_ent.attr | ATTR_DIR); + break; +#ifdef __REACTOS__ } +#endif } } if (!dots) { @@ -530,9 +565,15 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) if (file->dir_ent.attr & ATTR_DIR) { if (le32toh(file->dir_ent.size)) { +#ifndef __REACTOS__ + printf("%s\n Directory has non-zero size. Fixing it.\n", + path_name(file)); +#else printf("%s\n Directory has non-zero size.%s\n", path_name(file), (rw) ? " Fixing it." : ""); - if (rw) MODIFY(file, size, htole32(0)); + if (rw) +#endif + MODIFY(file, size, htole32(0)); } if (file->parent && !strncmp((const char *)file->dir_ent.name, MSDOS_DOT, @@ -541,7 +582,10 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) if (FSTART(file, fs) != expect) { printf("%s\n Start (%lu) does not point to parent (%lu)\n", path_name(file), (unsigned long)FSTART(file, fs), (long)expect); - if (rw) MODIFY_START(file, expect, fs); +#ifdef __REACTOS__ + if (rw) +#endif + MODIFY_START(file, expect, fs); } return 0; } @@ -555,14 +599,23 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) if (FSTART(file, fs) != expect) { printf("%s\n Start (%lu) does not point to .. (%lu)\n", path_name(file), (unsigned long)FSTART(file, fs), (unsigned long)expect); - if (rw) MODIFY_START(file, expect, fs); +#ifdef __REACTOS__ + if (rw) +#endif + MODIFY_START(file, expect, fs); } return 0; } if (FSTART(file, fs) == 0) { +#ifndef __REACTOS__ + printf("%s\n Start does point to root directory. Deleting dir. \n", + path_name(file)); +#else printf("%s\n Start does point to root directory.%s\n", path_name(file), (rw) ? " Deleting dir. " : ""); - if (rw) MODIFY(file, name[0], DELETED_FLAG); + if (rw) +#endif + MODIFY(file, name[0], DELETED_FLAG); return 0; } } @@ -571,19 +624,31 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) path_name(file)); if (!file->offset) die("Bad FAT32 root directory! (bad start cluster 1)\n"); - if (rw) MODIFY_START(file, 0, fs); +#ifdef __REACTOS__ + if (rw) +#endif + MODIFY_START(file, 0, fs); } if (FSTART(file, fs) >= fs->data_clusters + 2) { printf +#ifndef __REACTOS__ + ("%s\n Start cluster beyond limit (%lu > %lu). Truncating file.\n", + path_name(file), (unsigned long)FSTART(file, fs), + (unsigned long)(fs->data_clusters + 1)); +#else ("%s\n Start cluster beyond limit (%lu > %lu).%s\n", path_name(file), (unsigned long)FSTART(file, fs), (unsigned long)(fs->data_clusters + 1), (rw) ? " Truncating file." : ""); +#endif if (!file->offset) die("Bad FAT32 root directory! (start cluster beyond limit: %lu > %lu)\n", (unsigned long)FSTART(file, fs), (unsigned long)(fs->data_clusters + 1)); - if (rw) MODIFY_START(file, 0, fs); +#ifdef __REACTOS__ + if (rw) +#endif + MODIFY_START(file, 0, fs); } clusters = prev = 0; for (curr = FSTART(file, fs) ? FSTART(file, fs) : @@ -592,34 +657,46 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) get_fat(&curEntry, fs->fat, curr, fs); if (!curEntry.value || bad_cluster(fs, curr)) { +#ifndef __REACTOS__ + printf("%s\n Contains a %s cluster (%lu). Assuming EOF.\n", + path_name(file), curEntry.value ? "bad" : "free", (unsigned long)curr); +#else printf("%s\n Contains a %s cluster (%lu).%s\n", path_name(file), curEntry.value ? "bad" : "free", (unsigned long)curr, (rw) ? " Assuming EOF." : ""); +#endif if (prev) set_fat(fs, prev, -1); else if (!file->offset) die("FAT32 root dir starts with a bad cluster!"); else - if (rw) MODIFY_START(file, 0, fs); +#ifdef __REACTOS__ + if (rw) +#endif + MODIFY_START(file, 0, fs); break; } if (!(file->dir_ent.attr & ATTR_DIR) && le32toh(file->dir_ent.size) <= (uint64_t)clusters * fs->cluster_size) { +#ifdef __REACTOS__ if (rw) { - printf - ("%s\n File size is %u bytes, cluster chain length is > %llu " - "bytes.\n Truncating file to %u bytes.\n", path_name(file), - le32toh(file->dir_ent.size), - (unsigned long long)clusters * fs->cluster_size, - le32toh(file->dir_ent.size)); - truncate_file(fs, file, clusters); +#endif + printf + ("%s\n File size is %u bytes, cluster chain length is > %llu " + "bytes.\n Truncating file to %u bytes.\n", path_name(file), + le32toh(file->dir_ent.size), + (unsigned long long)clusters * fs->cluster_size, + le32toh(file->dir_ent.size)); + truncate_file(fs, file, clusters); +#ifdef __REACTOS__ } else { - printf - ("%s\n File size is %u bytes, cluster chain length is > %llu " - "bytes.\n", path_name(file), - le32toh(file->dir_ent.size), - (unsigned long long)clusters * fs->cluster_size); + printf + ("%s\n File size is %u bytes, cluster chain length is > %llu " + "bytes.\n", path_name(file), + le32toh(file->dir_ent.size), + (unsigned long long)clusters * fs->cluster_size); } +#endif break; } if ((owner = get_owner(fs, curr))) { @@ -634,27 +711,43 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) else clusters2++; restart = file->dir_ent.attr & ATTR_DIR; +#ifndef __REACTOS__ + if (!owner->offset) { +#else if (!owner->offset && rw) { +#endif printf(" Truncating second to %llu bytes because first " "is FAT32 root dir.\n", - (unsigned long long)clusters2 * fs->cluster_size); + (unsigned long long)clusters * fs->cluster_size); do_trunc = 2; +#ifndef __REACTOS__ + } else if (!file->offset) { +#else } else if (!file->offset && rw) { +#endif printf(" Truncating first to %llu bytes because second " "is FAT32 root dir.\n", - (unsigned long long)clusters * fs->cluster_size); + (unsigned long long)clusters2 * fs->cluster_size); do_trunc = 1; } else if (interactive) printf("1) Truncate first to %llu bytes%s\n" "2) Truncate second to %llu bytes\n", - (unsigned long long)clusters * fs->cluster_size, + (unsigned long long)clusters2 * fs->cluster_size, restart ? " and restart" : "", - (unsigned long long)clusters2 * fs->cluster_size); - else if (rw) + (unsigned long long)clusters * fs->cluster_size); + else +#ifdef __REACTOS__ + if (rw) +#endif printf(" Truncating second to %llu bytes.\n", - (unsigned long long)clusters2 * fs->cluster_size); + (unsigned long long)clusters * fs->cluster_size); +#ifndef __REACTOS__ + if (do_trunc != 2 + && (do_trunc == 1 +#else if ((do_trunc != 2 && rw) && ((do_trunc == 1 && rw) +#endif || (interactive && get_key("12", "?") == '1'))) { prev = 0; clusters = 0; @@ -696,7 +789,11 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) prev = curr; } if (!(file->dir_ent.attr & ATTR_DIR) && le32toh(file->dir_ent.size) > +#ifndef __REACTOS__ + (uint64_t)clusters * fs->cluster_size) { +#else (uint64_t)clusters * fs->cluster_size && rw) { +#endif printf ("%s\n File size is %u bytes, cluster chain length is %llu bytes." "\n Truncating file to %llu bytes.\n", path_name(file), @@ -739,7 +836,11 @@ static int check_dir(DOS_FS * fs, DOS_FILE ** root, int dots) path_name(parent), bad, good + bad); if (!dots) printf(" Not dropping root directory.\n"); +#ifndef __REACTOS__ + else if (!interactive) +#else else if (!interactive || !rw) +#endif printf(" Not dropping it in auto-mode.\n"); else if (get_key("yn", "Drop directory ? (y/n)") == 'y') { truncate_file(fs, parent, 0); @@ -766,30 +867,43 @@ static int check_dir(DOS_FS * fs, DOS_FILE ** root, int dots) dotdot++; } if (!((*walk)->dir_ent.attr & ATTR_VOLUME) && bad_name(*walk)) { +#ifndef __REACTOS__ + puts(path_name(*walk)); + printf(" Bad short file name (%s).\n", + file_name((*walk)->dir_ent.name)); +#else printf("%s\n Bad short file name (%s).\n", path_name(*walk), file_name((*walk)->dir_ent.name)); +#endif if (interactive) printf("1) Drop file\n2) Rename file\n3) Auto-rename\n" "4) Keep it\n"); - else if (rw) + else +#ifdef __REACTOS__ + if (rw) +#endif printf(" Auto-renaming it.\n"); +#ifdef __REACTOS__ if (rw || interactive) { - switch (interactive ? get_key("1234", "?") : '3') { - case '1': - drop_file(fs, *walk); - walk = &(*walk)->next; - continue; - case '2': - rename_file(*walk); - redo = 1; - break; - case '3': - auto_rename(*walk); - printf(" Renamed to %s\n", file_name((*walk)->dir_ent.name)); - break; - case '4': - break; +#endif + switch (interactive ? get_key("1234", "?") : '3') { + case '1': + drop_file(fs, *walk); + walk = &(*walk)->next; + continue; + case '2': + rename_file(*walk); + redo = 1; + break; + case '3': + auto_rename(*walk); + printf(" Renamed to %s\n", file_name((*walk)->dir_ent.name)); + break; + case '4': + break; +#ifdef __REACTOS__ } +#endif } } /* don't check for duplicates of the volume label */ @@ -808,40 +922,47 @@ static int check_dir(DOS_FS * fs, DOS_FILE ** root, int dots) ("1) Drop first\n2) Drop second\n3) Rename first\n" "4) Rename second\n5) Auto-rename first\n" "6) Auto-rename second\n"); - else if (rw) + else +#ifdef __REACTOS__ + if (rw) +#endif printf(" Auto-renaming second.\n"); +#ifdef __REACTOS__ if (rw || interactive) { - switch (interactive ? get_key("123456", "?") : '6') { - case '1': - drop_file(fs, *walk); - *walk = (*walk)->next; - skip = 1; - break; - case '2': - drop_file(fs, *scan); - *scan = (*scan)->next; - continue; - case '3': - rename_file(*walk); - printf(" Renamed to %s\n", path_name(*walk)); - redo = 1; - break; - case '4': - rename_file(*scan); - printf(" Renamed to %s\n", path_name(*walk)); - redo = 1; - break; - case '5': - auto_rename(*walk); - printf(" Renamed to %s\n", - file_name((*walk)->dir_ent.name)); - break; - case '6': - auto_rename(*scan); - printf(" Renamed to %s\n", - file_name((*scan)->dir_ent.name)); - break; +#endif + switch (interactive ? get_key("123456", "?") : '6') { + case '1': + drop_file(fs, *walk); + *walk = (*walk)->next; + skip = 1; + break; + case '2': + drop_file(fs, *scan); + *scan = (*scan)->next; + continue; + case '3': + rename_file(*walk); + printf(" Renamed to %s\n", path_name(*walk)); + redo = 1; + break; + case '4': + rename_file(*scan); + printf(" Renamed to %s\n", path_name(*walk)); + redo = 1; + break; + case '5': + auto_rename(*walk); + printf(" Renamed to %s\n", + file_name((*walk)->dir_ent.name)); + break; + case '6': + auto_rename(*scan); + printf(" Renamed to %s\n", + file_name((*scan)->dir_ent.name)); + break; +#ifdef __REACTOS__ } +#endif } } scan = &(*scan)->next; @@ -917,6 +1038,9 @@ static void test_file(DOS_FS * fs, DOS_FILE * file, int read_test) MODIFY_START(file, next_cluster(fs, walk), fs); set_fat(fs, walk, -2); } + } else { + prev = walk; + clusters++; } set_owner(fs, walk, file); } diff --git a/sdk/lib/fslib/vfatlib/check/check.h b/sdk/lib/fslib/vfatlib/check/check.h index 933bbf45b6..4dfa03a049 100644 --- a/sdk/lib/fslib/vfatlib/check/check.h +++ b/sdk/lib/fslib/vfatlib/check/check.h @@ -23,13 +23,13 @@ #ifndef _CHECK_H #define _CHECK_H -off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern); +off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern, int gen_name); -/* Allocate a free slot in the root directory for a new file. The file name is - constructed after 'pattern', which must include a %d type format for printf - and expand to exactly 11 characters. The name actually used is written into - the 'de' structure, the rest of *de is cleared. The offset returned is to - where in the filesystem the entry belongs. */ +/* Allocate a free slot in the root directory for a new file. If gen_name is + true, the file name is constructed after 'pattern', which must include a %d + type format for printf and expand to exactly 11 characters. The name + actually used is written into the 'de' structure, the rest of *de is cleared. + The offset returned is to where in the filesystem the entry belongs. */ int scan_root(DOS_FS * fs); diff --git a/sdk/lib/fslib/vfatlib/check/common.c b/sdk/lib/fslib/vfatlib/check/common.c index 4782f16cfa..2b02d63519 100644 --- a/sdk/lib/fslib/vfatlib/check/common.c +++ b/sdk/lib/fslib/vfatlib/check/common.c @@ -1,7 +1,3 @@ -/**** - ** Platform-dependent file - ****/ - /* common.c - Common functions Copyright (C) 1993 Werner Almesberger <werner.almesberger(a)lrc.di.epfl.ch> @@ -33,12 +29,12 @@ #define NDEBUG #include <debug.h> - typedef struct _link { void *data; struct _link *next; } LINK; +#ifdef __REACTOS__ DECLSPEC_NORETURN // __attribute((noreturn)) void exit(int exitcode) { @@ -51,38 +47,61 @@ void exit(int exitcode) DECLSPEC_NORETURN // __attribute((noreturn)) void die_func(const char *msg, ...) // die +#else +void die(const char *msg, ...) +#endif { va_list args; va_start(args, msg); - // vfprintf(stderr, msg, args); +#ifndef __REACTOS__ + vfprintf(stderr, msg, args); +#else DPRINT1("Unrecoverable problem!\n"); VfatPrintV((char*)msg, args); +#endif va_end(args); - // // fprintf(stderr, "\n"); - // VfatPrint("\n"); - +#ifndef __REACTOS__ + fprintf(stderr, "\n"); +#endif exit(1); } +#ifdef __REACTOS__ DECLSPEC_NORETURN // __attribute((noreturn)) void pdie_func(const char *msg, ...) // pdie +#else +void pdie(const char *msg, ...) +#endif { va_list args; va_start(args, msg); - // vfprintf(stderr, msg, args); +#ifndef __REACTOS__ + vfprintf(stderr, msg, args); +#else DPRINT1("Unrecoverable problem!\n"); VfatPrintV((char*)msg, args); +#endif va_end(args); - // // fprintf(stderr, ":%s\n", strerror(errno)); - // // VfatPrint(":%s\n", strerror(errno)); - // VfatPrint("\n"); - +#ifndef __REACTOS__ + fprintf(stderr, ":%s\n", strerror(errno)); +#endif exit(1); } -void *vfalloc(size_t size) +#ifndef __REACTOS__ +void *alloc(int size) +{ + void *this; + + if ((this = malloc(size))) + return this; + pdie("malloc"); + return NULL; /* for GCC */ +} +#else +void *vfalloc(int size) { void *ptr; @@ -97,7 +116,7 @@ void *vfalloc(size_t size) return ptr; } -void *vfcalloc(size_t size, size_t count) +void *vfcalloc(int size, int count) { void *ptr; @@ -115,15 +134,24 @@ void vffree(void *ptr) { RtlFreeHeap(RtlGetProcessHeap(), 0, ptr); } +#endif void *qalloc(void **root, int size) { LINK *link; +#ifndef __REACTOS__ + link = alloc(sizeof(LINK)); +#else link = vfalloc(sizeof(LINK)); +#endif link->next = *root; *root = link; +#ifndef __REACTOS__ + return link->data = alloc(size); +#else return link->data = vfalloc(size); +#endif } void qfree(void **root) @@ -133,24 +161,29 @@ void qfree(void **root) while (*root) { this = (LINK *) * root; *root = this->next; +#ifndef __REACTOS__ + free(this->data); + free(this); +#else vffree(this->data); vffree(this); +#endif } } - +#ifdef __REACTOS__ #ifdef min #undef min #endif -int min(int a,int b) +#endif +int min(int a, int b) { return a < b ? a : b; } - char get_key(const char *valid, const char *prompt) { -#if 0 +#ifndef __REACTOS__ int ch, okay; while (1) { diff --git a/sdk/lib/fslib/vfatlib/check/common.h b/sdk/lib/fslib/vfatlib/check/common.h index da990db14d..e957d0b37c 100644 --- a/sdk/lib/fslib/vfatlib/check/common.h +++ b/sdk/lib/fslib/vfatlib/check/common.h @@ -1,7 +1,3 @@ -/**** - ** Platform-dependent file - ****/ - /* common.h - Common functions Copyright (C) 1993 Werner Almesberger <werner.almesberger(a)lrc.di.epfl.ch> @@ -27,29 +23,42 @@ #ifndef _COMMON_H #define _COMMON_H +#ifndef __REACTOS__ +void die(const char *msg, ...) + __attribute((noreturn, format(printf, 1, 2))); +#else DECLSPEC_NORETURN // __attribute((noreturn)) -// void die(const char *msg, ...); void die_func(const char *msg, ...); #define die(msg, ...) \ do { \ die_func("DIE! (%s:%d) " msg "\n", __RELFILE__, __LINE__, ##__VA_ARGS__); \ } while (0) +#endif /* Displays a prinf-style message and terminates the program. */ +#ifndef __REACTOS__ +void pdie(const char *msg, ...) + __attribute((noreturn, format(printf, 1, 2))); +#else DECLSPEC_NORETURN // __attribute((noreturn)) -// void pdie(const char *msg, ...); void pdie_func(const char *msg, ...); #define pdie(msg, ...) \ do { \ pdie_func("P-DIE! (%s:%d) " msg "\n", __RELFILE__, __LINE__, ##__VA_ARGS__); \ } while (0) +#endif /* Like die, but appends an error message according to the state of errno. */ -void *vfalloc(size_t size); -void *vfcalloc(size_t size, size_t count); +#ifndef __REACTOS__ +void *alloc(int size); +#else +void *vfalloc(int size); +void *vfcalloc(int size, int count); void vffree(void *ptr); +#endif + /* mallocs SIZE bytes and returns a pointer to the data. Terminates the program if malloc fails. */ @@ -61,7 +70,9 @@ void qfree(void **root); /* Deallocates all qalloc'ed data areas described by ROOT. */ -//int min(int a,int b); +#ifndef __REACTOS__ +int min(int a, int b); +#endif /* Returns the smaller integer value of a and b. */ diff --git a/sdk/lib/fslib/vfatlib/check/fat.c b/sdk/lib/fslib/vfatlib/check/fat.c index a601e6a67f..efb05e1cdb 100644 --- a/sdk/lib/fslib/vfatlib/check/fat.c +++ b/sdk/lib/fslib/vfatlib/check/fat.c @@ -350,7 +350,11 @@ void reclaim_free(DOS_FS * fs) get_fat(&curEntry, fs->fat, i, fs); if (!get_owner(fs, i) && curEntry.value && +#ifndef __REACTOS__ + !FAT_IS_BAD(fs, curEntry.value)) { +#else !FAT_IS_BAD(fs, curEntry.value) && rw) { +#endif set_fat(fs, i, 0); reclaimed++; } @@ -490,32 +494,36 @@ void reclaim_file(DOS_FS * fs) } while (changed); +#ifdef __REACTOS__ if (rw) { - /* Now we can start recovery */ - files = reclaimed = 0; - for (i = 2; i < total_num_clusters; i++) - /* If this cluster is the head of an orphan chain... */ - if (get_owner(fs, i) == &orphan && !num_refs[i]) { - DIR_ENT de; - off_t offset; - files++; - offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); - de.start = htole16(i & 0xffff); - if (fs->fat_bits == 32) - de.starthi = htole16(i >> 16); - for (walk = i; walk > 0 && walk != -1; - walk = next_cluster(fs, walk)) { - de.size = htole32(le32toh(de.size) + fs->cluster_size); - reclaimed++; - } - fs_write(offset, sizeof(DIR_ENT), &de); +#endif + /* Now we can start recovery */ + files = reclaimed = 0; + for (i = 2; i < total_num_clusters; i++) + /* If this cluster is the head of an orphan chain... */ + if (get_owner(fs, i) == &orphan && !num_refs[i]) { + DIR_ENT de; + off_t offset; + files++; + offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC", 1); + de.start = htole16(i & 0xffff); + if (fs->fat_bits == 32) + de.starthi = htole16(i >> 16); + for (walk = i; walk > 0 && walk != -1; + walk = next_cluster(fs, walk)) { + de.size = htole32(le32toh(de.size) + fs->cluster_size); + reclaimed++; } - if (reclaimed) - printf("Reclaimed %d unused cluster%s (%llu bytes) in %d chain%s.\n", - reclaimed, reclaimed == 1 ? "" : "s", - (unsigned long long)reclaimed * fs->cluster_size, files, - files == 1 ? "" : "s"); - } + fs_write(offset, sizeof(DIR_ENT), &de); + } + if (reclaimed) + printf("Reclaimed %d unused cluster%s (%llu bytes) in %d chain%s.\n", + reclaimed, reclaimed == 1 ? "" : "s", + (unsigned long long)reclaimed * fs->cluster_size, files, + files == 1 ? "" : "s"); +#ifdef __REACTOS__ + } +#endif free(num_refs); } @@ -545,9 +553,16 @@ uint32_t update_free(DOS_FS * fs) (long)fs->free_clusters, (long)free); if (interactive) printf("1) Correct\n2) Don't correct\n"); - else if (rw) + else +#ifdef __REACTOS__ + if (rw) +#endif printf(" Auto-correcting.\n"); +#ifndef __REACTOS__ + if (!interactive || get_key("12", "?") == '1') +#else if ((!interactive && rw) || (interactive && get_key("12", "?") == '1')) +#endif do_set = 1; } } else { diff --git a/sdk/lib/fslib/vfatlib/check/file.c b/sdk/lib/fslib/vfatlib/check/file.c index 004e308c24..66be32bade 100644 --- a/sdk/lib/fslib/vfatlib/check/file.c +++ b/sdk/lib/fslib/vfatlib/check/file.c @@ -29,13 +29,14 @@ #define NDEBUG #include <debug.h> - FDSC *fp_root = NULL; static void put_char(char **p, unsigned char c) { - // if (dos_char_to_printable(p, c)) - // return; +#ifndef __REACTOS__ + if (dos_char_to_printable(p, c)) + return; +#endif if ((c >= ' ' && c < 0x7f) || c >= 0xa0) *(*p)++ = c; else { @@ -108,18 +109,15 @@ int file_cvt(unsigned char *name, unsigned char *fixed) } if (c == '\\') { c = 0; + name++; for (cnt = 3; cnt; cnt--) { if (*name < '0' || *name > '7') { - printf("Invalid octal character.\n"); + printf("Expected three octal digits.\n"); return 0; } c = c * 8 + *name++ - '0'; } - if (cnt < 4) { - printf("Expected three octal digits.\n"); - return 0; - } - name += 3; + name--; } if (islower(c)) c = toupper(c); @@ -158,7 +156,14 @@ void file_add(char *path, FD_TYPE type) exit(2); for (walk = *current; walk; walk = walk->next) if (!here && (!strncmp(name, walk->name, MSDOS_NAME) || (type == - fdt_undelete && !strncmp(name + 1, walk->name + 1, MSDOS_NAME - 1)))) + fdt_undelete + && + !strncmp + (name + 1, + walk->name + + 1, + MSDOS_NAME + - 1)))) die("Ambiguous name: \"%s\"", path); else if (here && !strncmp(name, walk->name, MSDOS_NAME)) break; diff --git a/sdk/lib/fslib/vfatlib/check/fsck.fat.h b/sdk/lib/fslib/vfatlib/check/fsck.fat.h index 6b06ae2692..2e9db8f8ba 100644 --- a/sdk/lib/fslib/vfatlib/check/fsck.fat.h +++ b/sdk/lib/fslib/vfatlib/check/fsck.fat.h @@ -28,10 +28,14 @@ #ifndef _DOSFSCK_H #define _DOSFSCK_H -//#include "types.h" - +#ifndef __REACTOS__ +#include <sys/types.h> +#include <fcntl.h> +#include <stddef.h> +#endif #include <stdint.h> +#ifdef __REACTOS__ #ifdef _WIN32 typedef unsigned int __u32; @@ -48,29 +52,8 @@ typedef unsigned __int64 __u64; #include "byteorder.h" #endif -#if 0 -#undef le16toh -#undef le32toh -#undef htole16 -#undef htole32 -#endif - #if __BYTE_ORDER == __BIG_ENDIAN #include "byteswap.h" - -#if 0 -#define le16toh(v) bswap_16(v) -#define le32toh(v) bswap_32(v) -#define htole16(v) le16toh(v) -#define htole32(v) le32toh(v) -#endif -#if 0 -#define le16toh(v) le16_to_cpu(v) -#define le32toh(v) le32_to_cpu(v) -#define htole16(v) cpu_to_le16(v) -#define htole32(v) cpu_to_le32(v) -#endif - #else #define le16toh(v) (v) #define le32toh(v) (v) @@ -78,19 +61,17 @@ typedef unsigned __int64 __u64; #define htole32(v) (v) #endif /* __BIG_ENDIAN */ -// #include "endian_compat.h" +#endif +#ifndef __REACTOS__ +#include "endian_compat.h" +#else #ifndef offsetof #define offsetof(t,e) ((int)&(((t *)0)->e)) #endif - -// extern int interactive, rw, list, verbose, test, write_immed; -// extern int atari_format; -// extern unsigned n_files; -// extern void *mem_queue; - #include "rosglue.h" +#endif #include "msdos_fs.h" @@ -98,7 +79,9 @@ typedef unsigned __int64 __u64; #define FAT_STATE_DIRTY 0x01 +#ifdef __REACTOS__ #include <pshpack1.h> +#endif /* ++roman: Use own definition of boot sector structure -- the kernel headers' * name for it is msdos_boot_sector in 2.0 and fat_boot_sector in 2.1 ... */ @@ -171,14 +154,12 @@ struct boot_sector_16 { struct info_sector { uint32_t magic; /* Magic for info sector ('RRaA') */ - uint8_t junk[0x1dc]; - uint32_t reserved1; /* Nothing as far as I can tell */ + uint8_t reserved1[480]; uint32_t signature; /* 0x61417272 ('rrAa') */ uint32_t free_clusters; /* Free cluster count. -1 if unknown */ uint32_t next_cluster; /* Most recently allocated cluster. */ - uint32_t reserved2[3]; - uint16_t reserved3; - uint16_t boot_sign; + uint8_t reserved2[12]; + uint32_t boot_sign; }; typedef struct { @@ -194,7 +175,9 @@ typedef struct { uint32_t size; /* file size (in bytes) */ } __attribute__ ((packed)) DIR_ENT; +#ifdef __REACTOS__ #include <poppack.h> +#endif typedef struct _dos_file { DIR_ENT dir_ent; @@ -214,7 +197,7 @@ typedef struct { typedef struct { int nfats; off_t fat_start; - unsigned int fat_size; /* unit is bytes */ + off_t fat_size; /* unit is bytes */ unsigned int fat_bits; /* size of a FAT entry */ unsigned int eff_fat_bits; /* # of used bits in a FAT entry */ uint32_t root_cluster; /* 0 for old-style root dir */ @@ -231,6 +214,12 @@ typedef struct { char *label; } DOS_FS; +#ifndef __REACTOS__ +extern int interactive, rw, list, verbose, test, write_immed; +extern int atari_format; +extern unsigned n_files; +extern void *mem_queue; +#endif /* value to use as end-of-file marker */ #define FAT_EOF(fs) ((atari_format ? 0xfff : 0xff8) | FAT_EXTD(fs)) diff --git a/sdk/lib/fslib/vfatlib/check/io.c b/sdk/lib/fslib/vfatlib/check/io.c index 06e0496e1a..e16d40a877 100644 --- a/sdk/lib/fslib/vfatlib/check/io.c +++ b/sdk/lib/fslib/vfatlib/check/io.c @@ -1,7 +1,3 @@ -/**** - ** Platform-dependent file - ****/ - /* io.c - Virtual disk input/output Copyright (C) 1993 Werner Almesberger <werner.almesberger(a)lrc.di.epfl.ch> @@ -51,6 +47,9 @@ typedef struct _change { } CHANGE; static CHANGE *changes, *last; +#ifndef __REACTOS__ +static int fd, did_change = 0; +#else static int did_change = 0; static HANDLE fd; static LARGE_INTEGER CurrentOffset; @@ -157,8 +156,20 @@ static off_t WIN32lseek(HANDLE fd, off_t offset, int whence) #define lseek WIN32lseek /******************************************************************************/ +#endif +#ifndef __REACTOS__ +void fs_open(char *path, int rw) +{ + if ((fd = open(path, rw ? O_RDWR : O_RDONLY)) < 0) { + perror("open"); + exit(6); + } + changes = last = NULL; + did_change = 0; +} +#else NTSTATUS fs_open(PUNICODE_STRING DriveRoot, int read_write) { NTSTATUS Status; @@ -264,6 +275,7 @@ void fs_dismount(void) DPRINT1("NtFsControlFile() failed with Status 0x%08x\n", Status); } } +#endif /** * Read data from the partition, accounting for any pending updates that are @@ -279,8 +291,7 @@ void fs_read(off_t pos, int size, void *data) CHANGE *walk; int got; -#if 1 // TMN - +#ifdef __REACTOS__ const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; const off_t seekpos_aligned = pos - (pos % 512); const size_t seek_delta = (size_t)(pos - seekpos_aligned); @@ -295,18 +306,14 @@ void fs_read(off_t pos, int size, void *data) assert(seek_delta + size <= readsize); memcpy(data, tmpBuf+seek_delta, size); free(tmpBuf); - -#else // TMN: - +#else if (lseek(fd, pos, 0) != pos) - pdie("Seek to %lld", pos); + pdie("Seek to %lld", (long long)pos); if ((got = read(fd, data, size)) < 0) - pdie("Read %d bytes at %lld", size, pos); - -#endif // TMN: - + pdie("Read %d bytes at %lld", size, (long long)pos); +#endif if (got != size) - die("Got %d bytes instead of %d at %lld", got, size, pos); + die("Got %d bytes instead of %d at %lld", got, size, (long long)pos); for (walk = changes; walk; walk = walk->next) { if (walk->pos < pos + size && walk->pos + walk->size > pos) { if (walk->pos < pos) @@ -319,43 +326,36 @@ void fs_read(off_t pos, int size, void *data) } } - int fs_test(off_t pos, int size) { void *scratch; int okay; -#if 1 // TMN - +#ifdef __REACTOS__ const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; // TMN: const off_t seekpos_aligned = pos - (pos % 512); // TMN: scratch = alloc(readsize_aligned); if (lseek(fd, seekpos_aligned, 0) != seekpos_aligned) pdie("Seek to %lld",pos); okay = read(fd, scratch, readsize_aligned) == (int)readsize_aligned; free(scratch); - -#else // TMN: - +#else if (lseek(fd, pos, 0) != pos) - pdie("Seek to %lld", pos); + pdie("Seek to %lld", (long long)pos); scratch = alloc(size); okay = read(fd, scratch, size) == size; free(scratch); - -#endif // TMN: +#endif return okay; } - void fs_write(off_t pos, int size, void *data) { CHANGE *new; int did; +#ifdef __REACTOS__ assert(interactive || rw); -#if 1 //SAE - if (FsCheckFlags & FSCHECK_IMMEDIATE_WRITE) { void *scratch; const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; @@ -390,22 +390,18 @@ void fs_write(off_t pos, int size, void *data) if (did < 0) pdie("Write %d bytes at %lld", size, pos); die("Wrote %d bytes instead of %d at %lld", did, size, pos); } - -#else //SAE - +#else if (write_immed) { did_change = 1; if (lseek(fd, pos, 0) != pos) - pdie("Seek to %lld", pos); + pdie("Seek to %lld", (long long)pos); if ((did = write(fd, data, size)) == size) return; if (did < 0) - pdie("Write %d bytes at %lld", size, pos); - die("Wrote %d bytes instead of %d at %lld", did, size, pos); + pdie("Write %d bytes at %lld", size, (long long)pos); + die("Wrote %d bytes instead of %d at %lld", did, size, (long long)pos); } - -#endif //SAE - +#endif new = alloc(sizeof(CHANGE)); new->pos = pos; memcpy(new->data = alloc(new->size = size), data, size); @@ -417,10 +413,9 @@ void fs_write(off_t pos, int size, void *data) last = new; } - static void fs_flush(void) { -#if 1 +#ifdef __REACTOS__ CHANGE *this; int old_write_immed = (FsCheckFlags & FSCHECK_IMMEDIATE_WRITE); @@ -442,7 +437,6 @@ static void fs_flush(void) if (!old_write_immed) FsCheckFlags ^= FSCHECK_IMMEDIATE_WRITE; #else - CHANGE *this; int size; @@ -450,26 +444,18 @@ static void fs_flush(void) this = changes; changes = changes->next; if (lseek(fd, this->pos, 0) != this->pos) - { - // printf("Seek to %lld failed: %s\n Did not write %d bytes.\n", - // (long long)this->pos, strerror(errno), this->size); - printf("Seek to %lld failed\n Did not write %d bytes.\n", - (long long)this->pos, this->size); - } + fprintf(stderr, + "Seek to %lld failed: %s\n Did not write %d bytes.\n", + (long long)this->pos, strerror(errno), this->size); else if ((size = write(fd, this->data, this->size)) < 0) - { - // printf("Writing %d bytes at %lld failed: %s\n", this->size, - // (long long)this->pos, strerror(errno)); - printf("Writing %d bytes at %lld failed\n", - this->size, (long long)this->pos); - } + fprintf(stderr, "Writing %d bytes at %lld failed: %s\n", this->size, + (long long)this->pos, strerror(errno)); else if (size != this->size) - printf("Wrote %d bytes instead of %d bytes at %lld.\n", - size, this->size, (long long)this->pos); + fprintf(stderr, "Wrote %d bytes instead of %d bytes at %lld." + "\n", size, this->size, (long long)this->pos); free(this->data); free(this); } - #endif } @@ -478,7 +464,7 @@ int fs_close(int write) CHANGE *next; int changed; - changed = !!changes; + changed = ! !changes; if (write) fs_flush(); else @@ -495,5 +481,5 @@ int fs_close(int write) int fs_changed(void) { - return !!changes || did_change; + return ! !changes || did_change; } diff --git a/sdk/lib/fslib/vfatlib/check/io.h b/sdk/lib/fslib/vfatlib/check/io.h index 23c6fd6a71..ce14766ee9 100644 --- a/sdk/lib/fslib/vfatlib/check/io.h +++ b/sdk/lib/fslib/vfatlib/check/io.h @@ -1,7 +1,3 @@ -/**** - ** Platform-dependent file - ****/ - /* io.h - Virtual disk input/output Copyright (C) 1993 Werner Almesberger <werner.almesberger(a)lrc.di.epfl.ch> @@ -31,17 +27,24 @@ #ifndef _IO_H #define _IO_H -//#include <sys/types.h> /* for loff_t */ -// #include <fcntl.h> /* for off_t */ +#ifndef __REACTOS__ +#include <fcntl.h> /* for off_t */ +#endif +#ifndef __REACTOS__ +void fs_open(char *path, int rw); +#else NTSTATUS fs_open(PUNICODE_STRING DriveRoot, int read_write); +#endif -/* Opens the file system PATH. If RW is zero, the file system is opened +/* Opens the filesystem PATH. If RW is zero, the filesystem is opened read-only, otherwise, it is opened read-write. */ +#ifdef __REACTOS__ BOOLEAN fs_isdirty(void); /* Checks if filesystem is dirty */ +#endif void fs_read(off_t pos, int size, void *data); @@ -69,6 +72,7 @@ int fs_changed(void); /* Determines whether the filesystem has changed. See fs_close. */ +#ifdef __REACTOS__ NTSTATUS fs_lock(BOOLEAN LockVolume); /* Lock or unlocks the volume */ @@ -76,5 +80,5 @@ NTSTATUS fs_lock(BOOLEAN LockVolume); void fs_dismount(void); /* Dismounts the volume */ - +#endif #endif diff --git a/sdk/lib/fslib/vfatlib/check/lfn.c b/sdk/lib/fslib/vfatlib/check/lfn.c index de78e743e9..a30ed57919 100644 --- a/sdk/lib/fslib/vfatlib/check/lfn.c +++ b/sdk/lib/fslib/vfatlib/check/lfn.c @@ -26,7 +26,6 @@ #define NDEBUG #include <debug.h> - typedef struct { uint8_t id; /* sequence number for slot */ uint8_t name0_4[10]; /* first 5 characters in name */ @@ -67,16 +66,13 @@ static unsigned char fat_uni2esc[64] = { /* for maxlen param */ #define UNTIL_0 INT_MAX -static void copy_lfn_part(unsigned char *dst, LFN_ENT * lfn); -static char *cnv_unicode(const unsigned char *uni, int maxlen, int use_q); - /* Convert name part in 'lfn' from unicode to ASCII */ -static __inline char* CNV_THIS_PART(LFN_ENT * lfn) -{ - unsigned char __part_uni[CHARS_PER_LFN*2]; - copy_lfn_part(__part_uni, lfn); - return cnv_unicode(__part_uni, CHARS_PER_LFN, 0); -} +#define CNV_THIS_PART(lfn) \ + ({ \ + unsigned char __part_uni[CHARS_PER_LFN*2]; \ + copy_lfn_part( __part_uni, lfn ); \ + cnv_unicode( __part_uni, CHARS_PER_LFN, 0 ); \ + }) /* Convert name parts collected so far (from previous slots) from unicode to * ASCII */ @@ -309,7 +305,8 @@ void lfn_add_slot(DIR_ENT * de, off_t dir_offset) can_fix = 1; } if (interactive) { - printf("1: Delete LFN\n2: Leave it as it is (and ignore LFN so far)\n"); + printf + ("1: Delete LFN\n2: Leave it as it is (and ignore LFN so far)\n"); if (can_fix) printf("3: Correct sequence number\n"); } else diff --git a/sdk/lib/fslib/vfatlib/check/msdos_fs.h b/sdk/lib/fslib/vfatlib/check/msdos_fs.h index 794cb0491a..a6bc8bb972 100644 --- a/sdk/lib/fslib/vfatlib/check/msdos_fs.h +++ b/sdk/lib/fslib/vfatlib/check/msdos_fs.h @@ -20,6 +20,10 @@ #ifndef _MSDOS_FS_H #define _MSDOS_FS_H +#ifndef __REACTOS__ +#include <stdint.h> +#endif + #define SECTOR_SIZE 512 /* sector size (bytes) */ #define MSDOS_DPS (SECTOR_SIZE / sizeof(struct msdos_dir_entry)) #define MSDOS_DPS_BITS 4 /* log2(MSDOS_DPS) */ @@ -43,7 +47,9 @@ #define MSDOS_DOT ". " /* ".", padded to MSDOS_NAME chars */ #define MSDOS_DOTDOT ".. " /* "..", padded to MSDOS_NAME chars */ +#ifdef __REACTOS__ #include <pshpack1.h> +#endif struct msdos_dir_entry { uint8_t name[MSDOS_NAME]; /* name including extension */ @@ -58,6 +64,8 @@ struct msdos_dir_entry { uint32_t size; /* file size (in bytes) */ } __attribute__ ((packed)); +#ifdef __REACTOS__ #include <poppack.h> +#endif #endif /* _MSDOS_FS_H */

1 0

02/02: [FASTFAT] Lock DirResource on flush in case we're updating entry
by Pierre Schweitzer 28 May '18

28 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f3169b295a03d13c38eb… commit 9f3169b295a03d13c38eb3a9cdb7cbe0e770c76c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 28 09:01:39 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 28 19:37:56 2018 +0200 [FASTFAT] Lock DirResource on flush in case we're updating entry CORE-14660 --- drivers/filesystems/fastfat/flush.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/filesystems/fastfat/flush.c b/drivers/filesystems/fastfat/flush.c index ebf1925172..22a8c6d08f 100644 --- a/drivers/filesystems/fastfat/flush.c +++ b/drivers/filesystems/fastfat/flush.c @@ -33,6 +33,7 @@ VfatFlushFile( IoStatus.Status = STATUS_SUCCESS; } + ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); if (BooleanFlagOn(Fcb->Flags, FCB_IS_DIRTY)) { Status = VfatUpdateEntry(DeviceExt, Fcb); @@ -41,6 +42,8 @@ VfatFlushFile( IoStatus.Status = Status; } } + ExReleaseResourceLite(&DeviceExt->DirResource); + return IoStatus.Status; }

1 0

01/02: [VFATLIB] Only attempt to clear the dirty set bit in rw mode.
by Pierre Schweitzer 28 May '18

28 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59dc951bf7555adc990dd… commit 59dc951bf7555adc990dded96a8355f23f315495 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 28 09:00:13 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 28 19:37:56 2018 +0200 [VFATLIB] Only attempt to clear the dirty set bit in rw mode. --- sdk/lib/fslib/vfatlib/check/boot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/lib/fslib/vfatlib/check/boot.c b/sdk/lib/fslib/vfatlib/check/boot.c index a1fd58a387..8596e2bb23 100644 --- a/sdk/lib/fslib/vfatlib/check/boot.c +++ b/sdk/lib/fslib/vfatlib/check/boot.c @@ -294,9 +294,11 @@ static char print_fat_dirty_state(void) if (interactive) { printf("1) Remove dirty bit\n" "2) No action\n"); return get_key("12", "?"); - } else + } else if (rw) { printf(" Automatically removing dirty bit.\n"); return '1'; + } + return '2'; } static void check_fat_state_bit(DOS_FS * fs, void *b)

1 0

01/01: [SYSSETUP][INF] Add the 'Registry Values' section to the default security settings and apply it to the registry
by Eric Kohl 28 May '18

28 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd9f22e9e5857e0235fbd… commit cd9f22e9e5857e0235fbd70ff7908e8840168c09 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 28 19:26:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 28 19:26:02 2018 +0200 [SYSSETUP][INF] Add the 'Registry Values' section to the default security settings and apply it to the registry --- dll/win32/syssetup/security.c | 222 +++++++++++++++++++++++++++++++++++++++++- media/inf/defltws.inf | 17 ++++ 2 files changed, 235 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 221d0152af..385fde1b36 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -245,7 +245,7 @@ InstallBuiltinAccounts(VOID) return; } - for (i = 0; i < 10; i++) + for (i = 0; i < ARRAYSIZE(BuiltinAccounts); i++) { if (!ConvertStringSidToSid(BuiltinAccounts[i], &AccountSid)) { @@ -314,7 +314,7 @@ InstallPrivileges(VOID) NULL, &InfContext)) { - DPRINT1("SetupFindfirstLineW failed\n"); + DPRINT1("SetupFindFirstLineW failed\n"); goto done; } @@ -324,7 +324,7 @@ InstallPrivileges(VOID) if (!SetupGetStringFieldW(&InfContext, 0, szPrivilegeString, - 256, + ARRAYSIZE(szPrivilegeString), NULL)) { DPRINT1("SetupGetStringFieldW() failed\n"); @@ -337,7 +337,7 @@ InstallPrivileges(VOID) if (!SetupGetStringFieldW(&InfContext, i + 1, szSidString, - 256, + ARRAYSIZE(szSidString), NULL)) { DPRINT1("SetupGetStringFieldW() failed\n"); @@ -400,11 +400,225 @@ done: } +static +VOID +ApplyRegistryValues(VOID) +{ + HINF hSecurityInf = INVALID_HANDLE_VALUE; + WCHAR szRegistryPath[MAX_PATH]; + WCHAR szRootName[MAX_PATH]; + WCHAR szKeyName[MAX_PATH]; + WCHAR szValueName[MAX_PATH]; + INFCONTEXT InfContext; + DWORD dwLength, dwType; + HKEY hRootKey, hKey; + PWSTR Ptr1, Ptr2; + DWORD dwError; + PVOID pBuffer; + + DPRINT("ApplyRegistryValues()\n"); + + hSecurityInf = SetupOpenInfFileW(L"defltws.inf", //szNameBuffer, + NULL, + INF_STYLE_WIN4, + NULL); + if (hSecurityInf == INVALID_HANDLE_VALUE) + { + DPRINT1("SetupOpenInfFileW failed\n"); + return; + } + + if (!SetupFindFirstLineW(hSecurityInf, + L"Registry Values", + NULL, + &InfContext)) + { + DPRINT1("SetupFindFirstLineW failed\n"); + goto done; + } + + do + { + /* Retrieve the privilege name */ + if (!SetupGetStringFieldW(&InfContext, + 0, + szRegistryPath, + ARRAYSIZE(szRegistryPath), + NULL)) + { + DPRINT1("SetupGetStringFieldW() failed\n"); + goto done; + } + + DPRINT("RegistryPath: %S\n", szRegistryPath); + + Ptr1 = wcschr(szRegistryPath, L'\\'); + Ptr2 = wcsrchr(szRegistryPath, L'\\'); + if (Ptr1 != NULL && Ptr2 != NULL && Ptr1 != Ptr2) + { + dwLength = (DWORD)(((ULONG_PTR)Ptr1 - (ULONG_PTR)szRegistryPath) / sizeof(WCHAR)); + wcsncpy(szRootName, szRegistryPath, dwLength); + szRootName[dwLength] = UNICODE_NULL; + + Ptr1++; + dwLength = (DWORD)(((ULONG_PTR)Ptr2 - (ULONG_PTR)Ptr1) / sizeof(WCHAR)); + wcsncpy(szKeyName, Ptr1, dwLength); + szKeyName[dwLength] = UNICODE_NULL; + + Ptr2++; + wcscpy(szValueName, Ptr2); + + DPRINT("RootName: %S\n", szRootName); + DPRINT("KeyName: %S\n", szKeyName); + DPRINT("ValueName: %S\n", szValueName); + + if (_wcsicmp(szRootName, L"Machine") == 0) + { + hRootKey = HKEY_LOCAL_MACHINE; + } + else + { + DPRINT1("Unsupported root key %S\n", szRootName); + break; + } + + if (!SetupGetIntField(&InfContext, + 1, + (PINT)&dwType)) + { + DPRINT1("Failed to create the key %S (Error %lu)\n", szKeyName, dwError); + break; + } + + if (dwType != REG_SZ && dwType != REG_EXPAND_SZ && dwType != REG_BINARY && + dwType != REG_DWORD && dwType != REG_MULTI_SZ) + { + DPRINT1("Invalid value type %lu\n", dwType); + break; + } + + dwLength = 0; + switch (dwType) + { + case REG_SZ: + case REG_EXPAND_SZ: + SetupGetStringField(&InfContext, + 2, + NULL, + 0, + &dwLength); + dwLength *= sizeof(WCHAR); + break; + + case REG_BINARY: + SetupGetBinaryField(&InfContext, + 2, + NULL, + 0, + &dwLength); + break; + + case REG_DWORD: + dwLength = sizeof(INT); + break; + + case REG_MULTI_SZ: + SetupGetMultiSzField(&InfContext, + 2, + NULL, + 0, + &dwLength); + dwLength *= sizeof(WCHAR); + break; + } + + if (dwLength == 0) + { + DPRINT1("Failed to determine the required buffer size!\n"); + break; + } + + dwError = RegCreateKeyExW(hRootKey, + szKeyName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + NULL); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to create the key %S (Error %lu)\n", szKeyName, dwError); + break; + } + + pBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (pBuffer) + { + switch (dwType) + { + case REG_SZ: + case REG_EXPAND_SZ: + SetupGetStringField(&InfContext, + 2, + pBuffer, + dwLength / sizeof(WCHAR), + &dwLength); + dwLength *= sizeof(WCHAR); + break; + + case REG_BINARY: + SetupGetBinaryField(&InfContext, + 2, + pBuffer, + dwLength, + &dwLength); + break; + + case REG_DWORD: + SetupGetIntField(&InfContext, + 2, + pBuffer); + break; + + case REG_MULTI_SZ: + SetupGetMultiSzField(&InfContext, + 2, + pBuffer, + dwLength / sizeof(WCHAR), + &dwLength); + dwLength *= sizeof(WCHAR); + break; + } + + RegSetValueEx(hKey, + szValueName, + 0, + dwType, + pBuffer, + dwLength); + + HeapFree(GetProcessHeap(), 0, pBuffer); + } + + RegCloseKey(hKey); + } + } + while (SetupFindNextLine(&InfContext, &InfContext)); + +done: + if (hSecurityInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hSecurityInf); +} + + VOID InstallSecurity(VOID) { InstallBuiltinAccounts(); InstallPrivileges(); + ApplyRegistryValues(); /* Hack */ SetPrimaryDomain(L"WORKGROUP", NULL); diff --git a/media/inf/defltws.inf b/media/inf/defltws.inf index cccca5baba..a2039441f3 100644 --- a/media/inf/defltws.inf +++ b/media/inf/defltws.inf @@ -44,3 +44,20 @@ SeSystemTimePrivilege = *S-1-5-32-544 SeTakeOwnershipPrivilege = *S-1-5-32-544 SeTcbPrivilege = SeUndockPrivilege = *S-1-5-32-544, *S-1-5-32-545 + + +[Registry Values] +; Full registry path = Type, Value +; +; Type: +; 1: REG_SZ +; 2: REG_EXPAND_SZ +; 3: REG_BINARY +; 4: REG_DWORD +; 7: REG_MULTI_SZ + +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\DontDisplayLastUserName = 4, 0 +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeCaption = 1, "" +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeText = 7, "" +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\ShutdownWithoutLogon = 4, 1 +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\UndockWithoutLogon = 4, 1 \ No newline at end of file

1 0

01/01: [USERENV] Implement CopySystemProfile Part 2 (Create the profile directory)
by Eric Kohl 28 May '18

28 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f9543940c432f0738d91… commit 1f9543940c432f0738d914f4ff2834966d3ce67a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 28 02:13:22 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 28 02:13:22 2018 +0200 [USERENV] Implement CopySystemProfile Part 2 (Create the profile directory) --- dll/win32/userenv/profile.c | 86 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 4 deletions(-) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index 8acbb90a91..0b49d7a869 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -112,13 +112,16 @@ CopySystemProfile( IN ULONG Unused) { WCHAR szKeyName[MAX_PATH]; - WCHAR szImagePath[MAX_PATH]; + WCHAR szRawProfilePath[MAX_PATH]; + WCHAR szProfilePath[MAX_PATH]; + WCHAR szDefaultProfilePath[MAX_PATH]; UNICODE_STRING SidString = {0, 0, NULL}; HANDLE hToken = NULL; PSID pUserSid = NULL; HKEY hProfileKey = NULL; DWORD dwDisposition; BOOL bResult = FALSE; + DWORD cchSize; DWORD dwError; DPRINT1("CopySystemProfile()\n"); @@ -177,21 +180,96 @@ CopySystemProfile( goto done; } - wcscpy(szImagePath, + wcscpy(szRawProfilePath, L"%systemroot%\\system32\\config\\systemprofile"); dwError = RegSetValueExW(hProfileKey, L"ProfileImagePath", 0, REG_EXPAND_SZ, - (PBYTE)szImagePath, - (wcslen(szImagePath) + 1) * sizeof(WCHAR)); + (PBYTE)szRawProfilePath, + (wcslen(szRawProfilePath) + 1) * sizeof(WCHAR)); if (dwError != ERROR_SUCCESS) { DPRINT1("Failed to set the ProfileImagePath value (Error %lu)\n", dwError); goto done; } + /* Expand the raw profile path */ + if (!ExpandEnvironmentStringsW(szRawProfilePath, + szProfilePath, + ARRAYSIZE(szProfilePath))) + { + DPRINT1("Failled to expand the raw profile path (Error %lu)\n", GetLastError()); + goto done; + } + + /* Create the profile directory if it does not exist yet */ + // FIXME: Security! + if (!CreateDirectoryW(szProfilePath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Failed to create the profile directory (Error %lu)\n", GetLastError()); + goto done; + } + } + + /* Get the path of the default profile */ + cchSize = ARRAYSIZE(szDefaultProfilePath); + if (!GetDefaultUserProfileDirectoryW(szDefaultProfilePath, &cchSize)) + { + DPRINT1("Failed to create the default profile path (Error %lu)\n", GetLastError()); + goto done; + } + + /* Copy the default profile into the new profile directory */ + // FIXME: Security! + if (!CopyDirectory(szProfilePath, szDefaultProfilePath)) + { + DPRINT1("Failed to copy the default profile directory (Error %lu)\n", GetLastError()); + goto done; + } + + /* Create user hive file */ + +#if 0 + /* Use the default hive file name */ +// StringCbCopyW(szBuffer, sizeof(szBuffer), szProfilePath); + StringCbCatW(szProfilePath, sizeof(szProfilePath), L"\\ntuser.dat"); + + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) + { + DPRINT1("Failed to acquire the restore privilege (Error %lu)\n", GetLastError()); + goto done; + } + + /* Load the user hive */ + dwError = RegLoadKeyW(HKEY_USERS, + SidString.Buffer, + szProfilePath); + AcquireRemoveRestorePrivilege(FALSE); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to load the new registry hive (Error %lu)\n", dwError); + goto done; + } + + bResult = TRUE; + + /* Initialize the user hive */ + if (!CreateUserHive(SidString.Buffer, szProfilePath)) + { + DPRINT1("Failed to create the new hive (Error %lu)\n", GetLastError()); + bResult = FALSE; + } + + /* Unload the user hive */ + AcquireRemoveRestorePrivilege(TRUE); + RegUnLoadKeyW(HKEY_USERS, SidString.Buffer); + AcquireRemoveRestorePrivilege(FALSE); +#endif bResult = TRUE;

1 0

01/01: [SETUP] Remove myself from the 1st stage setup code
by Eric Kohl 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=975b7d427d6428d57e356… commit 975b7d427d6428d57e3562d2bc4d9683d8319541 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 27 21:33:07 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 27 21:33:07 2018 +0200 [SETUP] Remove myself from the 1st stage setup code Congratulations Hermès! You just earned yourself full maintainership of the 1st stage setup. It's yours now. I'm out! --- base/setup/lib/fsutil.c | 3 +-- base/setup/lib/fsutil.h | 3 +-- base/setup/lib/genlist.c | 3 +-- base/setup/lib/genlist.h | 3 +-- base/setup/lib/partlist.c | 3 +-- base/setup/lib/partlist.h | 3 +-- base/setup/reactos/drivepage.c | 3 +-- base/setup/reactos/reactos.c | 3 +-- base/setup/reactos/reactos.h | 3 +-- base/setup/usetup/bootsup.c | 2 +- base/setup/usetup/bootsup.h | 2 +- base/setup/usetup/cmdcons.c | 2 +- base/setup/usetup/cmdcons.h | 2 +- base/setup/usetup/console.c | 2 +- base/setup/usetup/console.h | 2 +- base/setup/usetup/consup.c | 2 +- base/setup/usetup/consup.h | 2 +- base/setup/usetup/drivesup.c | 2 +- base/setup/usetup/drivesup.h | 2 +- base/setup/usetup/filequeue.c | 3 +-- base/setup/usetup/filequeue.h | 2 +- base/setup/usetup/filesup.c | 3 +-- base/setup/usetup/filesup.h | 2 +- base/setup/usetup/fslist.c | 3 +-- base/setup/usetup/fslist.h | 3 +-- base/setup/usetup/genlist.c | 3 +-- base/setup/usetup/genlist.h | 2 +- base/setup/usetup/inicache.c | 1 - base/setup/usetup/inicache.h | 1 - base/setup/usetup/partlist.c | 3 +-- base/setup/usetup/partlist.h | 2 +- base/setup/usetup/progress.h | 2 +- base/setup/usetup/registry.c | 2 +- base/setup/usetup/registry.h | 2 +- base/setup/usetup/settings.c | 3 +-- base/setup/usetup/settings.h | 2 +- base/setup/usetup/usetup.c | 3 +-- base/setup/usetup/usetup.h | 2 +- 38 files changed, 36 insertions(+), 55 deletions(-) diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index 16da7f5a56..b1f498a5ad 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Filesystem support functions - * COPYRIGHT: Copyright 2002-2018 Eric Kohl - * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Copyright 2017-2018 Hermes Belusca-Maito */ diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h index 6fbd864f83..46fe556d8f 100644 --- a/base/setup/lib/fsutil.h +++ b/base/setup/lib/fsutil.h @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Filesystem support functions - * COPYRIGHT: Copyright 2002-2018 Eric Kohl - * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Copyright 2017-2018 Hermes Belusca-Maito */ diff --git a/base/setup/lib/genlist.c b/base/setup/lib/genlist.c index dc09ac0a37..1795895a78 100644 --- a/base/setup/lib/genlist.c +++ b/base/setup/lib/genlist.c @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Generic list functions - * COPYRIGHT: Copyright 2004-2018 Eric Kohl - * Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> + * COPYRIGHT: Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/lib/genlist.h b/base/setup/lib/genlist.h index 9623d3aba1..56210891c1 100644 --- a/base/setup/lib/genlist.h +++ b/base/setup/lib/genlist.h @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Generic list functions - * COPYRIGHT: Copyright 2004-2018 Eric Kohl - * Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> + * COPYRIGHT: Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> */ #pragma once diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index 583544b96c..9861c241f8 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Partition list functions - * COPYRIGHT: Copyright 2002-2018 Eric Kohl - * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include "precomp.h" diff --git a/base/setup/lib/partlist.h b/base/setup/lib/partlist.h index 7a6cec9487..5d2b62535f 100644 --- a/base/setup/lib/partlist.h +++ b/base/setup/lib/partlist.h @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Partition list functions - * COPYRIGHT: Copyright 2002-2018 Eric Kohl - * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #pragma once diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index d117ae8144..5cda85e288 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -20,8 +20,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: base/setup/reactos/drivepage.c - * PROGRAMMERS: Eric Kohl - * Matthias Kupfer + * PROGRAMMERS: Matthias Kupfer * Dmitry Chapyshev (dmitry(a)reactos.org) */ diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 051071ad12..c7fcbee2fe 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -20,8 +20,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: base/setup/reactos/reactos.c - * PROGRAMMERS: Eric Kohl - * Matthias Kupfer + * PROGRAMMERS: Matthias Kupfer * Dmitry Chapyshev (dmitry(a)reactos.org) */ diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index bb507032c0..c7bcfdc89d 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -20,8 +20,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: base/setup/reactos/reactos.c - * PROGRAMMERS: Eric Kohl - * Matthias Kupfer + * PROGRAMMERS: Matthias Kupfer * Dmitry Chapyshev (dmitry(a)reactos.org) */ diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index cd5794025c..dd681f4787 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/bootsup.c * PURPOSE: Bootloader support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #include "usetup.h" diff --git a/base/setup/usetup/bootsup.h b/base/setup/usetup/bootsup.h index 0bdeb37bdd..33de23d7dc 100644 --- a/base/setup/usetup/bootsup.h +++ b/base/setup/usetup/bootsup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/bootsup.h * PURPOSE: Bootloader support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/cmdcons.c b/base/setup/usetup/cmdcons.c index 38a00d71e3..0307c11ca1 100644 --- a/base/setup/usetup/cmdcons.c +++ b/base/setup/usetup/cmdcons.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/cmdcons.c * PURPOSE: Recovery console - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #include "usetup.h" diff --git a/base/setup/usetup/cmdcons.h b/base/setup/usetup/cmdcons.h index dadf90f096..3db7538b4d 100644 --- a/base/setup/usetup/cmdcons.h +++ b/base/setup/usetup/cmdcons.h @@ -3,7 +3,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/cmdcons.h * PURPOSE: Recovery console - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ VOID diff --git a/base/setup/usetup/console.c b/base/setup/usetup/console.c index 858e83433e..1c35375dd6 100644 --- a/base/setup/usetup/console.c +++ b/base/setup/usetup/console.c @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/console.c * PURPOSE: Console support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ /* INCLUDES ******************************************************************/ diff --git a/base/setup/usetup/console.h b/base/setup/usetup/console.h index 8578afc11d..df8bcc8a26 100644 --- a/base/setup/usetup/console.h +++ b/base/setup/usetup/console.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/console.h * PURPOSE: Console support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index cec8c5ab5e..461cd7cbac 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/consup.c * PURPOSE: Console support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ /* INCLUDES ******************************************************************/ diff --git a/base/setup/usetup/consup.h b/base/setup/usetup/consup.h index 546e78864a..e00ebcd098 100644 --- a/base/setup/usetup/consup.h +++ b/base/setup/usetup/consup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/consup.h * PURPOSE: Console support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/drivesup.c b/base/setup/usetup/drivesup.c index a1f6e65761..c81b987fc1 100644 --- a/base/setup/usetup/drivesup.c +++ b/base/setup/usetup/drivesup.c @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/drivesup.c * PURPOSE: Drive support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/drivesup.h b/base/setup/usetup/drivesup.h index 2093a75ac9..5cd200d8fc 100644 --- a/base/setup/usetup/drivesup.h +++ b/base/setup/usetup/drivesup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/drivesup.h * PURPOSE: Drive support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/filequeue.c b/base/setup/usetup/filequeue.c index 65a271f435..e5d55908c3 100644 --- a/base/setup/usetup/filequeue.c +++ b/base/setup/usetup/filequeue.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filequeue.c * PURPOSE: File queue functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/filequeue.h b/base/setup/usetup/filequeue.h index 912e4a7ebb..ebc05e282b 100644 --- a/base/setup/usetup/filequeue.h +++ b/base/setup/usetup/filequeue.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filequeue.h * PURPOSE: File queue functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 49defff553..b7fdf692f1 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filesup.c * PURPOSE: File support functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/filesup.h b/base/setup/usetup/filesup.h index 317fad93be..87ab8354fe 100644 --- a/base/setup/usetup/filesup.h +++ b/base/setup/usetup/filesup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filesup.h * PURPOSE: File support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/fslist.c b/base/setup/usetup/fslist.c index d29d0df331..6aa8c4e193 100644 --- a/base/setup/usetup/fslist.c +++ b/base/setup/usetup/fslist.c @@ -21,8 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/fslist.c * PURPOSE: Filesystem list functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include "usetup.h" diff --git a/base/setup/usetup/fslist.h b/base/setup/usetup/fslist.h index 16388e2df2..d5f8b4c5ce 100644 --- a/base/setup/usetup/fslist.h +++ b/base/setup/usetup/fslist.h @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/fslist.h * PURPOSE: Filesystem list functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #pragma once diff --git a/base/setup/usetup/genlist.c b/base/setup/usetup/genlist.c index 991d6d0fa2..67f12edebe 100644 --- a/base/setup/usetup/genlist.c +++ b/base/setup/usetup/genlist.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/genlist.c * PURPOSE: Generic list functions - * PROGRAMMER: Eric Kohl - * Christoph von Wittich <christoph at reactos.org> + * PROGRAMMER: Christoph von Wittich <christoph at reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/genlist.h b/base/setup/usetup/genlist.h index ebe406960e..f6cdde32fd 100644 --- a/base/setup/usetup/genlist.h +++ b/base/setup/usetup/genlist.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/genlist.h * PURPOSE: Generic list functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/inicache.c b/base/setup/usetup/inicache.c index f509e59606..38dd44fefd 100644 --- a/base/setup/usetup/inicache.c +++ b/base/setup/usetup/inicache.c @@ -22,7 +22,6 @@ * FILE: base/setup/usetup/inicache.c * PURPOSE: INI file parser that caches contents of INI file in memory * PROGRAMMER: Royce Mitchell III - * Eric Kohl */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/inicache.h b/base/setup/usetup/inicache.h index 8e12103e28..33db2a38e9 100644 --- a/base/setup/usetup/inicache.h +++ b/base/setup/usetup/inicache.h @@ -22,7 +22,6 @@ * FILE: base/setup/usetup/inicache.h * PURPOSE: INI file parser that caches contents of INI file in memory * PROGRAMMER: Royce Mitchell III - * Eric Kohl */ #pragma once diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index ca8f13239f..6feb52b80f 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/partlist.c * PURPOSE: Partition list functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include "usetup.h" diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index b8caf457d4..ebb38167b9 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -20,7 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/partlist.h * PURPOSE: Partition list functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/progress.h b/base/setup/usetup/progress.h index 79c21959d7..4799225e33 100644 --- a/base/setup/usetup/progress.h +++ b/base/setup/usetup/progress.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/progress.h * PURPOSE: Partition list functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/registry.c b/base/setup/usetup/registry.c index 3ee3382678..d86705b3d5 100644 --- a/base/setup/usetup/registry.c +++ b/base/setup/usetup/registry.c @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/registry.c * PURPOSE: Registry creation functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/registry.h b/base/setup/usetup/registry.h index fc0f4f7edd..5064bb97f3 100644 --- a/base/setup/usetup/registry.h +++ b/base/setup/usetup/registry.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/registry.h * PURPOSE: Registry creation functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/settings.c b/base/setup/usetup/settings.c index 6de24b0ef4..a6dc2ed0fb 100644 --- a/base/setup/usetup/settings.c +++ b/base/setup/usetup/settings.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/settings.c * PURPOSE: Device settings support functions - * PROGRAMMERS: Eric Kohl - * Colin Finck + * PROGRAMMERS: Colin Finck */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/settings.h b/base/setup/usetup/settings.h index af1577e643..1fce8f7735 100644 --- a/base/setup/usetup/settings.h +++ b/base/setup/usetup/settings.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/settings.h * PURPOSE: Device settings support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 888c73fce0..bb12f96970 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -21,8 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/usetup.c * PURPOSE: Text-mode setup - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Herv� Poussineau (hpoussin(a)reactos.org) */ diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 5b74ec6f10..4b7d7de339 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/usetup.h * PURPOSE: Text-mode setup - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #ifndef _USETUP_PCH_

1 0

05/05: [USETUP] Improve the inicache module.
by Hermès Bélusca-Maïto 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8ea82d67b7bd65b63316… commit c8ea82d67b7bd65b633164d94e577c9dddd54bb6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:48:09 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 27 20:18:53 2018 +0200 [USETUP] Improve the inicache module. From the existing IniCacheLoad() function, introduce a IniCacheLoadFromMemory() function that just does the same (initialize an INI file cache and parse the INI file), but takes the input from a memory buffer. Then, rewrite the IniCacheLoad() function to just open the file given in input, and then fall back to calling IniCacheLoadFromMemory. The IniCacheLoadFromMemory() function will be used later. svn path=/branches/setup_improvements/; revision=74620 --- base/setup/usetup/inicache.c | 182 +++++++++++++++++++++++-------------------- base/setup/usetup/inicache.h | 7 ++ 2 files changed, 106 insertions(+), 83 deletions(-) diff --git a/base/setup/usetup/inicache.c b/base/setup/usetup/inicache.c index 16f3e2e4e0..f509e59606 100644 --- a/base/setup/usetup/inicache.c +++ b/base/setup/usetup/inicache.c @@ -467,21 +467,13 @@ IniCacheGetKeyValue( /* PUBLIC FUNCTIONS *********************************************************/ NTSTATUS -IniCacheLoad( +IniCacheLoadFromMemory( PINICACHE *Cache, - PWCHAR FileName, + PCHAR FileBuffer, + ULONG FileLength, BOOLEAN String) { - UNICODE_STRING Name; - OBJECT_ATTRIBUTES ObjectAttributes; - FILE_STANDARD_INFORMATION FileInfo; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE FileHandle; - NTSTATUS Status; - PCHAR FileBuffer; - ULONG FileLength; PCHAR Ptr; - LARGE_INTEGER FileOffset; PINICACHESECTION Section; PINICACHEKEY Key; @@ -495,6 +487,96 @@ IniCacheLoad( PCHAR KeyValue; ULONG KeyValueSize; + /* Allocate inicache header */ + *Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(INICACHE)); + if (*Cache == NULL) + { + DPRINT("RtlAllocateHeap() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Parse ini file */ + Section = NULL; + Ptr = FileBuffer; + while (Ptr != NULL && *Ptr != 0) + { + Ptr = IniCacheSkipWhitespace(Ptr); + if (Ptr == NULL) + continue; + + if (*Ptr == '[') + { + Section = NULL; + Ptr++; + + Ptr = IniCacheGetSectionName(Ptr, + &SectionName, + &SectionNameSize); + + DPRINT1("[%.*s]\n", SectionNameSize, SectionName); + + Section = IniCacheAddSection(*Cache, + SectionName, + SectionNameSize); + if (Section == NULL) + { + DPRINT("IniCacheAddSection() failed\n"); + Ptr = IniCacheSkipToNextSection(Ptr); + continue; + } + } + else + { + if (Section == NULL) + { + Ptr = IniCacheSkipToNextSection(Ptr); + continue; + } + + Ptr = IniCacheGetKeyName(Ptr, + &KeyName, + &KeyNameSize); + + Ptr = IniCacheGetKeyValue(Ptr, + &KeyValue, + &KeyValueSize, + String); + + DPRINT1("'%.*s' = '%.*s'\n", KeyNameSize, KeyName, KeyValueSize, KeyValue); + + Key = IniCacheAddKey(Section, + KeyName, + KeyNameSize, + KeyValue, + KeyValueSize); + if (Key == NULL) + { + DPRINT("IniCacheAddKey() failed\n"); + } + } + } + + return STATUS_SUCCESS; +} + +NTSTATUS +IniCacheLoad( + PINICACHE *Cache, + PWCHAR FileName, + BOOLEAN String) +{ + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_STANDARD_INFORMATION FileInfo; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + NTSTATUS Status; + PCHAR FileBuffer; + ULONG FileLength; + LARGE_INTEGER FileOffset; + *Cache = NULL; /* Open ini file */ @@ -568,84 +650,18 @@ IniCacheLoad( if (!NT_SUCCESS(Status)) { DPRINT("NtReadFile() failed (Status %lx)\n", Status); - RtlFreeHeap(ProcessHeap, 0, FileBuffer); - return Status; + goto Quit; } - /* Allocate inicache header */ - *Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(INICACHE)); - if (*Cache == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Parse ini file */ - Section = NULL; - Ptr = FileBuffer; - while (Ptr != NULL && *Ptr != 0) + Status = IniCacheLoadFromMemory(Cache, FileBuffer, FileLength, String); + if (!NT_SUCCESS(Status)) { - Ptr = IniCacheSkipWhitespace(Ptr); - if (Ptr == NULL) - continue; - - if (*Ptr == '[') - { - Section = NULL; - Ptr++; - - Ptr = IniCacheGetSectionName(Ptr, - &SectionName, - &SectionNameSize); - - DPRINT1("[%.*s]\n", SectionNameSize, SectionName); - - Section = IniCacheAddSection(*Cache, - SectionName, - SectionNameSize); - if (Section == NULL) - { - DPRINT("IniCacheAddSection() failed\n"); - Ptr = IniCacheSkipToNextSection(Ptr); - continue; - } - } - else - { - if (Section == NULL) - { - Ptr = IniCacheSkipToNextSection(Ptr); - continue; - } - - Ptr = IniCacheGetKeyName(Ptr, - &KeyName, - &KeyNameSize); - - Ptr = IniCacheGetKeyValue(Ptr, - &KeyValue, - &KeyValueSize, - String); - - DPRINT1("'%.*s' = '%.*s'\n", KeyNameSize, KeyName, KeyValueSize, KeyValue); - - Key = IniCacheAddKey(Section, - KeyName, - KeyNameSize, - KeyValue, - KeyValueSize); - if (Key == NULL) - { - DPRINT("IniCacheAddKey() failed\n"); - } - } + DPRINT1("IniCacheLoadFromMemory() failed (Status %lx)\n", Status); } - /* Free file buffer */ +Quit: + /* Free the file buffer, and return */ RtlFreeHeap(ProcessHeap, 0, FileBuffer); - return Status; } diff --git a/base/setup/usetup/inicache.h b/base/setup/usetup/inicache.h index 3a26332ab9..8e12103e28 100644 --- a/base/setup/usetup/inicache.h +++ b/base/setup/usetup/inicache.h @@ -73,6 +73,13 @@ typedef enum /* FUNCTIONS ****************************************************************/ +NTSTATUS +IniCacheLoadFromMemory( + PINICACHE *Cache, + PCHAR FileBuffer, + ULONG FileLength, + BOOLEAN String); + NTSTATUS IniCacheLoad( PINICACHE *Cache,

1 0

04/05: [USETUP] Improve the FileSup module.
by Hermès Bélusca-Maïto 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38e988ace7a68e1890bdd… commit 38e988ace7a68e1890bdd3625fe73a5341cc1bad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:45:43 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 27 20:18:53 2018 +0200 [USETUP] Improve the FileSup module. - Add a NtPathToDiskPartComponents() helper, that takes in input a fully qualified NT path to a file on hard disk, e.g.: \Device\Harddisk1\Partition2\foo\bar, and returns in output the disk number ('1'), the partition number ('2'), and the the path component "\foo\bar" that is after the device-harddisk-partition identifier. - Make the OpenAndMapFile() return the file size of the opened file. Both of these additions will be used soon. - Turn a isspace() call into a iswspace() one. svn path=/branches/setup_improvements/; revision=74619 --- base/setup/usetup/filesup.c | 141 +++++++++++++++++++++++++++++++++++++++++++- base/setup/usetup/filesup.h | 10 +++- 2 files changed, 148 insertions(+), 3 deletions(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 293e590b76..49defff553 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -501,7 +501,7 @@ IsValidPath( /* Path must not contain whitespace characters */ for (i = 0; i < Length; i++) { - if (isspace(InstallDir[i])) + if (iswspace(InstallDir[i])) return FALSE; } @@ -633,6 +633,117 @@ DoesFileExist( return NT_SUCCESS(Status); } +/* + * The format of NtPath should be: + * \Device\HarddiskXXX\PartitionYYY[\path] , + * where XXX and YYY respectively represent the hard disk and partition numbers, + * and [\path] represent an optional path (separated by '\\'). + * + * If a NT path of such a form is correctly parsed, the function returns respectively: + * - in pDiskNumber: the hard disk number XXX, + * - in pPartNumber: the partition number YYY, + * - in PathComponent: pointer value (inside NtPath) to the beginning of \path. + * + * NOTE: The function does not accept leading whitespace. + */ +BOOLEAN +NtPathToDiskPartComponents( + IN PCWSTR NtPath, + OUT PULONG pDiskNumber, + OUT PULONG pPartNumber, + OUT PCWSTR* PathComponent OPTIONAL) +{ + ULONG DiskNumber, PartNumber; + PCWSTR Path; + + *pDiskNumber = 0; + *pPartNumber = 0; + if (PathComponent) *PathComponent = NULL; + + Path = NtPath; + + if (_wcsnicmp(Path, L"\\Device\\Harddisk", 16) != 0) + { + /* The NT path doesn't start with the prefix string, thus it cannot be a hard disk device path */ + DPRINT1("'%S' : Not a possible hard disk device.\n", NtPath); + return FALSE; + } + + Path += 16; + + /* A number must be present now */ + if (!iswdigit(*Path)) + { + DPRINT1("'%S' : expected a number! Not a regular hard disk device.\n", Path); + return FALSE; + } + DiskNumber = wcstoul(Path, (PWSTR*)&Path, 10); + + /* Either NULL termination, or a path separator must be present now */ + if (!Path) + { + DPRINT1("An error happened!\n"); + return FALSE; + } + else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + { + DPRINT1("'%S' : expected a path separator!\n", Path); + return FALSE; + } + + if (!*Path) + { + DPRINT1("The path only specified a hard disk (and nothing else, like a partition...), so we stop there.\n"); + goto Quit; + } + + /* Here, *Path == L'\\' */ + + if (_wcsnicmp(Path, L"\\Partition", 10) != 0) + { + /* Actually, \Partition is optional so, if we don't have it, we still return success. Or should we? */ + DPRINT1("'%S' : unexpected format!\n", NtPath); + goto Quit; + } + + Path += 10; + + /* A number must be present now */ + if (!iswdigit(*Path)) + { + /* If we don't have a number it means this part of path is actually not a partition specifier, so we shouldn't fail either. Or should we? */ + DPRINT1("'%S' : expected a number!\n", Path); + goto Quit; + } + PartNumber = wcstoul(Path, (PWSTR*)&Path, 10); + + /* Either NULL termination, or a path separator must be present now */ + if (!Path) + { + /* We fail here because wcstoul failed for whatever reason */ + DPRINT1("An error happened!\n"); + return FALSE; + } + else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + { + /* We shouldn't fail here because it just means this part of path is actually not a partition specifier. Or should we? */ + DPRINT1("'%S' : expected a path separator!\n", Path); + goto Quit; + } + + /* OK, here we really have a partition specifier: return its number */ + *pPartNumber = PartNumber; + +Quit: + /* Return the disk number */ + *pDiskNumber = DiskNumber; + + /* Return the path component also, if the user wants it */ + if (PathComponent) *PathComponent = Path; + + return TRUE; +} + NTSTATUS OpenAndMapFile( IN HANDLE RootDirectory OPTIONAL, @@ -640,7 +751,8 @@ OpenAndMapFile( IN PCWSTR FileName, // OPTIONAL OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, - OUT PVOID* BaseAddress) + OUT PVOID* BaseAddress, + OUT PULONG FileSize OPTIONAL) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -681,6 +793,31 @@ OpenAndMapFile( return Status; } + if (FileSize) + { + /* Query the file size */ + FILE_STANDARD_INFORMATION FileInfo; + Status = NtQueryInformationFile(*FileHandle, + &IoStatusBlock, + &FileInfo, + sizeof(FileInfo), + FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); + NtClose(*FileHandle); + *FileHandle = NULL; + return Status; + } + + if (FileInfo.EndOfFile.HighPart != 0) + DPRINT1("WARNING!! The file %wZ is too large!\n", Name); + + *FileSize = FileInfo.EndOfFile.LowPart; + + DPRINT("File size: %lu\n", *FileSize); + } + /* Map the file in memory */ /* Create the section */ diff --git a/base/setup/usetup/filesup.h b/base/setup/usetup/filesup.h index 492dff0e87..317fad93be 100644 --- a/base/setup/usetup/filesup.h +++ b/base/setup/usetup/filesup.h @@ -63,6 +63,13 @@ DoesFileExist( IN PCWSTR PathName OPTIONAL, IN PCWSTR FileName); +BOOLEAN +NtPathToDiskPartComponents( + IN PCWSTR NtPath, + OUT PULONG pDiskNumber, + OUT PULONG pPartNumber, + OUT PCWSTR* PathComponent OPTIONAL); + NTSTATUS OpenAndMapFile( IN HANDLE RootDirectory OPTIONAL, @@ -70,7 +77,8 @@ OpenAndMapFile( IN PCWSTR FileName, // OPTIONAL OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, - OUT PVOID* BaseAddress); + OUT PVOID* BaseAddress, + OUT PULONG FileSize OPTIONAL); BOOLEAN UnMapFile(

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs