Changeset 628 for trunk/ab5.0/ablib/src/basic

Timestamp:

Sep 21, 2008, 2:01:36 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

winnls.ab, winsvc.abを追加

Location:

trunk/ab5.0/ablib/src/basic

Files:

• command.sbp (modified) (7 diffs)
• function.sbp (modified) (5 diffs)

trunk/ab5.0/ablib/src/basic/command.sbp

@@ -59 +59 @@
 
 Macro MSGBOX(hwnd As HWND, str As String)(title As String, boxType As DWord, ByRef retAns As DWord)
-'   Dim ret = MessageBox(hwnd, ToTCStr(str), ToTCStr(title), boxType)
-'   If VarPtr(retAns) Then
-'       retAns = ret
-'   End If
+    Dim ret = MessageBox(hwnd, ToTCStr(str), ToTCStr(title), boxType)
+    If VarPtr(retAns) Then
+        retAns = ret
+    End If
 End Macro
 
@@ -136 +136 @@
 Macro CLOSE()(FileNumber As Long)
     FileNumber--
+    ActiveBasic.Detail.ThrowIfInvaildFileNum(FileNumber)
 
     If _System_hFile(FileNumber) Then
@@ -148 +149 @@
 Sub INPUT_FromFile(FileNumber As Long)
     FileNumber--
+    ActiveBasic.Detail.ThrowIfInvaildFileNum(FileNumber)
 
     Dim i = 0 As Long
@@ -238 +240 @@
     Dim dwAccessByte As DWord
     FileNumber--
+    ActiveBasic.Detail.ThrowIfInvaildFileNum(FileNumber)
 
     WriteFile(_System_hFile(FileNumber), StrPtr(buf), Len(buf), VarPtr(dwAccessByte), ByVal 0)
@@ -404 +407 @@
 Macro FIELD(FileNumber As Long, FieldSize As Long)
     FileNumber--
+    ActiveBasic.Detail.ThrowIfInvaildFileNum(FileNumber)
     _System_FieldSize(FileNumber)=FieldSize
 End Macro
@@ -410 +414 @@
 
     FileNumber--
+    ActiveBasic.Detail.ThrowIfInvaildFileNum(FileNumber)
     RecodeNumber--
 
@@ -425 +430 @@
 
     FileNumber--
+    ActiveBasic.Detail.ThrowIfInvaildFileNum(FileNumber)
     RecodeNumber--
 

trunk/ab5.0/ablib/src/basic/function.sbp

@@ -123 +123 @@
 */
 Function Sgn(n As Double) As Long
-'   Sgn = ActiveBasic..Math.Sign(n)
+'   Sgn = ActiveBasic.Math.Sign(n)
 End Function
 
@@ -205 +205 @@
         Return New String(t, 2)
     Else
-        Throw New System.ArgumentOutOfRangeException("ChrW: c is invalid Unicode code point.", "c")
+        Throw New System.ArgumentOutOfRangeException("ChrW: c is invalid unicode code point.", "c")
     End If
 End Function
@@ -665 +665 @@
 Function Eof(FileNum As Long) As Long
     FileNum--
+    ActiveBasic.Detail.ThrowIfInvaildFileNum(FileNum)
     Dim dwCurrent = SetFilePointer(_System_hFile(FileNum), 0,NULL, FILE_CURRENT)
     Dim dwEnd = SetFilePointer(_System_hFile(FileNum), 0, NULL, FILE_END)
@@ -677 +678 @@
 
 Function Lof(FileNum As Long) As Long
-    Lof = GetFileSize(_System_hFile(FileNum-1), 0)
+    FileNum--
+    ActiveBasic.Detail.ThrowIfInvaildFileNum(FileNum)
+    Lof = GetFileSize(_System_hFile(FileNum), 0)
 End Function
 
 Function Loc(FileNum As Long) As Long
     FileNum--
-
+    ActiveBasic.Detail.ThrowIfInvaildFileNum(FileNum)
     Dim NowPos = SetFilePointer(_System_hFile(FileNum), 0, 0, FILE_CURRENT)
     Dim BeginPos = SetFilePointer(_System_hFile(FileNum), 0, 0, FILE_BEGIN)
@@ -690 +693 @@
 End Function
 
+Namespace ActiveBasic
+Namespace Detail
+
+Sub ThrowIfInvaildFileNum(n As Long)
+    If n < 0 Or n > 255 Then
+        Throw New System.ArgumentOutOfRangeException("FileNum", "Invalid file number")
+    ElseIf _System_hFile(n) = 0 Then
+        Throw New System.InvalidOperationException("File number " & Str$(n + 1) & "is not opend.")
+    End If
+End Sub
+
+End Namespace
+End Namespace
 
 '------------------