X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_common.c;h=b25871a3a316f027089d16bebda4fb8876e1add0;hb=a4123fea556d6c362318212127e25846981ea190;hp=bc75686e8a8498a837c36546aebc8ef005eafe61;hpb=ef4edd92f933f235a4ca106491168f317c764ab8;p=wimlib

diff --git a/src/win32_common.c b/src/win32_common.c
index bc75686e..b25871a3 100644
--- a/src/win32_common.c
+++ b/src/win32_common.c
@@ -62,16 +62,21 @@ out:
 static bool
 win32_modify_capture_privileges(bool enable)
 {
-	return win32_modify_privilege(SE_BACKUP_NAME, enable)
-	    && win32_modify_privilege(SE_SECURITY_NAME, enable);
+	bool ok = true;
+	ok &= win32_modify_privilege(SE_BACKUP_NAME, enable);
+	ok &= win32_modify_privilege(SE_SECURITY_NAME, enable);
+	return ok;
 }
 
 static bool
 win32_modify_apply_privileges(bool enable)
 {
-	return win32_modify_privilege(SE_RESTORE_NAME, enable)
-	    && win32_modify_privilege(SE_SECURITY_NAME, enable)
-	    && win32_modify_privilege(SE_TAKE_OWNERSHIP_NAME, enable);
+	bool ok = true;
+	ok &= win32_modify_privilege(SE_RESTORE_NAME, enable);
+	ok &= win32_modify_privilege(SE_SECURITY_NAME, enable);
+	ok &= win32_modify_privilege(SE_TAKE_OWNERSHIP_NAME, enable);
+	ok &= win32_modify_privilege(SE_MANAGE_VOLUME_NAME, enable);
+	return ok;
 }
 
 static void
@@ -374,6 +379,51 @@ win32_get_drive_path(const wchar_t *file_path, wchar_t drive_path[7])
 	return 0;
 }
 
+/* Try to attach an instance of the Windows Overlay File System Filter Driver to
+ * the specified drive (such as C:)  */
+bool
+win32_try_to_attach_wof(const wchar_t *drive)
+{
+	HMODULE fltlib;
+	bool retval = false;
+
+	/* Use FilterAttach() from Fltlib.dll.  */
+
+	fltlib = LoadLibrary(L"Fltlib.dll");
+
+	if (!fltlib) {
+		WARNING("Failed to load Fltlib.dll");
+		return retval;
+	}
+
+	HRESULT (WINAPI *func_FilterAttach)(LPCWSTR lpFilterName,
+					    LPCWSTR lpVolumeName,
+					    LPCWSTR lpInstanceName,
+					    DWORD dwCreatedInstanceNameLength,
+					    LPWSTR lpCreatedInstanceName);
+
+	func_FilterAttach = (void *)GetProcAddress(fltlib, "FilterAttach");
+
+	if (func_FilterAttach) {
+		HRESULT res;
+
+		res = (*func_FilterAttach)(L"wof", drive, NULL, 0, NULL);
+
+		if (res != S_OK)
+			res = (*func_FilterAttach)(L"wofadk", drive, NULL, 0, NULL);
+
+		if (res == S_OK)
+			retval = true;
+	} else {
+		WARNING("FilterAttach() does not exist in Fltlib.dll");
+	}
+
+	FreeLibrary(fltlib);
+
+	return retval;
+}
+
+
 static void
 windows_msg(u32 code, const wchar_t *format, va_list va,
 	    bool is_ntstatus, bool is_error)
@@ -399,9 +449,11 @@ retry:
 	if (n >= buflen)
 		goto realloc;
 
-	ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-			    NULL,
-			    is_ntstatus ? (*func_RtlNtStatusToDosError)(code) : code,
+	ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
+				FORMAT_MESSAGE_IGNORE_INSERTS |
+				(is_ntstatus ? FORMAT_MESSAGE_FROM_HMODULE : 0),
+			    (is_ntstatus ? ntdll_spec.handle : NULL),
+			    code,
 			    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 			    &buf[n],
 			    buflen - n,