X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_capture.c;h=71e6c840ab3c6f7f9186768813f2272778fbb25f;hb=3bb3e3c3806a121686cec80c56f2718c714915ef;hp=e0fe2608e4452444fcc69ee17bef9a209ab3acc4;hpb=d5984b47ca93ee5fa96a3d49aa5017b10e10e399;p=wimlib diff --git a/src/win32_capture.c b/src/win32_capture.c index e0fe2608..71e6c840 100644 --- a/src/win32_capture.c +++ b/src/win32_capture.c @@ -58,12 +58,11 @@ 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; u64 bytes_remaining; + u8 buf[BUFFER_SIZE]; HANDLE hFile = win32_open_existing_file(lte->file_on_disk, FILE_READ_DATA); @@ -73,17 +72,12 @@ read_win32_file_prefix(const struct wim_lookup_table_entry *lte, 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) { set_errno_from_GetLastError(); @@ -93,74 +87,40 @@ read_win32_file_prefix(const struct wim_lookup_table_entry *lte, 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; + size_t bytes_to_consume = min(len, ctx->bytes_remaining); - 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; + if (bytes_to_consume == 0) + return ERROR_SUCCESS; + + 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; } @@ -168,8 +128,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; @@ -180,16 +139,8 @@ 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 = OpenEncryptedFileRaw(lte->file_on_disk, 0, &file_ctx); @@ -197,8 +148,7 @@ read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte, 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; + return WIMLIB_ERR_OPEN; } err = ReadEncryptedFileRaw(win32_encrypted_export_cb, &export_ctx, file_ctx); @@ -219,8 +169,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; } @@ -402,7 +350,7 @@ win32_get_security_descriptor(HANDLE hFile, default: fail: set_errno_from_win32_error(err); - ERROR("Failed to read security descriptor of \"%ls\"", path); + ERROR_WITH_ERRNO("Failed to read security descriptor of \"%ls\"", path); ret = WIMLIB_ERR_READ; goto out_free_buf; } @@ -447,78 +395,87 @@ 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) { - 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; + 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; } - 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); + 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; } +out_free_buf: + FREE(buf); + return ret; #endif + +use_FindFirstFile: + ; WIN32_FIND_DATAW dat; HANDLE hFind; DWORD err; @@ -943,10 +900,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; @@ -1169,17 +1126,16 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret, unsigned vol_flags) { struct wim_dentry *root = NULL; - struct wim_inode *inode; + struct wim_inode *inode = NULL; DWORD err; u64 file_size; int 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) { @@ -1187,9 +1143,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 @@ -1204,8 +1159,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: @@ -1234,7 +1187,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) { @@ -1244,12 +1197,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; } @@ -1270,16 +1223,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); @@ -1296,7 +1251,7 @@ again: ¶ms->sd_set, state, params->add_flags); if (ret) - goto out_close_handle; + goto out; } file_size = ((u64)file_info.nFileSizeHigh << 32) | @@ -1313,7 +1268,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) @@ -1334,7 +1289,7 @@ again: ERROR_WITH_ERRNO("Failed to reopen \"%ls\"", path); ret = WIMLIB_ERR_OPEN; - goto out_close_handle; + goto out; } } ret = win32_recurse_directory(hFile, @@ -1345,9 +1300,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