Merge branch with pipable WIM support

[wimlib] / programs / imagex-win32.c

diff --git a/programs/imagex-win32.c b/programs/imagex-win32.c
index 18581ed0d2603bd94442c18d2814372d7008b4cb..e6e751aa303a979c9472dd40a23655936a728540 100644 (file)
--- a/programs/imagex-win32.c
+++ b/programs/imagex-win32.c
@@ -13,8 +13,11 @@
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
+#include <fcntl.h>
+#include <io.h>
 
-/* Replacement for glob() in Windows native builds. */
+/* Replacement for glob() in Windows native builds that operates on wide
+ * characters. */
 int
 win32_wglob(const wchar_t *pattern, int flags,
            int (*errfunc)(const wchar_t *epath, int eerrno),
@@ -80,7 +83,7 @@ win32_wglob(const wchar_t *pattern, int flags,
                size_t filename_len = wcslen(dat.cFileName);
                size_t len_needed = prefix_len + filename_len;
 
-               path = malloc(len_needed + sizeof(wchar_t));
+               path = malloc((len_needed + 1) * sizeof(wchar_t));
                if (!path)
                        goto oom;
 
@@ -119,7 +122,7 @@ globfree(glob_t *pglob)
 }
 
 static bool
-win32_modify_privilege(const char *privilege, bool enable)
+win32_modify_privilege(const wchar_t *privilege, bool enable)
 {
        HANDLE hToken;
        LUID luid;
@@ -129,13 +132,10 @@ win32_modify_privilege(const char *privilege, bool enable)
        if (!OpenProcessToken(GetCurrentProcess(),
                              TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
                              &hToken))
-       {
                goto out;
-       }
 
-       if (!LookupPrivilegeValue(NULL, privilege, &luid)) {
+       if (!LookupPrivilegeValueW(NULL, privilege, &luid))
                goto out;
-       }
 
        newState.PrivilegeCount = 1;
        newState.Privileges[0].Luid = luid;
@@ -171,29 +171,30 @@ win32_modify_restore_privileges(bool enable)
 }
 
 void
-win32_acquire_capture_privileges()
+win32_acquire_capture_privileges(void)
 {
        win32_modify_capture_privileges(true);
 }
 
 void
-win32_release_capture_privileges()
+win32_release_capture_privileges(void)
 {
        win32_modify_capture_privileges(false);
 }
 
 void
-win32_acquire_restore_privileges()
+win32_acquire_restore_privileges(void)
 {
        win32_modify_restore_privileges(true);
 }
 
 void
-win32_release_restore_privileges()
+win32_release_restore_privileges(void)
 {
        win32_modify_restore_privileges(false);
 }
 
+/* Convert a string from the "current Windows codepage" to UTF-16LE. */
 wchar_t *
 win32_mbs_to_wcs(const char *mbs, size_t mbs_nbytes, size_t *num_wchars_ret)
 {
@@ -245,6 +246,8 @@ is_path_separator(wchar_t c)
        return c == L'/' || c == L'\\';
 }
 
+/* basename() (modifying, trailing-slash stripping version) for wide-character
+ * strings. */
 wchar_t *
 win32_wbasename(wchar_t *path)
 {
@@ -259,3 +262,7 @@ win32_wbasename(wchar_t *path)
        return p;
 }
 
+void set_fd_to_binary_mode(int fd)
+{
+       _setmode(fd, _O_BINARY);
+}