Changeset 337 for trunk/Include

Timestamp:

Sep 22, 2007, 12:32:25 PM (17 years ago)

Author:

dai

Message:

index.abを一つにまとめた。

Location:

trunk/Include

Files:

• Classes/ActiveBasic/Core/index.ab (deleted)
• Classes/ActiveBasic/Strings/index.ab (deleted)
• Classes/ActiveBasic/Windows/CriticalSection.ab (modified) (1 diff)
• Classes/ActiveBasic/Windows/index.ab (deleted)
• Classes/ActiveBasic/index.ab (deleted)
• Classes/System/Collections/index.ab (deleted)
• Classes/System/Delegate.ab (added)
• Classes/System/Diagnostics/index.ab (deleted)
• Classes/System/Drawing/index.ab (deleted)
• Classes/System/Environment.ab (modified) (1 diff)
• Classes/System/IO/Directory.ab (modified) (1 diff)
• Classes/System/IO/DirectorySecurity.ab (added)
• Classes/System/IO/FileStream.ab (modified) (4 diffs)
• Classes/System/IO/Stream.ab (modified) (2 diffs)
• Classes/System/IO/index.ab (deleted)
• Classes/System/Media/index.ab (deleted)
• Classes/System/Security (added)
• Classes/System/Security/AccessControl (added)
• Classes/System/Security/AccessControl/misc.ab (added)
• Classes/System/Text/index.ab (deleted)
• Classes/System/Threading/index.ab (deleted)
• Classes/System/Windows/Forms/index.ab (deleted)
• Classes/System/index.ab (deleted)
• Classes/index.ab (modified) (1 diff)
• api_sql.sbp (modified) (1 diff)

trunk/Include/Classes/ActiveBasic/Windows/CriticalSection.ab

@@ -1 +1 @@
 'Classes/ActiveBasic/Windows/CriticalSection.ab
-
-#require <Classes/System/index.ab>
 
 Namespace ActiveBasic

trunk/Include/Classes/System/Environment.ab

@@ -2 +2 @@
 
 #require <api_psapi.sbp>
-#require <Classes/System/OperatingSystem.ab>
-#require <Classes/ActiveBasic/Windows/index.ab>
 
 Declare Function _System_SetEnvironmentVariable Lib "kernel32" Alias _FuncName_SetEnvironmentVariable (lpName As LPCTSTR, lpValue As LPTSTR) As BOOL

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

@@ -26 +26 @@
     End Function 
 
-    Static Function GetAccessControl(path As String, includeSections As AccessControlSections) As DirectorySecurity
+    Static Function GetAccessControl(path As String, includeSections As System.Security.AccessControl.AccessControlSections) As DirectorySecurity
     End Function
 

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

@@ -297 +297 @@
     End Sub
 
