Changeset 237 for Include/Classes/System/Threading

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

Include/Classes/System/Threading

Files:

• Thread.ab (modified) (6 diffs)
• WaitHandle.ab (modified) (1 diff)

Include/Classes/System/Threading/Thread.ab

@@ -52 +52 @@
     End Sub
 
-    Sub Thread(hThread As HANDLE,dwThreadId As DWord,dummy As Long)
+    Sub Thread(hThread As HANDLE, dwThreadId As DWord, dummy As Long)
         m_hThread=hThread
         m_dwThreadId=dwThreadId
@@ -61 +61 @@
 
 
-    Function Equals( thread As Thread ) As Boolean
-        If m_dwThreadId = thread.m_dwThreadId Then
-            Return True
-        End If
-        Return False
-    End Function
-
-
+    Function Equals(thread As Thread) As Boolean
+        Return m_dwThreadId = thread.m_dwThreadId
+    End Function
 
     '-----------------------
@@ -74 +69 @@
     '-----------------------
 
+    
     'Priority Property
     Sub Priority(value As ThreadPriority)
@@ -87 +83 @@
         Return m_dwThreadId
     End Function
+
 
 
@@ -314 +311 @@
 
     'カレントスレッドを取得
-    Function CurrentThread(ByRef obj_Thread As Thread) As BOOL
+    Function CurrentThread(ByRef obj_Thread As Thread) As Boolean
         Dim dwNowThreadId As DWord
         dwNowThreadId=GetCurrentThreadId()
@@ -322 +319 @@
             If ppobj_Thread[i]->ThreadId=dwNowThreadId Then
                 obj_Thread.Thread(ByVal ppobj_Thread[i])
-                Return 1
-            End If
-        Next
-
-        Return 0
+                Return True
+            End If
+        Next
+
+        Return False
     End Function
 

Include/Classes/System/Threading/WaitHandle.ab

@@ -63 +63 @@
 
     Static Function SignalAndWait(ByRef toSignal As WaitHandle, ByRef toWaitOn As WaitHandle, millisecondsTimeout As Long, exitContext As BOOL) As BOOL
-        Dim pSignalObjectAndWait = GetProcAddress(GetModuleHandle("Kernel32.dll"), "SignalObjectAndWait") _
-            As *Function(hObjectToSignal As HANDLE, hObjectToWaitOn As HANDLE, dwMilliseconds As DWord, bAlertable As DWord) As DWord
+        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
         If pSignalObjectAndWait = 0 Then
             ' PlatformNotSupportedException
             Debug
-            ExitThread(0)
+            ExitThread(-1)
         End If
-        Return WaitHandle.AfterWait(pSignalAndWait(toSignal.Handle, toWaitOn.Handle, millisecondsTimeout As DWord), 1)
+        Return WaitHandle.AfterWait(pSignalObjectAndWait(toSignal.Handle, toWaitOn.Handle, millisecondsTimeout As DWord, FALSE), 1)
     End Function