X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_capture.c;h=eb8bd7f9891f68ac038c964acc6a0746918d5446;hb=bbedc3e1934278c2ff2746b25b688477cffc9d83;hp=14a6c134833e0b47860c60e75321560ea60258ba;hpb=da295f258b60e1593de305385c0669eac4b76644;p=wimlib diff --git a/src/win32_capture.c b/src/win32_capture.c index 14a6c134..eb8bd7f9 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,11 +58,13 @@ 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; HANDLE hFile = win32_open_existing_file(lte->file_on_disk, @@ -97,16 +75,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) { @@ -125,6 +114,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; } @@ -136,6 +128,7 @@ struct win32_encrypted_read_ctx { void *buf; size_t buf_filled; u64 bytes_remaining; + u32 in_chunk_size; }; static DWORD WINAPI @@ -143,6 +136,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); @@ -154,7 +148,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); @@ -162,7 +156,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, @@ -192,6 +186,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) { @@ -207,7 +202,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 { @@ -269,25 +264,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; @@ -310,7 +308,6 @@ win32_get_short_name(HANDLE hFile, const wchar_t *path, struct wim_dentry *dentr FindClose(hFind); } return ret; -#endif } /* @@ -347,24 +344,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,7 +421,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; } @@ -467,6 +466,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; @@ -478,16 +480,21 @@ 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 { set_errno_from_nt_status(status); ERROR_WITH_ERRNO("Failed to read directory " @@ -536,7 +543,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; @@ -601,7 +611,6 @@ out_free_buf: out_find_close: FindClose(hFind); return ret; -#endif } /* Reparse point fixup status code */ @@ -962,10 +971,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; @@ -1019,28 +1028,27 @@ win32_capture_streams(HANDLE *hFile_p, 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_p, &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,6 +1065,10 @@ win32_capture_streams(HANDLE *hFile_p, 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 { set_errno_from_nt_status(status); ERROR_WITH_ERRNO("Failed to read streams of %ls", path); @@ -1107,12 +1119,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 @@ -1155,25 +1173,19 @@ out_free_buf: out_find_close: FindClose(hFind); return ret; -#endif /* !WITH_NTDLL */ unnamed_only: /* 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 @@ -1411,12 +1423,15 @@ 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)