Update progress functions

[wimlib] / include / wimlib / wim.h

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index dfd31fa3f9a758720762faa5d922335202169f45..86926d8983232817d3f663814790f9477dfbdbd4 100644 (file)
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -1,9 +1,11 @@
 #ifndef _WIMLIB_WIM_H
 #define _WIMLIB_WIM_H
 
+#include "wimlib.h"
 #include "wimlib/header.h"
 #include "wimlib/types.h"
 #include "wimlib/file_io.h"
+#include "wimlib/list.h"
 
 struct wim_info;
 struct wim_lookup_table;
@@ -41,6 +43,14 @@ struct WIMStruct {
        /* Temporary field */
        void *private;
 
+       struct wimlib_decompressor *decompressor;
+       u8 decompressor_ctype;
+       u32 decompressor_max_block_size;
+
+       struct list_head subwims;
+
+       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
         * image_metadata array. */
@@ -59,7 +69,34 @@ struct WIMStruct {
        u8 wim_locked : 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;
+
+       /* Currently registered progress function for this WIMStruct, or NULL if
+        * no progress function is currently registered for this WIMStruct.  */
+       wimlib_progress_func_t progfunc;
+       void *progctx;
 };
 
 static inline bool wim_is_pipable(const WIMStruct *wim)
@@ -69,18 +106,25 @@ 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);
 }
 
-extern void
+static inline bool wim_has_metadata(const WIMStruct *wim)
+{
+       return (wim->image_metadata != NULL || wim->hdr.image_count == 0);
+}
+
+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
-read_wim_header(const tchar *filename, struct filedes *in_fd,
-               struct wim_header *hdr);
+init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size);
+
+extern int
+read_wim_header(WIMStruct *wim, struct wim_header *hdr);
 
 extern int
 write_wim_header(const struct wim_header *hdr, struct filedes *out_fd);
@@ -92,9 +136,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);
 
@@ -104,18 +145,14 @@ for_image(WIMStruct *wim, int image, int (*visitor)(WIMStruct *));
 extern int
 wim_checksum_unhashed_streams(WIMStruct *wim);
 
-extern int
-reopen_wim(WIMStruct *wim);
-
 /* Internal open flags (pass to open_wim_as_WIMStruct(), not wimlib_open_wim())
  */
 #define WIMLIB_OPEN_FLAG_FROM_PIPE     0x80000000
-#define WIMLIB_OPEN_MASK_PUBLIC                0x7fffffff
 
 extern int
 open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
                      WIMStruct **wim_ret,
-                     wimlib_progress_func_t progress_func);
+                     wimlib_progress_func_t progfunc, void *progctx);
 
 extern int
 close_wim(WIMStruct *wim);