]> wimlib.net Git - wimlib/blobdiff - src/win32_capture.c
win32_capture.c: Load volume information on first chance
[wimlib] / src / win32_capture.c
index 3721123b2642179476d1ccd6e57f74caa0c74b0c..7ae4b5faf929722bac3424edf2024873c433f4f7 100644 (file)
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2013 Eric Biggers
+ * Copyright (C) 2013, 2014 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
 
 #ifdef __WIN32__
 
-#include "win32_common.h"
-#include "wimlib_internal.h"
-#include "lookup_table.h"
-#include "security.h"
-#include "endianness.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib/win32_common.h"
+
+#include "wimlib/capture.h"
+#include "wimlib/dentry.h"
+#include "wimlib/encoding.h"
+#include "wimlib/endianness.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/paths.h"
+#include "wimlib/reparse.h"
+
+#include <errno.h>
 
-#define MAX_GET_SD_ACCESS_DENIED_WARNINGS 1
-#define MAX_GET_SACL_PRIV_NOTHELD_WARNINGS 1
 struct win32_capture_state {
        unsigned long num_get_sd_access_denied;
        unsigned long num_get_sacl_priv_notheld;
+       unsigned long num_long_path_warnings;
 };
 
-
-static const wchar_t *capture_access_denied_msg =
-L"         If you are not running this program as the administrator, you may\n"
- "         need to do so, so that all data and metadata can be backed up.\n"
- "         Otherwise, there may be no way to access the desired data or\n"
- "         metadata without taking ownership of the file or directory.\n"
- ;
+static NTSTATUS
+winnt_openat(HANDLE cur_dir, const wchar_t *path, size_t path_nchars,
+            ACCESS_MASK perms, HANDLE *h_ret)
+{
+       UNICODE_STRING name;
+       OBJECT_ATTRIBUTES attr;
+       IO_STATUS_BLOCK iosb;
+       NTSTATUS status;
+
+       name.Length = path_nchars * sizeof(wchar_t);
+       name.MaximumLength = name.Length + sizeof(wchar_t);
+       name.Buffer = (wchar_t *)path;
+
+       attr.Length = sizeof(attr);
+       attr.RootDirectory = cur_dir;
+       attr.ObjectName = &name;
+       attr.Attributes = 0;
+       attr.SecurityDescriptor = NULL;
+       attr.SecurityQualityOfService = NULL;
+
+retry:
+       status = (*func_NtOpenFile)(h_ret, perms, &attr, &iosb,
+                                   FILE_SHARE_READ |
+                                           FILE_SHARE_WRITE |
+                                           FILE_SHARE_DELETE,
+                                   FILE_OPEN_REPARSE_POINT |
+                                           FILE_OPEN_FOR_BACKUP_INTENT |
+                                           FILE_SYNCHRONOUS_IO_NONALERT);
+       if (!NT_SUCCESS(status)) {
+               if (status == STATUS_ACCESS_DENIED ||
+                   status == STATUS_PRIVILEGE_NOT_HELD) {
+                       if (perms & ACCESS_SYSTEM_SECURITY) {
+                               perms &= ~ACCESS_SYSTEM_SECURITY;
+                               goto retry;
+                       }
+                       if (perms & READ_CONTROL) {
+                               perms &= ~READ_CONTROL;
+                               goto retry;
+                       }
+               }
+       }
+       return status;
+}
 
 int
 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)
+                      void *cb_ctx)
 {
-       int ret = 0;
-       void *out_buf;
-       DWORD err;
+       const wchar_t *path;
+       HANDLE h;
+       NTSTATUS status;
+       u8 buf[BUFFER_SIZE];
        u64 bytes_remaining;
+       int ret;
 
-       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);
+       path = lte->file_on_disk;
+       status = winnt_openat(NULL, path, wcslen(path),
+                             FILE_READ_DATA | SYNCHRONIZE, &h);
+       if (!NT_SUCCESS(status)) {
+               set_errno_from_nt_status(status);
+               ERROR_WITH_ERRNO("\"%ls\": Can't open for reading", path);
                return WIMLIB_ERR_OPEN;
        }
 
-       if (cb)
-               out_buf = alloca(WIM_CHUNK_SIZE);
-       else
-               out_buf = ctx_or_buf;
-
+       ret = 0;
        bytes_remaining = size;
        while (bytes_remaining) {
-               DWORD bytesToRead, bytesRead;
+               IO_STATUS_BLOCK iosb;
+               ULONG count;
 
-               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);
+               count = min(sizeof(buf), bytes_remaining);
+
+               status = (*func_NtReadFile)(h, NULL, NULL, NULL,
+                                           &iosb, buf, count, NULL, NULL);
+               if (!NT_SUCCESS(status) || iosb.Information != count) {
+                       set_errno_from_nt_status(status);
+                       ERROR_WITH_ERRNO("\"%ls\": Error reading data", path);
                        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;
-               }
+
+               bytes_remaining -= count;
+               ret = (*cb)(buf, count, cb_ctx);
+               if (ret)
+                       break;
        }
-       CloseHandle(hFile);
+       (*func_NtClose)(h);
        return ret;
 }
 
 struct win32_encrypted_read_ctx {
        consume_data_callback_t read_prefix_cb;
-       void *read_prefix_ctx_or_buf;
+       void *read_prefix_ctx;
        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)
+win32_encrypted_export_cb(unsigned char *data, void *_ctx, unsigned long len)
 {
-       const void *data = _data;
        struct win32_encrypted_read_ctx *ctx = _ctx;
        int ret;
+       size_t bytes_to_consume = min(len, ctx->bytes_remaining);
 
-       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;
+       if (bytes_to_consume == 0)
+               return ERROR_SUCCESS;
+
+       ret = (*ctx->read_prefix_cb)(data, bytes_to_consume, ctx->read_prefix_ctx);
+       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 -= bytes_to_consume;
        return ERROR_SUCCESS;
 }
 
@@ -158,44 +170,34 @@ 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)
+                                void *cb_ctx)
 {
        struct win32_encrypted_read_ctx export_ctx;
        DWORD err;
        void *file_ctx;
        int ret;
 
-       DEBUG("Reading %"PRIu64" bytes from encryted file \"%ls\"",
+       DEBUG("Reading %"PRIu64" bytes from encrypted 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.read_prefix_ctx = cb_ctx;
        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.buf_filled = 0;
        export_ctx.bytes_remaining = size;
 
-       err = OpenEncryptedFileRawW(lte->file_on_disk, 0, &file_ctx);
+       err = OpenEncryptedFileRaw(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;
+               set_errno_from_win32_error(err);
+               ERROR_WITH_ERRNO("Failed to open encrypted file \"%ls\" "
+                                "for raw read", lte->file_on_disk);
+               return WIMLIB_ERR_OPEN;
        }
        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);
+               set_errno_from_win32_error(err);
+               ERROR_WITH_ERRNO("Failed to read encrypted file \"%ls\"",
+                                lte->file_on_disk);
                ret = export_ctx.wimlib_err_code;
                if (ret == 0)
                        ret = WIMLIB_ERR_READ;
@@ -209,8 +211,6 @@ read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte,
                ret = 0;
        }
        CloseEncryptedFileRaw(file_ctx);
-out_free_buf:
-       FREE(export_ctx.buf);
        return ret;
 }
 
