X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=df8678904dd6d4573e10883af51bfcfda0a3031f;hb=b87b3beaacd32c045ab77dc56c6b90677d882830;hp=6ebe87313dbdf405ee9764d9fd7f7e26c75acebf;hpb=995b04cd421ff9cdcbfc44acab9c73407a93f74c;p=wimlib

diff --git a/src/wim.c b/src/wim.c
index 6ebe8731..df867890 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -44,9 +44,7 @@
 #include "wimlib/security.h"
 #include "wimlib/wim.h"
 #include "wimlib/xml.h"
-#ifdef __WIN32__
-#  include "wimlib/win32.h" /* for realpath() replacement */
-#endif
+#include "wimlib/win32.h"
 
 /* Information about the available compression types for the WIM format.  */
 static const struct {
@@ -184,12 +182,23 @@ wimlib_create_new_wim(enum wimlib_compression_type ctype, WIMStruct **wim_ret)
 		return WIMLIB_ERR_NOMEM;
 	}
 
-	init_wim_header(&wim->hdr, ctype,
-			wim_default_nonsolid_chunk_size(ctype));
-	wim->compression_type = ctype;
-	wim->out_compression_type = ctype;
+	/* Fill in wim->hdr with default values  */
+	wim->hdr.magic = WIM_MAGIC;
+	wim->hdr.wim_version = WIM_VERSION_DEFAULT;
+	wim->hdr.flags = 0;
+	wim->hdr.chunk_size = 0;
+	generate_guid(wim->hdr.guid);
+	wim->hdr.part_number = 1;
+	wim->hdr.total_parts = 1;
+	wim->hdr.image_count = 0;
+	wim->hdr.boot_idx = 0;
+
+	wim->compression_type = WIMLIB_COMPRESSION_TYPE_NONE;
 	wim->chunk_size = wim->hdr.chunk_size;
-	wim->out_chunk_size = wim->hdr.chunk_size;
+
+	/* Set the output compression type  */
+	wim->out_compression_type = ctype;
+	wim->out_chunk_size = wim_default_nonsolid_chunk_size(ctype);
 
 	*wim_ret = wim;
 	return 0;
@@ -439,7 +448,7 @@ WIMLIBAPI int
 wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info)
 {
 	memset(info, 0, sizeof(struct wimlib_wim_info));
-	memcpy(info->guid, wim->hdr.guid, WIMLIB_GUID_LEN);
+	copy_guid(info->guid, wim->hdr.guid);
 	info->image_count = wim->hdr.image_count;
 	info->boot_index = wim->hdr.boot_idx;
 	info->wim_version = wim->hdr.wim_version;
@@ -485,7 +494,7 @@ wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int whic
 	}
 
 	if (which & WIMLIB_CHANGE_GUID)
-		memcpy(wim->hdr.guid, info->guid, WIM_GUID_LEN);
+		copy_guid(wim->hdr.guid, info->guid);
 
 	if (which & WIMLIB_CHANGE_BOOT_INDEX)
 		wim->hdr.boot_idx = info->boot_index;