X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fxml.c;h=24fb32875da07b10bb9f00f15493ab3796494be7;hb=6f535b981a9192e1e2a38b3a8aaa8cd8124d8e96;hp=52cd441fe2ad38008c4f643b2020ef181a841c73;hpb=61db93f82eca3fe9f7676355c709c58cc425a6ad;p=wimlib diff --git a/src/xml.c b/src/xml.c index 52cd441f..24fb3287 100644 --- a/src/xml.c +++ b/src/xml.c @@ -7,43 +7,41 @@ /* * Copyright (C) 2012, 2013 Eric Biggers * - * This file is part of wimlib, a library for working with WIM files. + * 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 + * Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at your option) - * any later version. - * - * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. * - * You should have received a copy of the GNU General Public License - * along with wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU Lesser General Public License + * along with this file; if not, see http://www.gnu.org/licenses/. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include +#include +#include +#include + +#include "wimlib/assert.h" +#include "wimlib/blob_table.h" #include "wimlib/dentry.h" #include "wimlib/encoding.h" #include "wimlib/error.h" #include "wimlib/file_io.h" -#include "wimlib/lookup_table.h" #include "wimlib/metadata.h" #include "wimlib/resource.h" #include "wimlib/timestamp.h" #include "wimlib/xml.h" - -#include -#include -#include -#include -#include -#include -#include +#include "wimlib/write.h" /* Structures used to form an in-memory representation of the XML data (other * than the raw parse tree from libxml). */ @@ -61,6 +59,7 @@ struct windows_info { tchar *product_name; tchar *edition_id; tchar *installation_type; + tchar *pkeyconfigversion; tchar *hal; tchar *product_type; tchar *product_suite; @@ -87,7 +86,11 @@ struct image_info { tchar *display_name; tchar *display_description; tchar *flags; - struct wim_lookup_table *lookup_table; /* temporary field */ + bool wimboot; + + /* Note: must update clone_image_info() if adding new fields here */ + + struct blob_table *blob_table; /* temporary field */ }; /* A struct wim_info structure corresponds to the entire XML data for a WIM file. */ @@ -132,36 +135,80 @@ windows_info_xml_string_specs[] = { u64 wim_info_get_total_bytes(const struct wim_info *info) { - if (!info) + if (info) + return info->total_bytes; + else + return 0; +} + +u64 +wim_info_get_image_hard_link_bytes(const struct wim_info *info, int image) +{ + if (info) + return info->images[image - 1].hard_link_bytes; + else return 0; - return info->total_bytes; } u64 wim_info_get_image_total_bytes(const struct wim_info *info, int image) { - return info->images[image - 1].total_bytes; + if (info) + return info->images[image - 1].total_bytes; + else + return 0; } unsigned wim_info_get_num_images(const struct wim_info *info) { - return info->num_images; + if (info) + return info->num_images; + else + return 0; +} + +void +wim_info_set_wimboot(struct wim_info *info, int image, bool value) +{ + info->images[image - 1].wimboot = value; +} + +bool +wim_info_get_wimboot(const struct wim_info *info, int image) +{ + return info->images[image - 1].wimboot; } +/* Architecture constants are from w64 mingw winnt.h */ +#define PROCESSOR_ARCHITECTURE_INTEL 0 +#define PROCESSOR_ARCHITECTURE_MIPS 1 +#define PROCESSOR_ARCHITECTURE_ALPHA 2 +#define PROCESSOR_ARCHITECTURE_PPC 3 +#define PROCESSOR_ARCHITECTURE_SHX 4 +#define PROCESSOR_ARCHITECTURE_ARM 5 +#define PROCESSOR_ARCHITECTURE_IA64 6 +#define PROCESSOR_ARCHITECTURE_ALPHA64 7 +#define PROCESSOR_ARCHITECTURE_MSIL 8 +#define PROCESSOR_ARCHITECTURE_AMD64 9 +#define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 + /* Returns a statically allocated string that is a string representation of the * architecture number. */ static const tchar * get_arch(int arch) { switch (arch) { - case 0: + case PROCESSOR_ARCHITECTURE_INTEL: return T("x86"); - case 6: + case PROCESSOR_ARCHITECTURE_MIPS: + return T("MIPS"); + case PROCESSOR_ARCHITECTURE_ARM: + return T("ARM"); + case PROCESSOR_ARCHITECTURE_IA64: return T("ia64"); - case 9: + case PROCESSOR_ARCHITECTURE_AMD64: return T("x86_64"); - /* XXX Are there other arch values? */ default: return T("unknown"); } @@ -222,18 +269,13 @@ static int node_get_string(const xmlNode *string_node, tchar **tstr_ret) { xmlNode *child; - tchar *tstr = NULL; - int ret; - for_node_child(string_node, child) { - if (node_is_text(child) && child->content) { - ret = utf8_to_tstr_simple(child->content, &tstr); - if (ret) - return ret; - break; - } - } - *tstr_ret = tstr; + if (*tstr_ret) + return 0; + + for_node_child(string_node, child) + if (node_is_text(child) && child->content) + return utf8_to_tstr_simple(child->content, tstr_ret); return 0; } @@ -281,6 +323,7 @@ destroy_windows_info(struct windows_info *windows_info) FREE(windows_info->hal); FREE(windows_info->product_type); FREE(windows_info->product_suite); + FREE(windows_info->pkeyconfigversion); for (size_t i = 0; i < windows_info->num_languages; i++) FREE(windows_info->languages[i]); FREE(windows_info->languages); @@ -416,7 +459,19 @@ xml_read_windows_info(const xmlNode *windows_node, ret = node_get_string(child, &windows_info->system_root); } else if (node_name_is(child, "HAL")) { ret = node_get_string(child, &windows_info->hal); + } else if (node_name_is(child, "SERVICINGDATA")) { + xmlNode *grandchild; + + for_node_child(child, grandchild) { + if (node_is_element(grandchild) && + node_name_is(grandchild, "PKEYCONFIGVERSION")) + { + ret = node_get_string(grandchild, + &windows_info->pkeyconfigversion); + } + } } + if (ret != 0) return ret; } @@ -434,7 +489,7 @@ xml_read_image_info(xmlNode *image_node, struct image_info *image_info) index_prop = xmlGetProp(image_node, "INDEX"); if (index_prop) { image_info->index = atoi(index_prop); - FREE(index_prop); + xmlFree(index_prop); } else { image_info->index = 1; } @@ -456,7 +511,6 @@ xml_read_image_info(xmlNode *image_node, struct image_info *image_info) else if (node_name_is(child, "LASTMODIFICATIONTIME")) image_info->last_modification_time = node_get_timestamp(child); else if (node_name_is(child, "WINDOWS")) { - DEBUG("Found tag"); ret = xml_read_windows_info(child, &image_info->windows_info); image_info->windows_info_exists = true; @@ -470,13 +524,16 @@ xml_read_image_info(xmlNode *image_node, struct image_info *image_info) ret = node_get_string(child, &image_info->display_name); } else if (node_name_is(child, "DISPLAYDESCRIPTION")) { ret = node_get_string(child, &image_info->display_description); + } else if (node_name_is(child, "WIMBOOT")) { + if (node_get_u64(child) == 1) { + image_info->wimboot = true; + } } if (ret != 0) return ret; } if (!image_info->name) { tchar *empty_name; - /*WARNING("Image with index %d has no name", image_info->index);*/ empty_name = MALLOC(sizeof(tchar)); if (!empty_name) return WIMLIB_ERR_NOMEM; @@ -505,8 +562,9 @@ xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info_ret) num_images = 0; for_node_child(wim_node, child) { if (node_is_element(child) && node_name_is(child, "IMAGE")) { - if (num_images == INT_MAX) { - return WIMLIB_ERR_IMAGE_COUNT; + if (unlikely(num_images == MAX_IMAGES)) { + ret = WIMLIB_ERR_IMAGE_COUNT; + goto err; } num_images++; } @@ -525,7 +583,6 @@ xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info_ret) if (!node_is_element(child)) continue; if (node_name_is(child, "IMAGE")) { - DEBUG("Found tag"); ret = xml_read_image_info(child, &wim_info->images[i]); if (ret != 0) @@ -533,6 +590,16 @@ xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info_ret) i++; } else if (node_name_is(child, "TOTALBYTES")) { wim_info->total_bytes = node_get_u64(child); + } else if (node_name_is(child, "ESD")) { + xmlNode *esdchild; + for_node_child(child, esdchild) { + if (node_is_element(esdchild) && + node_name_is(esdchild, "ENCRYPTED")) + { + ret = WIMLIB_ERR_WIM_IS_ENCRYPTED; + goto err; + } + } } } @@ -546,7 +613,8 @@ xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info_ret) ERROR("WIM images are not indexed [1...%d] " "in XML data as expected", num_images); - return WIMLIB_ERR_IMAGE_COUNT; + ret = WIMLIB_ERR_IMAGE_COUNT; + goto err; } } @@ -558,10 +626,7 @@ err: return ret; } -/* Prints the information contained in a `struct windows_info'. - * - * Warning: any strings printed here are in UTF-8 encoding. If the locale - * character encoding is not UTF-8, the printed strings may be garbled. */ +/* Prints the information contained in a `struct windows_info'. */ static void print_windows_info(const struct windows_info *windows_info) { @@ -657,7 +722,7 @@ xml_write_strings_from_specs(xmlTextWriter *writer, for (size_t i = 0; i < num_specs; i++) { int rc = xml_write_string(writer, specs[i].name, *(const tchar * const *) - (struct_with_strings + specs[i].offset)); + (struct_with_strings + specs[i].offset)); if (rc) return rc; } @@ -720,7 +785,11 @@ xml_write_windows_version(xmlTextWriter *writer, if (rc < 0) return rc; - return xmlTextWriterEndElement(writer); /* */ + rc = xmlTextWriterEndElement(writer); /* */ + if (rc < 0) + return rc; + + return 0; } /* Writes the information contained in a `struct windows_info' to the XML @@ -768,18 +837,36 @@ xml_write_windows_info(xmlTextWriter *writer, return rc; } + if (windows_info->pkeyconfigversion) { + rc = xmlTextWriterStartElement(writer, "SERVICINGDATA"); + if (rc < 0) + return rc; + + rc = xml_write_string(writer, "PKEYCONFIGVERSION", + windows_info->pkeyconfigversion); + if (rc) + return rc; + + rc = xmlTextWriterEndElement(writer); + if (rc < 0) + return rc; + } + if (windows_info->windows_version_exists) { rc = xml_write_windows_version(writer, &windows_info->windows_version); - if (rc < 0) + if (rc) return rc; } - rc = xml_write_string(writer, "SYSTEMROOT", - windows_info->system_root); + rc = xml_write_string(writer, "SYSTEMROOT", windows_info->system_root); if (rc) return rc; - return xmlTextWriterEndElement(writer); /* */ + rc = xmlTextWriterEndElement(writer); /* */ + if (rc < 0) + return rc; + + return 0; } /* Writes a time element to the XML document being constructed in memory. */ @@ -862,9 +949,16 @@ xml_write_image_info(xmlTextWriter *writer, const struct image_info *image_info) if (rc) return rc; + if (image_info->wimboot) { + rc = xmlTextWriterWriteFormatElement(writer, "WIMBOOT", "%d", 1); + if (rc < 0) + return rc; + } + rc = xmlTextWriterEndElement(writer); /* */ if (rc < 0) return rc; + return 0; } @@ -893,11 +987,19 @@ clone_windows_info(const struct windows_info *old, struct windows_info *new) { int ret; + new->arch = old->arch; + ret = dup_strings_from_specs(old, new, windows_info_xml_string_specs, ARRAY_LEN(windows_info_xml_string_specs)); if (ret) return ret; + if (old->pkeyconfigversion) { + new->pkeyconfigversion = TSTRDUP(old->pkeyconfigversion); + if (new->pkeyconfigversion == NULL) + return WIMLIB_ERR_NOMEM; + } + if (old->languages) { new->languages = CALLOC(old->num_languages, sizeof(new->languages[0])); if (!new->languages) @@ -949,6 +1051,7 @@ clone_image_info(const struct image_info *old, struct image_info *new) if (ret) return ret; } + new->wimboot = old->wimboot; return 0; } @@ -1051,7 +1154,6 @@ xml_get_max_image_name_len(const WIMStruct *wim) return max_len; } -#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR void xml_set_memory_allocator(void *(*malloc_func)(size_t), void (*free_func)(void *), @@ -1059,14 +1161,12 @@ xml_set_memory_allocator(void *(*malloc_func)(size_t), { xmlMemSetup(free_func, malloc_func, realloc_func, STRDUP); } -#endif static int calculate_dentry_statistics(struct wim_dentry *dentry, void *arg) { struct image_info *info = arg; const struct wim_inode *inode = dentry->d_inode; - struct wim_lookup_table_entry *lte; /* Update directory count and file count. * @@ -1077,19 +1177,19 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg) * points) count as regular files. This is despite the fact that * junction points have FILE_ATTRIBUTE_DIRECTORY set. */ - if (dentry_is_root(dentry)) - return 0; - if (inode_is_directory(inode)) - info->dir_count++; - else - info->file_count++; + if (!dentry_is_root(dentry)) { + if (inode_is_directory(inode)) + info->dir_count++; + else + info->file_count++; + } /* * Update total bytes and hard link bytes. * - * Unfortunately there are some inconsistencies/bugs in the way this is - * done. + * We try to act the same as the MS implementation, even though there + * are some inconsistencies/bugs in the way it operates. * * If there are no alternate data streams in the image, the "total * bytes" is the sum of the size of the un-named data stream of each @@ -1111,20 +1211,28 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg) * link bytes", and this size is multiplied by the link count (NOT one * less than the link count). */ - lte = inode_unnamed_lte(inode, info->lookup_table); - if (lte) { - info->total_bytes += wim_resource_size(lte); - if (!dentry_is_first_in_inode(dentry)) - info->hard_link_bytes += wim_resource_size(lte); - } + if (!(inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_REPARSE_POINT))) + { + struct blob_descriptor *blob; + + blob = inode_get_blob_for_unnamed_data_stream(inode, + info->blob_table); + if (blob) { + info->total_bytes += blob->size; + if (!dentry_is_first_in_inode(dentry)) + info->hard_link_bytes += blob->size; + } - if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) { - for (unsigned i = 0; i < inode->i_num_ads; i++) { - if (inode->i_ads_entries[i].stream_name_nbytes) { - lte = inode_stream_lte(inode, i + 1, info->lookup_table); - if (lte) { - info->hard_link_bytes += inode->i_nlink * - wim_resource_size(lte); + if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) { + for (unsigned i = 0; i < inode->i_num_streams; i++) { + if (stream_is_named_data_stream(&inode->i_streams[i])) { + blob = stream_blob(&inode->i_streams[i], + info->blob_table); + if (blob) { + info->hard_link_bytes += inode->i_nlink * + blob->size; + } } } } @@ -1134,10 +1242,7 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg) /* * Calculate what to put in the , , , and - * elements of each . - * - * Please note there is no official documentation for exactly how this is done. - * But, see calculate_dentry_statistics(). + * elements of the specified WIM image. */ void xml_update_image_info(WIMStruct *wim, int image) @@ -1152,12 +1257,12 @@ xml_update_image_info(WIMStruct *wim, int image) image_info->dir_count = 0; image_info->total_bytes = 0; image_info->hard_link_bytes = 0; - image_info->lookup_table = wim->lookup_table; + image_info->blob_table = wim->blob_table; for_dentry_in_tree(wim->image_metadata[image - 1]->root_dentry, calculate_dentry_statistics, image_info); - image_info->last_modification_time = get_wim_timestamp(); + image_info->last_modification_time = now_as_wim_timestamp(); } /* Adds an image to the XML information. */ @@ -1188,7 +1293,7 @@ xml_add_image(WIMStruct *wim, const tchar *name) wim->wim_info = wim_info; image_info->index = wim_info->num_images; - image_info->creation_time = get_wim_timestamp(); + image_info->creation_time = now_as_wim_timestamp(); xml_update_image_info(wim, image_info->index); return 0; @@ -1249,6 +1354,8 @@ print_image_info(const struct wim_info *wim_info, int image) print_windows_info(&image_info->windows_info); if (image_info->flags) tprintf(T("Flags: %"TS"\n"), image_info->flags); + tprintf(T("WIMBoot compatible: %"TS"\n"), + image_info->wimboot ? T("yes") : T("no")); tputchar('\n'); } @@ -1270,22 +1377,19 @@ libxml_global_cleanup(void) int read_wim_xml_data(WIMStruct *wim) { + void *buf; + size_t bufsize; u8 *xml_data; xmlDoc *doc; xmlNode *root; int ret; - const struct resource_entry *res_entry; - res_entry = &wim->hdr.xml_res_entry; - - DEBUG("Reading XML data: %"PRIu64" bytes at offset %"PRIu64"", - (u64)res_entry->size, res_entry->offset); - - ret = res_entry_to_data(res_entry, wim, (void**)&xml_data); + ret = wimlib_get_xml_data(wim, &buf, &bufsize); if (ret) goto out; + xml_data = buf; - doc = xmlReadMemory((const char *)xml_data, res_entry->original_size, + doc = xmlReadMemory((const char *)xml_data, bufsize, NULL, "UTF-16LE", 0); if (!doc) { ERROR("Failed to parse XML data"); @@ -1446,6 +1550,7 @@ out_output_buffer_close: out_buffer_free: xmlBufferFree(buf); out: + DEBUG("ret=%d", ret); return ret; out_write_error: @@ -1457,7 +1562,7 @@ out_write_error: /* Writes the XML data to a WIM file. */ int write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes, - struct resource_entry *out_res_entry, + struct wim_reshdr *out_reshdr, int write_resource_flags) { int ret; @@ -1465,7 +1570,7 @@ write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes, size_t xml_len; DEBUG("Writing WIM XML data (image=%d, offset=%"PRIu64")", - image, total_bytes, wim->out_fd.offset); + image, wim->out_fd.offset); ret = prepare_wim_xml_data(wim, image, total_bytes, &xml_data, &xml_len); @@ -1476,13 +1581,15 @@ write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes, * compressed XML data, MS software cannot. */ ret = write_wim_resource_from_buffer(xml_data, xml_len, - WIM_RESHDR_FLAG_METADATA, + true, &wim->out_fd, WIMLIB_COMPRESSION_TYPE_NONE, - out_res_entry, + 0, + out_reshdr, NULL, write_resource_flags); FREE(xml_data); + DEBUG("ret=%d", ret); return ret; } @@ -1518,28 +1625,40 @@ wimlib_image_name_in_use(const WIMStruct *wim, const tchar *name) /* API function documented in wimlib.h */ +WIMLIBAPI int +wimlib_get_xml_data(WIMStruct *wim, void **buf_ret, size_t *bufsize_ret) +{ + const struct wim_reshdr *xml_reshdr; + + if (wim->filename == NULL && filedes_is_seekable(&wim->in_fd)) + return WIMLIB_ERR_INVALID_PARAM; + + if (buf_ret == NULL || bufsize_ret == NULL) + return WIMLIB_ERR_INVALID_PARAM; + + xml_reshdr = &wim->hdr.xml_data_reshdr; + + DEBUG("Reading XML data."); + *bufsize_ret = xml_reshdr->uncompressed_size; + return wim_reshdr_to_data(xml_reshdr, wim, buf_ret); +} + WIMLIBAPI int wimlib_extract_xml_data(WIMStruct *wim, FILE *fp) { - size_t size; - void *buf; int ret; + void *buf; + size_t bufsize; - ret = res_entry_to_data(&wim->hdr.xml_res_entry, wim, &buf); + ret = wimlib_get_xml_data(wim, &buf, &bufsize); if (ret) - goto out; + return ret; - size = wim->hdr.xml_res_entry.original_size; - if (fwrite(buf, 1, size, fp) != size) { + if (fwrite(buf, 1, bufsize, fp) != bufsize) { ERROR_WITH_ERRNO("Failed to extract XML data"); ret = WIMLIB_ERR_WRITE; - goto out_free_buf; } - - ret = 0; -out_free_buf: FREE(buf); -out: return ret; } @@ -1549,29 +1668,19 @@ wimlib_set_image_name(WIMStruct *wim, int image, const tchar *name) { tchar *p; int i; - int ret; - - DEBUG("Setting the name of image %d to %"TS, image, name); - - ret = can_modify_wim(wim); - if (ret) - return ret; if (name == NULL) name = T(""); - if (image < 1 || image > wim->hdr.image_count) { - ERROR("%d is not a valid image", image); + if (image < 1 || image > wim->hdr.image_count) return WIMLIB_ERR_INVALID_IMAGE; - } - for (i = 1; i <= wim->hdr.image_count; i++) { - if (i == image) - continue; - if (!tstrcmp(wim->wim_info->images[i - 1].name, name)) { - ERROR("The name \"%"TS"\" is already in use in the WIM!", - name); - return WIMLIB_ERR_IMAGE_NAME_COLLISION; + if (*name) { + for (i = 1; i <= wim->hdr.image_count; i++) { + if (i == image) + continue; + if (!tstrcmp(wim->wim_info->images[i - 1].name, name)) + return WIMLIB_ERR_IMAGE_NAME_COLLISION; } } @@ -1590,11 +1699,6 @@ do_set_image_info_str(WIMStruct *wim, int image, const tchar *tstr, { tchar *tstr_copy; tchar **dest_tstr_p; - int ret; - - ret = can_modify_wim(wim); - if (ret) - return ret; if (image < 1 || image > wim->hdr.image_count) { ERROR("%d is not a valid image", image);