X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fresource.c;h=db9c635bc4ce4f125ed4281da17cec6b7461be29;hb=53bc442c4f75b792a61edc23970c0e9308f75f5c;hp=e8f1114412b5940b07fe8db69caba304772eb6ae;hpb=e1ec9c16b55adb6947b4d1ff46dc847430db4746;p=wimlib

diff --git a/src/resource.c b/src/resource.c
index e8f11144..db9c635b 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -30,16 +30,20 @@
 #include "xpress.h"
 #include "sha1.h"
 
+#ifdef __WIN32__
+#  include "win32.h"
+#endif
+
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #ifdef WITH_NTFS_3G
-#include <time.h>
-#include <ntfs-3g/attrib.h>
-#include <ntfs-3g/inode.h>
-#include <ntfs-3g/dir.h>
+#  include <time.h>
+#  include <ntfs-3g/attrib.h>
+#  include <ntfs-3g/inode.h>
+#  include <ntfs-3g/dir.h>
 #endif
 
 /*
@@ -279,9 +283,9 @@ static int read_compressed_resource(FILE *fp, u64 resource_compressed_size,
 		bool is_partial_chunk = (partial_chunk_size !=
 						uncompressed_chunk_size);
 
-		DEBUG2("start_offset = %u, end_offset = %u", start_offset,
-					end_offset);
-		DEBUG2("partial_chunk_size = %u", partial_chunk_size);
+		DEBUG2("start_offset = %"PRIu64", end_offset = %"PRIu64"",
+		       start_offset, end_offset);
+		DEBUG2("partial_chunk_size = %"PRIu64"", partial_chunk_size);
 
 		/* This is undocumented, but chunks can be uncompressed.  This
 		 * appears to always be the case when the compressed chunk size
@@ -539,8 +543,8 @@ int read_wim_resource(const struct wim_lookup_table_entry *lte, u8 buf[],
 	case RESOURCE_IN_FILE_ON_DISK:
 		/* The resource is in some file on the external filesystem and
 		 * needs to be read uncompressed */
-		wimlib_assert(lte->file_on_disk);
-		wimlib_assert(&lte->file_on_disk == &lte->staging_file_name);
+		wimlib_assert(lte->file_on_disk != NULL);
+		BUILD_BUG_ON(&lte->file_on_disk != &lte->staging_file_name);
 		/* Use existing file pointer if available; otherwise open one
 		 * temporarily */
 		if (lte->file_on_disk_fp) {
@@ -558,6 +562,13 @@ int read_wim_resource(const struct wim_lookup_table_entry *lte, u8 buf[],
 		if (fp != lte->file_on_disk_fp)
 			fclose(fp);
 		break;
+#ifdef __WIN32__
+	case RESOURCE_WIN32:
+		wimlib_assert(lte->file_on_disk_fp != NULL);
+		ret = win32_read_file(lte->file_on_disk, lte->file_on_disk_fp,
+				      offset, size, buf);
+		break;
+#endif
 	case RESOURCE_IN_ATTACHED_BUFFER:
 		/* The resource is directly attached uncompressed in an
 		 * in-memory buffer. */