X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_capture.c;h=c7d2b20c637e2be12ac78672a67d733857eb5d4c;hp=3ceca2377645a907ec0b8bba504089253386ecf4;hb=65bb9ae621f3e5b5d9a20412f892e6c8fce35bd2;hpb=dc9a63af1936af287746c00bac7b713e99fd4fdd diff --git a/src/win32_capture.c b/src/win32_capture.c index 3ceca237..c7d2b20c 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 @@ -87,7 +63,6 @@ read_win32_file_prefix(const struct wim_lookup_table_entry *lte, { int ret = 0; void *out_buf; - DWORD err; u64 bytes_remaining; HANDLE hFile = win32_open_existing_file(lte->file_on_disk, @@ -270,25 +245,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 +289,6 @@ win32_get_short_name(HANDLE hFile, const wchar_t *path, struct wim_dentry *dentr FindClose(hFind); } return ret; -#endif } /* @@ -348,24 +325,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 @@ -468,6 +447,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,16 +461,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 " @@ -537,7 +524,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; @@ -602,7 +592,6 @@ out_free_buf: out_find_close: FindClose(hFind); return ret; -#endif } /* Reparse point fixup status code */ @@ -946,7 +935,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 */ @@ -1020,28 +1009,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) { @@ -1058,6 +1046,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); @@ -1108,12 +1100,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 @@ -1156,25 +1154,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 @@ -1412,12 +1404,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)