X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwin32_apply.c;h=56f82b6bfab953922d7c8b8eb39ba8b7f66d9e28;hb=290ada296b4be9bb48687a8e2bf6222b5c2daad7;hp=9135a7db690839f714d27c7de8db635bde0af7e7;hpb=0cf4f7d1cc404113224c15cc13662acf742f2bf4;p=wimlib

diff --git a/src/win32_apply.c b/src/win32_apply.c
index 9135a7db..56f82b6b 100644
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -402,23 +402,48 @@ win32_extract_stream(const wchar_t *path, const wchar_t *stream_name,
 		       creationDisposition, FILE_FLAG_BACKUP_SEMANTICS |
 					    FILE_FLAG_OPEN_REPARSE_POINT,
 		       NULL);
-	if (h == INVALID_HANDLE_VALUE)
-		goto error;
+	if (h == INVALID_HANDLE_VALUE) {
+		set_errno_from_GetLastError();
+		ret = WIMLIB_ERR_OPEN;
+		goto out;
+	}
 
-	ret = 0;
-	if (!lte)
+	if (!lte) {
+		ret = 0;
 		goto out_close_handle;
+	}
+
+	if (!SetFilePointerEx(h,
+			      (LARGE_INTEGER) { .QuadPart = lte->size},
+			      NULL,
+			      FILE_BEGIN))
+		goto write_error;
+
+	if (!SetEndOfFile(h))
+		goto write_error;
+
+	if (!SetFilePointerEx(h,
+			      (LARGE_INTEGER) { .QuadPart = 0},
+			      NULL,
+			      FILE_BEGIN))
+		goto write_error;
+
 	ret = extract_stream(lte, lte->size, win32_extract_wim_chunk, h);
-out_close_handle:
-	if (!CloseHandle(h))
-		goto error;
-	if (ret && !errno)
-		errno = -1;
-	return ret;
+	goto out_close_handle;
 
-error:
+write_error:
 	set_errno_from_GetLastError();
-	return WIMLIB_ERR_WRITE;
+	ret = WIMLIB_ERR_WRITE;
+
+out_close_handle:
+	if (!CloseHandle(h)) {
+		if (!ret) {
+			set_errno_from_GetLastError();
+			ret = WIMLIB_ERR_WRITE;
+		}
+	}
+out:
+	return ret;
 }
 
 static int