X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.c;h=8f591c3d9f57c18f63d89ae90c72504a895c0608;hp=99fb24261c3fe2b2837b712a3e0496baa6a19e23;hb=594502d26951aa89e374599de862486c1e7a6878;hpb=ca3f717fa42ec38d85dc020821340e59a15c25df

diff --git a/src/dentry.c b/src/dentry.c
index 99fb2426..8f591c3d 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -646,7 +646,15 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table)
 	wim_timestamp_to_str(inode->i_last_write_time, buf, sizeof(buf));
 	tprintf(T("Last Write Time   = %"TS"\n"), buf);
 
-	tprintf(T("Reparse Tag       = 0x%"PRIx32"\n"), inode->i_reparse_tag);
+	if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+		tprintf(T("Reparse Tag       = 0x%"PRIx32"\n"), inode->i_reparse_tag);
+		tprintf(T("Reparse Point Flags = 0x%"PRIx16"\n"),
+			inode->i_not_rpfixed);
+		tprintf(T("Reparse Point Unknown 2 = 0x%"PRIx32"\n"),
+			inode->i_rp_unknown_2);
+	}
+	tprintf(T("Reparse Point Unknown 1 = 0x%"PRIx32"\n"),
+		inode->i_rp_unknown_1);
 	tprintf(T("Hard Link Group   = 0x%"PRIx64"\n"), inode->i_ino);
 	tprintf(T("Hard Link Group Size = %"PRIu32"\n"), inode->i_nlink);
 	tprintf(T("Number of Alternate Data Streams = %hu\n"), inode->i_num_ads);
@@ -919,7 +927,7 @@ free_dentry_tree(struct wim_dentry *root, struct wim_lookup_table *lookup_table)
  * @parent: The dentry that will be the parent of @dentry.
  * @dentry: The dentry to link.
  */
-bool
+struct wim_dentry *
 dentry_add_child(struct wim_dentry * restrict parent,
 		 struct wim_dentry * restrict child)
 {
@@ -940,12 +948,12 @@ dentry_add_child(struct wim_dentry * restrict parent,
 		else if (result > 0)
 			new = &((*new)->rb_right);
 		else
-			return false;
+			return this;
 	}
 	child->parent = parent;
 	rb_link_node(&child->rb_node, rb_parent, new);
 	rb_insert_color(&child->rb_node, root);
-	return true;
+	return NULL;
 }
 
 /* Unlink a WIM dentry from the directory entry tree. */
@@ -1482,13 +1490,12 @@ read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 	 * reparse points, then put the fields in the same place and didn't
 	 * document it.  */
 	if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-		p += 4;
+		p = get_u32(p, &inode->i_rp_unknown_1);
 		p = get_u32(p, &inode->i_reparse_tag);
-		p += 2;
+		p = get_u16(p, &inode->i_rp_unknown_2);
 		p = get_u16(p, &inode->i_not_rpfixed);
 	} else {
-		p += 4;
-		/* i_reparse_tag is irrelevant; just leave it at 0. */
+		p = get_u32(p, &inode->i_rp_unknown_1);
 		p = get_u64(p, &inode->i_ino);
 	}