X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fwim.h;h=3fdc7d2d28ab45cc6dd62f3269708f707aa1af4d;hp=fc36c51991a534f32a551aff1659c8aacc7dec19;hb=1fc939b7bd0b37900d974b1cd5b11df128df71f5;hpb=da295f258b60e1593de305385c0669eac4b76644

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index fc36c519..3fdc7d2d 100644
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -1,6 +1,7 @@
 #ifndef _WIMLIB_WIM_H
 #define _WIMLIB_WIM_H
 
+#include "wimlib.h"
 #include "wimlib/header.h"
 #include "wimlib/types.h"
 #include "wimlib/file_io.h"
@@ -42,11 +43,13 @@ struct WIMStruct {
 	/* Temporary field */
 	void *private;
 
-	WIMStruct *master_wim;
+	struct wimlib_decompressor *decompressor;
+	u8 decompressor_ctype;
+	u32 decompressor_max_block_size;
 
-	struct list_head resource_wims;
+	struct list_head subwims;
 
-	struct list_head resource_wim_node;
+	struct list_head subwim_node;
 
 	/* The currently selected image, indexed starting at 1.  If not 0,
 	 * subtract 1 from this to get the index of the current image in the
@@ -65,12 +68,32 @@ struct WIMStruct {
 
 	u8 wim_locked : 1;
 
-	u8 being_unmerged : 1;
-
-	u8 is_owned_by_master : 1;
+	u8 guid_set_explicitly : 1;
 
 	/* One of WIMLIB_COMPRESSION_TYPE_*, cached from the header flags. */
-	u8 compression_type : 2;
+	u8 compression_type;
+
+	/* Overridden compression type for wimlib_overwrite() or wimlib_write().
+	 * Can be changed by wimlib_set_output_compression_type(); otherwise is
+	 * the same as compression_type.  */
+	u8 out_compression_type;
+
+	/* Compression type for writing packed streams; can be set with
+	 * wimlib_set_output_pack_compression_type().  */
+	u8 out_pack_compression_type;
+
+	/* Uncompressed size of compressed chunks in this WIM (cached from
+	 * header).  */
+	u32 chunk_size;
+
+	/* Overridden chunk size for wimlib_overwrite() or wimlib_write().  Can
+	 * be changed by wimlib_set_output_chunk_size(); otherwise is the same
+	 * as chunk_size.  */
+	u32 out_chunk_size;
+
+	/* Chunk size for writing packed streams; can be set with
+	 * wimlib_set_output_pack_chunk_size().  */
+	u32 out_pack_chunk_size;
 };
 
 static inline bool wim_is_pipable(const WIMStruct *wim)
@@ -80,7 +103,7 @@ static inline bool wim_is_pipable(const WIMStruct *wim)
 
 static inline bool wim_has_integrity_table(const WIMStruct *wim)
 {
-	return (wim->hdr.integrity.offset != 0);
+	return (wim->hdr.integrity_table_reshdr.offset_in_wim != 0);
 }
 
 static inline bool wim_has_metadata(const WIMStruct *wim)
@@ -88,15 +111,17 @@ static inline bool wim_has_metadata(const WIMStruct *wim)
 	return (wim->image_metadata != NULL || wim->hdr.image_count == 0);
 }
 
-extern void
+extern int
 wim_recalculate_refcnts(WIMStruct *wim);
 
 extern int
-init_wim_header(struct wim_header *hdr, int ctype);
+set_wim_hdr_cflags(int ctype, struct wim_header *hdr);
+
+extern int
+init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size);
 
 extern int
-read_wim_header(const tchar *filename, struct filedes *in_fd,
-		struct wim_header *hdr);
+read_wim_header(WIMStruct *wim, struct wim_header *hdr);
 
 extern int
 write_wim_header(const struct wim_header *hdr, struct filedes *out_fd);
@@ -108,9 +133,6 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd,
 extern int
 write_wim_header_flags(u32 hdr_flags, struct filedes *out_fd);
 
-extern int
-rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to);
-
 extern int
 select_wim_image(WIMStruct *wim, int image);