Changeset 408

Timestamp:

Feb 21, 2008, 8:48:14 PM (17 years ago)

Author:

NoWest

Message:

あまりに久しぶりの参加で調子でないです（笑
一先ず肩慣らしにWaitHandleの実装を進めておきました。

File:

• trunk/Include/Classes/System/Threading/WaitHandle.ab (modified) (3 diffs)

trunk/Include/Classes/System/Threading/WaitHandle.ab

@@ -29 +29 @@
 
     ' Methods
+    Virtual Sub WaitHandle()
+    End Sub
 
     Virtual Sub ~WaitHandle()
-        Dispose()
+        This.Dispose()
     End Sub
 
     Virtual Sub Close()
-        Dispose()
+        This.Dispose()
     End Sub
 
@@ -53 +55 @@
     End Function
 
-'   Function WaitOne(timeout As TimeSpan, exitContext As BOOL) As BOOL
-/*
-    Static Function WaitAll(count As DWord, handles As *HANDLE) As BOOL
+    Function WaitOne(timeout As System.TimeSpan, exitContext As Boolean) As Boolean
+        Return WaitHandle.AfterWait(WaitForSingleObject(h, timeout.TotalMilliseconds() As DWord), 1)
+    End Function
+
+    Static Function WaitAll(count As DWord, handles As *HANDLE) As Boolean
         Return WaitAll(count, handles, INFINITE, FALSE)
     End Function
 
-    Static Function WaitAll(count As DWord, handles As *HANDLE, millisecondsTimeout As Long, exitContext As BOOL) As BOOL
+    Static Function WaitAll(count As DWord, handles As *HANDLE, millisecondsTimeout As Long, exitContext As Boolean) As Boolean
         Return WaitHandle.AfterWait(WaitForMultipleObjects(count, handles, TRUE, millisecondsTimeout), count)
     End Function
 
-'   Static Function WaitAll(timeout As TimeSpan, handles As *HANDLE, millisecondsTimeout As Long, exitContext As BOOL) As BOOL
+    Static Function WaitAll(count As DWord, handles As *HANDLE, timeout As System.TimeSpan, exitContext As Boolean) As Boolean
+        Return WaitHandle.AfterWait(WaitForMultipleObjects(count, handles, TRUE, timeout.TotalMilliseconds() As DWord), count)
+    End Function
 
-    Static Function WaitAny(count As DWord, handles As *HANDLE) As BOOL
+    Static Function WaitAny(count As DWord, handles As *HANDLE) As Boolean
         Return WaitAny(count, handles, INFINITE, FALSE)
     End Function
 
-    Static Function WaitAny(count As DWord, handles As *HANDLE, millisecondsTimeout As Long, exitContext As BOOL) As BOOL
+    Static Function WaitAny(count As DWord, handles As *HANDLE, millisecondsTimeout As Long, exitContext As Boolean) As Boolean
         Return WaitHandle.AfterWait(WaitForMultipleObjects(count, handles, FALSE, millisecondsTimeout), count)
     End Function
 
-'   Static Function WaitAny(timeout As TimeSpan, handles As *HANDLE, millisecondsTimeout As Long, exitContext As BOOL) As BOOL
-*/
+    Static Function WaitAny(count As DWord, handles As *HANDLE, timeout As System.TimeSpan, exitContext As Boolean) As Boolean
+        Return WaitHandle.AfterWait(WaitForMultipleObjects(count, handles, FALSE, timeout.TotalMilliseconds() As DWord), count)
+    End Function
+
     Static Function SignalAndWait(toSignal As WaitHandle, toWaitOn As WaitHandle) As Boolean
         Return SignalAndWait(toSignal, toWaitOn, INFINITE, FALSE)
     End Function
 
-Public
+    Static Function SignalAndWait (toSignal As WaitHandle, toWaitOn As WaitHandle, timeout As System.TimeSpan, exitContext As Boolean) As Boolean
+        Return SignalAndWait(toSignal, toWaitOn, timeout.TotalMilliseconds() As Long, FALSE)
+    End Function
+
     Static Function SignalAndWait(toSignal As WaitHandle, toWaitOn As WaitHandle, millisecondsTimeout As Long, exitContext As Boolean) As Boolean
         Dim pSignalObjectAndWait = GetProcAddress(GetModuleHandle("Kernel32.dll"), "SignalObjectAndWait") As Detail.PFNSignalObjectAndWait
@@ -88 +99 @@
     End Function
 
-'   Static Function SignalAndWait(ByRef toSignal As WaitHandle, ByRef toWaitOn As WaitHandle, timeout As TimeSpan, exitContext As BOOL) As BOOL
-
-' Protected
-    Sub WaitHandle()
-    End Sub
+Public
+    Function WaitTimeout() As Long
+        Return WAIT_TIMEOUT
+    End Function
 
 Protected