X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_apply.c;h=c1fbc491bfe116482d2a9f85fa491c50bdb28b7f;hp=21ddfd2f0cb06e6181808ce8bab4d9ed21d15d53;hb=28d78c881095a7b50be60ed8d506aa15cceb9cae;hpb=b431a4cd6a1f5ebacf450acabeb765f8260d1027

diff --git a/src/win32_apply.c b/src/win32_apply.c
index 21ddfd2f..c1fbc491 100644
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -1198,16 +1198,15 @@ create_directories(struct list_head *dentry_list,
 
 		/* If the root dentry is being extracted, it was already done so
 		 * in prepare_target().  */
-		if (dentry_is_root(dentry))
-			continue;
-
-		ret = create_directory(dentry, ctx);
-		if (ret)
-			return ret;
+		if (!dentry_is_root(dentry)) {
+			ret = create_directory(dentry, ctx);
+			if (ret)
+				return ret;
 
-		ret = create_any_empty_ads(dentry, ctx);
-		if (ret)
-			return ret;
+			ret = create_any_empty_ads(dentry, ctx);
+			if (ret)
+				return ret;
+		}
 
 		ret = report_file_created(&ctx->common);
 		if (ret)
@@ -1458,11 +1457,11 @@ create_nondirectories(struct list_head *dentry_list, struct win32_apply_ctx *ctx
 		if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY)
 			continue;
 		/* Call create_nondirectory() only once per inode  */
-		if (dentry != inode_first_extraction_dentry(inode))
-			continue;
-		ret = create_nondirectory(inode, ctx);
-		if (ret)
-			return ret;
+		if (dentry == inode_first_extraction_dentry(inode)) {
+			ret = create_nondirectory(inode, ctx);
+			if (ret)
+				return ret;
+		}
 		ret = report_file_created(&ctx->common);
 		if (ret)
 			return ret;
@@ -2233,12 +2232,25 @@ do_warnings(const struct win32_apply_ctx *ctx)
 	}
 }
 
+static uint64_t
+count_dentries(const struct list_head *dentry_list)
+{
+	const struct list_head *cur;
+	uint64_t count = 0;
+
+	list_for_each(cur, dentry_list)
+		count++;
+
+	return count;
+}
+
 /* Extract files from a WIM image to a directory on Windows  */
 static int
 win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx)
 {
 	int ret;
 	struct win32_apply_ctx *ctx = (struct win32_apply_ctx *)_ctx;
+	uint64_t dentry_count;
 
 	ret = prepare_target(dentry_list, ctx);
 	if (ret)
@@ -2250,7 +2262,11 @@ win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx)
 			goto out;
 	}
 
-	reset_file_progress(&ctx->common);
+	dentry_count = count_dentries(dentry_list);
+
+	ret = start_file_structure_phase(&ctx->common, dentry_count);
+	if (ret)
+		goto out;
 
 	ret = create_directories(dentry_list, ctx);
 	if (ret)
@@ -2260,6 +2276,10 @@ win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx)
 	if (ret)
 		goto out;
 
+	ret = end_file_structure_phase(&ctx->common);
+	if (ret)
+		goto out;
+
 	struct read_stream_list_callbacks cbs = {
 		.begin_stream      = begin_extract_stream,
 		.begin_stream_ctx  = ctx,
@@ -2272,12 +2292,18 @@ win32_extract(struct list_head *dentry_list, struct apply_ctx *_ctx)
 	if (ret)
 		goto out;
 
-	reset_file_progress(&ctx->common);
+	ret = start_file_metadata_phase(&ctx->common, dentry_count);
+	if (ret)
+		goto out;
 
 	ret = apply_metadata(dentry_list, ctx);
 	if (ret)
 		goto out;
 
+	ret = end_file_metadata_phase(&ctx->common);
+	if (ret)
+		goto out;
+
 	if (unlikely(ctx->common.extract_flags & WIMLIB_EXTRACT_FLAG_WIMBOOT)) {
 		ret = end_wimboot_extraction(ctx);
 		if (ret)