X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_apply.c;h=11104f24bc88404d2ba2b5cbc94b8a1b593fa140;hp=c91315cf2f162695d24d9703dc03f8b40c6de95f;hb=b81519a7676f43fc26b2287b2d033711c22e4e99;hpb=f2f293a1759c81e7bd5deb904c3909368f3feaa5

diff --git a/src/win32_apply.c b/src/win32_apply.c
index c91315cf..11104f24 100644
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -57,6 +57,7 @@ L"If you are not running this program as the administrator, you may\n"
 
 static int
 win32_extract_try_rpfix(u8 *rpbuf,
+			u16 *rpbuflen_p,
 			const wchar_t *extract_root_realpath,
 			unsigned extract_root_realpath_nchars)
 {
@@ -74,8 +75,7 @@ win32_extract_try_rpfix(u8 *rpbuf,
 	size_t new_print_name_nchars;
 	utf16lechar *p;
 
-	ret = parse_reparse_data(rpbuf, 8 + le16_to_cpu(*(u16*)(rpbuf + 4)),
-				 &rpdata);
+	ret = parse_reparse_data(rpbuf, *rpbuflen_p, &rpdata);
 	if (ret)
 		return ret;
 
@@ -97,7 +97,7 @@ win32_extract_try_rpfix(u8 *rpbuf,
 	stripped_nchars = ret;
 	target = rpdata.substitute_name;
 	target_nchars = rpdata.substitute_name_nbytes / sizeof(utf16lechar);
-	stripped_target = target + 6;
+	stripped_target = target + stripped_nchars;
 	stripped_target_nchars = target_nchars - stripped_nchars;
 
 	new_target = alloca((6 + extract_root_realpath_nchars +
@@ -106,8 +106,7 @@ win32_extract_try_rpfix(u8 *rpbuf,
 	p = new_target;
 	if (stripped_nchars == 6) {
 		/* Include \??\ prefix if it was present before */
-		wmemcpy(p, L"\\??\\", 4);
-		p += 4;
+		p = wmempcpy(p, L"\\??\\", 4);
 	}
 
 	/* Print name excludes the \??\ if present. */
@@ -119,12 +118,10 @@ win32_extract_try_rpfix(u8 *rpbuf,
 		*p++ = extract_root_realpath[1];
 	}
 	/* Copy the rest of the extract root */
-	wmemcpy(p, extract_root_realpath + 2, extract_root_realpath_nchars - 2);
-	p += extract_root_realpath_nchars - 2;
+	p = wmempcpy(p, extract_root_realpath + 2, extract_root_realpath_nchars - 2);
 
 	/* Append the stripped target */
-	wmemcpy(p, stripped_target, stripped_target_nchars);
-	p += stripped_target_nchars;
+	p = wmempcpy(p, stripped_target, stripped_target_nchars);
 	new_target_nchars = p - new_target;
 	new_print_name_nchars = p - new_print_name;
 
@@ -138,7 +135,7 @@ win32_extract_try_rpfix(u8 *rpbuf,
 	rpdata.substitute_name_nbytes = new_target_nchars * sizeof(utf16lechar);
 	rpdata.print_name = new_print_name;
 	rpdata.print_name_nbytes = new_print_name_nchars * sizeof(utf16lechar);
-	return make_reparse_buffer(&rpdata, rpbuf);
+	return make_reparse_buffer(&rpdata, rpbuf, rpbuflen_p);
 }
 
 /* Wrapper around the FSCTL_SET_REPARSE_POINT ioctl to set the reparse data on
@@ -151,7 +148,7 @@ win32_set_reparse_data(HANDLE h,
 		       struct apply_args *args)
 {
 	int ret;
-	u8 rpbuf[REPARSE_POINT_MAX_SIZE];
+	u8 rpbuf[REPARSE_POINT_MAX_SIZE] _aligned_attribute(8);
 	DWORD bytesReturned;
 	u16 rpbuflen;
 
@@ -167,6 +164,7 @@ win32_set_reparse_data(HANDLE h,
 	    !inode->i_not_rpfixed)
 	{
 		ret = win32_extract_try_rpfix(rpbuf,
+					      &rpbuflen,
 					      args->target_realpath,
 					      args->target_realpath_len);
 		if (ret)
@@ -484,9 +482,12 @@ do_win32_extract_encrypted_stream(const wchar_t *path,
 static bool
 path_is_root_of_drive(const wchar_t *path)
 {
-	if (!*path)
+	if (*path == L'\0')
 		return false;
 
+	if (!wcsncmp(path, L"\\\\?\\", 4))
+		path += 4;
+
 	if (*path != L'/' && *path != L'\\') {
 		if (*(path + 1) == L':')
 			path += 2;
@@ -1237,6 +1238,7 @@ win32_do_apply_dentry(const wchar_t *output_path,
 	    !(args->vol_flags & FILE_SUPPORTS_REPARSE_POINTS))
 	{
 		WARNING("Not extracting reparse point \"%ls\"", output_path);
+		dentry->not_extracted = 1;
 	} else {
 		/* Create the file, directory, or reparse point, and extract the
 		 * data streams. */
@@ -1260,7 +1262,7 @@ win32_do_apply_dentry(const wchar_t *output_path,
 			/* Save extracted path for a later call to
 			 * CreateHardLinkW() if this inode has multiple links.
 			 * */
-			inode->i_extracted_file = WSTRDUP(output_path);
+			inode->i_extracted_file = WCSDUP(output_path);
 			if (!inode->i_extracted_file)
 				return WIMLIB_ERR_NOMEM;
 		}
@@ -1279,13 +1281,6 @@ win32_do_apply_dentry_timestamps(const wchar_t *path,
 	HANDLE h;
 	const struct wim_inode *inode = dentry->d_inode;
 
-	if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT &&
-	    !(args->vol_flags & FILE_SUPPORTS_REPARSE_POINTS))
-	{
-		/* Skip reparse points not extracted */
-		return 0;
-	}
-
 	/* Windows doesn't let you change the timestamps of the root directory
 	 * (at least on FAT, which is dumb but expected since FAT doesn't store
 	 * any metadata about the root directory...) */