X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fblob_table.h;h=4e70e5749f4b21f594ec26f034c414e8b11a5202;hp=9dfca8dcc7171bfc8a81447a3375b8b2c66c3a73;hb=8b676e7d340fb8197824745eb387e1d3154e6f60;hpb=b82856cb22783df0e19990eb68d3694753f52220

diff --git a/include/wimlib/blob_table.h b/include/wimlib/blob_table.h
index 9dfca8dc..4e70e574 100644
--- a/include/wimlib/blob_table.h
+++ b/include/wimlib/blob_table.h
@@ -41,16 +41,10 @@ enum blob_location {
 #endif
 
 #ifdef __WIN32__
-	/* Windows only: the blob's data is available as the contents of the
-	 * data stream named by @file_on_disk.  @file_on_disk is an NT namespace
-	 * path that may be longer than the Win32-level MAX_PATH.  Furthermore,
-	 * the stream may require "backup semantics" to access.  */
-	BLOB_IN_WINNT_FILE_ON_DISK,
-
-	/* Windows only: the blob's data is available as the raw encrypted data
-	 * of the external file named by @file_on_disk.  @file_on_disk is a
-	 * Win32 namespace path.  */
-	BLOB_WIN32_ENCRYPTED,
+	/* Windows only: the blob's data is available in the file (or named data
+	 * stream) specified by @windows_file.  The data might be only properly
+	 * accessible through the Windows API.  */
+	BLOB_IN_WINDOWS_FILE,
 #endif
 };
 
@@ -108,7 +102,7 @@ struct blob_descriptor {
 			struct wim_inode *back_inode;
 			u32 back_stream_id;
 		};
-	};
+	} _packed_attribute; /* union is SHA1_HASH_SIZE bytes */
 
 	/* Number of times this blob is referenced by file streams in WIM
 	 * images.  See blob_decrement_refcnt() for information about the
@@ -152,13 +146,6 @@ struct blob_descriptor {
 	u16 unique_size : 1;
 	u16 will_be_in_output_wim : 1;
 
-	/* Set to 1 if this blob represents a metadata resource that has been
-	 * changed.  In such cases, the hash cannot be used to verify the data
-	 * if the metadata resource is read again.  (This could be avoided if we
-	 * used separate fields for input/output checksum, but most blobs
-	 * wouldn't need this.)  */
-	u16 dont_check_metadata_hash : 1;
-
 	u16 may_send_done_with_file : 1;
 
 	/* Only used by wimlib_export_image() */
@@ -182,14 +169,13 @@ struct blob_descriptor {
 			union {
 
 				/* BLOB_IN_FILE_ON_DISK
-				 * BLOB_IN_WINNT_FILE_ON_DISK
-				 * BLOB_WIN32_ENCRYPTED  */
+				 * BLOB_IN_WINDOWS_FILE  */
 				struct {
-					tchar *file_on_disk;
+					union {
+						tchar *file_on_disk;
+						struct windows_file *windows_file;
+					};
 					struct wim_inode *file_inode;
-				#ifdef __WIN32__
-					u64 sort_key;
-				#endif
 				};
 
 				/* BLOB_IN_ATTACHED_BUFFER */
@@ -313,6 +299,9 @@ extern void
 blob_decrement_num_opened_fds(struct blob_descriptor *blob);
 #endif
 
+extern void
+blob_release_location(struct blob_descriptor *blob);
+
 extern void
 free_blob_descriptor(struct blob_descriptor *blob);
 
@@ -341,8 +330,7 @@ blob_to_wimlib_resource_entry(const struct blob_descriptor *blob,
 			      struct wimlib_resource_entry *wentry);
 
 extern int
-sort_blob_list(struct list_head *blob_list,
-	       size_t list_head_offset,
+sort_blob_list(struct list_head *blob_list, size_t list_head_offset,
 	       int (*compar)(const void *, const void*));
 
 extern int
@@ -353,7 +341,7 @@ extern int
 cmp_blobs_by_sequential_order(const void *p1, const void *p2);
 
 static inline const struct blob_extraction_target *
-blob_extraction_targets(struct blob_descriptor *blob)
+blob_extraction_targets(const struct blob_descriptor *blob)
 {
 	if (blob->out_refcnt <= ARRAY_LEN(blob->inline_blob_extraction_targets))
 		return blob->inline_blob_extraction_targets;
@@ -392,6 +380,31 @@ blob_set_is_located_in_attached_buffer(struct blob_descriptor *blob,
 	blob->size = size;
 }
 
+static inline bool
+blob_is_in_file(const struct blob_descriptor *blob)
+{
+	return blob->blob_location == BLOB_IN_FILE_ON_DISK
+#ifdef __WIN32__
+	    || blob->blob_location == BLOB_IN_WINDOWS_FILE
+#endif
+	   ;
+}
+
+#ifdef __WIN32__
+extern const wchar_t *
+get_windows_file_path(const struct windows_file *file);
+#endif
+
+static inline const tchar *
+blob_file_path(const struct blob_descriptor *blob)
+{
+#ifdef __WIN32__
+	if (blob->blob_location == BLOB_IN_WINDOWS_FILE)
+		return get_windows_file_path(blob->windows_file);
+#endif
+	return blob->file_on_disk;
+}
+
 extern struct blob_descriptor *
 new_blob_from_data_buffer(const void *buffer, size_t size,
 			  struct blob_table *blob_table);
@@ -402,8 +415,7 @@ after_blob_hashed(struct blob_descriptor *blob,
 		  struct blob_table *blob_table);
 
 extern int
-hash_unhashed_blob(struct blob_descriptor *blob,
-		   struct blob_table *blob_table,
+hash_unhashed_blob(struct blob_descriptor *blob, struct blob_table *blob_table,
 		   struct blob_descriptor **blob_ret);
 
 extern struct blob_descriptor **