Changeset 258 for Include/Classes

Timestamp:

May 21, 2007, 1:03:21 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

Prompt.sbp内を名前空間に入れた。EnvironmentのMachineName, UserName, GetFolderPathを実装。

Location:

Include/Classes/System

Files:

• Environment.ab (modified) (5 diffs)
• OperatingSystem.ab (modified) (6 diffs)
• Threading/WaitHandle.ab (modified) (3 diffs)

Include/Classes/System/Environment.ab

@@ -3 +3 @@
 #require <api_psapi.sbp>
 #require <Classes/System/OperatingSystem.ab>
+
+Namespace System
+
+Namespace Detail
+    TypeDef PFNGetProcessMemoryInfo = *Function(Process As HANDLE, ByRef mc As PROCESS_MEMORY_COUNTERS, cb As DWord) As BOOL
+End Namespace
 
 Class Environment
@@ -45 +51 @@
     End Function
 
-    ' MachineName
+    Static Function MachineName() As String
+        If Object.ReferenceEquals(machineName, Nothing) Then
+            Dim buf[MAX_COMPUTERNAME_LENGTH] As TCHAR
+            Dim len = (MAX_COMPUTERNAME_LENGTH + 1) As DWord
+            GetComputerName(buf, len)
+            machineName = New String(buf, len As Long)
+        End If
+        Return machineName
+    End Function            
 
     Static Function NewLine() As String
@@ -90 +104 @@
     ' UserInteractive
 
-    ' UserName
+    Static Function UserName() As String
+        If Object.ReferenceEquals(userName, Nothing) Then
+            Dim buf[UNLEN] As TCHAR
+            Dim len = (UNLEN + 1) As DWord
+            GetUserName(buf, len)
+            userName = New String(buf, len As Long)
+        End If
+        Return userName
+    End Function            
 
     ' Version
 
+Public
+    'NTでしか使用できない仕様
     Static Function WorkingSet() As Int64
-        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")) As PFNGetProcessMemoryInfo
+        Dim pGetProcessMemoryInfo = GetProcAddress(hmodPSAPI, ToMBStr("GetProcessMemoryInfo")) As Detail.PFNGetProcessMemoryInfo
         If pGetProcessMemoryInfo <> 0 Then
             Dim mc As PROCESS_MEMORY_COUNTERS
@@ -136 +158 @@
     ' GetEnvironmentVariables
 
+    Static Function GetFolderPath(f As Environment_SpecialFolder) As String
+'       If ... Then
+'           Throw New ArgumentException
+'       End If
+        Dim x As Long
+        x = f
+        Return ActiveBasic.Windows.GetFolderPath(x)
+    End Function
+
     ' GetLogicalDrives
 
@@ -143 +174 @@
     Static cmdLine = Nothing As String
     Static exitCode = 0 As Long
+    Static machineName = Nothing As String
     Static osVer = Nothing As OperatingSystem
     Static processorCount = 0 As Long
     Static sysDir = Nothing As String
+    Static userName = Nothing As String
 End Class
+
+Enum Environment_SpecialFolder
+    Desktop = CSIDL_DESKTOP
+    Programs = CSIDL_PROGRAMS
+    Personal = CSIDL_PERSONAL
+    MyDocuments = CSIDL_PERSONAL
+    Favorites = CSIDL_FAVORITES
+    Startup = CSIDL_STARTUP
+    Recent = CSIDL_RECENT
+    SendTo = CSIDL_SENDTO
+    StartMenu = CSIDL_STARTMENU
+    MyMusic = CSIDL_MYMUSIC
+    DesktopDirectory = CSIDL_DESKTOPDIRECTORY
+    MyComputer = CSIDL_DRIVES
+    Templates = CSIDL_TEMPLATES
+    ApplicationData = CSIDL_APPDATA '4.71
+    LocalApplicationData = CSIDL_LOCAL_APPDATA
+    InternetCache = CSIDL_INTERNET_CACHE
+    Cookies = CSIDL_COOKIES
+    History = CSIDL_HISTORY
+    CommonApplicationData = CSIDL_COMMON_APPDATA '5.0
+    System = CSIDL_SYSTEM
+    CommonProgramFiles = CSIDL_PROGRAM_FILES
+    ProgramFiles = CSIDL_PROGRAM_FILES
+    MyPictures = CSIDL_MYPICTURES
+End Enum
+
+
+End Namespace 'System

Include/Classes/System/OperatingSystem.ab

@@ -6 +6 @@
 #require <Classes/System/Version.ab>
 
+Namespace System
+
 Class OperatingSystem
     ' Inherits ICloneable', ISerializable
 Public
     ' Constractor
-    Sub OperatingSystem(platform As PlatformID, version As System.Version)
+    Sub OperatingSystem(platform As PlatformID, version As Version)
         pf = platform
         ver = version
@@ -18 +20 @@
     Sub OperatingSystem(vi As OSVERSIONINFOA)
         pf = vi.dwPlatformId As PlatformID
-        ver = New System.Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
+        ver = New Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
         sp = New String(vi.szCSDVersion As PCSTR)
     End Sub
@@ -24 +26 @@
     Sub OperatingSystem(vi As OSVERSIONINFOW)
         pf = vi.dwPlatformId As PlatformID
-        ver = New System.Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
+        ver = New Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
         sp = New String(vi.szCSDVersion As PCSTR)
     End Sub
@@ -33 +35 @@
     End Function
 
-    Const Function Version() As System.Version
+    Const Function Version() As Version
         Return ver
     End Function
@@ -71 +73 @@
 Private
     pf As PlatformID
-    ver As System.Version
+    ver As Version
     sp As String
 End Class
@@ -83 +85 @@
 End Enum
 
+End Namespace
+
 #endif '__SYSYTEM_OPERATINGSYSTEM_AB__

Include/Classes/System/Threading/WaitHandle.ab

@@ -3 +3 @@
 #ifndef __SYSTEM_THREADING_WAITHANDLE_AB__
 #define __SYSTEM_THREADING_WAITHANDLE_AB__
+
+'Namespace System
+'Namespace Threading
+
+Namespace Detail
+    TypeDef PFNSignalObjectAndWait = *Function(hObjectToSignal As HANDLE, hObjectToWaitOn As HANDLE, dwMilliseconds As DWord, bAlertable As DWord) As DWord
+End Namespace
 
 Class WaitHandle
@@ -62 +69 @@
     End Function
 
+Public
     Static Function SignalAndWait(ByRef toSignal As WaitHandle, ByRef toWaitOn As WaitHandle, millisecondsTimeout As Long, exitContext As BOOL) As BOOL
-        TypeDef PFNSignalObjectAndWait = *Function(hObjectToSignal As HANDLE, hObjectToWaitOn As HANDLE, dwMilliseconds As DWord, bAlertable As DWord) As DWord
-        Dim pSignalObjectAndWait = GetProcAddress(GetModuleHandle("Kernel32.dll"), "SignalObjectAndWait") As PFNSignalObjectAndWait
+        Dim pSignalObjectAndWait = GetProcAddress(GetModuleHandle("Kernel32.dll"), "SignalObjectAndWait") As Detail.PFNSignalObjectAndWait
         If pSignalObjectAndWait = 0 Then
             ' PlatformNotSupportedException
@@ -105 +112 @@
 End Class
 
+'End Namespace 'Threading
+'End Namespace 'System
+
 #endif '__SYSTEM_THREADING_WAITHANDLE_AB__