win32_capture.c: Use volume ID as device number

[wimlib] / src / win32_capture.c

diff --git a/src/win32_capture.c b/src/win32_capture.c
index 71a593695d9630f038590c4793a8aba433092cac..2df80f34a0d9059e9b988544fce5df2fbd7b0aa6 100644 (file)
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -1123,7 +1123,10 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                        ERROR_WITH_ERRNO("\"%ls\": Can't open file "
                                         "(status=0x%08"PRIx32")",
                                         printable_path(full_path), (u32)status);
                        ERROR_WITH_ERRNO("\"%ls\": Can't open file "
                                         "(status=0x%08"PRIx32")",
                                         printable_path(full_path), (u32)status);

-                       ret = WIMLIB_ERR_OPEN;
+                       if (status == STATUS_FVE_LOCKED_VOLUME)
+                               ret = WIMLIB_ERR_FVE_LOCKED_VOLUME;
+                       else
+                               ret = WIMLIB_ERR_OPEN;

                }
                /* XXX: Provide option to exclude files that fail with
                 * STATUS_SHARING_VIOLATION?  */
                }
                /* XXX: Provide option to exclude files that fail with
                 * STATUS_SHARING_VIOLATION?  */


@@ -1234,13 +1237,17 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
         * 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
         * 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. */
+        * directories on the FAT filesystem.
+        *
+        * Since we don't follow mount points on Windows, we don't need to query
+        * the volume ID per-file.  Just once, for the root, is enough.  But we
+        * can't simply pass 0, because then there could be inode collisions
+        * among multiple calls to win32_build_dentry_tree() that are scanning
+        * files on different volumes.  */

        ret = inode_table_new_dentry(params->inode_table,
                                     filename,
                                     file_info.InternalInformation.IndexNumber.QuadPart,
        ret = inode_table_new_dentry(params->inode_table,
                                     filename,
                                     file_info.InternalInformation.IndexNumber.QuadPart,

-                                    0, /* We don't follow mount points, so we
-                                          currently don't need to get the
-                                          volume ID / device number.  */
+                                    params->capture_root_dev,

                                     (file_info.StandardInformation.NumberOfLinks <= 1 ||
                                        (file_info.BasicInformation.FileAttributes &
                                         FILE_ATTRIBUTE_DIRECTORY)),
                                     (file_info.StandardInformation.NumberOfLinks <= 1 ||
                                        (file_info.BasicInformation.FileAttributes &
                                         FILE_ATTRIBUTE_DIRECTORY)),