/*
* 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 <libxml/encoding.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlwriter.h>
+#include <string.h>
+
+#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 <libxml/encoding.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xmlwriter.h>
-#include <limits.h>
-#include <string.h>
-#include <unistd.h>
+#include "wimlib/write.h"
/* Structures used to form an in-memory representation of the XML data (other
* than the raw parse tree from libxml). */
tchar *product_name;
tchar *edition_id;
tchar *installation_type;
+ tchar *pkeyconfigversion;
tchar *hal;
tchar *product_type;
tchar *product_suite;
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 */
};
/* A struct wim_info structure corresponds to the entire XML data for a WIM file. */
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
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;
}
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);
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;
}
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;
}
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 <WINDOWS> tag");
ret = xml_read_windows_info(child,
&image_info->windows_info);
image_info->windows_info_exists = true;
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;
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++;
}
if (!node_is_element(child))
continue;
if (node_name_is(child, "IMAGE")) {
- DEBUG("Found <IMAGE> tag");
ret = xml_read_image_info(child,
&wim_info->images[i]);
if (ret != 0)
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;
+ }
+ }
}
}
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;
}
}
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)
{
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;
}
if (rc < 0)
return rc;
- return xmlTextWriterEndElement(writer); /* </VERSION> */
+ rc = xmlTextWriterEndElement(writer); /* </VERSION> */
+ if (rc < 0)
+ return rc;
+
+ return 0;
}
/* Writes the information contained in a `struct windows_info' to the XML
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); /* </WINDOWS> */
+ rc = xmlTextWriterEndElement(writer); /* </WINDOWS> */
+ if (rc < 0)
+ return rc;
+
+ return 0;
}
/* Writes a time element to the XML document being constructed in memory. */
/* Writes an <IMAGE> element to the XML document. */
static int
-xml_write_image_info(xmlTextWriter *writer, const struct image_info *image_info)
+xml_write_image_info(xmlTextWriter *writer, const struct image_info *image_info,
+ int index)
{
int rc;
+
rc = xmlTextWriterStartElement(writer, "IMAGE");
if (rc < 0)
return rc;
- rc = xmlTextWriterWriteFormatAttribute(writer, "INDEX", "%d",
- image_info->index);
+ rc = xmlTextWriterWriteFormatAttribute(writer, "INDEX", "%d", index);
if (rc < 0)
return rc;
if (rc)
return rc;
+ if (image_info->wimboot) {
+ rc = xmlTextWriterWriteFormatElement(writer, "WIMBOOT", "%d", 1);
+ if (rc < 0)
+ return rc;
+ }
+
rc = xmlTextWriterEndElement(writer); /* </IMAGE> */
if (rc < 0)
return rc;
+
return 0;
}
{
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)
if (ret)
return ret;
}
+ new->wimboot = old->wimboot;
return 0;
}
struct image_info *image_info;
int ret;
- DEBUG("Copying XML data between WIM files for source image %d.", image);
-
wimlib_assert(old_wim_info != NULL);
wimlib_assert(image >= 1 && image <= old_wim_info->num_images);
wim_info = *wim_info_p;
wimlib_assert(image >= 1 && image <= wim_info->num_images);
- DEBUG("Deleting image %d from the XML data.", image);
destroy_image_info(&wim_info->images[image - 1]);
return max_len;
}
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
void
xml_set_memory_allocator(void *(*malloc_func)(size_t),
void (*free_func)(void *),
{
xmlMemSetup(free_func, malloc_func, realloc_func, STRDUP);
}
-#endif
-static int
-calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
+static u64
+inode_sum_stream_sizes(const struct wim_inode *inode,
+ const struct blob_table *blob_table)
{
- 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.
- *
- * Each dentry counts as either a file or a directory, but not both.
- * The root directory is an exception: it is not counted at all.
- *
- * Symbolic links and junction points (and presumably other reparse
- * 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;
+ u64 total_size = 0;
- 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.
- *
- * 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
- * inode times the link count of that inode. In other words, it would
- * be the total number of bytes of regular files you would have if you
- * extracted the full image without any hard-links. The "hard link
- * bytes" is equal to the "total bytes" minus the size of the un-named
- * data stream of each inode. In other words, the "hard link bytes"
- * counts the size of the un-named data stream for all the links to each
- * inode except the first one.
- *
- * Reparse points and directories don't seem to be counted in either the
- * total bytes or the hard link bytes.
- *
- * And now we get to the most confusing part, the alternate data
- * streams. They are not counted in the "total bytes". However, if the
- * link count of an inode with alternate data streams is 2 or greater,
- * the size of all the alternate data streams is included in the "hard
- * 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);
- }
+ for (unsigned i = 0; i < inode->i_num_streams; i++) {
+ const struct blob_descriptor *blob;
- 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);
- }
- }
- }
+ blob = stream_blob(&inode->i_streams[i], blob_table);
+ if (blob)
+ total_size += blob->size;
}
- return 0;
+ return total_size;
}
/*
* Calculate what to put in the <FILECOUNT>, <DIRCOUNT>, <TOTALBYTES>, and
- * <HARDLINKBYTES> elements of each <IMAGE>.
+ * <HARDLINKBYTES> elements of the specified WIM image.
*
- * Please note there is no official documentation for exactly how this is done.
- * But, see calculate_dentry_statistics().
+ * Note: since these stats are likely to be used for display purposes only, we
+ * no longer attempt to duplicate WIMGAPI's weird bugs when calculating them.
*/
void
xml_update_image_info(WIMStruct *wim, int image)
{
- struct image_info *image_info;
-
- DEBUG("Updating the image info for image %d", image);
-
- image_info = &wim->wim_info->images[image - 1];
-
- image_info->file_count = 0;
- image_info->dir_count = 0;
- image_info->total_bytes = 0;
- image_info->hard_link_bytes = 0;
- image_info->lookup_table = wim->lookup_table;
+ struct image_info *info;
+ struct wim_image_metadata *imd;
+ struct wim_inode *inode;
+ u64 size;
+
+ info = &wim->wim_info->images[image - 1];
+ imd = wim->image_metadata[image - 1];
+
+ info->file_count = 0;
+ info->dir_count = 0;
+ info->total_bytes = 0;
+ info->hard_link_bytes = 0;
+
+ image_for_each_inode(inode, imd) {
+ if (inode_is_directory(inode))
+ info->dir_count += inode->i_nlink;
+ else
+ info->file_count += inode->i_nlink;
+ size = inode_sum_stream_sizes(inode, wim->blob_table);
+ info->total_bytes += size * inode->i_nlink;
+ info->hard_link_bytes += size * (inode->i_nlink - 1);
+ }
- for_dentry_in_tree(wim->image_metadata[image - 1]->root_dentry,
- calculate_dentry_statistics,
- image_info);
- image_info->last_modification_time = get_wim_timestamp();
+ info->last_modification_time = now_as_wim_timestamp();
}
/* Adds an image to the XML information. */
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;
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');
}
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, &buf);
+ 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");
xmlOutputBuffer *outbuf;
xmlTextWriter *writer;
int ret;
- int first, last;
const xmlChar *content;
int len;
u8 *xml_data;
}
if (image == WIMLIB_ALL_IMAGES) {
- first = 1;
- last = wim->hdr.image_count;
- } else {
- first = image;
- last = image;
- }
-
- for (int i = first; i <= last; i++) {
- ret = xml_write_image_info(writer, &wim->wim_info->images[i - 1]);
- if (ret) {
+ for (int i = 0; i < wim->hdr.image_count; i++) {
+ ret = xml_write_image_info(writer,
+ &wim->wim_info->images[i],
+ i + 1);
if (ret < 0)
goto out_write_error;
- goto out_free_text_writer;
+ if (ret > 0)
+ goto out_free_text_writer;
}
+ } else {
+ ret = xml_write_image_info(writer,
+ &wim->wim_info->images[image - 1],
+ 1);
+ if (ret < 0)
+ goto out_write_error;
+ if (ret > 0)
+ goto out_free_text_writer;
}
ret = xmlTextWriterEndElement(writer);
/* 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;
u8 *xml_data;
size_t xml_len;
- DEBUG("Writing WIM XML data (image=%d, offset=%"PRIu64")",
- image, total_bytes, wim->out_fd.offset);
-
ret = prepare_wim_xml_data(wim, image, total_bytes,
&xml_data, &xml_len);
if (ret)
* 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);
/* API function documented in wimlib.h */
WIMLIBAPI int
-wimlib_extract_xml_data(WIMStruct *wim, FILE *fp)
+wimlib_get_xml_data(WIMStruct *wim, void **buf_ret, size_t *bufsize_ret)
{
- size_t size;
- void *buf;
- int ret;
+ const struct wim_reshdr *xml_reshdr;
+
+ if (wim->filename == NULL && filedes_is_seekable(&wim->in_fd))
+ return WIMLIB_ERR_NO_FILENAME;
- if (!wim->filename)
+ if (buf_ret == NULL || bufsize_ret == NULL)
return WIMLIB_ERR_INVALID_PARAM;
- ret = res_entry_to_data(&wim->hdr.xml_res_entry, wim, &buf);
+ xml_reshdr = &wim->hdr.xml_data_reshdr;
+
+ *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)
+{
+ int ret;
+ void *buf;
+ size_t bufsize;
+
+ 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;
}
{
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;
}
}
{
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);
git://wimlib.net / wimlib / blobdiff