]> wimlib.net Git - wimlib/blobdiff - src/win32.c
win32: handle excluded reparse points correctly
[wimlib] / src / win32.c
index 35026a56d258d38436dabb911a5ef30dc247fbaf..40a41e422bab5b7a5bab8cf4632c794b4ca4aca4 100644 (file)
 #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;
@@ -392,22 +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') {
-               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)
-                       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
@@ -493,12 +504,7 @@ 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 wim_inode_table *inode_table,
-                                 struct sd_set *sd_set,
-                                 const struct wimlib_capture_config *config,
-                                 int add_image_flags,
-                                 wimlib_progress_func_t progress_func,
+                                 struct add_image_params *params,
                                  struct win32_capture_state *state,
                                  unsigned vol_flags);
 
@@ -508,12 +514,7 @@ 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 wim_inode_table *inode_table,
-                       struct sd_set *sd_set,
-                       const struct wimlib_capture_config *config,
-                       int add_image_flags,
-                       wimlib_progress_func_t progress_func,
+                       struct add_image_params *params,
                        struct win32_capture_state *state,
                        unsigned vol_flags)
 {
@@ -564,12 +565,7 @@ win32_recurse_directory(struct wim_dentry *root,
                ret = win32_build_dentry_tree_recursive(&child,
                                                        dir_path,
                                                        path_len,
-                                                       lookup_table,
-                                                       inode_table,
-                                                       sd_set,
-                                                       config,
-                                                       add_image_flags,
-                                                       progress_func,
+                                                       params,
                                                        state,
                                                        vol_flags);
                dir_path[dir_path_num_chars] = L'\0';
@@ -590,56 +586,258 @@ 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.
- *
- * @inode:  WIM inode for the reparse point.
- *
- * @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.
+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.
  *
- * @path:  External path to the reparse point.  Used for error messages only.
+ * Note that this is only executed when WIMLIB_ADD_IMAGE_FLAG_RPFIX has been
+ * set.
  *
- * Returns 0 on success; nonzero on failure. */
-static int
-win32_capture_reparse_point(HANDLE hFile,
-                           struct wim_inode *inode,
-                           struct wim_lookup_table *lookup_table,
-                           const wchar_t *path)
+ * @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)
 {
-       DEBUG("Capturing reparse point \"%ls\"", path);
+       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;
+}
 
-       /* "Reparse point data, including the tag and optional GUID,
-        * cannot exceed 16 kilobytes." - MSDN  */
-       char reparse_point_buf[16 * 1024];
+static enum rp_status
+win32_try_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;
+}
+
+static int
+win32_get_reparse_data(HANDLE hFile, const wchar_t *path,
+                      struct add_image_params *params,
+                      void *reparse_data, size_t *reparse_data_len_ret)
+{
        DWORD bytesReturned;
+       u32 reparse_tag;
+       enum rp_status status;
 
+       DEBUG("Loading reparse data from \"%ls\"", path);
        if (!DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT,
                             NULL, /* "Not used with this operation; set to NULL" */
                             0, /* "Not used with this operation; set to 0" */
-                            reparse_point_buf, /* "A pointer to a buffer that
+                            reparse_data, /* "A pointer to a buffer that
                                                   receives the reparse point data */
-                            sizeof(reparse_point_buf), /* "The size of the output
-                                                          buffer, in bytes */
+                            REPARSE_POINT_MAX_SIZE, /* "The size of the output
+                                                       buffer, in bytes */
                             &bytesReturned,
                             NULL))
        {
                DWORD err = GetLastError();
                ERROR("Failed to get reparse data of \"%ls\"", path);
                win32_error(err);
-               return WIMLIB_ERR_READ;
+               return -WIMLIB_ERR_READ;
        }
        if (bytesReturned < 8) {
                ERROR("Reparse data on \"%ls\" is invalid", path);
-               return WIMLIB_ERR_READ;
+               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);
+
+       reparse_tag = le32_to_cpu(*(u32*)reparse_data);
+       if (params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_RPFIX &&
+           (reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK ||
+            reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT))
+       {
+               /* Try doing reparse point fixup */
+               status = win32_try_capture_rpfix(reparse_data,
+                                                &bytesReturned,
+                                                params->capture_root_ino,
+                                                params->capture_root_dev);
+       } else {
+               status = RP_NOT_FIXED;
+       }
+       *reparse_data_len_ret = bytesReturned;
+       return status;
 }
 
 /* Scans an unnamed or named stream of a Win32 file (not a reparse point
@@ -711,6 +909,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
@@ -884,12 +1088,7 @@ 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 wim_inode_table *inode_table,
-                                 struct sd_set *sd_set,
-                                 const struct wimlib_capture_config *config,
-                                 int add_image_flags,
-                                 wimlib_progress_func_t progress_func,
+                                 struct add_image_params *params,
                                  struct win32_capture_state *state,
                                  unsigned vol_flags)
 {
@@ -897,32 +1096,36 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
        struct wim_inode *inode;
        DWORD err;
        u64 file_size;
-       int ret = 0;
+       int ret;
+       void *reparse_data;
+       size_t reparse_data_len;
+       u16 not_rpfixed;
 
-       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);
                }
+               ret = 0;
                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,
@@ -945,12 +1148,37 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                goto out_close_handle;
        }
 
-       /* Create a WIM dentry with an associated inode, which may be shared */
-       ret = inode_table_new_dentry(inode_table,
+       if (file_info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+               reparse_data = alloca(REPARSE_POINT_MAX_SIZE);
+               ret = win32_get_reparse_data(hFile, path, params,
+                                            reparse_data, &reparse_data_len);
+               if (ret < 0) {
+                       /* WIMLIB_ERR_* (inverted) */
+                       ret = -ret;
+                       goto out_close_handle;
+               } else if (ret & RP_FIXED) {
+                       not_rpfixed = 0;
+               } else if (ret == RP_EXCLUDED) {
+                       ret = 0;
+                       goto out_close_handle;
+               } else {
+                       not_rpfixed = 1;
+               }
+       }
+
+       /* 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. */
+       ret = inode_table_new_dentry(params->inode_table,
                                     path_basename_with_len(path, path_num_chars),
                                     ((u64)file_info.nFileIndexHigh << 32) |
-                                        (u64)file_info.nFileIndexLow,
+                                        (u64)file_info.nFileIndexLow,
                                     file_info.dwVolumeSerialNumber,
+                                    (file_info.nNumberOfLinks <= 1 ||
+                                       (file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)),
                                     &root);
        if (ret)
                goto out_close_handle;
@@ -970,13 +1198,14 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
        inode->i_last_access_time = FILETIME_to_u64(&file_info.ftLastAccessTime);
        inode->i_resolved = 1;
 
-       add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE);
+       params->add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE);
 
