X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_apply.c;h=9ed563bb78d7e0996bc6810bc42980f70eeedfb6;hb=707700a1f8f41a8e27bc87d4debffe4fb1d24ec7;hp=5bc1e51f9c12b3ba68a8c37b5ac9629a2d986962;hpb=658ee1d652613948b29c412d75b3732801c2a235;p=wimlib diff --git a/src/win32_apply.c b/src/win32_apply.c index 5bc1e51f..9ed563bb 100644 --- a/src/win32_apply.c +++ b/src/win32_apply.c @@ -151,10 +151,16 @@ struct win32_apply_ctx { /* Number of files on which we couldn't set System Compression. */ unsigned long num_system_compression_failures; - /* The number of files on which we used XPRESS4K System Compression - * rather than a stronger variant, to be compatible with the Windows - * bootloader. */ - unsigned long num_xpress4k_forced_files; + /* The number of files which, for compatibility with the Windows + * bootloader, were not compressed using the requested system + * compression format. This includes matches with the hardcoded pattern + * list only; it does not include matches with patterns in + * [PrepopulateList]. */ + unsigned long num_system_compression_exclusions; + + /* The Windows build number of the image being applied, or 0 if unknown. + */ + u64 windows_build_number; /* Have we tried to enable short name support on the target volume yet? */ @@ -218,6 +224,14 @@ get_vol_flags(const wchar_t *target, DWORD *vol_flags_ret, } } +/* Is the image being extracted an OS image for Windows 10 or later? */ +static bool +is_image_windows_10_or_later(struct win32_apply_ctx *ctx) +{ + /* Note: if no build number is available, this returns false. */ + return ctx->windows_build_number >= 10240; +} + static const wchar_t * current_path(struct win32_apply_ctx *ctx); @@ -672,8 +686,8 @@ start_wimboot_extraction(struct list_head *dentry_list, struct win32_apply_ctx * int ret; struct wim_dentry *dentry; - if (!wim_info_get_wimboot(ctx->common.wim->wim_info, - ctx->common.wim->current_image)) + if (!xml_get_wimboot(ctx->common.wim->xml_info, + ctx->common.wim->current_image)) WARNING("The WIM image is not marked as WIMBoot compatible. This usually\n" " means it is not intended to be used to back a Windows operating\n" " system. Proceeding anyway."); @@ -975,6 +989,9 @@ open_target_directory(struct win32_apply_ctx *ctx) ctx->attr.Length = sizeof(ctx->attr); ctx->attr.RootDirectory = NULL; ctx->attr.ObjectName = &ctx->target_ntpath; + + /* Don't use FILE_OPEN_REPARSE_POINT here; we want the extraction to + * happen at the directory "pointed to" by the reparse point. */ status = (*func_NtCreateFile)(&ctx->h_target, FILE_TRAVERSE, &ctx->attr, @@ -984,7 +1001,6 @@ open_target_directory(struct win32_apply_ctx *ctx) FILE_SHARE_VALID_FLAGS, FILE_OPEN_IF, FILE_DIRECTORY_FILE | - FILE_OPEN_REPARSE_POINT | FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0); @@ -2320,14 +2336,15 @@ set_system_compression(HANDLE h, int format) return status; } -/* Hard-coded list of files which the Windows bootloader needs to access before - * the WOF driver has been loaded. Since the Windows bootloader only supports - * the XPRESS4K variant of System Compression, such files should not be - * compressed using other variants. */ -static wchar_t *xpress4k_only_pattern_strings[] = { +/* Hard-coded list of files which the Windows bootloader may need to access + * before the WOF driver has been loaded. */ +static wchar_t *bootloader_pattern_strings[] = { L"*winload.*", L"*winresume.*", L"\\Windows\\AppPatch\\drvmain.sdb", + L"\\Windows\\Boot\\DVD\\*", + L"\\Windows\\Boot\\EFI\\*", + L"\\Windows\\bootstat.dat", L"\\Windows\\Fonts\\vgaoem.fon", L"\\Windows\\Fonts\\vgasys.fon", L"\\Windows\\INF\\errata.inf", @@ -2352,9 +2369,9 @@ static wchar_t *xpress4k_only_pattern_strings[] = { L"\\Windows\\System32\\CodeIntegrity\\driver.stl", }; -static const struct string_set xpress4k_only_patterns = { - .strings = xpress4k_only_pattern_strings, - .num_strings = ARRAY_LEN(xpress4k_only_pattern_strings), +static const struct string_set bootloader_patterns = { + .strings = bootloader_pattern_strings, + .num_strings = ARRAY_LEN(bootloader_pattern_strings), }; static NTSTATUS @@ -2365,13 +2382,19 @@ set_system_compression_on_inode(struct wim_inode *inode, int format, NTSTATUS status; HANDLE h; - /* If needed, force the XPRESS4K format for this file. */ - if (format != FILE_PROVIDER_COMPRESSION_FORMAT_XPRESS4K) { + /* If it may be needed for compatibility with the Windows bootloader, + * force this file to XPRESS4K or uncompressed format. The bootloader + * of Windows 10 supports XPRESS4K only; older versions don't support + * system compression at all. */ + if (!is_image_windows_10_or_later(ctx) || + format != FILE_PROVIDER_COMPRESSION_FORMAT_XPRESS4K) + { /* We need to check the patterns against every name of the * inode, in case any of them match. */ struct wim_dentry *dentry; inode_for_each_extraction_alias(dentry, inode) { bool incompatible; + bool warned; if (calculate_dentry_full_path(dentry)) { ERROR("Unable to compute file path!"); @@ -2379,12 +2402,18 @@ set_system_compression_on_inode(struct wim_inode *inode, int format, } incompatible = match_pattern_list(dentry->d_full_path, - &xpress4k_only_patterns); + &bootloader_patterns); FREE(dentry->d_full_path); dentry->d_full_path = NULL; - if (incompatible) { - if (ctx->num_xpress4k_forced_files++ == 0) { + if (!incompatible) + continue; + + warned = (ctx->num_system_compression_exclusions++ > 0); + + if (is_image_windows_10_or_later(ctx)) { + /* Force to XPRESS4K */ + if (!warned) { WARNING("For compatibility with the " "Windows bootloader, some " "files are being\n" @@ -2396,7 +2425,19 @@ set_system_compression_on_inode(struct wim_inode *inode, int format, } format = FILE_PROVIDER_COMPRESSION_FORMAT_XPRESS4K; break; + } else { + /* Force to uncompressed */ + if (!warned) { + WARNING("For compatibility with the " + "Windows bootloader, some " + "files will not\n" + " be compressed with" + " system compression " + "(\"compacted\")."); + } + return STATUS_SUCCESS; } + } } @@ -2899,6 +2940,9 @@ win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx) goto out; } + ctx->windows_build_number = xml_get_windows_build_number(ctx->common.wim->xml_info, + ctx->common.wim->current_image); + dentry_count = count_dentries(dentry_list); ret = start_file_structure_phase(&ctx->common, dentry_count);