Changeset 268 for Include/Classes/System/Environment.ab

Timestamp:

Jun 2, 2007, 7:04:19 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

StringのResizeを呼ぶコンストラクタでメモリ確保されない場合を排除、ほか微修正

File:

• Include/Classes/System/Environment.ab (modified) (10 diffs)

Include/Classes/System/Environment.ab

@@ -3 +3 @@
 #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
+Declare Function _System_GetEnvironmentVariable Lib "kernel32" Alias _FuncName_GetEnvironmentVariable (lpName As PCTSTR, lpBuffer As PTSTR, nSize As DWord) As DWord
 
 Namespace System
@@ -8 +12 @@
 Namespace Detail
     TypeDef PFNGetProcessMemoryInfo = *Function(Process As HANDLE, ByRef mc As PROCESS_MEMORY_COUNTERS, cb As DWord) As BOOL
+
+    Dim hasShutdownStarted As Boolean
 End Namespace
 
@@ -48 +54 @@
 
     Static Function HasShutdownStarted() As Boolean
-        Return False
+        Return Detail.hasShutdownStarted
     End Function
 
@@ -59 +65 @@
         End If
         Return machineName
-    End Function            
+    End Function
 
     Static Function NewLine() As String
@@ -92 +98 @@
             sysDir = New String(p, len As Long)
             _System_free(p)
-        End IF
+        End If
         Return sysDir
     End Function
@@ -112 +118 @@
         End If
         Return userName
-    End Function            
+    End Function
 
     ' Version
@@ -126 +132 @@
             If pGetProcessMemoryInfo(GetCurrentProcess(), mc, Len (mc)) <> FALSE Then
                 WorkingSet = mc.WorkingSetSize
-                
             End If
         End If
@@ -154 +159 @@
     ' GetCommandLineArgs
 
-    ' GetEnvironmentVariable
+    Static Function GetEnvironmentVariable(variable As String) As String
+        Dim tcsVariable = ToTCStr(variable)
+        Dim size = _System_GetEnvironmentVariable(tcsVariable, 0, 0)
+        Dim p = _System_malloc(SizeOf (TCHAR) * size) As PTSTR
+        Dim len = _System_GetEnvironmentVariable(tcsVariable, p, size)
+        GetEnvironmentVariable = New String(p, len As Long)
+        _System_free(p)
+    End Function
 
     ' GetEnvironmentVariables
@@ -169 +181 @@
     ' GetLogicalDrives
 
-    ' SetEnvironmentVariable
+    Static Sub SetEnvironmentVariable(variable As String, value As String)
+        _System_SetEnvironmentVariable(ToTCStr(variable), ToTCStr(value))
+    End Sub
 
 Private
@@ -207 +221 @@
 End Enum
 
-
 End Namespace 'System