X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32.c;h=643832fbdc61dfb151286c1d3d268325afcf44a0;hp=3dc20a9422e74bfae46881dda8c553c9c648d906;hb=ca8727cf22a445adc20eb1f8b7a12b8eededc32d;hpb=7e7aeb2b91b492886ebdc28e5bac0b25462c154b

diff --git a/src/win32.c b/src/win32.c
index 3dc20a94..643832fb 100644
--- a/src/win32.c
+++ b/src/win32.c
@@ -39,11 +39,14 @@
 #include "lookup_table.h"
 #include "security.h"
 #include "endianness.h"
+#include "buffer_io.h"
+#include <pthread.h>
 
 #include <errno.h>
 
 #define MAX_GET_SD_ACCESS_DENIED_WARNINGS 1
 #define MAX_GET_SACL_PRIV_NOTHELD_WARNINGS 1
+#define MAX_CREATE_HARD_LINK_WARNINGS 5
 struct win32_capture_state {
 	unsigned long num_get_sd_access_denied;
 	unsigned long num_get_sacl_priv_notheld;
@@ -52,6 +55,28 @@ struct win32_capture_state {
 #define MAX_SET_SD_ACCESS_DENIED_WARNINGS 1
 #define MAX_SET_SACL_PRIV_NOTHELD_WARNINGS 1
 
+#ifdef ENABLE_ERROR_MESSAGES
+static void
+win32_error(u32 err_code)
+{
+	wchar_t *buffer;
+	DWORD nchars;
+	nchars = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
+				    FORMAT_MESSAGE_ALLOCATE_BUFFER,
+				NULL, err_code, 0,
+				(wchar_t*)&buffer, 0, NULL);
+	if (nchars == 0) {
+		ERROR("Error printing error message! "
+		      "Computer will self-destruct in 3 seconds.");
+	} else {
+		ERROR("Win32 error: %ls", buffer);
+		LocalFree(buffer);
+	}
+}
+#else /* ENABLE_ERROR_MESSAGES */
+#  define win32_error(err_code)
+#endif /* !ENABLE_ERROR_MESSAGES */
+
 /* Pointers to functions that are not available on all targetted versions of
  * Windows (XP and later).  NOTE: The WINAPI annotations seem to be important; I
  * assume it specifies a certain calling convention. */
@@ -127,32 +152,6 @@ L"If you are not running this program as the administrator, you may\n"
  "          `wimlib-imagex apply' with the --no-acls flag instead.\n"
  ;
 
-#ifdef ENABLE_ERROR_MESSAGES
-void
-win32_error(u32 err_code)
-{
-	wchar_t *buffer;
-	DWORD nchars;
-	nchars = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
-				    FORMAT_MESSAGE_ALLOCATE_BUFFER,
-				NULL, err_code, 0,
-				(wchar_t*)&buffer, 0, NULL);
-	if (nchars == 0) {
-		ERROR("Error printing error message! "
-		      "Computer will self-destruct in 3 seconds.");
-	} else {
-		ERROR("Win32 error: %ls", buffer);
-		LocalFree(buffer);
-	}
-}
-
-void
-win32_error_last()
-{
-	win32_error(GetLastError());
-}
-#endif
-
 static HANDLE
 win32_open_existing_file(const wchar_t *path, DWORD dwDesiredAccess)
 {
@@ -173,31 +172,218 @@ win32_open_file_data_only(const wchar_t *path)
 }
 
 int
-win32_read_file(const wchar_t *filename,
-		void *handle, u64 offset, size_t size, void *buf)
+read_win32_file_prefix(const struct wim_lookup_table_entry *lte,
+		       u64 size,
+		       consume_data_callback_t cb,
+		       void *ctx_or_buf,
+		       int _ignored_flags)
 {
-	HANDLE h = handle;
+	int ret = 0;
+	void *out_buf;
 	DWORD err;
-	DWORD bytesRead;
-	LARGE_INTEGER liOffset = {.QuadPart = offset};
+	u64 bytes_remaining;
 
-	wimlib_assert(size <= 0xffffffff);
+	HANDLE hFile = win32_open_file_data_only(lte->file_on_disk);
+	if (hFile == INVALID_HANDLE_VALUE) {
+		err = GetLastError();
+		ERROR("Failed to open \"%ls\"", lte->file_on_disk);
+		win32_error(err);
+		return WIMLIB_ERR_OPEN;
+	}
 
-	if (SetFilePointerEx(h, liOffset, NULL, FILE_BEGIN))
-		if (ReadFile(h, buf, size, &bytesRead, NULL) && bytesRead == size)
-			return 0;
-	err = GetLastError();
-	ERROR("Error reading \"%ls\"", filename);
-	win32_error(err);
-	return WIMLIB_ERR_READ;
+	if (cb)
+		out_buf = alloca(WIM_CHUNK_SIZE);
+	else
+		out_buf = ctx_or_buf;
+
+	bytes_remaining = size;
+	while (bytes_remaining) {
+		DWORD bytesToRead, bytesRead;
+
+		bytesToRead = min(WIM_CHUNK_SIZE, bytes_remaining);
+		if (!ReadFile(hFile, out_buf, bytesToRead, &bytesRead, NULL) ||
+		    bytesRead != bytesToRead)
+		{
+			err = GetLastError();
+			ERROR("Failed to read data from \"%ls\"", lte->file_on_disk);
+			win32_error(err);
+			ret = WIMLIB_ERR_READ;
+			break;
+		}
+		bytes_remaining -= bytesRead;
+		if (cb) {
+			ret = (*cb)(out_buf, bytesRead, ctx_or_buf);
+			if (ret)
+				break;
+		} else {
+			out_buf += bytesRead;
+		}
+	}
+	CloseHandle(hFile);
+	return ret;
 }
 
-void
-win32_close_file(void *handle)
+struct win32_encrypted_read_ctx {
+	consume_data_callback_t read_prefix_cb;
+	void *read_prefix_ctx_or_buf;
+	int wimlib_err_code;
+	void *buf;
+	size_t buf_filled;
+	u64 bytes_remaining;
+};
+
+static DWORD WINAPI
+win32_encrypted_export_cb(unsigned char *_data, void *_ctx, unsigned long len)
 {
-	CloseHandle((HANDLE)handle);
+	const void *data = _data;
+	struct win32_encrypted_read_ctx *ctx = _ctx;
+	int ret;
+
+	DEBUG("len = %lu", len);
+	if (ctx->read_prefix_cb) {
+		/* The length of the buffer passed to the ReadEncryptedFileRaw()
+		 * export callback is undocumented, so we assume it may be of
+		 * arbitrary size. */
+		size_t bytes_to_buffer = min(ctx->bytes_remaining - ctx->buf_filled,
+					     len);
+		while (bytes_to_buffer) {
+			size_t bytes_to_copy_to_buf =
+				min(bytes_to_buffer, WIM_CHUNK_SIZE - ctx->buf_filled);
+
+			memcpy(ctx->buf + ctx->buf_filled, data,
+			       bytes_to_copy_to_buf);
+			ctx->buf_filled += bytes_to_copy_to_buf;
+			data += bytes_to_copy_to_buf;
+			bytes_to_buffer -= bytes_to_copy_to_buf;
+
+			if (ctx->buf_filled == WIM_CHUNK_SIZE ||
+			    ctx->buf_filled == ctx->bytes_remaining)
+			{
+				ret = (*ctx->read_prefix_cb)(ctx->buf,
+							     ctx->buf_filled,
+							     ctx->read_prefix_ctx_or_buf);
+				if (ret) {
+					ctx->wimlib_err_code = ret;
+					/* Shouldn't matter what error code is returned
+					 * here, as long as it isn't ERROR_SUCCESS. */
+					return ERROR_READ_FAULT;
+				}
+				ctx->bytes_remaining -= ctx->buf_filled;
+				ctx->buf_filled = 0;
+			}
+		}
+	} else {
+		size_t len_to_copy = min(len, ctx->bytes_remaining);
+		memcpy(ctx->read_prefix_ctx_or_buf, data, len_to_copy);
+		ctx->bytes_remaining -= len_to_copy;
+		ctx->read_prefix_ctx_or_buf += len_to_copy;
+	}
+	return ERROR_SUCCESS;
 }
 
