X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwimboot.c;h=67798da3fd02f0deefc8591fd915f98509246a67;hb=8df639463ae0c754d2b1af3d6c1d22e59ee3ccf8;hp=351c8e67a016be2dad1cd25d905c96ceadf94783;hpb=be5acf31aa8292dcd4a2829492faefb0b200d28f;p=wimlib

diff --git a/src/wimboot.c b/src/wimboot.c
index 351c8e67..67798da3 100644
--- a/src/wimboot.c
+++ b/src/wimboot.c
@@ -37,6 +37,7 @@
 
 #include "wimlib/assert.h"
 #include "wimlib/blob_table.h"
+#include "wimlib/inode.h"
 #include "wimlib/error.h"
 #include "wimlib/util.h"
 #include "wimlib/wimboot.h"
@@ -346,7 +347,7 @@ static u8 *
 fill_in_wimoverlay_dat(u8 *buf,
 		       const struct WimOverlay_dat_header *old_hdr,
 		       const wchar_t *wim_path,
-		       const u8 wim_guid[WIM_GUID_LEN],
+		       const u8 wim_guid[GUID_SIZE],
 		       int image,
 		       u64 new_data_source_id,
 		       const PARTITION_INFORMATION_EX *part_info,
@@ -394,8 +395,8 @@ fill_in_wimoverlay_dat(u8 *buf,
 	new_entry_1->entry_2_length = new_entry_2_size;
 	new_entry_1->wim_type = WIM_BOOT_NOT_OS_WIM;
 	new_entry_1->wim_index = image;
-	BUILD_BUG_ON(sizeof(new_entry_1->guid) != WIM_GUID_LEN);
-	memcpy(new_entry_1->guid, wim_guid, WIM_GUID_LEN);
+	BUILD_BUG_ON(sizeof(new_entry_1->guid) != GUID_SIZE);
+	copy_guid(new_entry_1->guid, wim_guid);
 
 	p += sizeof(struct WimOverlay_dat_entry_1);
 
@@ -491,7 +492,7 @@ fill_in_wimoverlay_dat(u8 *buf,
 static int
 prepare_wimoverlay_dat(const struct WimOverlay_dat_header *old_hdr,
 		       const wchar_t *wim_path,
-		       const u8 wim_guid[WIM_GUID_LEN],
+		       const u8 wim_guid[GUID_SIZE],
 		       int image,
 		       void **new_contents_ret,
 		       u32 *new_contents_size_ret,
@@ -790,7 +791,7 @@ out_free_contents:
  */
 static int
 update_wimoverlay_manually(const wchar_t *drive, const wchar_t *wim_path,
-			   const u8 wim_guid[WIM_GUID_LEN],
+			   const u8 wim_guid[GUID_SIZE],
 			   int image, u64 *data_source_id_ret)
 {
 	wchar_t path_main[] = L"A:\\System Volume Information\\WimOverlay.dat";
@@ -926,7 +927,7 @@ try_to_attach_wof(const wchar_t *drive)
  */
 int
 wimboot_alloc_data_source_id(const wchar_t *wim_path,
-			     const u8 wim_guid[WIM_GUID_LEN],
+			     const u8 wim_guid[GUID_SIZE],
 			     int image, const wchar_t *target,
 			     u64 *data_source_id_ret, bool *wof_running_ret)
 {
@@ -1138,7 +1139,7 @@ wimboot_set_pointer(HANDLE h,
 			     sizeof(struct wof_external_info) +
 			     sizeof(struct wim_provider_rpdata));
 
-		in.hdr.rptag = WIMLIB_REPARSE_TAG_WOF;
+		in.hdr.rptag = WIM_IO_REPARSE_TAG_WOF;
 		in.hdr.rpdatalen = sizeof(in) - sizeof(in.hdr);
 		in.hdr.rpreserved = 0;