Changeset 388 for trunk/Include/Classes/System/IO

Timestamp:

Nov 25, 2007, 4:31:35 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

Stringなどで例外を投げるようにした。
#147の解決。
CType ASCII文字判定関数群の追加。

Location:

trunk/Include/Classes/System/IO

Files:

• FileStream.ab (modified) (12 diffs)
• Path.ab (modified) (3 diffs)
• Stream.ab (modified) (2 diffs)

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

@@ -1 +1 @@
 Namespace System
 Namespace IO
-
 
 /* ほんとはmiscに入れるかかファイルを分けたほうがいいかもしれないが一先ず実装 */
@@ -28 +27 @@
     fileShare As DWord
     fileOptions As DWord
-    fileReadOverlapped As OVERLAPPED
-    fileWriteOverlapped As OVERLAPPED
+    
+    offset As QWord 'オーバーラップドIO用
 
 Public
@@ -108 +107 @@
         This.fileShare = sh
         This.fileOptions = op
+        This.offset = 0
     End Sub
     Sub FileStream(path As String, mode As FileMode, access As FileAccess, share As FileShare)
@@ -133 +133 @@
         This.FileStream(path,mode,access,FileShare.None,FileOptions.None)
     End Sub
-
-    Sub ~FileStream()
-        This.Flush()
-        This.Close()
-    End Sub
-
 Public
     Override Function CanRead() As Boolean
@@ -176 +170 @@
     Function IsAsync() As Boolean
         /* ファイルが非同期操作に対応しているかを返す */
-        If This.fileOptions=FILE_FLAG_OVERLAPPED/*FileOptions.Asynchronous*/ Then
+        If This.fileOptions And FILE_FLAG_OVERLAPPED /*FileOptions.Asynchronous*/ Then
             Return True
         Else
@@ -187 +181 @@
             Dim length As LARGE_INTEGER
             length.LowPart=GetFileSize(This.handle,VarPtr(length.HighPart) As *DWord)
-            Return MAKEQWORD(length.LowPart,length.HighPart)
+            Return MAKEQWORD(length.LowPart,length.HighPart) As Int64
         End If
     End Function
 
     Function Name() As String
-        Return New String(This.filePath)
+        Return This.filePath
     End Function
     
@@ -198 +192 @@
         If This.CanSeek() Then
             If This.IsAsync() Then
-                fileReadOverlapped.Offset=LODWORD(value)
-                fileReadOverlapped.OffsetHigh=HIDWORD(value)
-                fileWriteOverlapped.OffsetHigh=LODWORD(value)
-                fileWriteOverlapped.OffsetHigh=HIDWORD(value)
+                offset = value As QWord
             Else
                 Dim position As LARGE_INTEGER
@@ -213 +204 @@
         If This.CanSeek() Then
             If This.IsAsync() Then
-                Return MAKEQWORD(fileReadOverlapped.Offset,fileReadOverlapped.OffsetHigh)
+                Return offset As Int64
             Else
                 Dim position As LARGE_INTEGER
                 ZeroMemory(VarPtr(position),SizeOf(LARGE_INTEGER))
                 position.LowPart=SetFilePointer(This.handle,position.LowPart,VarPtr(position.HighPart) As *DWord,FILE_CURRENT)
-                Return MAKEQWORD(position.LowPart,position.HighPart)
+                Return MAKEQWORD(position.LowPart,position.HighPart) As Int64
             End If
         End If
@@ -257 +248 @@
     End Function
 
-    Override Sub Close()
-        This.Dispose()
-    End Sub
-
 /*  CreateObjRef*/
     
-    Override Sub Dispose()
+    Override Sub Dispose(disposing As Boolean)
+        Flush()
         CloseHandle(InterlockedExchangePointer(VarPtr(This.handle),NULL))
     End Sub
 
-    Override Function EndRead(ByRef asyncResult As System.IAsyncResult) As Long
-        'TODO
-    End Function
-
-    Override Sub EndWrite(ByRef asyncResult As System.IAsyncResult)
+    Override Function EndRead(asyncResult As System.IAsyncResult) As Long
+        'TODO
+    End Function
+
+    Override Sub EndWrite(asyncResult As System.IAsyncResult)
         'TODO
     End Sub
@@ -298 +286 @@
 
     Sub Lock(position As Int64, length As Int64)
