Extended pyvmdk with disk and extent types

libyal · Sep 24, 2018 · 6a32239 · 6a32239
1 parent 30a73a1
commit 6a32239
Show file tree

Hide file tree

Showing 17 changed files with 1,140 additions and 319 deletions.
diff --git a/include/libvmdk/definitions.h.in b/include/libvmdk/definitions.h.in
@@ -62,7 +62,7 @@ enum LIBVMDK_FILE_TYPES
 
 /* The (virtual) disk types
  */
-enum LIBVMDK_DISK_TYPE
+enum LIBVMDK_DISK_TYPES
 {
 	LIBVMDK_DISK_TYPE_UNDEFINED,
 	LIBVMDK_DISK_TYPE_2GB_EXTENT_FLAT,

diff --git a/libvmdk/libvmdk_definitions.h.in b/libvmdk/libvmdk_definitions.h.in
@@ -75,7 +75,7 @@ enum LIBVMDK_FILE_TYPES
 
 /* The (virtual) disk types
  */
-enum LIBVMDK_DISK_TYPE
+enum LIBVMDK_DISK_TYPES
 {
 	LIBVMDK_DISK_TYPE_UNDEFINED,
 	LIBVMDK_DISK_TYPE_2GB_EXTENT_FLAT,
@@ -126,7 +126,7 @@ enum LIBVMDK_EXTENT_TYPES
 	LIBVMDK_EXTENT_TYPE_ZERO				= 7,
 };
 
-#endif
+#endif /* !defined( HAVE_LOCAL_LIBVMDK ) */
 
 /* The flags
  */
@@ -173,5 +173,5 @@ enum LIBVMDK_MARKERS
 #define LIBVMDK_MAXIMUM_CACHE_ENTRIES_GRAIN_GROUPS		32
 #define LIBVMDK_MAXIMUM_CACHE_ENTRIES_GRAINS			8
 
-#endif
+#endif /* !defined( _LIBVMDK_INTERNAL_DEFINITIONS_H ) */
 
diff --git a/msvscpp/Makefile.am b/msvscpp/Makefile.am
@@ -1,5 +1,4 @@
 MSVSCPP_FILES = \
-	dokan/dokan.vcproj \
 	libbfio/libbfio.vcproj \
 	libcdata/libcdata.vcproj \
 	libcerror/libcerror.vcproj \

diff --git a/msvscpp/dokan/dokan.vcproj b/msvscpp/dokan/dokan.vcproj
diff --git a/msvscpp/libbfio/libbfio.vcproj b/msvscpp/libbfio/libbfio.vcproj
@@ -158,6 +158,10 @@
 				RelativePath="..\..\libbfio\libbfio_file.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libbfio\libbfio_file_io_handle.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libbfio\libbfio_file_pool.c"
 				>
@@ -166,6 +170,10 @@
 				RelativePath="..\..\libbfio\libbfio_file_range.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libbfio\libbfio_file_range_io_handle.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libbfio\libbfio_handle.c"
 				>
@@ -174,6 +182,10 @@
 				RelativePath="..\..\libbfio\libbfio_memory_range.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libbfio\libbfio_memory_range_io_handle.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libbfio\libbfio_pool.c"
 				>
@@ -212,6 +224,10 @@
 				RelativePath="..\..\libbfio\libbfio_file.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libbfio\libbfio_file_io_handle.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libbfio\libbfio_file_pool.h"
 				>
@@ -220,6 +236,10 @@
 				RelativePath="..\..\libbfio\libbfio_file_range.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libbfio\libbfio_file_range_io_handle.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libbfio\libbfio_handle.h"
 				>
@@ -256,6 +276,10 @@
 				RelativePath="..\..\libbfio\libbfio_memory_range.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libbfio\libbfio_memory_range_io_handle.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libbfio\libbfio_pool.h"
 				>