Explorar o código

Clarify: TSetupFileLocationEntry.SourceTimeStamp doesn't necessarily come from the source, so just TimeStamp is a better name. Luckily the manifest header already had this right.

Martijn Laan hai 2 meses
pai
achega
51ea4eff4e

+ 7 - 7
Projects/Src/Compiler.SetupCompiler.pas

@@ -7471,17 +7471,17 @@ var
               ['CompressFiles: GetFileTime', ErrorCode, Win32ErrorString(ErrorCode)]);
           end;
           if TimeStampsInUTC then begin
-            FL.SourceTimeStamp := FT;
+            FL.TimeStamp := FT;
             Include(FL.Flags, floTimeStampInUTC);
           end
           else
-            FileTimeToLocalFileTime(FT, FL.SourceTimeStamp);
+            FileTimeToLocalFileTime(FT, FL.TimeStamp);
           if floApplyTouchDateTime in FLExtraInfo.Flags then
-            ApplyTouchDateTime(FL.SourceTimeStamp);
+            ApplyTouchDateTime(FL.TimeStamp);
           if TimeStampRounding > 0 then begin
-            var SourceTimeStamp := Int64(FL.SourceTimeStamp);
-            Dec(SourceTimeStamp, SourceTimeStamp mod (TimeStampRounding * 10000000));
-            FL.SourceTimeStamp := TFileTime(SourceTimeStamp);
+            var TimeStamp := Int64(FL.TimeStamp);
+            Dec(TimeStamp, TimeStamp mod (TimeStampRounding * 10000000));
+            FL.TimeStamp := TFileTime(TimeStamp);
           end;
 
           if ChunkCompressed and IsX86OrX64Executable(SourceFile) then
@@ -7814,7 +7814,7 @@ var
         FL := FileLocationEntries[I];
         FLExtraInfo := FileLocationEntryExtraInfos[I];
         S := IntToStr(I) + #9 + FileLocationEntryFilenames[I] + #9 +
-          FileTimeToString(FL.SourceTimeStamp, floTimeStampInUTC in FL.Flags) + #9;
+          FileTimeToString(FL.TimeStamp, floTimeStampInUTC in FL.Flags) + #9;
         if floVersionInfoValid in FL.Flags then
           S := S + Format('%u.%u.%u.%u', [FL.FileVersionMS shr 16,
             FL.FileVersionMS and $FFFF, FL.FileVersionLS shr 16,

+ 2 - 2
Projects/Src/Setup.ExtractFileFunc.pas

@@ -46,9 +46,9 @@ begin
         not (foDontVerifyChecksum in CurFile^.Options));
 
       if floTimeStampInUTC in CurFileLocation^.Flags then
-        CurFileDate := CurFileLocation^.SourceTimeStamp
+        CurFileDate := CurFileLocation^.TimeStamp
       else
-        LocalFileTimeToFileTime(CurFileLocation^.SourceTimeStamp, CurFileDate);
+        LocalFileTimeToFileTime(CurFileLocation^.TimeStamp, CurFileDate);
       SetFileTime(DestF.Handle, nil, nil, @CurFileDate);
     finally
       DestF.Free;

+ 2 - 2
Projects/Src/Setup.Install.pas

@@ -794,9 +794,9 @@ Retry:
       var CurFileDateDidRead := True; { Set to False later if needed }
       if Assigned(CurFileLocation) then begin
         if floTimeStampInUTC in CurFileLocation^.Flags then
-          CurFileDate := CurFileLocation^.SourceTimeStamp
+          CurFileDate := CurFileLocation^.TimeStamp
         else
-          LocalFileTimeToFileTime(CurFileLocation^.SourceTimeStamp, CurFileDate);
+          LocalFileTimeToFileTime(CurFileLocation^.TimeStamp, CurFileDate);
         CurFileDateValid := True;
       end else if Assigned(AExternalFileDate) then begin
         CurFileDate := AExternalFileDate^;

+ 1 - 1
Projects/Src/Shared.Struct.pas

@@ -280,7 +280,7 @@ type
     OriginalSize: Int64;
     ChunkCompressedSize: Int64;
     SHA256Sum: TSHA256Digest;
-    SourceTimeStamp: TFileTime;
+    TimeStamp: TFileTime;
     FileVersionMS, FileVersionLS: DWORD;
     Flags: set of (floVersionInfoValid, floTimeStampInUTC, floCallInstructionOptimized,
       floChunkEncrypted, floChunkCompressed);