-    Override Function Read(ByRef 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
         If This.CanRead() Then
             Dim ret As DWord
@@ -316 +316 @@
     End Function
 
-    Override Function ReadByte() As Long
-        Dim b As Byte
-        Dim ret = Read(b, 0, 1)
-        If ret <> 0 Then
-            Return b As Long
-        Else
-            Return -1
-        End If
-    End Function
 /*  ReferenceEquals*/
 
@@ -388 +379 @@
     End Sub
 
-    Override Sub Write(ByRef buffer[] As Byte, offset As Long, count As Long)
+    Override Sub Write(buffer As *Byte, offset As Long, count As Long)
         If This.CanWrite() Then
             Dim ret As DWord
@@ -405 +396 @@
     End Sub
 
-    Override Sub WriteByte(b As Byte)
-        Write(b, 0, 1)
-    End Sub
-
 Protected
     Override Function CreateWaitHandle() As System.Threading.WaitHandle

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

@@ -46 +46 @@
     Virtual Sub EndWrite(ByRef asyncResult As System.IAsyncResult): End Sub
     Abstract Sub Flush()
-    Abstract Function Read(ByRef buffer[] As Byte, offset As Long, count As Long) As Long
+    Abstract Function Read(buffer As *Byte, offset As Long, count As Long) As Long
 
     Virtual Function ReadByte() As Long
         Dim b As Byte
-        Dim ret = Read(b, 0, 1)
+        Dim ret = Read(VarPtr(b), 0, 1)
         If ret <> 0 Then
             Return b
@@ -60 +60 @@
     Abstract Function Seek(offset As Int64, origin As SeekOrigin) As Long
     Abstract Sub SetLength(value As Int64)
-    Abstract Sub Write(ByRef buffer[] As Byte, offset As Long, count As Long)
+    Abstract Sub Write(buffer As *Byte, offset As Long, count As Long)
 
     Virtual Sub WriteByte(b As Byte)
-        Write(b, 0, 1)
+        Write(VarPtr(b), 0, 1)
     End Sub
 Protected

trunk/Include/Classes/index.ab

@@ -1 @@
-' コンパイルに最低限必要なファイル
-
-#require "./ActiveBasic/index.ab"
-#require "./System/index.ab"
+#require "./ActiveBasic/Core/TypeInfo.ab"
+#require "./ActiveBasic/Math/Math.ab"
+#require "./ActiveBasic/Strings/SPrintF.ab"
+#require "./ActiveBasic/Strings/Strings.ab"
+#require "./ActiveBasic/Windows/CriticalSection.ab"
+#require "./ActiveBasic/Windows/WindowHandle.sbp"
+#require "./ActiveBasic/Windows/Windows.ab"
+#require "./System/Blittable.ab"
+#require "./System/DateTime.ab"
+#require "./System/Delegate.ab"
+#require "./System/Environment.ab"
+#require "./System/Math.ab"
+#require "./System/misc.ab"
+#require "./System/Object.ab"
+#require "./System/OperatingSystem.ab"
+#require "./System/String.ab"
+#require "./System/TimeSpan.ab"
+#require "./System/TypeInfo.ab"
+#require "./System/Version.ab"
+#require "./System/Collections/ArrayList.ab"
+#require "./System/Collections/misc.ab"
+#require "./System/Collections/Generic/Dictionary.ab"
+#require "./System/Collections/Generic/List.ab"
+/*
+#require "./System/Data/Odbc/Odbc.ab"
+*/
+#require "./System/Diagnostics/base.ab"
+#require "./System/Diagnostics/Debug.ab"
+#require "./System/Diagnostics/Trace.ab"
+#require "./System/Diagnostics/TraceListener.ab"
+#require "./System/Diagnostics/TraceListenerCollection.ab"
+/*
+#require "./System/Drawing/CharacterRange.ab"
+#require "./System/Drawing/Color.ab"
+#require "./System/Drawing/Font.ab"
+#require "./System/Drawing/Graphics.ab"
+#require "./System/Drawing/Image.ab"
+#require "./System/Drawing/misc.ab"
+#require "./System/Drawing/Point.ab"
+#require "./System/Drawing/PointF.ab"
+#require "./System/Drawing/Rectangle.ab"
+#require "./System/Drawing/RectangleF.ab"
+#require "./System/Drawing/Size.ab"
+#require "./System/Drawing/SizeF.ab"
+#require "./System/Drawing/Drawing2D/Matrix.ab"
+#require "./System/Drawing/Drawing2D/misc.ab"
+#require "./System/Drawing/Imaging/MetafileHeader.ab"
+#require "./System/Drawing/Imaging/misc.ab"
+#require "./System/Drawing/Text/misc.ab"
+*/
+#require "./System/IO/Directory.ab"
+#require "./System/IO/DirectoryInfo.ab"
+#require "./System/IO/DirectorySecurity.ab"
+#require "./System/IO/DriveInfo.ab"
+#require "./System/IO/File.ab"
+#require "./System/IO/FileInfo.ab"
+#require "./System/IO/FileStream.ab"
+#require "./System/IO/FileSystemInfo.ab"
+#require "./System/IO/misc.ab"
+#require "./System/IO/Path.ab"
+#require "./System/IO/Stream.ab"
+#require "./System/IO/StreamReader.ab"
+#require "./System/IO/StreamWriter.ab"
+#require "./System/Media/SystemSound.ab"
+#require "./System/Media/SystemSounds.ab"
+#require "./System/Runtime/InteropServices/GCHandle.ab"
+#require "./System/Security/AccessControl/misc.ab"
+#require "./System/Text/StringBuilder.ab"
+#require "./System/Threading/Thread.ab"
+#require "./System/Threading/WaitHandle.ab"
+#require "./System/Windows/Forms/Application.ab"
+#require "./System/Windows/Forms/Control.ab"
+#require "./System/Windows/Forms/CreateParams.ab"
+#require "./System/Windows/Forms/Message.ab"
+#require "./System/Windows/Forms/MessageBox.ab"
+#require "./System/Windows/Forms/misc.ab"
+#require "./System/Windows/Forms/PaintEventArgs.ab"

trunk/Include/api_sql.sbp

@@ -14 +14 @@
 TypeDef SQLINTEGER     = Long
 TypeDef SQLUINTEGER    = DWord
+TypeDef SQLSMALLINT    = Integer
+TypeDef SQLUSMALLINT   = Word
 #ifdef _WIN64
 TypeDef SQLLEN         = Int64