* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
+#ifdef __WIN32__
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#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. */
/* 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) */
d = dentry;
do {
len += d->d_extraction_name_nchars + 1;
- d = d->parent;
+ d = d->d_parent;
} while (!dentry_is_root(d) && will_extract_dentry(d));
return --len; /* No leading slash */
ctx->pathbuf.Length = len * sizeof(wchar_t);
p = ctx->pathbuf.Buffer + len;
for (d = dentry;
- !dentry_is_root(d->parent) && will_extract_dentry(d->parent);
- d = d->parent)
+ !dentry_is_root(d->d_parent) && will_extract_dentry(d->d_parent);
+ d = d->d_parent)
{
p -= d->d_extraction_name_nchars;
wmemcpy(p, d->d_extraction_name, d->d_extraction_name_nchars);
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). */
- status = (*func_RtlDosPathNameToNtPathName_U_WithStatus)(ctx->common.target,
- &ctx->target_ntpath,
- NULL, NULL);
- 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;
return 0;
}
-/* Gets the number of bytes to allocate for the specified inode. */
-static void
-inode_get_allocation_size(const struct wim_inode *inode,
- LARGE_INTEGER *allocation_size_ret)
-{
- const struct wim_lookup_table_entry *unnamed_stream;
-
- /* We just count the unnamed data stream. */
-
- unnamed_stream = inode_unnamed_lte_resolved(inode);
- if (unnamed_stream)
- allocation_size_ret->QuadPart = unnamed_stream->size;
- else
- allocation_size_ret->QuadPart = 0;
-}
-
/*
* Creates the nondirectory file named by @dentry.
*
struct win32_apply_ctx *ctx)
{
const struct wim_inode *inode;
- LARGE_INTEGER allocation_size;
ULONG attrib;
NTSTATUS status;
bool retried = false;
inode = dentry->d_inode;
- /* To increase performance, we will pre-allocate space for the file
- * data. */
- inode_get_allocation_size(inode, &allocation_size);
-
/* If the file already exists and has FILE_ATTRIBUTE_SYSTEM and/or
* FILE_ATTRIBUTE_HIDDEN, these must be specified in order to supersede
* the file.
build_extraction_path(dentry, ctx);
retry:
status = do_create_file(h_ret, GENERIC_READ | GENERIC_WRITE | DELETE,
- &allocation_size, attrib, FILE_SUPERSEDE,
+ NULL, attrib, FILE_SUPERSEDE,
FILE_NON_DIRECTORY_FILE, ctx);
if (NT_SUCCESS(status)) {
int ret;
{
const struct wim_inode *inode = dentry->d_inode;
size_t stream_name_nchars = 0;
- LARGE_INTEGER allocation_size;
+ FILE_ALLOCATION_INFORMATION alloc_info;
HANDLE h;
NTSTATUS status;
&info, ctx->common.progctx);
FREE(dentry->_full_path);
dentry->_full_path = NULL;
- return ret;
+ if (ret)
+ return ret;
+ /* Go on and open the file for normal extraction. */
} else {
FREE(dentry->_full_path);
dentry->_full_path = NULL;
}
}
- /* Too many open handles? */
- if (ctx->num_open_handles == MAX_OPEN_HANDLES) {
- ERROR("Too many 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;
}
/* Open a new handle */
- allocation_size.QuadPart = stream->size;
status = do_create_file(&h,
FILE_WRITE_DATA | SYNCHRONIZE,
- &allocation_size, 0, FILE_OPEN_IF,
+ NULL, 0, FILE_OPEN_IF,
FILE_SEQUENTIAL_ONLY |
FILE_SYNCHRONOUS_IO_NONALERT,
ctx);
}
ctx->open_handles[ctx->num_open_handles++] = h;
+
+ /* Allocate space for the data. */
+ alloc_info.AllocationSize.QuadPart = stream->size;
+ (*func_NtSetInformationFile)(h, &ctx->iosb,
+ &alloc_info, sizeof(alloc_info),
+ FileAllocationInformation);
return 0;
}
/* Given a Windows NT namespace path, such as \??\e:\Windows\System32, return a
* pointer to the suffix of the path that is device-relative, such as
- * Windows\System32. */
+ * Windows\System32.
+ *
+ * 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
+ * characters. */
static const wchar_t *
get_device_relative_path(const wchar_t *path, size_t path_nchars)
{
path = wmemchr(path, L'\\', (end - path));
if (!path)
- return orig_path;
+ return end;
do {
path++;
} while (path != end && *path == L'\\');
target_ntpath_nchars = ctx->target_ntpath.Length / sizeof(wchar_t);
- fixed_subst_name_nchars = target_ntpath_nchars + 1 + relpath_nchars;
+ fixed_subst_name_nchars = target_ntpath_nchars;
+ if (relpath_nchars)
+ fixed_subst_name_nchars += 1 + relpath_nchars;
wchar_t fixed_subst_name[fixed_subst_name_nchars];
wmemcpy(fixed_subst_name, ctx->target_ntpath.Buffer,
target_ntpath_nchars);
- fixed_subst_name[target_ntpath_nchars] = L'\\';
- wmemcpy(&fixed_subst_name[target_ntpath_nchars + 1],
- relpath, relpath_nchars);
+ if (relpath_nchars) {
+ fixed_subst_name[target_ntpath_nchars] = L'\\';
+ wmemcpy(&fixed_subst_name[target_ntpath_nchars + 1],
+ relpath, relpath_nchars);
+ }
/* Doesn't need to be null-terminated. */
/* Print name should be Win32, but not all NT names can even be
.extract = win32_extract,
.context_size = sizeof(struct win32_apply_ctx),
};
+
+#endif /* __WIN32__ */
git://wimlib.net / wimlib / blobdiff