X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_capture.c;h=f940179cd58f2aed786ed4637d5985ff5bb4050b;hp=e0fe2608e4452444fcc69ee17bef9a209ab3acc4;hb=4f9ccdbed3ee79171d0b861c4ba93b54ce8feaac;hpb=d5984b47ca93ee5fa96a3d49aa5017b10e10e399 diff --git a/src/win32_capture.c b/src/win32_capture.c index e0fe2608..f940179c 100644 --- a/src/win32_capture.c +++ b/src/win32_capture.c @@ -58,12 +58,15 @@ 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; + bool out_buf_malloced; u64 bytes_remaining; + const size_t stack_max = 32768; HANDLE hFile = win32_open_existing_file(lte->file_on_disk, FILE_READ_DATA); @@ -73,16 +76,27 @@ 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_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) { @@ -101,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; } @@ -112,6 +129,7 @@ struct win32_encrypted_read_ctx { void *buf; size_t buf_filled; u64 bytes_remaining; + u32 in_chunk_size; }; static DWORD WINAPI @@ -119,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); @@ -130,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); @@ -138,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, @@ -168,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) { @@ -183,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 { @@ -402,7 +422,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 +467,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; + if (!func_NtQueryDirectoryFile) + goto use_FindFirstFile; - 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; + 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;