X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_apply.c;h=9fac1561a32a76d8cb01ca1047ded7c2bb6a4def;hb=acb16926b00fabdba062ff4300da5d3aef32ceeb;hp=f249197a39524a3624bda261c458a4c229936ac7;hpb=cc7b6ee47d4037ae8fa11b4c2d5154091d543704;p=wimlib diff --git a/src/win32_apply.c b/src/win32_apply.c index f249197a..9fac1561 100644 --- a/src/win32_apply.c +++ b/src/win32_apply.c @@ -21,6 +21,8 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ +#ifdef __WIN32__ + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -38,10 +40,6 @@ #include "wimlib/xml.h" #include "wimlib/wimboot.h" -/* TODO: Add workaround for when a stream needs to be extracted to more places - * than this */ -#define MAX_OPEN_HANDLES 32768 - struct win32_apply_ctx { /* Extract flags, the pointer to the WIMStruct, etc. */ @@ -55,6 +53,7 @@ struct win32_apply_ctx { void *mem_prepopulate_pats; u8 wim_lookup_table_hash[SHA1_HASH_SIZE]; bool wof_running; + bool tried_to_load_prepopulate_list; } wimboot; /* Open handle to the target directory */ @@ -98,12 +97,12 @@ struct win32_apply_ctx { struct reparse_buffer_disk rpbuf; /* Temporary buffer for reparse data of "fixed" absolute symbolic links - * and junction */ + * and junctions */ struct reparse_buffer_disk rpfixbuf; /* Array of open handles to filesystem streams currently being written */ - HANDLE open_handles[MAX_OPEN_HANDLES]; + HANDLE open_handles[MAX_OPEN_STREAMS]; /* Number of handles in @open_handles currently open (filled in from the * beginning of the array) */ @@ -126,6 +125,13 @@ struct win32_apply_ctx { /* Number of files for which we didn't have permission to set any part * of the security descriptor. */ unsigned long no_security_descriptors; + + /* Number of files for which we couldn't set the short name. */ + unsigned long num_short_name_failures; + + /* Have we tried to enable short name support on the target volume yet? + */ + bool tried_to_enable_short_names; }; /* Get the drive letter from a Windows path, or return the null character if the @@ -237,7 +243,7 @@ win32_get_supported_features(const wchar_t *target, return 0; } -/* Load the patterns from [PrepopulateList] of WimBootCompresse.ini in the WIM +/* Load the patterns from [PrepopulateList] of WimBootCompress.ini in the WIM * image being extracted. */ static int load_prepopulate_pats(struct win32_apply_ctx *ctx) @@ -251,6 +257,8 @@ load_prepopulate_pats(struct win32_apply_ctx *ctx) void *mem; struct text_file_section sec; + ctx->wimboot.tried_to_load_prepopulate_list = true; + dentry = get_dentry(ctx->common.wim, path, WIMLIB_CASE_INSENSITIVE); if (!dentry || (dentry->d_inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY | @@ -307,6 +315,95 @@ in_prepopulate_list(struct wim_dentry *dentry, wcslen(dentry->_full_path), pats); } +static const wchar_t * +current_path(struct win32_apply_ctx *ctx); + +static void +build_extraction_path(const struct wim_dentry *dentry, + struct win32_apply_ctx *ctx); + +#define WIM_BACKING_NOT_ENABLED -1 +#define WIM_BACKING_NOT_POSSIBLE -2 +#define WIM_BACKING_EXCLUDED -3 + +/* + * Determines if the unnamed data stream of a file will be created as an + * external backing, as opposed to a standard extraction. + */ +static int +win32_will_externally_back(struct wim_dentry *dentry, struct apply_ctx *_ctx) +{ + struct win32_apply_ctx *ctx = (struct win32_apply_ctx *)_ctx; + struct wim_lookup_table_entry *stream; + int ret; + + if (!(ctx->common.extract_flags & WIMLIB_EXTRACT_FLAG_WIMBOOT)) + return WIM_BACKING_NOT_ENABLED; + + if (!ctx->wimboot.tried_to_load_prepopulate_list) { + ret = load_prepopulate_pats(ctx); + if (ret == WIMLIB_ERR_NOMEM) + return ret; + } + + if (dentry->d_inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_REPARSE_POINT | + FILE_ATTRIBUTE_ENCRYPTED)) + return WIM_BACKING_NOT_POSSIBLE; + + stream = inode_unnamed_lte_resolved(dentry->d_inode); + + if (!stream || + stream->resource_location != RESOURCE_IN_WIM || + stream->rspec->wim != ctx->common.wim || + stream->size != stream->rspec->uncompressed_size) + return WIM_BACKING_NOT_POSSIBLE; + + ret = calculate_dentry_full_path(dentry); + if (ret) + return ret; + + if (in_prepopulate_list(dentry, ctx)) + return WIM_BACKING_EXCLUDED; + + return 0; +} + +static int +set_external_backing(HANDLE h, struct wim_dentry *dentry, struct win32_apply_ctx *ctx) +{ + int ret; + + ret = win32_will_externally_back(dentry, &ctx->common); + if (ret > 0) /* Error. */ + return ret; + + if (ret < 0 && ret != WIM_BACKING_EXCLUDED) + return 0; /* Not externally backing, other than due to exclusion. */ + + build_extraction_path(dentry, ctx); + + if (ret == WIM_BACKING_EXCLUDED) { + /* Not externally backing due to exclusion. */ + union wimlib_progress_info info; + + info.wimboot_exclude.path_in_wim = dentry->_full_path; + info.wimboot_exclude.extraction_path = current_path(ctx); + + return call_progress(ctx->common.progfunc, + WIMLIB_PROGRESS_MSG_WIMBOOT_EXCLUDE, + &info, ctx->common.progctx); + } else { + /* Externally backing. */ + return wimboot_set_pointer(h, + current_path(ctx), + inode_unnamed_lte_resolved(dentry->d_inode), + ctx->wimboot.data_source_id, + ctx->wimboot.wim_lookup_table_hash, + ctx->wimboot.wof_running); + } +} + /* Calculates the SHA-1 message digest of the WIM's lookup table. */ static int hash_lookup_table(WIMStruct *wim, u8 hash[SHA1_HASH_SIZE]) @@ -323,12 +420,13 @@ start_wimboot_extraction(struct win32_apply_ctx *ctx) int ret; WIMStruct *wim = ctx->common.wim; - ret = load_prepopulate_pats(ctx); - if (ret == WIMLIB_ERR_NOMEM) - return ret; + if (!ctx->wimboot.tried_to_load_prepopulate_list) { + ret = load_prepopulate_pats(ctx); + if (ret == WIMLIB_ERR_NOMEM) + return ret; + } - if (!wim_info_get_wimboot(wim->wim_info, - wim->current_image)) + if (!wim_info_get_wimboot(wim->wim_info, wim->current_image)) WARNING("Image is not marked as WIMBoot compatible!"); ret = hash_lookup_table(ctx->common.wim, @@ -344,6 +442,80 @@ start_wimboot_extraction(struct win32_apply_ctx *ctx) &ctx->wimboot.wof_running); } +static void +build_win32_extraction_path(const struct wim_dentry *dentry, + struct win32_apply_ctx *ctx); + +/* Sets WimBoot=1 in the extracted SYSTEM registry hive. + * + * WIMGAPI does this, and it's possible that it's important. + * But I don't know exactly what this value means to Windows. */ +static int +end_wimboot_extraction(struct win32_apply_ctx *ctx) +{ + struct wim_dentry *dentry; + wchar_t subkeyname[32]; + LONG res; + LONG res2; + HKEY key; + DWORD value; + + dentry = get_dentry(ctx->common.wim, L"\\Windows\\System32\\config\\SYSTEM", + WIMLIB_CASE_INSENSITIVE); + + if (!dentry || !will_extract_dentry(dentry)) + goto out; + + if (!will_extract_dentry(wim_get_current_root_dentry(ctx->common.wim))) + goto out; + + /* Not bothering to use the native routines (e.g. NtLoadKey()) for this. + * If this doesn't work, you probably also have many other problems. */ + + build_win32_extraction_path(dentry, ctx); + + randomize_char_array_with_alnum(subkeyname, 20); + subkeyname[20] = L'\0'; + + res = RegLoadKey(HKEY_LOCAL_MACHINE, subkeyname, ctx->pathbuf.Buffer); + if (res) + goto out_check_res; + + wcscpy(&subkeyname[20], L"\\Setup"); + + res = RegCreateKeyEx(HKEY_LOCAL_MACHINE, subkeyname, 0, NULL, + REG_OPTION_BACKUP_RESTORE, 0, NULL, &key, NULL); + if (res) + goto out_unload_key; + + value = 1; + + res = RegSetValueEx(key, L"WimBoot", 0, REG_DWORD, + (const BYTE *)&value, sizeof(DWORD)); + if (res) + goto out_close_key; + + res = RegFlushKey(key); + +out_close_key: + res2 = RegCloseKey(key); + if (!res) + res = res2; +out_unload_key: + subkeyname[20] = L'\0'; + RegUnLoadKey(HKEY_LOCAL_MACHINE, subkeyname); +out_check_res: + if (res) { + /* Warning only. */ + set_errno_from_win32_error(res); + WARNING_WITH_ERRNO("Failed to set \\Setup: dword \"WimBoot\"=1 value " + "in registry hive \"%ls\" (err=%"PRIu32")", + ctx->pathbuf.Buffer, (u32)res); + } +out: + return 0; +} + /* Returns the number of wide characters needed to represent the path to the * specified @dentry, relative to the target directory, when extracted. * @@ -357,7 +529,7 @@ dentry_extraction_path_length(const struct wim_dentry *dentry) d = dentry; do { len += d->d_extraction_name_nchars + 1; - d = d->parent; + d = d->d_parent; } while (!dentry_is_root(d) && will_extract_dentry(d)); return --len; /* No leading slash */ @@ -368,7 +540,7 @@ dentry_extraction_path_length(const struct wim_dentry *dentry) * * If the inode has no named data streams, this will be 0. Otherwise, this will * be 1 plus the length of the longest-named data stream, since the data stream - * name must be separated form the path by the ':' character. */ + * name must be separated from the path by the ':' character. */ static size_t inode_longest_named_data_stream_spec(const struct wim_inode *inode) { @@ -426,8 +598,8 @@ build_extraction_path(const struct wim_dentry *dentry, ctx->pathbuf.Length = len * sizeof(wchar_t); p = ctx->pathbuf.Buffer + len; for (d = dentry; - !dentry_is_root(d->parent) && will_extract_dentry(d->parent); - d = d->parent) + !dentry_is_root(d->d_parent) && will_extract_dentry(d->d_parent); + d = d->d_parent) { p -= d->d_extraction_name_nchars; wmemcpy(p, d->d_extraction_name, d->d_extraction_name_nchars); @@ -464,7 +636,7 @@ build_extraction_path_with_ads(const struct wim_dentry *dentry, * The path is saved in ctx->pathbuf and will be null terminated. * * XXX: We could get rid of this if it wasn't needed for the file encryption - * APIs. */ + * APIs, and the registry manipulation in WIMBoot mode. */ static void build_win32_extraction_path(const struct wim_dentry *dentry, struct win32_apply_ctx *ctx) @@ -482,7 +654,7 @@ build_win32_extraction_path(const struct wim_dentry *dentry, ctx->pathbuf.Length += ctx->target_ntpath.Length + sizeof(wchar_t); ctx->pathbuf.Buffer[ctx->pathbuf.Length / sizeof(wchar_t)] = L'\0'; - wimlib_assert(ctx->pathbuf.Length >= 8 && + wimlib_assert(ctx->pathbuf.Length >= 4 * sizeof(wchar_t) && !wmemcmp(ctx->pathbuf.Buffer, L"\\??\\", 4)); ctx->pathbuf.Buffer[1] = L'\\'; @@ -512,24 +684,15 @@ current_path(struct win32_apply_ctx *ctx) static int prepare_target(struct list_head *dentry_list, struct win32_apply_ctx *ctx) { + int ret; NTSTATUS status; size_t path_max; /* Open handle to the target directory (possibly creating it). */ - status = (*func_RtlDosPathNameToNtPathName_U_WithStatus)(ctx->common.target, - &ctx->target_ntpath, - NULL, NULL); - if (!NT_SUCCESS(status)) { - if (status == STATUS_NO_MEMORY) { - return WIMLIB_ERR_NOMEM; - } else { - ERROR("\"%ls\": invalid path name " - "(status=0x%08"PRIx32")", - ctx->common.target, (u32)status); - return WIMLIB_ERR_INVALID_PARAM; - } - } + ret = win32_path_to_nt_path(ctx->common.target, &ctx->target_ntpath); + if (ret) + return ret; ctx->attr.Length = sizeof(ctx->attr); ctx->attr.ObjectName = &ctx->target_ntpath; @@ -581,11 +744,11 @@ prepare_target(struct list_head *dentry_list, struct win32_apply_ctx *ctx) /* When creating an inode that will have a short (DOS) name, we create it using * the long name associated with the short name. This ensures that the short * name gets associated with the correct long name. */ -static const struct wim_dentry * +static struct wim_dentry * first_extraction_alias(const struct wim_inode *inode) { - const struct list_head *next = inode->i_extraction_aliases.next; - const struct wim_dentry *dentry; + struct list_head *next = inode->i_extraction_aliases.next; + struct wim_dentry *dentry; do { dentry = list_entry(next, struct wim_dentry, @@ -674,7 +837,7 @@ adjust_compression_attribute(HANDLE h, const struct wim_dentry *dentry, * handle to the file. If it does, it sets it to NULL. */ static int -maybe_clear_encryption_attribute(HANDLE *h_ret, const struct wim_dentry *dentry, +maybe_clear_encryption_attribute(HANDLE *h_ptr, const struct wim_dentry *dentry, struct win32_apply_ctx *ctx) { if (dentry->d_inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) @@ -691,7 +854,7 @@ maybe_clear_encryption_attribute(HANDLE *h_ret, const struct wim_dentry *dentry, BOOL bret; /* Get current attributes */ - status = (*func_NtQueryInformationFile)(*h_ret, &ctx->iosb, + status = (*func_NtQueryInformationFile)(*h_ptr, &ctx->iosb, &info, sizeof(info), FileBasicInformation); if (NT_SUCCESS(status) && @@ -707,8 +870,8 @@ maybe_clear_encryption_attribute(HANDLE *h_ret, const struct wim_dentry *dentry, * handle to the file so we don't get ERROR_SHARING_VIOLATION. We also * hack together a Win32 path, although we will use the \\?\ prefix so * it will actually be a NT path in disguise... */ - (*func_NtClose)(*h_ret); - *h_ret = NULL; + (*func_NtClose)(*h_ptr); + *h_ptr = NULL; build_win32_extraction_path(dentry, ctx); @@ -727,6 +890,43 @@ maybe_clear_encryption_attribute(HANDLE *h_ret, const struct wim_dentry *dentry, return 0; } +/* Try to enable short name support on the target volume. If successful, return + * true. If unsuccessful, issue a warning and return false. */ +static bool +try_to_enable_short_names(const wchar_t *volume) +{ + HANDLE h; + FILE_FS_PERSISTENT_VOLUME_INFORMATION info; + BOOL bret; + DWORD bytesReturned; + + h = CreateFile(volume, GENERIC_WRITE, + FILE_SHARE_VALID_FLAGS, NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, NULL); + if (h == INVALID_HANDLE_VALUE) + goto fail; + + info.VolumeFlags = 0; + info.FlagMask = PERSISTENT_VOLUME_STATE_SHORT_NAME_CREATION_DISABLED; + info.Version = 1; + info.Reserved = 0; + + bret = DeviceIoControl(h, FSCTL_SET_PERSISTENT_VOLUME_STATE, + &info, sizeof(info), NULL, 0, + &bytesReturned, NULL); + + CloseHandle(h); + + if (!bret) + goto fail; + return true; + +fail: + WARNING("Failed to enable short name support on %ls " + "(err=%"PRIu32")", volume + 4, (u32)GetLastError()); + return false; +} + /* Set the short name on the open file @h which has been created at the location * indicated by @dentry. * @@ -741,29 +941,67 @@ static int set_short_name(HANDLE h, const struct wim_dentry *dentry, struct win32_apply_ctx *ctx) { + + if (!ctx->common.supported_features.short_names) + return 0; + + /* + * Note: The size of the FILE_NAME_INFORMATION buffer must be such that + * FileName contains at least 2 wide characters (4 bytes). Otherwise, + * NtSetInformationFile() will return STATUS_INFO_LENGTH_MISMATCH. This + * is despite the fact that FileNameLength can validly be 0 or 2 bytes, + * with the former case being removing the existing short name if + * present, rather than setting one. + * + * The null terminator is seemingly optional, but to be safe we include + * space for it and zero all unused space. + */ + size_t bufsize = offsetof(FILE_NAME_INFORMATION, FileName) + - dentry->short_name_nbytes; + max(dentry->short_name_nbytes, sizeof(wchar_t)) + + sizeof(wchar_t); u8 buf[bufsize] _aligned_attribute(8); FILE_NAME_INFORMATION *info = (FILE_NAME_INFORMATION *)buf; NTSTATUS status; + memset(buf, 0, bufsize); + info->FileNameLength = dentry->short_name_nbytes; memcpy(info->FileName, dentry->short_name, dentry->short_name_nbytes); +retry: status = (*func_NtSetInformationFile)(h, &ctx->iosb, info, bufsize, FileShortNameInformation); if (NT_SUCCESS(status)) return 0; + if (status == STATUS_SHORT_NAMES_NOT_ENABLED_ON_VOLUME) { + if (dentry->short_name_nbytes == 0) + return 0; + if (!ctx->tried_to_enable_short_names) { + wchar_t volume[7]; + int ret; + + ctx->tried_to_enable_short_names = true; + + ret = win32_get_drive_path(ctx->common.target, + volume); + if (ret) + return ret; + if (try_to_enable_short_names(volume)) + goto retry; + } + } + /* By default, failure to set short names is not an error (since short * names aren't too important anymore...). */ - if (!(ctx->common.extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_SHORT_NAMES)) + if (!(ctx->common.extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_SHORT_NAMES)) { + ctx->num_short_name_failures++; return 0; + } if (status == STATUS_SHORT_NAMES_NOT_ENABLED_ON_VOLUME) { - if (dentry->short_name_nbytes == 0) - return 0; - ERROR("Can't extract short name when short " + ERROR("Can't set short name when short " "names are not enabled on the volume!"); } else { ERROR("Can't set short name on \"%ls\" (status=0x%08"PRIx32")", @@ -961,37 +1199,24 @@ create_directories(struct list_head *dentry_list, * wait until later to actually set the reparse data. */ /* If the root dentry is being extracted, it was already done so - * it prepare_target(). */ - if (dentry_is_root(dentry)) - continue; + * in prepare_target(). */ + if (!dentry_is_root(dentry)) { + ret = create_directory(dentry, ctx); + if (ret) + return ret; - ret = create_directory(dentry, ctx); - if (ret) - return ret; + ret = create_any_empty_ads(dentry, ctx); + if (ret) + return ret; + } - ret = create_any_empty_ads(dentry, ctx); + ret = report_file_created(&ctx->common); if (ret) return ret; } return 0; } -/* Gets the number of bytes to allocate for the specified inode. */ -static void -inode_get_allocation_size(const struct wim_inode *inode, - LARGE_INTEGER *allocation_size_ret) -{ - const struct wim_lookup_table_entry *unnamed_stream; - - /* We just count the unnamed data stream. */ - - unnamed_stream = inode_unnamed_lte_resolved(inode); - if (unnamed_stream) - allocation_size_ret->QuadPart = unnamed_stream->size; - else - allocation_size_ret->QuadPart = 0; -} - /* * Creates the nondirectory file named by @dentry. * @@ -1004,17 +1229,12 @@ create_nondirectory_inode(HANDLE *h_ret, const struct wim_dentry *dentry, struct win32_apply_ctx *ctx) { const struct wim_inode *inode; - LARGE_INTEGER allocation_size; ULONG attrib; NTSTATUS status; bool retried = false; inode = dentry->d_inode; - /* To increase performance, we will pre-allocate space for the file - * data. */ - inode_get_allocation_size(inode, &allocation_size); - /* If the file already exists and has FILE_ATTRIBUTE_SYSTEM and/or * FILE_ATTRIBUTE_HIDDEN, these must be specified in order to supersede * the file. @@ -1040,7 +1260,7 @@ create_nondirectory_inode(HANDLE *h_ret, const struct wim_dentry *dentry, build_extraction_path(dentry, ctx); retry: status = do_create_file(h_ret, GENERIC_READ | GENERIC_WRITE | DELETE, - &allocation_size, attrib, FILE_SUPERSEDE, + NULL, attrib, FILE_SUPERSEDE, FILE_NON_DIRECTORY_FILE, ctx); if (NT_SUCCESS(status)) { int ret; @@ -1198,7 +1418,7 @@ create_links(HANDLE h, const struct wim_dentry *first_dentry, static int create_nondirectory(const struct wim_inode *inode, struct win32_apply_ctx *ctx) { - const struct wim_dentry *first_dentry; + struct wim_dentry *first_dentry; HANDLE h; int ret; @@ -1217,6 +1437,10 @@ create_nondirectory(const struct wim_inode *inode, struct win32_apply_ctx *ctx) if (!ret) ret = create_links(h, first_dentry, ctx); + /* "WIMBoot" extraction: set external backing by the WIM file if needed. */ + if (!ret && unlikely(ctx->common.extract_flags & WIMLIB_EXTRACT_FLAG_WIMBOOT)) + ret = set_external_backing(h, first_dentry, ctx); + (*func_NtClose)(h); return ret; } @@ -1235,9 +1459,12 @@ create_nondirectories(struct list_head *dentry_list, struct win32_apply_ctx *ctx if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) continue; /* Call create_nondirectory() only once per inode */ - if (dentry != inode_first_extraction_dentry(inode)) - continue; - ret = create_nondirectory(inode, ctx); + if (dentry == inode_first_extraction_dentry(inode)) { + ret = create_nondirectory(inode, ctx); + if (ret) + return ret; + } + ret = report_file_created(&ctx->common); if (ret) return ret; } @@ -1282,7 +1509,7 @@ begin_extract_stream_instance(const struct wim_lookup_table_entry *stream, { const struct wim_inode *inode = dentry->d_inode; size_t stream_name_nchars = 0; - LARGE_INTEGER allocation_size; + FILE_ALLOCATION_INFORMATION alloc_info; HANDLE h; NTSTATUS status; @@ -1333,51 +1560,18 @@ begin_extract_stream_instance(const struct wim_lookup_table_entry *stream, return prepare_data_buffer(ctx, stream->size); } - /* Extracting unnamed data stream in WIMBoot mode? */ - if (unlikely(ctx->common.extract_flags & WIMLIB_EXTRACT_FLAG_WIMBOOT) - && (stream_name_nchars == 0) - && (stream->resource_location == RESOURCE_IN_WIM) - && (stream->rspec->wim == ctx->common.wim) - && (stream->size == stream->rspec->uncompressed_size)) - { - int ret = calculate_dentry_full_path(dentry); - if (ret) - return ret; - if (in_prepopulate_list(dentry, ctx)) { - if (ctx->common.progress_func) { - union wimlib_progress_info info; - - info.wimboot_exclude.path_in_wim = dentry->_full_path; - info.wimboot_exclude.extraction_path = current_path(ctx); - - ctx->common.progress_func(WIMLIB_PROGRESS_MSG_WIMBOOT_EXCLUDE, - &info); - FREE(dentry->_full_path); - dentry->_full_path = NULL; - } - } else { - FREE(dentry->_full_path); - dentry->_full_path = NULL; - return wimboot_set_pointer(&ctx->pathbuf, - current_path(ctx), - stream, - ctx->wimboot.data_source_id, - ctx->wimboot.wim_lookup_table_hash, - ctx->wimboot.wof_running); - } - } - - /* Too many open handles? */ - if (ctx->num_open_handles == MAX_OPEN_HANDLES) { - ERROR("Too many open handles!"); + if (ctx->num_open_handles == MAX_OPEN_STREAMS) { + /* XXX: Fix this. But because of the checks in + * extract_stream_list(), this can now only happen on a + * filesystem that does not support hard links. */ + ERROR("Can't extract data: too many open files!"); return WIMLIB_ERR_UNSUPPORTED; } /* Open a new handle */ - allocation_size.QuadPart = stream->size; status = do_create_file(&h, FILE_WRITE_DATA | SYNCHRONIZE, - &allocation_size, 0, FILE_OPEN_IF, + NULL, 0, FILE_OPEN_IF, FILE_SEQUENTIAL_ONLY | FILE_SYNCHRONOUS_IO_NONALERT, ctx); @@ -1390,6 +1584,12 @@ begin_extract_stream_instance(const struct wim_lookup_table_entry *stream, } ctx->open_handles[ctx->num_open_handles++] = h; + + /* Allocate space for the data. */ + alloc_info.AllocationSize.QuadPart = stream->size; + (*func_NtSetInformationFile)(h, &ctx->iosb, + &alloc_info, sizeof(alloc_info), + FileAllocationInformation); return 0; } @@ -1474,7 +1674,13 @@ skip_nt_toplevel_component(const wchar_t *path, size_t path_nchars) /* Given a Windows NT namespace path, such as \??\e:\Windows\System32, return a * pointer to the suffix of the path that is device-relative, such as - * Windows\System32. */ + * Windows\System32. + * + * The path has an explicit length and is not necessarily null terminated. + * + * If the path just something like \??\e: then the returned pointer will point + * just past the colon. In this case the length of the result will be 0 + * characters. */ static const wchar_t * get_device_relative_path(const wchar_t *path, size_t path_nchars) { @@ -1487,7 +1693,7 @@ get_device_relative_path(const wchar_t *path, size_t path_nchars) path = wmemchr(path, L'\\', (end - path)); if (!path) - return orig_path; + return end; do { path++; } while (path != end && *path == L'\\'); @@ -1536,14 +1742,18 @@ try_rpfix(u8 *rpbuf, u16 *rpbuflen_p, struct win32_apply_ctx *ctx) target_ntpath_nchars = ctx->target_ntpath.Length / sizeof(wchar_t); - fixed_subst_name_nchars = target_ntpath_nchars + 1 + relpath_nchars; + fixed_subst_name_nchars = target_ntpath_nchars; + if (relpath_nchars) + fixed_subst_name_nchars += 1 + relpath_nchars; wchar_t fixed_subst_name[fixed_subst_name_nchars]; wmemcpy(fixed_subst_name, ctx->target_ntpath.Buffer, target_ntpath_nchars); - fixed_subst_name[target_ntpath_nchars] = L'\\'; - wmemcpy(&fixed_subst_name[target_ntpath_nchars + 1], - relpath, relpath_nchars); + if (relpath_nchars) { + fixed_subst_name[target_ntpath_nchars] = L'\\'; + wmemcpy(&fixed_subst_name[target_ntpath_nchars + 1], + relpath, relpath_nchars); + } /* Doesn't need to be null-terminated. */ /* Print name should be Win32, but not all NT names can even be @@ -1645,8 +1855,7 @@ extract_encrypted_file(const struct wim_dentry *dentry, /* Called when starting to read a stream for extraction on Windows */ static int -begin_extract_stream(struct wim_lookup_table_entry *stream, - u32 flags, void *_ctx) +begin_extract_stream(struct wim_lookup_table_entry *stream, void *_ctx) { struct win32_apply_ctx *ctx = _ctx; const struct stream_owner *owners = stream_owners(stream); @@ -1690,11 +1899,6 @@ begin_extract_stream(struct wim_lookup_table_entry *stream, } } - if (unlikely(ctx->num_open_handles == 0 && ctx->data_buffer_ptr == NULL)) { - /* The data of this stream isn't actually needed! - * (This can happen in WIMBoot mode.) */ - return BEGIN_STREAM_STATUS_SKIP_STREAM; - } return 0; fail: @@ -1761,7 +1965,10 @@ end_extract_stream(struct wim_lookup_table_entry *stream, int status, void *_ctx dentry = list_first_entry(&ctx->reparse_dentries, struct wim_dentry, tmp_list); build_extraction_path(dentry, ctx); - ERROR("Invalid reparse point", current_path(ctx)); + ERROR("Reparse data of \"%ls\" has size " + "%"PRIu64" bytes (exceeds %u bytes)", + current_path(ctx), stream->size, + REPARSE_DATA_MAX_SIZE); return WIMLIB_ERR_INVALID_REPARSE_DATA; } /* In the WIM format, reparse streams are just the reparse data @@ -1987,6 +2194,9 @@ apply_metadata(struct list_head *dentry_list, struct win32_apply_ctx *ctx) ret = apply_metadata_to_file(dentry, ctx); if (ret) return ret; + ret = report_file_metadata_applied(&ctx->common); + if (ret) + return ret; } return 0; } @@ -1998,23 +2208,42 @@ static void do_warnings(const struct win32_apply_ctx *ctx) { if (ctx->partial_security_descriptors == 0 && - ctx->no_security_descriptors == 0) + ctx->no_security_descriptors == 0 && + ctx->num_short_name_failures == 0) return; WARNING("Extraction to \"%ls\" complete, but with one or more warnings:", ctx->common.target); - if (ctx->partial_security_descriptors != 0) { + if (ctx->num_short_name_failures) { + WARNING("- Could not set short names on %lu files or directories", + ctx->num_short_name_failures); + } + if (ctx->partial_security_descriptors) { WARNING("- Could only partially set the security descriptor\n" " on %lu files or directories.", ctx->partial_security_descriptors); } - if (ctx->no_security_descriptors != 0) { + if (ctx->no_security_descriptors) { WARNING("- Could not set security descriptor at all\n" " on %lu files or directories.", ctx->no_security_descriptors); } - WARNING("To fully restore all security descriptors, run the program\n" - " with Administrator rights."); + if (ctx->partial_security_descriptors || ctx->no_security_descriptors) { + WARNING("To fully restore all security descriptors, run the program\n" + " with Administrator rights."); + } +} + +static uint64_t +count_dentries(const struct list_head *dentry_list) +{ + const struct list_head *cur; + uint64_t count = 0; + + list_for_each(cur, dentry_list) + count++; + + return count; } /* Extract files from a WIM image to a directory on Windows */ @@ -2023,17 +2252,24 @@ win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx) { int ret; struct win32_apply_ctx *ctx = (struct win32_apply_ctx *)_ctx; + uint64_t dentry_count; ret = prepare_target(dentry_list, ctx); if (ret) goto out; - if (ctx->common.extract_flags & WIMLIB_EXTRACT_FLAG_WIMBOOT) { + if (unlikely(ctx->common.extract_flags & WIMLIB_EXTRACT_FLAG_WIMBOOT)) { ret = start_wimboot_extraction(ctx); if (ret) goto out; } + dentry_count = count_dentries(dentry_list); + + ret = start_file_structure_phase(&ctx->common, dentry_count); + if (ret) + goto out; + ret = create_directories(dentry_list, ctx); if (ret) goto out; @@ -2042,6 +2278,10 @@ win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx) if (ret) goto out; + ret = end_file_structure_phase(&ctx->common); + if (ret) + goto out; + struct read_stream_list_callbacks cbs = { .begin_stream = begin_extract_stream, .begin_stream_ctx = ctx, @@ -2054,10 +2294,24 @@ win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx) if (ret) goto out; + ret = start_file_metadata_phase(&ctx->common, dentry_count); + if (ret) + goto out; + ret = apply_metadata(dentry_list, ctx); if (ret) goto out; + ret = end_file_metadata_phase(&ctx->common); + if (ret) + goto out; + + if (unlikely(ctx->common.extract_flags & WIMLIB_EXTRACT_FLAG_WIMBOOT)) { + ret = end_wimboot_extraction(ctx); + if (ret) + goto out; + } + do_warnings(ctx); out: if (ctx->h_target) @@ -2079,5 +2333,8 @@ const struct apply_operations win32_apply_ops = { .name = "Windows", .get_supported_features = win32_get_supported_features, .extract = win32_extract, + .will_externally_back = win32_will_externally_back, .context_size = sizeof(struct win32_apply_ctx), }; + +#endif /* __WIN32__ */