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

Timestamp:

May 7, 2007, 4:22:52 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

#_fullcompileで検出されたエラーの修正（明らかに判るもののみ）

File:

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

Include/Classes/System/Environment.ab

@@ -1 +1 @@
 ' System/Environment.ab
 
+#require <api_psapi.sbp>
 #require <Classes/System/OperatingSystem.ab>
 
@@ -8 +9 @@
 
     Static Function CommandLine() As String
-        If cmdLine = Nothing Then
+        If Object.ReferenceEquals(cmdLine, Nothing) Then
 #ifdef __STRING_IS_NOT_UNICODE
             cmdLine = New String(GetCommandLineA())
@@ -51 +52 @@
 
     Static Function OSVersion() As OperatingSystem
-        If osVer = Nothing Then
+        If Object.ReferenceEquals(osVer, Nothing) Then
             Dim vi As OSVERSIONINFO
             GetVersionEx(vi)
@@ -71 +72 @@
 
     Static Function SystemDirectory() As String
-        If sysDir = Nothing Then
+        If Object.ReferenceEquals(sysDir, Nothing) Then
             Dim size = GetSystemDirectory(0, 0)
-            Dim p = _System_malloc(SizeOf (TCHAR) * size)
-            Dim len = GetSystemDirectory(size, p)
+            Dim p = _System_malloc(SizeOf (TCHAR) * size) As PTSTR
+            Dim len = GetSystemDirectory(p, size)
             sysDir = New String(p, len As Long)
             _System_free(p)
@@ -94 +95 @@
 
     Static Function WorkingSet() As Int64
-        Dim pGetProcessMemoryInfo As *Function(Process As HANDLE, ByRef mc As PPROCESS_MEMORY_COUNTERS, cb As DWord) As BOOL
+        TypeDef PFNGetProcessMemoryInfo = *Function(Process As HANDLE, ByRef mc As PROCESS_MEMORY_COUNTERS, cb As DWord) As BOOL
+        Dim pGetProcessMemoryInfo As PFNGetProcessMemoryInfo
         Dim hmodPSAPI = LoadLibrary("PSAPI.DLL")
         If hmodPSAPI = 0 Then Return 0
-        pGetProcessMemoryInfo = GetProcAddress(hmodPSAPI, ToMBStr("GetProcessMemoryInfo"))
+        pGetProcessMemoryInfo = GetProcAddress(hmodPSAPI, ToMBStr("GetProcessMemoryInfo")) As PFNGetProcessMemoryInfo
         If pGetProcessMemoryInfo <> 0 Then
-            Dim mc As PPROCESS_MEMORY_COUNTERS
+            Dim mc As PROCESS_MEMORY_COUNTERS
             If pGetProcessMemoryInfo(GetCurrentProcess(), mc, Len (mc)) <> FALSE Then
                 WorkingSet = mc.WorkingSetSize
+                
             End If
         End If
@@ -117 +120 @@
         Dim src = ToTCStr(s)
         Dim size = ExpandEnvironmentStrings(src, 0, 0)
-        Dim dst = _System_malloc(SizeOf (TCHAR) * size)
+        Dim dst = _System_malloc(SizeOf (TCHAR) * size) As PTSTR
         ExpandEnvironmentStrings(src, dst, size)
         ExpandEnvironmentVariables = New String(dst, size - 1)