Fixed timezone shifting

Author: bastianeicher

ICSharpCode.SharpZipLib/Zip/ZipEntry.cs

@@ -1058,7 +1058,7 @@ internal void ProcessExtraData(bool localHeader)
 							long lastAccess = extraData.ReadLong();
 							long createTime = extraData.ReadLong();
 
-							DateTime = System.DateTime.FromFileTime(lastModification);
+							DateTime = System.DateTime.FromFileTimeUtc(lastModification);
 						}
 						break;
 					} else {
@@ -1075,8 +1075,8 @@ internal void ProcessExtraData(bool localHeader)
 				if (((flags & 1) != 0) && (length >= 5)) {
 					int iTime = extraData.ReadInt();
 
-					DateTime = (new System.DateTime(1970, 1, 1, 0, 0, 0).ToUniversalTime() +
-						new TimeSpan(0, 0, 0, iTime, 0)).ToLocalTime();
+					DateTime = (new System.DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc ) +
+						new TimeSpan(0, 0, 0, iTime, 0));
 				}
 			}
 			if (method == CompressionMethod.WinZipAES) {

ICSharpCode.SharpZipLib/Zip/ZipExtraData.cs

@@ -193,22 +193,22 @@ public void SetData(byte[] data, int index, int count)
 				if (((_flags & Flags.ModificationTime) != 0) && (count >= 5)) {
 					int iTime = helperStream.ReadLEInt();
 
-					_modificationTime = (new DateTime(1970, 1, 1, 0, 0, 0).ToUniversalTime() +
-						new TimeSpan(0, 0, 0, iTime, 0)).ToLocalTime();
+					_modificationTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc) +
+						new TimeSpan(0, 0, 0, iTime, 0);
 				}
 
 				if ((_flags & Flags.AccessTime) != 0) {
 					int iTime = helperStream.ReadLEInt();
 
-					_lastAccessTime = (new DateTime(1970, 1, 1, 0, 0, 0).ToUniversalTime() +
-						new TimeSpan(0, 0, 0, iTime, 0)).ToLocalTime();
+					_lastAccessTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc) +
+						new TimeSpan(0, 0, 0, iTime, 0);
 				}
 
 				if ((_flags & Flags.CreateTime) != 0) {
 					int iTime = helperStream.ReadLEInt();
 
-					_createTime = (new DateTime(1970, 1, 1, 0, 0, 0).ToUniversalTime() +
-						new TimeSpan(0, 0, 0, iTime, 0)).ToLocalTime();
+					_createTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc) +
+						new TimeSpan(0, 0, 0, iTime, 0);
 				}
 			}
 		}
@@ -224,17 +224,17 @@ public byte[] GetData()
 				helperStream.IsStreamOwner = false;
 				helperStream.WriteByte((byte)_flags);     // Flags
 				if ((_flags & Flags.ModificationTime) != 0) {
-					TimeSpan span = _modificationTime.ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0).ToUniversalTime();
+					TimeSpan span = _modificationTime - new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
 					var seconds = (int)span.TotalSeconds;
 					helperStream.WriteLEInt(seconds);
 				}
 				if ((_flags & Flags.AccessTime) != 0) {
-					TimeSpan span = _lastAccessTime.ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0).ToUniversalTime();
+					TimeSpan span = _lastAccessTime - new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
 					var seconds = (int)span.TotalSeconds;
 					helperStream.WriteLEInt(seconds);
 				}
 				if ((_flags & Flags.CreateTime) != 0) {
-					TimeSpan span = _createTime.ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0).ToUniversalTime();
+					TimeSpan span = _createTime - new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
 					var seconds = (int)span.TotalSeconds;
 					helperStream.WriteLEInt(seconds);
 				}
@@ -365,13 +365,13 @@ public void SetData(byte[] data, int index, int count)
 					if (ntfsTag == 1) {
 						if (ntfsLength >= 24) {
 							long lastModificationTicks = helperStream.ReadLELong();
-							_lastModificationTime = DateTime.FromFileTime(lastModificationTicks);
+							_lastModificationTime = DateTime.FromFileTimeUtc(lastModificationTicks);
 
 							long lastAccessTicks = helperStream.ReadLELong();
-							_lastAccessTime = DateTime.FromFileTime(lastAccessTicks);
+							_lastAccessTime = DateTime.FromFileTimeUtc(lastAccessTicks);
 
 							long createTimeTicks = helperStream.ReadLELong();
-							_createTime = DateTime.FromFileTime(createTimeTicks);
+							_createTime = DateTime.FromFileTimeUtc(createTimeTicks);
 						}
 						break;
 					} else {
@@ -394,9 +394,9 @@ public byte[] GetData()
 				helperStream.WriteLEInt(0);       // Reserved
 				helperStream.WriteLEShort(1);     // Tag
 				helperStream.WriteLEShort(24);    // Length = 3 x 8.
-				helperStream.WriteLELong(_lastModificationTime.ToFileTime());
-				helperStream.WriteLELong(_lastAccessTime.ToFileTime());
-				helperStream.WriteLELong(_createTime.ToFileTime());
+				helperStream.WriteLELong(_lastModificationTime.ToFileTimeUtc());
+				helperStream.WriteLELong(_lastAccessTime.ToFileTimeUtc());
+				helperStream.WriteLELong(_createTime.ToFileTimeUtc());
 				return ms.ToArray();
 			}
 		}
@@ -469,9 +469,9 @@ public DateTime LastAccessTime
 		}
 
 		#region Instance Fields
-		DateTime _lastAccessTime = DateTime.FromFileTime(0);
-		DateTime _lastModificationTime = DateTime.FromFileTime(0);
-		DateTime _createTime = DateTime.FromFileTime(0);
+		DateTime _lastAccessTime = DateTime.FromFileTimeUtc(0);
+		DateTime _lastModificationTime = DateTime.FromFileTimeUtc(0);
+		DateTime _createTime = DateTime.FromFileTimeUtc(0);
 		#endregion
 	}