Char encoding updates and misc. fixes

[wimlib] / src / win32.c

diff --git a/src/win32.c b/src/win32.c
index 2b26e1cdbdebd72fe9b7c72475fad79d2b98245f..dfa92ffd01169c6b86a18ddd919f4be696be810e 100644 (file)
--- a/src/win32.c
+++ b/src/win32.c
@@ -31,7 +31,7 @@
 #include <windows.h>
 #include <ntdef.h>
 #include <wchar.h>
-#include <shlwapi.h> /* shlwapi.h for PathMatchSpecA() */
+#include <shlwapi.h> /* shlwapi.h for PathMatchSpecW() */
 #ifdef ERROR /* windows.h defines this */
 #  undef ERROR
 #endif
@@ -70,7 +70,7 @@ win32_global_init()
 
        if (hKernel32 == NULL) {
                DEBUG("Loading Kernel32.dll");
-               hKernel32 = LoadLibraryA("Kernel32.dll");
+               hKernel32 = LoadLibraryW(L"Kernel32.dll");
                if (hKernel32 == NULL) {
                        err = GetLastError();
                        WARNING("Can't load Kernel32.dll");
@@ -329,7 +329,7 @@ win32_recurse_directory(struct wim_dentry *root,
        } while (FindNextFileW(hFind, &dat));
        err = GetLastError();
        if (err != ERROR_NO_MORE_FILES) {
-               ERROR("Failed to read directory \"%s\"", dir_path);
+               ERROR("Failed to read directory \"%ls\"", dir_path);
                win32_error(err);
                if (ret == 0)
                        ret = WIMLIB_ERR_READ;
@@ -818,7 +818,7 @@ win32_build_dentry_tree(struct wim_dentry **root_ret,
        size_t path_nchars;
        wchar_t *path;
        int ret;
-       
+
        path_nchars = wcslen(root_disk_path);
        if (path_nchars > 32767)
                return WIMLIB_ERR_INVALID_PARAM;
@@ -831,6 +831,8 @@ win32_build_dentry_tree(struct wim_dentry **root_ret,
        if (!path)
                return WIMLIB_ERR_NOMEM;
 
+       wmemcpy(path, root_disk_path, path_nchars + 1);
+
        ret = win32_build_dentry_tree_recursive(root_ret,
                                                path,
                                                path_nchars,
@@ -1189,7 +1191,6 @@ win32_do_apply_dentry_timestamps(const wchar_t *path,
 {
        DWORD err;
        HANDLE h;
-       int ret;
        const struct wim_inode *inode = dentry->d_inode;
 
        DEBUG("Opening \"%ls\" to set timestamps", path);