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

Timestamp:

Feb 28, 2008, 1:39:16 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

Consoleをスレッド安全化（クリティカルセクション使用）。
Exception.HResultをPublicにした。
StringBuilder.Replaceが正しく機能しない問題を解消。

Location:

trunk/Include/Classes/System/IO

Files:

• Exception.ab (modified) (2 diffs)
• File.ab (modified) (1 diff)
• FileStream.ab (modified) (2 diffs)
• StreamReader.ab (modified) (1 diff)

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

@@ -64 +64 @@
     */
     Sub ThrowWinIOException(msg As String, error As DWord)
-'       Throw IOException(msg, HRESULT_FROM_WIN32(error))
+        Throw New IOException(msg, HRESULT_FROM_WIN32(error))
     End Sub
 
@@ -74 +74 @@
     */
     Sub ThrowWinLastErrorIOException(msg As String)
-'       Throw IOException(msg, HRESULT_FROM_WIN32(GetLastError()))
+        Throw New IOException(msg, HRESULT_FROM_WIN32(GetLastError()))
     End Sub
 End Namespace

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

@@ -27 +27 @@
 
 Enum FileMode
-    Append = OPEN_ALWAYS
-    Create = CREATE_ALWAYS
-    CreateNew = CREATE_NEW
-    Open = OPEN_EXISTING
-    OpenOrCreate = OPEN_ALWAYS
-    Truncate = TRUNCATE_EXISTING
+    Append = 4 'OPEN_ALWAYS
+    Create = 2 'CREATE_ALWAYS
+    CreateNew = 1 'CREATE_NEW
+    Open = 3 'OPEN_EXISTING
+    OpenOrCreate = 4 'OPEN_ALWAYS
+    Truncate = 5 'TRUNCATE_EXISTING
 End Enum
 

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

@@ -34 +34 @@
     /* コンストラクタ.NETと同じように実装は難しい、一先ず動くものを実装したが変更が必要だと思う */
     Sub FileStream(path As String, mode As FileMode, access As FileAccess, share As FileShare, options As FileOptions)
+        If ActiveBasic.IsNothing(path) Then
+            Throw New ArgumentNullException("path")
+        ElseIf path.Length = 0 Then
+            Throw New ArgumentException
+        End If
+
+
         Dim ac = access As DWord
         Dim sh = share As DWord
@@ -49 +56 @@
         'Throw System.IO.FileNotFoundException 
             This.handle=0
-            Beep(220,500)
+            Detail.ThrowWinLastErrorIOException("Failed to open/create file.")
             Exit Sub
         End If

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

@@ -50 +50 @@
     Override Function Read() As Long
         Read = Peek()
-        cur++
+        If Read <> -1 Then
+            cur++
+        End If
     End Function