X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Fwof.h;h=0715211ddaef45aa18cf8587f3d11760fe788c55;hb=1935b4a25c79127e7b7394f810e496895f0ad937;hp=fae0801dbc820d7624e71da4cb52e0e10af26b1c;hpb=3de1ec66f778edda19865482d685bc6f4e17faf7;p=wimlib

diff --git a/include/wimlib/wof.h b/include/wimlib/wof.h
index fae0801d..0715211d 100644
--- a/include/wimlib/wof.h
+++ b/include/wimlib/wof.h
@@ -70,12 +70,13 @@ struct wim_provider_rpdata {
 	u8 blob_table_hash[20];
 
 	/* Uncompressed size of the file's unnamed data stream, in bytes.  */
-	le64 unnamed_data_stream_uncompressed_size;
+	le64 unnamed_data_stream_size;
 
-	/* Compressed size of the file's unnamed data stream, in bytes.  If the
-	 * stream is stored uncompressed, set this the same as the uncompressed
-	 * size.  */
-	le64 unnamed_data_stream_compressed_size;
+	/* Size of the file's unnamed data stream as stored in the WIM file.
+	 * If this is the same as unnamed_data_stream_size, then the stream is
+	 * uncompressed.  If this is the *not* the same as
+	 * unnamed_data_stream_size, then the stream is compressed.  */
+	le64 unnamed_data_stream_size_in_wim;
 
 	/* Byte offset of the file's unnamed data stream in the WIM.  */
 	le64 unnamed_data_stream_offset_in_wim;
@@ -377,32 +378,32 @@ struct wim_provider_external_info {
 struct wim_provider_overlay_entry {
 	/* Byte offset of the next entry from the beginning of this structure,
 	 * or 0 if there are no more entries.  */
-	uint32_t next_entry_offset;
+	u32 next_entry_offset;
 
-	uint32_t padding;
+	u32 padding;
 
 	/* Identifier for the WIM file.  */
-	uint64_t data_source_id;
+	u64 data_source_id;
 
 	/* GUID of the WIM file.  */
-	uint8_t guid[16];
+	u8 guid[16];
 
 	/* Byte offset of the WIM's file name from the beginning of this
 	 * structure.  */
-	uint32_t wim_file_name_offset;
+	u32 wim_file_name_offset;
 
 	/* Type of WIM file: WIM_BOOT_OS_WIM or WIM_BOOT_NOT_OS_WIM.  */
-	uint32_t wim_type;
+	u32 wim_type;
 
 	/* Index of the image in the WIM to use??? (This doesn't really make
 	 * sense, since WIM files combine file data "blobs" for all images into
 	 * a single table.  Set to 1 if unsure...)  */
-	uint32_t wim_index;
+	u32 wim_index;
 
 	/* 0 when WIM provider active, otherwise
 	 * WIM_PROVIDER_EXTERNAL_FLAG_NOT_ACTIVE or
 	 * WIM_PROVIDER_EXTERNAL_FLAG_SUSPENDED.  */
-	uint32_t flags;
+	u32 flags;
 
 	/* Full path to the WIM in the NT device namespace, e.g.
 	 * "\Device\HardDiskVolume2\test.wim".  Seems to be null-terminated,