X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fxml.c;h=5258aaf4cfacb7275e1d8203195668b09680c20d;hp=52cd441fe2ad38008c4f643b2020ef181a841c73;hb=db52422f8a9e87e7d160b68b3271d26c41f0687e;hpb=61db93f82eca3fe9f7676355c709c58cc425a6ad;ds=sidebyside

diff --git a/src/xml.c b/src/xml.c
index 52cd441f..5258aaf4 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -132,36 +132,68 @@ 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;
 }
 
+/* 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");
 	}
@@ -720,7 +752,11 @@ xml_write_windows_version(xmlTextWriter *writer,
 	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
@@ -770,16 +806,19 @@ xml_write_windows_info(xmlTextWriter *writer,
 
 	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. */
@@ -865,6 +904,7 @@ xml_write_image_info(xmlTextWriter *writer, const struct image_info *image_info)
 	rc = xmlTextWriterEndElement(writer); /* </IMAGE> */
 	if (rc < 0)
 		return rc;
+
 	return 0;
 }
 
@@ -1270,6 +1310,7 @@ libxml_global_cleanup(void)
 int
 read_wim_xml_data(WIMStruct *wim)
 {
+	void *buf;
 	u8 *xml_data;
 	xmlDoc *doc;
 	xmlNode *root;
@@ -1281,9 +1322,10 @@ read_wim_xml_data(WIMStruct *wim)
 	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 = res_entry_to_data(res_entry, wim, &buf);
 	if (ret)
 		goto out;
+	xml_data = buf;
 
 	doc = xmlReadMemory((const char *)xml_data, res_entry->original_size,
 			    NULL, "UTF-16LE", 0);
@@ -1446,6 +1488,7 @@ out_output_buffer_close:
 out_buffer_free:
 	xmlBufferFree(buf);
 out:
+	DEBUG("ret=%d", ret);
 	return ret;
 
 out_write_error:
@@ -1481,8 +1524,10 @@ write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes,
 					     WIMLIB_COMPRESSION_TYPE_NONE,
 					     out_res_entry,
 					     NULL,
-					     write_resource_flags);
+					     write_resource_flags,
+					     &wim->lzx_context);
 	FREE(xml_data);
+	DEBUG("ret=%d");
 	return ret;
 }
 
@@ -1525,6 +1570,9 @@ wimlib_extract_xml_data(WIMStruct *wim, FILE *fp)
 	void *buf;
 	int ret;
 
+	if (!wim->filename)
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	ret = res_entry_to_data(&wim->hdr.xml_res_entry, wim, &buf);
 	if (ret)
 		goto out;