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;
}
err = OpenEncryptedFileRawW(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;
* 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
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;
status == STATUS_NO_MORE_MATCHES) {
ret = 0;
} else {
- errno = win32_error_to_errno(
- RtlNtStatusToDosError(status));
+ set_errno_from_nt_status(status);
ERROR_WITH_ERRNO("Failed to read directory "
"\"%ls\"", dir_path);
ret = WIMLIB_ERR_READ;
for (;;) {
if (!(info->FileNameLength == 2 && info->FileName[0] == L'.') &&
!(info->FileNameLength == 4 && info->FileName[0] == L'.' &&
- info->FileName[1] == L'.'))
+ info->FileName[1] == L'.'))
{
wchar_t *p;
struct wim_dentry *child;
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;
}
}
} while (FindNextFileW(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) {
*size_ret = 0;
err = OpenEncryptedFileRawW(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;
}
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;
}
buf = newbuf;
} 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;
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:
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