X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimboot.c;h=740db91af75f3c62fa5d54e7dae0af5244d6f2d5;hp=9a61ba510bab13075ef60e40ceab270fcae47336;hb=18f09fc4fa05185897b2c3789f90cc8e3fd872c8;hpb=b8ebc57d493d7b6e660a50f7789fcb5451f5d77d diff --git a/src/wimboot.c b/src/wimboot.c index 9a61ba51..740db91a 100644 --- a/src/wimboot.c +++ b/src/wimboot.c @@ -11,7 +11,7 @@ */ /* - * Copyright (C) 2014 Eric Biggers + * Copyright (C) 2014-2016 Eric Biggers * * This file is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free @@ -36,8 +36,9 @@ #include "wimlib/win32_common.h" #include "wimlib/assert.h" +#include "wimlib/blob_table.h" +#include "wimlib/inode.h" #include "wimlib/error.h" -#include "wimlib/lookup_table.h" #include "wimlib/util.h" #include "wimlib/wimboot.h" #include "wimlib/win32.h" @@ -186,8 +187,8 @@ query_partition_and_disk_info(const wchar_t *path, } if (part_info->PartitionStyle == PARTITION_STYLE_GPT) { - BUILD_BUG_ON(sizeof(part_info->Gpt.PartitionId) != - sizeof(drive_info->Gpt.DiskId)); + STATIC_ASSERT(sizeof(part_info->Gpt.PartitionId) == + sizeof(drive_info->Gpt.DiskId)); if (!memcmp(&part_info->Gpt.PartitionId, &drive_info->Gpt.DiskId, sizeof(drive_info->Gpt.DiskId))) @@ -217,30 +218,6 @@ out: return ret; } -/* - * Allocate a new WIM data source ID. - * - * @old_hdr - * Previous WimOverlay.dat contents, or NULL if file did not exist. - * - * Returns the new data source ID. - */ -static u64 -alloc_new_data_source_id(const struct WimOverlay_dat_header *old_hdr) -{ - if (!old_hdr) - return 0; - - for (u64 id = 0; ; id++) { - for (u32 i = 0; i < old_hdr->num_entries_1; i++) - if (id == old_hdr->entry_1s[i].data_source_id) - goto next; - return id; - next: - ; - } -} - /* * Calculate the size of WimOverlay.dat with one entry added. * @@ -262,7 +239,7 @@ calculate_wimoverlay_dat_size(const struct WimOverlay_dat_header *old_hdr, size_64 = sizeof(struct WimOverlay_dat_header); if (old_hdr) { - for (u32 i = 0; i < old_hdr->num_entries_1; i++) { + for (u32 i = 0; i < old_hdr->num_entries; i++) { size_64 += sizeof(struct WimOverlay_dat_entry_1); size_64 += old_hdr->entry_1s[i].entry_2_length; } @@ -346,7 +323,7 @@ static u8 * fill_in_wimoverlay_dat(u8 *buf, const struct WimOverlay_dat_header *old_hdr, const wchar_t *wim_path, - const u8 wim_guid[WIM_GUID_LEN], + const u8 wim_guid[GUID_SIZE], int image, u64 new_data_source_id, const PARTITION_INFORMATION_EX *part_info, @@ -365,17 +342,16 @@ fill_in_wimoverlay_dat(u8 *buf, new_hdr->magic = WIMOVERLAY_DAT_MAGIC; new_hdr->wim_provider_version = WIM_PROVIDER_CURRENT_VERSION; new_hdr->unknown_0x08 = 0x00000028; - new_hdr->num_entries_1 = (old_hdr ? old_hdr->num_entries_1 : 0) + 1; - new_hdr->num_entries_2 = (old_hdr ? old_hdr->num_entries_2 : 0) + 1; - new_hdr->unknown_0x14 = 0x00000000; + new_hdr->num_entries = (old_hdr ? old_hdr->num_entries : 0) + 1; + new_hdr->next_data_source_id = (old_hdr ? old_hdr->next_data_source_id : 0) + 1; p += sizeof(struct WimOverlay_dat_header); /* Copy WIM-specific information for old entries */ entry_2_offset = sizeof(struct WimOverlay_dat_header) + - (new_hdr->num_entries_1 * sizeof(struct WimOverlay_dat_entry_1)); + (new_hdr->num_entries * sizeof(struct WimOverlay_dat_entry_1)); if (old_hdr) { - for (u32 i = 0; i < old_hdr->num_entries_1; i++) { + for (u32 i = 0; i < old_hdr->num_entries; i++) { new_entry_1 = (struct WimOverlay_dat_entry_1 *)p; p = mempcpy(p, &old_hdr->entry_1s[i], @@ -394,14 +370,14 @@ fill_in_wimoverlay_dat(u8 *buf, new_entry_1->entry_2_length = new_entry_2_size; new_entry_1->wim_type = WIM_BOOT_NOT_OS_WIM; new_entry_1->wim_index = image; - BUILD_BUG_ON(sizeof(new_entry_1->guid) != WIM_GUID_LEN); - memcpy(new_entry_1->guid, wim_guid, WIM_GUID_LEN); + STATIC_ASSERT(sizeof(new_entry_1->guid) == GUID_SIZE); + copy_guid(new_entry_1->guid, wim_guid); p += sizeof(struct WimOverlay_dat_entry_1); /* Copy WIM location information for old entries */ if (old_hdr) { - for (u32 i = 0; i < old_hdr->num_entries_1; i++) { + for (u32 i = 0; i < old_hdr->num_entries; i++) { wimlib_assert(new_hdr->entry_1s[i].entry_2_offset == p - buf); wimlib_assert(old_hdr->entry_1s[i].entry_2_length == new_hdr->entry_1s[i].entry_2_length); @@ -437,21 +413,21 @@ fill_in_wimoverlay_dat(u8 *buf, new_entry_2->disk.mbr.padding[1] = 0x00000000; new_entry_2->disk.mbr.padding[2] = 0x00000000; } else { - BUILD_BUG_ON(sizeof(new_entry_2->partition.gpt.part_unique_guid) != - sizeof(part_info->Gpt.PartitionId)); + STATIC_ASSERT(sizeof(new_entry_2->partition.gpt.part_unique_guid) == + sizeof(part_info->Gpt.PartitionId)); memcpy(new_entry_2->partition.gpt.part_unique_guid, &part_info->Gpt.PartitionId, sizeof(part_info->Gpt.PartitionId)); new_entry_2->partition_table_type = WIMOVERLAY_PARTITION_TYPE_GPT; - BUILD_BUG_ON(sizeof(new_entry_2->disk.gpt.disk_guid) != - sizeof(disk_info->Gpt.DiskId)); + STATIC_ASSERT(sizeof(new_entry_2->disk.gpt.disk_guid) == + sizeof(disk_info->Gpt.DiskId)); memcpy(new_entry_2->disk.gpt.disk_guid, &disk_info->Gpt.DiskId, sizeof(disk_info->Gpt.DiskId)); - BUILD_BUG_ON(sizeof(new_entry_2->disk.gpt.disk_guid) != - sizeof(new_entry_2->partition.gpt.part_unique_guid)); + STATIC_ASSERT(sizeof(new_entry_2->disk.gpt.disk_guid) == + sizeof(new_entry_2->partition.gpt.part_unique_guid)); } new_entry_2->unknown_0x58[0] = 0x00000000; new_entry_2->unknown_0x58[1] = 0x00000000; @@ -491,7 +467,7 @@ fill_in_wimoverlay_dat(u8 *buf, static int prepare_wimoverlay_dat(const struct WimOverlay_dat_header *old_hdr, const wchar_t *wim_path, - const u8 wim_guid[WIM_GUID_LEN], + const u8 wim_guid[GUID_SIZE], int image, void **new_contents_ret, u32 *new_contents_size_ret, @@ -510,7 +486,7 @@ prepare_wimoverlay_dat(const struct WimOverlay_dat_header *old_hdr, if (ret) return ret; - new_data_source_id = alloc_new_data_source_id(old_hdr); + new_data_source_id = old_hdr ? old_hdr->next_data_source_id : 0; new_entry_2_size = sizeof(struct WimOverlay_dat_entry_2) + ((wcslen(wim_path) - 2 + 1) * sizeof(wchar_t)); @@ -585,7 +561,7 @@ retry: status = (*func_RtlCreateSystemVolumeInformationFolder)(&str); - err2 = (*func_RtlNtStatusToDosError)(status); + err2 = RtlNtStatusToDosError(status); if (err2 == ERROR_SUCCESS) { if (!already_retried) { already_retried = true; @@ -636,9 +612,7 @@ retry: if (hdr->magic != WIMOVERLAY_DAT_MAGIC || hdr->wim_provider_version != WIM_PROVIDER_CURRENT_VERSION || - hdr->unknown_0x08 != 0x00000028 || - (hdr->num_entries_1 != hdr->num_entries_2) || - hdr->unknown_0x14 != 0x00000000) + hdr->unknown_0x08 != 0x00000028) { ERROR("\"%ls\": Header contains unexpected data:", path); if (wimlib_print_errors) { @@ -651,23 +625,33 @@ retry: goto out_free_contents; } - if ((u64)hdr->num_entries_1 * sizeof(struct WimOverlay_dat_entry_1) > + if ((u64)hdr->num_entries * sizeof(struct WimOverlay_dat_entry_1) > info.nFileSizeLow - sizeof(struct WimOverlay_dat_header)) { ERROR("\"%ls\": File is unexpectedly small " "(only %"PRIu32" bytes, but has %"PRIu32" entries)", - path, (u32)info.nFileSizeLow, hdr->num_entries_1); + path, (u32)info.nFileSizeLow, hdr->num_entries); ret = WIMLIB_ERR_UNSUPPORTED; goto out_free_contents; } - for (u32 i = 0; i < hdr->num_entries_1; i++) { + for (u32 i = 0; i < hdr->num_entries; i++) { const struct WimOverlay_dat_entry_1 *entry_1; const struct WimOverlay_dat_entry_2 *entry_2; u32 wim_file_name_length; entry_1 = &hdr->entry_1s[i]; + if (entry_1->data_source_id >= hdr->next_data_source_id) { + ERROR("\"%ls\": value of next_data_source_id " + "(0x%016"PRIx64") is unexpected, since entry " + "%"PRIu32" has data source ID 0x%016"PRIx64, + path, hdr->next_data_source_id, + i, entry_1->data_source_id); + ret = WIMLIB_ERR_UNSUPPORTED; + goto out_free_contents; + } + if (((u64)entry_1->entry_2_offset + (u64)entry_1->entry_2_length) > info.nFileSizeLow) @@ -790,17 +774,17 @@ out_free_contents: */ static int update_wimoverlay_manually(const wchar_t *drive, const wchar_t *wim_path, - const u8 wim_guid[WIM_GUID_LEN], + const u8 wim_guid[GUID_SIZE], int image, u64 *data_source_id_ret) { wchar_t path_main[] = L"A:\\System Volume Information\\WimOverlay.dat"; wchar_t path_backup[] = L"A:\\System Volume Information\\WimOverlay.backup"; wchar_t path_wimlib_backup[] = L"A:\\System Volume Information\\WimOverlay.wimlib_backup"; wchar_t path_new[] = L"A:\\System Volume Information\\WimOverlay.wimlib_new"; - void *old_contents; - void *new_contents; - u32 new_contents_size; - u64 new_data_source_id; + void *old_contents = NULL; + void *new_contents = NULL; + u32 new_contents_size = 0; + u64 new_data_source_id = -1; int ret; wimlib_assert(drive[0] != L'\0' && @@ -865,47 +849,6 @@ out: return ret; } -/* Try to attach an instance of the Windows Overlay File System Filter Driver to - * the specified drive (such as C:) */ -static bool -try_to_attach_wof(const wchar_t *drive) -{ - HMODULE fltlib; - bool retval = false; - - /* Use FilterAttach() from Fltlib.dll. */ - - fltlib = LoadLibrary(L"Fltlib.dll"); - - if (!fltlib) { - WARNING("Failed to load Fltlib.dll"); - return retval; - } - - HRESULT (WINAPI *func_FilterAttach)(LPCWSTR lpFilterName, - LPCWSTR lpVolumeName, - LPCWSTR lpInstanceName, - DWORD dwCreatedInstanceNameLength, - LPWSTR lpCreatedInstanceName); - - func_FilterAttach = (void *)GetProcAddress(fltlib, "FilterAttach"); - - if (func_FilterAttach) { - HRESULT res; - - res = (*func_FilterAttach)(L"WoF", drive, NULL, 0, NULL); - - if (res == S_OK) - retval = true; - } else { - WARNING("FilterAttach() does not exist in Fltlib.dll"); - } - - FreeLibrary(fltlib); - - return retval; -} - /* * Allocate a WOF data source ID for a WIM file. * @@ -926,7 +869,7 @@ try_to_attach_wof(const wchar_t *drive) */ int wimboot_alloc_data_source_id(const wchar_t *wim_path, - const u8 wim_guid[WIM_GUID_LEN], + const u8 wim_guid[GUID_SIZE], int image, const wchar_t *target, u64 *data_source_id_ret, bool *wof_running_ret) { @@ -1000,7 +943,7 @@ retry_ioctl: CloseHandle(h); h = INVALID_HANDLE_VALUE; tried_to_attach_wof = true; - if (try_to_attach_wof(drive_path + 4)) + if (win32_try_to_attach_wof(drive_path + 4)) goto retry_ioctl; } ret = WIMLIB_ERR_UNSUPPORTED; @@ -1057,12 +1000,12 @@ out: * * @h * Open handle to the file, with GENERIC_WRITE access. - * @lte - * Unnamed data stream of the file. + * @blob + * The blob for the unnamed data stream of the file. * @data_source_id * Allocated identifier for the WIM data source on the destination volume. - * @lookup_table_hash - * SHA-1 message digest of the WIM's lookup table. + * @blob_table_hash + * SHA-1 message digest of the WIM's blob table. * @wof_running * %true if the WOF driver appears to be available and working; %false if * not. @@ -1071,9 +1014,9 @@ out: */ bool wimboot_set_pointer(HANDLE h, - const struct wim_lookup_table_entry *lte, + const struct blob_descriptor *blob, u64 data_source_id, - const u8 lookup_table_hash[SHA1_HASH_SIZE], + const u8 blob_table_hash[SHA1_HASH_SIZE], bool wof_running) { DWORD bytes_returned; @@ -1096,9 +1039,9 @@ wimboot_set_pointer(HANDLE h, in.wim_info.version = WIM_PROVIDER_CURRENT_VERSION; in.wim_info.flags = 0; in.wim_info.data_source_id = data_source_id; - copy_hash(in.wim_info.resource_hash, lte->hash); + copy_hash(in.wim_info.unnamed_data_stream_hash, blob->hash); - /* lookup_table_hash is not necessary */ + /* blob_table_hash is not necessary */ if (!DeviceIoControl(h, FSCTL_SET_EXTERNAL_BACKING, &in, sizeof(in), NULL, 0, @@ -1134,11 +1077,11 @@ wimboot_set_pointer(HANDLE h, struct wim_provider_rpdata wim_info; } in; - BUILD_BUG_ON(sizeof(in) != 8 + - sizeof(struct wof_external_info) + - sizeof(struct wim_provider_rpdata)); + STATIC_ASSERT(sizeof(in) == 8 + + sizeof(struct wof_external_info) + + sizeof(struct wim_provider_rpdata)); - in.hdr.rptag = WIMLIB_REPARSE_TAG_WOF; + in.hdr.rptag = WIM_IO_REPARSE_TAG_WOF; in.hdr.rpdatalen = sizeof(in) - sizeof(in.hdr); in.hdr.rpreserved = 0; @@ -1148,11 +1091,11 @@ wimboot_set_pointer(HANDLE h, in.wim_info.version = 2; in.wim_info.flags = 0; in.wim_info.data_source_id = data_source_id; - copy_hash(in.wim_info.resource_hash, lte->hash); - copy_hash(in.wim_info.wim_lookup_table_hash, lookup_table_hash); - in.wim_info.stream_uncompressed_size = lte->size; - in.wim_info.stream_compressed_size = lte->rspec->size_in_wim; - in.wim_info.stream_offset_in_wim = lte->rspec->offset_in_wim; + copy_hash(in.wim_info.unnamed_data_stream_hash, blob->hash); + copy_hash(in.wim_info.blob_table_hash, blob_table_hash); + in.wim_info.unnamed_data_stream_size = blob->size; + in.wim_info.unnamed_data_stream_size_in_wim = blob->rdesc->size_in_wim; + in.wim_info.unnamed_data_stream_offset_in_wim = blob->rdesc->offset_in_wim; if (!DeviceIoControl(h, FSCTL_SET_REPARSE_POINT, &in, sizeof(in), NULL, 0, &bytes_returned, NULL)) @@ -1167,7 +1110,7 @@ wimboot_set_pointer(HANDLE h, return false; if (!SetFilePointerEx(h, - (LARGE_INTEGER){ .QuadPart = lte->size}, + (LARGE_INTEGER){ .QuadPart = blob->size}, NULL, FILE_BEGIN)) return false;