+int
+read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte,
+				 u64 size,
+				 consume_data_callback_t cb,
+				 void *ctx_or_buf,
+				 int _ignored_flags)
+{
+	struct win32_encrypted_read_ctx export_ctx;
+	DWORD err;
+	void *file_ctx;
+	int ret;
+
+	DEBUG("Reading %"PRIu64" bytes from encryted file \"%ls\"",
+	      size, lte->file_on_disk);
+
+	export_ctx.read_prefix_cb = cb;
+	export_ctx.read_prefix_ctx_or_buf = ctx_or_buf;
+	export_ctx.wimlib_err_code = 0;
+	if (cb) {
+		export_ctx.buf = MALLOC(WIM_CHUNK_SIZE);
+		if (!export_ctx.buf)
+			return WIMLIB_ERR_NOMEM;
+	} else {
+		export_ctx.buf = NULL;
+	}
+	export_ctx.bytes_remaining = size;
+
+	err = OpenEncryptedFileRawW(lte->file_on_disk, 0, &file_ctx);
+	if (err != ERROR_SUCCESS) {
+		ERROR("Failed to open encrypted file \"%ls\" for raw read",
+		      lte->file_on_disk);
+		win32_error(err);
+		ret = WIMLIB_ERR_OPEN;
+		goto out_free_buf;
+	}
+	err = ReadEncryptedFileRaw(win32_encrypted_export_cb,
+				   &export_ctx, file_ctx);
+	if (err != ERROR_SUCCESS) {
+		ERROR("Failed to read encrypted file \"%ls\"",
+		      lte->file_on_disk);
+		win32_error(err);
+		ret = export_ctx.wimlib_err_code;
+		if (ret == 0)
+			ret = WIMLIB_ERR_READ;
+	} else if (export_ctx.bytes_remaining != 0) {
+		ERROR("Only could read %"PRIu64" of %"PRIu64" bytes from "
+		      "encryted file \"%ls\"",
+		      size - export_ctx.bytes_remaining, size,
+		      lte->file_on_disk);
+		ret = WIMLIB_ERR_READ;
+	} else {
+		ret = 0;
+	}
+	CloseEncryptedFileRaw(file_ctx);
+out_free_buf:
+	FREE(export_ctx.buf);
+	return ret;
+}
+
+/* Given a path, which may not yet exist, get a set of flags that describe the
+ * features of the volume the path is on. */
+static int
+win32_get_vol_flags(const wchar_t *path, unsigned *vol_flags_ret)
+{
+	wchar_t *volume;
+	BOOL bret;
+	DWORD vol_flags;
+
+	if (path[0] != L'\0' && path[0] != L'\\' &&
+	    path[0] != L'/' && path[1] == L':')
+	{
+		/* Path starts with a drive letter; use it. */
+		volume = alloca(4 * sizeof(wchar_t));
+		volume[0] = path[0];
+		volume[1] = path[1];
+		volume[2] = L'\\';
+		volume[3] = L'\0';
+	} else {
+		/* Path does not start with a drive letter; use the volume of
+		 * the current working directory. */
+		volume = NULL;
+	}
+	bret = GetVolumeInformationW(volume, /* lpRootPathName */
+				     NULL,  /* lpVolumeNameBuffer */
+				     0,     /* nVolumeNameSize */
+				     NULL,  /* lpVolumeSerialNumber */
+				     NULL,  /* lpMaximumComponentLength */
+				     &vol_flags, /* lpFileSystemFlags */
+				     NULL,  /* lpFileSystemNameBuffer */
+				     0);    /* nFileSystemNameSize */
+	if (!bret) {
+		DWORD err = GetLastError();
+		WARNING("Failed to get volume information for path \"%ls\"", path);
+		win32_error(err);
+		vol_flags = 0xffffffff;
+	}
+
+	DEBUG("using vol_flags = %x", vol_flags);
+	*vol_flags_ret = vol_flags;
+	return 0;
+}
+
+
 static u64
 FILETIME_to_u64(const FILETIME *ft)
 {
@@ -208,21 +394,31 @@ static int
 win32_get_short_name(struct wim_dentry *dentry, const wchar_t *path)
 {
 	WIN32_FIND_DATAW dat;
-	if (FindFirstFileW(path, &dat) && dat.cAlternateFileName[0] != L'\0') {
-		size_t short_name_nbytes = wcslen(dat.cAlternateFileName) *
-					   sizeof(wchar_t);
-		size_t n = short_name_nbytes + sizeof(wchar_t);
-		dentry->short_name = MALLOC(n);
-		if (!dentry->short_name)
-			return WIMLIB_ERR_NOMEM;
-		memcpy(dentry->short_name, dat.cAlternateFileName, n);
-		dentry->short_name_nbytes = short_name_nbytes;
-	}
+	HANDLE hFind;
+	int ret = 0;
+
 	/* If we can't read the short filename for some reason, we just ignore
 	 * the error and assume the file has no short name.  I don't think this
 	 * should be an issue, since the short names are essentially obsolete
 	 * anyway. */
-	return 0;
+	hFind = FindFirstFileW(path, &dat);
+	if (hFind != INVALID_HANDLE_VALUE) {
+		if (dat.cAlternateFileName[0] != L'\0') {
+			DEBUG("\"%ls\": short name \"%ls\"", path, dat.cAlternateFileName);
+			size_t short_name_nbytes = wcslen(dat.cAlternateFileName) *
+						   sizeof(wchar_t);
+			size_t n = short_name_nbytes + sizeof(wchar_t);
+			dentry->short_name = MALLOC(n);
+			if (dentry->short_name) {
+				memcpy(dentry->short_name, dat.cAlternateFileName, n);
+				dentry->short_name_nbytes = short_name_nbytes;
+			} else {
+				ret = WIMLIB_ERR_NOMEM;
+			}
+		}
+		FindClose(hFind);
+	}
+	return ret;
 }
 
 static int
@@ -308,12 +504,9 @@ static int
 win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 				  wchar_t *path,
 				  size_t path_num_chars,
-				  struct wim_lookup_table *lookup_table,
-				  struct sd_set *sd_set,
-				  const struct wimlib_capture_config *config,
-				  int add_image_flags,
-				  wimlib_progress_func_t progress_func,
-				  struct win32_capture_state *state);
+				  struct add_image_params *params,
+				  struct win32_capture_state *state,
+				  unsigned vol_flags);
 
 /* Reads the directory entries of directory using a Win32 API and recursively
  * calls win32_build_dentry_tree() on them. */
