Changeset 497 for trunk/Include/Classes/System/Environment.ab

Timestamp:

Mar 28, 2008, 5:43:34 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

インクルードガードとその他不要な前処理定義などの削除

File:

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

trunk/Include/Classes/System/Environment.ab

@@ -20 +20 @@
     Static Function CommandLine() As String
         If Object.ReferenceEquals(cmdLine, Nothing) Then
-#ifdef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
+            cmdLine = New String(GetCommandLineW())
+#else
             cmdLine = New String(GetCommandLineA())
-#else
-            cmdLine = New String(GetCommandLineW())
 #endif
         End If
@@ -120 +120 @@
 Public
     'NTでしか使用できない仕様
-    Static Function WorkingSet() As Int64
+    Static Function WorkingSet() As SIZE_T
         Dim hmodPSAPI = LoadLibrary("PSAPI.DLL")
         If hmodPSAPI = 0 Then Return 0
@@ -141 +141 @@
 
     Static Function ExpandEnvironmentVariables(s As String) As String
+        If ActiveBasic.IsNothing(s) Then
+            Throw New ArgumentNullException("s")
+        End If
         Dim src = ToTCStr(s)
         Dim size = ExpandEnvironmentStrings(src, 0, 0)
-        Dim dst = GC_malloc_atomic(SizeOf (TCHAR) * size) As PTSTR
-        ExpandEnvironmentStrings(src, dst, size)
-        ExpandEnvironmentVariables = New String(dst, size - 1)
+        Dim dst = New Text.StringBuilder
+        dst.Length = size As Long
+        ExpandEnvironmentStrings(src, StrPtr(dst), size)
+        dst.Length = (size - 1) As Long
+        ExpandEnvironmentVariables = dst.ToString
     End Function
 
@@ -155 +160 @@
 
     Static Function GetEnvironmentVariable(variable As String) As String
+        If ActiveBasic.IsNothing(variable) Then
+            Throw New ArgumentNullException("variable")
+        End If
         Dim tcsVariable = ToTCStr(variable)
         Dim size = _System_GetEnvironmentVariable(tcsVariable, 0, 0)
-        Dim p = GC_malloc_atomic(SizeOf (TCHAR) * size) As PTSTR
-        Dim len = _System_GetEnvironmentVariable(tcsVariable, p, size)
-        GetEnvironmentVariable = New String(p, len As Long)
+        Dim buf = New Text.StringBuilder
+        buf.Length = size As Long
+        buf.Length  = _System_GetEnvironmentVariable(tcsVariable, StrPtr(buf), size)
+        GetEnvironmentVariable = buf.ToString
     End Function
 
@@ -176 +185 @@
 
     Static Sub SetEnvironmentVariable(variable As String, value As String)
+        If ActiveBasic.IsNothing(variable) Then
+            Throw New ArgumentNullException("variable")
+        End If
         _System_SetEnvironmentVariable(ToTCStr(variable), ToTCStr(value))
     End Sub