]> wimlib.net Git - wimlib/blobdiff - src/win32.c
Win32 apply: clear compression flag when needed
[wimlib] / src / win32.c
index 643832fbdc61dfb151286c1d3d268325afcf44a0..e9bdeeb87ffd46a1278512a31240a3c32979bab3 100644 (file)
@@ -29,7 +29,8 @@
 #include <windows.h>
 #include <ntdef.h>
 #include <wchar.h>
-#include <shlwapi.h> /* shlwapi.h for PathMatchSpecW() */
+#include <shlwapi.h> /* for PathMatchSpecW() */
+#include <aclapi.h> /* for SetSecurityInfo() */
 #ifdef ERROR /* windows.h defines this */
 #  undef ERROR
 #endif
@@ -711,7 +712,6 @@ win32_maybe_rpfix_target(wchar_t *target, size_t *target_nchars_p,
        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;
@@ -723,8 +723,8 @@ win32_maybe_rpfix_target(wchar_t *target, size_t *target_nchars_p,
 }
 
 static enum rp_status
-win32_do_capture_rpfix(char *rpbuf, DWORD *rpbuflen_p,
-                      u64 capture_root_ino, u64 capture_root_dev)
+win32_try_capture_rpfix(char *rpbuf, DWORD *rpbuflen_p,
+                       u64 capture_root_ino, u64 capture_root_dev)
 {
        const char *p_get;
        char *p_put;
@@ -794,73 +794,51 @@ win32_do_capture_rpfix(char *rpbuf, DWORD *rpbuflen_p,
        return status;
 }
 
-/* Load a reparse point into a WIM inode.  It is just stored in memory.
- *
- * @hFile is the open handle to a reparse point, with permission to read the
- * reparse data.
- *
- * @inode is the WIM inode for the reparse point.
- */
 static int
-win32_capture_reparse_point(struct wim_dentry **root_p,
-                           HANDLE hFile,
-                           struct wim_inode *inode,
-                           const wchar_t *path,
-                           struct add_image_params *params)
+win32_get_reparse_data(HANDLE hFile, const wchar_t *path,
+                      struct add_image_params *params,
+                      void *reparse_data, size_t *reparse_data_len_ret)
 {
-       DEBUG("Capturing reparse point \"%ls\"", path);
-
-       /* "Reparse point data, including the tag and optional GUID,
-        * cannot exceed 16 kilobytes." - MSDN  */
-       char reparse_point_buf[REPARSE_POINT_MAX_SIZE];
        DWORD bytesReturned;
-       char *fixed_buf;
-       DWORD fixed_len;
+       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);
 
+       reparse_tag = le32_to_cpu(*(u32*)reparse_data);
        if (params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_RPFIX &&
-           (inode->i_reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK ||
-            inode->i_reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT))
+           (reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK ||
+            reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT))
        {
                /* Try doing reparse point fixup */
-               enum rp_status status;
-               status = win32_do_capture_rpfix(reparse_point_buf,
-                                               &bytesReturned,
-                                               params->capture_root_ino,
-                                               params->capture_root_dev);
-               if (status == RP_EXCLUDED) {
-                       /* Absolute path points out of capture tree.  Free the
-                        * dentry; we're not including it at all. */
-                       free_dentry(*root_p);
-                       *root_p = NULL;
-                       return 0;
-               } else if (status & RP_FIXED) {
-                       /* Absolute path fixup was done. */
-                       inode->i_not_rpfixed = 0;
-               }
+               status = win32_try_capture_rpfix(reparse_data,
+                                                &bytesReturned,
+                                                params->capture_root_ino,
+                                                params->capture_root_dev);
+       } else {
+               status = RP_NOT_FIXED;
        }
-       return inode_set_unnamed_stream(inode, reparse_point_buf + 8,
-                                       bytesReturned - 8, params->lookup_table);
+       *reparse_data_len_ret = bytesReturned;
+       return status;
 }
 
 /* Scans an unnamed or named stream of a Win32 file (not a reparse point
@@ -1119,8 +1097,10 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
        struct wim_inode *inode;
        DWORD err;
        u64 file_size;
-       int ret = 0;
-       const wchar_t *basename;
+       int ret;
+       void *reparse_data;
+       size_t reparse_data_len;
+       u16 not_rpfixed;
 
        if (exclude_path(path, path_num_chars, params->config, true)) {
                if (params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) {
@@ -1136,6 +1116,7 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                        info.scan.excluded = true;
                        params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
                }
+               ret = 0;
                goto out;
        }
 
@@ -1168,31 +1149,40 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                goto out_close_handle;
        }
 
+       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. */
-       basename = path_basename_with_len(path, path_num_chars);
-       if (!(file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-           && file_info.nNumberOfLinks > 1)
-       {
-               ret = inode_table_new_dentry(params->inode_table,
-                                            basename,
-                                            ((u64)file_info.nFileIndexHigh << 32) |
-                                                (u64)file_info.nFileIndexLow,
-                                            file_info.dwVolumeSerialNumber,
-                                            &root);
-               if (ret)
-                       goto out_close_handle;
-       } else {
-               ret = new_dentry_with_inode(basename, &root);
-               if (ret)
-                       goto out_close_handle;
-               list_add_tail(&root->d_inode->i_list, &params->inode_table->extra_inodes);
-       }
-
+       ret = inode_table_new_dentry(params->inode_table,
+                                    path_basename_with_len(path, path_num_chars),
+                                    ((u64)file_info.nFileIndexHigh << 32) |
+                                        (u64)file_info.nFileIndexLow,
+                                    file_info.dwVolumeSerialNumber,
+                                    (file_info.nNumberOfLinks <= 1 ||
+                                       (file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)),
+                                    &root);
+       if (ret)
+               goto out_close_handle;
 
        ret = win32_get_short_name(root, path);
        if (ret)
@@ -1224,39 +1214,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,
-                                           params->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,
                                              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(&root, hFile, inode, path, params);
-       } else {
-               /* Not a directory, not a reparse point; capture the default
-                * file contents and any alternate data streams. */
-               ret = win32_capture_streams(path,
-                                           path_num_chars,
-                                           inode,
-                                           params->lookup_table,
-                                           file_size,
-                                           vol_flags);
        }
 out_close_handle:
        CloseHandle(hFile);
