Changeset 82 for Include/Classes/System

Timestamp:

Feb 1, 2007, 7:35:43 PM (18 years ago)

Author:

OverTaker

Message:

KindがUnspecifiedのとき、UTCとLocalの変換ができないバグを修正

File:

• Include/Classes/System/DateTime.ab (modified) (4 diffs)

Include/Classes/System/DateTime.ab

@@ -385 +385 @@
     Static Function FromFileTime(fileTime As FILETIME) As DateTime
         Dim localTime As FILETIME
+        Dim time As SYSTEMTIME
         FileTimeToLocalFileTime(fileTime, localTime)
-        Dim time As SYSTEMTIME
         FileTimeToSystemTime(localTime, time)
+
         Dim date As DateTime(time, Local)
         Return date
@@ -397 +398 @@
             .wYear = Year As Word
             .wMonth = Month As Word
+            .wDayOfWeek = DayOfWeek As Word
             .wDay = Day As Word
             .wHour = Hour As Word
@@ -411 +413 @@
         Dim time As SYSTEMTIME
         FileTimeToSystemTime(fileTime, time)
+
         Dim date As DateTime(time, Utc)
         Return date
@@ -418 +421 @@
         Dim fileTime As FILETIME
         fileTime = ToFileTime()
-        If Kind = 1 Then
-            Dim utcTime As FILETIME
-            LocalFileTimeToFileTime(fileTime, ToFileTimeUtc)'Return
-        Else
-            Return fileTime
+        If Kind = Utc Then
+            ToFileTimeUtc = fileTime
+        Else
+            LocalFileTimeToFileTime(fileTime, ToFileTimeUtc) 'Return
         End If
     End Function
 
     Function ToLocalTime() As DateTime
+        If Kind = Local Then
+            ToLocalTime = This
+        Else
+            ToLocalTime = DateTime.FromFileTime(ToFileTime())
+            ToLocalTime.Kind = Local
+        End If
+    End Function
+
+    Function ToUniversalTime() As DateTime
         If Kind = Utc Then
-            ToLocalTime = DateTime.FromFileTime(ToFileTimeUtc())
-            ToLocalTime.Kind = Local
-        Else
-            ToLocalTime = This
-        End If
-    End Function
-
-    Function ToUniversalTime() As DateTime
-        If Kind = Local Then
+            ToUniversalTime = This
+        Else
             ToUniversalTime = DateTime.FromFileTimeUtc(ToFileTimeUtc())
             ToUniversalTime.Kind = Utc
-        Else
-            ToUniversalTime = This
         End If
     End Function