X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32.c;h=ce94b049106dd4b1a57ed060b9be45fa1bfb9802;hp=775e782eedd9d576e8f6cdd72431948eb22db823;hb=51996593b805cc79ba3a67ea4c721baa60e1c70e;hpb=406df77b8a9c2bb3318cf7737702eac27041e41e diff --git a/src/win32.c b/src/win32.c index 775e782e..ce94b049 100644 --- a/src/win32.c +++ b/src/win32.c @@ -1,7 +1,7 @@ /* * win32.c * - * All the code specific to native Windows builds is in here. + * All the library code specific to native Windows builds is in here. */ /* @@ -31,25 +31,92 @@ #include #include #include -#include -#ifdef ERROR +#include /* shlwapi.h for PathMatchSpecA() */ +#ifdef ERROR /* windows.h defines this */ # undef ERROR #endif - -/* Microsoft's swprintf() violates the C standard and they require programmers - * to do this weird define to get the correct function. */ -#define swprintf _snwprintf - #include "win32.h" #include "dentry.h" #include "lookup_table.h" #include "security.h" +#include "endianness.h" #include + + +/* Pointers to functions that are not available on all targetted versions of + * Windows (XP and later). NOTE: The WINAPI annotations seem to be important; I + * assume it specifies a certain calling convention. */ + +/* Vista and later */ +static HANDLE (WINAPI *win32func_FindFirstStreamW)(LPCWSTR lpFileName, + STREAM_INFO_LEVELS InfoLevel, + LPVOID lpFindStreamData, + DWORD dwFlags) = NULL; + +/* Vista and later */ +static BOOL (WINAPI *win32func_FindNextStreamW)(HANDLE hFindStream, + LPVOID lpFindStreamData) = NULL; + +static HMODULE hKernel32 = NULL; + +/* Try to dynamically load some functions */ +void +win32_global_init() +{ + DWORD err; + bool warned; + + + if (hKernel32 == NULL) { + DEBUG("Loading Kernel32.dll"); + hKernel32 = LoadLibraryA("Kernel32.dll"); + if (hKernel32 == NULL) { + err = GetLastError(); + WARNING("Can't load Kernel32.dll"); + win32_error(err); + return; + } + } + + DEBUG("Looking for FindFirstStreamW"); + win32func_FindFirstStreamW = (void*)GetProcAddress(hKernel32, "FindFirstStreamW"); + if (!win32func_FindFirstStreamW) { + WARNING("Could not find function FindFirstStreamW() in Kernel32.dll!"); + WARNING("Capturing alternate data streams will not be supported."); + return; + } + + DEBUG("Looking for FindNextStreamW"); + win32func_FindNextStreamW = (void*)GetProcAddress(hKernel32, "FindNextStreamW"); + if (!win32func_FindNextStreamW) { + WARNING("Could not find function FindNextStreamW() in Kernel32.dll!"); + WARNING("Capturing alternate data streams will not be supported."); + win32func_FindFirstStreamW = NULL; + } +} + +void +win32_global_cleanup() +{ + if (hKernel32 != NULL) { + DEBUG("Closing Kernel32.dll"); + FreeLibrary(hKernel32); + hKernel32 = NULL; + } +} + +static const char *access_denied_msg = +" If you are not running this program as the administrator, you may\n" +" need to do so, so that all data and metadata can be backed up.\n" +" Otherwise, there may be no way to access the desired data or\n" +" metadata without taking ownership of the file or directory.\n"; + #ifdef ENABLE_ERROR_MESSAGES -void win32_error(u32 err_code) +void +win32_error(u32 err_code) { char *buffer; DWORD nchars; @@ -64,17 +131,19 @@ void win32_error(u32 err_code) LocalFree(buffer); } } -#else -#define win32_error(err_code) + +void +win32_error_last() +{ + win32_error(GetLastError()); +} #endif -void *win32_open_file_readonly(const void *path) +static HANDLE +win32_open_existing_file(const wchar_t *path, DWORD dwDesiredAccess) { - return CreateFileW((const wchar_t*)path, - FILE_READ_DATA | - FILE_READ_ATTRIBUTES | - READ_CONTROL | - ACCESS_SYSTEM_SECURITY, + return CreateFileW(path, + dwDesiredAccess, FILE_SHARE_READ, NULL, /* lpSecurityAttributes */ OPEN_EXISTING, @@ -83,8 +152,15 @@ void *win32_open_file_readonly(const void *path) NULL /* hTemplateFile */); } -int win32_read_file(const char *filename, - void *handle, u64 offset, size_t size, u8 *buf) +HANDLE +win32_open_file_data_only(const wchar_t *path) +{ + return win32_open_existing_file(path, FILE_READ_DATA); +} + +int +win32_read_file(const mbchar *filename, + void *handle, u64 offset, size_t size, void *buf) { HANDLE h = handle; DWORD err; @@ -102,126 +178,41 @@ int win32_read_file(const char *filename, return WIMLIB_ERR_READ; } -void win32_close_file(void *handle) +void +win32_close_file(void *handle) { CloseHandle((HANDLE)handle); } -static bool win32_modify_privilege(const char *privilege, bool enable) -{ - HANDLE hToken; - LUID luid; - TOKEN_PRIVILEGES newState; - bool ret = false; - - DEBUG("%s privilege %s", - enable ? "Enabling" : "Disabling", privilege); - - if (!OpenProcessToken(GetCurrentProcess(), - TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, - &hToken)) - { - DEBUG("OpenProcessToken() failed"); - goto out; - } - - if (!LookupPrivilegeValue(NULL, privilege, &luid)) { - DEBUG("LookupPrivilegeValue() failed"); - goto out; - } - - newState.PrivilegeCount = 1; - newState.Privileges[0].Luid = luid; - newState.Privileges[0].Attributes = (enable ? SE_PRIVILEGE_ENABLED : 0); - ret = AdjustTokenPrivileges(hToken, FALSE, &newState, 0, NULL, NULL); - if (!ret) - DEBUG("AdjustTokenPrivileges() failed"); - CloseHandle(hToken); -out: - if (!ret) { - DWORD err = GetLastError(); - win32_error(err); - WARNING("Failed to %s privilege %s", - enable ? "enable" : "disable", privilege); - WARNING("The program will continue, but if permission issues are " - "encountered, you may need to run this program as the administrator"); - } - return ret; -} - -static bool win32_acquire_privilege(const char *privilege) -{ - return win32_modify_privilege(privilege, true); -} - -static bool win32_release_privilege(const char *privilege) -{ - return win32_modify_privilege(privilege, false); -} - - -void win32_acquire_capture_privileges() -{ - win32_acquire_privilege(SE_BACKUP_NAME); - win32_acquire_privilege(SE_SECURITY_NAME); -} - -void win32_release_capture_privileges() -{ - win32_release_privilege(SE_BACKUP_NAME); - win32_release_privilege(SE_SECURITY_NAME); -} - -void win32_acquire_restore_privileges() -{ - win32_acquire_privilege(SE_RESTORE_NAME); - win32_acquire_privilege(SE_SECURITY_NAME); - win32_acquire_privilege(SE_TAKE_OWNERSHIP_NAME); -} - -void win32_release_restore_privileges() -{ - win32_release_privilege(SE_RESTORE_NAME); - win32_release_privilege(SE_SECURITY_NAME); - win32_release_privilege(SE_TAKE_OWNERSHIP_NAME); -} - -static u64 FILETIME_to_u64(const FILETIME *ft) +static u64 +FILETIME_to_u64(const FILETIME *ft) { return ((u64)ft->dwHighDateTime << 32) | (u64)ft->dwLowDateTime; } - -int win32_build_dentry_tree(struct wim_dentry **root_ret, - const char *root_disk_path, - struct wim_lookup_table *lookup_table, - struct wim_security_data *sd, - const struct capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - void *extra_arg); - -static int win32_get_short_name(struct wim_dentry *dentry, - const wchar_t *path_utf16) +static int +win32_get_short_name(struct wim_dentry *dentry, + const wchar_t *path_utf16) { WIN32_FIND_DATAW dat; if (FindFirstFileW(path_utf16, &dat) && dat.cAlternateFileName[0] != L'\0') { - size_t short_name_len = wcslen(dat.cAlternateFileName) * 2; - size_t n = short_name_len + sizeof(wchar_t); + size_t short_name_nbytes = wcslen(dat.cAlternateFileName) * 2; + size_t n = short_name_nbytes + sizeof(wchar_t); dentry->short_name = MALLOC(n); if (!dentry->short_name) return WIMLIB_ERR_NOMEM; memcpy(dentry->short_name, dat.cAlternateFileName, n); - dentry->short_name_len = short_name_len; + dentry->short_name_nbytes = short_name_nbytes; } return 0; } -static int win32_get_security_descriptor(struct wim_dentry *dentry, - struct sd_set *sd_set, - const wchar_t *path_utf16) +static int +win32_get_security_descriptor(struct wim_dentry *dentry, + struct sd_set *sd_set, + const wchar_t *path_utf16) { SECURITY_INFORMATION requestedInformation; DWORD lenNeeded = 0; @@ -253,24 +244,32 @@ static int win32_get_security_descriptor(struct wim_dentry *dentry, err = GetLastError(); } } - ERROR("Win32 API: Failed to read security descriptor of \"%ls\"", - path_utf16); - win32_error(err); - return WIMLIB_ERR_READ; + + if (err == ERROR_ACCESS_DENIED) { + WARNING("Failed to read security descriptor of \"%ls\": " + "Access denied!\n%s", path_utf16, access_denied_msg); + return 0; + } else { + ERROR("Win32 API: Failed to read security descriptor of \"%ls\"", + path_utf16); + win32_error(err); + return WIMLIB_ERR_READ; + } } /* Reads the directory entries of directory using a Win32 API and recursively - * calls build_dentry_tree() on them. */ -static int win32_recurse_directory(struct wim_dentry *root, - const char *root_disk_path, - struct wim_lookup_table *lookup_table, - struct wim_security_data *sd, - const struct capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - struct sd_set *sd_set, - const wchar_t *path_utf16, - size_t path_utf16_nchars) + * calls win32_build_dentry_tree() on them. */ +static int +win32_recurse_directory(struct wim_dentry *root, + const mbchar *root_disk_path, + struct wim_lookup_table *lookup_table, + struct wim_security_data *sd, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + struct sd_set *sd_set, + const wchar_t *path_utf16, + size_t path_utf16_nchars) { WIN32_FIND_DATAW dat; HANDLE hFind; @@ -304,24 +303,25 @@ static int win32_recurse_directory(struct wim_dentry *root, ret = 0; do { /* Skip . and .. entries */ - if (!(dat.cFileName[0] == L'.' && - (dat.cFileName[1] == L'\0' || - (dat.cFileName[1] == L'.' && dat.cFileName[2] == L'\0')))) + if (!(dat.cFileName[0] == cpu_to_le16(L'.') && + (dat.cFileName[1] == cpu_to_le16(L'\0') || + (dat.cFileName[1] == cpu_to_le16(L'.') && + dat.cFileName[2] == cpu_to_le16(L'\0'))))) { struct wim_dentry *child; - char *utf8_name; - size_t utf8_name_nbytes; - ret = utf16_to_utf8((const char*)dat.cFileName, - wcslen(dat.cFileName) * sizeof(wchar_t), - &utf8_name, - &utf8_name_nbytes); + mbchar *mbs_name; + size_t mbs_name_nbytes; + ret = utf16le_to_mbs(dat.cFileName, + wcslen(dat.cFileName) * sizeof(wchar_t), + &mbs_name, + &mbs_name_nbytes); if (ret) goto out_find_close; - char name[strlen(root_disk_path) + 1 + utf8_name_nbytes + 1]; - sprintf(name, "%s/%s", root_disk_path, utf8_name); - FREE(utf8_name); + mbchar name[strlen(root_disk_path) + 1 + mbs_name_nbytes + 1]; + sprintf(name, "%s/%s", root_disk_path, mbs_name); + FREE(mbs_name); ret = win32_build_dentry_tree(&child, name, lookup_table, sd, config, add_image_flags, progress_func, sd_set); @@ -354,14 +354,14 @@ out_find_close: * for the reparse point unless an entry already exists for * the exact same data stream. * - * @path: External path to the parse point (UTF-8). Used for error messages - * only. + * @path: External path to the reparse point. Used for error messages only. * * Returns 0 on success; nonzero on failure. */ -static int win32_capture_reparse_point(HANDLE hFile, - struct wim_inode *inode, - struct wim_lookup_table *lookup_table, - const char *path) +static int +win32_capture_reparse_point(HANDLE hFile, + struct wim_inode *inode, + struct wim_lookup_table *lookup_table, + const mbchar *path) { /* "Reparse point data, including the tag and optional GUID, * cannot exceed 16 kilobytes." - MSDN */ @@ -369,8 +369,14 @@ static int win32_capture_reparse_point(HANDLE hFile, DWORD bytesReturned; if (!DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT, - NULL, 0, reparse_point_buf, - sizeof(reparse_point_buf), &bytesReturned, NULL)) + NULL, /* "Not used with this operation; set to NULL" */ + 0, /* "Not used with this operation; set to 0" */ + reparse_point_buf, /* "A pointer to a buffer that + receives the reparse point data */ + sizeof(reparse_point_buf), /* "The size of the output + buffer, in bytes */ + &bytesReturned, + NULL)) { DWORD err = GetLastError(); ERROR("Win32 API: Failed to get reparse data of \"%s\"", path); @@ -381,9 +387,9 @@ static int win32_capture_reparse_point(HANDLE hFile, ERROR("Reparse data on \"%s\" is invalid", path); return WIMLIB_ERR_READ; } - inode->i_reparse_tag = *(u32*)reparse_point_buf; + inode->i_reparse_tag = le32_to_cpu(*(u32*)reparse_point_buf); return inode_add_ads_with_data(inode, "", - (const u8*)reparse_point_buf + 8, + reparse_point_buf + 8, bytesReturned - 8, lookup_table); } @@ -398,7 +404,8 @@ static int win32_capture_reparse_point(HANDLE hFile, * * Returns 0 on success; nonzero on failure. */ -static int win32_sha1sum(const wchar_t *path, u8 hash[SHA1_HASH_SIZE]) +static int +win32_sha1sum(const wchar_t *path, u8 hash[SHA1_HASH_SIZE]) { HANDLE hFile; SHA_CTX ctx; @@ -406,7 +413,7 @@ static int win32_sha1sum(const wchar_t *path, u8 hash[SHA1_HASH_SIZE]) DWORD bytesRead; int ret; - hFile = win32_open_file_readonly(path); + hFile = win32_open_file_data_only(path); if (hFile == INVALID_HANDLE_VALUE) return WIMLIB_ERR_OPEN; @@ -445,28 +452,33 @@ out_close_handle: * * Returns 0 on success; nonzero on failure. */ -static int win32_capture_stream(const wchar_t *path_utf16, - size_t path_utf16_nchars, - struct wim_inode *inode, - struct wim_lookup_table *lookup_table, - WIN32_FIND_STREAM_DATA *dat) +static int +win32_capture_stream(const wchar_t *path_utf16, + size_t path_utf16_nchars, + struct wim_inode *inode, + struct wim_lookup_table *lookup_table, + WIN32_FIND_STREAM_DATA *dat) { struct wim_ads_entry *ads_entry; u8 hash[SHA1_HASH_SIZE]; struct wim_lookup_table_entry *lte; int ret; - wchar_t *p, *colon; + wchar_t *stream_name, *colon; + size_t stream_name_nchars; bool is_named_stream; wchar_t *spath; size_t spath_nchars; DWORD err; + size_t spath_buf_nbytes; + const wchar_t *relpath_prefix; + const wchar_t *colonchar; /* The stream name should be returned as :NAME:TYPE */ - p = dat->cStreamName; - if (*p != L':') + stream_name = dat->cStreamName; + if (*stream_name != L':') goto out_invalid_stream_name; - p += 1; - colon = wcschr(p, L':'); + stream_name += 1; + colon = wcschr(stream_name, L':'); if (colon == NULL) goto out_invalid_stream_name; @@ -476,47 +488,56 @@ static int win32_capture_stream(const wchar_t *path_utf16, goto out; } - is_named_stream = (p != colon); + *colon = '\0'; + + stream_name_nchars = colon - stream_name; + is_named_stream = (stream_name_nchars != 0); + if (is_named_stream) { /* Allocate an ADS entry for the named stream. */ - char *utf8_stream_name; - size_t utf8_stream_name_len; - ret = utf16_to_utf8((const char *)p, - (colon - p) * sizeof(wchar_t), - &utf8_stream_name, - &utf8_stream_name_len); - if (ret) - goto out; - ads_entry = inode_add_ads(inode, utf8_stream_name); - FREE(utf8_stream_name); + ads_entry = inode_add_ads_utf16le(inode, stream_name, + stream_name_nchars * 2); if (!ads_entry) { ret = WIMLIB_ERR_NOMEM; goto out; } } - /* Create a UTF-16 string @spath that gives the filename, then a colon, - * then the stream name. Or, if it's an unnamed stream, just the + /* Create a UTF-16LE string @spath that gives the filename, then a + * colon, then the stream name. Or, if it's an unnamed stream, just the * filename. It is MALLOC()'ed so that it can be saved in the - * wim_lookup_table_entry if needed. */ - *colon = '\0'; + * wim_lookup_table_entry if needed. + * + * As yet another special case, relative paths need to be changed to + * begin with an explicit "./" so that, for example, a file t:ads, where + * :ads is the part we added, is not interpreted as a file on the t: + * drive. */ spath_nchars = path_utf16_nchars; - if (is_named_stream) - spath_nchars += colon - p + 1; - - spath = MALLOC((spath_nchars + 1) * sizeof(wchar_t)); - memcpy(spath, path_utf16, path_utf16_nchars * sizeof(wchar_t)); + relpath_prefix = L""; + colonchar = L""; if (is_named_stream) { - spath[path_utf16_nchars] = L':'; - memcpy(&spath[path_utf16_nchars + 1], p, (colon - p) * sizeof(wchar_t)); + spath_nchars += 1 + stream_name_nchars; + colonchar = L":"; + if (path_utf16_nchars == 1 && + path_utf16[0] != cpu_to_le16('/') && + path_utf16[0] != cpu_to_le16('\\')) + { + spath_nchars += 2; + relpath_prefix = L"./"; + } } - spath[spath_nchars] = L'\0'; + + spath_buf_nbytes = (spath_nchars + 1) * sizeof(wchar_t); + spath = MALLOC(spath_buf_nbytes); + + swprintf(spath, spath_buf_nbytes, L"%ls%ls%ls%ls", + relpath_prefix, path_utf16, colonchar, stream_name); ret = win32_sha1sum(spath, hash); if (ret) { err = GetLastError(); ERROR("Win32 API: Failed to read \"%ls\" to calculate SHA1sum", - path_utf16); + spath); win32_error(err); goto out_free_spath; } @@ -533,7 +554,8 @@ static int win32_capture_stream(const wchar_t *path_utf16, ret = WIMLIB_ERR_NOMEM; goto out_free_spath; } - lte->file_on_disk = (char*)spath; + lte->win32_file_on_disk = spath; + lte->file_on_disk_fp = INVALID_HANDLE_VALUE; spath = NULL; lte->resource_location = RESOURCE_WIN32; lte->resource_entry.original_size = (uint64_t)dat->StreamSize.QuadPart; @@ -566,22 +588,33 @@ out_invalid_stream_name: * * @lookup_table: Stream lookup table for the WIM. * + * @file_size: Size of unnamed data stream. (Used only if alternate + * data streams API appears to be unavailable.) + * * Returns 0 on success; nonzero on failure. */ -static int win32_capture_streams(const wchar_t *path_utf16, - size_t path_utf16_nchars, - struct wim_inode *inode, - struct wim_lookup_table *lookup_table) +static int +win32_capture_streams(const wchar_t *path_utf16, + size_t path_utf16_nchars, + struct wim_inode *inode, + struct wim_lookup_table *lookup_table, + u64 file_size) { WIN32_FIND_STREAM_DATA dat; int ret; HANDLE hFind; DWORD err; - hFind = FindFirstStreamW(path_utf16, FindStreamInfoStandard, &dat, 0); + if (win32func_FindFirstStreamW == NULL) + goto unnamed_only; + + hFind = win32func_FindFirstStreamW(path_utf16, FindStreamInfoStandard, &dat, 0); if (hFind == INVALID_HANDLE_VALUE) { err = GetLastError(); + if (err == ERROR_CALL_NOT_IMPLEMENTED) + goto unnamed_only; + /* Seems legal for this to return ERROR_HANDLE_EOF on reparse * points and directories */ if ((inode->i_attributes & @@ -590,10 +623,17 @@ static int win32_capture_streams(const wchar_t *path_utf16, { return 0; } else { - ERROR("Win32 API: Failed to look up data streams of \"%ls\"", - path_utf16); - win32_error(err); - return WIMLIB_ERR_READ; + if (err == ERROR_ACCESS_DENIED) { + WARNING("Failed to look up data streams of \"%ls\": " + "Access denied!\n%s", path_utf16, + access_denied_msg); + return 0; + } else { + ERROR("Win32 API: Failed to look up data streams of \"%ls\"", + path_utf16); + win32_error(err); + return WIMLIB_ERR_READ; + } } } do { @@ -603,7 +643,7 @@ static int win32_capture_streams(const wchar_t *path_utf16, &dat); if (ret) goto out_find_close; - } while (FindNextStreamW(hFind, &dat)); + } while (win32func_FindNextStreamW(hFind, &dat)); err = GetLastError(); if (err != ERROR_HANDLE_EOF) { ERROR("Win32 API: Error reading data streams from \"%ls\"", path_utf16); @@ -613,26 +653,43 @@ static int win32_capture_streams(const wchar_t *path_utf16, out_find_close: FindClose(hFind); return ret; +unnamed_only: + if (inode->i_attributes & + (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY)) + { + ret = 0; + } else { + wcscpy(dat.cStreamName, L"::$DATA"); + dat.StreamSize.QuadPart = file_size; + ret = win32_capture_stream(path_utf16, + path_utf16_nchars, + inode, lookup_table, + &dat); + } + return ret; } /* Win32 version of capturing a directory tree */ -int win32_build_dentry_tree(struct wim_dentry **root_ret, - const char *root_disk_path, - struct wim_lookup_table *lookup_table, - struct wim_security_data *sd, - const struct capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - void *extra_arg) +int +win32_build_dentry_tree(struct wim_dentry **root_ret, + const mbchar *root_disk_path, + struct wim_lookup_table *lookup_table, + struct wim_security_data *sd, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + void *extra_arg) { struct wim_dentry *root = NULL; int ret = 0; struct wim_inode *inode; wchar_t *path_utf16; + size_t path_utf16_nbytes; size_t path_utf16_nchars; struct sd_set *sd_set; DWORD err; + u64 file_size; if (exclude_path(root_disk_path, config, true)) { if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) { @@ -668,13 +725,14 @@ int win32_build_dentry_tree(struct wim_dentry **root_ret, sd_set = extra_arg; } - ret = utf8_to_utf16(root_disk_path, strlen(root_disk_path), - (char**)&path_utf16, &path_utf16_nchars); + ret = mbs_to_utf16le(root_disk_path, strlen(root_disk_path), + &path_utf16, &path_utf16_nbytes); if (ret) goto out_destroy_sd_set; - path_utf16_nchars /= sizeof(wchar_t); + path_utf16_nchars = path_utf16_nbytes / sizeof(wchar_t); - HANDLE hFile = win32_open_file_readonly(path_utf16); + HANDLE hFile = win32_open_existing_file(path_utf16, + FILE_READ_DATA | FILE_READ_ATTRIBUTES); if (hFile == INVALID_HANDLE_VALUE) { err = GetLastError(); ERROR("Win32 API: Failed to open \"%s\"", root_disk_path); @@ -694,16 +752,9 @@ int win32_build_dentry_tree(struct wim_dentry **root_ret, } /* Create a WIM dentry */ - root = new_dentry_with_timeless_inode(path_basename(root_disk_path)); - if (!root) { - if (errno == EILSEQ) - ret = WIMLIB_ERR_INVALID_UTF8_STRING; - else if (errno == ENOMEM) - ret = WIMLIB_ERR_NOMEM; - else - ret = WIMLIB_ERR_ICONV_NOT_AVAILABLE; + ret = new_dentry_with_timeless_inode(path_basename(root_disk_path), &root); + if (ret) goto out_close_handle; - } /* Start preparing the associated WIM inode */ inode = root->d_inode; @@ -720,12 +771,18 @@ int win32_build_dentry_tree(struct wim_dentry **root_ret, /* Get DOS name and security descriptor (if any). */ ret = win32_get_short_name(root, path_utf16); - if (ret) - goto out_close_handle; - ret = win32_get_security_descriptor(root, sd_set, path_utf16); if (ret) goto out_close_handle; + if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) { + ret = win32_get_security_descriptor(root, sd_set, path_utf16); + if (ret) + goto out_close_handle; + } + + file_size = ((u64)file_info.nFileSizeHigh << 32) | + (u64)file_info.nFileSizeLow; + if (inode_is_directory(inode)) { /* Directory (not a reparse point) --- recurse to children */ @@ -734,7 +791,8 @@ int win32_build_dentry_tree(struct wim_dentry **root_ret, ret = win32_capture_streams(path_utf16, path_utf16_nchars, inode, - lookup_table); + lookup_table, + file_size); if (ret) goto out_close_handle; ret = win32_recurse_directory(root, @@ -759,7 +817,8 @@ int win32_build_dentry_tree(struct wim_dentry **root_ret, ret = win32_capture_streams(path_utf16, path_utf16_nchars, inode, - lookup_table); + lookup_table, + file_size); } out_close_handle: CloseHandle(hFile); @@ -777,7 +836,8 @@ out: } /* Replacement for POSIX fnmatch() (partial functionality only) */ -extern int fnmatch(const char *pattern, const char *string, int flags) +int +fnmatch(const char *pattern, const char *string, int flags) { if (PathMatchSpecA(string, pattern)) return 0; @@ -785,10 +845,11 @@ extern int fnmatch(const char *pattern, const char *string, int flags) return FNM_NOMATCH; } -static int win32_set_reparse_data(HANDLE h, - u32 reparse_tag, - const struct wim_lookup_table_entry *lte, - const wchar_t *path) +static int +win32_set_reparse_data(HANDLE h, + u32 reparse_tag, + const struct wim_lookup_table_entry *lte, + const wchar_t *path) { int ret; u8 *buf; @@ -812,8 +873,8 @@ static int win32_set_reparse_data(HANDLE h, ret = read_full_wim_resource(lte, buf + 8, 0); if (ret) return ret; - *(u32*)(buf + 0) = reparse_tag; - *(u16*)(buf + 4) = len; + *(u32*)(buf + 0) = cpu_to_le32(reparse_tag); + *(u16*)(buf + 4) = cpu_to_le16(len); *(u16*)(buf + 6) = 0; /* Set the reparse data on the open file using the @@ -852,7 +913,8 @@ static int win32_set_reparse_data(HANDLE h, } -static int win32_extract_chunk(const u8 *buf, size_t len, u64 offset, void *arg) +static int +win32_extract_chunk(const void *buf, size_t len, u64 offset, void *arg) { HANDLE hStream = arg; @@ -870,16 +932,19 @@ static int win32_extract_chunk(const u8 *buf, size_t len, u64 offset, void *arg) return 0; } -static int do_win32_extract_stream(HANDLE hStream, struct wim_lookup_table_entry *lte) +static int +do_win32_extract_stream(HANDLE hStream, struct wim_lookup_table_entry *lte) { return extract_wim_resource(lte, wim_resource_size(lte), win32_extract_chunk, hStream); } -static int win32_extract_stream(const struct wim_inode *inode, - const wchar_t *path, - const wchar_t *stream_name_utf16, - struct wim_lookup_table_entry *lte) +static int +win32_extract_stream(const struct wim_inode *inode, + const wchar_t *path, + const wchar_t *stream_name_utf16, + struct wim_lookup_table_entry *lte, + const struct wim_security_data *security_data) { wchar_t *stream_path; HANDLE h; @@ -887,9 +952,20 @@ static int win32_extract_stream(const struct wim_inode *inode, DWORD err; DWORD creationDisposition = CREATE_ALWAYS; + SECURITY_ATTRIBUTES *secattr; + + if (security_data && inode->i_security_id != -1) { + secattr = alloca(sizeof(*secattr)); + secattr->nLength = sizeof(*secattr); + secattr->lpSecurityDescriptor = security_data->descriptors[inode->i_security_id]; + secattr->bInheritHandle = FALSE; + } else { + secattr = NULL; + } + if (stream_name_utf16) { /* Named stream. Create a buffer that contains the UTF-16LE - * string [./]@path:@stream_name_utf16. This is needed to + * string [.\]@path:@stream_name_utf16. This is needed to * create and open the stream using CreateFileW(). I'm not * aware of any other APIs to do this. Note: the '$DATA' suffix * seems to be unneeded. Additional note: a "./" prefix needs @@ -903,7 +979,11 @@ static int win32_extract_stream(const struct wim_inode *inode, path_nchars = wcslen(path); stream_name_nchars = wcslen(stream_name_utf16); stream_path_nchars = path_nchars + 1 + stream_name_nchars; - if (path[0] != L'/' && path[0] != L'\\') { + if (path[0] != cpu_to_le16(L'\0') && + path[0] != cpu_to_le16(L'/') && + path[0] != cpu_to_le16(L'\\') && + path[1] != cpu_to_le16(L':')) + { prefix = L"./"; stream_path_nchars += 2; } else { @@ -921,7 +1001,7 @@ static int win32_extract_stream(const struct wim_inode *inode, * the call to CreateFileW() will merely open the directory that * was already created rather than creating a new file. */ if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) { - if (!CreateDirectoryW(stream_path, NULL)) { + if (!CreateDirectoryW(stream_path, secattr)) { err = GetLastError(); if (err != ERROR_ALREADY_EXISTS) { ERROR("Failed to create directory \"%ls\"", @@ -942,9 +1022,9 @@ static int win32_extract_stream(const struct wim_inode *inode, DEBUG("Opening \"%ls\"", stream_path); h = CreateFileW(stream_path, - GENERIC_WRITE | WRITE_OWNER | WRITE_DAC | ACCESS_SYSTEM_SECURITY, + GENERIC_WRITE, 0, - NULL, + secattr, creationDisposition, FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS | @@ -1003,32 +1083,36 @@ out: * * Returns 0 on success; nonzero on failure. */ -static int win32_extract_streams(const struct wim_inode *inode, - const wchar_t *path, u64 *completed_bytes_p) +static int +win32_extract_streams(const struct wim_inode *inode, + const wchar_t *path, u64 *completed_bytes_p, + const struct wim_security_data *security_data) { struct wim_lookup_table_entry *unnamed_lte; int ret; unnamed_lte = inode_unnamed_lte_resolved(inode); - ret = win32_extract_stream(inode, path, NULL, unnamed_lte); + ret = win32_extract_stream(inode, path, NULL, unnamed_lte, + security_data); if (ret) goto out; if (unnamed_lte) *completed_bytes_p += wim_resource_size(unnamed_lte); for (u16 i = 0; i < inode->i_num_ads; i++) { const struct wim_ads_entry *ads_entry = &inode->i_ads_entries[i]; - if (ads_entry->stream_name_len != 0) { + if (ads_entry->stream_name_nbytes != 0) { /* Skip special UNIX data entries (see documentation for * WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) */ - if (ads_entry->stream_name_len == WIMLIB_UNIX_DATA_TAG_LEN - && !memcmp(ads_entry->stream_name_utf8, - WIMLIB_UNIX_DATA_TAG, - WIMLIB_UNIX_DATA_TAG_LEN)) + if (ads_entry->stream_name_nbytes == WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES + && !memcmp(ads_entry->stream_name, + WIMLIB_UNIX_DATA_TAG_UTF16LE, + WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES)) continue; ret = win32_extract_stream(inode, path, - (const wchar_t*)ads_entry->stream_name, - ads_entry->lte); + ads_entry->stream_name, + ads_entry->lte, + NULL); if (ret) break; if (ads_entry->lte) @@ -1039,48 +1123,21 @@ out: return ret; } -/* - * Sets the security descriptor on an extracted file. This is Win32-specific - * code. - * - * @inode: The WIM inode that was extracted and has a security descriptor. - * @path: UTF-16LE external path that the inode was extracted to. - * @sd: Security data for the WIM image. - * - * Returns 0 on success; nonzero on failure. - */ -static int win32_set_security_data(const struct wim_inode *inode, - const wchar_t *path, - const struct wim_security_data *sd) -{ - SECURITY_INFORMATION securityInformation = DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION | - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION; - if (!SetFileSecurityW(path, securityInformation, - (PSECURITY_DESCRIPTOR)sd->descriptors[inode->i_security_id])) - { - DWORD err = GetLastError(); - ERROR("Can't set security descriptor on \"%ls\"", path); - win32_error(err); - return WIMLIB_ERR_WRITE; - } - return 0; -} - -int win32_apply_dentry(const char *output_path, - size_t output_path_len, - const struct wim_dentry *dentry, - struct apply_args *args) +/* Extract a file, directory, reparse point, or hard link to an + * already-extracted file using the Win32 API */ +int win32_do_apply_dentry(const mbchar *output_path, + size_t output_path_nbytes, + struct wim_dentry *dentry, + struct apply_args *args) { - char *utf16_path; - size_t utf16_path_len; + wchar_t *utf16le_path; + size_t utf16le_path_nbytes; DWORD err; int ret; struct wim_inode *inode = dentry->d_inode; - ret = utf8_to_utf16(output_path, output_path_len, - &utf16_path, &utf16_path_len); + ret = mbs_to_utf16le(output_path, output_path_nbytes, + &utf16le_path, &utf16le_path_nbytes); if (ret) return ret; @@ -1088,81 +1145,70 @@ int win32_apply_dentry(const char *output_path, /* Linked file, with another name already extracted. Create a * hard link. */ DEBUG("Creating hard link \"%ls => %ls\"", - (const wchar_t*)utf16_path, - (const wchar_t*)inode->i_extracted_file); - if (!CreateHardLinkW((const wchar_t*)utf16_path, - (const wchar_t*)inode->i_extracted_file, - NULL)) + utf16le_path, inode->i_extracted_file); + if (!CreateHardLinkW(utf16le_path, inode->i_extracted_file, NULL)) { err = GetLastError(); ERROR("Can't create hard link \"%ls => %ls\"", - (const wchar_t*)utf16_path, - (const wchar_t*)inode->i_extracted_file); + utf16le_path, inode->i_extracted_file); ret = WIMLIB_ERR_LINK; win32_error(err); } } else { /* Create the file, directory, or reparse point, and extract the * data streams. */ - ret = win32_extract_streams(inode, (const wchar_t*)utf16_path, - &args->progress.extract.completed_bytes); + const struct wim_security_data *security_data; + if (args->extract_flags & WIMLIB_EXTRACT_FLAG_NOACLS) + security_data = NULL; + else + security_data = wim_const_security_data(args->w); + + ret = win32_extract_streams(inode, utf16le_path, + &args->progress.extract.completed_bytes, + security_data); if (ret) goto out_free_utf16_path; - /* Set security descriptor if present */ - if (inode->i_security_id != -1) { - DEBUG("Setting security descriptor %d on %s", - inode->i_security_id, output_path); - ret = win32_set_security_data(inode, - (const wchar_t*)utf16_path, - wim_const_security_data(args->w)); - if (ret) - goto out_free_utf16_path; - } if (inode->i_nlink > 1) { /* Save extracted path for a later call to * CreateHardLinkW() if this inode has multiple links. * */ - inode->i_extracted_file = utf16_path; + inode->i_extracted_file = utf16le_path; goto out; } } out_free_utf16_path: - FREE(utf16_path); + FREE(utf16le_path); out: return ret; } -int win32_apply_dentry_timestamps(const char *output_path, - size_t output_path_len, - const struct wim_dentry *dentry, - const struct apply_args *args) +/* Set timestamps on an extracted file using the Win32 API */ +int +win32_do_apply_dentry_timestamps(const mbchar *output_path, + size_t output_path_nbytes, + const struct wim_dentry *dentry, + const struct apply_args *args) { /* Win32 */ - char *utf16_path; - size_t utf16_path_len; + wchar_t *utf16le_path; + size_t utf16le_path_nbytes; DWORD err; HANDLE h; int ret; const struct wim_inode *inode = dentry->d_inode; - ret = utf8_to_utf16(output_path, output_path_len, - &utf16_path, &utf16_path_len); + ret = mbs_to_utf16le(output_path, output_path_nbytes, + &utf16le_path, &utf16le_path_nbytes); if (ret) return ret; DEBUG("Opening \"%s\" to set timestamps", output_path); - h = CreateFileW((const wchar_t*)utf16_path, - GENERIC_WRITE | WRITE_OWNER | WRITE_DAC | ACCESS_SYSTEM_SECURITY, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, - NULL); + h = win32_open_existing_file(utf16le_path, FILE_WRITE_ATTRIBUTES); if (h == INVALID_HANDLE_VALUE) err = GetLastError(); - FREE(utf16_path); + FREE(utf16le_path); if (h == INVALID_HANDLE_VALUE) goto fail; @@ -1194,28 +1240,39 @@ out: } /* Replacement for POSIX fsync() */ -int fsync(int fd) +int +fsync(int fd) { HANDLE h = (HANDLE)_get_osfhandle(fd); if (h == INVALID_HANDLE_VALUE) { + ERROR("Could not get Windows handle for file descriptor"); + win32_error(GetLastError()); errno = EBADF; return -1; } if (!FlushFileBuffers(h)) { + ERROR("Could not flush file buffers to disk"); + win32_error(GetLastError()); errno = EIO; return -1; } return 0; } -unsigned win32_get_number_of_processors() +/* Use the Win32 API to get the number of processors */ +unsigned +win32_get_number_of_processors() { SYSTEM_INFO sysinfo; GetSystemInfo(&sysinfo); return sysinfo.dwNumberOfProcessors; } -char *realpath(const char *path, char *resolved_path) +/* Replacement for POSIX-2008 realpath(). Warning: partial functionality only + * (resolved_path must be NULL). Also I highly doubt that GetFullPathName + * really does the right thing under all circumstances. */ +mbchar * +realpath(const mbchar *path, mbchar *resolved_path) { DWORD ret; wimlib_assert(resolved_path == NULL); @@ -1224,7 +1281,7 @@ char *realpath(const char *path, char *resolved_path) if (!ret) goto fail_win32; - resolved_path = MALLOC(ret + 1); + resolved_path = MALLOC(ret); if (!resolved_path) goto fail; ret = GetFullPathNameA(path, ret, resolved_path, NULL); @@ -1238,3 +1295,29 @@ fail_win32: fail: return NULL; } + +char * +nl_langinfo(nl_item item) +{ + wimlib_assert(item == CODESET); + static char buf[64]; + strcpy(buf, "Unknown"); + return buf; +} + +/* rename() on Windows fails if the destination file exists. Fix it. */ +int +rename_replacement(const char *oldpath, const char *newpath) +{ + if (MoveFileExA(oldpath, newpath, MOVEFILE_REPLACE_EXISTING)) { + return 0; + } else { + /* As usual, the possible error values are not documented */ + DWORD err = GetLastError(); + ERROR("MoveFileExA(): Can't rename \"%s\" to \"%s\"", + oldpath, newpath); + win32_error(err); + errno = 0; + return -1; + } +}