Changeset 601

Timestamp:

Aug 21, 2008, 10:55:43 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

PlatformIDで#198を回避

File:

• trunk/ab5.0/ablib/src/Classes/System/OperatingSystem.ab (modified) (2 diffs)

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

@@ -15 +15 @@
     End Sub
 
-    Sub OperatingSystem(vi As OSVERSIONINFOA)
-        pf = vi.dwPlatformId As PlatformID
+    Sub OperatingSystem(ByRef vi As OSVERSIONINFOA)
+        pf = ToPlatformID(vi.dwPlatformId)
         ver = New Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
         sp = New String(vi.szCSDVersion As PCSTR)
     End Sub
 
-    Sub OperatingSystem(vi As OSVERSIONINFOW)
-        pf = vi.dwPlatformId As PlatformID
+    Sub OperatingSystem(ByRef vi As OSVERSIONINFOW)
+        pf = ToPlatformID(vi.dwPlatformId)
         ver = New Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
-        sp = New String(vi.szCSDVersion As PCSTR)
+        sp = New String(vi.szCSDVersion As PCWSTR)
     End Sub
 
@@ -72 +72 @@
     ver As Version
     sp As String
+
+    Static Function ToPlatformID(platformId As DWord) As PlatformID
+        Select Case platformId
+            Case VER_PLATFORM_WIN32s
+                Return PlatformID.Win32S
+            Case VER_PLATFORM_WIN32_WINDOWS
+                Return PlatformID.Win32Windows
+            Case VER_PLATFORM_WIN32_NT
+                Return PlatformID.Win32NT
+            Case VER_PLATFORM_WIN32_CE
+                Return PlatformID.WinCE
+            Case Else
+                Return PlatformID.Unix
+        End Select
+    End Function
 End Class