win32_apply.c: try to clear attributes on existing directories

diff --git a/include/wimlib/win32_common.h b/include/wimlib/win32_common.h
index 324285138006ecb0edbe055cce89ccb65734e31f..9b873550ec69fe0b4bd378c399d4c00bbeba9585 100644 (file)
--- a/include/wimlib/win32_common.h
+++ b/include/wimlib/win32_common.h
@@ -25,6 +25,10 @@ extern NTSTATUS (WINAPI *func_NtCreateFile)(PHANDLE FileHandle,
                                            PVOID EaBuffer,
                                            ULONG EaLength);
 
                                            PVOID EaBuffer,
                                            ULONG EaLength);
 

+#ifndef FILE_OPENED
+#  define FILE_OPENED 0x00000001
+#endif
+

 extern NTSTATUS (WINAPI *func_NtOpenFile) (PHANDLE FileHandle,
                                           ACCESS_MASK DesiredAccess,
                                           POBJECT_ATTRIBUTES ObjectAttributes,
 extern NTSTATUS (WINAPI *func_NtOpenFile) (PHANDLE FileHandle,
                                           ACCESS_MASK DesiredAccess,
                                           POBJECT_ATTRIBUTES ObjectAttributes,

diff --git a/src/win32_apply.c b/src/win32_apply.c
index b66717ec78666a1d8654c9db0518e4230e66c3e8..26814f68eab5b3535b63ee2bb00e7550fbafa03f 100644 (file)
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -1370,6 +1370,20 @@ create_directory(const struct wim_dentry *dentry, struct win32_apply_ctx *ctx)
                return WIMLIB_ERR_MKDIR;
        }
 
                return WIMLIB_ERR_MKDIR;
        }
 

+       if (ctx->iosb.Information == FILE_OPENED) {
+               /* If we opened an existing directory, try to clear its file
+                * attributes.  As far as I know, this only actually makes a
+                * difference in the case where a FILE_ATTRIBUTE_READONLY
+                * directory has a named data stream which needs to be
+                * extracted.  You cannot create a named data stream of such a
+                * directory, even though this contradicts Microsoft's
+                * documentation for FILE_ATTRIBUTE_READONLY which states it is
+                * not honored for directories!  */
+               FILE_BASIC_INFORMATION basic_info = { .FileAttributes = FILE_ATTRIBUTE_NORMAL };
+               (*func_NtSetInformationFile)(h, &ctx->iosb, &basic_info,
+                                            sizeof(basic_info), FileBasicInformation);
+       }
+

        if (!dentry_is_root(dentry)) {
                ret = set_short_name(h, dentry, ctx);
                if (ret)
        if (!dentry_is_root(dentry)) {
                ret = set_short_name(h, dentry, ctx);
                if (ret)