#include "wimlib/xml.h"
#include "wimlib/wimboot.h"
-/* TODO: Add workaround for when a stream needs to be extracted to more places
- * than this */
-#define MAX_OPEN_HANDLES 32768
-
struct win32_apply_ctx {
/* Extract flags, the pointer to the WIMStruct, etc. */
struct reparse_buffer_disk rpbuf;
/* Temporary buffer for reparse data of "fixed" absolute symbolic links
- * and junction */
+ * and junctions */
struct reparse_buffer_disk rpfixbuf;
/* Array of open handles to filesystem streams currently being written
*/
- HANDLE open_handles[MAX_OPEN_HANDLES];
+ HANDLE open_handles[MAX_OPEN_STREAMS];
/* Number of handles in @open_handles currently open (filled in from the
* beginning of the array) */
return 0;
}
-/* Load the patterns from [PrepopulateList] of WimBootCompresse.ini in the WIM
+/* Load the patterns from [PrepopulateList] of WimBootCompress.ini in the WIM
* image being extracted. */
static int
load_prepopulate_pats(struct win32_apply_ctx *ctx)
if (ret == WIMLIB_ERR_NOMEM)
return ret;
- if (!wim_info_get_wimboot(wim->wim_info,
- wim->current_image))
+ if (!wim_info_get_wimboot(wim->wim_info, wim->current_image))
WARNING("Image is not marked as WIMBoot compatible!");
ret = hash_lookup_table(ctx->common.wim,
*
* If the inode has no named data streams, this will be 0. Otherwise, this will
* be 1 plus the length of the longest-named data stream, since the data stream
- * name must be separated form the path by the ':' character. */
+ * name must be separated from the path by the ':' character. */
static size_t
inode_longest_named_data_stream_spec(const struct wim_inode *inode)
{
static int
prepare_target(struct list_head *dentry_list, struct win32_apply_ctx *ctx)
{
+ int ret;
NTSTATUS status;
size_t path_max;
/* Open handle to the target directory (possibly creating it). */
- if (func_RtlDosPathNameToNtPathName_U_WithStatus) {
- status = (*func_RtlDosPathNameToNtPathName_U_WithStatus)(ctx->common.target,
- &ctx->target_ntpath,
- NULL, NULL);
- } else {
- if ((*func_RtlDosPathNameToNtPathName_U)(ctx->common.target,
- &ctx->target_ntpath,
- NULL, NULL))
- status = STATUS_SUCCESS;
- else
- status = STATUS_NO_MEMORY;
- }
- if (!NT_SUCCESS(status)) {
- if (status == STATUS_NO_MEMORY) {
- return WIMLIB_ERR_NOMEM;
- } else {
- ERROR("\"%ls\": invalid path name "
- "(status=0x%08"PRIx32")",
- ctx->common.target, (u32)status);
- return WIMLIB_ERR_INVALID_PARAM;
- }
- }
+ ret = win32_path_to_nt_path(ctx->common.target, &ctx->target_ntpath);
+ if (ret)
+ return ret;
ctx->attr.Length = sizeof(ctx->attr);
ctx->attr.ObjectName = &ctx->target_ntpath;
* handle to the file. If it does, it sets it to NULL.
*/
static int
-maybe_clear_encryption_attribute(HANDLE *h_ret, const struct wim_dentry *dentry,
+maybe_clear_encryption_attribute(HANDLE *h_ptr, const struct wim_dentry *dentry,
struct win32_apply_ctx *ctx)
{
if (dentry->d_inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED)
BOOL bret;
/* Get current attributes */
- status = (*func_NtQueryInformationFile)(*h_ret, &ctx->iosb,
+ status = (*func_NtQueryInformationFile)(*h_ptr, &ctx->iosb,
&info, sizeof(info),
FileBasicInformation);
if (NT_SUCCESS(status) &&
* handle to the file so we don't get ERROR_SHARING_VIOLATION. We also
* hack together a Win32 path, although we will use the \\?\ prefix so
* it will actually be a NT path in disguise... */
- (*func_NtClose)(*h_ret);
- *h_ret = NULL;
+ (*func_NtClose)(*h_ptr);
+ *h_ptr = NULL;
build_win32_extraction_path(dentry, ctx);
* wait until later to actually set the reparse data. */
/* If the root dentry is being extracted, it was already done so
- * it prepare_target(). */
+ * in prepare_target(). */
if (dentry_is_root(dentry))
continue;
}
}
- /* Too many open handles? */
- if (ctx->num_open_handles == MAX_OPEN_HANDLES) {
+ if (ctx->num_open_handles == MAX_OPEN_STREAMS) {
+ /* XXX: Fix this. But because of the checks in
+ * extract_stream_list(), this can now only happen on a
+ * filesystem that does not support hard links. */
ERROR("Can't extract data: too many open files!");
return WIMLIB_ERR_UNSUPPORTED;
}
* The path has an explicit length and is not necessarily null terminated.
*
* If the path just something like \??\e: then the returned pointer will point
- * just past the colon; in this case the length of the result will be 0
+ * just past the colon. In this case the length of the result will be 0
* characters. */
static const wchar_t *
get_device_relative_path(const wchar_t *path, size_t path_nchars)
/* Called when starting to read a stream for extraction on Windows */
static int
-begin_extract_stream(struct wim_lookup_table_entry *stream,
- u32 flags, void *_ctx)
+begin_extract_stream(struct wim_lookup_table_entry *stream, void *_ctx)
{
struct win32_apply_ctx *ctx = _ctx;
const struct stream_owner *owners = stream_owners(stream);
}
}
- if (unlikely(ctx->num_open_handles == 0 && ctx->data_buffer_ptr == NULL)) {
- /* The data of this stream isn't actually needed!
- * (This can happen in WIMBoot mode.) */
- return BEGIN_STREAM_STATUS_SKIP_STREAM;
- }
return 0;
fail:
git://wimlib.net / wimlib / blobdiff