-       if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)
+       if (!(params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)
            && (vol_flags & FILE_PERSISTENT_ACLS))
        {
-               ret = win32_get_security_descriptor(root, sd_set, path, state,
-                                                   add_image_flags);
+               ret = win32_get_security_descriptor(root, params->sd_set,
+                                                   path, state,
+                                                   params->add_image_flags);
                if (ret)
                        goto out_close_handle;
        }
@@ -984,47 +1213,33 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
        file_size = ((u64)file_info.nFileSizeHigh << 32) |
                     (u64)file_info.nFileSizeLow;
 
-       if (inode_is_directory(inode)) {
-               /* Directory (not a reparse point) --- recurse to children */
+       /* 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,
+                                   inode,
+                                   params->lookup_table,
+                                   file_size,
+                                   vol_flags);
+       if (ret)
+               goto out_close_handle;
 
-               /* But first... directories may have alternate data streams that
-                * need to be captured. */
-               ret = win32_capture_streams(path,
-                                           path_num_chars,
-                                           inode,
-                                           lookup_table,
-                                           file_size,
-                                           vol_flags);
-               if (ret)
-                       goto out_close_handle;
+       if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+               /* Reparse point: set the reparse data (which we read already)
+                * */
+               inode->i_not_rpfixed = not_rpfixed;
+               inode->i_reparse_tag = le32_to_cpu(*(u32*)reparse_data);
+               ret = inode_set_unnamed_stream(inode, reparse_data + 8,
+                                              reparse_data_len - 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,
-                                             lookup_table,
-                                             inode_table,
-                                             sd_set,
-                                             config,
-                                             add_image_flags,
-                                             progress_func,
+                                             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);
-       } 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,
-                                           vol_flags);
        }
 out_close_handle:
        CloseHandle(hFile);
@@ -1032,7 +1247,7 @@ out:
        if (ret == 0)
                *root_ret = root;
        else
-               free_dentry_tree(root, lookup_table);
+               free_dentry_tree(root, params->lookup_table);
        return ret;
 }
 
@@ -1072,13 +1287,7 @@ 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 wim_inode_table *inode_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;
@@ -1086,10 +1295,17 @@ win32_build_dentry_tree(struct wim_dentry **root_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!
@@ -1103,20 +1319,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,
-                                               inode_table,
-                                               sd_set,
-                                               config,
-                                               add_image_flags,
-                                               progress_func,
-                                               &state,
-                                               vol_flags);
+       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;
 }
 
@@ -1616,7 +1824,7 @@ win32_extract_streams(const struct wim_inode *inode,
                                   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))
@@ -1638,7 +1846,7 @@ win32_extract_streams(const struct wim_inode *inode,
                                                   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);
                }
        }
@@ -1713,11 +1921,31 @@ win32_do_apply_dentry(const wchar_t *output_path,
                        win32_error(err);
                        return WIMLIB_ERR_LINK;
                } else {
-                       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.");
+                       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...");
+                       }
                }
        }
+
+       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,
@@ -1756,6 +1984,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) {