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

Timestamp:

Feb 27, 2008, 1:04:59 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

StreamReaderの完成。StringReaderの追加。
Consoleの追加（現在入力関係の一部のみ）。

File:

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

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

@@ -27 +27 @@
     fileShare As DWord
     fileOptions As DWord
+    ownsHandle As Boolean
     
     offset As QWord 'オーバーラップドIO用
@@ -33 +34 @@
     /* コンストラクタ.NETと同じように実装は難しい、一先ず動くものを実装したが変更が必要だと思う */
     Sub FileStream(path As String, mode As FileMode, access As FileAccess, share As FileShare, options As FileOptions)
-        Dim ac As DWord
-        Dim mo As DWord
-        Dim sh As DWord
-        Dim op As DWord
-
-        Select Case access
-            Case FileAccess.Read
-                ac=GENERIC_READ
-            Case FileAccess.ReadWrite
-                ac=GENERIC_READ or GENERIC_WRITE
-            Case FileAccess.Write
-                ac=GENERIC_WRITE
-        End Select
-
-        Select Case share
-            Case FileShare.DeleteFile
-                sh=FILE_SHARE_DELETE
-            Case FileShare.None
-                sh=0
-            Case FileShare.Read
-                sh=FILE_SHARE_READ
-            Case FileShare.ReadWrite
-                sh=FILE_SHARE_READ or FILE_SHARE_WRITE
-            Case FileShare.Write
-                sh=FILE_SHARE_WRITE
-        End Select
-
-        Select Case mode
-            Case FileMode.Append
-                mo=OPEN_ALWAYS
-            Case FileMode.Create
-                mo=CREATE_ALWAYS
-            Case FileMode.CreateNew
-                mo=CREATE_NEW
-            Case FileMode.Open
-                mo=OPEN_EXISTING
-            Case FileMode.OpenOrCreate
-                mo=OPEN_ALWAYS
-            Case FileMode.Truncate
-                mo=TRUNCATE_EXISTING
-        End Select
-
-        op = options As DWord
+        Dim ac = access As DWord
+        Dim sh = share As DWord
+        Dim mo = mode As DWord
+        Dim op = options As DWord
 '       If (Environment.OSVersion.Platform As DWord) <> (PlatformID.Win32NT As DWord) Then 'ToDo: なぜかアクセス違反になる
             op And= Not FILE_FLAG_OVERLAPPED
@@ -97 +59 @@
         This.fileOptions = op
         This.offset = 0
+        This.ownsHandle = True
     End Sub
     Sub FileStream(path As String, mode As FileMode, access As FileAccess, share As FileShare)
@@ -122 +85 @@
         This.FileStream(path,mode,access,FileShare.None,FileOptions.None)
     End Sub
+    /*
+    @date 2008/02/26
+    @auther Egtra
+    '不要になったら削除すること
+    */
+    Sub FileStream(h As HANDLE, access As FileAccess, owns As Boolean)
+        handle = h
+        fileAccess = access As DWord
+        ownsHandle = owns
+    End Sub
+
 Public
     /*!
@@ -259 +233 @@
 /*  CreateObjRef*/
     
-    Override Sub Dispose(disposing As Boolean)
-        Flush()
-        CloseHandle(InterlockedExchangePointer(VarPtr(This.handle),NULL))
-    End Sub
-
     Override Function EndRead(asyncResult As System.IAsyncResult) As Long
         'TODO
@@ -450 +419 @@
 
 Protected
+    Override Sub Dispose(disposing As Boolean)
+        If handle <> 0 Then
+            Flush()
+            CloseHandle(InterlockedExchangePointer(VarPtr(handle), NULL))
+        End If
+    End Sub
+
     Override Function CreateWaitHandle() As System.Threading.WaitHandle
-        Return New System.Threading.AutoResetEvent(False)
+        '調査した限りでは、System.Threading.EventWaitHandleクラスをNewする模様。
+        '現状ではSystem.Threading.WaitHandleクラスをNewしてからHandleにて設定
+        Dim wh As System.Threading.WaitHandle
+        wh.Handle=CreateEvent(NULL,TRUE,FALSE,NULL)
+        Return wh
     End Function