X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fxml.c;h=142c1a91a6f4d9f20dba78454a56ba66c6e6d906;hb=a1d2684c03d066f103ae50485f48512613b84575;hp=5103d75d8d34d01901cf6505fc05950b98b4ad14;hpb=f37f269be1b81cdd00018db0486e377240093e75;p=wimlib

diff --git a/src/xml.c b/src/xml.c
index 5103d75d..142c1a91 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -62,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;
@@ -258,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);
@@ -314,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);
@@ -449,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;
 	}
@@ -566,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;
+					}
+				}
 			}
 		}
 
@@ -805,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)
@@ -939,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)