X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_apply.c;h=56f82b6bfab953922d7c8b8eb39ba8b7f66d9e28;hb=290ada296b4be9bb48687a8e2bf6222b5c2daad7;hp=2b0d5a4bdc221c9b5953d7e8361b13f986a6de26;hpb=0e8a218c22b3c5d42ccc368b3b45d270f942cfde;p=wimlib diff --git a/src/win32_apply.c b/src/win32_apply.c index 2b0d5a4b..56f82b6b 100644 --- a/src/win32_apply.c +++ b/src/win32_apply.c @@ -30,63 +30,45 @@ #include "wimlib/win32_common.h" #include "wimlib/apply.h" -#include "wimlib/capture.h" +#include "wimlib/capture.h" /* for mangle_pat() */ #include "wimlib/dentry.h" #include "wimlib/error.h" #include "wimlib/lookup_table.h" -#include "wimlib/paths.h" +#include "wimlib/resource.h" #include "wimlib/textfile.h" #include "wimlib/xml.h" +#include "wimlib/wildcard.h" #include "wimlib/wim.h" #include "wimlib/wimboot.h" -static void -ctx_save_data_source_id(struct apply_ctx *ctx, u64 data_source_id) -{ - ctx->private[0] = data_source_id & 0xFFFFFFFF; - ctx->private[1] = data_source_id >> 32; -} - -static u64 -ctx_get_data_source_id(const struct apply_ctx *ctx) -{ - return (u32)ctx->private[0] | ((u64)(u32)ctx->private[1] << 32); -} - -static void -set_prepopulate_pats(struct apply_ctx *ctx, struct string_set *s) -{ - ctx->private[2] = (intptr_t)s; -} - -static struct string_set * -alloc_prepopulate_pats(struct apply_ctx *ctx) -{ - struct string_set *s = CALLOC(1, sizeof(*s)); - set_prepopulate_pats(ctx, s); - return s; -} +struct win32_apply_private_data { + u64 data_source_id; + struct string_set *prepopulate_pats; + void *mem_prepopulate_pats; + u8 wim_lookup_table_hash[SHA1_HASH_SIZE]; + bool wof_running; +}; -static struct string_set * -get_prepopulate_pats(struct apply_ctx *ctx) +static struct win32_apply_private_data * +get_private_data(struct apply_ctx *ctx) { - return (struct string_set *)(ctx->private[2]); + BUILD_BUG_ON(sizeof(ctx->private) < sizeof(struct win32_apply_private_data)); + return (struct win32_apply_private_data *)(ctx->private); } static void -free_prepopulate_pats(struct apply_ctx *ctx) +free_prepopulate_pats(struct win32_apply_private_data *dat) { - struct string_set *s; - - s = get_prepopulate_pats(ctx); - if (s) { - FREE(s->strings); - FREE(s); + if (dat->prepopulate_pats) { + FREE(dat->prepopulate_pats->strings); + FREE(dat->prepopulate_pats); + dat->prepopulate_pats = NULL; } - set_prepopulate_pats(ctx, NULL); - FREE((void *)ctx->private[3]); - ctx->private[3] = (intptr_t)NULL; + if (dat->mem_prepopulate_pats) { + FREE(dat->mem_prepopulate_pats); + dat->mem_prepopulate_pats = NULL; + } } static int @@ -102,6 +84,7 @@ load_prepopulate_pats(struct apply_ctx *ctx) void *buf; void *mem; struct text_file_section sec; + struct win32_apply_private_data *dat = get_private_data(ctx); dentry = get_dentry(ctx->wim, path, WIMLIB_CASE_INSENSITIVE); if (!dentry || @@ -118,7 +101,7 @@ load_prepopulate_pats(struct apply_ctx *ctx) if (ret) return ret; - s = alloc_prepopulate_pats(ctx); + s = CALLOC(1, sizeof(struct string_set)); if (!s) { FREE(buf); return WIMLIB_ERR_NOMEM; @@ -131,30 +114,46 @@ load_prepopulate_pats(struct apply_ctx *ctx) LOAD_TEXT_FILE_REMOVE_QUOTES | LOAD_TEXT_FILE_NO_WARNINGS, mangle_pat); + BUILD_BUG_ON(OS_PREFERRED_PATH_SEPARATOR != WIM_PATH_SEPARATOR); FREE(buf); if (ret) { - free_prepopulate_pats(ctx); + FREE(s); return ret; } - ctx->private[3] = (intptr_t)mem; + dat->prepopulate_pats = s; + dat->mem_prepopulate_pats = mem; return 0; } static bool -in_prepopulate_list(struct wim_dentry *dentry, - struct apply_ctx *ctx) +in_prepopulate_list(struct wim_dentry *dentry, struct apply_ctx *ctx) { struct string_set *pats; const tchar *path; + size_t path_nchars; - pats = get_prepopulate_pats(ctx); - if (!pats) + pats = get_private_data(ctx)->prepopulate_pats; + if (!pats || !pats->num_strings) return false; + path = dentry_full_path(dentry); if (!path) return false; - return match_pattern(path, path_basename(path), pats); + path_nchars = tstrlen(path); + + for (size_t i = 0; i < pats->num_strings; i++) + if (match_path(path, path_nchars, pats->strings[i], + OS_PREFERRED_PATH_SEPARATOR, true)) + return true; + + return false; +} + +static int +hash_lookup_table(WIMStruct *wim, u8 hash[SHA1_HASH_SIZE]) +{ + return wim_reshdr_to_hash(&wim->hdr.lookup_table_reshdr, wim, hash); } static int @@ -163,10 +162,11 @@ win32_start_extract(const wchar_t *path, struct apply_ctx *ctx) int ret; unsigned vol_flags; bool supports_SetFileShortName; + struct win32_apply_private_data *dat = get_private_data(ctx); ret = win32_get_vol_flags(path, &vol_flags, &supports_SetFileShortName); if (ret) - return ret; + goto err; ctx->supported_features.archive_files = 1; ctx->supported_features.hidden_files = 1; @@ -207,32 +207,38 @@ win32_start_extract(const wchar_t *path, struct apply_ctx *ctx) ret = load_prepopulate_pats(ctx); if (ret == WIMLIB_ERR_NOMEM) - return ret; - - u64 data_source_id; + goto err; if (!wim_info_get_wimboot(ctx->wim->wim_info, ctx->wim->current_image)) WARNING("Image is not marked as WIMBoot compatible!"); + + ret = hash_lookup_table(ctx->wim, dat->wim_lookup_table_hash); + if (ret) + goto err; + ret = wimboot_alloc_data_source_id(ctx->wim->filename, + ctx->wim->hdr.guid, ctx->wim->current_image, - path, &data_source_id); - if (ret) { - free_prepopulate_pats(ctx); - return ret; - } - - ctx_save_data_source_id(ctx, data_source_id); + path, + &dat->data_source_id, + &dat->wof_running); + if (ret) + goto err; } return 0; + +err: + free_prepopulate_pats(dat); + return ret; } static int win32_finish_extract(struct apply_ctx *ctx) { - free_prepopulate_pats(ctx); + free_prepopulate_pats(get_private_data(ctx)); return 0; } @@ -396,23 +402,48 @@ win32_extract_stream(const wchar_t *path, const wchar_t *stream_name, creationDisposition, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, NULL); - if (h == INVALID_HANDLE_VALUE) - goto error; + if (h == INVALID_HANDLE_VALUE) { + set_errno_from_GetLastError(); + ret = WIMLIB_ERR_OPEN; + goto out; + } - ret = 0; - if (!lte) + if (!lte) { + ret = 0; goto out_close_handle; + } + + if (!SetFilePointerEx(h, + (LARGE_INTEGER) { .QuadPart = lte->size}, + NULL, + FILE_BEGIN)) + goto write_error; + + if (!SetEndOfFile(h)) + goto write_error; + + if (!SetFilePointerEx(h, + (LARGE_INTEGER) { .QuadPart = 0}, + NULL, + FILE_BEGIN)) + goto write_error; + ret = extract_stream(lte, lte->size, win32_extract_wim_chunk, h); -out_close_handle: - if (!CloseHandle(h)) - goto error; - if (ret && !errno) - errno = -1; - return ret; + goto out_close_handle; -error: +write_error: set_errno_from_GetLastError(); - return WIMLIB_ERR_WRITE; + ret = WIMLIB_ERR_WRITE; + +out_close_handle: + if (!CloseHandle(h)) { + if (!ret) { + set_errno_from_GetLastError(); + ret = WIMLIB_ERR_WRITE; + } + } +out: + return ret; } static int @@ -425,11 +456,27 @@ win32_extract_unnamed_stream(file_spec_t file, && lte && lte->resource_location == RESOURCE_IN_WIM && lte->rspec->wim == ctx->wim - && !in_prepopulate_list(dentry, ctx)) + && lte->size == lte->rspec->uncompressed_size) { - return wimboot_set_pointer(file.path, - ctx_get_data_source_id(ctx), - lte->hash); + if (in_prepopulate_list(dentry, ctx)) { + if (ctx->progress_func) { + union wimlib_progress_info info; + + info.wimboot_exclude.path_in_wim = dentry->_full_path; + info.wimboot_exclude.extraction_path = file.path; + + ctx->progress_func(WIMLIB_PROGRESS_MSG_WIMBOOT_EXCLUDE, + &info); + } + } else { + const struct win32_apply_private_data *dat; + + dat = get_private_data(ctx); + return wimboot_set_pointer(file.path, lte, + dat->data_source_id, + dat->wim_lookup_table_hash, + dat->wof_running); + } } return win32_extract_stream(file.path, NULL, 0, lte, ctx);