@@ -321,18 +514,17 @@ static int
 win32_recurse_directory(struct wim_dentry *root,
 			wchar_t *dir_path,
 			size_t dir_path_num_chars,
-			struct wim_lookup_table *lookup_table,
-			struct sd_set *sd_set,
-			const struct wimlib_capture_config *config,
-			int add_image_flags,
-			wimlib_progress_func_t progress_func,
-			struct win32_capture_state *state)
+			struct add_image_params *params,
+			struct win32_capture_state *state,
+			unsigned vol_flags)
 {
 	WIN32_FIND_DATAW dat;
 	HANDLE hFind;
 	DWORD err;
 	int ret;
 
+	DEBUG("Recurse to directory \"%ls\"", dir_path);
+
 	/* Begin reading the directory by calling FindFirstFileW.  Unlike UNIX
 	 * opendir(), FindFirstFileW has file globbing built into it.  But this
 	 * isn't what we actually want, so just add a dummy glob to get all
@@ -373,12 +565,9 @@ win32_recurse_directory(struct wim_dentry *root,
 		ret = win32_build_dentry_tree_recursive(&child,
 							dir_path,
 							path_len,
-							lookup_table,
-							sd_set,
-							config,
-							add_image_flags,
-							progress_func,
-							state);
+							params,
+							state,
+							vol_flags);
 		dir_path[dir_path_num_chars] = L'\0';
 		if (ret)
 			goto out_find_close;
@@ -397,30 +586,236 @@ out_find_close:
 	return ret;
 }
 
-/* Load a reparse point into a WIM inode.  It is just stored in memory.
- *
- * @hFile:  Open handle to a reparse point, with permission to read the reparse
- *          data.
+int
+win32_get_file_and_vol_ids(const wchar_t *path, u64 *ino_ret, u64 *dev_ret)
+{
+	HANDLE hFile;
+	DWORD err;
+	BY_HANDLE_FILE_INFORMATION file_info;
+	int ret;
+
+ 	hFile = win32_open_existing_file(path, FILE_READ_ATTRIBUTES);
+	if (hFile == INVALID_HANDLE_VALUE) {
+		err = GetLastError();
+		WARNING("Failed to open \"%ls\" to get file and volume IDs",
+			path);
+		win32_error(err);
+		return WIMLIB_ERR_OPEN;
+	}
+
+	if (!GetFileInformationByHandle(hFile, &file_info)) {
+		err = GetLastError();
+		ERROR("Failed to get file information for \"%ls\"", path);
+		win32_error(err);
+		ret = WIMLIB_ERR_STAT;
+	} else {
+		*ino_ret = ((u64)file_info.nFileIndexHigh << 32) |
+			    (u64)file_info.nFileIndexLow;
+		*dev_ret = file_info.dwVolumeSerialNumber;
+		ret = 0;
+	}
+	CloseHandle(hFile);
+	return ret;
+}
+
+/* Reparse point fixup status code */
+enum rp_status {
+	/* Reparse point corresponded to an absolute symbolic link or junction
+	 * point that pointed outside the directory tree being captured, and
+	 * therefore was excluded. */
+	RP_EXCLUDED       = 0x0,
+
+	/* Reparse point was not fixed as it was either a relative symbolic
+	 * link, a mount point, or something else we could not understand. */
+	RP_NOT_FIXED      = 0x1,
+
+	/* Reparse point corresponded to an absolute symbolic link or junction
+	 * point that pointed inside the directory tree being captured, where
+	 * the target was specified by a "full" \??\ prefixed path, and
+	 * therefore was fixed to be relative to the root of the directory tree
+	 * being captured. */
+	RP_FIXED_FULLPATH = 0x2,
+
+	/* Same as RP_FIXED_FULLPATH, except the absolute link target did not
+	 * have the \??\ prefix.  It may have begun with a drive letter though.
+	 * */
+	RP_FIXED_ABSPATH  = 0x4,
+
+	/* Either RP_FIXED_FULLPATH or RP_FIXED_ABSPATH. */
+	RP_FIXED          = RP_FIXED_FULLPATH | RP_FIXED_ABSPATH,
+};
+
+/* Given the "substitute name" target of a Windows reparse point, try doing a
+ * fixup where we change it to be absolute relative to the root of the directory
+ * tree being captured.
  *
- * @inode:  WIM inode for the reparse point.
+ * Note that this is only executed when WIMLIB_ADD_IMAGE_FLAG_RPFIX has been
+ * set.
  *
- * @lookup_table:  Stream lookup table for the WIM; an entry will be added to it
- *                 for the reparse point unless an entry already exists for
- *                 the exact same data stream.
+ * @capture_root_ino and @capture_root_dev indicate the inode number and device
+ * of the root of the directory tree being captured.  They are meant to identify
+ * this directory (as an alternative to its actual path, which could potentially
+ * be reached via multiple destinations due to other symbolic links).  This may
+ * not work properly on FAT, which doesn't seem to supply proper inode numbers
+ * or file IDs.  However, FAT doesn't support reparse points so this function
+ * wouldn't even be called anyway.  */
+static enum rp_status
+win32_maybe_rpfix_target(wchar_t *target, size_t *target_nchars_p,
+			 u64 capture_root_ino, u64 capture_root_dev)
+{
+	size_t target_nchars= *target_nchars_p;
+	size_t stripped_chars;
+	wchar_t *orig_target;
+
+	if (target_nchars == 0)
+		/* Invalid reparse point (empty target) */
+		return RP_NOT_FIXED;
+
+	if (target[0] == L'\\') {
+		if (target_nchars >= 2 && target[1] == L'\\') {
+			/* Probably a volume.  Can't do anything with it. */
+			DEBUG("Not fixing target (probably a volume)");
+			return RP_NOT_FIXED;
+		} else if (target_nchars >= 7 &&
+			   target[1] == '?' &&
+			   target[2] == '?' &&
+			   target[3] == '\\' &&
+			   target[4] != '\0' &&
+			   target[5] == ':' &&
+			   target[6] == '\\')
+		{
+			DEBUG("Full style path");
+			/* Full \??\x:\ style path (may be junction or symlink)
+			 * */
+			stripped_chars = 6;
+		} else {
+			DEBUG("Absolute target without drive letter");
+			/* Absolute target, without drive letter */
+			stripped_chars = 0;
+		}
+	} else if (target_nchars >= 3 &&
+		   target[0] != L'\0' &&
+		   target[1] == L':' &&
+		   target[2] == L'\\')
+	{
+		DEBUG("Absolute target with drive letter");
+		/* Absolute target, with drive letter */
+		stripped_chars = 2;
+	} else {
+		DEBUG("Relative symlink or other link");
+		/* Relative symlink or other unexpected format */
+		return RP_NOT_FIXED;
+	}
+	target[target_nchars] = L'\0';
+	orig_target = target;
+	target = fixup_symlink(target + stripped_chars, capture_root_ino, capture_root_dev);
+	if (!target)
+		return RP_EXCLUDED;
+
+	target_nchars = wcslen(target);
+	wmemmove(orig_target + stripped_chars, target, target_nchars + 1);
+	*target_nchars_p = target_nchars + stripped_chars;
+	DEBUG("Fixed reparse point (new target: \"%ls\")", orig_target);
+	if (stripped_chars == 6)
+		return RP_FIXED_FULLPATH;
+	else
+		return RP_FIXED_ABSPATH;
+}
+
+static enum rp_status
+win32_do_capture_rpfix(char *rpbuf, DWORD *rpbuflen_p,
+		       u64 capture_root_ino, u64 capture_root_dev)
+{
+	const char *p_get;
+	char *p_put;
+	u16 substitute_name_offset;
+	u16 substitute_name_len;
+	wchar_t *target;
+	size_t target_nchars;
+	enum rp_status status;
+	u32 rptag;
+	DWORD rpbuflen = *rpbuflen_p;
+
+	if (rpbuflen < 16) /* Invalid reparse point (length too small) */
+		return RP_NOT_FIXED;
+	p_get = get_u32(rpbuf, &rptag);
+	p_get += 4;
+	p_get = get_u16(p_get, &substitute_name_offset);
+	p_get = get_u16(p_get, &substitute_name_len);
+	p_get += 4;
+	if (rptag == WIM_IO_REPARSE_TAG_SYMLINK) {
+		if (rpbuflen < 20) /* Invalid reparse point (length too small) */
+			return RP_NOT_FIXED;
+		p_get += 4;
+	}
+	if ((DWORD)substitute_name_offset +
+	    substitute_name_len + (p_get - rpbuf) > rpbuflen)
+		/* Invalid reparse point (length too small) */
+		return RP_NOT_FIXED;
+
+	target = (wchar_t*)&p_get[substitute_name_offset];
+	target_nchars = substitute_name_len / 2;
+	/* Note: target is not necessarily null-terminated */
+
+	status = win32_maybe_rpfix_target(target, &target_nchars,
+					  capture_root_ino, capture_root_dev);
+	if (status & RP_FIXED) {
+		size_t target_nbytes = target_nchars * 2;
+		size_t print_nbytes = target_nbytes;
+		wchar_t target_copy[target_nchars];
+		wchar_t *print_name = target_copy;
+
+		if (status == RP_FIXED_FULLPATH) {
+			/* "full path", meaning \??\ prefixed.  We should not
+			 * include this prefix in the print name, as it is
+			 * apparently meant for the filesystem driver only. */
+			print_nbytes -= 8;
+			print_name += 4;
+		}
+		wmemcpy(target_copy, target, target_nchars);
+		p_put = rpbuf + 8;
+		p_put = put_u16(p_put, 0); /* Substitute name offset */
+		p_put = put_u16(p_put, target_nbytes); /* Substitute name length */
+		p_put = put_u16(p_put, target_nbytes + 2); /* Print name offset */
+		p_put = put_u16(p_put, print_nbytes); /* Print name length */
+		if (rptag == WIM_IO_REPARSE_TAG_SYMLINK)
+			p_put = put_u32(p_put, 1);
+		p_put = put_bytes(p_put, target_nbytes, target_copy);
+		p_put = put_u16(p_put, 0);
+		p_put = put_bytes(p_put, print_nbytes, print_name);
+		p_put = put_u16(p_put, 0);
+
+		/* Wrote the end of the reparse data.  Recalculate the length,
+		 * set the length field correctly, and return it. */
+		rpbuflen = p_put - rpbuf;
+		put_u16(rpbuf + 4, rpbuflen - 8);
+		*rpbuflen_p = rpbuflen;
+	}
+	return status;
+}
+
+/* Load a reparse point into a WIM inode.  It is just stored in memory.
  *
- * @path:  External path to the reparse point.  Used for error messages only.
+ * @hFile is the open handle to a reparse point, with permission to read the
+ * reparse data.
  *
- * Returns 0 on success; nonzero on failure. */
+ * @inode is the WIM inode for the reparse point.
+ */
 static int
-win32_capture_reparse_point(HANDLE hFile,
+win32_capture_reparse_point(struct wim_dentry **root_p,
+			    HANDLE hFile,
 			    struct wim_inode *inode,
-			    struct wim_lookup_table *lookup_table,
-			    const wchar_t *path)
+			    const wchar_t *path,
+			    struct add_image_params *params)
 {
+	DEBUG("Capturing reparse point \"%ls\"", path);
+
 	/* "Reparse point data, including the tag and optional GUID,
 	 * cannot exceed 16 kilobytes." - MSDN  */
-	char reparse_point_buf[16 * 1024];
+	char reparse_point_buf[REPARSE_POINT_MAX_SIZE];
 	DWORD bytesReturned;
+	char *fixed_buf;
+	DWORD fixed_len;
 
 	if (!DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT,
 			     NULL, /* "Not used with this operation; set to NULL" */
@@ -442,50 +837,30 @@ win32_capture_reparse_point(HANDLE hFile,
 		return WIMLIB_ERR_READ;
 	}
 	inode->i_reparse_tag = le32_to_cpu(*(u32*)reparse_point_buf);
-	return inode_add_ads_with_data(inode, L"",
-				       reparse_point_buf + 8,
-				       bytesReturned - 8, lookup_table);
-}
-
-/* Calculate the SHA1 message digest of a Win32 data stream, which may be either
- * an unnamed or named data stream.
- *
- * @path:	Path to the file, with the stream noted at the end for named
- *              streams.  UTF-16LE encoding.
- *
- * @hash:       On success, the SHA1 message digest of the stream is written to
- *              this location.
- *
- * Returns 0 on success; nonzero on failure.
- */
-static int
-win32_sha1sum(const wchar_t *path, u8 hash[SHA1_HASH_SIZE])
-{
-	HANDLE hFile;
-	SHA_CTX ctx;
-	u8 buf[32768];
-	DWORD bytesRead;
-	int ret;
 
-	hFile = win32_open_file_data_only(path);
-	if (hFile == INVALID_HANDLE_VALUE)
-		return WIMLIB_ERR_OPEN;
-
-	sha1_init(&ctx);
-	for (;;) {
-		if (!ReadFile(hFile, buf, sizeof(buf), &bytesRead, NULL)) {
-			ret = WIMLIB_ERR_READ;
-			goto out_close_handle;
+	if (params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_RPFIX &&
+	    (inode->i_reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK ||
+	     inode->i_reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT))
+	{
+		/* Try doing reparse point fixup */
+		enum rp_status status;
+		status = win32_do_capture_rpfix(reparse_point_buf,
+						&bytesReturned,
+						params->capture_root_ino,
+						params->capture_root_dev);
+		if (status == RP_EXCLUDED) {
+			/* Absolute path points out of capture tree.  Free the
+			 * dentry; we're not including it at all. */
+			free_dentry(*root_p);
+			*root_p = NULL;
+			return 0;
+		} else if (status & RP_FIXED) {
+			/* Absolute path fixup was done. */
+			inode->i_not_rpfixed = 0;
 		}
-		if (bytesRead == 0)
-			break;
-		sha1_update(&ctx, buf, bytesRead);
 	}
-	ret = 0;
-	sha1_final(hash, &ctx);
-out_close_handle:
-	CloseHandle(hFile);
-	return ret;
+	return inode_set_unnamed_stream(inode, reparse_point_buf + 8,
+					bytesReturned - 8, params->lookup_table);
 }
 
 /* Scans an unnamed or named stream of a Win32 file (not a reparse point
@@ -514,7 +889,6 @@ win32_capture_stream(const wchar_t *path,
 		     WIN32_FIND_STREAM_DATA *dat)
 {
 	struct wim_ads_entry *ads_entry;
-	u8 hash[SHA1_HASH_SIZE];
 	struct wim_lookup_table_entry *lte;
 	int ret;
 	wchar_t *stream_name, *colon;
@@ -522,11 +896,12 @@ win32_capture_stream(const wchar_t *path,
 	bool is_named_stream;
 	wchar_t *spath;
 	size_t spath_nchars;
-	DWORD err;
 	size_t spath_buf_nbytes;
 	const wchar_t *relpath_prefix;
 	const wchar_t *colonchar;
 
+	DEBUG("Capture \"%ls\" stream \"%ls\"", path, dat->cStreamName);
+
 	/* The stream name should be returned as :NAME:TYPE */
 	stream_name = dat->cStreamName;
 	if (*stream_name != L':')
@@ -557,6 +932,12 @@ win32_capture_stream(const wchar_t *path,
 		}
 	}
 
+	/* If zero length stream, no lookup table entry needed. */
+	if ((u64)dat->StreamSize.QuadPart == 0) {
+		ret = 0;
+		goto out;
+	}
+
 	/* Create a UTF-16LE string @spath that gives the filename, then a
 	 * colon, then the stream name.  Or, if it's an unnamed stream, just the
 	 * filename.  It is MALLOC()'ed so that it can be saved in the
@@ -587,39 +968,30 @@ win32_capture_stream(const wchar_t *path,
 	swprintf(spath, L"%ls%ls%ls%ls",
 		 relpath_prefix, path, colonchar, stream_name);
 
-	ret = win32_sha1sum(spath, hash);
-	if (ret) {
-		err = GetLastError();
-		ERROR("Failed to read \"%ls\" to calculate SHA1sum", spath);
-		win32_error(err);
+	/* Make a new wim_lookup_table_entry */
+	lte = new_lookup_table_entry();
+	if (!lte) {
+		ret = WIMLIB_ERR_NOMEM;
 		goto out_free_spath;
 	}
-
-	lte = __lookup_resource(lookup_table, hash);
-	if (lte) {
-		/* Use existing wim_lookup_table_entry that has the same SHA1
-		 * message digest */
-		lte->refcnt++;
-	} else {
-		/* Make a new wim_lookup_table_entry */
-		lte = new_lookup_table_entry();
-		if (!lte) {
-			ret = WIMLIB_ERR_NOMEM;
-			goto out_free_spath;
-		}
-		lte->file_on_disk = spath;
-		lte->win32_file_on_disk_fp = INVALID_HANDLE_VALUE;
-		spath = NULL;
+	lte->file_on_disk = spath;
+	spath = NULL;
+	if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED && !is_named_stream)
+		lte->resource_location = RESOURCE_WIN32_ENCRYPTED;
+	else
 		lte->resource_location = RESOURCE_WIN32;
-		lte->resource_entry.original_size = (uint64_t)dat->StreamSize.QuadPart;
-		lte->resource_entry.size = (uint64_t)dat->StreamSize.QuadPart;
-		copy_hash(lte->hash, hash);
-		lookup_table_insert(lookup_table, lte);
-	}
-	if (is_named_stream)
+	lte->resource_entry.original_size = (u64)dat->StreamSize.QuadPart;
+
+	u32 stream_id;
+	if (is_named_stream) {
+		stream_id = ads_entry->stream_id;
 		ads_entry->lte = lte;
-	else
+	} else {
+		stream_id = 0;
 		inode->i_lte = lte;
+	}
+	lookup_table_insert_unhashed(lookup_table, lte, inode, stream_id);
+	ret = 0;
 out_free_spath:
 	FREE(spath);
 out:
@@ -644,6 +1016,9 @@ out_invalid_stream_name:
  * @file_size:		Size of unnamed data stream.  (Used only if alternate
  *                      data streams API appears to be unavailable.)
  *
+ * @vol_flags:          Flags that specify features of the volume being
+ *			captured.
+ *
  * Returns 0 on success; nonzero on failure.
  */
 static int
@@ -651,20 +1026,23 @@ win32_capture_streams(const wchar_t *path,
 		      size_t path_num_chars,
 		      struct wim_inode *inode,
 		      struct wim_lookup_table *lookup_table,
-		      u64 file_size)
+		      u64 file_size,
+		      unsigned vol_flags)
 {
 	WIN32_FIND_STREAM_DATA dat;
 	int ret;
 	HANDLE hFind;
 	DWORD err;
 
-	if (win32func_FindFirstStreamW == NULL)
+	DEBUG("Capturing streams from \"%ls\"", path);
+
+	if (win32func_FindFirstStreamW == NULL ||
+	    !(vol_flags & FILE_NAMED_STREAMS))
 		goto unnamed_only;
 
 	hFind = win32func_FindFirstStreamW(path, FindStreamInfoStandard, &dat, 0);
 	if (hFind == INVALID_HANDLE_VALUE) {
 		err = GetLastError();
-
 		if (err == ERROR_CALL_NOT_IMPLEMENTED)
 			goto unnamed_only;
 
@@ -674,14 +1052,14 @@ win32_capture_streams(const wchar_t *path,
 		    (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
 		    && err == ERROR_HANDLE_EOF)
 		{
+			DEBUG("ERROR_HANDLE_EOF (ok)");
 			return 0;
 		} else {
 			if (err == ERROR_ACCESS_DENIED) {
-				/* XXX This maybe should be an error. */
-				WARNING("Failed to look up data streams "
-					"of \"%ls\": Access denied!\n%ls",
-					path, capture_access_denied_msg);
-				return 0;
+				ERROR("Failed to look up data streams "
+				      "of \"%ls\": Access denied!\n%ls",
+				      path, capture_access_denied_msg);
+				return WIMLIB_ERR_READ;
 			} else {
 				ERROR("Failed to look up data streams "
 				      "of \"%ls\"", path);
@@ -708,8 +1086,9 @@ out_find_close:
 	FindClose(hFind);
 	return ret;
 unnamed_only:
-	/* FindFirstStreamW() API is not available.  Only capture the unnamed
-	 * data stream. */
+	/* FindFirstStreamW() API is not available, or the volume does not
+	 * support named streams.  Only capture the unnamed data stream. */
+	DEBUG("Only capturing unnamed data stream");
 	if (inode->i_attributes &
 	     (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
 	{
@@ -732,43 +1111,41 @@ static int
 win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 				  wchar_t *path,
 				  size_t path_num_chars,
-				  struct wim_lookup_table *lookup_table,
-				  struct sd_set *sd_set,
-				  const struct wimlib_capture_config *config,
-				  int add_image_flags,
-				  wimlib_progress_func_t progress_func,
-				  struct win32_capture_state *state)
+				  struct add_image_params *params,
+				  struct win32_capture_state *state,
+				  unsigned vol_flags)
 {
 	struct wim_dentry *root = NULL;
 	struct wim_inode *inode;
 	DWORD err;
 	u64 file_size;
 	int ret = 0;
+	const wchar_t *basename;
 
-	if (exclude_path(path, path_num_chars, config, true)) {
-		if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) {
+	if (exclude_path(path, path_num_chars, params->config, true)) {
+		if (params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) {
 			ERROR("Cannot exclude the root directory from capture");
 			ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
 			goto out;
 		}
-		if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE)
-		    && progress_func)
+		if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE)
+		    && params->progress_func)
 		{
 			union wimlib_progress_info info;
 			info.scan.cur_path = path;
 			info.scan.excluded = true;
-			progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+			params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
 		}
 		goto out;
 	}
 
-	if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
-	    && progress_func)
+	if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
+	    && params->progress_func)
 	{
 		union wimlib_progress_info info;
 		info.scan.cur_path = path;
 		info.scan.excluded = false;
-		progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+		params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
 	}
 
 	HANDLE hFile = win32_open_existing_file(path,
@@ -791,33 +1168,55 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 		goto out_close_handle;
 	}
 
-	/* Create a WIM dentry */
-	ret = new_dentry_with_timeless_inode(path_basename_with_len(path, path_num_chars),
+	/* Create a WIM dentry with an associated inode, which may be shared.
+	 *
+	 * However, we need to explicitly check for directories and files with
+	 * only 1 link and refuse to hard link them.  This is because Windows
+	 * has a bug where it can return duplicate File IDs for files and
+	 * directories on the FAT filesystem. */
+	basename = path_basename_with_len(path, path_num_chars);
+	if (!(file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+	    && file_info.nNumberOfLinks > 1)
+	{
+		ret = inode_table_new_dentry(params->inode_table,
+					     basename,
+					     ((u64)file_info.nFileIndexHigh << 32) |
+						 (u64)file_info.nFileIndexLow,
+					     file_info.dwVolumeSerialNumber,
 					     &root);
+		if (ret)
+			goto out_close_handle;
+	} else {
+		ret = new_dentry_with_inode(basename, &root);
+		if (ret)
+			goto out_close_handle;
+		list_add_tail(&root->d_inode->i_list, &params->inode_table->extra_inodes);
+	}
+
+
+	ret = win32_get_short_name(root, path);
 	if (ret)
 		goto out_close_handle;
 
-	/* Start preparing the associated WIM inode */
 	inode = root->d_inode;
 
+	if (inode->i_nlink > 1) /* Shared inode; nothing more to do */
+		goto out_close_handle;
+
 	inode->i_attributes = file_info.dwFileAttributes;
 	inode->i_creation_time = FILETIME_to_u64(&file_info.ftCreationTime);
 	inode->i_last_write_time = FILETIME_to_u64(&file_info.ftLastWriteTime);
 	inode->i_last_access_time = FILETIME_to_u64(&file_info.ftLastAccessTime);
-	inode->i_ino = ((u64)file_info.nFileIndexHigh << 32) |
-			(u64)file_info.nFileIndexLow;
-
 	inode->i_resolved = 1;
-	add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE);
 
-	/* Get DOS name and security descriptor (if any). */
-	ret = win32_get_short_name(root, path);
-	if (ret)
-		goto out_close_handle;
+	params->add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE);
 
-	if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) {
-		ret = win32_get_security_descriptor(root, sd_set, path, state,
-						    add_image_flags);
+	if (!(params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)
+	    && (vol_flags & FILE_PERSISTENT_ACLS))
+	{
+		ret = win32_get_security_descriptor(root, params->sd_set,
+						    path, state,
+						    params->add_image_flags);
 		if (ret)
 			goto out_close_handle;
 	}
@@ -833,35 +1232,31 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 		ret = win32_capture_streams(path,
 					    path_num_chars,
 					    inode,
-					    lookup_table,
-					    file_size);
+					    params->lookup_table,
+					    file_size,
+					    vol_flags);
 		if (ret)
 			goto out_close_handle;
 		ret = win32_recurse_directory(root,
 					      path,
 					      path_num_chars,
-					      lookup_table,
-					      sd_set,
-					      config,
-					      add_image_flags,
-					      progress_func,
-					      state);
+					      params,
+					      state,
+					      vol_flags);
 	} else if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
 		/* Reparse point: save the reparse tag and data.  Alternate data
 		 * streams are not captured, if it's even possible for a reparse
 		 * point to have alternate data streams... */