+        If position < 0 Then
+            Throw New ArgumentOutOfRangeException("FileStream.Lock: An argument is negative value.", New System.Int64(position), "position")
+        ElseIf length < 0 Then
+            Throw New ArgumentOutOfRangeException("FileStream.Lock: An argument is negative value.", New System.Int64(length), "length")
+        End If
+        LockFile(handle, LODWORD(position As QWord), HIDWORD(position As QWord),
+            LODWORD(length As QWord), HIDWORD(length As QWord))
     End Sub
 
     Override Function Read( buffer As *Byte, offset As Long, count As Long) As Long
         If This.CanRead() Then
-            Dim ret As DWord
-            If This.IsAsync() Then
-                ReadFile(This.handle,VarPtr(buffer[offset]),count,VarPtr(ret),This.fileReadOverlapped)
-                While This.fileReadOverlapped.Internal=STATUS_PENDING
-                Wend
-                fileReadOverlapped.Offset+=LODWORD(ret)
-                fileReadOverlapped.OffsetHigh+=HIDWORD(ret)
-                fileWriteOverlapped.Offset+=LODWORD(ret)
-                fileWriteOverlapped.OffsetHigh+=HIDWORD(ret)
-                Return ret
-            Else
-                ReadFile(This.handle,VarPtr(buffer[offset]),count,VarPtr(ret),ByVal NULL)
-                Return ret
-            End If
+            Dim readBytes As DWord
+            If This.IsAsync() Then
+                Dim overlapped As OVERLAPPED
+                SetQWord(VarPtr(overlapped.Offset), offset)
+                Dim ret = ReadFile(This.handle, VarPtr(buffer[offset]), count, 0, overlapped)
+                If ret = FALSE Then
+                    If GetLastError() = ERROR_IO_PENDING Then
+                        GetOverlappedResult(This.handle, overlapped, readBytes, TRUE)
+                    End If
+                End If
+                offset += Read
+            Else
+                ReadFile(This.handle,VarPtr(buffer[offset]),count,VarPtr(readBytes),ByVal NULL)
+            End If
+            Read = readBytes As Long
         End If
     End Function
@@ -326 +322 @@
                 Select Case origin
                     Case SeekOrigin.Begin
-                        fileReadOverlapped.Offset=LODWORD(offset)
-                        fileReadOverlapped.OffsetHigh=HIDWORD(offset)
-                        fileWriteOverlapped.OffsetHigh=LODWORD(offset)
-                        fileWriteOverlapped.OffsetHigh=HIDWORD(offset)
+                        This.offset = offset
                     Case SeekOrigin.Current
-                        fileReadOverlapped.Offset+=LODWORD(offset)
-                        fileReadOverlapped.OffsetHigh+=HIDWORD(offset)
-                        fileWriteOverlapped.Offset+=LODWORD(offset)
-                        fileWriteOverlapped.OffsetHigh+=HIDWORD(offset)
+                        This.offset += offset
                     Case SeekOrigin.End
-                        fileReadOverlapped.Offset=LODWORD(This.Length()+offset)
-                        fileReadOverlapped.OffsetHigh=HIDWORD(This.Length()+offset)
-                        fileWriteOverlapped.Offset=LODWORD(This.Length()+offset)
-                        fileWriteOverlapped.OffsetHigh=HIDWORD(This.Length()+offset)
+                        This.offset = This.Length + offset
                 End Select
             Else
@@ -379 +366 @@
 
     Sub Unlock(position As Int64, length As Int64)
-    End Sub
+        If position < 0 Then
+            Throw New ArgumentOutOfRangeException("FileStream.Lock: An argument is negative value.", New System.Int64(position), "position")
+        ElseIf length < 0 Then
+            Throw New ArgumentOutOfRangeException("FileStream.Lock: An argument is negative value.", New System.Int64(length), "length")
+        End If
+        UnlockFile(handle, LODWORD(position As QWord), HIDWORD(position As QWord),
+            LODWORD(length As QWord), HIDWORD(length As QWord))
+    End Sub
+
 
     Override Sub Write(buffer As *Byte, offset As Long, count As Long)
         If This.CanWrite() Then
