Changeset 603 for trunk/ab5.0

Timestamp:

Aug 21, 2008, 11:04:42 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

[601][602]でのコミットし忘れ分と細かい修正

Location:

trunk/ab5.0/ablib/src

Files:

• Classes/ActiveBasic/Windows/Windows.ab (modified) (3 diffs)
• Classes/System/Environment.ab (modified) (1 diff)
• Classes/System/Math.ab (modified) (2 diffs)
• WinNT.ab (modified) (1 diff)
• basic.sbp (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/Windows.ab

@@ -47 +47 @@
 End Namespace
 
+Function HResultToString(hr As HRESULT) As String
+    Dim pszMsg As PCSTR
+    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER Or FORMAT_MESSAGE_FROM_SYSTEM Or FORMAT_MESSAGE_IGNORE_INSERTS,
+        0, hr, LANG_USER_DEFAULT, VarPtr(pszMsg) As PTSTR, 0, 0)
+    If pszMsg <> 0 Then
+        HResultToString = New String(pszMsg)
+        LocalFree(pszMsg)
+    End If
+End Function
 
 /*!
@@ -68 +77 @@
     */
     Sub WindowsException(hr As HRESULT)
-        Exception(hresultToString(hr))
+        Exception(HResultToString(hr))
         HResult = hr
     End Sub
@@ -98 +107 @@
     End Sub
 Private
-    Static Function hresultToString(hr As HRESULT) As String
-        Dim pszMsg As PCSTR
-        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER Or FORMAT_MESSAGE_FROM_SYSTEM Or FORMAT_MESSAGE_IGNORE_INSERTS,
-            0, hr, LANG_USER_DEFAULT, VarPtr(pszMsg) As PTSTR, 0, 0)
-        If pszMsg <> 0 Then
-            hresultToString = New String(pszMsg)
-            LocalFree(pszMsg)
-        End If
-    End Function
 End Class
 

trunk/ab5.0/ablib/src/Classes/System/Environment.ab

@@ -69 +69 @@
     Static Function OSVersion() As OperatingSystem
         Dim vi As OSVERSIONINFO
+        vi.dwOSVersionInfoSize = Len(vi)
         GetVersionEx(vi)
         OSVersion = New OperatingSystem(vi)

trunk/ab5.0/ablib/src/Classes/System/Math.ab

@@ -315 +315 @@
         End If
     End Function
-
+/*
     Static Function Sign(value As Double) As Long
         If value = 0 Then
@@ -325 +325 @@
         End If
     End Function
-/*
+
     Static Function Sign(value As SByte) As Long
         If value = 0 Then

trunk/ab5.0/ablib/src/WinNT.ab

@@ -1177 +1177 @@
 'ACCESS TYPES
 
-'Const DELETE = (&h00010000)
+Const DELETE = (&h00010000)
 Const READ_CONTROL = (&h00020000)
 Const WRITE_DAC = (&h00040000)

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

@@ -132 +132 @@
         InitializeCriticalSection(_System_CriticalSection)
 
-        _System_hProcessHeap=HeapCreate(HEAP_GENERATE_EXCEPTIONS,0,0)
+        _System_hProcessHeap=HeapCreate(0,0,0)
 
         ' GC管理オブジェクトを初期化