-		ret = win32_capture_reparse_point(hFile,
-						  inode,
-						  lookup_table,
-						  path);
+		ret = win32_capture_reparse_point(&root, hFile, inode, path, params);
 	} else {
 		/* Not a directory, not a reparse point; capture the default
 		 * file contents and any alternate data streams. */
 		ret = win32_capture_streams(path,
 					    path_num_chars,
 					    inode,
-					    lookup_table,
-					    file_size);
+					    params->lookup_table,
+					    file_size,
+					    vol_flags);
 	}
 out_close_handle:
 	CloseHandle(hFile);
@@ -869,7 +1264,7 @@ out:
 	if (ret == 0)
 		*root_ret = root;
 	else
-		free_dentry_tree(root, lookup_table);
+		free_dentry_tree(root, params->lookup_table);
 	return ret;
 }
 
@@ -909,22 +1304,27 @@ win32_do_capture_warnings(const struct win32_capture_state *state,
 int
 win32_build_dentry_tree(struct wim_dentry **root_ret,
 			const wchar_t *root_disk_path,
-			struct wim_lookup_table *lookup_table,
-			struct sd_set *sd_set,
-			const struct wimlib_capture_config *config,
-			int add_image_flags,
-			wimlib_progress_func_t progress_func,
-			void *extra_arg)
+			struct add_image_params *params)
 {
 	size_t path_nchars;
 	wchar_t *path;
 	int ret;
 	struct win32_capture_state state;
+	unsigned vol_flags;
+
 
 	path_nchars = wcslen(root_disk_path);
 	if (path_nchars > 32767)
 		return WIMLIB_ERR_INVALID_PARAM;
 
+	ret = win32_get_file_and_vol_ids(root_disk_path,
+					 &params->capture_root_ino,
+					 &params->capture_root_dev);
+	if (ret)
+		return ret;
+
+	win32_get_vol_flags(root_disk_path, &vol_flags);
+
 	/* There is no check for overflow later when this buffer is being used!
 	 * But the max path length on NTFS is 32767 characters, and paths need
 	 * to be written specially to even go past 260 characters, so we should
@@ -936,18 +1336,12 @@ win32_build_dentry_tree(struct wim_dentry **root_ret,
 	wmemcpy(path, root_disk_path, path_nchars + 1);
 
 	memset(&state, 0, sizeof(state));
-	ret = win32_build_dentry_tree_recursive(root_ret,
-						path,
-						path_nchars,
-						lookup_table,
-						sd_set,
-						config,
-						add_image_flags,
-						progress_func,
-						&state);
+	ret = win32_build_dentry_tree_recursive(root_ret, path,
+						path_nchars, params,
+						&state, vol_flags);
 	FREE(path);
 	if (ret == 0)
-		win32_do_capture_warnings(&state, add_image_flags);
+		win32_do_capture_warnings(&state, params->add_image_flags);
 	return ret;
 }
 
@@ -976,7 +1370,7 @@ win32_set_reparse_data(HANDLE h,
 	 * leave 8 bytes of space for them at the beginning of the buffer, then
 	 * set them manually. */
 	buf = alloca(len + 8);
-	ret = read_full_wim_resource(lte, buf + 8, 0);
+	ret = read_full_resource_into_buf(lte, buf + 8, false);
 	if (ret)
 		return ret;
 	*(u32*)(buf + 0) = cpu_to_le32(reparse_tag);
@@ -1018,6 +1412,45 @@ win32_set_reparse_data(HANDLE h,
 	return 0;
 }
 
+static int
+win32_set_compressed(HANDLE hFile, const wchar_t *path)
+{
+	USHORT format = COMPRESSION_FORMAT_DEFAULT;
+	DWORD bytesReturned = 0;
+	if (!DeviceIoControl(hFile, FSCTL_SET_COMPRESSION,
+			     &format, sizeof(USHORT),
+			     NULL, 0,
+			     &bytesReturned, NULL))
+	{
+		/* Could be a warning only, but we only call this if the volume
+		 * supports compression.  So I'm calling this an error. */
+		DWORD err = GetLastError();
+		ERROR("Failed to set compression flag on \"%ls\"", path);
+		win32_error(err);
+		return WIMLIB_ERR_WRITE;
+	}
+	return 0;
+}
+
+static int
+win32_set_sparse(HANDLE hFile, const wchar_t *path)
+{
+	DWORD bytesReturned = 0;
+	if (!DeviceIoControl(hFile, FSCTL_SET_SPARSE,
+			     NULL, 0,
+			     NULL, 0,
+			     &bytesReturned, NULL))
+	{
+		/* Could be a warning only, but we only call this if the volume
+		 * supports sparse files.  So I'm calling this an error. */
+		DWORD err = GetLastError();
+		WARNING("Failed to set sparse flag on \"%ls\"", path);
+		win32_error(err);
+		return WIMLIB_ERR_WRITE;
+	}
+	return 0;
+}
+
 /*
  * Sets the security descriptor on an extracted file.
  */
@@ -1092,7 +1525,7 @@ fail:
 
 
 static int
-win32_extract_chunk(const void *buf, size_t len, u64 offset, void *arg)
+win32_extract_chunk(const void *buf, size_t len, void *arg)
 {
 	HANDLE hStream = arg;
 
@@ -1117,6 +1550,14 @@ do_win32_extract_stream(HANDLE hStream, struct wim_lookup_table_entry *lte)
 				    win32_extract_chunk, hStream);
 }
 
