X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_apply.c;h=7148ca814151c1106ee425b1a57b9ce2b4651984;hb=b0a6bbcba9dc23f4722827cb13fb0efff5e2799d;hp=972224efad978188b191c217508fe734ba2fd2a8;hpb=d5447ec541b245fa91dac72ce2822bdaafc30f6c;p=wimlib diff --git a/src/win32_apply.c b/src/win32_apply.c index 972224ef..7148ca81 100644 --- a/src/win32_apply.c +++ b/src/win32_apply.c @@ -479,26 +479,6 @@ do_win32_extract_encrypted_stream(const wchar_t *path, return ret; } -static bool -path_is_root_of_drive(const wchar_t *path) -{ - if (*path == L'\0') - return false; - - if (!wcsncmp(path, L"\\\\?\\", 4)) - path += 4; - - if (*path != L'/' && *path != L'\\') { - if (*(path + 1) == L':') - path += 2; - else - return false; - } - while (*path == L'/' || *path == L'\\') - path++; - return (*path == L'\0'); -} - static inline DWORD win32_mask_attributes(DWORD i_attributes) { @@ -602,7 +582,7 @@ win32_begin_extract_unnamed_stream(const struct wim_inode *inode, * to CreateFileW() will merely open the directory that was already * created rather than creating a new file. */ if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) { - if (!path_is_root_of_drive(path)) { + if (!win32_path_is_root_of_drive(path)) { if (!CreateDirectoryW(path, NULL)) { err = GetLastError(); if (err != ERROR_ALREADY_EXISTS) { @@ -655,7 +635,7 @@ win32_begin_extract_unnamed_stream(const struct wim_inode *inode, * directory, so treat that as a special case and do not set attributes. * */ if (*creationDisposition_ret == OPEN_EXISTING && - !path_is_root_of_drive(path)) + !win32_path_is_root_of_drive(path)) { if (!SetFileAttributesW(path, win32_mask_attributes(inode->i_attributes))) @@ -734,7 +714,7 @@ win32_finish_extract_stream(HANDLE h, const struct wim_dentry *dentry, return ret; } - if (dentry_has_short_name(dentry)) + if (dentry_has_short_name(dentry) && !dentry->dos_name_invalid) SetFileShortNameW(h, dentry->short_name); else if (running_on_windows_7_or_later()) SetFileShortNameW(h, L""); @@ -813,12 +793,12 @@ win32_extract_stream(const struct wim_dentry *dentry, 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 - * to be added when the path is not absolute to avoid ambiguity - * with drive letters. */ + * seems to be unneeded. Additional note: a ".\" prefix needs + * to be added when the path is a 1-character long relative path + * to avoid ambiguity with drive letters. */ size_t stream_path_nchars; size_t path_nchars; size_t stream_name_nchars; @@ -827,12 +807,10 @@ win32_extract_stream(const struct wim_dentry *dentry, path_nchars = wcslen(path); stream_name_nchars = wcslen(stream_name_utf16); stream_path_nchars = path_nchars + 1 + stream_name_nchars; - if (path[0] != cpu_to_le16(L'\0') && - path[0] != cpu_to_le16(L'/') && - path[0] != cpu_to_le16(L'\\') && - path[1] != cpu_to_le16(L':')) - { - prefix = L"./"; + if (path_nchars == 1 && !is_any_path_separator(path[0])) { + static const wchar_t _prefix[] = + {L'.', OS_PREFERRED_PATH_SEPARATOR, L'\0'}; + prefix = _prefix; stream_path_nchars += 2; } else { prefix = L""; @@ -853,9 +831,24 @@ win32_extract_stream(const struct wim_dentry *dentry, } DEBUG("Opening \"%ls\"", stream_path); - /* DELETE access is needed for SetFileShortNameW(), for some reason. */ - requestedAccess = GENERIC_READ | GENERIC_WRITE | DELETE | + requestedAccess = GENERIC_READ | GENERIC_WRITE | ACCESS_SYSTEM_SECURITY; + /* DELETE access is needed for SetFileShortNameW(), for some reason. + * But don't request it for the extraction root, for the following + * reasons: + * + * - Requesting DELETE access on the extraction root will cause a + * sharing violation if the extraction root is the current working + * directory ("."). + * - The extraction root may be extracted to a different name than given + * in the WIM file, in which case the DOS name, if given, would not be + * meaningful. + * - For full-image extractions, the root dentry is supposed to be + * unnamed anyway. + * - Microsoft's ImageX does not extract the root directory. + */ + if (dentry != args->extract_root) + requestedAccess |= DELETE; try_open_again: /* Open the stream to be extracted. Depending on what we have set * creationDisposition to, we may be creating this for the first time, @@ -871,7 +864,7 @@ try_open_again: if (h == INVALID_HANDLE_VALUE) { err = GetLastError(); if (err == ERROR_ACCESS_DENIED && - path_is_root_of_drive(stream_path)) + win32_path_is_root_of_drive(stream_path)) { ret = 0; goto out; @@ -885,7 +878,11 @@ try_open_again: requestedAccess &= ~ACCESS_SYSTEM_SECURITY; goto try_open_again; } - if (err == ERROR_SHARING_VIOLATION) { + if (err == ERROR_SHARING_VIOLATION && + (inode->i_attributes & (FILE_ATTRIBUTE_ENCRYPTED | + FILE_ATTRIBUTE_DIRECTORY)) == + (FILE_ATTRIBUTE_ENCRYPTED | FILE_ATTRIBUTE_DIRECTORY)) + { if (remaining_sharing_violations) { --remaining_sharing_violations; /* This can happen when restoring encrypted directories @@ -897,13 +894,12 @@ try_open_again: } else { ERROR("Too many sharing violations; giving up..."); } - } else { - if (creationDisposition == OPEN_EXISTING) - ERROR("Failed to open \"%ls\"", stream_path); - else - ERROR("Failed to create \"%ls\"", stream_path); - win32_error(err); } + if (creationDisposition == OPEN_EXISTING) + ERROR("Failed to open \"%ls\"", stream_path); + else + ERROR("Failed to create \"%ls\"", stream_path); + win32_error(err); ret = WIMLIB_ERR_OPEN; goto fail; } @@ -1285,7 +1281,7 @@ win32_do_apply_dentry_timestamps(const wchar_t *path, /* 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)) + if (win32_path_is_root_of_drive(path)) return 0; DEBUG("Opening \"%ls\" to set timestamps", path);