@@ -221,233 +221,216 @@ FILETIME_to_u64(const FILETIME *ft)
        return ((u64)ft->dwHighDateTime << 32) | (u64)ft->dwLowDateTime;
 }
 
+/* Load the short name of a file into a WIM dentry.
+ *
+ * If we can't read the short filename for some reason, we just ignore the error
+ * and assume the file has no short name.  This shouldn't be an issue, since the
+ * short names are essentially obsolete anyway.
+ */
 static int
-win32_get_short_name(struct wim_dentry *dentry, const wchar_t *path)
+win32_get_short_name(HANDLE hFile, struct wim_dentry *dentry)
 {
-       WIN32_FIND_DATAW dat;
-       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. */
-       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);
+
+       /* It's not any harder to just make the NtQueryInformationFile() system
+        * call ourselves, and it saves a dumb call to FindFirstFile() which of
+        * course has to create its own handle.  */
+       NTSTATUS status;
+       IO_STATUS_BLOCK io_status;
+       u8 buf[128] _aligned_attribute(8);
+       const FILE_NAME_INFORMATION *info;
+
+       status = (*func_NtQueryInformationFile)(hFile, &io_status, buf, sizeof(buf),
+                                               FileAlternateNameInformation);
+       info = (const FILE_NAME_INFORMATION*)buf;
+       if (NT_SUCCESS(status) && info->FileNameLength != 0) {
+               dentry->short_name = utf16le_dupz(info->FileName,
+                                                 info->FileNameLength);
+               if (!dentry->short_name)
+                       return WIMLIB_ERR_NOMEM;
+               dentry->short_name_nbytes = info->FileNameLength;
        }
-       return ret;
+       return 0;
 }
 
 static int
