X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_capture.c;h=fa3f04fbff8ef28235c9df2e690e3684669089dd;hb=cbd31ea4e13a4e7479b2a19dc59efd9f2dd86e5e;hp=2a69009add04503cf14bdb83e0ae8b4f746abae8;hpb=c9b74a8ec3c3243432cbcbdefe6a00007930988a;p=wimlib diff --git a/src/win32_capture.c b/src/win32_capture.c index 2a69009a..fa3f04fb 100644 --- a/src/win32_capture.c +++ b/src/win32_capture.c @@ -36,30 +36,6 @@ #include "wimlib/paths.h" #include "wimlib/reparse.h" -#ifdef WITH_NTDLL -# include -# include - -NTSTATUS WINAPI -NtQuerySecurityObject(HANDLE handle, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - ULONG Length, - PULONG LengthNeeded); -NTSTATUS WINAPI -NtQueryDirectoryFile(HANDLE FileHandle, - HANDLE Event, - PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - PIO_STATUS_BLOCK IoStatusBlock, - PVOID FileInformation, - ULONG Length, - FILE_INFORMATION_CLASS FileInformationClass, - BOOLEAN ReturnSingleEntry, - PUNICODE_STRING FileName, - BOOLEAN RestartScan); -#endif - #define MAX_GET_SD_ACCESS_DENIED_WARNINGS 1 #define MAX_GET_SACL_PRIV_NOTHELD_WARNINGS 1 #define MAX_CAPTURE_LONG_PATH_WARNINGS 5 @@ -82,110 +58,66 @@ int read_win32_file_prefix(const struct wim_lookup_table_entry *lte, u64 size, consume_data_callback_t cb, - void *ctx_or_buf, - int _ignored_flags) + void *cb_ctx) { int ret = 0; - void *out_buf; - DWORD err; u64 bytes_remaining; + u8 buf[BUFFER_SIZE]; - 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 (cb) - out_buf = alloca(WIM_CHUNK_SIZE); - else - out_buf = ctx_or_buf; - bytes_remaining = size; while (bytes_remaining) { DWORD bytesToRead, bytesRead; - bytesToRead = min(WIM_CHUNK_SIZE, bytes_remaining); - if (!ReadFile(hFile, out_buf, bytesToRead, &bytesRead, NULL) || + bytesToRead = min(sizeof(buf), bytes_remaining); + if (!ReadFile(hFile, 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; } bytes_remaining -= bytesRead; - if (cb) { - ret = (*cb)(out_buf, bytesRead, ctx_or_buf); - if (ret) - break; - } else { - out_buf += bytesRead; - } + ret = (*cb)(buf, bytesRead, cb_ctx); + if (ret) + break; } +out_close_handle: CloseHandle(hFile); return ret; } struct win32_encrypted_read_ctx { consume_data_callback_t read_prefix_cb; - void *read_prefix_ctx_or_buf; + void *read_prefix_ctx; int wimlib_err_code; - void *buf; - size_t buf_filled; u64 bytes_remaining; }; static DWORD WINAPI -win32_encrypted_export_cb(unsigned char *_data, void *_ctx, unsigned long len) +win32_encrypted_export_cb(unsigned char *data, void *_ctx, unsigned long len) { - const void *data = _data; struct win32_encrypted_read_ctx *ctx = _ctx; int ret; - - DEBUG("len = %lu", len); - if (ctx->read_prefix_cb) { - /* The length of the buffer passed to the ReadEncryptedFileRaw() - * export callback is undocumented, so we assume it may be of - * arbitrary size. */ - size_t bytes_to_buffer = min(ctx->bytes_remaining - ctx->buf_filled, - len); - while (bytes_to_buffer) { - size_t bytes_to_copy_to_buf = - min(bytes_to_buffer, WIM_CHUNK_SIZE - ctx->buf_filled); - - memcpy(ctx->buf + ctx->buf_filled, data, - bytes_to_copy_to_buf); - ctx->buf_filled += bytes_to_copy_to_buf; - data += bytes_to_copy_to_buf; - bytes_to_buffer -= bytes_to_copy_to_buf; - - if (ctx->buf_filled == WIM_CHUNK_SIZE || - ctx->buf_filled == ctx->bytes_remaining) - { - ret = (*ctx->read_prefix_cb)(ctx->buf, - ctx->buf_filled, - ctx->read_prefix_ctx_or_buf); - if (ret) { - ctx->wimlib_err_code = ret; - /* Shouldn't matter what error code is returned - * here, as long as it isn't ERROR_SUCCESS. */ - return ERROR_READ_FAULT; - } - ctx->bytes_remaining -= ctx->buf_filled; - ctx->buf_filled = 0; - } - } - } else { - size_t len_to_copy = min(len, ctx->bytes_remaining); - ctx->read_prefix_ctx_or_buf = mempcpy(ctx->read_prefix_ctx_or_buf, - data, - len_to_copy); - ctx->bytes_remaining -= len_to_copy; + size_t bytes_to_consume = min(len, ctx->bytes_remaining); + + ret = (*ctx->read_prefix_cb)(data, bytes_to_consume, ctx->read_prefix_ctx); + if (ret) { + ctx->wimlib_err_code = ret; + /* Shouldn't matter what error code is returned here, as long as + * it isn't ERROR_SUCCESS. */ + return ERROR_READ_FAULT; } + ctx->bytes_remaining -= bytes_to_consume; return ERROR_SUCCESS; } @@ -193,8 +125,7 @@ int read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte, u64 size, consume_data_callback_t cb, - void *ctx_or_buf, - int _ignored_flags) + void *cb_ctx) { struct win32_encrypted_read_ctx export_ctx; DWORD err; @@ -205,32 +136,23 @@ read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte, size, lte->file_on_disk); export_ctx.read_prefix_cb = cb; - export_ctx.read_prefix_ctx_or_buf = ctx_or_buf; + export_ctx.read_prefix_ctx = cb_ctx; export_ctx.wimlib_err_code = 0; - if (cb) { - export_ctx.buf = MALLOC(WIM_CHUNK_SIZE); - if (!export_ctx.buf) - return WIMLIB_ERR_NOMEM; - } else { - export_ctx.buf = NULL; - } - 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); - ret = WIMLIB_ERR_OPEN; - goto out_free_buf; + set_errno_from_win32_error(err); + ERROR_WITH_ERRNO("Failed to open encrypted file \"%ls\" " + "for raw read", lte->file_on_disk); + return WIMLIB_ERR_OPEN; } 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; @@ -244,8 +166,6 @@ read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte, ret = 0; } CloseEncryptedFileRaw(file_ctx); -out_free_buf: - FREE(export_ctx.buf); return ret; } @@ -270,25 +190,28 @@ win32_get_short_name(HANDLE hFile, const wchar_t *path, struct wim_dentry *dentr * call ourselves, and it saves a dumb call to FindFirstFile() which of * course has to create its own handle. */ #ifdef WITH_NTDLL - NTSTATUS status; - IO_STATUS_BLOCK io_status; - u8 buf[128] _aligned_attribute(8); - const FILE_NAME_INFORMATION *info; - - status = 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; + 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; } - return 0; -#else +#endif + WIN32_FIND_DATAW dat; HANDLE hFind; int ret = 0; @@ -311,7 +234,6 @@ win32_get_short_name(HANDLE hFile, const wchar_t *path, struct wim_dentry *dentr FindClose(hFind); } return ret; -#endif } /* @@ -348,24 +270,26 @@ win32_query_security_descriptor(HANDLE hFile, const wchar_t *path, 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 @@ -422,8 +346,8 @@ win32_get_security_descriptor(HANDLE hFile, goto out_free_buf; default: fail: - errno = win32_error_to_errno(err); - ERROR("Failed to read security descriptor of \"%ls\"", path); + set_errno_from_win32_error(err); + ERROR_WITH_ERRNO("Failed to read security descriptor of \"%ls\"", path); ret = WIMLIB_ERR_READ; goto out_free_buf; } @@ -468,6 +392,9 @@ win32_recurse_directory(HANDLE hDir, * 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) + goto use_FindFirstFile; + NTSTATUS status; IO_STATUS_BLOCK io_status; const size_t bufsize = 8192; @@ -479,19 +406,23 @@ win32_recurse_directory(HANDLE hDir, if (!buf) return WIMLIB_ERR_NOMEM; for (;;) { - status = NtQueryDirectoryFile(hDir, NULL, NULL, NULL, - &io_status, buf, bufsize, - FileNamesInformation, - FALSE, NULL, restartScan); + 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 if (status == STATUS_NOT_IMPLEMENTED || + status == STATUS_NOT_SUPPORTED || + status == STATUS_INVALID_INFO_CLASS) { + FREE(buf); + goto use_FindFirstFile; } 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; @@ -503,7 +434,7 @@ win32_recurse_directory(HANDLE hDir, 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; @@ -538,7 +469,10 @@ win32_recurse_directory(HANDLE hDir, out_free_buf: FREE(buf); return ret; -#else +#endif + +use_FindFirstFile: + ; WIN32_FIND_DATAW dat; HANDLE hFind; DWORD err; @@ -550,7 +484,7 @@ out_free_buf: 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) { @@ -558,8 +492,9 @@ out_free_buf: 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; } } @@ -591,18 +526,17 @@ out_free_buf: 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; } out_find_close: FindClose(hFind); return ret; -#endif } /* Reparse point fixup status code */ @@ -780,9 +714,8 @@ win32_get_reparse_data(HANDLE hFile, const wchar_t *path, &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) { @@ -810,10 +743,10 @@ win32_get_reparse_data(HANDLE hFile, const wchar_t *path, } 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; } @@ -824,18 +757,20 @@ win32_get_encrypted_file_size(const wchar_t *path, u64 *size_ret) 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; @@ -945,7 +880,7 @@ win32_capture_stream(const wchar_t *path, 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 */ @@ -962,10 +897,10 @@ win32_capture_stream(const wchar_t *path, ret = win32_get_encrypted_file_size(path, &encrypted_size); if (ret) goto out_free_spath; - lte->resource_entry.original_size = encrypted_size; + lte->size = encrypted_size; } else { lte->resource_location = RESOURCE_IN_FILE_ON_DISK; - lte->resource_entry.original_size = (u64)dat->StreamSize.QuadPart; + lte->size = (u64)dat->StreamSize.QuadPart; } u32 stream_id; @@ -1002,7 +937,7 @@ out_invalid_stream_name: * 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, @@ -1019,28 +954,27 @@ win32_capture_streams(HANDLE hFile, 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) { @@ -1057,8 +991,12 @@ win32_capture_streams(HANDLE hFile, 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; @@ -1071,6 +1009,14 @@ win32_capture_streams(HANDLE hFile, 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 (;;) { @@ -1099,12 +1045,18 @@ out_free_buf: 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 @@ -1122,9 +1074,9 @@ 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; } } @@ -1139,32 +1091,27 @@ out_free_buf: } 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 @@ -1183,10 +1130,9 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret, u8 *rpbuf; u16 rpbuflen; u16 not_rpfixed; - HANDLE hFile; + HANDLE hFile = INVALID_HANDLE_VALUE; DWORD desiredAccess; - params->progress.scan.cur_path = path; if (exclude_path(path, path_num_chars, params->config, true)) { if (params->add_flags & WIMLIB_ADD_FLAG_ROOT) { @@ -1194,9 +1140,8 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret, ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; goto out; } - do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED); ret = 0; - goto out; + goto out_progress; } #if 0 @@ -1211,8 +1156,6 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret, } #endif - do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK); - desiredAccess = FILE_READ_DATA | FILE_READ_ATTRIBUTES | READ_CONTROL | ACCESS_SYSTEM_SECURITY; again: @@ -1241,7 +1184,7 @@ again: ERROR_WITH_ERRNO("Failed to get file information for \"%ls\"", path); ret = WIMLIB_ERR_STAT; - goto out_close_handle; + goto out; } if (file_info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { @@ -1251,12 +1194,12 @@ again: if (ret < 0) { /* WIMLIB_ERR_* (inverted) */ ret = -ret; - goto out_close_handle; + goto out; } else if (ret & RP_FIXED) { not_rpfixed = 0; } else if (ret == RP_EXCLUDED) { ret = 0; - goto out_close_handle; + goto out_progress; } else { not_rpfixed = 1; } @@ -1277,16 +1220,18 @@ again: (file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)), &root); if (ret) - goto out_close_handle; + goto out; ret = win32_get_short_name(hFile, path, root); if (ret) - goto out_close_handle; + goto out; inode = root->d_inode; - if (inode->i_nlink > 1) /* Shared inode; nothing more to do */ - goto out_close_handle; + if (inode->i_nlink > 1) { + /* Shared inode; nothing more to do */ + goto out_progress; + } inode->i_attributes = file_info.dwFileAttributes; inode->i_creation_time = FILETIME_to_u64(&file_info.ftCreationTime); @@ -1303,7 +1248,7 @@ again: ¶ms->sd_set, state, params->add_flags); if (ret) - goto out_close_handle; + goto out; } file_size = ((u64)file_info.nFileSizeHigh << 32) | @@ -1312,7 +1257,7 @@ again: /* 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, @@ -1320,7 +1265,7 @@ again: file_size, vol_flags); if (ret) - goto out_close_handle; + goto out; if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) { /* Reparse point: set the reparse data (which we read already) @@ -1331,6 +1276,19 @@ again: params->lookup_table); } else if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) { /* Directory (not a reparse point) --- recurse to children */ + + 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; + } + } ret = win32_recurse_directory(hFile, path, path_num_chars, @@ -1339,9 +1297,19 @@ again: state, vol_flags); } -out_close_handle: - CloseHandle(hFile); + if (ret) + goto out; + + path[path_num_chars] = '\0'; +out_progress: + params->progress.scan.cur_path = path; + if (root == NULL) + do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL); + else + do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode); out: + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); if (ret == 0) *root_ret = root; else @@ -1389,30 +1357,27 @@ win32_build_dentry_tree(struct wim_dentry **root_ret, 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);