+static int
+do_win32_extract_encrypted_stream(const wchar_t *path,
+				  const struct wim_lookup_table_entry *lte)
+{
+	ERROR("Extracting encryted streams not implemented");
+	return WIMLIB_ERR_INVALID_PARAM;
+}
+
 static bool
 path_is_root_of_drive(const wchar_t *path)
 {
@@ -1134,11 +1575,117 @@ path_is_root_of_drive(const wchar_t *path)
 	return (*path == L'\0');
 }
 
+static DWORD
+win32_get_create_flags_and_attributes(DWORD i_attributes)
+{
+	DWORD attributes;
+
+	/*
+	 * Some attributes cannot be set by passing them to CreateFile().  In
+	 * particular:
+	 *
+	 * FILE_ATTRIBUTE_DIRECTORY:
+	 *   CreateDirectory() must be called instead of CreateFile().
+	 *
+	 * FILE_ATTRIBUTE_SPARSE_FILE:
+	 *   Needs an ioctl.
+	 *   See: win32_set_sparse().
+	 *
+	 * FILE_ATTRIBUTE_COMPRESSED:
+	 *   Not clear from the documentation, but apparently this needs an
+	 *   ioctl as well.
+	 *   See: win32_set_compressed().
+	 *
+	 * FILE_ATTRIBUTE_REPARSE_POINT:
+	 *   Needs an ioctl, with the reparse data specified.
+	 *   See: win32_set_reparse_data().
+	 *
+	 * In addition, clear any file flags in the attributes that we don't
+	 * want, but also specify FILE_FLAG_OPEN_REPARSE_POINT and
+	 * FILE_FLAG_BACKUP_SEMANTICS as we are a backup application.
+	 */
+	attributes = i_attributes & ~(FILE_ATTRIBUTE_SPARSE_FILE |
+				      FILE_ATTRIBUTE_COMPRESSED |
+				      FILE_ATTRIBUTE_REPARSE_POINT |
+				      FILE_ATTRIBUTE_DIRECTORY |
+				      FILE_FLAG_DELETE_ON_CLOSE |
+				      FILE_FLAG_NO_BUFFERING |
+				      FILE_FLAG_OPEN_NO_RECALL |
+				      FILE_FLAG_OVERLAPPED |
+				      FILE_FLAG_RANDOM_ACCESS |
+				      /*FILE_FLAG_SESSION_AWARE |*/
+				      FILE_FLAG_SEQUENTIAL_SCAN |
+				      FILE_FLAG_WRITE_THROUGH);
+	return attributes |
+	       FILE_FLAG_OPEN_REPARSE_POINT |
+	       FILE_FLAG_BACKUP_SEMANTICS;
+}
+
+static bool
+inode_has_special_attributes(const struct wim_inode *inode)
+{
+	return (inode->i_attributes & (FILE_ATTRIBUTE_COMPRESSED |
+				       FILE_ATTRIBUTE_REPARSE_POINT |
+				       FILE_ATTRIBUTE_SPARSE_FILE)) != 0;
+}
+
+/* Set compression or sparse attributes, and reparse data, if supported by the
+ * volume. */
+static int
+win32_set_special_attributes(HANDLE hFile, const struct wim_inode *inode,
+			     struct wim_lookup_table_entry *unnamed_stream_lte,
+			     const wchar_t *path, unsigned vol_flags)
+{
+	int ret;
+
+	if (inode->i_attributes & FILE_ATTRIBUTE_COMPRESSED) {
+		if (vol_flags & FILE_FILE_COMPRESSION) {
+			DEBUG("Setting compression flag on \"%ls\"", path);
+			ret = win32_set_compressed(hFile, path);
+			if (ret)
+				return ret;
+		} else {
+			DEBUG("Cannot set compression attribute on \"%ls\": "
+			      "volume does not support transparent compression",
+			      path);
+		}
+	}
+
+	if (inode->i_attributes & FILE_ATTRIBUTE_SPARSE_FILE) {
+		if (vol_flags & FILE_SUPPORTS_SPARSE_FILES) {
+			DEBUG("Setting sparse flag on \"%ls\"", path);
+			ret = win32_set_sparse(hFile, path);
+			if (ret)
+				return ret;
+		} else {
+			DEBUG("Cannot set sparse attribute on \"%ls\": "
+			      "volume does not support sparse files",
+			      path);
+		}
+	}
+
+	if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+		if (vol_flags & FILE_SUPPORTS_REPARSE_POINTS) {
+			DEBUG("Setting reparse data on \"%ls\"", path);
+			ret = win32_set_reparse_data(hFile, inode->i_reparse_tag,
+						     unnamed_stream_lte, path);
+			if (ret)
+				return ret;
+		} else {
+			DEBUG("Cannot set reparse data on \"%ls\": volume "
+			      "does not support reparse points", path);
+		}
+	}
+
+	return 0;
+}
+
 static int
 win32_extract_stream(const struct wim_inode *inode,
 		     const wchar_t *path,
 		     const wchar_t *stream_name_utf16,
-		     struct wim_lookup_table_entry *lte)
+		     struct wim_lookup_table_entry *lte,
+		     unsigned vol_flags)
 {
 	wchar_t *stream_path;
 	HANDLE h;
@@ -1202,23 +1749,23 @@ win32_extract_stream(const struct wim_inode *inode,
 				}
 			}
 			DEBUG("Created directory \"%ls\"", stream_path);
