X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_capture.c;h=f940179cd58f2aed786ed4637d5985ff5bb4050b;hb=67b6e421c8018a894f38eee258dbc03510137254;hp=feb3feaa53795eeb30615504483c287fb51d9f87;hpb=8b8c35471a032fff8bde926cc280a024d4ad78ca;p=wimlib diff --git a/src/win32_capture.c b/src/win32_capture.c index feb3feaa..f940179c 100644 --- a/src/win32_capture.c +++ b/src/win32_capture.c @@ -36,18 +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); -#endif - #define MAX_GET_SD_ACCESS_DENIED_WARNINGS 1 #define MAX_GET_SACL_PRIV_NOTHELD_WARNINGS 1 #define MAX_CAPTURE_LONG_PATH_WARNINGS 5 @@ -70,38 +58,51 @@ int read_win32_file_prefix(const struct wim_lookup_table_entry *lte, u64 size, consume_data_callback_t cb, + u32 in_chunk_size, void *ctx_or_buf, int _ignored_flags) { int ret = 0; void *out_buf; - DWORD err; + bool out_buf_malloced; u64 bytes_remaining; + const size_t stack_max = 32768; - 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_malloced = false; + if (cb) { + if (in_chunk_size <= stack_max) { + out_buf = alloca(in_chunk_size); + } else { + out_buf = MALLOC(in_chunk_size); + if (out_buf == NULL) { + ret = WIMLIB_ERR_NOMEM; + goto out_close_handle; + } + out_buf_malloced = true; + } + } else { out_buf = ctx_or_buf; + } bytes_remaining = size; while (bytes_remaining) { DWORD bytesToRead, bytesRead; - bytesToRead = min(WIM_CHUNK_SIZE, bytes_remaining); + bytesToRead = min(in_chunk_size, bytes_remaining); 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; } @@ -114,6 +115,9 @@ read_win32_file_prefix(const struct wim_lookup_table_entry *lte, out_buf += bytesRead; } } + if (out_buf_malloced) + FREE(out_buf); +out_close_handle: CloseHandle(hFile); return ret; } @@ -125,6 +129,7 @@ struct win32_encrypted_read_ctx { void *buf; size_t buf_filled; u64 bytes_remaining; + u32 in_chunk_size; }; static DWORD WINAPI @@ -132,6 +137,7 @@ win32_encrypted_export_cb(unsigned char *_data, void *_ctx, unsigned long len) { const void *data = _data; struct win32_encrypted_read_ctx *ctx = _ctx; + u32 in_chunk_size = ctx->in_chunk_size; int ret; DEBUG("len = %lu", len); @@ -143,7 +149,7 @@ win32_encrypted_export_cb(unsigned char *_data, void *_ctx, unsigned long len) len); while (bytes_to_buffer) { size_t bytes_to_copy_to_buf = - min(bytes_to_buffer, WIM_CHUNK_SIZE - ctx->buf_filled); + min(bytes_to_buffer, in_chunk_size - ctx->buf_filled); memcpy(ctx->buf + ctx->buf_filled, data, bytes_to_copy_to_buf); @@ -151,7 +157,7 @@ win32_encrypted_export_cb(unsigned char *_data, void *_ctx, unsigned long len) data += bytes_to_copy_to_buf; bytes_to_buffer -= bytes_to_copy_to_buf; - if (ctx->buf_filled == WIM_CHUNK_SIZE || + if (ctx->buf_filled == in_chunk_size || ctx->buf_filled == ctx->bytes_remaining) { ret = (*ctx->read_prefix_cb)(ctx->buf, @@ -181,6 +187,7 @@ int read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte, u64 size, consume_data_callback_t cb, + u32 in_chunk_size, void *ctx_or_buf, int _ignored_flags) { @@ -196,7 +203,7 @@ read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte, export_ctx.read_prefix_ctx_or_buf = ctx_or_buf; export_ctx.wimlib_err_code = 0; if (cb) { - export_ctx.buf = MALLOC(WIM_CHUNK_SIZE); + export_ctx.buf = MALLOC(in_chunk_size); if (!export_ctx.buf) return WIMLIB_ERR_NOMEM; } else { @@ -205,20 +212,20 @@ read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte, 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; @@ -244,18 +251,47 @@ FILETIME_to_u64(const FILETIME *ft) 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); @@ -279,7 +315,7 @@ win32_get_short_name(struct wim_dentry *dentry, const wchar_t *path) * 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: * @@ -305,28 +341,30 @@ win32_get_short_name(struct wim_dentry *dentry, const wchar_t *path) 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 @@ -338,7 +376,7 @@ win32_get_security_descriptor(HANDLE hFile, int add_flags) { SECURITY_INFORMATION requestedInformation; - u8 _buf[1]; + u8 _buf[4096]; u8 *buf; size_t bufsize; DWORD lenNeeded; @@ -354,7 +392,7 @@ win32_get_security_descriptor(HANDLE hFile, for (;;) { err = win32_query_security_descriptor(hFile, path, requestedInformation, - (PSECURITY_DESCRIPTOR)buf, + (SECURITY_DESCRIPTOR*)buf, bufsize, &lenNeeded); switch (err) { case ERROR_SUCCESS: @@ -383,8 +421,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; } @@ -392,11 +430,10 @@ win32_get_security_descriptor(HANDLE hFile, 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); @@ -411,23 +448,110 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret, 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) + goto use_FindFirstFile; + + 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 if (status == STATUS_NOT_IMPLEMENTED || + status == STATUS_NOT_SUPPORTED || + status == STATUS_INVALID_INFO_CLASS) { + FREE(buf); + goto use_FindFirstFile; + } 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 + +use_FindFirstFile: + ; + 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 @@ -435,7 +559,7 @@ win32_recurse_directory(struct wim_dentry *root, 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) { @@ -443,8 +567,9 @@ win32_recurse_directory(struct wim_dentry *root, 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; } } @@ -476,11 +601,11 @@ win32_recurse_directory(struct wim_dentry *root, 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; } @@ -664,9 +789,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) { @@ -694,10 +818,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; } @@ -708,18 +832,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; @@ -829,7 +955,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 */ @@ -886,7 +1012,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, @@ -903,28 +1029,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) { @@ -941,8 +1066,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; @@ -955,6 +1084,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 (;;) { @@ -983,12 +1120,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 @@ -1006,9 +1149,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; } } @@ -1023,32 +1166,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 @@ -1163,7 +1301,7 @@ again: 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; @@ -1196,7 +1334,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, @@ -1206,8 +1344,6 @@ again: 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) * */ @@ -1217,14 +1353,27 @@ again: 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: @@ -1275,30 +1424,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);