-win32_get_security_descriptor(struct wim_dentry *dentry,
-                             struct sd_set *sd_set,
-                             const wchar_t *path,
+win32_get_security_descriptor(HANDLE h,
+                             struct wim_inode *inode,
+                             struct wim_sd_set *sd_set,
                              struct win32_capture_state *state,
                              int add_flags)
 {
        SECURITY_INFORMATION requestedInformation;
-       DWORD lenNeeded = 0;
-       BOOL status;
-       DWORD err;
-       unsigned long n;
+       u8 _buf[4096];
+       u8 *buf;
+       size_t bufsize;
+       DWORD lenNeeded;
+       NTSTATUS status;
+       int ret;
 
        requestedInformation = DACL_SECURITY_INFORMATION |
                               SACL_SECURITY_INFORMATION |
                               OWNER_SECURITY_INFORMATION |
                               GROUP_SECURITY_INFORMATION;
-again:
-       /* Request length of security descriptor */
-       status = GetFileSecurityW(path, requestedInformation,
-                                 NULL, 0, &lenNeeded);
-       err = GetLastError();
-       if (!status && err == ERROR_INSUFFICIENT_BUFFER) {
-               DWORD len = lenNeeded;
-               char buf[len];
-               if (GetFileSecurityW(path, requestedInformation,
-                                    (PSECURITY_DESCRIPTOR)buf, len, &lenNeeded))
-               {
-                       int security_id = sd_set_add_sd(sd_set, buf, len);
-                       if (security_id < 0)
+       buf = _buf;
+       bufsize = sizeof(_buf);
+
+       /*
+        * We need the file's security descriptor in SECURITY_DESCRIPTOR_RELATIVE
+        * format, and we currently have a handle opened with as many relevant
+        * permissions as possible.  At this point, on Windows there are a number of
+        * options for reading a file's security descriptor:
+        *
+        * GetFileSecurity():  This takes in a path and returns the
+        * SECURITY_DESCRIPTOR_RELATIVE.  Problem: this uses an internal handle, not
+        * ours, and the handle created internally doesn't specify
+        * FILE_FLAG_BACKUP_SEMANTICS.  Therefore there can be access denied errors on
+        * some files and directories, even when running as the Administrator.
+        *
+        * GetSecurityInfo():  This takes in a handle and returns the security
+        * descriptor split into a bunch of different parts.  This should work, but it's
+        * dumb because we have to put the security descriptor back together again.
+        *
+        * BackupRead():  This can read the security descriptor, but this is a
+        * difficult-to-use API, probably only works as the Administrator, and the
+        * format of the returned data is not well documented.
+        *
+        * NtQuerySecurityObject():  This is exactly what we need, as it takes in a
+        * handle and returns the security descriptor in SECURITY_DESCRIPTOR_RELATIVE
+        * format.  Only problem is that it's a ntdll function and therefore not
+        * officially part of the Win32 API.  Oh well.
+        */
+       while (!(NT_SUCCESS(status = (*func_NtQuerySecurityObject)(h,
+                                                                  requestedInformation,
+                                                                  (PSECURITY_DESCRIPTOR)buf,
+                                                                  bufsize,
+                                                                  &lenNeeded))))
+       {
+               switch (status) {
+               case STATUS_BUFFER_OVERFLOW:
+                       wimlib_assert(buf == _buf);
+                       buf = MALLOC(lenNeeded);
+                       if (!buf)
                                return WIMLIB_ERR_NOMEM;
-                       else {
-                               dentry->d_inode->i_security_id = security_id;
-                               return 0;
+                       bufsize = lenNeeded;
+                       break;
+               case STATUS_PRIVILEGE_NOT_HELD:
+               case STATUS_ACCESS_DENIED:
+                       if (add_flags & WIMLIB_ADD_FLAG_STRICT_ACLS) {
+               default:
+                               set_errno_from_nt_status(status);
+                               ret = WIMLIB_ERR_READ;
+                               goto out_free_buf;
                        }
-               } else {
-                       err = GetLastError();
-               }
-       }
-
-       if (add_flags & WIMLIB_ADD_FLAG_STRICT_ACLS)
-               goto fail;
-
-       switch (err) {
-       case ERROR_PRIVILEGE_NOT_HELD:
-               if (requestedInformation & SACL_SECURITY_INFORMATION) {
-                       n = state->num_get_sacl_priv_notheld++;
-                       requestedInformation &= ~SACL_SECURITY_INFORMATION;
-                       if (n < MAX_GET_SACL_PRIV_NOTHELD_WARNINGS) {
-                               WARNING(
-"We don't have enough privileges to read the full security\n"
-"          descriptor of \"%ls\"!\n"
-"          Re-trying with SACL omitted.\n", path);
-                       } else if (n == MAX_GET_SACL_PRIV_NOTHELD_WARNINGS) {
-                               WARNING(
-"Suppressing further privileges not held error messages when reading\n"
-"          security descriptors.");
+                       if (requestedInformation & SACL_SECURITY_INFORMATION) {
+                               state->num_get_sacl_priv_notheld++;
+                               requestedInformation &= ~SACL_SECURITY_INFORMATION;
+                               break;
                        }
-                       goto again;
-               }
-               /* Fall through */
-       case ERROR_ACCESS_DENIED:
-               n = state->num_get_sd_access_denied++;
-               if (n < MAX_GET_SD_ACCESS_DENIED_WARNINGS) {
-                       WARNING("Failed to read security descriptor of \"%ls\": "
-                               "Access denied!\n%ls", path, capture_access_denied_msg);
-               } else if (n == MAX_GET_SD_ACCESS_DENIED_WARNINGS) {
-                       WARNING("Suppressing further access denied errors messages i"
-                               "when reading security descriptors");
+                       state->num_get_sd_access_denied++;
+                       ret = 0;
+                       goto out_free_buf;
                }
-               return 0;
-       default:
-fail:
-               ERROR("Failed to read security descriptor of \"%ls\"", path);
-               win32_error(err);
-               return WIMLIB_ERR_READ;
        }
+
+       inode->i_security_id = sd_set_add_sd(sd_set, buf, lenNeeded);
+       if (inode->i_security_id < 0)
+               ret = WIMLIB_ERR_NOMEM;
+       else
+               ret = 0;
+out_free_buf:
+       if (buf != _buf)
+               FREE(buf);
+       return ret;
 }
 
 static int
 win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
-                                 wchar_t *path,
-                                 size_t path_num_chars,
+                                 HANDLE cur_dir,
+                                 wchar_t *full_path,
+                                 size_t full_path_nchars,
+                                 const wchar_t *filename,
+                                 size_t filename_nchars,
                                  struct add_image_params *params,
                                  struct win32_capture_state *state,
-                                 unsigned vol_flags);
+                                 DWORD vol_flags);
 
-/* Reads the directory entries of directory using a Win32 API and recursively
- * calls win32_build_dentry_tree() on them. */
+/* Reads the directory entries of directory and recursively calls
+ * win32_build_dentry_tree() on them.  */
 static int
-win32_recurse_directory(struct wim_dentry *root,
-                       wchar_t *dir_path,
-                       size_t dir_path_num_chars,
+win32_recurse_directory(HANDLE h,
+                       wchar_t *full_path,
+                       size_t full_path_nchars,
+                       struct wim_dentry *root,
                        struct add_image_params *params,
                        struct win32_capture_state *state,
-                       unsigned vol_flags)
+                       DWORD 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
-        * entries. */
-       dir_path[dir_path_num_chars] = L'/';
-       dir_path[dir_path_num_chars + 1] = L'*';
-       dir_path[dir_path_num_chars + 2] = L'\0';
-       hFind = FindFirstFileW(dir_path, &dat);
-       dir_path[dir_path_num_chars] = L'\0';
-
-       if (hFind == INVALID_HANDLE_VALUE) {
-               err = GetLastError();
-               if (err == ERROR_FILE_NOT_FOUND) {
-                       return 0;
-               } else {
-                       ERROR("Failed to read directory \"%ls\"", dir_path);
-                       win32_error(err);
-                       return WIMLIB_ERR_READ;
-               }
-       }
-       ret = 0;
-       do {
-               /* Skip . and .. entries */
-               if (dat.cFileName[0] == L'.' &&
-                   (dat.cFileName[1] == L'\0' ||
-                    (dat.cFileName[1] == L'.' &&
-                     dat.cFileName[2] == L'\0')))
-                       continue;
-               size_t filename_len = wcslen(dat.cFileName);
-
-               dir_path[dir_path_num_chars] = L'/';
-               wmemcpy(dir_path + dir_path_num_chars + 1,
-                       dat.cFileName,
-                       filename_len + 1);
-
-               struct wim_dentry *child;
-               size_t path_len = dir_path_num_chars + 1 + filename_len;
-               ret = win32_build_dentry_tree_recursive(&child,
-                                                       dir_path,
-                                                       path_len,
-                                                       params,
-                                                       state,
-                                                       vol_flags);
-               dir_path[dir_path_num_chars] = L'\0';
-               if (ret)
-                       goto out_find_close;
-               if (child)
-                       dentry_add_child(root, child);
-       } while (FindNextFileW(hFind, &dat));
-       err = GetLastError();
-       if (err != ERROR_NO_MORE_FILES) {
-               ERROR("Failed to read directory \"%ls\"", dir_path);
-               win32_error(err);
-               if (ret == 0)
-                       ret = WIMLIB_ERR_READ;
-       }
-out_find_close:
-       FindClose(hFind);
-       return ret;
-}
+       /* Using NtQueryDirectoryFile() we can re-use the same open handle,
+        * which we opened with FILE_FLAG_BACKUP_SEMANTICS.  */
 
-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;
+       NTSTATUS status;
+       IO_STATUS_BLOCK io_status;
+       const size_t bufsize = 8192;
+       void *buf;
 
-       hFile = win32_open_existing_file(path, FILE_READ_ATTRIBUTES);
-       if (hFile == INVALID_HANDLE_VALUE) {
-               err = GetLastError();
-               if (err != ERROR_FILE_NOT_FOUND) {
-                       WARNING("Failed to open \"%ls\" to get file "
-                               "and volume IDs", path);
-                       win32_error(err);
+       buf = MALLOC(bufsize);
+       if (!buf)
+               return WIMLIB_ERR_NOMEM;
+
+       while (NT_SUCCESS(status = (*func_NtQueryDirectoryFile)(h, NULL, NULL, NULL,
+                                                               &io_status, buf, bufsize,
+                                                               FileNamesInformation,
+                                                               FALSE, NULL, FALSE)))
+       {
+               const FILE_NAMES_INFORMATION *info = buf;
+               for (;;) {
+                       if (!(info->FileNameLength == 2 && info->FileName[0] == L'.') &&
+                           !(info->FileNameLength == 4 && info->FileName[0] == L'.' &&
+                                                          info->FileName[1] == L'.'))
+                       {
+                               wchar_t *p;
+                               struct wim_dentry *child;
+
+                               p = full_path + full_path_nchars;
+                               *p++ = L'\\';
+                               p = wmempcpy(p, info->FileName,
+                                            info->FileNameLength / 2);
+                               *p = '\0';
+
+                               ret = win32_build_dentry_tree_recursive(
+                                                               &child,
+                                                               h,
+                                                               full_path,
+                                                               p - full_path,
+                                                               full_path + full_path_nchars + 1,
+                                                               info->FileNameLength / 2,
+                                                               params,
+                                                               state,
+                                                               vol_flags);
+
+                               full_path[full_path_nchars] = L'\0';
+
+                               if (ret)
+                                       goto out_free_buf;
+                               if (child)
+                                       dentry_add_child(root, child);
+                       }
+                       if (info->NextEntryOffset == 0)
+                               break;
+                       info = (const FILE_NAMES_INFORMATION *)
+                                       ((const u8 *)info + info->NextEntryOffset);
                }
-               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;
+       if (status != STATUS_NO_MORE_FILES) {
+               set_errno_from_nt_status(status);
+               ERROR_WITH_ERRNO("\"%ls\": Can't read directory", full_path);
+               ret = WIMLIB_ERR_READ;
        }
-       CloseHandle(hFile);
+out_free_buf:
+       FREE(buf);
        return ret;
 }
 
@@ -530,15 +513,13 @@ win32_capture_maybe_rpfix_target(wchar_t *target, u16 *target_nbytes_p,
 static int
 win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
                        u64 capture_root_ino, u64 capture_root_dev,
-                       const wchar_t *path)
+                       const wchar_t *path, struct add_image_params *params)
 {
        struct reparse_data rpdata;
-       DWORD rpbuflen;
        int ret;
        enum rp_status rp_status;
 
-       rpbuflen = *rpbuflen_p;
-       ret = parse_reparse_data(rpbuf, rpbuflen, &rpdata);
+       ret = parse_reparse_data(rpbuf, *rpbuflen_p, &rpdata);
        if (ret)
                return -ret;
 
@@ -546,7 +527,7 @@ win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
                                                     &rpdata.substitute_name_nbytes,
                                                     capture_root_ino,
                                                     capture_root_dev,
-                                                    le32_to_cpu(*(u32*)rpbuf));
+                                                    le32_to_cpu(*(le32*)rpbuf));
        if (rp_status & RP_FIXED) {
                wimlib_assert(rpdata.substitute_name_nbytes % 2 == 0);
                utf16lechar substitute_name_copy[rpdata.substitute_name_nbytes / 2];
@@ -562,24 +543,25 @@ win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
                        rpdata.print_name += 4;
                        rpdata.print_name_nbytes -= 8;
                }
-               ret = make_reparse_buffer(&rpdata, rpbuf);
+               ret = make_reparse_buffer(&rpdata, rpbuf, rpbuflen_p);
                if (ret == 0)
                        ret = rp_status;
                else
                        ret = -ret;
        } else {
                if (rp_status == RP_EXCLUDED) {
+                       /* Ignoring absolute symbolic link or junction point
+                        * that points out of the tree to be captured.  */
                        size_t print_name_nchars = rpdata.print_name_nbytes / 2;
                        wchar_t print_name0[print_name_nchars + 1];
                        print_name0[print_name_nchars] = L'\0';
                        wmemcpy(print_name0, rpdata.print_name, print_name_nchars);
-                       WARNING("Ignoring %ls pointing out of capture directory:\n"
-                               "          \"%ls\" -> \"%ls\"\n"
-                               "          (Use --norpfix to capture all symbolic links "
-                               "and junction points as-is)",
-                               (rpdata.rptag == WIM_IO_REPARSE_TAG_SYMLINK) ?
-                                       L"absolute symbolic link" : L"junction point",
-                               path, print_name0);
+
+                       params->progress.scan.cur_path = path;
+                       params->progress.scan.symlink_target = print_name0;
+                       do_capture_progress(params,
+                                           WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK,
+                                           NULL);
                }
                ret = rp_status;
        }
@@ -591,8 +573,8 @@ win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
  * fixing the targets of absolute symbolic links and junction points to be
  * relative to the root of capture.
  *
- * @hFile:  Open handle to the reparse point.
- * @path:   Path to the reparse point.  Used for error messages only.
+ * @h:     Open handle to the reparse point.
+ * @path:   Path to the reparse point file.
  * @params: Additional parameters, including whether to do reparse point fixups
  *          or not.
  * @rpbuf:  Buffer of length at least REPARSE_POINT_MAX_SIZE bytes into which
@@ -608,7 +590,7 @@ win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
  *     code.
  */
 static int
-win32_get_reparse_data(HANDLE hFile, const wchar_t *path,
+win32_get_reparse_data(HANDLE h, const wchar_t *path,
                       struct add_image_params *params,
                       u8 *rpbuf, u16 *rpbuflen_ret)
 {
@@ -617,8 +599,7 @@ win32_get_reparse_data(HANDLE hFile, const wchar_t *path,
        int ret;
        u16 rpbuflen;
 
-       DEBUG("Loading reparse data from \"%ls\"", path);
-       if (!DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT,
+       if (!DeviceIoControl(h, FSCTL_GET_REPARSE_POINT,
                             NULL, /* "Not used with this operation; set to NULL" */
                             0, /* "Not used with this operation; set to 0" */
                             rpbuf, /* "A pointer to a buffer that
@@ -628,18 +609,17 @@ win32_get_reparse_data(HANDLE hFile, const wchar_t *path,
                             &bytesReturned,
                             NULL))
        {
-               DWORD err = GetLastError();
-               ERROR("Failed to get reparse data of \"%ls\"", path);
-               win32_error(err);
+               set_errno_from_GetLastError();
                return -WIMLIB_ERR_READ;
        }
+
        if (bytesReturned < 8 || bytesReturned > REPARSE_POINT_MAX_SIZE) {
-               ERROR("Reparse data on \"%ls\" is invalid", path);
+               errno = EINVAL;
                return -WIMLIB_ERR_INVALID_REPARSE_DATA;
        }
 
        rpbuflen = bytesReturned;
-       reparse_tag = le32_to_cpu(*(u32*)rpbuf);
+       reparse_tag = le32_to_cpu(*(le32*)rpbuf);
        if (params->add_flags & WIMLIB_ADD_FLAG_RPFIX &&
            (reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK ||
             reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT))
@@ -649,7 +629,8 @@ win32_get_reparse_data(HANDLE hFile, const wchar_t *path,
                                              &rpbuflen,
                                              params->capture_root_ino,
                                              params->capture_root_dev,
-                                             path);
+                                             path,
+                                             params);
        } else {
                ret = RP_NOT_FIXED;
        }
@@ -658,10 +639,10 @@ win32_get_reparse_data(HANDLE hFile, const wchar_t *path,
 }
 
 static DWORD WINAPI
-win32_tally_encrypted_size_cb(unsigned char *_data, void *_ctx,
+win32_tally_encrypted_size_cb(unsigned char *_data, void *_size_ret,
                              unsigned long len)
 {
-       *(u64*)_ctx += len;
+       *(u64*)_size_ret += len;
        return ERROR_SUCCESS;
 }
 
@@ -672,18 +653,20 @@ win32_get_encrypted_file_size(const wchar_t *path, u64 *size_ret)
        void *file_ctx;
        int ret;
 
-       *size_ret = 0;
-       err = OpenEncryptedFileRawW(path, 0, &file_ctx);
+       err = OpenEncryptedFileRaw(path, 0, &file_ctx);
        if (err != ERROR_SUCCESS) {
-               ERROR("Failed to open encrypted file \"%ls\" for raw read", path);
-               win32_error(err);
+               set_errno_from_win32_error(err);
+               ERROR_WITH_ERRNO("Failed to open encrypted file \"%ls\" "
+                                "for raw read", path);
                return WIMLIB_ERR_OPEN;
        }
+       *size_ret = 0;
        err = ReadEncryptedFileRaw(win32_tally_encrypted_size_cb,
                                   size_ret, file_ctx);
        if (err != ERROR_SUCCESS) {
-               ERROR("Failed to read raw encrypted data from \"%ls\"", path);
-               win32_error(err);
+               set_errno_from_win32_error(err);
+               ERROR_WITH_ERRNO("Failed to read raw encrypted data from "
+                                "\"%ls\"", path);
                ret = WIMLIB_ERR_READ;
        } else {
                ret = 0;
@@ -692,333 +675,371 @@ win32_get_encrypted_file_size(const wchar_t *path, u64 *size_ret)
        return ret;
 }
 
-/* Scans an unnamed or named stream of a Win32 file (not a reparse point
- * stream); calculates its SHA1 message digest and either creates a `struct
- * wim_lookup_table_entry' in memory for it, or uses an existing 'struct
- * wim_lookup_table_entry' for an identical stream.
- *
- * @path:               Path to the file (UTF-16LE).
- *
- * @path_num_chars:     Number of 2-byte characters in @path.
- *
- * @inode:              WIM inode to save the stream into.
- *
- * @lookup_table:       Stream lookup table for the WIM.
- *
- * @dat:                A `WIN32_FIND_STREAM_DATA' structure that specifies the
- *                      stream name.
- *
- * Returns 0 on success; nonzero on failure.
- */
+static bool
+get_data_stream_name(const wchar_t *raw_stream_name, size_t raw_stream_name_nchars,
+                    const wchar_t **stream_name_ret, size_t *stream_name_nchars_ret)
+{
+       const wchar_t *sep, *type, *end;
+
+       /* The stream name should be returned as :NAME:TYPE  */
+       if (raw_stream_name_nchars < 1)
+               return false;
+       if (raw_stream_name[0] != L':')
+               return false;
+
+       raw_stream_name++;
+       raw_stream_name_nchars--;
+
+       end = raw_stream_name + raw_stream_name_nchars;
+
+       sep = wmemchr(raw_stream_name, L':', raw_stream_name_nchars);
+       if (!sep)
+               return false;
+
+       type = sep + 1;
+       if (end - type != 5)
+               return false;
+
+       if (wmemcmp(type, L"$DATA", 5))
+               return false;
+
+       *stream_name_ret = raw_stream_name;
+       *stream_name_nchars_ret = sep - raw_stream_name;
+       return true;
+}
+
+static wchar_t *
+build_stream_path(const wchar_t *path, size_t path_nchars,
+                 const wchar_t *stream_name, size_t stream_name_nchars)
+{
+       size_t stream_path_nchars;
+       wchar_t *stream_path;
+       wchar_t *p;
+
+       stream_path_nchars = path_nchars;
+       if (stream_name_nchars)
+               stream_path_nchars += 1 + stream_name_nchars;
+
+       stream_path = MALLOC((stream_path_nchars + 1) * sizeof(wchar_t));
+       if (stream_path) {
+               p = wmempcpy(stream_path, path, path_nchars);
+               if (stream_name_nchars) {
+                       *p++ = L':';
+                       p = wmempcpy(p, stream_name, stream_name_nchars);
+               }
+               *p++ = L'\0';
+       }
+       return stream_path;
+}
+
 static int
-win32_capture_stream(const wchar_t *path,
-                    size_t path_num_chars,
+win32_capture_stream(const wchar_t *path, size_t path_nchars,
+                    const wchar_t *raw_stream_name, size_t raw_stream_name_nchars,
+                    u64 stream_size,
                     struct wim_inode *inode,
-                    struct wim_lookup_table *lookup_table,
-                    WIN32_FIND_STREAM_DATA *dat)
+                    struct list_head *unhashed_streams)
 {
+       const wchar_t *stream_name;
+       size_t stream_name_nchars;
        struct wim_ads_entry *ads_entry;
+       wchar_t *stream_path;
        struct wim_lookup_table_entry *lte;
-       int ret;
-       wchar_t *stream_name, *colon;
-       size_t stream_name_nchars;
-       bool is_named_stream;
-       wchar_t *spath;
-       size_t spath_nchars;
-       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':')
-               goto out_invalid_stream_name;
-       stream_name += 1;
-       colon = wcschr(stream_name, L':');
-       if (colon == NULL)
-               goto out_invalid_stream_name;
-
-       if (wcscmp(colon + 1, L"$DATA")) {
-               /* Not a DATA stream */
-               ret = 0;
-               goto out;
-       }
-
-       *colon = '\0';
+       u32 stream_id;
 
-       stream_name_nchars = colon - stream_name;
-       is_named_stream = (stream_name_nchars != 0);
+       /* Given the raw stream name (which is something like
+        * L":streamname:$DATA", extract just the stream name part.  */
+       if (!get_data_stream_name(raw_stream_name, raw_stream_name_nchars,
+                                 &stream_name, &stream_name_nchars))
+               return 0;
 
-       if (is_named_stream) {
-               /* Allocate an ADS entry for the named stream. */
+       /* If this is a named stream, allocate an ADS entry.  */
+       if (stream_name_nchars) {
                ads_entry = inode_add_ads_utf16le(inode, stream_name,
                                                  stream_name_nchars * sizeof(wchar_t));
-               if (!ads_entry) {
-                       ret = WIMLIB_ERR_NOMEM;
-                       goto out;
-               }
-       }
-
-       /* 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
-        * wim_lookup_table_entry if needed.
-        *
-        * As yet another special case, relative paths need to be changed to
-        * begin with an explicit "./" so that, for example, a file t:ads, where
-        * :ads is the part we added, is not interpreted as a file on the t:
-        * drive. */
-       spath_nchars = path_num_chars;
-       relpath_prefix = L"";
-       colonchar = L"";
-       if (is_named_stream) {
-               spath_nchars += 1 + stream_name_nchars;
-               colonchar = L":";
-               if (path_num_chars == 1 &&
-                   path[0] != L'/' &&
-                   path[0] != L'\\')
-               {
-                       spath_nchars += 2;
-                       relpath_prefix = L"./";
-               }
+               if (!ads_entry)
+                       return WIMLIB_ERR_NOMEM;
+       } else {
+               ads_entry = NULL;
        }
 
-       spath_buf_nbytes = (spath_nchars + 1) * sizeof(wchar_t);
-       spath = MALLOC(spath_buf_nbytes);
+       /* If the stream is empty, no lookup table entry is needed. */
+       if (stream_size == 0)
+               return 0;
 
-       swprintf(spath, L"%ls%ls%ls%ls",
-                relpath_prefix, path, colonchar, stream_name);
+       /* Build the path to the stream.  For unnamed streams, this is simply
+        * the path to the file.  For named streams, this is the path to the
+        * file, followed by a colon, followed by the stream name.  */
+       stream_path = build_stream_path(path, path_nchars,
+                                       stream_name, stream_name_nchars);
+       if (!stream_path)
+               return WIMLIB_ERR_NOMEM;
 
-       /* Make a new wim_lookup_table_entry */
+       /* Set up the lookup table entry for the stream.  */
        lte = new_lookup_table_entry();
        if (!lte) {
-               ret = WIMLIB_ERR_NOMEM;
-               goto out_free_spath;
+               FREE(stream_path);
+               return WIMLIB_ERR_NOMEM;
        }
-       lte->file_on_disk = spath;
-       spath = NULL;
-       if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED && !is_named_stream) {
+       lte->file_on_disk = stream_path;
+       lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
+       lte->size = stream_size;
+       if ((inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) && !ads_entry) {
+               /* Special case for encrypted file.  */
+
+               /* OpenEncryptedFileRaw() expects Win32 name, not NT name.  */
+               lte->file_on_disk[1] = L'\\';
+               wimlib_assert(!wmemcmp(lte->file_on_disk, L"\\\\?\\", 4));
+
                u64 encrypted_size;
+               int ret;
+
+               ret = win32_get_encrypted_file_size(lte->file_on_disk,
+                                                   &encrypted_size);
+               if (ret) {
+                       free_lookup_table_entry(lte);
+                       return ret;
+               }
+               lte->size = encrypted_size;
                lte->resource_location = RESOURCE_WIN32_ENCRYPTED;
-               ret = win32_get_encrypted_file_size(path, &encrypted_size);
-               if (ret)
-                       goto out_free_spath;
-               lte->resource_entry.original_size = encrypted_size;
-       } else {
-               lte->resource_location = RESOURCE_WIN32;
-               lte->resource_entry.original_size = (u64)dat->StreamSize.QuadPart;
        }
 
-       u32 stream_id;
-       if (is_named_stream) {
+       if (ads_entry) {
                stream_id = ads_entry->stream_id;
                ads_entry->lte = lte;
        } 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:
-       return ret;
-out_invalid_stream_name:
-       ERROR("Invalid stream name: \"%ls:%ls\"", path, dat->cStreamName);
-       ret = WIMLIB_ERR_READ;
-       goto out;
+       add_unhashed_stream(lte, inode, stream_id, unhashed_streams);
+       return 0;
 }
 
-/* Scans a Win32 file for unnamed and named data streams (not reparse point
- * streams).
- *
- * @path:               Path to the file (UTF-16LE).
- *
- * @path_num_chars:     Number of 2-byte characters in @path.
+/* Load information about the streams of an open file into a WIM inode.
  *
- * @inode:              WIM inode to save the stream into.
+ * We use the NtQueryInformationFile() system call instead of FindFirstStream()
+ * and FindNextStream().  This is done for two reasons:
  *
- * @lookup_table:       Stream lookup table for the WIM.
- *
- * @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.
+ * - FindFirstStream() opens its own handle to the file or directory and
+ *   apparently does so without specifying FILE_FLAG_BACKUP_SEMANTICS, thereby
+ *   causing access denied errors on certain files (even when running as the
+ *   Administrator).
+ * - FindFirstStream() and FindNextStream() is only available on Windows Vista
+ *   and later, whereas the stream support in NtQueryInformationFile() was
+ *   already present in Windows XP.
  */
 static int
-win32_capture_streams(const wchar_t *path,
-                     size_t path_num_chars,
+win32_capture_streams(HANDLE *hFile_p,
+                     const wchar_t *path,
+                     size_t path_nchars,
                      struct wim_inode *inode,
-                     struct wim_lookup_table *lookup_table,
+                     struct list_head *unhashed_streams,
                      u64 file_size,
-                     unsigned vol_flags)
+                     DWORD vol_flags)
 {
-       WIN32_FIND_STREAM_DATA dat;
        int ret;
-       HANDLE hFind;
-       DWORD err;
+       u8 _buf[8192] _aligned_attribute(8);
+       u8 *buf;
+       size_t bufsize;
+       IO_STATUS_BLOCK io_status;
+       NTSTATUS status;
+       const FILE_STREAM_INFORMATION *info;
 
        DEBUG("Capturing streams from \"%ls\"", path);
 
-       if (win32func_FindFirstStreamW == NULL ||
-           !(vol_flags & FILE_NAMED_STREAMS))
+       buf = _buf;
+       bufsize = sizeof(_buf);
+
+       if (!(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;
+       /* Get a buffer containing the stream information.  */
+       while (!NT_SUCCESS(status = (*func_NtQueryInformationFile)(*hFile_p,
+                                                                  &io_status,
+                                                                  buf,
+                                                                  bufsize,
+                                                                  FileStreamInformation)))
+       {
 
-               /* Seems legal for this to return ERROR_HANDLE_EOF on reparse
-                * points and directories */
-               if ((inode->i_attributes &
-                   (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
-                   && err == ERROR_HANDLE_EOF)
-               {
-                       DEBUG("ERROR_HANDLE_EOF (ok)");
-                       return 0;
-               } else {
-                       if (err == ERROR_ACCESS_DENIED) {
-                               WARNING("Failed to look up data streams "
-                                       "of \"%ls\": Access denied!\n%ls",
-                                       path, capture_access_denied_msg);
-                               return 0;
-                       } else {
-                               ERROR("Failed to look up data streams "
-                                     "of \"%ls\"", path);
-                               win32_error(err);
-                               return WIMLIB_ERR_READ;
+               switch (status) {
+               case STATUS_BUFFER_OVERFLOW:
+                       {
+                               u8 *newbuf;
+
+                               bufsize *= 2;
+                               if (buf == _buf)
+                                       newbuf = MALLOC(bufsize);
+                               else
+                                       newbuf = REALLOC(buf, bufsize);
+                               if (!newbuf) {
+                                       ret = WIMLIB_ERR_NOMEM;
+                                       goto out_free_buf;
+                               }
+                               buf = newbuf;
                        }
+                       break;
+               case STATUS_NOT_IMPLEMENTED:
+               case STATUS_NOT_SUPPORTED:
+               case STATUS_INVALID_INFO_CLASS:
+                       goto unnamed_only;
+               default:
+                       set_errno_from_nt_status(status);
+                       ERROR_WITH_ERRNO("\"%ls\": Failed to query "
+                                        "stream information", path);
+                       ret = WIMLIB_ERR_READ;
+                       goto out_free_buf;
                }
        }
-       do {
-               ret = win32_capture_stream(path,
-                                          path_num_chars,
-                                          inode, lookup_table,
-                                          &dat);
+
+       if (io_status.Information == 0) {
+               /* No stream information.  */
+               ret = 0;
+               goto out_free_buf;
+       }
+
+       if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) {
+               /* OpenEncryptedFileRaw() seems to fail with
+                * ERROR_SHARING_VIOLATION if there are any handles opened to
+                * the file.  */
+               (*func_NtClose)(*hFile_p);
+               *hFile_p = INVALID_HANDLE_VALUE;
+       }
+
+       /* Parse one or more stream information structures.  */
+       info = (const FILE_STREAM_INFORMATION *)buf;
+       for (;;) {
+               /* Capture the stream.  */
+               ret = win32_capture_stream(path, path_nchars,
+                                          info->StreamName,
+                                          info->StreamNameLength / 2,
+                                          info->StreamSize.QuadPart,
+                                          inode, unhashed_streams);
                if (ret)
-                       goto out_find_close;
-       } while (win32func_FindNextStreamW(hFind, &dat));
-       err = GetLastError();
-       if (err != ERROR_HANDLE_EOF) {
-               ERROR("Win32 API: Error reading data streams from \"%ls\"", path);
-               win32_error(err);
-               ret = WIMLIB_ERR_READ;
+                       goto out_free_buf;
+
+               if (info->NextEntryOffset == 0) {
+                       /* No more stream information.  */
+                       break;
+               }
+               /* Advance to next stream information.  */
+               info = (const FILE_STREAM_INFORMATION *)
+                               ((const u8 *)info + info->NextEntryOffset);
        }
-out_find_close:
-       FindClose(hFind);
-       return ret;
+       ret = 0;
+       goto out_free_buf;
+
 unnamed_only:
-       /* FindFirstStreamW() API is not available, or the volume does not
-        * support named streams.  Only capture the unnamed data stream. */
+       /* 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))
+       if (inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
+                                  FILE_ATTRIBUTE_REPARSE_POINT))
        {
                ret = 0;
-       } else {
-               /* Just create our own WIN32_FIND_STREAM_DATA for an unnamed
-                * stream to reduce the code to a call to the
-                * already-implemented win32_capture_stream() */
-               wcscpy(dat.cStreamName, L"::$DATA");
-               dat.StreamSize.QuadPart = file_size;
-               ret = win32_capture_stream(path,
-                                          path_num_chars,
-                                          inode, lookup_table,
-                                          &dat);
+               goto out_free_buf;
        }
+
+       ret = win32_capture_stream(path, path_nchars,
+                                  L"::$DATA", 7, file_size,
+                                  inode, unhashed_streams);
+out_free_buf:
+       /* Free buffer if allocated on heap.  */
+       if (buf != _buf)
+               FREE(buf);
        return ret;
 }
 
 static int
 win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
-                                 wchar_t *path,
-                                 size_t path_num_chars,
+                                 HANDLE cur_dir,
+                                 wchar_t *full_path,
+                                 size_t full_path_nchars,
+                                 const wchar_t *filename,
+                                 size_t filename_nchars,
                                  struct add_image_params *params,
                                  struct win32_capture_state *state,
-                                 unsigned vol_flags)
+                                 DWORD vol_flags)
 {
        struct wim_dentry *root = NULL;
-       struct wim_inode *inode;
-       DWORD err;
-       u64 file_size;
+       struct wim_inode *inode = NULL;
+       HANDLE h = INVALID_HANDLE_VALUE;
        int ret;
+       NTSTATUS status;
+       BY_HANDLE_FILE_INFORMATION file_info;
        u8 *rpbuf;
        u16 rpbuflen;
        u16 not_rpfixed;
 
-       if (exclude_path(path, path_num_chars, params->config, true)) {
-               if (params->add_flags & WIMLIB_ADD_FLAG_ROOT) {
-                       ERROR("Cannot exclude the root directory from capture");
-                       ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
-                       goto out;
-               }
-               if ((params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE)
-                   && params->progress_func)
-               {
-                       union wimlib_progress_info info;
-                       info.scan.cur_path = path;
-                       info.scan.excluded = true;
-                       params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
-               }
-               ret = 0;
-               goto out;
-       }
-
-       if ((params->add_flags & WIMLIB_ADD_FLAG_VERBOSE)
-           && params->progress_func)
+       if (should_exclude_path(full_path + params->capture_root_nchars,
+                               full_path_nchars - params->capture_root_nchars,
+                               params->config))
        {
-               union wimlib_progress_info info;
-               info.scan.cur_path = path;
-               info.scan.excluded = false;
-               params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+               ret = 0;
+               goto out_progress;
        }
 
-       HANDLE hFile = win32_open_existing_file(path,
-                                               FILE_READ_DATA | FILE_READ_ATTRIBUTES);
-       if (hFile == INVALID_HANDLE_VALUE) {
-               err = GetLastError();
-               ERROR("Win32 API: Failed to open \"%ls\"", path);
-               win32_error(err);
+       status = winnt_openat(cur_dir,
+                             (cur_dir ? filename : full_path),
+                             (cur_dir ? filename_nchars : full_path_nchars),
+                             FILE_READ_DATA |
+                                       FILE_READ_ATTRIBUTES |
+                                       READ_CONTROL |
+                                       ACCESS_SYSTEM_SECURITY |
+                                       SYNCHRONIZE,
+                             &h);
+       if (!NT_SUCCESS(status)) {
+               set_errno_from_nt_status(status);
+               ERROR_WITH_ERRNO("\"%ls\": Can't open file", full_path);
                ret = WIMLIB_ERR_OPEN;
                goto out;
        }
 
-       BY_HANDLE_FILE_INFORMATION file_info;
-       if (!GetFileInformationByHandle(hFile, &file_info)) {
-               err = GetLastError();
-               ERROR("Win32 API: Failed to get file information for \"%ls\"",
-                     path);
-               win32_error(err);
+       if (!GetFileInformationByHandle(h, &file_info)) {
+               set_errno_from_GetLastError();
+               ERROR_WITH_ERRNO("\"%ls\": Can't get file information", full_path);
                ret = WIMLIB_ERR_STAT;
-               goto out_close_handle;
+               goto out;
+       }
+
+       if (!cur_dir) {
+               /* Root directory; get volume information.  */
+               FILE_FS_ATTRIBUTE_INFORMATION info;
+               IO_STATUS_BLOCK iosb;
+
+               params->capture_root_ino =
+                       ((u64)file_info.nFileIndexHigh << 32) |
+                               file_info.nFileIndexLow;
+               params->capture_root_dev = file_info.dwVolumeSerialNumber;
+
+               status = (*func_NtQueryVolumeInformationFile)(h, &iosb,
+                                                             &info, sizeof(info),
+                                                             FileFsAttributeInformation);
+               if ((NT_SUCCESS(status) || (status == STATUS_BUFFER_OVERFLOW)) &&
+                   iosb.Information >= sizeof(FILE_FS_ATTRIBUTE_INFORMATION))
+               {
+                       vol_flags = info.FileSystemAttributes;
+               } else {
+                       set_errno_from_nt_status(status);
+                       WARNING_WITH_ERRNO("\"%ls\": Can't get volume information",
+                                          full_path);
+                       vol_flags = 0;
+               }
        }
 
        if (file_info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
                rpbuf = alloca(REPARSE_POINT_MAX_SIZE);
-               ret = win32_get_reparse_data(hFile, path, params,
-                                            rpbuf, &rpbuflen);
+               ret = win32_get_reparse_data(h, full_path,
+                                            params, rpbuf, &rpbuflen);
                if (ret < 0) {
                        /* WIMLIB_ERR_* (inverted) */
                        ret = -ret;
-                       goto out_close_handle;
+                       ERROR_WITH_ERRNO("\"%ls\": Can't get reparse data",
+                                        full_path);
+                       goto out;
                } else if (ret & RP_FIXED) {
                        not_rpfixed = 0;
                } else if (ret == RP_EXCLUDED) {
                        ret = 0;
-                       goto out_close_handle;
+                       goto out;
                } else {
                        not_rpfixed = 1;
                }
@@ -1031,7 +1052,7 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
         * has a bug where it can return duplicate File IDs for files and
         * directories on the FAT filesystem. */
        ret = inode_table_new_dentry(params->inode_table,
-                                    path_basename_with_len(path, path_num_chars),
+                                    filename,
                                     ((u64)file_info.nFileIndexHigh << 32) |
                                         (u64)file_info.nFileIndexLow,
                                     file_info.dwVolumeSerialNumber,
@@ -1039,16 +1060,21 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                                        (file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)),
                                     &root);
        if (ret)
-               goto out_close_handle;
+               goto out;
 
-       ret = win32_get_short_name(root, path);
-       if (ret)
-               goto out_close_handle;
+       ret = win32_get_short_name(h, root);
+       if (ret) {
+               ERROR_WITH_ERRNO("\"%ls\": Can't get short name", full_path);
+               goto out;
+       }
 
        inode = root->d_inode;
 
-       if (inode->i_nlink > 1) /* Shared inode; nothing more to do */
-               goto out_close_handle;
+       if (inode->i_nlink > 1) {
+               /* Shared inode; nothing more to do */
+               ret = 0;
+               goto out_progress;
+       }
 
        inode->i_attributes = file_info.dwFileAttributes;
        inode->i_creation_time = FILETIME_to_u64(&file_info.ftCreationTime);
@@ -1061,25 +1087,25 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
        if (!(params->add_flags & WIMLIB_ADD_FLAG_NO_ACLS)
            && (vol_flags & FILE_PERSISTENT_ACLS))
        {
-               ret = win32_get_security_descriptor(root, params->sd_set,
-                                                   path, state,
+               ret = win32_get_security_descriptor(h, inode,
+                                                   params->sd_set, state,
                                                    params->add_flags);
-               if (ret)
-                       goto out_close_handle;
+               if (ret) {
+                       ERROR_WITH_ERRNO("\"%ls\": Can't "
+                                        "read security descriptor", full_path);
+                       goto out;
+               }
        }
 
-       file_size = ((u64)file_info.nFileSizeHigh << 32) |
-                    (u64)file_info.nFileSizeLow;
-
-       CloseHandle(hFile);
-
        /* Capture the unnamed data stream (only should be present for regular
         * files) and any alternate data streams. */
-       ret = win32_capture_streams(path,
-                                   path_num_chars,
+       ret = win32_capture_streams(&h,
+                                   full_path,
+                                   full_path_nchars,
                                    inode,
-                                   params->lookup_table,
-                                   file_size,
+                                   params->unhashed_streams,
+                                   ((u64)file_info.nFileSizeHigh << 32) |
+                                       file_info.nFileSizeLow,
                                    vol_flags);
        if (ret)
                goto out;
@@ -1088,22 +1114,50 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                /* Reparse point: set the reparse data (which we read already)
                 * */
                inode->i_not_rpfixed = not_rpfixed;
-               inode->i_reparse_tag = le32_to_cpu(*(u32*)rpbuf);
+               inode->i_reparse_tag = le32_to_cpu(*(le32*)rpbuf);
                ret = inode_set_unnamed_stream(inode, rpbuf + 8, rpbuflen - 8,
                                               params->lookup_table);
        } else if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) {
                /* Directory (not a reparse point) --- recurse to children */
-               ret = win32_recurse_directory(root,
-                                             path,
-                                             path_num_chars,
+
+               if (h == INVALID_HANDLE_VALUE) {
+                       /* Re-open handle that was closed to read raw encrypted
+                        * data.  */
+                       status = winnt_openat(cur_dir,
+                                             (cur_dir ?
+                                              filename : full_path),
+                                             (cur_dir ?
+                                              filename_nchars : full_path_nchars),
+                                             FILE_LIST_DIRECTORY | SYNCHRONIZE,
+                                             &h);
+                       if (!NT_SUCCESS(status)) {
+                               set_errno_from_nt_status(status);
+                               ERROR_WITH_ERRNO("\"%ls\": Can't open file",
+                                                full_path);
+                               ret = WIMLIB_ERR_OPEN;
+                               goto out;
+                       }
+               }
+               ret = win32_recurse_directory(h,
+                                             full_path,
+                                             full_path_nchars,
+                                             root,
                                              params,
                                              state,
                                              vol_flags);
        }
-       goto out;
-out_close_handle:
-       CloseHandle(hFile);
+       if (ret)
+               goto out;
+
+out_progress:
+       params->progress.scan.cur_path = full_path;
+       if (root)
+               do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
+       else
+               do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
 out:
+       if (h != INVALID_HANDLE_VALUE)
+               (*func_NtClose)(h);
        if (ret == 0)
                *root_ret = root;
        else
@@ -1112,91 +1166,82 @@ out:
 }
 
 static void
-win32_do_capture_warnings(const struct win32_capture_state *state,
+win32_do_capture_warnings(const wchar_t *path,
+                         const struct win32_capture_state *state,
                          int add_flags)
 {
        if (state->num_get_sacl_priv_notheld == 0 &&
            state->num_get_sd_access_denied == 0)
                return;
 
-       WARNING("");
-       WARNING("Built dentry tree successfully, but with the following problem(s):");
+       WARNING("Scan of \"%ls\" complete, but with one or more warnings:", path);
        if (state->num_get_sacl_priv_notheld != 0) {
-               WARNING("Could not capture SACL (System Access Control List)\n"
-                       "          on %lu files or directories.",
+               WARNING("Could not capture SACL (System Access Control List)\n"
+                       "            on %lu files or directories.",
                        state->num_get_sacl_priv_notheld);
        }
        if (state->num_get_sd_access_denied != 0) {
-               WARNING("Could not capture security descriptor at all\n"
-                       "          on %lu files or directories.",
+               WARNING("Could not capture security descriptor at all\n"
+                       "            on %lu files or directories.",
                        state->num_get_sd_access_denied);
        }
-       WARNING(
-          "Try running the program as the Administrator to make sure all the\n"
-"          desired metadata has been captured exactly.  However, if you\n"
-"          do not care about capturing security descriptors correctly, then\n"
-"          nothing more needs to be done%ls\n",
-       (add_flags & WIMLIB_ADD_FLAG_NO_ACLS) ? L"." :
-         L", although you might consider\n"
-"          passing the --no-acls flag to `wimlib-imagex capture' or\n"
-"          `wimlib-imagex append' to explicitly capture no security\n"
-"          descriptors.\n");
+       WARNING("To fully capture all security descriptors, run the program\n"
+               "          with Administrator rights.");
 }
 
+#define WINDOWS_NT_MAX_PATH 32768
+
 /* Win32 version of capturing a directory tree */
 int
 win32_build_dentry_tree(struct wim_dentry **root_ret,
                        const wchar_t *root_disk_path,
                        struct add_image_params *params)
 {
-       size_t path_nchars;
        wchar_t *path;
+       DWORD dret;
+       size_t path_nchars;
        int ret;
        struct win32_capture_state state;
-       unsigned vol_flags;
 
-       if (!win32func_FindFirstStreamW) {
-               WARNING("Running on Windows XP or earlier; "
-                       "alternate data streams will not be captured.");
-       }
+       /* WARNING: There is no check for overflow later when this buffer is
+        * being used!  But it's as long as the maximum path length understood
+        * by Windows NT (which is NOT the same as MAX_PATH).  */
+       path = MALLOC((WINDOWS_NT_MAX_PATH + 1) * sizeof(wchar_t));
+       if (!path)
+               return WIMLIB_ERR_NOMEM;
 
-       path_nchars = wcslen(root_disk_path);
-       if (path_nchars > 32767)
-               return WIMLIB_ERR_INVALID_PARAM;
+       /* Translate into full path.  */
+       dret = GetFullPathName(root_disk_path, WINDOWS_NT_MAX_PATH - 3,
+                              &path[4], NULL);
 
-       if (GetFileAttributesW(root_disk_path) == INVALID_FILE_ATTRIBUTES &&
-           GetLastError() == ERROR_FILE_NOT_FOUND)
-       {
-               ERROR("Capture directory \"%ls\" does not exist!",
-                     root_disk_path);
-               return WIMLIB_ERR_OPENDIR;
+       if (dret == 0 || dret >= WINDOWS_NT_MAX_PATH - 3) {
+               ERROR("Can't get full path name for \"%ls\"", root_disk_path);
+               return WIMLIB_ERR_UNSUPPORTED;
        }
 
-       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);
+       /* Add \??\ prefix to form the NT namespace path.  */
+       wmemcpy(path, L"\\??\\", 4);
+       path_nchars = dret + 4;
 
-       /* 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
-        * be okay with 32770 characters. */
-       path = MALLOC(32770 * sizeof(wchar_t));
-       if (!path)
-               return WIMLIB_ERR_NOMEM;
+       /* Strip trailing slashes.  If we don't do this, we may create a path
+       * with multiple consecutive backslashes, which for some reason causes
+       * Windows to report that the file cannot be found.  */
+       while (path_nchars >= 2 &&
+              path[path_nchars - 1] == L'\\' &&
+              path[path_nchars - 2] != L':')
+       {
+               path[--path_nchars] = L'\0';
+       }
 
-       wmemcpy(path, root_disk_path, path_nchars + 1);
+       params->capture_root_nchars = path_nchars;
 
        memset(&state, 0, sizeof(state));
-       ret = win32_build_dentry_tree_recursive(root_ret, path,
-                                               path_nchars, params,
-                                               &state, vol_flags);
+       ret = win32_build_dentry_tree_recursive(root_ret, NULL,
+                                               path, path_nchars, L"", 0,
+                                               params, &state, 0);
        FREE(path);
        if (ret == 0)
-               win32_do_capture_warnings(&state, params->add_flags);
+               win32_do_capture_warnings(root_disk_path, &state, params->add_flags);
        return ret;
 }