-			if (!(inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+			if (!inode_has_special_attributes(inode)) {
 				ret = 0;
 				goto out;
 			}
+			DEBUG("Directory \"%ls\" has special attributes!",
+			      stream_path);
 			creationDisposition = OPEN_EXISTING;
 		}
 	}
 
 	DEBUG("Opening \"%ls\"", stream_path);
 	h = CreateFileW(stream_path,
-			GENERIC_WRITE,
+			GENERIC_READ | GENERIC_WRITE,
 			0,
 			NULL,
 			creationDisposition,
-			FILE_FLAG_OPEN_REPARSE_POINT |
-			    FILE_FLAG_BACKUP_SEMANTICS |
-			    inode->i_attributes,
+			win32_get_create_flags_and_attributes(inode->i_attributes),
 			NULL);
 	if (h == INVALID_HANDLE_VALUE) {
 		err = GetLastError();
@@ -1228,18 +1775,26 @@ win32_extract_stream(const struct wim_inode *inode,
 		goto fail;
 	}
 
-	if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT &&
-	    stream_name_utf16 == NULL)
-	{
-		DEBUG("Setting reparse data on \"%ls\"", path);
-		ret = win32_set_reparse_data(h, inode->i_reparse_tag, lte, path);
+	if (stream_name_utf16 == NULL && inode_has_special_attributes(inode)) {
+		ret = win32_set_special_attributes(h, inode, lte, path,
+						   vol_flags);
 		if (ret)
 			goto fail_close_handle;
-	} else {
+	}
+
+	if (!(inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
 		if (lte) {
 			DEBUG("Extracting \"%ls\" (len = %"PRIu64")",
 			      stream_path, wim_resource_size(lte));
-			ret = do_win32_extract_stream(h, lte);
+			if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED
+			    && stream_name_utf16 == NULL
+			    && (vol_flags & FILE_SUPPORTS_ENCRYPTION))
+			{
+				ret = do_win32_extract_encrypted_stream(stream_path,
+									lte);
+			} else {
+				ret = do_win32_extract_stream(h, lte);
+			}
 			if (ret)
 				goto fail_close_handle;
 		}
@@ -1275,17 +1830,22 @@ out:
  */
 static int
 win32_extract_streams(const struct wim_inode *inode,
-		      const wchar_t *path, u64 *completed_bytes_p)
+		      const wchar_t *path, u64 *completed_bytes_p,
+		      unsigned vol_flags)
 {
 	struct wim_lookup_table_entry *unnamed_lte;
 	int ret;
 
 	unnamed_lte = inode_unnamed_lte_resolved(inode);
-	ret = win32_extract_stream(inode, path, NULL, unnamed_lte);
+	ret = win32_extract_stream(inode, path, NULL, unnamed_lte,
+				   vol_flags);
 	if (ret)
 		goto out;
-	if (unnamed_lte)
+	if (unnamed_lte && inode->i_extracted_file == NULL)
 		*completed_bytes_p += wim_resource_size(unnamed_lte);
+
+	if (!(vol_flags & FILE_NAMED_STREAMS))
+		goto out;
 	for (u16 i = 0; i < inode->i_num_ads; i++) {
 		const struct wim_ads_entry *ads_entry = &inode->i_ads_entries[i];
 		if (ads_entry->stream_name_nbytes != 0) {
@@ -1299,10 +1859,11 @@ win32_extract_streams(const struct wim_inode *inode,
 			ret = win32_extract_stream(inode,
 						   path,
 						   ads_entry->stream_name,
-						   ads_entry->lte);
+						   ads_entry->lte,
+						   vol_flags);
 			if (ret)
 				break;
-			if (ads_entry->lte)
+			if (ads_entry->lte && inode->i_extracted_file == NULL)
 				*completed_bytes_p += wim_resource_size(ads_entry->lte);
 		}
 	}
@@ -1322,41 +1883,109 @@ win32_do_apply_dentry(const wchar_t *output_path,
 	struct wim_inode *inode = dentry->d_inode;
 	DWORD err;
 
+	if (!args->have_vol_flags) {
+		win32_get_vol_flags(output_path, &args->vol_flags);
+		args->have_vol_flags = true;
+		/* Warn the user about data that may not be extracted. */
+		if (!(args->vol_flags & FILE_SUPPORTS_SPARSE_FILES))
+			WARNING("Volume does not support sparse files!\n"
+				"          Sparse files will be extracted as non-sparse.");
+		if (!(args->vol_flags & FILE_SUPPORTS_REPARSE_POINTS))
+			WARNING("Volume does not support reparse points!\n"
+				"          Reparse point data will not be extracted.");
+		if (!(args->vol_flags & FILE_NAMED_STREAMS)) {
+			WARNING("Volume does not support named data streams!\n"
+				"          Named data streams will not be extracted.");
+		}
+		if (!(args->vol_flags & FILE_SUPPORTS_ENCRYPTION)) {
+			WARNING("Volume does not support encryption!\n"
+				"          Encrypted files will be extracted as raw data.");
+		}
+		if (!(args->vol_flags & FILE_FILE_COMPRESSION)) {
+			WARNING("Volume does not support transparent compression!\n"
+				"          Compressed files will be extracted as non-compressed.");
+		}
+		if (!(args->vol_flags & FILE_PERSISTENT_ACLS)) {
+			if (args->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS) {
+				ERROR("Strict ACLs requested, but the volume does not "
+				      "support ACLs!");
+				return WIMLIB_ERR_VOLUME_LACKS_FEATURES;
+			} else {
+				WARNING("Volume does not support persistent ACLS!\n"
+					"          File permissions will not be extracted.");
+			}
+		}
+	}
+
 	if (inode->i_nlink > 1 && inode->i_extracted_file != NULL) {
 		/* Linked file, with another name already extracted.  Create a
 		 * hard link. */
+
+		/* There is a volume flag for this (FILE_SUPPORTS_HARD_LINKS),
+		 * but it's only available on Windows 7 and later.  So no use
+		 * even checking it, really.  Instead, CreateHardLinkW() will
+		 * apparently return ERROR_INVALID_FUNCTION if the volume does
+		 * not support hard links. */
 		DEBUG("Creating hard link \"%ls => %ls\"",
 		      output_path, inode->i_extracted_file);
-		if (!CreateHardLinkW(output_path, inode->i_extracted_file, NULL)) {
-			err = GetLastError();
+		if (CreateHardLinkW(output_path, inode->i_extracted_file, NULL))
+			return 0;
+
+		err = GetLastError();
+		if (err != ERROR_INVALID_FUNCTION) {
 			ERROR("Can't create hard link \"%ls => %ls\"",
 			      output_path, inode->i_extracted_file);
 			win32_error(err);
 			return WIMLIB_ERR_LINK;
+		} else {
+			args->num_hard_links_failed++;
+			if (args->num_hard_links_failed < MAX_CREATE_HARD_LINK_WARNINGS) {
+				WARNING("Can't create hard link \"%ls => %ls\":\n"
+					"          Volume does not support hard links!\n"
+					"          Falling back to extracting a copy of the file.",
+					output_path, inode->i_extracted_file);
+			} else if (args->num_hard_links_failed == MAX_CREATE_HARD_LINK_WARNINGS) {
+				WARNING("Suppressing further hard linking warnings...");
+			}
 		}
-	} else {
-		/* Create the file, directory, or reparse point, and extract the
-		 * data streams. */
-		ret = win32_extract_streams(inode, output_path,
-					    &args->progress.extract.completed_bytes);
+	}
+
+	if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT &&
+	    !(args->vol_flags & FILE_SUPPORTS_REPARSE_POINTS))
+	{
+		WARNING("Skipping extraction of reparse point \"%ls\":\n"
+			"          Not supported by destination filesystem",
+			output_path);
+		struct wim_lookup_table_entry *lte;
+		lte = inode_unnamed_lte_resolved(inode);
+		if (lte)
+			args->progress.extract.completed_bytes += wim_resource_size(lte);
+		return 0;
+	}
+
+	/* Create the file, directory, or reparse point, and extract the
+	 * data streams. */
+	ret = win32_extract_streams(inode, output_path,
+				    &args->progress.extract.completed_bytes,
+				    args->vol_flags);
+	if (ret)
+		return ret;
+
+	if (inode->i_security_id >= 0 &&
+	    !(args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_ACLS)
+	    && (args->vol_flags & FILE_PERSISTENT_ACLS))
+	{
+		ret = win32_set_security_data(inode, output_path, args);
 		if (ret)
 			return ret;
-
-		if (inode->i_security_id >= 0 &&
-		    !(args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_ACLS))
-		{
-			ret = win32_set_security_data(inode, output_path, args);
-			if (ret)
-				return ret;
-		}
-		if (inode->i_nlink > 1) {
-			/* Save extracted path for a later call to
-			 * CreateHardLinkW() if this inode has multiple links.
-			 * */
-			inode->i_extracted_file = WSTRDUP(output_path);
-			if (!inode->i_extracted_file)
-				ret = WIMLIB_ERR_NOMEM;
-		}
+	}
+	if (inode->i_nlink > 1) {
+		/* Save extracted path for a later call to
+		 * CreateHardLinkW() if this inode has multiple links.
+		 * */
+		inode->i_extracted_file = WSTRDUP(output_path);
+		if (!inode->i_extracted_file)
+			ret = WIMLIB_ERR_NOMEM;
 	}
 	return 0;
 }
@@ -1372,6 +2001,19 @@ 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...) */
+	if (path_is_root_of_drive(path))
+		return 0;
+
 	DEBUG("Opening \"%ls\" to set timestamps", path);
 	h = win32_open_existing_file(path, FILE_WRITE_ATTRIBUTES);
 	if (h == INVALID_HANDLE_VALUE) {
@@ -1534,4 +2176,20 @@ fail:
 	return -1;
 }
 
+
+/* This really could be replaced with _wcserror_s, but this doesn't seem to
+ * actually be available in MSVCRT.DLL on Windows XP (perhaps it's statically
+ * linked in by Visual Studio...?). */
+extern int
+win32_strerror_r_replacement(int errnum, wchar_t *buf, size_t buflen)
+{
+	static pthread_mutex_t strerror_lock = PTHREAD_MUTEX_INITIALIZER;
+
+	pthread_mutex_lock(&strerror_lock);
+	mbstowcs(buf, strerror(errnum), buflen);
+	buf[buflen - 1] = '\0';
+	pthread_mutex_unlock(&strerror_lock);
+	return 0;
+}
+
 #endif /* __WIN32__ */