@@ -1407,15 +1391,20 @@ win32_set_reparse_data(HANDLE h,
                DWORD err = GetLastError();
                ERROR("Failed to set reparse data on \"%ls\"", path);
                win32_error(err);
-               return WIMLIB_ERR_WRITE;
+               if (err == ERROR_ACCESS_DENIED || err == ERROR_PRIVILEGE_NOT_HELD)
+                       return WIMLIB_ERR_INSUFFICIENT_PRIVILEGES_TO_EXTRACT;
+               else if (reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK ||
+                        reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT)
+                       return WIMLIB_ERR_LINK;
+               else
+                       return WIMLIB_ERR_WRITE;
        }
        return 0;
 }
 
 static int
-win32_set_compressed(HANDLE hFile, const wchar_t *path)
+win32_set_compression_state(HANDLE hFile, USHORT format, const wchar_t *path)
 {
-       USHORT format = COMPRESSION_FORMAT_DEFAULT;
        DWORD bytesReturned = 0;
        if (!DeviceIoControl(hFile, FSCTL_SET_COMPRESSION,
                             &format, sizeof(USHORT),
@@ -1427,7 +1416,10 @@ win32_set_compressed(HANDLE hFile, const wchar_t *path)
                DWORD err = GetLastError();
                ERROR("Failed to set compression flag on \"%ls\"", path);
                win32_error(err);
-               return WIMLIB_ERR_WRITE;
+               if (err == ERROR_ACCESS_DENIED || err == ERROR_PRIVILEGE_NOT_HELD)
+                       return WIMLIB_ERR_INSUFFICIENT_PRIVILEGES_TO_EXTRACT;
+               else
+                       return WIMLIB_ERR_WRITE;
        }
        return 0;
 }
@@ -1446,7 +1438,10 @@ win32_set_sparse(HANDLE hFile, const wchar_t *path)
                DWORD err = GetLastError();
                WARNING("Failed to set sparse flag on \"%ls\"", path);
                win32_error(err);
-               return WIMLIB_ERR_WRITE;
+               if (err == ERROR_ACCESS_DENIED || err == ERROR_PRIVILEGE_NOT_HELD)
+                       return WIMLIB_ERR_INSUFFICIENT_PRIVILEGES_TO_EXTRACT;
+               else
+                       return WIMLIB_ERR_WRITE;
        }
        return 0;
 }
