X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_capture.c;h=4adf3364cb8f5ae778f9bca4f4e787fe1fc07162;hb=61e88c80f4b0262be1da706d2dbb05597b265cd1;hp=0dbbf38e806a12c3479e40609e27865bda2b205a;hpb=42172f81213121f379563919114d4897d816134b;p=wimlib

diff --git a/src/win32_capture.c b/src/win32_capture.c
index 0dbbf38e..4adf3364 100644
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -7,20 +7,18 @@
 /*
  * Copyright (C) 2013, 2014 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * 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
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef __WIN32__
@@ -387,7 +385,7 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 				  size_t full_path_nchars,
 				  const wchar_t *filename,
 				  size_t filename_nchars,
-				  struct add_image_params *params,
+				  struct capture_params *params,
 				  struct winnt_scan_stats *stats,
 				  u32 vol_flags);
 
@@ -396,7 +394,7 @@ winnt_recurse_directory(HANDLE h,
 			wchar_t *full_path,
 			size_t full_path_nchars,
 			struct wim_dentry *parent,
-			struct add_image_params *params,
+			struct capture_params *params,
 			struct winnt_scan_stats *stats,
 			u32 vol_flags)
 {
@@ -612,7 +610,7 @@ out_close_root_dir:
 }
 
 static int
-winnt_rpfix_progress(struct add_image_params *params, const wchar_t *path,
+winnt_rpfix_progress(struct capture_params *params, const wchar_t *path,
 		     const struct reparse_data *rpdata, int scan_status)
 {
 	size_t print_name_nchars = rpdata->print_name_nbytes / sizeof(wchar_t);
@@ -629,7 +627,7 @@ winnt_rpfix_progress(struct add_image_params *params, const wchar_t *path,
 static int
 winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
 		u64 capture_root_ino, u64 capture_root_dev,
-		const wchar_t *path, struct add_image_params *params)
+		const wchar_t *path, struct capture_params *params)
 {
 	struct reparse_data rpdata;
 	const wchar_t *rel_target;
@@ -748,7 +746,7 @@ winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
  */
 static int
 winnt_get_reparse_data(HANDLE h, const wchar_t *path,
-		       struct add_image_params *params,
+		       struct capture_params *params,
 		       u8 *rpbuf, u16 *rpbuflen_ret)
 {
 	DWORD bytes_returned;
@@ -962,6 +960,7 @@ winnt_scan_stream(const wchar_t *path, size_t path_nchars,
 		stream_id = 0;
 		inode->i_lte = lte;
 	}
+	lte->file_inode = inode;
 	add_unhashed_stream(lte, inode, stream_id, unhashed_streams);
 	return 0;
 }
@@ -1101,7 +1100,7 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 				  size_t full_path_nchars,
 				  const wchar_t *filename,
 				  size_t filename_nchars,
-				  struct add_image_params *params,
+				  struct capture_params *params,
 				  struct winnt_scan_stats *stats,
 				  u32 vol_flags)
 {
@@ -1384,10 +1383,12 @@ out_progress:
 out:
 	if (likely(h != INVALID_HANDLE_VALUE))
 		(*func_NtClose)(h);
-	if (likely(ret == 0))
-		*root_ret = root;
-	else
+	if (unlikely(ret)) {
 		free_dentry_tree(root, params->lookup_table);
+		root = NULL;
+		ret = report_capture_error(params, ret, full_path);
+	}
+	*root_ret = root;
 	return ret;
 }
 
@@ -1419,7 +1420,7 @@ winnt_do_scan_warnings(const wchar_t *path, const struct winnt_scan_stats *stats
 int
 win32_build_dentry_tree(struct wim_dentry **root_ret,
 			const wchar_t *root_disk_path,
-			struct add_image_params *params)
+			struct capture_params *params)
 {
 	wchar_t *path;
 	int ret;