stream_path = alloca(sizeof(wchar_t) *
(wcslen(path) + 1 +
wcslen(stream_name) + 1));
- swprintf(stream_path, L"%ls:%ls", path, stream_name);
+ tsprintf(stream_path, L"%ls:%ls", path, stream_name);
}
h = CreateFile(stream_path, FILE_WRITE_DATA, 0, NULL,
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;
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;
}
static int
-win32_extract_encrypted_stream(file_spec_t file,
+win32_extract_encrypted_stream(const wchar_t *path,
struct wim_lookup_table_entry *lte,
struct apply_ctx *ctx)
{
- const tchar *path = file.path;
void *file_ctx;
DWORD err;
int ret;
err = OpenEncryptedFileRaw(path, CREATE_FOR_IMPORT, &file_ctx);
if (err != ERROR_SUCCESS) {
- errno = win32_error_to_errno(err);
+ set_errno_from_win32_error(err);
ret = WIMLIB_ERR_OPEN;
goto out;
}
err = WriteEncryptedFileRaw(win32_encrypted_import_cb, &extract_ctx,
file_ctx);
if (err != ERROR_SUCCESS) {
- errno = win32_error_to_errno(err);
+ set_errno_from_win32_error(err);
ret = WIMLIB_ERR_WRITE;
goto out_close;
}
USHORT compression_format = COMPRESSION_FORMAT_DEFAULT;
DWORD bytes_returned;
- h = CreateFile(path, GENERIC_READ | GENERIC_WRITE, 0, NULL,
- OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS |
- FILE_FLAG_OPEN_REPARSE_POINT,
- NULL);
+ h = win32_open_existing_file(path, GENERIC_READ | GENERIC_WRITE);
if (h == INVALID_HANDLE_VALUE)
goto error;
FILE_ATTRIBUTE_ENCRYPTED;
u32 actual_attributes;
- /* On FAT filesystems we can't set FILE_ATTRIBUTE_READONLY on the
- * initial pass (when files are created, but data not extracted);
- * otherwise the system will refuse access to the file even if the
- * process has SeRestorePrivilege. */
+ /* Delay setting FILE_ATTRIBUTE_READONLY on the initial pass (when files
+ * are created, but data not extracted); otherwise the system will
+ * refuse access to the file even if the process has SeRestorePrivilege.
+ */
if (pass == 0)
attributes &= ~FILE_ATTRIBUTE_READONLY;
DWORD bytes_returned;
USHORT compression_format = COMPRESSION_FORMAT_NONE;
- h = CreateFile(path, GENERIC_READ | GENERIC_WRITE, 0, NULL,
- OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS |
- FILE_FLAG_OPEN_REPARSE_POINT,
- NULL);
+ h = win32_open_existing_file(path, GENERIC_READ | GENERIC_WRITE);
if (h == INVALID_HANDLE_VALUE)
goto error;
DWORD err;
DWORD bytes_returned;
- h = CreateFile(path, GENERIC_WRITE, 0, NULL,
- OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS |
- FILE_FLAG_OPEN_REPARSE_POINT,
- NULL);
+ h = win32_open_existing_file(path, GENERIC_WRITE);
if (h == INVALID_HANDLE_VALUE)
goto error;
HANDLE h;
DWORD err;
- h = CreateFile(path, GENERIC_WRITE | DELETE, 0, NULL,
- OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS |
- FILE_FLAG_OPEN_REPARSE_POINT,
- NULL);
+ h = win32_open_existing_file(path, GENERIC_WRITE | DELETE);
if (h == INVALID_HANDLE_VALUE)
goto error;
return WIMLIB_ERR_WRITE; /* XXX: need better error code */
}
+static DWORD
+do_win32_set_security_descriptor(HANDLE h, const wchar_t *path,
+ SECURITY_INFORMATION info,
+ PSECURITY_DESCRIPTOR desc)
+{
+#ifdef WITH_NTDLL
+ if (func_NtSetSecurityObject) {
+ return (*func_RtlNtStatusToDosError)(
+ (*func_NtSetSecurityObject)(h, info, desc));
+ }
+#endif
+ if (SetFileSecurity(path, info, desc))
+ return ERROR_SUCCESS;
+ else
+ return GetLastError();
+}
+
static int
-win32_set_security_descriptor(const wchar_t *path, const u8 *desc, size_t desc_size,
- struct apply_ctx *ctx)
+win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
+ size_t desc_size, struct apply_ctx *ctx)
{
SECURITY_INFORMATION info;
+ HANDLE h;
+ DWORD err;
+ int ret;
+
+ info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
+ DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION;
+ h = INVALID_HANDLE_VALUE;
- info = OWNER_SECURITY_INFORMATION |
- GROUP_SECURITY_INFORMATION |
- DACL_SECURITY_INFORMATION |
- SACL_SECURITY_INFORMATION;
-retry:
- if (!SetFileSecurity(path, info, (PSECURITY_DESCRIPTOR)desc)) {
- if (!(ctx->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS) &&
- GetLastError() == ERROR_PRIVILEGE_NOT_HELD &&
- (info & SACL_SECURITY_INFORMATION))
+#ifdef WITH_NTDLL
+ 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;
+ }
+ }
+#endif
+
+ for (;;) {
+ err = do_win32_set_security_descriptor(h, path, info,
+ (PSECURITY_DESCRIPTOR)desc);
+ if (err == ERROR_SUCCESS)
+ break;
+ if ((err == ERROR_PRIVILEGE_NOT_HELD ||
+ err == ERROR_ACCESS_DENIED) &&
+ !(ctx->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS))
{
- info &= ~SACL_SECURITY_INFORMATION;
- goto retry;
+ if (info & SACL_SECURITY_INFORMATION) {
+ info &= ~SACL_SECURITY_INFORMATION;
+ ctx->partial_security_descriptors++;
+ continue;
+ }
+ if (info & DACL_SECURITY_INFORMATION) {
+ info &= ~DACL_SECURITY_INFORMATION;
+ continue;
+ }
+ if (info & OWNER_SECURITY_INFORMATION) {
+ info &= ~OWNER_SECURITY_INFORMATION;
+ continue;
+ }
+ ctx->partial_security_descriptors--;
+ ctx->no_security_descriptors++;
+ break;
}
+ SetLastError(err);
goto error;
}
- return 0;
+ ret = 0;
+out_close:
+#ifdef WITH_NTDLL
+ if (func_NtSetSecurityObject)
+ CloseHandle(h);
+#endif
+ return ret;
error:
set_errno_from_GetLastError();
- return WIMLIB_ERR_SET_SECURITY;
+ ret = WIMLIB_ERR_SET_SECURITY;
+ goto out_close;
}
static int
FILETIME lastWriteTime = {.dwLowDateTime = last_write_time & 0xffffffff,
.dwHighDateTime = last_write_time >> 32};
- h = CreateFile(path, FILE_WRITE_ATTRIBUTES, 0, NULL,
- OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS |
- FILE_FLAG_OPEN_REPARSE_POINT,
- NULL);
+ h = win32_open_existing_file(path, FILE_WRITE_ATTRIBUTES);
if (h == INVALID_HANDLE_VALUE)
goto error;
.realpath_works_on_nonexisting_files = 1,
.root_directory_is_special = 1,
.requires_final_set_attributes_pass = 1,
+ .extract_encrypted_stream_creates_file = 1,
+ .requires_short_name_reordering = 1, /* TODO: check if this is really needed */
};
#endif /* __WIN32__ */
git://wimlib.net / wimlib / blobdiff