Changeset 426 for trunk/Include/Classes/System/IO/FileStream.ab

Timestamp:

Feb 26, 2008, 3:33:49 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

StreamReaderの実装開始。
Stringの+演算子で右辺がNullのときに起こるアクセス違反を回避。

File:

• trunk/Include/Classes/System/IO/FileStream.ab (modified) (5 diffs)

trunk/Include/Classes/System/IO/FileStream.ab

@@ -76 +76 @@
 
         op = options As DWord
-        If Not Environment.OSVersion.Platform = PlatformID.Win32NT Then
+'       If (Environment.OSVersion.Platform As DWord) <> (PlatformID.Win32NT As DWord) Then 'ToDo: なぜかアクセス違反になる
             op And= Not FILE_FLAG_OVERLAPPED
-        End If
+'       End If
 
         This.handle=CreateFile(ToTCStr(path),ac,sh,ByVal NULL,mo,op,0)
@@ -305 +305 @@
     End Sub
 
-    Override Function Read( buffer As *Byte, offset As Long, count As Long) As Long
+    Override Function Read(buffer As *Byte, offset As Long, count As Long) As Long
         disposedCheck()
         If buffer = 0 Then
-'           Throw ArgumentNullException("FileStream.Read: An argument is null value.", "buffer")
+            Throw New ArgumentNullException("FileStream.Read: An argument is null value.", "buffer")
         ElseIf Not This.CanRead() Then
-'           Throw NotSupportedException("FileStream.Read: This stream is not readable.")
+            Throw New NotSupportedException("FileStream.Read: This stream is not readable.")
         End If
 
@@ -320 +320 @@
             overlapped.hEvent = CreateEvent(0, TRUE, FALSE, 0)
             If overlapped.hEvent = 0 Then
-'               Throw OutOfMemoryException("FileStream.Read: Failed to create an event object.")
+                Throw New OutOfMemoryException("FileStream.Read: Failed to create an event object.")
             End If
             Try
@@ -327 +327 @@
                     Dim error = GetLastError()
                     If error <> ERROR_IO_PENDING Then
-'                       Detail.ThrowWinIOException("FileStream.Read: Failed to read.", error)
+                        Detail.ThrowWinIOException("FileStream.Read: Failed to read.", error)
                     End If
                 End If
                 ret = GetOverlappedResult(This.handle, overlapped, readBytes, TRUE)
                 If ret = FALSE Then
-'                   Detail.ThrowWinLastErrorIOException("FileStream.Read: Failed to read.")
+                    Detail.ThrowWinLastErrorIOException("FileStream.Read: Failed to read.")
                 End If
                 offset += Read
@@ -341 +341 @@
             ret = ReadFile(This.handle,VarPtr(buffer[offset]),count,VarPtr(readBytes),ByVal NULL)
             If ret = FALSE Then
-'               Detail.ThrowWinLastErrorIOException("FileStream.Read: Failed to read.")
+                Detail.ThrowWinLastErrorIOException("FileStream.Read: Failed to read.")
             End If
         End If