X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_apply.c;h=c0487c62445e6b4d23e0e517c07dca689416a087;hb=969809ef646ec6ceb9730da2eb21884feaff994d;hp=421db26b0d9a6e6f3321d8ccccd19711dacb5ffa;hpb=f62ed8ae0312228f797398e462a132a7cfa319d7;p=wimlib diff --git a/src/win32_apply.c b/src/win32_apply.c index 421db26b..c0487c62 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. */ @@ -98,12 +96,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) */ @@ -237,7 +235,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) @@ -327,8 +325,7 @@ start_wimboot_extraction(struct win32_apply_ctx *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, @@ -336,6 +333,20 @@ start_wimboot_extraction(struct win32_apply_ctx *ctx) if (ret) return ret; + /* TODO: DISM seems to set HKEY_LOCAL_MACHINE\SOFTWARE\Setup + * "WimBoot"=dword:00000001 in the registry of the extracted image. Do + * we need to do this too? I'd really prefer not to be mucking around + * with the extracted files, and certainly not the registry... + * + * It changed two other keys as well: + * + * [HKEY_LOCAL_MACHINE\SOFTWARE\ControlSet001\Control\ProductOptions] + * value "ProductPolicy" + * + * [HKEY_LOCAL_MACHINE\SOFTWARE\ControlSet001\Control\SessionManager\AppCompatCache] + * value "AppCompatCache" + */ + return wimboot_alloc_data_source_id(wim->filename, wim->hdr.guid, wim->current_image, @@ -357,7 +368,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 +379,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 +437,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); @@ -512,33 +523,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). */ - if (func_RtlDosPathNameToNtPathName_U_WithStatus) { - status = (*func_RtlDosPathNameToNtPathName_U_WithStatus)(ctx->common.target, - &ctx->target_ntpath, - NULL, NULL); - } else { - if ((*func_RtlDosPathNameToNtPathName_U)(ctx->common.target, - &ctx->target_ntpath, - NULL, NULL)) - status = STATUS_SUCCESS; - else - status = STATUS_NO_MEMORY; - } - 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; @@ -683,7 +676,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) @@ -700,7 +693,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) && @@ -716,8 +709,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); @@ -970,7 +963,7 @@ 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(). */ + * in prepare_target(). */ if (dentry_is_root(dentry)) continue; @@ -981,6 +974,10 @@ create_directories(struct list_head *dentry_list, ret = create_any_empty_ads(dentry, ctx); if (ret) return ret; + + ret = report_file_created(&ctx->common); + if (ret) + return ret; } return 0; } @@ -1228,6 +1225,9 @@ create_nondirectories(struct list_head *dentry_list, struct win32_apply_ctx *ctx ret = create_nondirectory(inode, ctx); if (ret) return ret; + ret = report_file_created(&ctx->common); + if (ret) + return ret; } return 0; } @@ -1342,7 +1342,9 @@ begin_extract_stream_instance(const struct wim_lookup_table_entry *stream, &info, ctx->common.progctx); FREE(dentry->_full_path); dentry->_full_path = NULL; - return ret; + if (ret) + return ret; + /* Go on and open the file for normal extraction. */ } else { FREE(dentry->_full_path); dentry->_full_path = NULL; @@ -1355,9 +1357,11 @@ begin_extract_stream_instance(const struct wim_lookup_table_entry *stream, } } - /* 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; } @@ -1467,7 +1471,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) { @@ -1480,7 +1490,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'\\'); @@ -1529,14 +1539,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 @@ -1638,8 +1652,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); @@ -1683,11 +1696,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: @@ -1983,6 +1991,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; } @@ -2030,6 +2041,8 @@ win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx) goto out; } + reset_file_progress(&ctx->common); + ret = create_directories(dentry_list, ctx); if (ret) goto out; @@ -2050,6 +2063,8 @@ win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx) if (ret) goto out; + reset_file_progress(&ctx->common); + ret = apply_metadata(dentry_list, ctx); if (ret) goto out; @@ -2077,3 +2092,5 @@ const struct apply_operations win32_apply_ops = { .extract = win32_extract, .context_size = sizeof(struct win32_apply_ctx), }; + +#endif /* __WIN32__ */