X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Fwim.h;h=4afa60eb8594943ecc8ad06e4d8912384e51627b;hb=5944d11442d5df847c3393951a8563412d16e640;hp=fc36c51991a534f32a551aff1659c8aacc7dec19;hpb=da295f258b60e1593de305385c0669eac4b76644;p=wimlib

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index fc36c519..4afa60eb 100644
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -42,11 +42,12 @@ struct WIMStruct {
 	/* Temporary field */
 	void *private;
 
-	WIMStruct *master_wim;
+	/* LZX compression context for default thread  */
+	struct wimlib_lzx_context *lzx_context;
 
-	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 +66,25 @@ 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;
+
+	/* Overwritten 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 : 2;
+
+	/* 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;
 };
 
 static inline bool wim_is_pipable(const WIMStruct *wim)
@@ -88,11 +102,14 @@ 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,