@@ -1456,21 +1451,55 @@ win32_set_sparse(HANDLE hFile, const wchar_t *path)
  */
 static int
 win32_set_security_data(const struct wim_inode *inode,
+                       HANDLE hFile,
                        const wchar_t *path,
                        struct apply_args *args)
 {
        PSECURITY_DESCRIPTOR descriptor;
        unsigned long n;
        DWORD err;
+       const struct wim_security_data *sd;
 
-       descriptor = wim_const_security_data(args->w)->descriptors[inode->i_security_id];
+       SECURITY_INFORMATION securityInformation = 0;
+
+       void *owner = NULL;
+       void *group = NULL;
+       ACL *dacl = NULL;
+       ACL *sacl = NULL;
+
+       BOOL owner_defaulted;
+       BOOL group_defaulted;
+       BOOL dacl_present;
+       BOOL dacl_defaulted;
+       BOOL sacl_present;
+       BOOL sacl_defaulted;
+
+       sd = wim_const_security_data(args->w);
+       descriptor = sd->descriptors[inode->i_security_id];
+
+       GetSecurityDescriptorOwner(descriptor, &owner, &owner_defaulted);
+       if (owner)
+               securityInformation |= OWNER_SECURITY_INFORMATION;
+
+       GetSecurityDescriptorGroup(descriptor, &group, &group_defaulted);
+       if (group)
+               securityInformation |= GROUP_SECURITY_INFORMATION;
+
+       GetSecurityDescriptorDacl(descriptor, &dacl_present,
+                                 &dacl, &dacl_defaulted);
+       if (dacl)
+               securityInformation |= DACL_SECURITY_INFORMATION;
+
+       GetSecurityDescriptorSacl(descriptor, &sacl_present,
+                                 &sacl, &sacl_defaulted);
+       if (sacl)
+               securityInformation |= SACL_SECURITY_INFORMATION;
 
-       SECURITY_INFORMATION securityInformation = DACL_SECURITY_INFORMATION |
-                                                  SACL_SECURITY_INFORMATION |
-                                                  OWNER_SECURITY_INFORMATION |
-                                                  GROUP_SECURITY_INFORMATION;
 again:
-       if (SetFileSecurityW(path, securityInformation, descriptor))
+       if (securityInformation == 0)
+               return 0;
+       if (SetSecurityInfo(hFile, SE_FILE_OBJECT,
+                           securityInformation, owner, group, dacl, sacl))
                return 0;
        err = GetLastError();
        if (args->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS)
@@ -1480,6 +1509,7 @@ again:
                if (securityInformation & SACL_SECURITY_INFORMATION) {
                        n = args->num_set_sacl_priv_notheld++;
                        securityInformation &= ~SACL_SECURITY_INFORMATION;
+                       sacl = NULL;
                        if (n < MAX_SET_SACL_PRIV_NOTHELD_WARNINGS) {
                                WARNING(
 "We don't have enough privileges to set the full security\n"
@@ -1519,7 +1549,10 @@ again:
 fail:
                ERROR("Failed to set security descriptor on \"%ls\"", path);
                win32_error(err);
-               return WIMLIB_ERR_WRITE;
+               if (err == ERROR_ACCESS_DENIED || err == ERROR_PRIVILEGE_NOT_HELD)
+                       return WIMLIB_ERR_INSUFFICIENT_PRIVILEGES_TO_EXTRACT;
+               else
+                       return WIMLIB_ERR_WRITE;
        }
 }
 
@@ -1621,14 +1654,6 @@ win32_get_create_flags_and_attributes(DWORD i_attributes)
               FILE_FLAG_BACKUP_SEMANTICS;
 }
 
-static bool
-inode_has_special_attributes(const struct wim_inode *inode)
-{
-       return (inode->i_attributes & (FILE_ATTRIBUTE_COMPRESSED |
-                                      FILE_ATTRIBUTE_REPARSE_POINT |
-                                      FILE_ATTRIBUTE_SPARSE_FILE)) != 0;
-}
-
 /* Set compression or sparse attributes, and reparse data, if supported by the
  * volume. */
 static int
@@ -1638,13 +1663,21 @@ win32_set_special_attributes(HANDLE hFile, const struct wim_inode *inode,
 {
        int ret;
 
-       if (inode->i_attributes & FILE_ATTRIBUTE_COMPRESSED) {
-               if (vol_flags & FILE_FILE_COMPRESSION) {
+       if (vol_flags & FILE_FILE_COMPRESSION) {
+
+               USHORT format;
+               if (inode->i_attributes & FILE_ATTRIBUTE_COMPRESSED) {
+                       format = COMPRESSION_FORMAT_DEFAULT;
                        DEBUG("Setting compression flag on \"%ls\"", path);
-                       ret = win32_set_compressed(hFile, path);
-                       if (ret)
-                               return ret;
                } else {
+                       format = COMPRESSION_FORMAT_NONE;
+                       DEBUG("Clearing compression flag on \"%ls\"", path);
+               }
+               ret = win32_set_compression_state(hFile, format, path);
+               if (ret)
+                       return ret;
+       } else {
+               if (inode->i_attributes & FILE_ATTRIBUTE_COMPRESSED) {
                        DEBUG("Cannot set compression attribute on \"%ls\": "
                              "volume does not support transparent compression",
                              path);
@@ -1676,7 +1709,6 @@ win32_set_special_attributes(HANDLE hFile, const struct wim_inode *inode,
                              "does not support reparse points", path);
                }
        }
-
        return 0;
 }
 
@@ -1685,17 +1717,18 @@ win32_extract_stream(const struct wim_inode *inode,
                     const wchar_t *path,
                     const wchar_t *stream_name_utf16,
                     struct wim_lookup_table_entry *lte,
-                    unsigned vol_flags)
+                    struct apply_args *args)
 {
        wchar_t *stream_path;
        HANDLE h;
        int ret;
        DWORD err;
        DWORD creationDisposition = CREATE_ALWAYS;
+       DWORD requestedAccess;
 
        if (stream_name_utf16) {
                /* Named stream.  Create a buffer that contains the UTF-16LE
-                * string [.\]@path:@stream_name_utf16.  This is needed to
+                * string [./]path:stream_name_utf16.  This is needed to
                 * create and open the stream using CreateFileW().  I'm not
                 * aware of any other APIs to do this.  Note: the '$DATA' suffix
                 * seems to be unneeded.  Additional note: a "./" prefix needs
@@ -1749,19 +1782,16 @@ win32_extract_stream(const struct wim_inode *inode,
                                }
                        }
                        DEBUG("Created directory \"%ls\"", stream_path);
-                       if (!inode_has_special_attributes(inode)) {
-                               ret = 0;
-                               goto out;
-                       }
-                       DEBUG("Directory \"%ls\" has special attributes!",
-                             stream_path);
                        creationDisposition = OPEN_EXISTING;
                }
        }
 
        DEBUG("Opening \"%ls\"", stream_path);
+       requestedAccess = GENERIC_READ | GENERIC_WRITE |
+                         ACCESS_SYSTEM_SECURITY;
+try_open_again:
        h = CreateFileW(stream_path,
-                       GENERIC_READ | GENERIC_WRITE,
+                       requestedAccess,
                        0,
                        NULL,
                        creationDisposition,
@@ -1769,15 +1799,30 @@ win32_extract_stream(const struct wim_inode *inode,
                        NULL);
        if (h == INVALID_HANDLE_VALUE) {
                err = GetLastError();
+               if (err == ERROR_PRIVILEGE_NOT_HELD &&
+                   (requestedAccess & ACCESS_SYSTEM_SECURITY))
+               {
+                       requestedAccess &= ~ACCESS_SYSTEM_SECURITY;
+                       goto try_open_again;
+               }
                ERROR("Failed to create \"%ls\"", stream_path);
                win32_error(err);
                ret = WIMLIB_ERR_OPEN;
                goto fail;
        }
 
-       if (stream_name_utf16 == NULL && inode_has_special_attributes(inode)) {
+       if (stream_name_utf16 == NULL) {
+               if (inode->i_security_id >= 0 &&
+                   !(args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_ACLS)
+                   && (args->vol_flags & FILE_PERSISTENT_ACLS))
+               {
+                       ret = win32_set_security_data(inode, h, path, args);
+                       if (ret)
+                               goto fail_close_handle;
+               }
+
                ret = win32_set_special_attributes(h, inode, lte, path,
-                                                  vol_flags);
+                                                  args->vol_flags);
                if (ret)
                        goto fail_close_handle;
        }
@@ -1788,7 +1833,7 @@ win32_extract_stream(const struct wim_inode *inode,
                              stream_path, wim_resource_size(lte));
                        if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED
                            && stream_name_utf16 == NULL
-                           && (vol_flags & FILE_SUPPORTS_ENCRYPTION))
+                           && (args->vol_flags & FILE_SUPPORTS_ENCRYPTION))
                        {
                                ret = do_win32_extract_encrypted_stream(stream_path,
                                                                        lte);
@@ -1821,56 +1866,151 @@ out:
 /*
  * Creates a file, directory, or reparse point and extracts all streams to it
  * (unnamed data stream and/or reparse point stream, plus any alternate data
- * streams).  This in Win32-specific code.
+ * streams).
  *
  * @inode:     WIM inode for this file or directory.
  * @path:      UTF-16LE external path to extract the inode to.
+ * @args:      Additional extraction context.
  *
  * Returns 0 on success; nonzero on failure.
  */
 static int
 win32_extract_streams(const struct wim_inode *inode,
-                     const wchar_t *path, u64 *completed_bytes_p,
-                     unsigned vol_flags)
+                     const wchar_t *path, struct apply_args *args)
 {
        struct wim_lookup_table_entry *unnamed_lte;
        int ret;
 
+       /* Extract the unnamed stream. */
+
        unnamed_lte = inode_unnamed_lte_resolved(inode);
-       ret = win32_extract_stream(inode, path, NULL, unnamed_lte,
-                                  vol_flags);
+       ret = win32_extract_stream(inode, path, NULL, unnamed_lte, args);
        if (ret)
                goto out;
        if (unnamed_lte && inode->i_extracted_file == NULL)
-               *completed_bytes_p += wim_resource_size(unnamed_lte);
+       {
+               args->progress.extract.completed_bytes +=
+                       wim_resource_size(unnamed_lte);
+       }
 
-       if (!(vol_flags & FILE_NAMED_STREAMS))
+       /* Extract any named streams, if supported by the volume. */
+
+       if (!(args->vol_flags & FILE_NAMED_STREAMS))
                goto out;
        for (u16 i = 0; i < inode->i_num_ads; i++) {
                const struct wim_ads_entry *ads_entry = &inode->i_ads_entries[i];
-               if (ads_entry->stream_name_nbytes != 0) {
-                       /* Skip special UNIX data entries (see documentation for
-                        * WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) */
-                       if (ads_entry->stream_name_nbytes == WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES
-                           && !memcmp(ads_entry->stream_name,
-                                      WIMLIB_UNIX_DATA_TAG_UTF16LE,
-                                      WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES))
-                               continue;
-                       ret = win32_extract_stream(inode,
-                                                  path,
-                                                  ads_entry->stream_name,
-                                                  ads_entry->lte,
-                                                  vol_flags);
-                       if (ret)
-                               break;
-                       if (ads_entry->lte && inode->i_extracted_file == NULL)
-                               *completed_bytes_p += wim_resource_size(ads_entry->lte);
+
+               /* Skip the unnamed stream if it's in the ADS entries (we
+                * already extracted it...) */
+               if (ads_entry->stream_name_nbytes == 0)
+                       continue;
+
+               /* Skip special UNIX data entries (see documentation for
+                * WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) */
+               if (ads_entry->stream_name_nbytes == WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES
+                   && !memcmp(ads_entry->stream_name,
+                              WIMLIB_UNIX_DATA_TAG_UTF16LE,
+                              WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES))
+                       continue;
+
+               /* Extract the named stream */
+               ret = win32_extract_stream(inode,
+                                          path,
+                                          ads_entry->stream_name,
+                                          ads_entry->lte,
+                                          args);
+               if (ret)
+                       break;
+
+               /* Tally the bytes extracted, unless this was supposed to be a
+                * hard link and we are extracting the data again only as a
+                * fallback. */
+               if (ads_entry->lte && inode->i_extracted_file == NULL)
+               {
+                       args->progress.extract.completed_bytes +=
+                               wim_resource_size(ads_entry->lte);
                }
        }
 out:
        return ret;
 }
 
+static int
+win32_check_vol_flags(const wchar_t *output_path, struct apply_args *args)
+{
+       if (args->have_vol_flags)
+               return 0;
+
+       win32_get_vol_flags(output_path, &args->vol_flags);
+       args->have_vol_flags = true;
+       /* Warn the user about data that may not be extracted. */
+       if (!(args->vol_flags & FILE_SUPPORTS_SPARSE_FILES))
+               WARNING("Volume does not support sparse files!\n"
+                       "          Sparse files will be extracted as non-sparse.");
+       if (!(args->vol_flags & FILE_SUPPORTS_REPARSE_POINTS))
+               WARNING("Volume does not support reparse points!\n"
+                       "          Reparse point data will not be extracted.");
+       if (!(args->vol_flags & FILE_NAMED_STREAMS)) {
+               WARNING("Volume does not support named data streams!\n"
+                       "          Named data streams will not be extracted.");
+       }
+       if (!(args->vol_flags & FILE_SUPPORTS_ENCRYPTION)) {
+               WARNING("Volume does not support encryption!\n"
+                       "          Encrypted files will be extracted as raw data.");
+       }
+       if (!(args->vol_flags & FILE_FILE_COMPRESSION)) {
+               WARNING("Volume does not support transparent compression!\n"
+                       "          Compressed files will be extracted as non-compressed.");
+       }
+       if (!(args->vol_flags & FILE_PERSISTENT_ACLS)) {
+               if (args->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS) {
+                       ERROR("Strict ACLs requested, but the volume does not "
+                             "support ACLs!");
+                       return WIMLIB_ERR_VOLUME_LACKS_FEATURES;
+               } else {
+                       WARNING("Volume does not support persistent ACLS!\n"
+                               "          File permissions will not be extracted.");
+               }
+       }
+       return 0;
+}
+
+static int
+win32_try_hard_link(const wchar_t *output_path, const struct wim_inode *inode,
+                   struct apply_args *args)
+{
+       DWORD err;
+
+       /* There is a volume flag for this (FILE_SUPPORTS_HARD_LINKS),
+        * but it's only available on Windows 7 and later.  So no use
+        * even checking it, really.  Instead, CreateHardLinkW() will
+        * apparently return ERROR_INVALID_FUNCTION if the volume does
+        * not support hard links. */
+       DEBUG("Creating hard link \"%ls => %ls\"",
+             output_path, inode->i_extracted_file);
+       if (CreateHardLinkW(output_path, inode->i_extracted_file, NULL))
+               return 0;
+
+       err = GetLastError();
+       if (err != ERROR_INVALID_FUNCTION) {
+               ERROR("Can't create hard link \"%ls => %ls\"",
+                     output_path, inode->i_extracted_file);
+               win32_error(err);
+               return WIMLIB_ERR_LINK;
+       } else {
+               args->num_hard_links_failed++;
+               if (args->num_hard_links_failed < MAX_CREATE_HARD_LINK_WARNINGS) {
+                       WARNING("Can't create hard link \"%ls => %ls\":\n"
+                               "          Volume does not support hard links!\n"
+                               "          Falling back to extracting a copy of the file.",
+                               output_path, inode->i_extracted_file);
+               } else if (args->num_hard_links_failed == MAX_CREATE_HARD_LINK_WARNINGS) {
+                       WARNING("Suppressing further hard linking warnings...");
+               }
+               return -1;
+       }
+}
+
 /* Extract a file, directory, reparse point, or hard link to an
  * already-extracted file using the Win32 API */
 int
@@ -1881,73 +2021,17 @@ win32_do_apply_dentry(const wchar_t *output_path,
 {
        int ret;
        struct wim_inode *inode = dentry->d_inode;
-       DWORD err;
-
-       if (!args->have_vol_flags) {
-               win32_get_vol_flags(output_path, &args->vol_flags);
-               args->have_vol_flags = true;
-               /* Warn the user about data that may not be extracted. */
-               if (!(args->vol_flags & FILE_SUPPORTS_SPARSE_FILES))
-                       WARNING("Volume does not support sparse files!\n"
-                               "          Sparse files will be extracted as non-sparse.");
-               if (!(args->vol_flags & FILE_SUPPORTS_REPARSE_POINTS))
-                       WARNING("Volume does not support reparse points!\n"
-                               "          Reparse point data will not be extracted.");
-               if (!(args->vol_flags & FILE_NAMED_STREAMS)) {
-                       WARNING("Volume does not support named data streams!\n"
-                               "          Named data streams will not be extracted.");
-               }
-               if (!(args->vol_flags & FILE_SUPPORTS_ENCRYPTION)) {
-                       WARNING("Volume does not support encryption!\n"
-                               "          Encrypted files will be extracted as raw data.");
-               }
-               if (!(args->vol_flags & FILE_FILE_COMPRESSION)) {
-                       WARNING("Volume does not support transparent compression!\n"
-                               "          Compressed files will be extracted as non-compressed.");
-               }
-               if (!(args->vol_flags & FILE_PERSISTENT_ACLS)) {
-                       if (args->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS) {
-                               ERROR("Strict ACLs requested, but the volume does not "
-                                     "support ACLs!");
-                               return WIMLIB_ERR_VOLUME_LACKS_FEATURES;
-                       } else {
-                               WARNING("Volume does not support persistent ACLS!\n"
-                                       "          File permissions will not be extracted.");
-                       }
-               }
-       }
 
+       ret = win32_check_vol_flags(output_path, args);
+       if (ret)
+               return ret;
        if (inode->i_nlink > 1 && inode->i_extracted_file != NULL) {
                /* Linked file, with another name already extracted.  Create a
                 * hard link. */
-
-               /* There is a volume flag for this (FILE_SUPPORTS_HARD_LINKS),
-                * but it's only available on Windows 7 and later.  So no use
-                * even checking it, really.  Instead, CreateHardLinkW() will
-                * apparently return ERROR_INVALID_FUNCTION if the volume does
-                * not support hard links. */
-               DEBUG("Creating hard link \"%ls => %ls\"",
-                     output_path, inode->i_extracted_file);
-               if (CreateHardLinkW(output_path, inode->i_extracted_file, NULL))
-                       return 0;
-
-               err = GetLastError();
-               if (err != ERROR_INVALID_FUNCTION) {
-                       ERROR("Can't create hard link \"%ls => %ls\"",
-                             output_path, inode->i_extracted_file);
-                       win32_error(err);
-                       return WIMLIB_ERR_LINK;
-               } else {
-                       args->num_hard_links_failed++;
-                       if (args->num_hard_links_failed < MAX_CREATE_HARD_LINK_WARNINGS) {
-                               WARNING("Can't create hard link \"%ls => %ls\":\n"
-                                       "          Volume does not support hard links!\n"
-                                       "          Falling back to extracting a copy of the file.",
-                                       output_path, inode->i_extracted_file);
-                       } else if (args->num_hard_links_failed == MAX_CREATE_HARD_LINK_WARNINGS) {
-                               WARNING("Suppressing further hard linking warnings...");
-                       }
-               }
+               ret = win32_try_hard_link(output_path, inode, args);
+               if (ret >= 0)
+                       return ret;
+               /* Falling back to extracting copy of file */
        }
 
        if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT &&
@@ -1965,20 +2049,10 @@ win32_do_apply_dentry(const wchar_t *output_path,
 
        /* Create the file, directory, or reparse point, and extract the
         * data streams. */
-       ret = win32_extract_streams(inode, output_path,
-                                   &args->progress.extract.completed_bytes,
-                                   args->vol_flags);
+       ret = win32_extract_streams(inode, output_path, args);
        if (ret)
                return ret;
 
-       if (inode->i_security_id >= 0 &&
-           !(args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_ACLS)
-           && (args->vol_flags & FILE_PERSISTENT_ACLS))
-       {
-               ret = win32_set_security_data(inode, output_path, args);
-               if (ret)
-                       return ret;
-       }
        if (inode->i_nlink > 1) {
                /* Save extracted path for a later call to
                 * CreateHardLinkW() if this inode has multiple links.
@@ -1987,7 +2061,7 @@ win32_do_apply_dentry(const wchar_t *output_path,
                if (!inode->i_extracted_file)
                        ret = WIMLIB_ERR_NOMEM;
        }
-       return 0;
+       return ret;
 }
 
 /* Set timestamps on an extracted file using the Win32 API */