Changeset 303 for trunk/Include/basic

Timestamp:

Aug 24, 2007, 11:14:46 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

フルコンパイルでのミスあぶり出し。註：修正は全て@300や@301以前に行われた。

Location:

trunk/Include/basic

Files:

• command.sbp (modified) (5 diffs)
• function.sbp (modified) (1 diff)

trunk/Include/basic/command.sbp

@@ -7 +7 @@
 #require <windows.sbp>
 #require <Classes/System/Environment.ab>
+#require <Classes/ActiveBasic/Windows/Windows.ab>
 
 Const _System_Type_SByte = 1
@@ -65 +66 @@
 '----------------
 
-Function _System_MessageBox(hw As HWND, s As PCSTR, t As PCSTR, b As DWord) As DWord
-    Return MessageBoxA(hw, s, t, b)
-End Function
-
-Function _System_MessageBox(hw As HWND, s As PCWSTR, t As PCWSTR, b As DWord) As DWord
-    Return MessageBoxW(hw, s, t, b)
-End Function
-
 Macro MSGBOX(hwnd As HWND, str As String)(title As String, boxType As DWord, ByRef retAns As DWord)
+    Dim ret = ActiveBasic.Windows.Detail._System_MessageBox(hwnd, ToSCStr(str), ToSCStr(title), boxType)
     If VarPtr(retAns) Then
-        retAns = _System_MessageBox(hwnd, ToSCStr(str), ToSCStr(title), boxType)
-    Else
-        _System_MessageBox(hwnd, ToSCStr(str), ToSCStr(title), boxType)
+        retAns = ret
     End If
 End Macro
@@ -424 +416 @@
 Macro FIELD(FileNumber As Long, FieldSize As Long)
     FileNumber--
-
     _System_FieldSize(FileNumber)=FieldSize
 End Macro
-Macro GET(FileNumber As Long, RecodeNumber As Long, ByRef lpBuffer As String)
+Macro GET(FileNumber As Long, RecodeNumber As Long, ByRef buffer As String)
     Dim dwAccessByte As DWord
 
@@ -434 +425 @@
 
     SetFilePointer(_System_hFile(FileNumber), SizeOf (StrChar) * RecodeNumber * _System_FieldSize(FileNumber), 0, FILE_BEGIN)
-    lpBuffer = ZeroString(_System_FieldSize(FileNumber))
-    ReadFile(_System_hFile(FileNumber), StrPtr(lpBuffer), SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte),ByVal 0)
-    If Not dwAccessByte=_System_FieldSize(FileNumber) Then
-        lpBuffer = Left$(lpBuffer, dwAccessByte)
+    Dim t = ZeroString(_System_FieldSize(FileNumber))
+    ReadFile(_System_hFile(FileNumber), StrPtr(t), SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
+    If dwAccessByte = _System_FieldSize(FileNumber) Then
+        buffer = t.ToString
+    Else
+        buffer = Left$(t.ToString, dwAccessByte)
     End If
 End Macro
-Macro PUT(FileNumber As Long, RecodeNumber As Long, ByRef lpBuffer As String)
+Macro PUT(FileNumber As Long, RecodeNumber As Long, buffer As String)
     Dim dwAccessByte As DWord
 
@@ -447 +440 @@
 
     SetFilePointer(_System_hFile(FileNumber), SizeOf (StrChar) * RecodeNumber*_System_FieldSize(FileNumber), 0, FILE_BEGIN)
-    WriteFile(_System_hFile(FileNumber), StrPtr(lpBuffer),SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
+    WriteFile(_System_hFile(FileNumber), StrPtr(buffer), SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
 End Macro
 

trunk/Include/basic/function.sbp

@@ -1019 +1019 @@
 End Function
 
+Function _System_PtrObj(p As VoidPtr) As Object
+    SetPointer(VarPtr(_System_PtrObj), p)
+End Function
+
 '--------
 ' 文字列関数その2