X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex-win32.c;h=a0cbc33dec91fd5d3c648d2ccae3fd16ed3203fd;hp=0fe04399e8fc4b603faad77bb2ca563ede25a733;hb=b348831df3fcf7d8eb66d35e4d0cf8434e788473;hpb=782d531f37b8548e8b28d28bc8e4e07d6be41944

diff --git a/programs/imagex-win32.c b/programs/imagex-win32.c
index 0fe04399..a0cbc33d 100644
--- a/programs/imagex-win32.c
+++ b/programs/imagex-win32.c
@@ -1,21 +1,20 @@
-
-/* Replacements for functions needed specifically by the 'imagex' program in
- * Windows native builds; also, Windows-specific code to acquire and release
- * privileges needed to backup and restore files */
+/* Windows-specific code for wimlib-imagex.  */
 
 #ifndef __WIN32__
 #  error "This file contains Windows code"
 #endif
 
 #include "imagex-win32.h"
-#include <windows.h>
-#include <errno.h>
-#include <string.h>
 #include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <io.h>
 #include <stdio.h>
+#include <string.h>
+#include <windows.h>
 
 /* Replacement for glob() in Windows native builds that operates on wide
- * characters. */
+ * characters.  */
 int
 win32_wglob(const wchar_t *pattern, int flags,
 	    int (*errfunc)(const wchar_t *epath, int eerrno),
@@ -81,7 +80,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,80 +118,7 @@ globfree(glob_t *pglob)
 	free(pglob->gl_pathv);
 }
 
-static bool
-win32_modify_privilege(const wchar_t *privilege, bool enable)
-{
-	HANDLE hToken;
-	LUID luid;
-	TOKEN_PRIVILEGES newState;
-	bool ret = false;
-
-	if (!OpenProcessToken(GetCurrentProcess(),
-			      TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
-			      &hToken))
-		goto out;
-
-	if (!LookupPrivilegeValueW(NULL, privilege, &luid))
-		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);
-	CloseHandle(hToken);
-out:
-	if (!ret) {
-		fwprintf(stderr, L"WARNING: Failed to %ls privilege %s\n",
-			enable ? L"enable" : L"disable", privilege);
-		fwprintf(stderr,
-			L"WARNING: The program will continue, "
-			L"but if permission issues are\n"
-			L"encountered, you may need to run "
-			L"this program as the administrator\n");
-	}
-	return ret;
-}
-
-static void
-win32_modify_capture_privileges(bool enable)
-{
-	win32_modify_privilege(SE_BACKUP_NAME, enable);
-	win32_modify_privilege(SE_SECURITY_NAME, enable);
-}
-
-static void
-win32_modify_restore_privileges(bool enable)
-{
-	win32_modify_privilege(SE_RESTORE_NAME, enable);
-	win32_modify_privilege(SE_SECURITY_NAME, enable);
-	win32_modify_privilege(SE_TAKE_OWNERSHIP_NAME, enable);
-}
-
-void
-win32_acquire_capture_privileges()
-{
-	win32_modify_capture_privileges(true);
-}
-
-void
-win32_release_capture_privileges()
-{
-	win32_modify_capture_privileges(false);
-}
-
-void
-win32_acquire_restore_privileges()
-{
-	win32_modify_restore_privileges(true);
-}
-
-void
-win32_release_restore_privileges()
-{
-	win32_modify_restore_privileges(false);
-}
-
-/* Convert a string from the "current Windows codepage" to UTF-16LE. */
+/* 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,7 +171,7 @@ is_path_separator(wchar_t c)
 }
 
 /* basename() (modifying, trailing-slash stripping version) for wide-character
- * strings. */
+ * strings.  Understands both forward and backward slashes.  */
 wchar_t *
 win32_wbasename(wchar_t *path)
 {
@@ -260,3 +186,8 @@ win32_wbasename(wchar_t *path)
 	return p;
 }
 
+/* Set a file descriptor to binary mode.  */
+void set_fd_to_binary_mode(int fd)
+{
+	_setmode(fd, _O_BINARY);
+}