From 4f2a1e433bdea48f9f3a495c49f6d2736424178c Mon Sep 17 00:00:00 2001
From: Christophe Grenier <grenier@cgsecurity.org>
Date: Sat, 11 Sep 2010 17:58:22 +0200
Subject: [PATCH] Fix for x86_64-pc-mingw32

---
 compile.sh     | 8 +++++---
 src/file_jpg.c | 6 ++++++
 src/suspend.c  | 6 ++++++
 win/readme.txt | 6 +++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/compile.sh b/compile.sh
index 246a63f3..2c05e1e3 100755
--- a/compile.sh
+++ b/compile.sh
@@ -5,8 +5,8 @@
 VER_E2FSPROGS=
 VER_PROGSREISERFS=0.3.1-rc8
 VER_NTFSPROGS=2.0.0
-#VER_LIBEWF=20080501
-VER_LIBEWF=20090510
+#VER_LIBEWF=20090510
+VER_LIBEWF=20100226
 crosscompile_target=
 prefix=/usr/
 if [ "$CC" = "gcc295" ];
@@ -237,6 +237,9 @@ then
           i386-mingw32)
 		$confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-iconv --enable-missing-uuid-ok
                 ;;
+	  i686-pc-mingw32|x86_64-pc-mingw32)
+		$confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --enable-missing-uuid-ok
+                ;;
 	  arm-marvell-linux-gnu)
 		$confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-ewf --without-ntfs
                 ;;
@@ -253,4 +256,3 @@ then
 	cd $pwd_saved
   fi
 fi
-
diff --git a/src/file_jpg.c b/src/file_jpg.c
index fedf2d67..3cb312fc 100644
--- a/src/file_jpg.c
+++ b/src/file_jpg.c
@@ -39,6 +39,12 @@
 #include <setjmp.h>
 #endif
 #ifdef HAVE_JPEGLIB_H
+#ifdef __MINGW32__
+#ifndef HAVE_BOOLEAN
+#define HAVE_BOOLEAN
+typedef int boolean;
+#endif
+#endif
 #include <jpeglib.h>
 #include "suspend.h"
 #endif
diff --git a/src/suspend.c b/src/suspend.c
index 5a6bda16..5bc6d0a0 100644
--- a/src/suspend.c
+++ b/src/suspend.c
@@ -42,6 +42,12 @@
 
 #define AM_MEMORY_MANAGER	/* we define jvirt_Xarray_control structs */
 #ifdef HAVE_JPEGLIB_H
+#ifdef __MINGW32__
+#ifndef HAVE_BOOLEAN
+#define HAVE_BOOLEAN
+typedef int boolean;
+#endif
+#endif
 #include <jpeglib.h>
 #endif
 #include "types.h"
diff --git a/win/readme.txt b/win/readme.txt
index 09dd2a30..066dd846 100644
--- a/win/readme.txt
+++ b/win/readme.txt
@@ -6,12 +6,16 @@ The Windows version of TestDisk & PhotoRec should work under
 - Windows Vista
 - Windows Server 2008
 - Windows 7
+On Windows 64-bit, WoW64 (Windows 32-bit On Windows 64-bit) is required to run
+these 32-bit executables.
+For Windows 64-bit without WoW64, use the Windows 64-bit version of TestDisk
+& PhotoRec.
 
 If you are using an older version of Windows, run the DOS version of TestDisk.
 You can download it from http://www.cgsecurity.org/wiki/TestDisk_Download
 
 TestDisk doesn't need to be installed, you only need to
-- extract the directory "win" and its subdirectory "win\c"
+- extract the files
 - run testdisk_win.exe or photorec_win.exe
 
 TestDisk & PhotoRec documentation can be found online: