[iso] add timestamp preservation

* Enabled through the Alt-T cheat mode
* Closes #389

res/localization/rufus.loc

@@ -515,6 +515,7 @@ t MSG_265 "VMWare disk detection"
 t MSG_266 "Dual UEFI/BIOS mode"
 t MSG_267 "Applying Windows image: %0.1f%% completed"
 t MSG_268 "Applying Windows image..."
+t MSG_269 "Preserve timestamps"
 
 ################################################################################
 ############################# TRANSLATOR END COPY ##############################

src/iso.c

@@ -60,7 +60,7 @@ typedef struct {
 
 RUFUS_ISO_REPORT iso_report;
 int64_t iso_blocking_status = -1;
-BOOL enable_iso = TRUE, enable_joliet = TRUE, enable_rockridge = TRUE, has_ldlinux_c32;
+BOOL enable_iso = TRUE, enable_joliet = TRUE, enable_rockridge = TRUE, preserve_timestamps = FALSE, has_ldlinux_c32;
 #define ISO_BLOCKING(x) do {x; iso_blocking_status++; } while(0)
 static const char* psz_extract_dir;
 static const char* bootmgr_efi_name = "bootmgr.efi";
@@ -306,6 +306,31 @@ static void print_extracted_file(char* psz_fullpath, int64_t i_file_length)
 	psz_fullpath[nul_pos] = 0;
 }
 
+// Convert from time_t to FILETIME
+// Uses 3 static entries so that we can convert 3 concurrent values at the same time
+static LPFILETIME __inline to_filetime(time_t t)
+{
+	static int i = 0;
+	static FILETIME ft[3], *r;
+	LONGLONG ll = Int32x32To64(t, 10000000) + 116444736000000000;
+
+	r = &ft[i];
+	r->dwLowDateTime = (DWORD)ll;
+	r->dwHighDateTime = (DWORD)(ll >> 32);
+	i = (i + 1) % ARRAYSIZE(ft);
+	return r;
+}
+
+// Helper function to restore the timestamp on a directory
+static void __inline set_directory_timestamp(char* path, LPFILETIME creation, LPFILETIME last_access, LPFILETIME modify)
+{
+	HANDLE dir_handle = CreateFileU(path, GENERIC_READ | GENERIC_WRITE,
+		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+	if ((dir_handle == INVALID_HANDLE_VALUE) || (!SetFileTime(dir_handle, creation, last_access, modify)))
+		uprintf("  Could not set timestamp for directory '%s': %s", path, WindowsErrorString());
+	safe_closehandle(dir_handle);
+}
+
 // Returns 0 on success, nonzero on error
 static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const char *psz_path)
 {
@@ -343,6 +368,10 @@ static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const cha
 			if (!scan_only) {
 				psz_sanpath = sanitize_filename(psz_fullpath, &is_identical);
 				IGNORE_RETVAL(_mkdirU(psz_sanpath));
+				if (preserve_timestamps) {
+					set_directory_timestamp(psz_sanpath, to_filetime(udf_get_attribute_time(p_udf_dirent)),
+						to_filetime(udf_get_access_time(p_udf_dirent)), to_filetime(udf_get_modification_time(p_udf_dirent)));
+				}
 				safe_free(psz_sanpath);
 			}
 			p_udf_dirent2 = udf_opendir(p_udf_dirent);
@@ -405,6 +434,10 @@ static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const cha
 				if (nb_blocks++ % PROGRESS_THRESHOLD == 0)
 					UpdateProgress(OP_DOS, 100.0f*nb_blocks/total_blocks);
 			}
+			if ((preserve_timestamps) && (!SetFileTime(file_handle, to_filetime(udf_get_attribute_time(p_udf_dirent)),
+				to_filetime(udf_get_access_time(p_udf_dirent)), to_filetime(udf_get_modification_time(p_udf_dirent)))))
+				uprintf("  Could not set timestamp: %s", WindowsErrorString());
+
 			// If you have a fast USB 3.0 device, the default Windows buffering does an
 			// excellent job at compensating for our small blocks read/writes to max out the
 			// device's bandwidth.
@@ -486,6 +519,10 @@ static int iso_extract_files(iso9660_t* p_iso, const char *psz_path)
 			if (!scan_only) {
 				psz_sanpath = sanitize_filename(psz_fullpath, &is_identical);
 				IGNORE_RETVAL(_mkdirU(psz_sanpath));
+				if (preserve_timestamps) {
+					LPFILETIME ft = to_filetime(mktime(&p_statbuf->tm));
+					set_directory_timestamp(psz_sanpath, ft, ft, ft);
+				}
 				safe_free(psz_sanpath);
 			}
 			if (iso_extract_files(p_iso, psz_iso_name))
@@ -550,6 +587,11 @@ static int iso_extract_files(iso9660_t* p_iso, const char *psz_path)
 				if (nb_blocks++ % PROGRESS_THRESHOLD == 0)
 					UpdateProgress(OP_DOS, 100.0f*nb_blocks/total_blocks);
 			}
+			if (preserve_timestamps) {
+				LPFILETIME ft = to_filetime(mktime(&p_statbuf->tm));
+				if (!SetFileTime(file_handle, ft, ft, ft))
+					uprintf("  Could not set timestamp: %s", WindowsErrorString());
+			}
 			ISO_BLOCKING(safe_closehandle(file_handle));
 			if (props.is_syslinux_cfg || props.is_grub_cfg)
 				fix_config(psz_sanpath, psz_path, psz_basename, &props);

src/rufus.c

@@ -103,7 +103,7 @@ static BOOL log_displayed = FALSE;
 static BOOL iso_provided = FALSE;
 static BOOL user_notified = FALSE;
 static BOOL relaunch = FALSE;
-extern BOOL force_large_fat32, enable_iso, enable_joliet, enable_rockridge, enable_ntfs_compression;
+extern BOOL force_large_fat32, enable_iso, enable_joliet, enable_rockridge, enable_ntfs_compression, preserve_timestamps;
 extern uint8_t* grub2_buf;
 extern long grub2_len;
 extern const char* old_c32_name[NB_OLD_C32];
@@ -2920,6 +2920,12 @@ relaunch:
 			GetUSBDevices(0);
 			continue;
 		}
+		// Alt-T => Preserve timestamps when extracting ISO files
+		if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'T')) {
+			preserve_timestamps = !preserve_timestamps;
+			PrintStatus2000(lmprintf(MSG_269), preserve_timestamps);
+			continue;
+		}
 		// Alt-U => Use PROPER size units, instead of this whole Kibi/Gibi nonsense
 		if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'U')) {
 			use_fake_units = !use_fake_units;

src/rufus.rc

@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.3.680"
+CAPTION "Rufus 2.3.681"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -157,7 +157,7 @@ END
 
 IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.3.680"
+CAPTION "Rufus 2.3.681"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -283,7 +283,7 @@ END
 IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 2.3.680"
+CAPTION "Rufus 2.3.681"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -415,7 +415,7 @@ END
 IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 2.3.680"
+CAPTION "Rufus 2.3.681"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -671,8 +671,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,680,0
+ FILEVERSION 2,3,681,0
- PRODUCTVERSION 2,3,680,0
+ PRODUCTVERSION 2,3,681,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -689,13 +689,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.3.680"
+            VALUE "FileVersion", "2.3.681"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.3.680"
+            VALUE "ProductVersion", "2.3.681"
         END
     END
     BLOCK "VarFileInfo"