Changeset 699

Timestamp:

2009/03/31 14:15:23 (3 years ago)

Author:

egtra

Message:

無駄となったUNICODE条件分岐を削除

File:

• trunk/ab5.0/ablib/src/Classes/System/Environment.ab (modified) (3 diffs)

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

@@ -19 +19 @@
 
     Static Function CommandLine() As String
-#ifdef UNICODE
-            CommandLine = New String(GetCommandLineW())
-#else
-            CommandLine = New String(GetCommandLineA())
-#endif
+        CommandLine = New String(GetCommandLine())
     End Function
 
@@ -68 +64 @@
 
     Static Function OSVersion() As OperatingSystem
-        Dim vi As OSVERSIONINFO
-        vi.dwOSVersionInfoSize = Len(vi)
-        GetVersionEx(vi)
-        OSVersion = New OperatingSystem(vi)
+        OSVersion = New OperatingSystem(ActiveBasic.Windows.Version.Detail.vi)
     End Function
 
@@ -163 +156 @@
         Dim buf = New Text.StringBuilder
         buf.Length = size As Long
-        buf.Length  = _System_GetEnvironmentVariable(tcsVariable, StrPtr(buf), size)
+        buf.Length = _System_GetEnvironmentVariable(tcsVariable, StrPtr(buf), size)
         GetEnvironmentVariable = buf.ToString
     End Function