X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_apply.c;h=e26455c4ae03de9b1484391f6644fadd96e15de0;hp=557572330946b99118b61d54f12be6fada7b613d;hb=956f44f1fa63c3dfb99b080d4961c7c44fac640d;hpb=af1a9f0d89f9d4428776238a561a6a5b6900f2d4 diff --git a/src/win32_apply.c b/src/win32_apply.c index 55757233..e26455c4 100644 --- a/src/win32_apply.c +++ b/src/win32_apply.c @@ -81,21 +81,63 @@ win32_start_extract(const wchar_t *path, struct apply_ctx *ctx) return 0; } +/* Create a normal file, overwriting one already present. */ static int win32_create_file(const wchar_t *path, struct apply_ctx *ctx, u64 *cookie_ret) { HANDLE h; - - h = CreateFile(path, 0, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, NULL); - if (h == INVALID_HANDLE_VALUE) - goto error; + unsigned retry_count = 0; + DWORD dwFlagsAndAttributes = FILE_FLAG_BACKUP_SEMANTICS; + +retry: + /* WRITE_OWNER and WRITE_DAC privileges are required for some reason, + * even through we're creating a new file. */ + h = CreateFile(path, WRITE_OWNER | WRITE_DAC, 0, NULL, + CREATE_ALWAYS, dwFlagsAndAttributes, NULL); + if (h == INVALID_HANDLE_VALUE) { + /* File couldn't be created. */ + DWORD err = GetLastError(); + if (err == ERROR_ACCESS_DENIED && retry_count == 0) { + + /* Access denied error for the first time. Try + * adjusting file attributes. */ + + /* Get attributes of the existing file. */ + DWORD attribs = GetFileAttributes(path); + if (attribs != INVALID_FILE_ATTRIBUTES && + (attribs & (FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_READONLY))) + { + /* If the existing file has + * FILE_ATTRIBUTE_HIDDEN and/or + * FILE_ATTRIBUTE_SYSTEM, they must be set in + * the call to CreateFile(). This is true even + * when FILE_ATTRIBUTE_NORMAL was not specified, + * contrary to the MS "documentation". */ + dwFlagsAndAttributes |= (attribs & + (FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM)); + /* If the existing file has + * FILE_ATTRIBUTE_READONLY, it must be cleared + * before attempting to create a new file over + * it. This is true even when the process has + * the SE_RESTORE_NAME privilege and requested + * the FILE_FLAG_BACKUP_SEMANTICS flag to + * CreateFile(). */ + if (attribs & FILE_ATTRIBUTE_READONLY) { + SetFileAttributes(path, + attribs & ~FILE_ATTRIBUTE_READONLY); + } + retry_count++; + goto retry; + } + } + set_errno_from_win32_error(err); + return WIMLIB_ERR_OPEN; + } CloseHandle(h); return 0; - -error: - set_errno_from_GetLastError(); - return WIMLIB_ERR_OPEN; } static int @@ -112,6 +154,33 @@ error: return WIMLIB_ERR_MKDIR; } +/* Delete a non-directory file, working around Windows quirks. */ +static BOOL +win32_delete_file_wrapper(const wchar_t *path) +{ + DWORD attrib; + DWORD err; + + if (DeleteFile(path)) + return TRUE; + + err = GetLastError(); + attrib = GetFileAttributes(path); + if (attrib & FILE_ATTRIBUTE_READONLY) { + /* Try again with FILE_ATTRIBUTE_READONLY cleared. */ + attrib &= ~FILE_ATTRIBUTE_READONLY; + if (SetFileAttributes(path, attrib)) { + if (DeleteFile(path)) + return TRUE; + else + err = GetLastError(); + } + } + + SetLastError(err); + return FALSE; +} + static int win32_create_hardlink(const wchar_t *oldpath, const wchar_t *newpath, struct apply_ctx *ctx) @@ -119,7 +188,7 @@ win32_create_hardlink(const wchar_t *oldpath, const wchar_t *newpath, if (!CreateHardLink(newpath, oldpath, NULL)) { if (GetLastError() != ERROR_ALREADY_EXISTS) goto error; - if (!DeleteFile(newpath)) + if (!win32_delete_file_wrapper(newpath)) goto error; if (!CreateHardLink(newpath, oldpath, NULL)) goto error; @@ -138,7 +207,7 @@ win32_create_symlink(const wchar_t *oldpath, const wchar_t *newpath, if (!(*win32func_CreateSymbolicLinkW)(newpath, oldpath, 0)) { if (GetLastError() != ERROR_ALREADY_EXISTS) goto error; - if (!DeleteFile(newpath)) + if (!win32_delete_file_wrapper(newpath)) goto error; if (!(*win32func_CreateSymbolicLinkW)(newpath, oldpath, 0)) goto error; @@ -195,8 +264,7 @@ win32_extract_stream(const wchar_t *path, const wchar_t *stream_name, ret = 0; if (!lte) goto out_close_handle; - ret = extract_wim_resource(lte, wim_resource_size(lte), - win32_extract_wim_chunk, h); + ret = extract_stream(lte, lte->size, win32_extract_wim_chunk, h); out_close_handle: if (!CloseHandle(h)) goto error; @@ -239,9 +307,9 @@ win32_encrypted_import_cb(unsigned char *data, void *_import_ctx, unsigned long len = *len_p; const struct wim_lookup_table_entry *lte = import_ctx->lte; - len = min(len, wim_resource_size(lte) - import_ctx->offset); + len = min(len, lte->size - import_ctx->offset); - if (read_partial_wim_resource_into_buf(lte, len, import_ctx->offset, data)) + if (read_partial_wim_stream_into_buf(lte, len, import_ctx->offset, data)) return ERROR_READ_FAULT; import_ctx->offset += len; @@ -499,8 +567,9 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc, if (func_NtSetSecurityObject) { h = win32_open_existing_file(path, MAXIMUM_ALLOWED); if (h == INVALID_HANDLE_VALUE) { - ERROR_WITH_ERRNO("Can't open %ls (%u)", path, GetLastError()); - goto error; + set_errno_from_GetLastError(); + ERROR_WITH_ERRNO("Can't open %ls", path); + return WIMLIB_ERR_SET_SECURITY; } } #endif @@ -508,8 +577,10 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc, for (;;) { err = do_win32_set_security_descriptor(h, path, info, (PSECURITY_DESCRIPTOR)desc); - if (err == ERROR_SUCCESS) + if (err == ERROR_SUCCESS) { + ret = 0; break; + } if ((err == ERROR_PRIVILEGE_NOT_HELD || err == ERROR_ACCESS_DENIED) && !(ctx->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS)) @@ -529,23 +600,18 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc, } ctx->partial_security_descriptors--; ctx->no_security_descriptors++; + ret = 0; break; } - SetLastError(err); - goto error; + set_errno_from_win32_error(err); + ret = WIMLIB_ERR_SET_SECURITY; + break; } - ret = 0; -out_close: #ifdef WITH_NTDLL if (func_NtSetSecurityObject) CloseHandle(h); #endif return ret; - -error: - set_errno_from_GetLastError(); - ret = WIMLIB_ERR_SET_SECURITY; - goto out_close; } static int