X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fblob_table.c;h=ab8d08467e717a9fd093488094453cecc394e586;hb=ef01d3a49d4a0e83f0fb5bd6604a1b7ebeee71a1;hp=e1fb6adac77c3c46603468c9e1be058d450270f7;hpb=3d9eb49da969c4ac2c8579db7baf96ae3fd04e1c;p=wimlib

diff --git a/src/blob_table.c b/src/blob_table.c
index e1fb6ada..ab8d0846 100644
--- a/src/blob_table.c
+++ b/src/blob_table.c
@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers
+ * Copyright (C) 2012-2016 Eric Biggers
  *
  * This file is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
@@ -44,6 +44,7 @@
 #include "wimlib/resource.h"
 #include "wimlib/unaligned.h"
 #include "wimlib/util.h"
+#include "wimlib/win32.h"
 #include "wimlib/write.h"
 
 /* A hash table mapping SHA-1 message digests to blob descriptors  */
@@ -53,21 +54,13 @@ struct blob_table {
 	size_t mask; /* capacity - 1; capacity is a power of 2  */
 };
 
-static size_t
-next_power_of_2(size_t n)
-{
-	if (n <= 1)
-		return 1;
-	return (size_t)1 << (1 + flsw(n - 1));
-}
-
 struct blob_table *
 new_blob_table(size_t capacity)
 {
 	struct blob_table *table;
 	struct hlist_head *array;
 
-	capacity = next_power_of_2(capacity);
+	capacity = roundup_pow_of_2(capacity);
 
 	table = MALLOC(sizeof(struct blob_table));
 	if (table == NULL)
@@ -129,10 +122,6 @@ clone_blob_descriptor(const struct blob_descriptor *old)
 		break;
 
 	case BLOB_IN_FILE_ON_DISK:
-#ifdef __WIN32__
-	case BLOB_IN_WINNT_FILE_ON_DISK:
-	case BLOB_WIN32_ENCRYPTED:
-#endif
 #ifdef WITH_FUSE
 	case BLOB_IN_STAGING_FILE:
 		STATIC_ASSERT((void*)&old->file_on_disk ==
@@ -142,6 +131,11 @@ clone_blob_descriptor(const struct blob_descriptor *old)
 		if (new->file_on_disk == NULL)
 			goto out_free;
 		break;
+#ifdef __WIN32__
+	case BLOB_IN_WINDOWS_FILE:
+		new->windows_file = clone_windows_file(old->windows_file);
+		break;
+#endif
 	case BLOB_IN_ATTACHED_BUFFER:
 		new->attached_buffer = memdup(old->attached_buffer, old->size);
 		if (new->attached_buffer == NULL)
@@ -179,10 +173,6 @@ blob_release_location(struct blob_descriptor *blob)
 		break;
 	}
 	case BLOB_IN_FILE_ON_DISK:
-#ifdef __WIN32__
-	case BLOB_IN_WINNT_FILE_ON_DISK:
-	case BLOB_WIN32_ENCRYPTED:
-#endif
 #ifdef WITH_FUSE
 	case BLOB_IN_STAGING_FILE:
 		STATIC_ASSERT((void*)&blob->file_on_disk ==
@@ -193,10 +183,14 @@ blob_release_location(struct blob_descriptor *blob)
 			      (void*)&blob->attached_buffer);
 		FREE(blob->file_on_disk);
 		break;
+#ifdef __WIN32__
+	case BLOB_IN_WINDOWS_FILE:
+		free_windows_file(blob->windows_file);
+		break;
+#endif
 #ifdef WITH_NTFS_3G
 	case BLOB_IN_NTFS_VOLUME:
-		if (blob->ntfs_loc)
-			free_ntfs_location(blob->ntfs_loc);
+		free_ntfs_location(blob->ntfs_loc);
 		break;
 #endif
 	}
@@ -463,18 +457,14 @@ cmp_blobs_by_sequential_order(const void *p1, const void *p2)
 	case BLOB_IN_FILE_ON_DISK:
 #ifdef WITH_FUSE
 	case BLOB_IN_STAGING_FILE:
-#endif
-#ifdef __WIN32__
-	case BLOB_IN_WINNT_FILE_ON_DISK:
-	case BLOB_WIN32_ENCRYPTED:
-		/* Windows: compare by starting LCN (logical cluster number)  */
-		v = cmp_u64(blob1->sort_key, blob2->sort_key);
-		if (v)
-			return v;
 #endif
 		/* Compare files by path: just a heuristic that will place files
 		 * in the same directory next to each other.  */
 		return tstrcmp(blob1->file_on_disk, blob2->file_on_disk);
+#ifdef __WIN32__
+	case BLOB_IN_WINDOWS_FILE:
+		return cmp_windows_files(blob1->windows_file, blob2->windows_file);
+#endif
 #ifdef WITH_NTFS_3G
 	case BLOB_IN_NTFS_VOLUME:
 		return cmp_ntfs_locations(blob1->ntfs_loc, blob2->ntfs_loc);
@@ -1017,9 +1007,6 @@ read_blob_table(WIMStruct *wim)
 		}
 
 		if (reshdr.flags & WIM_RESHDR_FLAG_METADATA) {
-
-			cur_blob->is_metadata = 1;
-
 			/* Blob table entry for a metadata resource.  */
 
 			/* Metadata entries with no references must be ignored.
@@ -1066,7 +1053,10 @@ read_blob_table(WIMStruct *wim)
 			 * this overrides the actual locations of the metadata
 			 * resources themselves in the WIM file as well as any
 			 * information written in the XML data.  */
-			wim->image_metadata[image_index++]->metadata_blob = cur_blob;
+			wim->image_metadata[image_index] = new_unloaded_image_metadata(cur_blob);
+			if (!wim->image_metadata[image_index])
+				goto oom;
+			image_index++;
 		} else {
 			/* Blob table entry for a non-metadata blob.  */
 
@@ -1101,8 +1091,6 @@ read_blob_table(WIMStruct *wim)
 
 	if (wim->hdr.part_number == 1 && image_index != wim->hdr.image_count) {
 		WARNING("Could not find metadata resources for all images");
-		for (u32 i = image_index; i < wim->hdr.image_count; i++)
-			put_image_metadata(wim->image_metadata[i], NULL);
 		wim->hdr.image_count = image_index;
 	}