#include "wimlib/paths.h"
#include "wimlib/reparse.h"
-#ifdef WITH_NTDLL
-# include <winternl.h>
-# include <ntstatus.h>
-
-NTSTATUS WINAPI
-NtQuerySecurityObject(HANDLE handle,
- SECURITY_INFORMATION SecurityInformation,
- PSECURITY_DESCRIPTOR SecurityDescriptor,
- ULONG Length,
- PULONG LengthNeeded);
-#endif
-
#define MAX_GET_SD_ACCESS_DENIED_WARNINGS 1
#define MAX_GET_SACL_PRIV_NOTHELD_WARNINGS 1
#define MAX_CAPTURE_LONG_PATH_WARNINGS 5
{
int ret = 0;
void *out_buf;
- DWORD err;
u64 bytes_remaining;
- HANDLE hFile = win32_open_file_data_only(lte->file_on_disk);
+ HANDLE hFile = win32_open_existing_file(lte->file_on_disk,
+ FILE_READ_DATA);
if (hFile == INVALID_HANDLE_VALUE) {
- err = GetLastError();
- ERROR("Failed to open \"%ls\"", lte->file_on_disk);
- win32_error(err);
+ set_errno_from_GetLastError();
+ ERROR_WITH_ERRNO("Failed to open \"%ls\"", lte->file_on_disk);
return WIMLIB_ERR_OPEN;
}
if (!ReadFile(hFile, out_buf, bytesToRead, &bytesRead, NULL) ||
bytesRead != bytesToRead)
{
- err = GetLastError();
- ERROR("Failed to read data from \"%ls\"", lte->file_on_disk);
- win32_error(err);
+ set_errno_from_GetLastError();
+ ERROR_WITH_ERRNO("Failed to read data from \"%ls\"",
+ lte->file_on_disk);
ret = WIMLIB_ERR_READ;
break;
}
export_ctx.buf_filled = 0;
export_ctx.bytes_remaining = size;
- err = OpenEncryptedFileRawW(lte->file_on_disk, 0, &file_ctx);
+ err = OpenEncryptedFileRaw(lte->file_on_disk, 0, &file_ctx);
if (err != ERROR_SUCCESS) {
- ERROR("Failed to open encrypted file \"%ls\" for raw read",
- lte->file_on_disk);
- win32_error(err);
+ set_errno_from_win32_error(err);
+ ERROR_WITH_ERRNO("Failed to open encrypted file \"%ls\" "
+ "for raw read", lte->file_on_disk);
ret = WIMLIB_ERR_OPEN;
goto out_free_buf;
}
err = ReadEncryptedFileRaw(win32_encrypted_export_cb,
&export_ctx, file_ctx);
if (err != ERROR_SUCCESS) {
- ERROR("Failed to read encrypted file \"%ls\"",
- lte->file_on_disk);
- win32_error(err);
+ set_errno_from_win32_error(err);
+ ERROR_WITH_ERRNO("Failed to read encrypted file \"%ls\"",
+ lte->file_on_disk);
ret = export_ctx.wimlib_err_code;
if (ret == 0)
ret = WIMLIB_ERR_READ;
return ((u64)ft->dwHighDateTime << 32) | (u64)ft->dwLowDateTime;
}
+/* Load the short name of a file into a WIM dentry.
+ *
+ * If we can't read the short filename for some reason, we just ignore the error
+ * and assume the file has no short name. This shouldn't be an issue, since the
+ * short names are essentially obsolete anyway.
+ */
static int
-win32_get_short_name(struct wim_dentry *dentry, const wchar_t *path)
+win32_get_short_name(HANDLE hFile, const wchar_t *path, struct wim_dentry *dentry)
{
+
+ /* It's not any harder to just make the NtQueryInformationFile() system
+ * call ourselves, and it saves a dumb call to FindFirstFile() which of
+ * course has to create its own handle. */
+#ifdef WITH_NTDLL
+ if (func_NtQueryInformationFile) {
+ NTSTATUS status;
+ IO_STATUS_BLOCK io_status;
+ u8 buf[128] _aligned_attribute(8);
+ const FILE_NAME_INFORMATION *info;
+
+ status = (*func_NtQueryInformationFile)(hFile, &io_status, buf, sizeof(buf),
+ FileAlternateNameInformation);
+ info = (const FILE_NAME_INFORMATION*)buf;
+ if (status == STATUS_SUCCESS && info->FileNameLength != 0) {
+ dentry->short_name = MALLOC(info->FileNameLength + 2);
+ if (!dentry->short_name)
+ return WIMLIB_ERR_NOMEM;
+ memcpy(dentry->short_name, info->FileName,
+ info->FileNameLength);
+ dentry->short_name[info->FileNameLength / 2] = L'\0';
+ dentry->short_name_nbytes = info->FileNameLength;
+ }
+ return 0;
+ }
+#endif
+
WIN32_FIND_DATAW dat;
HANDLE hFind;
int ret = 0;
- /* If we can't read the short filename for some reason, we just ignore
- * the error and assume the file has no short name. I don't think this
- * should be an issue, since the short names are essentially obsolete
- * anyway. */
- hFind = FindFirstFileW(path, &dat);
+ hFind = FindFirstFile(path, &dat);
if (hFind != INVALID_HANDLE_VALUE) {
if (dat.cAlternateFileName[0] != L'\0') {
DEBUG("\"%ls\": short name \"%ls\"", path, dat.cAlternateFileName);
* win32_query_security_descriptor() - Query a file's security descriptor
*
* We need the file's security descriptor in SECURITY_DESCRIPTOR_RELATIVE
- * relative format, and we currently have a handle opened with as many relevant
+ * format, and we currently have a handle opened with as many relevant
* permissions as possible. At this point, on Windows there are a number of
* options for reading a file's security descriptor:
*
static DWORD
win32_query_security_descriptor(HANDLE hFile, const wchar_t *path,
SECURITY_INFORMATION requestedInformation,
- PSECURITY_DESCRIPTOR *buf,
+ SECURITY_DESCRIPTOR *buf,
DWORD bufsize, DWORD *lengthNeeded)
{
#ifdef WITH_NTDLL
- NTSTATUS status;
-
- status = NtQuerySecurityObject(hFile, requestedInformation, buf,
- bufsize, lengthNeeded);
- /* Since it queries an already-open handle, NtQuerySecurityObject()
- * apparently returns STATUS_ACCESS_DENIED rather than
- * STATUS_PRIVILEGE_NOT_HELD. */
- if (status == STATUS_ACCESS_DENIED)
- return ERROR_PRIVILEGE_NOT_HELD;
- else
- return RtlNtStatusToDosError(status);
-#else
+ if (func_NtQuerySecurityObject) {
+ NTSTATUS status;
+
+ status = (*func_NtQuerySecurityObject)(hFile,
+ requestedInformation, buf,
+ bufsize, lengthNeeded);
+ /* Since it queries an already-open handle, NtQuerySecurityObject()
+ * apparently returns STATUS_ACCESS_DENIED rather than
+ * STATUS_PRIVILEGE_NOT_HELD. */
+ if (status == STATUS_ACCESS_DENIED)
+ return ERROR_PRIVILEGE_NOT_HELD;
+ else
+ return (*func_RtlNtStatusToDosError)(status);
+ }
+#endif
if (GetFileSecurity(path, requestedInformation, buf,
bufsize, lengthNeeded))
return ERROR_SUCCESS;
else
return GetLastError();
-#endif
}
static int
int add_flags)
{
SECURITY_INFORMATION requestedInformation;
- u8 _buf[1];
+ u8 _buf[4096];
u8 *buf;
size_t bufsize;
DWORD lenNeeded;
for (;;) {
err = win32_query_security_descriptor(hFile, path,
requestedInformation,
- (PSECURITY_DESCRIPTOR)buf,
+ (SECURITY_DESCRIPTOR*)buf,
bufsize, &lenNeeded);
switch (err) {
case ERROR_SUCCESS:
goto out_free_buf;
default:
fail:
- errno = win32_error_to_errno(err);
+ set_errno_from_win32_error(err);
ERROR("Failed to read security descriptor of \"%ls\"", path);
ret = WIMLIB_ERR_READ;
goto out_free_buf;
have_descriptor:
inode->i_security_id = sd_set_add_sd(sd_set, buf, lenNeeded);
- if (inode->i_security_id < 0) {
+ if (inode->i_security_id < 0)
ret = WIMLIB_ERR_NOMEM;
- goto out_free_buf;
- }
- ret = 0;
+ else
+ ret = 0;
out_free_buf:
if (buf != _buf)
FREE(buf);
struct win32_capture_state *state,
unsigned vol_flags);
-/* Reads the directory entries of directory using a Win32 API and recursively
- * calls win32_build_dentry_tree() on them. */
+/* Reads the directory entries of directory and recursively calls
+ * win32_build_dentry_tree() on them. */
static int
-win32_recurse_directory(struct wim_dentry *root,
+win32_recurse_directory(HANDLE hDir,
wchar_t *dir_path,
size_t dir_path_num_chars,
+ struct wim_dentry *root,
struct add_image_params *params,
struct win32_capture_state *state,
unsigned vol_flags)
{
- WIN32_FIND_DATAW dat;
- HANDLE hFind;
- DWORD err;
int ret;
DEBUG("Recurse to directory \"%ls\"", dir_path);
+ /* Using NtQueryDirectoryFile() we can re-use the same open handle,
+ * which we opened with FILE_FLAG_BACKUP_SEMANTICS (probably not the
+ * case for the FindFirstFile() API; it's not documented). */
+#ifdef WITH_NTDLL
+ if (func_NtQueryDirectoryFile) {
+ NTSTATUS status;
+ IO_STATUS_BLOCK io_status;
+ const size_t bufsize = 8192;
+ u8 *buf;
+ BOOL restartScan = TRUE;
+ const FILE_NAMES_INFORMATION *info;
+
+ buf = MALLOC(bufsize);
+ if (!buf)
+ return WIMLIB_ERR_NOMEM;
+ for (;;) {
+ status = (*func_NtQueryDirectoryFile)(hDir, NULL, NULL, NULL,
+ &io_status, buf, bufsize,
+ FileNamesInformation,
+ FALSE, NULL, restartScan);
+ restartScan = FALSE;
+ if (status != STATUS_SUCCESS) {
+ if (status == STATUS_NO_MORE_FILES ||
+ status == STATUS_NO_MORE_ENTRIES ||
+ status == STATUS_NO_MORE_MATCHES) {
+ ret = 0;
+ } else {
+ set_errno_from_nt_status(status);
+ ERROR_WITH_ERRNO("Failed to read directory "
+ "\"%ls\"", dir_path);
+ ret = WIMLIB_ERR_READ;
+ }
+ goto out_free_buf;
+ }
+ wimlib_assert(io_status.Information != 0);
+ info = (const FILE_NAMES_INFORMATION*)buf;
+ for (;;) {
+ if (!(info->FileNameLength == 2 && info->FileName[0] == L'.') &&
+ !(info->FileNameLength == 4 && info->FileName[0] == L'.' &&
+ info->FileName[1] == L'.'))
+ {
+ wchar_t *p;
+ struct wim_dentry *child;
+
+ p = dir_path + dir_path_num_chars;
+ *p++ = L'\\';
+ p = wmempcpy(p, info->FileName,
+ info->FileNameLength / 2);
+ *p = '\0';
+
+ ret = win32_build_dentry_tree_recursive(
+ &child,
+ dir_path,
+ p - dir_path,
+ params,
+ state,
+ vol_flags);
+
+ dir_path[dir_path_num_chars] = L'\0';
+
+ if (ret)
+ goto out_free_buf;
+ if (child)
+ dentry_add_child(root, child);
+ }
+ if (info->NextEntryOffset == 0)
+ break;
+ info = (const FILE_NAMES_INFORMATION*)
+ ((const u8*)info + info->NextEntryOffset);
+ }
+ }
+ out_free_buf:
+ FREE(buf);
+ return ret;
+ }
+#endif
+ WIN32_FIND_DATAW dat;
+ HANDLE hFind;
+ DWORD err;
+
/* Begin reading the directory by calling FindFirstFileW. Unlike UNIX
* opendir(), FindFirstFileW has file globbing built into it. But this
* isn't what we actually want, so just add a dummy glob to get all
dir_path[dir_path_num_chars] = OS_PREFERRED_PATH_SEPARATOR;
dir_path[dir_path_num_chars + 1] = L'*';
dir_path[dir_path_num_chars + 2] = L'\0';
- hFind = FindFirstFileW(dir_path, &dat);
+ hFind = FindFirstFile(dir_path, &dat);
dir_path[dir_path_num_chars] = L'\0';
if (hFind == INVALID_HANDLE_VALUE) {
if (err == ERROR_FILE_NOT_FOUND) {
return 0;
} else {
- ERROR("Failed to read directory \"%ls\"", dir_path);
- win32_error(err);
+ set_errno_from_win32_error(err);
+ ERROR_WITH_ERRNO("Failed to read directory \"%ls\"",
+ dir_path);
return WIMLIB_ERR_READ;
}
}
goto out_find_close;
if (child)
dentry_add_child(root, child);
- } while (FindNextFileW(hFind, &dat));
+ } while (FindNextFile(hFind, &dat));
err = GetLastError();
if (err != ERROR_NO_MORE_FILES) {
- ERROR("Failed to read directory \"%ls\"", dir_path);
- win32_error(err);
+ set_errno_from_win32_error(err);
+ ERROR_WITH_ERRNO("Failed to read directory \"%ls\"", dir_path);
if (ret == 0)
ret = WIMLIB_ERR_READ;
}
&bytesReturned,
NULL))
{
- DWORD err = GetLastError();
- ERROR("Failed to get reparse data of \"%ls\"", path);
- win32_error(err);
+ set_errno_from_GetLastError();
+ ERROR_WITH_ERRNO("Failed to get reparse data of \"%ls\"", path);
return -WIMLIB_ERR_READ;
}
if (bytesReturned < 8 || bytesReturned > REPARSE_POINT_MAX_SIZE) {
}
static DWORD WINAPI
-win32_tally_encrypted_size_cb(unsigned char *_data, void *_ctx,
+win32_tally_encrypted_size_cb(unsigned char *_data, void *_size_ret,
unsigned long len)
{
- *(u64*)_ctx += len;
+ *(u64*)_size_ret += len;
return ERROR_SUCCESS;
}
void *file_ctx;
int ret;
- *size_ret = 0;
- err = OpenEncryptedFileRawW(path, 0, &file_ctx);
+ err = OpenEncryptedFileRaw(path, 0, &file_ctx);
if (err != ERROR_SUCCESS) {
- ERROR("Failed to open encrypted file \"%ls\" for raw read", path);
- win32_error(err);
+ set_errno_from_win32_error(err);
+ ERROR_WITH_ERRNO("Failed to open encrypted file \"%ls\" "
+ "for raw read", path);
return WIMLIB_ERR_OPEN;
}
+ *size_ret = 0;
err = ReadEncryptedFileRaw(win32_tally_encrypted_size_cb,
size_ret, file_ctx);
if (err != ERROR_SUCCESS) {
- ERROR("Failed to read raw encrypted data from \"%ls\"", path);
- win32_error(err);
+ set_errno_from_win32_error(err);
+ ERROR_WITH_ERRNO("Failed to read raw encrypted data from "
+ "\"%ls\"", path);
ret = WIMLIB_ERR_READ;
} else {
ret = 0;
spath_buf_nbytes = (spath_nchars + 1) * sizeof(wchar_t);
spath = MALLOC(spath_buf_nbytes);
- swprintf(spath, L"%ls%ls%ls%ls",
+ tsprintf(spath, L"%ls%ls%ls%ls",
relpath_prefix, path, colonchar, stream_name);
/* Make a new wim_lookup_table_entry */
* already present in Windows XP.
*/
static int
-win32_capture_streams(HANDLE hFile,
+win32_capture_streams(HANDLE *hFile_p,
const wchar_t *path,
size_t path_num_chars,
struct wim_inode *inode,
IO_STATUS_BLOCK io_status;
NTSTATUS status;
const FILE_STREAM_INFORMATION *info;
-#else
+#endif
HANDLE hFind;
DWORD err;
-#endif
DEBUG("Capturing streams from \"%ls\"", path);
if (!(vol_flags & FILE_NAMED_STREAMS))
goto unnamed_only;
-#ifndef WITH_NTDLL
- if (win32func_FindFirstStreamW == NULL)
- goto unnamed_only;
-#endif
#ifdef WITH_NTDLL
+ if (!func_NtQueryInformationFile)
+ goto use_FindFirstStream;
+
buf = _buf;
bufsize = sizeof(_buf);
/* Get a buffer containing the stream information. */
for (;;) {
- status = NtQueryInformationFile(hFile, &io_status, buf, bufsize,
- FileStreamInformation);
+ status = (*func_NtQueryInformationFile)(*hFile_p, &io_status,
+ buf, bufsize,
+ FileStreamInformation);
if (status == STATUS_SUCCESS) {
break;
} else if (status == STATUS_BUFFER_OVERFLOW) {
goto out_free_buf;
}
buf = newbuf;
+ } else if (status == STATUS_NOT_IMPLEMENTED ||
+ status == STATUS_NOT_SUPPORTED ||
+ status == STATUS_INVALID_INFO_CLASS) {
+ goto use_FindFirstStream;
} else {
- errno = win32_error_to_errno(RtlNtStatusToDosError(status));
+ set_errno_from_nt_status(status);
ERROR_WITH_ERRNO("Failed to read streams of %ls", path);
ret = WIMLIB_ERR_READ;
goto out_free_buf;
goto out_free_buf;
}
+ if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) {
+ /* OpenEncryptedFileRaw() seems to fail with
+ * ERROR_SHARING_VIOLATION if there are any handles opened to
+ * the file. */
+ CloseHandle(*hFile_p);
+ *hFile_p = INVALID_HANDLE_VALUE;
+ }
+
/* Parse one or more stream information structures. */
info = (const FILE_STREAM_INFORMATION*)buf;
for (;;) {
if (buf != _buf)
FREE(buf);
return ret;
+#endif /* WITH_NTDLL */
-#else /* WITH_NTDLL */
+use_FindFirstStream:
+ if (win32func_FindFirstStreamW == NULL)
+ goto unnamed_only;
hFind = win32func_FindFirstStreamW(path, FindStreamInfoStandard, &dat, 0);
if (hFind == INVALID_HANDLE_VALUE) {
err = GetLastError();
- if (err == ERROR_CALL_NOT_IMPLEMENTED)
+ if (err == ERROR_CALL_NOT_IMPLEMENTED ||
+ err == ERROR_NOT_SUPPORTED ||
+ err == ERROR_INVALID_FUNCTION ||
+ err == ERROR_INVALID_PARAMETER)
goto unnamed_only;
/* Seems legal for this to return ERROR_HANDLE_EOF on reparse
path, capture_access_denied_msg);
return 0;
} else {
- ERROR("Failed to look up data streams "
- "of \"%ls\"", path);
- win32_error(err);
+ set_errno_from_win32_error(err);
+ ERROR_WITH_ERRNO("Failed to look up data streams "
+ "of \"%ls\"", path);
return WIMLIB_ERR_READ;
}
}
} while (win32func_FindNextStreamW(hFind, &dat));
err = GetLastError();
if (err != ERROR_HANDLE_EOF) {
- ERROR("Win32 API: Error reading data streams from \"%ls\"", path);
- win32_error(err);
+ set_errno_from_win32_error(err);
+ ERROR_WITH_ERRNO("Error reading data streams from "
+ "\"%ls\"", path);
ret = WIMLIB_ERR_READ;
}
out_find_close:
FindClose(hFind);
return ret;
-#endif /* !WITH_NTDLL */
unnamed_only:
- /* FindFirstStreamW() API is not available, or the volume does not
+ /* FindFirstStream() API is not available, or the volume does not
* support named streams. Only capture the unnamed data stream. */
DEBUG("Only capturing unnamed data stream");
- if (!(inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
- FILE_ATTRIBUTE_REPARSE_POINT)))
- {
- wcscpy(dat.cStreamName, L"::$DATA");
- dat.StreamSize.QuadPart = file_size;
- ret = win32_capture_stream(path,
- path_num_chars,
- inode, lookup_table,
- &dat);
- if (ret)
- return ret;
- }
- return ret;
+ if (inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
+ FILE_ATTRIBUTE_REPARSE_POINT))
+ return 0;
+
+ wcscpy(dat.cStreamName, L"::$DATA");
+ dat.StreamSize.QuadPart = file_size;
+ return win32_capture_stream(path, path_num_chars,
+ inode, lookup_table, &dat);
}
static int
if (ret)
goto out_close_handle;
- ret = win32_get_short_name(root, path);
+ ret = win32_get_short_name(hFile, path, root);
if (ret)
goto out_close_handle;
/* Capture the unnamed data stream (only should be present for regular
* files) and any alternate data streams. */
- ret = win32_capture_streams(hFile,
+ ret = win32_capture_streams(&hFile,
path,
path_num_chars,
inode,
if (ret)
goto out_close_handle;
- CloseHandle(hFile);
-
if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
/* Reparse point: set the reparse data (which we read already)
* */
params->lookup_table);
} else if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) {
/* Directory (not a reparse point) --- recurse to children */
- ret = win32_recurse_directory(root,
+
+ if (hFile == INVALID_HANDLE_VALUE) {
+ /* Re-open handle that was closed to read raw encrypted
+ * data. */
+ hFile = win32_open_existing_file(path, FILE_READ_DATA);
+ if (hFile == INVALID_HANDLE_VALUE) {
+ set_errno_from_GetLastError();
+ ERROR_WITH_ERRNO("Failed to reopen \"%ls\"",
+ path);
+ ret = WIMLIB_ERR_OPEN;
+ goto out_close_handle;
+ }
+ }
+ ret = win32_recurse_directory(hFile,
path,
path_num_chars,
+ root,
params,
state,
vol_flags);
}
- goto out;
out_close_handle:
CloseHandle(hFile);
out:
DWORD dret;
bool need_prefix_free = false;
-#ifndef WITH_NTDLL
- if (!win32func_FindFirstStreamW) {
+ if (!win32func_FindFirstStreamW
+#ifdef WITH_NTDLL
+ && !func_NtQueryInformationFile
+#endif
+ )
+ {
WARNING("Running on Windows XP or earlier; "
"alternate data streams will not be captured.");
}
-#endif
path_nchars = wcslen(root_disk_path);
if (path_nchars > WINDOWS_NT_MAX_PATH)
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);
- if (ret)
+ if (ret) {
+ ERROR_WITH_ERRNO("Can't open %ls", root_disk_path);
return ret;
+ }
win32_get_vol_flags(root_disk_path, &vol_flags, NULL);
git://wimlib.net / wimlib / blobdiff