-            Dim ret As DWord
-            If This.IsAsync() Then
-                WriteFile(This.handle,VarPtr(buffer[offset]),count,VarPtr(ret),This.fileWriteOverlapped)
-                While This.fileReadOverlapped.Internal=STATUS_PENDING
-                Wend
-                This.fileReadOverlapped.Offset+=LODWORD(ret)
-                This.fileReadOverlapped.OffsetHigh+=HIDWORD(ret)
-                This.fileWriteOverlapped.Offset+=LODWORD(ret)
-                This.fileWriteOverlapped.OffsetHigh+=HIDWORD(ret)
-            Else
-                WriteFile(This.handle,VarPtr(buffer[offset]),count,VarPtr(ret),ByVal NULL)
+            Dim writeBytes As DWord
+            If This.IsAsync() Then
+                Dim overlapped As OVERLAPPED
+                SetQWord(VarPtr(overlapped.Offset), offset)
+                Dim ret = WriteFile(This.handle, VarPtr(buffer[offset]), count, 0, overlapped)
+                If ret = FALSE Then
+                    If GetLastError() = ERROR_IO_PENDING Then
+                        GetOverlappedResult(This.handle, overlapped, writeBytes, TRUE)
+                    End If
+                End If
+                offset += writeBytes
+            Else
+                WriteFile(This.handle, VarPtr(buffer[offset]), count, VarPtr(writeBytes), ByVal NULL)
             End If
         End If

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

@@ -10 +10 @@
 Class Path
 Public
-    Static AltDirectorySeparatorChar = &H2F As Char '/
-    Static DirectorySeparatorChar = &H5C As Char    '\
-    Static PathSeparator = &H3B As Char             ';
-    Static VolumeSeparatorChar = &H3A As Char       ':
+    Static AltDirectorySeparatorChar = &H2F As StrChar '/
+    Static DirectorySeparatorChar = &H5C As StrChar    '\
+    Static PathSeparator = &H3B As StrChar             ';
+    Static VolumeSeparatorChar = &H3A As StrChar       ':
 
     Static Function GetFileName(path As String) As String
@@ -121 +121 @@
 
     Static Function Combine(path1 As String, path2 As String) As String
-        If path1.LastIndexOf(Chr$(VolumeSeparatorChar)) And path1.Length = 2 Then
+        If path1.LastIndexOf(VolumeSeparatorChar) And path1.Length = 2 Then
             Return path1 + path2
         End If
 
-        If path1.LastIndexOf(Chr$(DirectorySeparatorChar), ELM(path1.Length), 1) = -1 Then
+        If path1.LastIndexOf(DirectorySeparatorChar, ELM(path1.Length), 1) = -1 Then
             Return path1 + Chr$(DirectorySeparatorChar) + path2
         Else
@@ -133 +133 @@
 
 Private
-    Static Function getExtensionPosition(ByRef path As String) As Long
+    Static Function getExtensionPosition(path As String) As Long
         Dim lastSepPos = getLastSeparatorPosision(path) As Long
-        getExtensionPosition = path.LastIndexOf(".", ELM(path.Length), path.Length - lastSepPos)
+        If lastSepPos = -1 Then 
+            lastSepPos = 0
+        End If
+        getExtensionPosition = path.LastIndexOf(Asc("."), ELM(path.Length), path.Length - lastSepPos)
     End Function
 
-    Static Function getLastSeparatorPosision(ByRef path As String) As Long
-        Dim lastSepPos = path.LastIndexOf(Chr$(DirectorySeparatorChar)) As Long
+    Static Function getLastSeparatorPosision(path As String) As Long
+        Dim lastSepPos = path.LastIndexOf(DirectorySeparatorChar) As Long
         If lastSepPos <> -1 Then Return lastSepPos
 
-        lastSepPos = path.LastIndexOf(Chr$(VolumeSeparatorChar))
+        lastSepPos = path.LastIndexOf(VolumeSeparatorChar)
         Return lastSepPos
     End Function

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

@@ -10 +10 @@
 Public
     Virtual Sub ~Stream()
-        This.Close()
+        This.Dispose(False)
     End Sub
 Public
@@ -49 +49 @@
     End Function
     Virtual Sub Close()
-        This.Dispose()
+        Dispose(True)
     End Sub
+    Virtual Sub Dispose()
+        Dispose(True)
+    End Sub
+    Virtual Sub Dispose(disposing As Boolean):  End Sub
     Virtual Function EndRead(ByRef asyncResult As System.IAsyncResult) As Long: End Function
     Virtual Sub EndWrite(ByRef asyncResult As System.IAsyncResult): End Sub