if (ret < 0)
return RP_NOT_FIXED;
stripped_chars = ret;
+ if (stripped_chars)
+ stripped_chars -= 2;
target[target_nchars] = L'\0';
orig_target = target;
target = capture_fixup_absolute_symlink(target + stripped_chars,
wmemmove(orig_target + stripped_chars, target, target_nchars + 1);
*target_nbytes_p = (target_nchars + stripped_chars) * sizeof(wchar_t);
DEBUG("Fixed reparse point (new target: \"%ls\")", orig_target);
- if (stripped_chars == 6)
+ if (stripped_chars)
return RP_FIXED_FULLPATH;
else
return RP_FIXED_ABSPATH;
if (path_nchars > 32767)
return WIMLIB_ERR_INVALID_PARAM;
+ if (GetFileAttributesW(root_disk_path) == INVALID_FILE_ATTRIBUTES &&
+ GetLastError() == ERROR_FILE_NOT_FOUND)
+ {
+ ERROR("Capture directory \"%ls\" does not exist!",
+ root_disk_path);
+ return WIMLIB_ERR_OPENDIR;
+ }
+
ret = win32_get_file_and_vol_ids(root_disk_path,
¶ms->capture_root_ino,
¶ms->capture_root_dev);
/* Print name excludes the \??\ if present. */
new_print_name = p;
- if (target_nchars - stripped_target_nchars != 0) {
+ if (stripped_nchars != 0) {
/* Get drive letter from real path to extract root, if a drive
* letter was present before. */
*p++ = extract_root_realpath[0];
}
struct win32_encrypted_extract_ctx {
- void *file_ctx;
- int wimlib_err_code;
- bool done;
- pthread_cond_t cond;
- pthread_mutex_t mutex;
- u8 buf[WIM_CHUNK_SIZE];
- size_t buf_filled;
+ const struct wim_lookup_table_entry *lte;
+ u64 offset;
};
static DWORD WINAPI
{
struct win32_encrypted_extract_ctx *ctx = _ctx;
unsigned long len = *len_p;
+ const struct wim_lookup_table_entry *lte = ctx->lte;
- pthread_mutex_lock(&ctx->mutex);
- while (len) {
- size_t bytes_to_copy;
+ len = min(len, wim_resource_size(lte) - ctx->offset);
- DEBUG("Importing up to %lu more bytes of raw encrypted data", len);
- while (ctx->buf_filled == 0) {
- if (ctx->done)
- goto out;
- pthread_cond_wait(&ctx->cond, &ctx->mutex);
- }
- bytes_to_copy = min(len, ctx->buf_filled);
- memcpy(data, ctx->buf, bytes_to_copy);
- len -= bytes_to_copy;
- data += bytes_to_copy;
- ctx->buf_filled -= bytes_to_copy;
- memmove(ctx->buf, ctx->buf + bytes_to_copy, ctx->buf_filled);
- pthread_cond_signal(&ctx->cond);
- }
-out:
- *len_p -= len;
- pthread_mutex_unlock(&ctx->mutex);
- return ERROR_SUCCESS;
-}
+ if (read_partial_wim_resource_into_buf(lte, len, ctx->offset, data, false))
+ return ERROR_READ_FAULT;
-/* Extract ("Import") an encrypted file in a different thread. */
-static void *
-win32_encrypted_import_proc(void *arg)
-{
- struct win32_encrypted_extract_ctx *ctx = arg;
- DWORD ret;
- ret = WriteEncryptedFileRaw(win32_encrypted_import_cb, ctx,
- ctx->file_ctx);
- pthread_mutex_lock(&ctx->mutex);
- if (ret == ERROR_SUCCESS) {
- ctx->wimlib_err_code = 0;
- } else {
- win32_error(ret);
- ctx->wimlib_err_code = WIMLIB_ERR_WRITE;
- }
- ctx->done = true;
- pthread_cond_signal(&ctx->cond);
- pthread_mutex_unlock(&ctx->mutex);
- return NULL;
-}
-
-
-static int
-win32_extract_raw_encrypted_chunk(const void *buf, size_t len, void *arg)
-{
- struct win32_encrypted_extract_ctx *ctx = arg;
- size_t bytes_to_copy;
-
- while (len) {
- DEBUG("Extracting up to %zu more bytes of encrypted data", len);
- pthread_mutex_lock(&ctx->mutex);
- while (ctx->buf_filled == WIM_CHUNK_SIZE) {
- if (ctx->done) {
- pthread_mutex_unlock(&ctx->mutex);
- return ctx->wimlib_err_code;
- }
- pthread_cond_wait(&ctx->cond, &ctx->mutex);
- }
- bytes_to_copy = min(len, WIM_CHUNK_SIZE - ctx->buf_filled);
- memcpy(&ctx->buf[ctx->buf_filled], buf, bytes_to_copy);
- len -= bytes_to_copy;
- buf += bytes_to_copy;
- ctx->buf_filled += bytes_to_copy;
- pthread_cond_signal(&ctx->cond);
- pthread_mutex_unlock(&ctx->mutex);
- }
- return 0;
+ ctx->offset += len;
+ *len_p = len;
+ return ERROR_SUCCESS;
}
/* Create an encrypted file and extract the raw encrypted data to it.
do_win32_extract_encrypted_stream(const wchar_t *path,
const struct wim_lookup_table_entry *lte)
{
- struct win32_encrypted_extract_ctx ctx;
void *file_ctx;
- pthread_t import_thread;
int ret;
- int ret2;
DEBUG("Opening file \"%ls\" to extract raw encrypted data", path);
return WIMLIB_ERR_OPEN;
}
- if (!lte)
- goto out_close;
-
- /* Hack alert: WriteEncryptedFileRaw() requires the callback function
- * to work with a buffer whose size we cannot control. This doesn't
- * play well with our read_resource_prefix() function, which itself uses
- * a callback function to extract WIM_CHUNK_SIZE chunks of data. We
- * work around this problem by calling WriteEncryptedFileRaw() in a
- * different thread and feeding it the data as needed. */
- ctx.file_ctx = file_ctx;
- ctx.buf_filled = 0;
- ctx.done = false;
- ctx.wimlib_err_code = 0;
- if (pthread_mutex_init(&ctx.mutex, NULL)) {
- ERROR_WITH_ERRNO("Can't create mutex");
- ret = WIMLIB_ERR_NOMEM;
- goto out_close;
- }
- if (pthread_cond_init(&ctx.cond, NULL)) {
- ERROR_WITH_ERRNO("Can't create condition variable");
- ret = WIMLIB_ERR_NOMEM;
- goto out_pthread_mutex_destroy;
- }
- ret = pthread_create(&import_thread, NULL,
- win32_encrypted_import_proc, &ctx);
- if (ret) {
- errno = ret;
- ERROR_WITH_ERRNO("Failed to create thread");
- ret = WIMLIB_ERR_FORK;
- goto out_pthread_cond_destroy;
- }
-
- ret = extract_wim_resource(lte, wim_resource_size(lte),
- win32_extract_raw_encrypted_chunk, &ctx);
- pthread_mutex_lock(&ctx.mutex);
- ctx.done = true;
- pthread_cond_signal(&ctx.cond);
- pthread_mutex_unlock(&ctx.mutex);
- ret2 = pthread_join(import_thread, NULL);
- if (ret2) {
- errno = ret2;
- ERROR_WITH_ERRNO("Failed to join encrypted import thread");
- if (ret == 0)
+ if (lte) {
+ struct win32_encrypted_extract_ctx ctx;
+
+ ctx.lte = lte;
+ ctx.offset = 0;
+ ret = WriteEncryptedFileRaw(win32_encrypted_import_cb, &ctx, file_ctx);
+ if (ret == ERROR_SUCCESS) {
+ ret = 0;
+ } else {
ret = WIMLIB_ERR_WRITE;
+ ERROR("Failed to extract encrypted file \"%ls\"", path);
+ }
}
- if (ret == 0)
- ret = ctx.wimlib_err_code;
-out_pthread_cond_destroy:
- pthread_cond_destroy(&ctx.cond);
-out_pthread_mutex_destroy:
- pthread_mutex_destroy(&ctx.mutex);
-out_close:
CloseEncryptedFileRaw(file_ctx);
- if (ret)
- ERROR("Failed to extract encrypted file \"%ls\"", path);
return ret;
}
vol_flags & FILE_SUPPORTS_ENCRYPTION)
{
if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) {
- if (!EncryptFile(path)) {
- err = GetLastError();
- ERROR("Failed to encrypt directory \"%ls\"",
- path);
- win32_error(err);
- return WIMLIB_ERR_WRITE;
+ unsigned remaining_sharing_violations = 100;
+ while (!EncryptFile(path)) {
+ if (remaining_sharing_violations &&
+ err == ERROR_SHARING_VIOLATION)
+ {
+ WARNING("Couldn't encrypt directory \"%ls\" "
+ "due to sharing violation; re-trying "
+ "after 100 ms", path);
+ Sleep(100);
+ remaining_sharing_violations--;
+ } else {
+ err = GetLastError();
+ ERROR("Failed to encrypt directory \"%ls\"",
+ path);
+ win32_error(err);
+ return WIMLIB_ERR_WRITE;
+ }
}
} else {
ret = do_win32_extract_encrypted_stream(path, lte);
/* Set security descriptor and extract stream data or reparse data (skip the
* unnamed data stream of encrypted files, which was already extracted). */
static int
-win32_finish_extract_stream(HANDLE h, const struct wim_inode *inode,
+win32_finish_extract_stream(HANDLE h, const struct wim_dentry *dentry,
const struct wim_lookup_table_entry *lte,
const wchar_t *stream_path,
const wchar_t *stream_name_utf16,
struct apply_args *args)
{
int ret = 0;
+ const struct wim_inode *inode = dentry->d_inode;
+ const wchar_t *short_name;
if (stream_name_utf16 == NULL) {
/* Unnamed stream. */
* the stream is encrypted and therefore was already
* extracted as a special case. */
ret = do_win32_extract_stream(h, lte);
+ if (ret)
+ return ret;
+ }
+
+ if (dentry_has_short_name(dentry))
+ short_name = dentry->short_name;
+ else
+ short_name = L"";
+ /* Set short name */
+ if (!SetFileShortNameW(h, short_name)) {
+ #if 0
+ DWORD err = GetLastError();
+ ERROR("Could not set short name on \"%ls\"", stream_path);
+ win32_error(err);
+ #endif
}
} else {
/* Extract the data for a named data stream. */
* This handles reparse points, directories, alternate data streams, encrypted
* files, compressed files, etc.
*
- * @inode: WIM inode containing the stream.
+ * @dentry: WIM dentry for the file or directory being extracted.
*
* @path: Path to extract the file to.
*
* Returns 0 on success; nonzero on failure.
*/
static int
-win32_extract_stream(const struct wim_inode *inode,
+win32_extract_stream(const struct wim_dentry *dentry,
const wchar_t *path,
const wchar_t *stream_name_utf16,
struct wim_lookup_table_entry *lte,
DWORD creationDisposition = CREATE_ALWAYS;
DWORD requestedAccess;
BY_HANDLE_FILE_INFORMATION file_info;
+ unsigned remaining_sharing_violations = 1000;
+ const struct wim_inode *inode = dentry->d_inode;
if (stream_name_utf16) {
/* Named stream. Create a buffer that contains the UTF-16LE
}
DEBUG("Opening \"%ls\"", stream_path);
- requestedAccess = GENERIC_READ | GENERIC_WRITE |
+ /* DELETE access is needed for SetFileShortNameW(), for some reason. */
+ requestedAccess = GENERIC_READ | GENERIC_WRITE | DELETE |
ACCESS_SYSTEM_SECURITY;
try_open_again:
/* Open the stream to be extracted. Depending on what we have set
* CreateDirectoryW() or OpenEncryptedFileRawW(). */
h = CreateFileW(stream_path,
requestedAccess,
- 0,
+ FILE_SHARE_READ,
NULL,
creationDisposition,
win32_get_create_flags_and_attributes(inode->i_attributes),
requestedAccess &= ~ACCESS_SYSTEM_SECURITY;
goto try_open_again;
}
- ERROR("Failed to create \"%ls\"", stream_path);
- win32_error(err);
+ if (err == ERROR_SHARING_VIOLATION) {
+ if (remaining_sharing_violations) {
+ --remaining_sharing_violations;
+ /* This can happen when restoring encrypted directories
+ * for some reason. Probably a bug in EncryptFile(). */
+ WARNING("Couldn't open \"%ls\" due to sharing violation; "
+ "re-trying after 100ms", stream_path);
+ Sleep(100);
+ goto 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);
+ }
ret = WIMLIB_ERR_OPEN;
goto fail;
}
* descriptor and actually extract the stream data (other than for
* extracted files, which were already extracted).
* win32_finish_extract_stream() handles these additional steps. */
- ret = win32_finish_extract_stream(h, inode, lte, stream_path,
+ ret = win32_finish_extract_stream(h, dentry, lte, stream_path,
stream_name_utf16, args);
if (ret)
goto fail_close_handle;
* (unnamed data stream and/or reparse point stream, plus any alternate data
* streams). Handles sparse, compressed, and/or encrypted files.
*
- * @inode: WIM inode for this file or directory.
+ * @dentry: WIM dentry for this file or directory.
* @path: UTF-16LE external path to extract the inode to.
* @args: Additional extraction context.
*
* Returns 0 on success; nonzero on failure.
*/
static int
-win32_extract_streams(const struct wim_inode *inode,
+win32_extract_streams(const struct wim_dentry *dentry,
const wchar_t *path, struct apply_args *args)
{
struct wim_lookup_table_entry *unnamed_lte;
int ret;
+ const struct wim_inode *inode = dentry->d_inode;
/* First extract the unnamed stream. */
unnamed_lte = inode_unnamed_lte_resolved(inode);
- ret = win32_extract_stream(inode, path, NULL, unnamed_lte, args);
+ ret = win32_extract_stream(dentry, path, NULL, unnamed_lte, args);
if (ret)
goto out;
continue;
/* Extract the named stream */
- ret = win32_extract_stream(inode,
+ ret = win32_extract_stream(dentry,
path,
ads_entry->stream_name,
ads_entry->lte,
} else {
/* Create the file, directory, or reparse point, and extract the
* data streams. */
- ret = win32_extract_streams(inode, output_path, args);
+ ret = win32_extract_streams(dentry, output_path, args);
if (ret)
return ret;
}
git://wimlib.net / wimlib / blobdiff