X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_capture.c;h=60d212d13ce102f62de70ebd711e045bb68e1db7;hp=ba9937cfb1982363aca8cd67137ed0196c63faaa;hb=c0f97d52b487123a1a68a6a07fa0d9be81ee1f72;hpb=ebdba490384924ef422b1df675ba11d5030faf09 diff --git a/src/win32_capture.c b/src/win32_capture.c index ba9937cf..60d212d1 100644 --- a/src/win32_capture.c +++ b/src/win32_capture.c @@ -38,6 +38,7 @@ #include "wimlib/error.h" #include "wimlib/paths.h" #include "wimlib/reparse.h" +#include "wimlib/wof.h" struct winnt_scan_stats { unsigned long num_get_sd_access_denied; @@ -106,7 +107,7 @@ retry: * described by @blob. */ int read_winnt_stream_prefix(const struct blob_descriptor *blob, u64 size, - consume_data_callback_t cb, void *cb_ctx) + const struct read_blob_callbacks *cbs) { const wchar_t *path; HANDLE h; @@ -137,17 +138,23 @@ read_winnt_stream_prefix(const struct blob_descriptor *blob, u64 size, status = (*func_NtReadFile)(h, NULL, NULL, NULL, &iosb, buf, count, NULL, NULL); - if (!NT_SUCCESS(status)) { - winnt_error(status, L"\"%ls\": Error reading data", - printable_path(path)); - ret = WIMLIB_ERR_READ; + if (unlikely(!NT_SUCCESS(status))) { + if (status == STATUS_END_OF_FILE) { + ERROR("\"%ls\": File was concurrently truncated", + printable_path(path)); + ret = WIMLIB_ERR_CONCURRENT_MODIFICATION_DETECTED; + } else { + winnt_error(status, L"\"%ls\": Error reading data", + printable_path(path)); + ret = WIMLIB_ERR_READ; + } break; } bytes_read = iosb.Information; bytes_remaining -= bytes_read; - ret = (*cb)(buf, bytes_read, cb_ctx); + ret = call_consume_chunk(buf, bytes_read, cbs); if (ret) break; } @@ -156,8 +163,7 @@ read_winnt_stream_prefix(const struct blob_descriptor *blob, u64 size, } struct win32_encrypted_read_ctx { - consume_data_callback_t read_prefix_cb; - void *read_prefix_ctx; + const struct read_blob_callbacks *cbs; int wimlib_err_code; u64 bytes_remaining; }; @@ -172,7 +178,7 @@ win32_encrypted_export_cb(unsigned char *data, void *_ctx, unsigned long len) if (bytes_to_consume == 0) return ERROR_SUCCESS; - ret = (*ctx->read_prefix_cb)(data, bytes_to_consume, ctx->read_prefix_ctx); + ret = call_consume_chunk(data, bytes_to_consume, ctx->cbs); if (ret) { ctx->wimlib_err_code = ret; /* It doesn't matter what error code is returned here, as long @@ -186,7 +192,7 @@ win32_encrypted_export_cb(unsigned char *data, void *_ctx, unsigned long len) int read_win32_encrypted_file_prefix(const struct blob_descriptor *blob, u64 size, - consume_data_callback_t cb, void *cb_ctx) + const struct read_blob_callbacks *cbs) { struct win32_encrypted_read_ctx export_ctx; DWORD err; @@ -197,8 +203,7 @@ read_win32_encrypted_file_prefix(const struct blob_descriptor *blob, if (blob->file_inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) flags |= CREATE_FOR_DIR; - export_ctx.read_prefix_cb = cb; - export_ctx.read_prefix_ctx = cb_ctx; + export_ctx.cbs = cbs; export_ctx.wimlib_err_code = 0; export_ctx.bytes_remaining = size; @@ -235,7 +240,7 @@ read_win32_encrypted_file_prefix(const struct blob_descriptor *blob, /* * Load the short name of a file into a WIM dentry. */ -static NTSTATUS +static noinline_for_stack NTSTATUS winnt_get_short_name(HANDLE h, struct wim_dentry *dentry) { /* It's not any harder to just make the NtQueryInformationFile() system @@ -250,11 +255,11 @@ winnt_get_short_name(HANDLE h, struct wim_dentry *dentry) FileAlternateNameInformation); 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) + dentry->d_short_name = utf16le_dupz(info->FileName, + info->FileNameLength); + if (!dentry->d_short_name) return STATUS_NO_MEMORY; - dentry->short_name_nbytes = info->FileNameLength; + dentry->d_short_name_nbytes = info->FileNameLength; } return status; } @@ -263,7 +268,7 @@ winnt_get_short_name(HANDLE h, struct wim_dentry *dentry) * Load the security descriptor of a file into the corresponding inode and the * WIM image's security descriptor set. */ -static NTSTATUS +static noinline_for_stack NTSTATUS winnt_get_security_descriptor(HANDLE h, struct wim_inode *inode, struct wim_sd_set *sd_set, struct winnt_scan_stats *stats, int add_flags) @@ -417,9 +422,8 @@ winnt_recurse_directory(HANDLE h, { const FILE_NAMES_INFORMATION *info = buf; for (;;) { - if (!(info->FileNameLength == 2 && info->FileName[0] == L'.') && - !(info->FileNameLength == 4 && info->FileName[0] == L'.' && - info->FileName[1] == L'.')) + if (!should_ignore_filename(info->FileName, + info->FileNameLength / 2)) { wchar_t *p; wchar_t *filename; @@ -452,8 +456,7 @@ winnt_recurse_directory(HANDLE h, if (ret) goto out_free_buf; - if (child) - dentry_add_child(parent, child); + attach_scanned_tree(parent, child, params->blob_table); } if (info->NextEntryOffset == 0) break; @@ -473,13 +476,7 @@ out_free_buf: } /* Reparse point fixup status code */ -enum rp_status { - /* Reparse point will be captured literally (no fixup) */ - RP_NOT_FIXED = -1, - - /* Reparse point will be captured with fixup */ - RP_FIXED = -2, -}; +#define RP_FIXED (-1) static bool file_has_ino_and_dev(HANDLE h, u64 ino, u64 dev) @@ -513,20 +510,15 @@ file_has_ino_and_dev(HANDLE h, u64 ino, u64 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. - * - * If yes, return a pointer to the portion of the link following this prefix. - * - * If no, return NULL. - * - * If the link target does not appear to be a valid NT namespace path, return - * @target itself. + * This is the Windows equivalent of unix_relativize_link_target(); see there + * for general details. This version works with an "absolute" Windows link + * target, specified from the root of the Windows kernel object namespace. Note + * that we have to open directories with a trailing slash when present because + * \??\E: opens the E: device itself and not the filesystem root directory. */ 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) +winnt_relativize_link_target(const wchar_t *target, size_t target_nbytes, + u64 ino, u64 dev) { UNICODE_STRING name; OBJECT_ATTRIBUTES attr; @@ -592,28 +584,29 @@ winnt_get_root_relative_target(const wchar_t *target, size_t target_nbytes, name.Buffer = (wchar_t *)p; name.Length = 0; - if (file_has_ino_and_dev(h, capture_root_ino, - capture_root_dev)) + if (file_has_ino_and_dev(h, ino, dev)) goto out_close_root_dir; } } while (p != target_end); - p = NULL; + p = target; out_close_root_dir: if (attr.RootDirectory) (*func_NtClose)(attr.RootDirectory); + while (p > target && *(p - 1) == L'\\') + p--; return p; } static int winnt_rpfix_progress(struct capture_params *params, const wchar_t *path, - const struct reparse_data *rpdata, int scan_status) + const struct link_reparse_point *link, int scan_status) { - size_t print_name_nchars = rpdata->print_name_nbytes / sizeof(wchar_t); + size_t print_name_nchars = link->print_name_nbytes / sizeof(wchar_t); wchar_t print_name0[print_name_nchars + 1]; - wmemcpy(print_name0, rpdata->print_name, print_name_nchars); + wmemcpy(print_name0, link->print_name, print_name_nchars); print_name0[print_name_nchars] = L'\0'; params->progress.scan.cur_path = printable_path(path); @@ -622,18 +615,16 @@ winnt_rpfix_progress(struct capture_params *params, const wchar_t *path, } static int -winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p, - u64 capture_root_ino, u64 capture_root_dev, +winnt_try_rpfix(struct reparse_buffer_disk *rpbuf, u16 *rpbuflen_p, const wchar_t *path, struct capture_params *params) { - struct reparse_data rpdata; + struct link_reparse_point link; const wchar_t *rel_target; int ret; - if (parse_reparse_data(rpbuf, *rpbuflen_p, &rpdata)) { - /* Couldn't even understand the reparse data. Don't try the - * fixup. */ - return RP_NOT_FIXED; + if (parse_link_reparse_point(rpbuf, *rpbuflen_p, &link)) { + /* Couldn't understand the reparse data; don't do the fixup. */ + return 0; } /* @@ -644,7 +635,7 @@ winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p, * 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 + * set, in addition to truly relative symbolic links such as "Users" or * "Users\Public". However, WIMGAPI (as of Windows 8.1) has this same * behavior. * @@ -658,28 +649,19 @@ winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p, * - \??\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 (link_is_relative_symlink(&link)) + return 0; - if (rel_target == rpdata.substitute_name) { - /* Weird target --- keep the reparse point and don't mess with - * it. */ - return RP_NOT_FIXED; + rel_target = winnt_relativize_link_target(link.substitute_name, + link.substitute_name_nbytes, + params->capture_root_ino, + params->capture_root_dev); + + if (rel_target == link.substitute_name) { + /* Target points outside of the tree being captured or had an + * unrecognized path format. Don't adjust it. */ + return winnt_rpfix_progress(params, path, &link, + WIMLIB_SCAN_DENTRY_NOT_FIXED_SYMLINK); } /* We have an absolute target pointing within the directory being @@ -688,98 +670,96 @@ winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p, * * 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 + * will need to be reversed when applying the image, it doesn't matter * what exactly the prefix is, as long as it looks like an absolute - * path. - */ + * 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); + static const wchar_t prefix[6] = L"\\??\\X:"; + static const size_t num_unprintable_chars = 4; - wchar_t tmp[rel_target_nchars + 7]; + size_t rel_target_nbytes = + link.substitute_name_nbytes - ((const u8 *)rel_target - + (const u8 *)link.substitute_name); - wmemcpy(tmp, L"\\??\\X:\\", 7); - wmemcpy(tmp + 7, rel_target, rel_target_nchars); + wchar_t tmp[(sizeof(prefix) + rel_target_nbytes) / sizeof(wchar_t)]; - 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)); + memcpy(tmp, prefix, sizeof(prefix)); + memcpy(tmp + ARRAY_LEN(prefix), rel_target, rel_target_nbytes); - if (make_reparse_buffer(&rpdata, rpbuf, rpbuflen_p)) - return RP_NOT_FIXED; - } - ret = winnt_rpfix_progress(params, path, &rpdata, + link.substitute_name = tmp; + link.substitute_name_nbytes = sizeof(tmp); + + link.print_name = link.substitute_name + num_unprintable_chars; + link.print_name_nbytes = link.substitute_name_nbytes - + (num_unprintable_chars * sizeof(wchar_t)); + + if (make_link_reparse_point(&link, rpbuf, rpbuflen_p)) + return 0; + + ret = winnt_rpfix_progress(params, path, &link, WIMLIB_SCAN_DENTRY_FIXED_SYMLINK); if (ret) return ret; return RP_FIXED; } -/* - * Loads the reparse point data from a reparse point into memory, optionally - * 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 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 success, returns a negative `enum rp_status' value. - * On failure, returns a positive error code. - */ -static int -winnt_get_reparse_data(HANDLE h, const wchar_t *path, - struct capture_params *params, - u8 *rpbuf, u16 *rpbuflen_ret) +/* Load the reparse data of a file into the corresponding WIM inode. If the + * reparse point is a symbolic link or junction with an absolute target and + * RPFIX mode is enabled, then also rewrite its target to be relative to the + * capture root. */ +static noinline_for_stack int +winnt_load_reparse_data(HANDLE h, struct wim_inode *inode, + const wchar_t *full_path, struct capture_params *params) { + struct reparse_buffer_disk rpbuf; DWORD bytes_returned; - u32 reparse_tag; - int ret; u16 rpbuflen; + int ret; + + if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) { + /* See comment above assign_stream_types_encrypted() */ + WARNING("Ignoring reparse data of encrypted file \"%ls\"", + printable_path(full_path)); + return 0; + } if (!DeviceIoControl(h, FSCTL_GET_REPARSE_POINT, - NULL, 0, rpbuf, REPARSE_POINT_MAX_SIZE, + NULL, 0, &rpbuf, REPARSE_POINT_MAX_SIZE, &bytes_returned, NULL)) { - win32_error(GetLastError(), L"\"%ls\": Can't get reparse data", - printable_path(path)); - return WIMLIB_ERR_READ; + win32_error(GetLastError(), L"\"%ls\": Can't get reparse point", + printable_path(full_path)); + return WIMLIB_ERR_READLINK; } - if (unlikely(bytes_returned < REPARSE_DATA_OFFSET)) { - ERROR("\"%ls\": Reparse point data is invalid", - printable_path(path)); + rpbuflen = bytes_returned; + + if (unlikely(rpbuflen < REPARSE_DATA_OFFSET)) { + ERROR("\"%ls\": reparse point buffer is too short", + printable_path(full_path)); return WIMLIB_ERR_INVALID_REPARSE_DATA; } - 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)) - { - ret = winnt_try_rpfix(rpbuf, &rpbuflen, - params->capture_root_ino, - params->capture_root_dev, - path, params); + if (params->add_flags & WIMLIB_ADD_FLAG_RPFIX) { + ret = winnt_try_rpfix(&rpbuf, &rpbuflen, full_path, params); + if (ret == RP_FIXED) + inode->i_rp_flags &= ~WIM_RP_FLAG_NOT_FIXED; + else if (ret) + return ret; } - *rpbuflen_ret = rpbuflen; - return ret; + + inode->i_reparse_tag = le32_to_cpu(rpbuf.rptag); + inode->i_rp_reserved = le16_to_cpu(rpbuf.rpreserved); + + if (!inode_add_stream_with_data(inode, + STREAM_TYPE_REPARSE_POINT, + NO_STREAM_NAME, + rpbuf.rpdata, + rpbuflen - REPARSE_DATA_OFFSET, + params->blob_table)) + return WIMLIB_ERR_NOMEM; + + return 0; } static DWORD WINAPI @@ -994,13 +974,13 @@ err_nomem: * and later, whereas the stream support in NtQueryInformationFile() was * already present in Windows XP. */ -static int +static noinline_for_stack int winnt_scan_data_streams(HANDLE h, const wchar_t *path, size_t path_nchars, struct wim_inode *inode, struct list_head *unhashed_blobs, u64 file_size, u32 vol_flags) { int ret; - u8 _buf[1024] _aligned_attribute(8); + u8 _buf[4096] _aligned_attribute(8); u8 *buf; size_t bufsize; IO_STATUS_BLOCK iosb; @@ -1102,7 +1082,7 @@ out_free_buf: return ret; } -static u64 +static noinline_for_stack u64 get_sort_key(HANDLE h) { STARTING_VCN_INPUT_BUFFER in = { .StartingVcn.QuadPart = 0 }; @@ -1133,6 +1113,137 @@ set_sort_key(struct wim_inode *inode, u64 sort_key) } } +/* Special case to better support in-place updates of backing WIM files: in + * WIMBOOT mode, if the file is backed by a WIM (perhaps the WIM being updated) + * and WOF is not attached to the volume, then capture the file as the + * "dereferenced file" rather than as the "pointer file". Note that this only + * requires stream manipulation --- there is no special handling of metadata + * such as security descriptors required. */ +static noinline_for_stack int +fixup_wim_backed_file(struct wim_inode *inode, struct blob_table *blob_table) +{ + struct wim_inode_stream *strm; + struct blob_descriptor *blob; + u8 _rpdata[REPARSE_DATA_MAX_SIZE] _aligned_attribute(8); + struct { + struct wof_external_info wof_info; + struct wim_provider_rpdata wim_info; + } *rpdata = (void *)_rpdata; + int ret; + + strm = inode_get_unnamed_stream(inode, STREAM_TYPE_REPARSE_POINT); + blob = stream_blob_resolved(strm); + if (!blob || blob->size < sizeof(*rpdata)) + return 0; + + ret = read_blob_into_buf(blob, rpdata); + if (ret) + return ret; + + if (rpdata->wof_info.version != WOF_CURRENT_VERSION || + rpdata->wof_info.provider != WOF_PROVIDER_WIM || + rpdata->wim_info.version != 2) + return 0; + + blob = lookup_blob(blob_table, rpdata->wim_info.unnamed_data_stream_hash); + if (!blob) + return 0; + + /* All okay --- remove the reparse point and redirect the unnamed data + * stream to the "dereferenced" one. */ + inode_remove_stream(inode, strm, blob_table); + strm = inode_get_unnamed_data_stream(inode); + wimlib_assert(strm != NULL); + inode_replace_stream_blob(inode, strm, blob, blob_table); + inode->i_attributes &= ~(FILE_ATTRIBUTE_REPARSE_POINT | + FILE_ATTRIBUTE_SPARSE_FILE); + if (inode->i_attributes == 0) + inode->i_attributes = FILE_ATTRIBUTE_NORMAL; + return 0; +} + +static noinline_for_stack u32 +get_volume_information(HANDLE h, const wchar_t *full_path, + struct capture_params *params) +{ + FILE_FS_ATTRIBUTE_INFORMATION attr_info; + FILE_FS_VOLUME_INFORMATION vol_info; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + u32 vol_flags; + + /* 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 { + winnt_warning(status, L"\"%ls\": Can't get volume attributes", + printable_path(full_path)); + vol_flags = 0; + } + + /* 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 { + winnt_warning(status, L"\"%ls\": Can't get volume ID", + printable_path(full_path)); + params->capture_root_dev = 0; + } + return vol_flags; +} + +struct file_info { + u32 attributes; + u32 num_links; + u64 creation_time; + u64 last_write_time; + u64 last_access_time; + u64 ino; + u64 end_of_file; +}; + +static noinline_for_stack NTSTATUS +get_file_info(HANDLE h, struct file_info *info) +{ + IO_STATUS_BLOCK iosb; + NTSTATUS status; + FILE_ALL_INFORMATION all_info; + + status = (*func_NtQueryInformationFile)(h, &iosb, &all_info, + sizeof(all_info), + FileAllInformation); + + if (unlikely(!NT_SUCCESS(status) && status != STATUS_BUFFER_OVERFLOW)) + return status; + + info->attributes = all_info.BasicInformation.FileAttributes; + info->num_links = all_info.StandardInformation.NumberOfLinks; + info->creation_time = all_info.BasicInformation.CreationTime.QuadPart; + info->last_write_time = all_info.BasicInformation.LastWriteTime.QuadPart; + info->last_access_time = all_info.BasicInformation.LastAccessTime.QuadPart; + info->ino = all_info.InternalInformation.IndexNumber.QuadPart; + info->end_of_file = all_info.StandardInformation.EndOfFile.QuadPart; + return STATUS_SUCCESS; +} + static int winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret, HANDLE cur_dir, @@ -1149,14 +1260,14 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret, HANDLE h = NULL; int ret; NTSTATUS status; - FILE_ALL_INFORMATION file_info; + struct file_info file_info; ACCESS_MASK requestedPerms; u64 sort_key; - ret = try_exclude(full_path, full_path_nchars, params); - if (ret < 0) /* Excluded? */ + ret = try_exclude(full_path, params); + if (unlikely(ret < 0)) /* Excluded? */ goto out_progress; - if (ret > 0) /* Error? */ + if (unlikely(ret > 0)) /* Error? */ goto out; /* Open the file. */ @@ -1195,27 +1306,16 @@ retry_open: } /* 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)) - { - winnt_error(status, - L"\"%ls\": Can't get file information", - printable_path(full_path)); - ret = WIMLIB_ERR_STAT; - goto out; - } + status = get_file_info(h, &file_info); + if (!NT_SUCCESS(status)) { + winnt_error(status, L"\"%ls\": Can't get file information", + printable_path(full_path)); + ret = WIMLIB_ERR_STAT; + goto out; } if (unlikely(!(requestedPerms & FILE_READ_DATA)) && - !(file_info.BasicInformation.FileAttributes & FILE_ATTRIBUTE_ENCRYPTED)) + !(file_info.attributes & FILE_ATTRIBUTE_ENCRYPTED)) { ERROR("\"%ls\": Permission to read data was denied", printable_path(full_path)); @@ -1224,57 +1324,12 @@ retry_open: } 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 { - winnt_warning(status, - L"\"%ls\": Can't get volume attributes", - printable_path(full_path)); - 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 { - winnt_warning(status, L"\"%ls\": Can't get volume ID", - printable_path(full_path)); - params->capture_root_dev = 0; - } + vol_flags = get_volume_information(h, full_path, params); + params->capture_root_ino = file_info.ino; } + /* Create a WIM dentry with an associated inode, which may be shared. * * However, we need to explicitly check for directories and files with @@ -1289,11 +1344,9 @@ retry_open: * files on different volumes. */ ret = inode_table_new_dentry(params->inode_table, filename, - file_info.InternalInformation.IndexNumber.QuadPart, + file_info.ino, params->capture_root_dev, - (file_info.StandardInformation.NumberOfLinks <= 1 || - (file_info.BasicInformation.FileAttributes & - FILE_ATTRIBUTE_DIRECTORY)), + (file_info.num_links <= 1), &root); if (ret) goto out; @@ -1318,10 +1371,10 @@ retry_open: goto out_progress; } - 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_attributes = file_info.attributes; + inode->i_creation_time = file_info.creation_time; + inode->i_last_write_time = file_info.last_write_time; + inode->i_last_access_time = file_info.last_access_time; /* Get the file's security descriptor, unless we are capturing in * NO_ACLS mode or the volume does not support security descriptors. */ @@ -1342,38 +1395,9 @@ retry_open: /* If this is a reparse point, load the reparse data. */ if (unlikely(inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)) { - if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) { - /* See comment above assign_stream_types_encrypted() */ - WARNING("Ignoring reparse data of encrypted file \"%ls\"", - printable_path(full_path)); - } else { - u8 rpbuf[REPARSE_POINT_MAX_SIZE] _aligned_attribute(8); - u16 rpbuflen; - - ret = winnt_get_reparse_data(h, full_path, params, - rpbuf, &rpbuflen); - switch (ret) { - case RP_FIXED: - inode->i_not_rpfixed = 0; - break; - case RP_NOT_FIXED: - inode->i_not_rpfixed = 1; - break; - default: - goto out; - } - inode->i_reparse_tag = le32_to_cpu(*(le32*)rpbuf); - if (!inode_add_stream_with_data(inode, - STREAM_TYPE_REPARSE_POINT, - NO_STREAM_NAME, - rpbuf + REPARSE_DATA_OFFSET, - rpbuflen - REPARSE_DATA_OFFSET, - params->blob_table)) - { - ret = WIMLIB_ERR_NOMEM; - goto out; - } - } + ret = winnt_load_reparse_data(h, inode, full_path, params); + if (ret) + goto out; } sort_key = get_sort_key(h); @@ -1409,12 +1433,21 @@ retry_open: full_path_nchars, inode, params->unhashed_blobs, - file_info.StandardInformation.EndOfFile.QuadPart, + file_info.end_of_file, vol_flags); if (ret) goto out; } + if (unlikely((params->add_flags & WIMLIB_ADD_FLAG_WIMBOOT) && + (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) && + (inode->i_reparse_tag == WIM_IO_REPARSE_TAG_WOF))) + { + ret = fixup_wim_backed_file(inode, params->blob_table); + if (ret) + goto out; + } + set_sort_key(inode, sort_key); if (inode_is_directory(inode)) {