compress_parallel.c: Determine physical memory on OS X

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index deeedb50efba04f5088e52615f66380124846c8f..142c1a91a6f4d9f20dba78454a56ba66c6e6d906 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -36,6 +36,7 @@
 #include "wimlib/resource.h"
 #include "wimlib/timestamp.h"
 #include "wimlib/xml.h"
+#include "wimlib/write.h"
 
 #include <libxml/encoding.h>
 #include <libxml/parser.h>
@@ -61,6 +62,7 @@ struct windows_info {
        tchar   *product_name;
        tchar   *edition_id;
        tchar   *installation_type;
+       tchar   *pkeyconfigversion;
        tchar   *hal;
        tchar   *product_type;
        tchar   *product_suite;
@@ -257,6 +259,9 @@ node_get_string(const xmlNode *string_node, tchar **tstr_ret)
        tchar *tstr = NULL;
        int ret;
 
+       if (*tstr_ret)
+               return 0;
+
        for_node_child(string_node, child) {
                if (node_is_text(child) && child->content) {
                        ret = utf8_to_tstr_simple(child->content, &tstr);
@@ -313,6 +318,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);
@@ -448,7 +454,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;
        }
@@ -565,6 +583,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;
+                                       }
+                               }
                        }
                }
 
@@ -689,7 +717,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;
        }
@@ -804,6 +832,21 @@ 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)
@@ -938,6 +981,12 @@ clone_windows_info(const struct windows_info *old, struct windows_info *new)
        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)
@@ -1091,7 +1140,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 *),
@@ -1099,7 +1147,6 @@ 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)
@@ -1153,9 +1200,9 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
         */
        lte = inode_unnamed_lte(inode, info->lookup_table);
        if (lte) {
-               info->total_bytes += wim_resource_size(lte);
+               info->total_bytes += lte->size;
                if (!dentry_is_first_in_inode(dentry))
-                       info->hard_link_bytes += wim_resource_size(lte);
+                       info->hard_link_bytes += lte->size;
        }
 
        if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) {
@@ -1164,7 +1211,7 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
                                lte = inode_stream_lte(inode, i + 1, info->lookup_table);
                                if (lte) {
                                        info->hard_link_bytes += inode->i_nlink *
-                                                                wim_resource_size(lte);
+                                                                lte->size;
                                }
                        }
                }
@@ -1311,23 +1358,18 @@ 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, &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");
@@ -1500,7 +1542,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;
@@ -1522,12 +1564,12 @@ write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes,
                                             WIM_RESHDR_FLAG_METADATA,
                                             &wim->out_fd,
                                             WIMLIB_COMPRESSION_TYPE_NONE,
-                                            out_res_entry,
+                                            0,
+                                            out_reshdr,
                                             NULL,
-                                            write_resource_flags,
-                                            &wim->lzx_context);
+                                            write_resource_flags);
        FREE(xml_data);
-       DEBUG("ret=%d");
+       DEBUG("ret=%d", ret);
        return ret;
 }
 
@@ -1566,14 +1608,19 @@ wimlib_image_name_in_use(const WIMStruct *wim, const tchar *name)
 WIMLIBAPI int
 wimlib_get_xml_data(WIMStruct *wim, void **buf_ret, size_t *bufsize_ret)
 {
-       if (wim->filename == NULL)
+       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;
 
-       *bufsize_ret = wim->hdr.xml_res_entry.original_size;
-       return res_entry_to_data(&wim->hdr.xml_res_entry, wim, buf_ret);
+       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