From 36c246e92b6bb9037b38a787a8615154c944f00b Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 29 Dec 2015 16:33:23 -0500
Subject: [PATCH] Integrated VHD support into Autopsy

---
 .../src/org/sleuthkit/autopsy/casemodule/Bundle.properties | 2 +-
 .../org/sleuthkit/autopsy/casemodule/GeneralFilter.java    | 2 +-
 Core/src/org/sleuthkit/autopsy/core/Installer.java         | 7 +++++++
 build-windows.xml                                          | 4 +++-
 build.xml                                                  | 1 +
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index 1fda9d37b6..a6420390c7 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -164,7 +164,7 @@ CasePropertiesForm.updateCaseName.confMsg.title=Create directory
 CueBannerPanel.title.text=Open Recent Case
 GeneralFilter.rawImageDesc.text=Raw Images (*.img, *.dd, *.001, *.aa, *.raw, *.bin)
 GeneralFilter.encaseImageDesc.text=Encase Images (*.e01)
-GeneralFilter.virtualMachineImageDesc.text=Virtual Machines (*.vmdk)
+GeneralFilter.virtualMachineImageDesc.text=Virtual Machines (*.vmdk, *.vhd)
 ImageDSProcessor.dsType.text=Image File
 ImageDSProcessor.allDesc.text=All Supported Types
 ImageFilePanel.moduleErr=Module Error
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java
index 235cfd7442..ffe6f26b72 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java
@@ -38,7 +38,7 @@ public class GeneralFilter extends FileFilter {
     public static final String ENCASE_IMAGE_DESC = NbBundle.getMessage(GeneralFilter.class,
             "GeneralFilter.encaseImageDesc.text");
     
-    public static final List<String> VIRTUAL_MACHINE_EXTS = Arrays.asList(new String[]{".vmdk"}); //NON-NLS
+    public static final List<String> VIRTUAL_MACHINE_EXTS = Arrays.asList(new String[]{".vmdk", ".vhd"}); //NON-NLS
     public static final String VIRTUAL_MACHINE_DESC = NbBundle.getMessage(GeneralFilter.class,
             "GeneralFilter.virtualMachineImageDesc.text");    
 
diff --git a/Core/src/org/sleuthkit/autopsy/core/Installer.java b/Core/src/org/sleuthkit/autopsy/core/Installer.java
index c8fbf72861..2c5493d38d 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java
@@ -92,6 +92,13 @@ public class Installer extends ModuleInstall {
             } catch (UnsatisfiedLinkError e) {
                 logger.log(Level.SEVERE, "Error loading VMDK library, ", e); //NON-NLS
             }
+            
+            try {
+                System.loadLibrary("libvhdi"); //NON-NLS
+                logger.log(Level.INFO, "VHDI library loaded"); //NON-NLS
+            } catch (UnsatisfiedLinkError e) {
+                logger.log(Level.SEVERE, "Error loading VHDI library, ", e); //NON-NLS
+            }
 
             /* PostgreSQL */
             try {
diff --git a/build-windows.xml b/build-windows.xml
index 71c6783935..d462070294 100644
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -44,7 +44,8 @@
     <target name="copyWinTskLibs64ToBaseDir" if="win64.TskLib.exists">
         <fileset dir="${win64.TskLib.path}" id="win64dlls">
             <include name="libewf.dll" />
-            <include name="libvmdk.dll"/>            
+            <include name="libvmdk.dll"/> 
+            <include name="libvhdi.dll"/>            
             <include name="zlib.dll"/>
         </fileset>
         
@@ -72,6 +73,7 @@
         <fileset dir="${win32.TskLib.path}" id="win32dlls">
             <include name="zlib.dll" />
             <include name="libvmdk.dll"/>
+            <include name="libvhdi.dll"/> 
             <include name="libewf.dll"/>          
         </fileset>
         
diff --git a/build.xml b/build.xml
index 68d0cc0320..f7e71af51e 100755
--- a/build.xml
+++ b/build.xml
@@ -114,6 +114,7 @@
                 <include name="libtsk_jni.dll" />
                 <include name="libewf.dll" />
                 <include name="libvmdk.dll"/>
+                <include name="libvhdi.dll"/>
                 <include name="zlib.dll" />
                 <include name="libintl-8.dll"/>
                 <include name="ssleay32.dll"/>