X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_apply.c;h=b7646651efd5d08040dda18cad4d0e4ed0064e1d;hb=bc935cde42375026594e2bb93443efa635273859;hp=3415753e53f585d348e3ec358070cc06c84618ed;hpb=3ffb2cde078ae8f62d542ab89166e1059c13d758;p=wimlib

diff --git a/src/win32_apply.c b/src/win32_apply.c
index 3415753e..b7646651 100644
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -81,21 +81,63 @@ win32_start_extract(const wchar_t *path, struct apply_ctx *ctx)
 	return 0;
 }
 
+/* Create a normal file, overwriting one already present.  */
 static int
 win32_create_file(const wchar_t *path, struct apply_ctx *ctx, u64 *cookie_ret)
 {
 	HANDLE h;
-
-	h = CreateFile(path, 0, 0, NULL, CREATE_ALWAYS,
-		       FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, NULL);
-	if (h == INVALID_HANDLE_VALUE)
-		goto error;
+	unsigned retry_count = 0;
+	DWORD dwFlagsAndAttributes = FILE_FLAG_BACKUP_SEMANTICS;
+
+retry:
+	/* WRITE_OWNER and WRITE_DAC privileges are required for some reason,
+	 * even through we're creating a new file.  */
+	h = CreateFile(path, WRITE_OWNER | WRITE_DAC, 0, NULL,
+		       CREATE_ALWAYS, dwFlagsAndAttributes, NULL);
+	if (h == INVALID_HANDLE_VALUE) {
+		/* File couldn't be created.  */
+		DWORD err = GetLastError();
+		if (err == ERROR_ACCESS_DENIED && retry_count == 0) {
+
+			/* Access denied error for the first time.  Try
+			 * adjusting file attributes.  */
+
+			/* Get attributes of the existing file.  */
+			DWORD attribs = GetFileAttributes(path);
+			if (attribs != INVALID_FILE_ATTRIBUTES &&
+			    (attribs & (FILE_ATTRIBUTE_HIDDEN |
+					FILE_ATTRIBUTE_SYSTEM |
+					FILE_ATTRIBUTE_READONLY)))
+			{
+				/* If the existing file has
+				 * FILE_ATTRIBUTE_HIDDEN and/or
+				 * FILE_ATTRIBUTE_SYSTEM, they must be set in
+				 * the call to CreateFile().  This is true even
+				 * when FILE_ATTRIBUTE_NORMAL was not specified,
+				 * contrary to the MS "documentation".  */
+				dwFlagsAndAttributes |= (attribs &
+							 (FILE_ATTRIBUTE_HIDDEN |
+							  FILE_ATTRIBUTE_SYSTEM));
+				/* If the existing file has
+				 * FILE_ATTRIBUTE_READONLY, it must be cleared
+				 * before attempting to create a new file over
+				 * it.  This is true even when the process has
+				 * the SE_RESTORE_NAME privilege and requested
+				 * the FILE_FLAG_BACKUP_SEMANTICS flag to
+				 * CreateFile().  */
+				if (attribs & FILE_ATTRIBUTE_READONLY) {
+					SetFileAttributes(path,
+							  attribs & ~FILE_ATTRIBUTE_READONLY);
+				}
+				retry_count++;
+				goto retry;
+			}
+		}
+		set_errno_from_win32_error(err);
+		return WIMLIB_ERR_OPEN;
+	}
 	CloseHandle(h);
 	return 0;
-
-error:
-	set_errno_from_GetLastError();
-	return WIMLIB_ERR_OPEN;
 }
 
 static int
@@ -240,7 +282,7 @@ win32_encrypted_import_cb(unsigned char *data, void *_import_ctx,
 
 	len = min(len, lte->size - import_ctx->offset);
 
-	if (read_partial_wim_resource_into_buf(lte, len, import_ctx->offset, data))
+	if (read_partial_wim_stream_into_buf(lte, len, import_ctx->offset, data))
 		return ERROR_READ_FAULT;
 
 	import_ctx->offset += len;
@@ -498,8 +540,9 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
 	if (func_NtSetSecurityObject) {
 		h = win32_open_existing_file(path, MAXIMUM_ALLOWED);
 		if (h == INVALID_HANDLE_VALUE) {
-			ERROR_WITH_ERRNO("Can't open %ls (%u)", path, GetLastError());
-			goto error;
+			set_errno_from_GetLastError();
+			ERROR_WITH_ERRNO("Can't open %ls", path);
+			return WIMLIB_ERR_SET_SECURITY;
 		}
 	}
 #endif
@@ -507,8 +550,10 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
 	for (;;) {
 		err = do_win32_set_security_descriptor(h, path, info,
 						       (PSECURITY_DESCRIPTOR)desc);
-		if (err == ERROR_SUCCESS)
+		if (err == ERROR_SUCCESS) {
+			ret = 0;
 			break;
+		}
 		if ((err == ERROR_PRIVILEGE_NOT_HELD ||
 		     err == ERROR_ACCESS_DENIED) &&
 		    !(ctx->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS))
@@ -528,23 +573,18 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
 			}
 			ctx->partial_security_descriptors--;
 			ctx->no_security_descriptors++;
+			ret = 0;
 			break;
 		}
-		SetLastError(err);
-		goto error;
+		set_errno_from_win32_error(err);
+		ret = WIMLIB_ERR_SET_SECURITY;
+		break;
 	}
-	ret = 0;
-out_close:
 #ifdef WITH_NTDLL
 	if (func_NtSetSecurityObject)
 		CloseHandle(h);
 #endif
 	return ret;
-
-error:
-	set_errno_from_GetLastError();
-	ret = WIMLIB_ERR_SET_SECURITY;
-	goto out_close;
 }
 
 static int