Author: ion
Date: Sat Jul 23 10:16:10 2011
New Revision: 52797
URL: http://svn.reactos.org/svn/reactos?rev=52797&view=rev
Log:
[KERNEL32]: Fix bugs #22, #23, #24, #25: (Un)RegisterWait(Ex) APIs were not
checking for an invalid wait handle.
[KERNEL32]: Fix bugs #26, #27: RegisterWait(Ex) was not calling
GetConsoleInputWaitHandle, so waits on console handles were given straight to
the kernel (which obvioulsy doesn't grok them).
[KERNEL32]: Fix bugs #28, #29: UnRegisterWait(Ex) was not checking for
STATUS_PENDING, which is a "warning" in NT, but an error as far as this API is
concerned, so FALSE should be returned.
Modified:
trunk/reactos/dll/win32/kernel32/client/synch.c
Modified: trunk/reactos/dll/win32/kernel32/client/synch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/synch.c?rev=52797&r1=52796&r2=52797&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] Sat Jul 23
10:16:10 2011
@@ -7,8 +7,6 @@
*/
/* INCLUDES *****************************************************************/
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x600
#include <k32.h>
#define NDEBUG
@@ -687,103 +685,144 @@
*/
BOOL
WINAPI
-RegisterWaitForSingleObject(
- PHANDLE phNewWaitObject,
- HANDLE hObject,
- WAITORTIMERCALLBACK Callback,
- PVOID Context,
- ULONG dwMilliseconds,
- ULONG dwFlags
- )
-{
- NTSTATUS Status = RtlRegisterWait(phNewWaitObject,
- hObject,
- Callback,
- Context,
- dwMilliseconds,
- dwFlags);
-
+RegisterWaitForSingleObject(OUT PHANDLE phNewWaitObject,
+ IN HANDLE hObject,
+ IN WAITORTIMERCALLBACK Callback,
+ IN PVOID Context,
+ IN ULONG dwMilliseconds,
+ IN ULONG dwFlags)
+{
+ NTSTATUS Status;
+
+ /* Get real handle */
+ hObject = TranslateStdHandle(hObject);
+
+ /* Check for console handle */
+ if ((IsConsoleHandle(hObject)) && (VerifyConsoleIoHandle(hObject)))
+ {
+ /* Get the real wait handle */
+ hObject = GetConsoleInputWaitHandle();
+ }
+
+ /* Register the wait now */
+ Status = RtlRegisterWait(phNewWaitObject,
+ hObject,
+ Callback,
+ Context,
+ dwMilliseconds,
+ dwFlags);
if (!NT_SUCCESS(Status))
{
+ /* Return failure */
SetLastErrorByStatus(Status);
return FALSE;
}
+
+ /* All good */
return TRUE;
}
-
-/*
- * @implemented
- */
-HANDLE
-WINAPI
-RegisterWaitForSingleObjectEx(
- HANDLE hObject,
- WAITORTIMERCALLBACK Callback,
- PVOID Context,
- ULONG dwMilliseconds,
- ULONG dwFlags
- )
+/*
+ * @implemented
+ */
+HANDLE
+WINAPI
+RegisterWaitForSingleObjectEx(IN HANDLE hObject,
+ IN WAITORTIMERCALLBACK Callback,
+ IN PVOID Context,
+ IN ULONG dwMilliseconds,
+ IN ULONG dwFlags)
{
NTSTATUS Status;
HANDLE hNewWaitObject;
+ /* Get real handle */
+ hObject = TranslateStdHandle(hObject);
+
+ /* Check for console handle */
+ if ((IsConsoleHandle(hObject)) && (VerifyConsoleIoHandle(hObject)))
+ {
+ /* Get the real wait handle */
+ hObject = GetConsoleInputWaitHandle();
+ }
+
+ /* Register the wait */
Status = RtlRegisterWait(&hNewWaitObject,
hObject,
Callback,
Context,
dwMilliseconds,
dwFlags);
-
if (!NT_SUCCESS(Status))
{
+ /* Return failure */
SetLastErrorByStatus(Status);
return NULL;
}
+ /* Return the object */
return hNewWaitObject;
}
-
-/*
- * @implemented
- */
-BOOL
-WINAPI
-UnregisterWait(
- HANDLE WaitHandle
- )
-{
- NTSTATUS Status = RtlDeregisterWaitEx(WaitHandle, NULL);
-
- if (!NT_SUCCESS(Status))
- {
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+UnregisterWait(IN HANDLE WaitHandle)
+{
+ NTSTATUS Status;
+
+ /* Check for invalid handle */
+ if (!WaitHandle)
+ {
+ /* Fail */
+ SetLastError(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+
+ /* Deregister the wait and check status */
+ Status = RtlDeregisterWaitEx(WaitHandle, NULL);
+ if (!(NT_SUCCESS(Status)) || (Status == STATUS_PENDING))
+ {
+ /* Failure or non-blocking call */
SetLastErrorByStatus(Status);
return FALSE;
}
+ /* All good */
return TRUE;
}
-
-/*
- * @implemented
- */
-BOOL
-WINAPI
-UnregisterWaitEx(
- HANDLE WaitHandle,
- HANDLE CompletionEvent
- )
-{
- NTSTATUS Status = RtlDeregisterWaitEx(WaitHandle, CompletionEvent);
-
- if (!NT_SUCCESS(Status))
- {
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+UnregisterWaitEx(IN HANDLE WaitHandle,
+ IN HANDLE CompletionEvent)
+{
+ NTSTATUS Status;
+
+ /* Check for invalid handle */
+ if (!WaitHandle)
+ {
+ /* Fail */
+ SetLastError(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+
+ /* Deregister the wait and check status */
+ Status = RtlDeregisterWaitEx(WaitHandle, CompletionEvent);
+ if (!(NT_SUCCESS(Status)) ||
+ ((CompletionEvent != INVALID_HANDLE_VALUE) && (Status ==
STATUS_PENDING)))
+ {
+ /* Failure or non-blocking call */
SetLastErrorByStatus(Status);
return FALSE;
}
+ /* All good */
return TRUE;
}
