/*
* win32_capture.c - Windows-specific code for capturing files into a WIM image.
+ *
+ * This now uses the native Windows NT API a lot and not just Win32.
*/
/*
#include <errno.h>
-struct win32_capture_state {
+struct winnt_scan_stats {
unsigned long num_get_sd_access_denied;
unsigned long num_get_sacl_priv_notheld;
- unsigned long num_long_path_warnings;
};
+static inline const wchar_t *
+printable_path(const wchar_t *full_path)
+{
+ /* Skip over \\?\ or \??\ */
+ return full_path + 4;
+}
+
+/*
+ * If cur_dir is not NULL, open an existing file relative to the already-open
+ * directory cur_dir.
+ *
+ * Otherwise, open the file specified by @path, which must be a Windows NT
+ * namespace path.
+ */
static NTSTATUS
winnt_openat(HANDLE cur_dir, const wchar_t *path, size_t path_nchars,
ACCESS_MASK perms, HANDLE *h_ret)
retry:
status = (*func_NtOpenFile)(h_ret, perms, &attr, &iosb,
- FILE_SHARE_READ |
- FILE_SHARE_WRITE |
- FILE_SHARE_DELETE,
+ FILE_SHARE_VALID_FLAGS,
FILE_OPEN_REPARSE_POINT |
FILE_OPEN_FOR_BACKUP_INTENT |
- FILE_SYNCHRONOUS_IO_NONALERT);
+ FILE_SYNCHRONOUS_IO_NONALERT |
+ FILE_SEQUENTIAL_ONLY);
if (!NT_SUCCESS(status)) {
+ /* Try requesting fewer permissions */
if (status == STATUS_ACCESS_DENIED ||
status == STATUS_PRIVILEGE_NOT_HELD) {
if (perms & ACCESS_SYSTEM_SECURITY) {
return status;
}
+/* Read the first @size bytes from the file, or named data stream of a file,
+ * from which the stream entry @lte was created. */
int
-read_win32_file_prefix(const struct wim_lookup_table_entry *lte,
- u64 size,
- consume_data_callback_t cb,
- void *cb_ctx)
+read_winnt_file_prefix(const struct wim_lookup_table_entry *lte, u64 size,
+ consume_data_callback_t cb, void *cb_ctx)
{
const wchar_t *path;
HANDLE h;
u64 bytes_remaining;
int ret;
+ /* This is an NT namespace path. */
path = lte->file_on_disk;
+
status = winnt_openat(NULL, path, wcslen(path),
FILE_READ_DATA | SYNCHRONIZE, &h);
if (!NT_SUCCESS(status)) {
set_errno_from_nt_status(status);
- ERROR_WITH_ERRNO("\"%ls\": Can't open for reading", path);
+ ERROR_WITH_ERRNO("\"%ls\": Can't open for reading "
+ "(status=0x%08"PRIx32")",
+ printable_path(path), (u32)status);
return WIMLIB_ERR_OPEN;
}
while (bytes_remaining) {
IO_STATUS_BLOCK iosb;
ULONG count;
+ ULONG bytes_read;
count = min(sizeof(buf), bytes_remaining);
status = (*func_NtReadFile)(h, NULL, NULL, NULL,
&iosb, buf, count, NULL, NULL);
- if (!NT_SUCCESS(status) || iosb.Information != count) {
+ if (!NT_SUCCESS(status)) {
set_errno_from_nt_status(status);
- ERROR_WITH_ERRNO("\"%ls\": Error reading data", path);
+ ERROR_WITH_ERRNO("\"%ls\": Error reading data "
+ "(status=0x%08"PRIx32")",
+ printable_path(path), (u32)status);
ret = WIMLIB_ERR_READ;
break;
}
- bytes_remaining -= count;
- ret = (*cb)(buf, count, cb_ctx);
+ bytes_read = iosb.Information;
+
+ bytes_remaining -= bytes_read;
+ ret = (*cb)(buf, bytes_read, cb_ctx);
if (ret)
break;
}
int
read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte,
u64 size,
- consume_data_callback_t cb,
- void *cb_ctx)
+ consume_data_callback_t cb, void *cb_ctx)
{
struct win32_encrypted_read_ctx export_ctx;
DWORD err;
void *file_ctx;
int ret;
- DEBUG("Reading %"PRIu64" bytes from encrypted file \"%ls\"",
- size, lte->file_on_disk);
-
export_ctx.read_prefix_cb = cb;
export_ctx.read_prefix_ctx = cb_ctx;
export_ctx.wimlib_err_code = 0;
if (err != ERROR_SUCCESS) {
set_errno_from_win32_error(err);
ERROR_WITH_ERRNO("Failed to open encrypted file \"%ls\" "
- "for raw read", lte->file_on_disk);
+ "for raw read",
+ printable_path(lte->file_on_disk));
return WIMLIB_ERR_OPEN;
}
err = ReadEncryptedFileRaw(win32_encrypted_export_cb,
if (err != ERROR_SUCCESS) {
set_errno_from_win32_error(err);
ERROR_WITH_ERRNO("Failed to read encrypted file \"%ls\"",
- lte->file_on_disk);
+ printable_path(lte->file_on_disk));
ret = export_ctx.wimlib_err_code;
if (ret == 0)
ret = WIMLIB_ERR_READ;
ERROR("Only could read %"PRIu64" of %"PRIu64" bytes from "
"encryted file \"%ls\"",
size - export_ctx.bytes_remaining, size,
- lte->file_on_disk);
+ printable_path(lte->file_on_disk));
ret = WIMLIB_ERR_READ;
} else {
ret = 0;
return ret;
}
-
-static u64
-FILETIME_to_u64(const FILETIME *ft)
-{
- return ((u64)ft->dwHighDateTime << 32) | (u64)ft->dwLowDateTime;
-}
-
-/* Load the short name of a file into a WIM dentry.
- *
- * If we can't read the short filename for some reason, we just ignore the error
- * and assume the file has no short name. This shouldn't be an issue, since the
- * short names are essentially obsolete anyway.
+/*
+ * Load the short name of a file into a WIM dentry.
*/
-static int
-win32_get_short_name(HANDLE hFile, struct wim_dentry *dentry)
+static NTSTATUS
+winnt_get_short_name(HANDLE h, struct wim_dentry *dentry)
{
-
/* It's not any harder to just make the NtQueryInformationFile() system
* call ourselves, and it saves a dumb call to FindFirstFile() which of
* course has to create its own handle. */
NTSTATUS status;
- IO_STATUS_BLOCK io_status;
+ IO_STATUS_BLOCK iosb;
u8 buf[128] _aligned_attribute(8);
const FILE_NAME_INFORMATION *info;
- status = (*func_NtQueryInformationFile)(hFile, &io_status, buf, sizeof(buf),
+ status = (*func_NtQueryInformationFile)(h, &iosb, buf, sizeof(buf),
FileAlternateNameInformation);
- info = (const FILE_NAME_INFORMATION*)buf;
+ info = (const FILE_NAME_INFORMATION *)buf;
if (NT_SUCCESS(status) && info->FileNameLength != 0) {
dentry->short_name = utf16le_dupz(info->FileName,
info->FileNameLength);
if (!dentry->short_name)
- return WIMLIB_ERR_NOMEM;
+ return STATUS_NO_MEMORY;
dentry->short_name_nbytes = info->FileNameLength;
}
- return 0;
+ return status;
}
-static int
-win32_get_security_descriptor(HANDLE h,
- struct wim_inode *inode,
+/*
+ * Load the security descriptor of a file into the corresponding inode, and the
+ * WIM image's security descriptor set.
+ */
+static NTSTATUS
+winnt_get_security_descriptor(HANDLE h, struct wim_inode *inode,
struct wim_sd_set *sd_set,
- struct win32_capture_state *state,
- int add_flags)
+ struct winnt_scan_stats *stats, int add_flags)
{
SECURITY_INFORMATION requestedInformation;
- u8 _buf[4096];
+ u8 _buf[4096] _aligned_attribute(8);
u8 *buf;
- size_t bufsize;
- DWORD lenNeeded;
+ ULONG bufsize;
+ ULONG len_needed;
NTSTATUS status;
- int ret;
requestedInformation = DACL_SECURITY_INFORMATION |
SACL_SECURITY_INFORMATION |
bufsize = sizeof(_buf);
/*
- * We need the file's security descriptor in SECURITY_DESCRIPTOR_RELATIVE
- * format, and we currently have a handle opened with as many relevant
- * permissions as possible. At this point, on Windows there are a number of
- * options for reading a file's security descriptor:
+ * We need the file's security descriptor in
+ * SECURITY_DESCRIPTOR_RELATIVE format, and we currently have a handle
+ * opened with as many relevant permissions as possible. At this point,
+ * on Windows there are a number of options for reading a file's
+ * security descriptor:
*
* GetFileSecurity(): This takes in a path and returns the
- * SECURITY_DESCRIPTOR_RELATIVE. Problem: this uses an internal handle, not
- * ours, and the handle created internally doesn't specify
- * FILE_FLAG_BACKUP_SEMANTICS. Therefore there can be access denied errors on
- * some files and directories, even when running as the Administrator.
+ * SECURITY_DESCRIPTOR_RELATIVE. Problem: this uses an internal handle,
+ * not ours, and the handle created internally doesn't specify
+ * FILE_FLAG_BACKUP_SEMANTICS. Therefore there can be access denied
+ * errors on some files and directories, even when running as the
+ * Administrator.
*
* GetSecurityInfo(): This takes in a handle and returns the security
- * descriptor split into a bunch of different parts. This should work, but it's
- * dumb because we have to put the security descriptor back together again.
+ * descriptor split into a bunch of different parts. This should work,
+ * but it's dumb because we have to put the security descriptor back
+ * together again.
*
* BackupRead(): This can read the security descriptor, but this is a
- * difficult-to-use API, probably only works as the Administrator, and the
- * format of the returned data is not well documented.
+ * difficult-to-use API, probably only works as the Administrator, and
+ * the format of the returned data is not well documented.
*
- * NtQuerySecurityObject(): This is exactly what we need, as it takes in a
- * handle and returns the security descriptor in SECURITY_DESCRIPTOR_RELATIVE
- * format. Only problem is that it's a ntdll function and therefore not
- * officially part of the Win32 API. Oh well.
+ * NtQuerySecurityObject(): This is exactly what we need, as it takes
+ * in a handle and returns the security descriptor in
+ * SECURITY_DESCRIPTOR_RELATIVE format. Only problem is that it's a
+ * ntdll function and therefore not officially part of the Win32 API.
+ * Oh well.
*/
while (!(NT_SUCCESS(status = (*func_NtQuerySecurityObject)(h,
requestedInformation,
(PSECURITY_DESCRIPTOR)buf,
bufsize,
- &lenNeeded))))
+ &len_needed))))
{
switch (status) {
- case STATUS_BUFFER_OVERFLOW:
+ case STATUS_BUFFER_TOO_SMALL:
wimlib_assert(buf == _buf);
- buf = MALLOC(lenNeeded);
+ buf = MALLOC(len_needed);
if (!buf)
- return WIMLIB_ERR_NOMEM;
- bufsize = lenNeeded;
+ return STATUS_NO_MEMORY;
+ bufsize = len_needed;
break;
case STATUS_PRIVILEGE_NOT_HELD:
case STATUS_ACCESS_DENIED:
if (add_flags & WIMLIB_ADD_FLAG_STRICT_ACLS) {
default:
- set_errno_from_nt_status(status);
- ret = WIMLIB_ERR_READ;
+ /* Permission denied in STRICT_ACLS mode, or
+ * unknown error. */
goto out_free_buf;
}
if (requestedInformation & SACL_SECURITY_INFORMATION) {
- state->num_get_sacl_priv_notheld++;
+ /* Try again without the SACL. */
+ stats->num_get_sacl_priv_notheld++;
requestedInformation &= ~SACL_SECURITY_INFORMATION;
break;
}
- state->num_get_sd_access_denied++;
- ret = 0;
+ /* Fake success (useful when capturing as
+ * non-Administrator). */
+ stats->num_get_sd_access_denied++;
+ status = STATUS_SUCCESS;
goto out_free_buf;
}
}
- inode->i_security_id = sd_set_add_sd(sd_set, buf, lenNeeded);
- if (inode->i_security_id < 0)
- ret = WIMLIB_ERR_NOMEM;
- else
- ret = 0;
+ /* Add the security descriptor to the WIM image, and save its ID in
+ * file's inode. */
+ inode->i_security_id = sd_set_add_sd(sd_set, buf, len_needed);
+ if (unlikely(inode->i_security_id < 0))
+ status = STATUS_NO_MEMORY;
out_free_buf:
- if (buf != _buf)
+ if (unlikely(buf != _buf))
FREE(buf);
- return ret;
+ return status;
}
static int
-win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
+winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
HANDLE cur_dir,
wchar_t *full_path,
size_t full_path_nchars,
const wchar_t *filename,
size_t filename_nchars,
struct add_image_params *params,
- struct win32_capture_state *state,
- unsigned vol_flags);
+ struct winnt_scan_stats *stats,
+ u32 vol_flags);
-/* Reads the directory entries of directory and recursively calls
- * win32_build_dentry_tree() on them. */
static int
-win32_recurse_directory(HANDLE h,
+winnt_recurse_directory(HANDLE h,
wchar_t *full_path,
size_t full_path_nchars,
- struct wim_dentry *root,
+ struct wim_dentry *parent,
struct add_image_params *params,
- struct win32_capture_state *state,
- unsigned vol_flags)
+ struct winnt_scan_stats *stats,
+ u32 vol_flags)
{
- int ret;
-
- /* Using NtQueryDirectoryFile() we can re-use the same open handle,
- * which we opened with FILE_FLAG_BACKUP_SEMANTICS. */
-
- NTSTATUS status;
- IO_STATUS_BLOCK io_status;
- const size_t bufsize = 8192;
void *buf;
+ const size_t bufsize = 8192;
+ IO_STATUS_BLOCK iosb;
+ NTSTATUS status;
+ int ret;
buf = MALLOC(bufsize);
if (!buf)
return WIMLIB_ERR_NOMEM;
+ /* Using NtQueryDirectoryFile() we can re-use the same open handle,
+ * which we opened with FILE_FLAG_BACKUP_SEMANTICS. */
+
while (NT_SUCCESS(status = (*func_NtQueryDirectoryFile)(h, NULL, NULL, NULL,
- &io_status, buf, bufsize,
+ &iosb, buf, bufsize,
FileNamesInformation,
FALSE, NULL, FALSE)))
{
info->FileName[1] == L'.'))
{
wchar_t *p;
+ wchar_t *filename;
struct wim_dentry *child;
p = full_path + full_path_nchars;
- *p++ = L'\\';
- p = wmempcpy(p, info->FileName,
+ /* Only add a backslash if we don't already have
+ * one. This prevents a duplicate backslash
+ * from being added when the path to the capture
+ * dir had a trailing backslash. */
+ if (*(p - 1) != L'\\')
+ *p++ = L'\\';
+ filename = p;
+ p = wmempcpy(filename, info->FileName,
info->FileNameLength / 2);
*p = '\0';
- ret = win32_build_dentry_tree_recursive(
- &child,
- h,
- full_path,
- p - full_path,
- full_path + full_path_nchars + 1,
- info->FileNameLength / 2,
- params,
- state,
- vol_flags);
+ ret = winnt_build_dentry_tree_recursive(
+ &child,
+ h,
+ full_path,
+ p - full_path,
+ filename,
+ info->FileNameLength / 2,
+ params,
+ stats,
+ vol_flags);
full_path[full_path_nchars] = L'\0';
if (ret)
goto out_free_buf;
if (child)
- dentry_add_child(root, child);
+ dentry_add_child(parent, child);
}
if (info->NextEntryOffset == 0)
break;
}
}
- if (status != STATUS_NO_MORE_FILES) {
+ if (unlikely(status != STATUS_NO_MORE_FILES)) {
set_errno_from_nt_status(status);
- ERROR_WITH_ERRNO("\"%ls\": Can't read directory", full_path);
+ ERROR_WITH_ERRNO("\"%ls\": Can't read directory "
+ "(status=0x%08"PRIx32")",
+ printable_path(full_path), (u32)status);
ret = WIMLIB_ERR_READ;
}
out_free_buf:
return ret;
}
-/* Reparse point fixup status code */
+/* Reparse point fixup status code */
enum rp_status {
- /* Reparse point corresponded to an absolute symbolic link or junction
- * point that pointed outside the directory tree being captured, and
- * therefore was excluded. */
- RP_EXCLUDED = 0x0,
-
- /* Reparse point was not fixed as it was either a relative symbolic
- * link, a mount point, or something else we could not understand. */
- RP_NOT_FIXED = 0x1,
-
- /* Reparse point corresponded to an absolute symbolic link or junction
- * point that pointed inside the directory tree being captured, where
- * the target was specified by a "full" \??\ prefixed path, and
- * therefore was fixed to be relative to the root of the directory tree
- * being captured. */
- RP_FIXED_FULLPATH = 0x2,
-
- /* Same as RP_FIXED_FULLPATH, except the absolute link target did not
- * have the \??\ prefix. It may have begun with a drive letter though.
- * */
- RP_FIXED_ABSPATH = 0x4,
-
- /* Either RP_FIXED_FULLPATH or RP_FIXED_ABSPATH. */
- RP_FIXED = RP_FIXED_FULLPATH | RP_FIXED_ABSPATH,
+ /* Reparse point will be captured literally (no fixup) */
+ RP_NOT_FIXED = -1,
+
+ /* Reparse point will be captured with fixup */
+ RP_FIXED = -2,
};
-/* Given the "substitute name" target of a Windows reparse point, try doing a
- * fixup where we change it to be absolute relative to the root of the directory
- * tree being captured.
+static bool
+file_has_ino_and_dev(HANDLE h, u64 ino, u64 dev)
+{
+ NTSTATUS status;
+ IO_STATUS_BLOCK iosb;
+ FILE_INTERNAL_INFORMATION int_info;
+ FILE_FS_VOLUME_INFORMATION vol_info;
+
+ status = (*func_NtQueryInformationFile)(h, &iosb,
+ &int_info, sizeof(int_info),
+ FileInternalInformation);
+ if (!NT_SUCCESS(status))
+ return false;
+
+ if (int_info.IndexNumber.QuadPart != ino)
+ return false;
+
+ status = (*func_NtQueryVolumeInformationFile)(h, &iosb,
+ &vol_info, sizeof(vol_info),
+ FileFsVolumeInformation);
+ if (!(NT_SUCCESS(status) || status == STATUS_BUFFER_OVERFLOW))
+ return false;
+
+ if (iosb.Information <
+ offsetof(FILE_FS_VOLUME_INFORMATION, VolumeSerialNumber) +
+ sizeof(vol_info.VolumeSerialNumber))
+ return false;
+
+ return (vol_info.VolumeSerialNumber == dev);
+}
+
+/*
+ * Given an (expected) NT namespace symbolic link or junction target @target of
+ * length @target_nbytes, determine if a prefix of the target points to a file
+ * identified by @capture_root_ino and @capture_root_dev.
*
- * Note that this is only executed when WIMLIB_ADD_FLAG_RPFIX has been
- * set.
+ * If yes, return a pointer to the portion of the link following this prefix.
*
- * @capture_root_ino and @capture_root_dev indicate the inode number and device
- * of the root of the directory tree being captured. They are meant to identify
- * this directory (as an alternative to its actual path, which could potentially
- * be reached via multiple destinations due to other symbolic links). This may
- * not work properly on FAT, which doesn't seem to supply proper inode numbers
- * or file IDs. However, FAT doesn't support reparse points so this function
- * wouldn't even be called anyway.
+ * If no, return NULL.
+ *
+ * If the link target does not appear to be a valid NT namespace path, return
+ * @target itself.
*/
-static enum rp_status
-win32_capture_maybe_rpfix_target(wchar_t *target, u16 *target_nbytes_p,
- u64 capture_root_ino, u64 capture_root_dev,
- u32 rptag)
+static const wchar_t *
+winnt_get_root_relative_target(const wchar_t *target, size_t target_nbytes,
+ u64 capture_root_ino, u64 capture_root_dev)
{
- u16 target_nchars = *target_nbytes_p / 2;
- size_t stripped_chars;
- wchar_t *orig_target;
- int ret;
+ UNICODE_STRING name;
+ OBJECT_ATTRIBUTES attr;
+ IO_STATUS_BLOCK iosb;
+ NTSTATUS status;
+ const wchar_t *target_end;
+ const wchar_t *p;
- ret = parse_substitute_name(target, *target_nbytes_p, rptag);
- if (ret < 0)
- return RP_NOT_FIXED;
- stripped_chars = ret;
- if (stripped_chars)
- stripped_chars -= 2;
- target[target_nchars] = L'\0';
- orig_target = target;
- target = capture_fixup_absolute_symlink(target + stripped_chars,
- capture_root_ino, capture_root_dev);
- if (!target)
- return RP_EXCLUDED;
- target_nchars = wcslen(target);
- wmemmove(orig_target + stripped_chars, target, target_nchars + 1);
- *target_nbytes_p = (target_nchars + stripped_chars) * sizeof(wchar_t);
- DEBUG("Fixed reparse point (new target: \"%ls\")", orig_target);
- if (stripped_chars)
- return RP_FIXED_FULLPATH;
- else
- return RP_FIXED_ABSPATH;
+ target_end = target + (target_nbytes / sizeof(wchar_t));
+
+ /* Empty path??? */
+ if (target_end == target)
+ return target;
+
+ /* No leading slash??? */
+ if (target[0] != L'\\')
+ return target;
+
+ /* UNC path??? */
+ if ((target_end - target) >= 2 &&
+ target[0] == L'\\' && target[1] == L'\\')
+ return target;
+
+ attr.Length = sizeof(attr);
+ attr.RootDirectory = NULL;
+ attr.ObjectName = &name;
+ attr.Attributes = 0;
+ attr.SecurityDescriptor = NULL;
+ attr.SecurityQualityOfService = NULL;
+
+ name.Buffer = (wchar_t *)target;
+ name.Length = 0;
+ p = target;
+ do {
+ HANDLE h;
+ const wchar_t *orig_p = p;
+
+ /* Skip non-backslashes */
+ while (p != target_end && *p != L'\\')
+ p++;
+
+ /* Skip backslashes */
+ while (p != target_end && *p == L'\\')
+ p++;
+
+ /* Append path component */
+ name.Length += (p - orig_p) * sizeof(wchar_t);
+ name.MaximumLength = name.Length;
+
+ /* Try opening the file */
+ status = (*func_NtOpenFile) (&h,
+ FILE_READ_ATTRIBUTES | FILE_TRAVERSE,
+ &attr,
+ &iosb,
+ FILE_SHARE_VALID_FLAGS,
+ FILE_OPEN_FOR_BACKUP_INTENT);
+
+ if (NT_SUCCESS(status)) {
+ /* Reset root directory */
+ if (attr.RootDirectory)
+ (*func_NtClose)(attr.RootDirectory);
+ attr.RootDirectory = h;
+ name.Buffer = (wchar_t *)p;
+ name.Length = 0;
+
+ if (file_has_ino_and_dev(h, capture_root_ino,
+ capture_root_dev))
+ goto out_close_root_dir;
+ }
+ } while (p != target_end);
+
+ p = NULL;
+
+out_close_root_dir:
+ if (attr.RootDirectory)
+ (*func_NtClose)(attr.RootDirectory);
+ return p;
}
-/* Returns: `enum rp_status' value on success; negative WIMLIB_ERR_* value on
- * failure. */
static int
-win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
- u64 capture_root_ino, u64 capture_root_dev,
- const wchar_t *path, struct add_image_params *params)
+winnt_rpfix_progress(struct add_image_params *params, const wchar_t *path,
+ const struct reparse_data *rpdata,
+ enum wimlib_progress_msg msg)
+{
+ size_t print_name_nchars = rpdata->print_name_nbytes / sizeof(wchar_t);
+ wchar_t print_name0[print_name_nchars + 1];
+
+ wmemcpy(print_name0, rpdata->print_name, print_name_nchars);
+ print_name0[print_name_nchars] = L'\0';
+
+ params->progress.scan.cur_path = printable_path(path);
+ params->progress.scan.symlink_target = print_name0;
+ return do_capture_progress(params, msg, NULL);
+}
+
+static int
+winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
+ u64 capture_root_ino, u64 capture_root_dev,
+ const wchar_t *path, struct add_image_params *params)
{
struct reparse_data rpdata;
+ const wchar_t *rel_target;
int ret;
- enum rp_status rp_status;
- ret = parse_reparse_data(rpbuf, *rpbuflen_p, &rpdata);
- if (ret)
- return -ret;
-
- rp_status = win32_capture_maybe_rpfix_target(rpdata.substitute_name,
- &rpdata.substitute_name_nbytes,
- capture_root_ino,
- capture_root_dev,
- le32_to_cpu(*(le32*)rpbuf));
- if (rp_status & RP_FIXED) {
- wimlib_assert(rpdata.substitute_name_nbytes % 2 == 0);
- utf16lechar substitute_name_copy[rpdata.substitute_name_nbytes / 2];
- wmemcpy(substitute_name_copy, rpdata.substitute_name,
- rpdata.substitute_name_nbytes / 2);
- rpdata.substitute_name = substitute_name_copy;
- rpdata.print_name = substitute_name_copy;
- rpdata.print_name_nbytes = rpdata.substitute_name_nbytes;
- if (rp_status == RP_FIXED_FULLPATH) {
- /* "full path", meaning \??\ prefixed. We should not
- * include this prefix in the print name, as it is
- * apparently meant for the filesystem driver only. */
- rpdata.print_name += 4;
- rpdata.print_name_nbytes -= 8;
- }
- ret = make_reparse_buffer(&rpdata, rpbuf, rpbuflen_p);
- if (ret == 0)
- ret = rp_status;
- else
- ret = -ret;
- } else {
- if (rp_status == RP_EXCLUDED) {
- /* Ignoring absolute symbolic link or junction point
- * that points out of the tree to be captured. */
- size_t print_name_nchars = rpdata.print_name_nbytes / 2;
- wchar_t print_name0[print_name_nchars + 1];
- print_name0[print_name_nchars] = L'\0';
- wmemcpy(print_name0, rpdata.print_name, print_name_nchars);
-
- params->progress.scan.cur_path = path;
- params->progress.scan.symlink_target = print_name0;
- do_capture_progress(params,
- WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK,
- NULL);
- }
- ret = rp_status;
+ if (parse_reparse_data(rpbuf, *rpbuflen_p, &rpdata)) {
+ /* Couldn't even understand the reparse data. Don't try the
+ * fixup. */
+ return RP_NOT_FIXED;
}
- return ret;
+
+ /*
+ * Don't do reparse point fixups on relative symbolic links.
+ *
+ * On Windows, a relative symbolic link is supposed to be identifiable
+ * by having reparse tag WIM_IO_REPARSE_TAG_SYMLINK and flags
+ * SYMBOLIC_LINK_RELATIVE. We will use this information, although this
+ * may not always do what the user expects, since drive-relative
+ * symbolic links such as "\Users\Public" have SYMBOLIC_LINK_RELATIVE
+ * set, in addition to truely relative symbolic links such as "Users" or
+ * "Users\Public". However, WIMGAPI (as of Windows 8.1) has this same
+ * behavior.
+ *
+ * Otherwise, as far as I can tell, the targets of symbolic links that
+ * are NOT relative, as well as junctions (note: a mountpoint is the
+ * sames thing as a junction), must be NT namespace paths, for example:
+ *
+ * - \??\e:\Users\Public
+ * - \DosDevices\e:\Users\Public
+ * - \Device\HardDiskVolume4\Users\Public
+ * - \??\Volume{c47cb07c-946e-4155-b8f7-052e9cec7628}\Users\Public
+ * - \DosDevices\Volume{c47cb07c-946e-4155-b8f7-052e9cec7628}\Users\Public
+ */
+ if (rpdata.rptag == WIM_IO_REPARSE_TAG_SYMLINK &&
+ (rpdata.rpflags & SYMBOLIC_LINK_RELATIVE))
+ return RP_NOT_FIXED;
+
+ rel_target = winnt_get_root_relative_target(rpdata.substitute_name,
+ rpdata.substitute_name_nbytes,
+ capture_root_ino,
+ capture_root_dev);
+ if (!rel_target) {
+ /* Target points outside of the tree being captured. Don't
+ * adjust it. */
+ ret = winnt_rpfix_progress(params, path, &rpdata,
+ WIMLIB_SCAN_DENTRY_NOT_FIXED_SYMLINK);
+ if (ret)
+ return ret;
+ return RP_NOT_FIXED;
+ }
+
+ if (rel_target == rpdata.substitute_name) {
+ /* Weird target --- keep the reparse point and don't mess with
+ * it. */
+ return RP_NOT_FIXED;
+ }
+
+ /* We have an absolute target pointing within the directory being
+ * captured, @rel_target is the suffix of the link target that is the
+ * part relative to the directory being captured.
+ *
+ * We will cut off the prefix before this part (which is the path to the
+ * directory being captured) and add a dummy prefix. Since the process
+ * will need to be reversed when applying the image, it shouldn't matter
+ * what exactly the prefix is, as long as it looks like an absolute
+ * path.
+ */
+
+ {
+ size_t rel_target_nbytes =
+ rpdata.substitute_name_nbytes - ((const u8 *)rel_target -
+ (const u8 *)rpdata.substitute_name);
+ size_t rel_target_nchars = rel_target_nbytes / sizeof(wchar_t);
+
+ wchar_t tmp[rel_target_nchars + 7];
+
+ wmemcpy(tmp, L"\\??\\X:\\", 7);
+ wmemcpy(tmp + 7, rel_target, rel_target_nchars);
+
+ rpdata.substitute_name = tmp;
+ rpdata.substitute_name_nbytes = rel_target_nbytes + (7 * sizeof(wchar_t));
+ rpdata.print_name = tmp + 4;
+ rpdata.print_name_nbytes = rel_target_nbytes + (3 * sizeof(wchar_t));
+
+ if (make_reparse_buffer(&rpdata, rpbuf, rpbuflen_p))
+ return RP_NOT_FIXED;
+ }
+ ret = winnt_rpfix_progress(params, path, &rpdata,
+ WIMLIB_SCAN_DENTRY_FIXED_SYMLINK);
+ if (ret)
+ return ret;
+ return RP_FIXED;
}
/*
* fixing the targets of absolute symbolic links and junction points to be
* relative to the root of capture.
*
- * @h: Open handle to the reparse point.
- * @path: Path to the reparse point file.
- * @params: Additional parameters, including whether to do reparse point fixups
- * or not.
- * @rpbuf: Buffer of length at least REPARSE_POINT_MAX_SIZE bytes into which
- * the reparse point buffer will be loaded.
- * @rpbuflen_ret: On success, the length of the reparse point buffer in bytes
- * is written to this location.
- *
- * Returns:
- * On success, returns an `enum rp_status' value that indicates if and/or
- * how the reparse point fixup was done.
+ * @h:
+ * Open handle to the reparse point file.
+ * @path:
+ * Path to the reparse point file.
+ * @params:
+ * Capture parameters. add_flags, capture_root_ino, capture_root_dev,
+ * progfunc, progctx, and progress are used.
+ * @rpbuf:
+ * Buffer of length at least REPARSE_POINT_MAX_SIZE bytes into which the
+ * reparse point buffer will be loaded.
+ * @rpbuflen_ret:
+ * On success, the length of the reparse point buffer in bytes is written
+ * to this location.
*
- * On failure, returns a negative value that is a negated WIMLIB_ERR_*
- * code.
+ * On success, returns a negative `enum rp_status' value.
+ * On failure, returns a positive error code.
*/
static int
-win32_get_reparse_data(HANDLE h, const wchar_t *path,
+winnt_get_reparse_data(HANDLE h, const wchar_t *path,
struct add_image_params *params,
u8 *rpbuf, u16 *rpbuflen_ret)
{
- DWORD bytesReturned;
+ DWORD bytes_returned;
u32 reparse_tag;
int ret;
u16 rpbuflen;
if (!DeviceIoControl(h, FSCTL_GET_REPARSE_POINT,
- NULL, /* "Not used with this operation; set to NULL" */
- 0, /* "Not used with this operation; set to 0" */
- rpbuf, /* "A pointer to a buffer that
- receives the reparse point data */
- REPARSE_POINT_MAX_SIZE, /* "The size of the output
- buffer, in bytes */
- &bytesReturned,
- NULL))
+ NULL, 0, rpbuf, REPARSE_POINT_MAX_SIZE,
+ &bytes_returned, NULL))
{
set_errno_from_GetLastError();
- return -WIMLIB_ERR_READ;
+ return WIMLIB_ERR_READ;
}
- if (bytesReturned < 8 || bytesReturned > REPARSE_POINT_MAX_SIZE) {
+ if (unlikely(bytes_returned < 8)) {
errno = EINVAL;
- return -WIMLIB_ERR_INVALID_REPARSE_DATA;
+ return WIMLIB_ERR_INVALID_REPARSE_DATA;
}
- rpbuflen = bytesReturned;
+ rpbuflen = bytes_returned;
reparse_tag = le32_to_cpu(*(le32*)rpbuf);
+ ret = RP_NOT_FIXED;
if (params->add_flags & WIMLIB_ADD_FLAG_RPFIX &&
(reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK ||
reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT))
{
- /* Try doing reparse point fixup */
- ret = win32_capture_try_rpfix(rpbuf,
- &rpbuflen,
- params->capture_root_ino,
- params->capture_root_dev,
- path,
- params);
- } else {
- ret = RP_NOT_FIXED;
+ ret = winnt_try_rpfix(rpbuf, &rpbuflen,
+ params->capture_root_ino,
+ params->capture_root_dev,
+ path, params);
}
*rpbuflen_ret = rpbuflen;
return ret;
if (err != ERROR_SUCCESS) {
set_errno_from_win32_error(err);
ERROR_WITH_ERRNO("Failed to open encrypted file \"%ls\" "
- "for raw read", path);
+ "for raw read", printable_path(path));
return WIMLIB_ERR_OPEN;
}
*size_ret = 0;
if (err != ERROR_SUCCESS) {
set_errno_from_win32_error(err);
ERROR_WITH_ERRNO("Failed to read raw encrypted data from "
- "\"%ls\"", path);
+ "\"%ls\"", printable_path(path));
ret = WIMLIB_ERR_READ;
} else {
ret = 0;
}
static int
-win32_capture_stream(const wchar_t *path, size_t path_nchars,
- const wchar_t *raw_stream_name, size_t raw_stream_name_nchars,
- u64 stream_size,
- struct wim_inode *inode,
- struct list_head *unhashed_streams)
+winnt_scan_stream(const wchar_t *path, size_t path_nchars,
+ const wchar_t *raw_stream_name, size_t raw_stream_name_nchars,
+ u64 stream_size,
+ struct wim_inode *inode, struct list_head *unhashed_streams)
{
const wchar_t *stream_name;
size_t stream_name_nchars;
u32 stream_id;
/* Given the raw stream name (which is something like
- * L":streamname:$DATA", extract just the stream name part. */
+ * :streamname:$DATA), extract just the stream name part.
+ * Ignore any non-$DATA streams. */
if (!get_data_stream_name(raw_stream_name, raw_stream_name_nchars,
&stream_name, &stream_name_nchars))
return 0;
- /* If this is a named stream, allocate an ADS entry. */
+ /* If this is a named stream, allocate an ADS entry for it. */
if (stream_name_nchars) {
ads_entry = inode_add_ads_utf16le(inode, stream_name,
- stream_name_nchars * sizeof(wchar_t));
+ stream_name_nchars *
+ sizeof(wchar_t));
if (!ads_entry)
return WIMLIB_ERR_NOMEM;
} else {
return WIMLIB_ERR_NOMEM;
}
lte->file_on_disk = stream_path;
- lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
+ lte->resource_location = RESOURCE_IN_WINNT_FILE_ON_DISK;
lte->size = stream_size;
if ((inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) && !ads_entry) {
/* Special case for encrypted file. */
- /* OpenEncryptedFileRaw() expects Win32 name, not NT name. */
+ /* OpenEncryptedFileRaw() expects Win32 name, not NT name.
+ * Change \??\ into \\?\ */
lte->file_on_disk[1] = L'\\';
wimlib_assert(!wmemcmp(lte->file_on_disk, L"\\\\?\\", 4));
return 0;
}
-/* Load information about the streams of an open file into a WIM inode.
+/*
+ * Load information about the streams of an open file into a WIM inode.
*
* We use the NtQueryInformationFile() system call instead of FindFirstStream()
* and FindNextStream(). This is done for two reasons:
* already present in Windows XP.
*/
static int
-win32_capture_streams(HANDLE *hFile_p,
- const wchar_t *path,
- size_t path_nchars,
- struct wim_inode *inode,
- struct list_head *unhashed_streams,
- u64 file_size,
- unsigned vol_flags)
+winnt_scan_streams(HANDLE *hFile_p, const wchar_t *path, size_t path_nchars,
+ struct wim_inode *inode, struct list_head *unhashed_streams,
+ u64 file_size, u32 vol_flags)
{
int ret;
- u8 _buf[8192] _aligned_attribute(8);
+ u8 _buf[1024] _aligned_attribute(8);
u8 *buf;
size_t bufsize;
- IO_STATUS_BLOCK io_status;
+ IO_STATUS_BLOCK iosb;
NTSTATUS status;
const FILE_STREAM_INFORMATION *info;
- DEBUG("Capturing streams from \"%ls\"", path);
-
buf = _buf;
bufsize = sizeof(_buf);
/* Get a buffer containing the stream information. */
while (!NT_SUCCESS(status = (*func_NtQueryInformationFile)(*hFile_p,
- &io_status,
+ &iosb,
buf,
bufsize,
FileStreamInformation)))
goto unnamed_only;
default:
set_errno_from_nt_status(status);
- ERROR_WITH_ERRNO("\"%ls\": Failed to query "
- "stream information", path);
+ ERROR_WITH_ERRNO("\"%ls\": Failed to query stream "
+ "information (status=0x%08"PRIx32")",
+ printable_path(path), (u32)status);
ret = WIMLIB_ERR_READ;
goto out_free_buf;
}
}
- if (io_status.Information == 0) {
+ if (iosb.Information == 0) {
/* No stream information. */
ret = 0;
goto out_free_buf;
}
- if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) {
+ if (unlikely(inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED)) {
/* OpenEncryptedFileRaw() seems to fail with
* ERROR_SHARING_VIOLATION if there are any handles opened to
* the file. */
/* Parse one or more stream information structures. */
info = (const FILE_STREAM_INFORMATION *)buf;
for (;;) {
- /* Capture the stream. */
- ret = win32_capture_stream(path, path_nchars,
- info->StreamName,
- info->StreamNameLength / 2,
- info->StreamSize.QuadPart,
- inode, unhashed_streams);
+ /* Load the stream information. */
+ ret = winnt_scan_stream(path, path_nchars,
+ info->StreamName,
+ info->StreamNameLength / 2,
+ info->StreamSize.QuadPart,
+ inode, unhashed_streams);
if (ret)
goto out_free_buf;
unnamed_only:
/* The volume does not support named streams. Only capture the unnamed
- * data stream. */
- DEBUG("Only capturing unnamed data stream");
+ * data stream. */
if (inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
FILE_ATTRIBUTE_REPARSE_POINT))
{
goto out_free_buf;
}
- ret = win32_capture_stream(path, path_nchars,
- L"::$DATA", 7, file_size,
- inode, unhashed_streams);
+ ret = winnt_scan_stream(path, path_nchars, L"::$DATA", 7,
+ file_size, inode, unhashed_streams);
out_free_buf:
/* Free buffer if allocated on heap. */
- if (buf != _buf)
+ if (unlikely(buf != _buf))
FREE(buf);
return ret;
}
static int
-win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
+winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
HANDLE cur_dir,
wchar_t *full_path,
size_t full_path_nchars,
const wchar_t *filename,
size_t filename_nchars,
struct add_image_params *params,
- struct win32_capture_state *state,
- unsigned vol_flags)
+ struct winnt_scan_stats *stats,
+ u32 vol_flags)
{
struct wim_dentry *root = NULL;
struct wim_inode *inode = NULL;
HANDLE h = INVALID_HANDLE_VALUE;
int ret;
NTSTATUS status;
- BY_HANDLE_FILE_INFORMATION file_info;
+ FILE_ALL_INFORMATION file_info;
u8 *rpbuf;
u16 rpbuflen;
u16 not_rpfixed;
if (should_exclude_path(full_path + params->capture_root_nchars,
full_path_nchars - params->capture_root_nchars,
params->config))
- {
- ret = 0;
goto out_progress;
- }
+ /* Open the file. */
status = winnt_openat(cur_dir,
(cur_dir ? filename : full_path),
(cur_dir ? filename_nchars : full_path_nchars),
ACCESS_SYSTEM_SECURITY |
SYNCHRONIZE,
&h);
- if (!NT_SUCCESS(status)) {
- set_errno_from_nt_status(status);
- ERROR_WITH_ERRNO("\"%ls\": Can't open file", full_path);
- ret = WIMLIB_ERR_OPEN;
+ if (unlikely(!NT_SUCCESS(status))) {
+ if (status == STATUS_DELETE_PENDING) {
+ WARNING("\"%ls\": Deletion pending; skipping file",
+ printable_path(full_path));
+ ret = 0;
+ } else {
+ set_errno_from_nt_status(status);
+ ERROR_WITH_ERRNO("\"%ls\": Can't open file "
+ "(status=0x%08"PRIx32")",
+ printable_path(full_path), (u32)status);
+ ret = WIMLIB_ERR_OPEN;
+ }
+ /* XXX: Provide option to exclude files that fail with
+ * STATUS_SHARING_VIOLATION? */
goto out;
}
- if (!GetFileInformationByHandle(h, &file_info)) {
- set_errno_from_GetLastError();
- ERROR_WITH_ERRNO("\"%ls\": Can't get file information", full_path);
- ret = WIMLIB_ERR_STAT;
- goto out;
+ /* Get information about the file. */
+ {
+ IO_STATUS_BLOCK iosb;
+
+ status = (*func_NtQueryInformationFile)(h, &iosb,
+ &file_info,
+ sizeof(file_info),
+ FileAllInformation);
+
+ if (unlikely(!NT_SUCCESS(status) &&
+ status != STATUS_BUFFER_OVERFLOW))
+ {
+ set_errno_from_nt_status(status);
+ ERROR_WITH_ERRNO("\"%ls\": Can't get file information "
+ "(status=0x%08"PRIx32")",
+ printable_path(full_path), (u32)status);
+ ret = WIMLIB_ERR_STAT;
+ goto out;
+ }
}
- if (file_info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+ if (unlikely(!cur_dir)) {
+
+ /* Root of tree being captured; get volume information. */
+
+ FILE_FS_ATTRIBUTE_INFORMATION attr_info;
+ FILE_FS_VOLUME_INFORMATION vol_info;
+ IO_STATUS_BLOCK iosb;
+
+ /* Get volume flags */
+ status = (*func_NtQueryVolumeInformationFile)(h, &iosb,
+ &attr_info,
+ sizeof(attr_info),
+ FileFsAttributeInformation);
+ if (likely((NT_SUCCESS(status) ||
+ (status == STATUS_BUFFER_OVERFLOW)) &&
+ (iosb.Information >=
+ offsetof(FILE_FS_ATTRIBUTE_INFORMATION,
+ FileSystemAttributes) +
+ sizeof(attr_info.FileSystemAttributes))))
+ {
+ vol_flags = attr_info.FileSystemAttributes;
+ } else {
+ set_errno_from_nt_status(status);
+ WARNING_WITH_ERRNO("\"%ls\": Can't get volume attributes "
+ "(status=0x%08"PRIx32")",
+ printable_path(full_path),
+ (u32)status);
+ vol_flags = 0;
+ }
+
+ /* Set inode number of root directory */
+ params->capture_root_ino =
+ file_info.InternalInformation.IndexNumber.QuadPart;
+
+ /* Get volume ID. */
+ status = (*func_NtQueryVolumeInformationFile)(h, &iosb,
+ &vol_info,
+ sizeof(vol_info),
+ FileFsVolumeInformation);
+ if (likely((NT_SUCCESS(status) ||
+ (status == STATUS_BUFFER_OVERFLOW)) &&
+ (iosb.Information >=
+ offsetof(FILE_FS_VOLUME_INFORMATION,
+ VolumeSerialNumber) +
+ sizeof(vol_info.VolumeSerialNumber))))
+ {
+ params->capture_root_dev = vol_info.VolumeSerialNumber;
+ } else {
+ set_errno_from_nt_status(status);
+ WARNING_WITH_ERRNO("\"%ls\": Can't get volume ID "
+ "(status=0x%08"PRIx32")",
+ printable_path(full_path),
+ (u32)status);
+ params->capture_root_dev = 0;
+ }
+ }
+
+ /* If this is a reparse point, read the reparse data. */
+ if (unlikely(file_info.BasicInformation.FileAttributes &
+ FILE_ATTRIBUTE_REPARSE_POINT))
+ {
rpbuf = alloca(REPARSE_POINT_MAX_SIZE);
- ret = win32_get_reparse_data(h, full_path,
- params, rpbuf, &rpbuflen);
- if (ret < 0) {
- /* WIMLIB_ERR_* (inverted) */
- ret = -ret;
- ERROR_WITH_ERRNO("\"%ls\": Can't get reparse data",
- full_path);
- goto out;
- } else if (ret & RP_FIXED) {
+ ret = winnt_get_reparse_data(h, full_path, params,
+ rpbuf, &rpbuflen);
+ switch (ret) {
+ case RP_FIXED:
not_rpfixed = 0;
- } else if (ret == RP_EXCLUDED) {
- ret = 0;
- goto out;
- } else {
+ break;
+ case RP_NOT_FIXED:
not_rpfixed = 1;
+ break;
+ default:
+ ERROR_WITH_ERRNO("\"%ls\": Can't get reparse data",
+ printable_path(full_path));
+ goto out;
}
}
* directories on the FAT filesystem. */
ret = inode_table_new_dentry(params->inode_table,
filename,
- ((u64)file_info.nFileIndexHigh << 32) |
- (u64)file_info.nFileIndexLow,
- file_info.dwVolumeSerialNumber,
- (file_info.nNumberOfLinks <= 1 ||
- (file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)),
+ file_info.InternalInformation.IndexNumber.QuadPart,
+ 0, /* We don't follow mount points, so we
+ currently don't need to get the
+ volume ID / device number. */
+ (file_info.StandardInformation.NumberOfLinks <= 1 ||
+ (file_info.BasicInformation.FileAttributes &
+ FILE_ATTRIBUTE_DIRECTORY)),
&root);
if (ret)
goto out;
- ret = win32_get_short_name(h, root);
- if (ret) {
- ERROR_WITH_ERRNO("\"%ls\": Can't get short name", full_path);
+ /* Get the short (DOS) name of the file. */
+ status = winnt_get_short_name(h, root);
+
+ /* If we can't read the short filename for any reason other than
+ * out-of-memory, just ignore the error and assume the file has no short
+ * name. This shouldn't be an issue, since the short names are
+ * essentially obsolete anyway. */
+ if (unlikely(status == STATUS_NO_MEMORY)) {
+ ret = WIMLIB_ERR_NOMEM;
goto out;
}
inode = root->d_inode;
if (inode->i_nlink > 1) {
- /* Shared inode; nothing more to do */
- ret = 0;
+ /* Shared inode (hard link); skip reading per-inode information.
+ */
goto out_progress;
}
- inode->i_attributes = file_info.dwFileAttributes;
- inode->i_creation_time = FILETIME_to_u64(&file_info.ftCreationTime);
- inode->i_last_write_time = FILETIME_to_u64(&file_info.ftLastWriteTime);
- inode->i_last_access_time = FILETIME_to_u64(&file_info.ftLastAccessTime);
+ inode->i_attributes = file_info.BasicInformation.FileAttributes;
+ inode->i_creation_time = file_info.BasicInformation.CreationTime.QuadPart;
+ inode->i_last_write_time = file_info.BasicInformation.LastWriteTime.QuadPart;
+ inode->i_last_access_time = file_info.BasicInformation.LastAccessTime.QuadPart;
inode->i_resolved = 1;
- params->add_flags &= ~WIMLIB_ADD_FLAG_ROOT;
-
+ /* Get the file's security descriptor, unless we are capturing in
+ * NO_ACLS mode or the volume does not support security descriptors. */
if (!(params->add_flags & WIMLIB_ADD_FLAG_NO_ACLS)
&& (vol_flags & FILE_PERSISTENT_ACLS))
{
- ret = win32_get_security_descriptor(h, inode,
- params->sd_set, state,
- params->add_flags);
- if (ret) {
- ERROR_WITH_ERRNO("\"%ls\": Can't "
- "read security descriptor", full_path);
+ status = winnt_get_security_descriptor(h, inode,
+ params->sd_set, stats,
+ params->add_flags);
+ if (!NT_SUCCESS(status)) {
+ set_errno_from_nt_status(status);
+ ERROR_WITH_ERRNO("\"%ls\": Can't read security "
+ "descriptor (status=0x%08"PRIu32")",
+ printable_path(full_path),
+ (u32)status);
+ ret = WIMLIB_ERR_STAT;
goto out;
}
}
- /* Capture the unnamed data stream (only should be present for regular
- * files) and any alternate data streams. */
- ret = win32_capture_streams(&h,
- full_path,
- full_path_nchars,
- inode,
- params->unhashed_streams,
- ((u64)file_info.nFileSizeHigh << 32) |
- file_info.nFileIndexLow,
- vol_flags);
+ /* Load information about the unnamed data stream and any named data
+ * streams. */
+ ret = winnt_scan_streams(&h,
+ full_path,
+ full_path_nchars,
+ inode,
+ params->unhashed_streams,
+ file_info.StandardInformation.EndOfFile.QuadPart,
+ vol_flags);
if (ret)
goto out;
- if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
- /* Reparse point: set the reparse data (which we read already)
- * */
+ if (unlikely(inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+
+ /* Reparse point: set the reparse data (already read). */
+
inode->i_not_rpfixed = not_rpfixed;
inode->i_reparse_tag = le32_to_cpu(*(le32*)rpbuf);
ret = inode_set_unnamed_stream(inode, rpbuf + 8, rpbuflen - 8,
params->lookup_table);
+ if (ret)
+ goto out;
} else if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) {
- /* Directory (not a reparse point) --- recurse to children */
- if (h == INVALID_HANDLE_VALUE) {
+ /* Directory: recurse to children. */
+
+ if (unlikely(h == INVALID_HANDLE_VALUE)) {
/* Re-open handle that was closed to read raw encrypted
* data. */
status = winnt_openat(cur_dir,
&h);
if (!NT_SUCCESS(status)) {
set_errno_from_nt_status(status);
- ERROR_WITH_ERRNO("\"%ls\": Can't open file",
- full_path);
+ ERROR_WITH_ERRNO("\"%ls\": Can't re-open file "
+ "(status=0x%08"PRIx32")",
+ printable_path(full_path),
+ (u32)status);
ret = WIMLIB_ERR_OPEN;
goto out;
}
}
- ret = win32_recurse_directory(h,
+ ret = winnt_recurse_directory(h,
full_path,
full_path_nchars,
root,
params,
- state,
+ stats,
vol_flags);
+ if (ret)
+ goto out;
}
- if (ret)
- goto out;
out_progress:
- params->progress.scan.cur_path = full_path;
- if (root)
- do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
+ params->progress.scan.cur_path = printable_path(full_path);
+ if (likely(root))
+ ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
else
- do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
+ ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
out:
- if (h != INVALID_HANDLE_VALUE)
+ if (likely(h != INVALID_HANDLE_VALUE))
(*func_NtClose)(h);
- if (ret == 0)
+ if (likely(ret == 0))
*root_ret = root;
else
free_dentry_tree(root, params->lookup_table);
}
static void
-win32_do_capture_warnings(const wchar_t *path,
- const struct win32_capture_state *state,
- int add_flags)
+winnt_do_scan_warnings(const wchar_t *path, const struct winnt_scan_stats *stats)
{
- if (state->num_get_sacl_priv_notheld == 0 &&
- state->num_get_sd_access_denied == 0)
+ if (likely(stats->num_get_sacl_priv_notheld == 0 &&
+ stats->num_get_sd_access_denied == 0))
return;
WARNING("Scan of \"%ls\" complete, but with one or more warnings:", path);
- if (state->num_get_sacl_priv_notheld != 0) {
+ if (stats->num_get_sacl_priv_notheld != 0) {
WARNING("- Could not capture SACL (System Access Control List)\n"
" on %lu files or directories.",
- state->num_get_sacl_priv_notheld);
+ stats->num_get_sacl_priv_notheld);
}
- if (state->num_get_sd_access_denied != 0) {
+ if (stats->num_get_sd_access_denied != 0) {
WARNING("- Could not capture security descriptor at all\n"
" on %lu files or directories.",
- state->num_get_sd_access_denied);
+ stats->num_get_sd_access_denied);
}
WARNING("To fully capture all security descriptors, run the program\n"
" with Administrator rights.");
#define WINDOWS_NT_MAX_PATH 32768
-/* Win32 version of capturing a directory tree */
+/* Win32 version of capturing a directory tree. */
int
win32_build_dentry_tree(struct wim_dentry **root_ret,
const wchar_t *root_disk_path,
struct add_image_params *params)
{
- size_t path_nchars;
wchar_t *path;
int ret;
- struct win32_capture_state state;
- unsigned vol_flags;
- DWORD dret;
-
- path_nchars = wcslen(root_disk_path);
- if (path_nchars > WINDOWS_NT_MAX_PATH)
- return WIMLIB_ERR_INVALID_PARAM;
-
- ret = win32_get_file_and_vol_ids(root_disk_path,
- ¶ms->capture_root_ino,
- ¶ms->capture_root_dev);
- if (ret) {
- ERROR_WITH_ERRNO("Can't open %ls", root_disk_path);
- return ret;
- }
-
- win32_get_vol_flags(root_disk_path, &vol_flags, NULL);
+ UNICODE_STRING ntpath;
+ struct winnt_scan_stats stats;
/* WARNING: There is no check for overflow later when this buffer is
* being used! But it's as long as the maximum path length understood
- * by Windows NT (which is NOT the same as MAX_PATH). */
+ * by Windows NT (which is NOT the same as MAX_PATH). */
path = MALLOC((WINDOWS_NT_MAX_PATH + 1) * sizeof(wchar_t));
if (!path)
return WIMLIB_ERR_NOMEM;
- /* Translate into full path */
- dret = GetFullPathName(root_disk_path, WINDOWS_NT_MAX_PATH - 3,
- &path[4], NULL);
+ ret = win32_path_to_nt_path(root_disk_path, &ntpath);
+ if (ret)
+ goto out_free_path;
- if (dret == 0 || dret >= WINDOWS_NT_MAX_PATH - 3) {
- ERROR("Can't get full path name for \"%ls\"", root_disk_path);
- return WIMLIB_ERR_UNSUPPORTED;
+ if (ntpath.Length < 4 * sizeof(wchar_t) ||
+ ntpath.Length > WINDOWS_NT_MAX_PATH * sizeof(wchar_t) ||
+ wmemcmp(ntpath.Buffer, L"\\??\\", 4))
+ {
+ ERROR("\"%ls\": unrecognized path format", root_disk_path);
+ ret = WIMLIB_ERR_INVALID_PARAM;
+ goto out_free_path;
}
- /* Add \??\ prefix */
- wmemcpy(path, L"\\??\\", 4);
- path_nchars = dret + 4;
+ params->capture_root_nchars = ntpath.Length / sizeof(wchar_t);
+ wmemcpy(path, ntpath.Buffer, params->capture_root_nchars);
+ path[params->capture_root_nchars] = L'\0';
- /* Strip trailing slashes. If we don't do this, we may create a path
- * with multiple consecutive backslashes, which for some reason causes
- * Windows to report that the file cannot be found. */
- while (path_nchars >= 2 &&
- path[path_nchars - 1] == L'\\' &&
- path[path_nchars - 2] != L':')
- {
- path[--path_nchars] = L'\0';
- }
+ HeapFree(GetProcessHeap(), 0, ntpath.Buffer);
- params->capture_root_nchars = path_nchars;
+ memset(&stats, 0, sizeof(stats));
- memset(&state, 0, sizeof(state));
- ret = win32_build_dentry_tree_recursive(root_ret, NULL,
- path, path_nchars, L"", 0,
- params, &state, vol_flags);
+ ret = winnt_build_dentry_tree_recursive(root_ret, NULL,
+ path, params->capture_root_nchars,
+ L"", 0, params, &stats, 0);
+out_free_path:
FREE(path);
if (ret == 0)
- win32_do_capture_warnings(root_disk_path, &state, params->add_flags);
+ winnt_do_scan_warnings(root_disk_path, &stats);
return ret;
}
git://wimlib.net / wimlib / blobdiff