Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 07:23:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implemented SignalObjectAndWait().

Browse source 
Added some checks for console handles.

svn path=/trunk/; revision=4247
This commit is contained in:
Eric Kohl 2003-03-06 13:01:15 +00:00
parent bceffa7c9b
commit 916b14c816
2 changed files with 249 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/lib/kernel32/file/file.c
View file

@ -1,4 +1,4 @@
/* $Id: file.c,v 1.41 2003/02/12 00:39:31 hyperion Exp $
/* $Id: file.c,v 1.42 2003/03/06 13:00:51 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@ -249,29 +249,26 @@ GetFileType(HANDLE hFile)
IO_STATUS_BLOCK StatusBlock;
NTSTATUS Status;
/* get real handle */
/* Get real handle */
switch ((ULONG)hFile)
{
case STD_INPUT_HANDLE:
hFile = NtCurrentPeb()->ProcessParameters->hStdInput;
break;
case STD_OUTPUT_HANDLE:
hFile = NtCurrentPeb()->ProcessParameters->hStdOutput;
break;
case STD_ERROR_HANDLE:
hFile = NtCurrentPeb()->ProcessParameters->hStdError;
break;
}
/* check console handles */
/* Check for console handle */
if (IsConsoleHandle(hFile))
{
// if (VerifyConsoleHandle(hFile))
if (VerifyConsoleIoHandle(hFile))
return FILE_TYPE_CHAR;
}

169
reactos/lib/kernel32/synch/wait.c
View file

@ -1,4 +1,4 @@
/* $Id: wait.c,v 1.20 2003/02/27 15:40:46 gdalsnes Exp $
/* $Id: wait.c,v 1.21 2003/03/06 13:01:15 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@ -33,9 +33,36 @@ WaitForSingleObjectEx(HANDLE hHandle,
DWORD dwMilliseconds,
BOOL bAlertable)
{
NTSTATUS errCode;
PLARGE_INTEGER TimePtr;
LARGE_INTEGER Time;
NTSTATUS Status;
/* Get real handle */
switch ((ULONG)hHandle)
{
case STD_INPUT_HANDLE:
hHandle = NtCurrentPeb()->ProcessParameters->hStdInput;
break;
case STD_OUTPUT_HANDLE:
hHandle = NtCurrentPeb()->ProcessParameters->hStdOutput;
break;
case STD_ERROR_HANDLE:
hHandle = NtCurrentPeb()->ProcessParameters->hStdError;
break;
}
/* Check for console handle */
if (IsConsoleHandle(hHandle))
{
if (VerifyConsoleIoHandle(hHandle))
{
DPRINT1("Console handles are not supported yet!\n");
SetLastError(ERROR_INVALID_HANDLE);
return WAIT_FAILED;
}
}
if (dwMilliseconds == INFINITE)
{
@ -47,22 +74,22 @@ WaitForSingleObjectEx(HANDLE hHandle,
TimePtr = &Time;
}
errCode = NtWaitForSingleObject(hHandle,
Status = NtWaitForSingleObject(hHandle,
(BOOLEAN) bAlertable,
TimePtr);
if (errCode == STATUS_TIMEOUT)
if (Status == STATUS_TIMEOUT)
{
return WAIT_TIMEOUT;
}
else if ((errCode == WAIT_OBJECT_0) ||
(errCode == WAIT_ABANDONED_0))
else if ((Status == WAIT_OBJECT_0) ||
(Status == WAIT_ABANDONED_0))
{
return(errCode);
return Status;
}
SetLastErrorByStatus (errCode);
SetLastErrorByStatus (Status);
return(WAIT_FAILED);
return WAIT_FAILED;
}
@ -87,12 +114,55 @@ WaitForMultipleObjectsEx(DWORD nCount,
DWORD dwMilliseconds,
BOOL bAlertable)
{
NTSTATUS errCode;
LARGE_INTEGER Time;
PLARGE_INTEGER TimePtr;
LARGE_INTEGER Time;
PHANDLE HandleBuffer;
DWORD i;
NTSTATUS Status;
DPRINT("nCount %lu\n", nCount);
HandleBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, nCount * sizeof(HANDLE));
if (HandleBuffer == NULL)
{
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return WAIT_FAILED;
}
for (i = 0; i < nCount; i++)
{
switch ((DWORD)lpHandles[i])
{
case STD_INPUT_HANDLE:
HandleBuffer[i] = NtCurrentPeb()->ProcessParameters->hStdInput;
break;
case STD_OUTPUT_HANDLE:
HandleBuffer[i] = NtCurrentPeb()->ProcessParameters->hStdOutput;
break;
case STD_ERROR_HANDLE:
HandleBuffer[i] = NtCurrentPeb()->ProcessParameters->hStdError;
break;
default:
HandleBuffer[i] = lpHandles[i];
break;
}
/* Check for console handle */
if (IsConsoleHandle(HandleBuffer[i]))
{
if (VerifyConsoleIoHandle(HandleBuffer[i]))
{
DPRINT1("Console handles are not supported yet!\n");
RtlFreeHeap(RtlGetProcessHeap(), 0, HandleBuffer);
SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
}
}
if (dwMilliseconds == INFINITE)
{
TimePtr = NULL;
@ -103,28 +173,30 @@ WaitForMultipleObjectsEx(DWORD nCount,
TimePtr = &Time;
}
errCode = NtWaitForMultipleObjects (nCount,
(PHANDLE)lpHandles,
Status = NtWaitForMultipleObjects (nCount,
HandleBuffer,
bWaitAll ? WaitAll : WaitAny,
(BOOLEAN)bAlertable,
TimePtr);
if (errCode == STATUS_TIMEOUT)
RtlFreeHeap(RtlGetProcessHeap(), 0, HandleBuffer);
if (Status == STATUS_TIMEOUT)
{
return WAIT_TIMEOUT;
}
else if (((errCode >= WAIT_OBJECT_0) &&
(errCode <= WAIT_OBJECT_0 + nCount - 1)) ||
((errCode >= WAIT_ABANDONED_0) &&
(errCode <= WAIT_ABANDONED_0 + nCount - 1)))
else if (((Status >= WAIT_OBJECT_0) &&
(Status <= WAIT_OBJECT_0 + nCount - 1)) ||
((Status >= WAIT_ABANDONED_0) &&
(Status <= WAIT_ABANDONED_0 + nCount - 1)))
{
return(errCode);
return Status;
}
DPRINT("errCode %lx\n", errCode);
SetLastErrorByStatus (errCode);
DPRINT("Status %lx\n", Status);
SetLastErrorByStatus (Status);
return(WAIT_FAILED);
return WAIT_FAILED;
}
@ -134,7 +206,58 @@ SignalObjectAndWait(HANDLE hObjectToSignal,
DWORD dwMilliseconds,
BOOL bAlertable)
{
UNIMPLEMENTED
PLARGE_INTEGER TimePtr;
LARGE_INTEGER Time;
NTSTATUS Status;
/* Get real handle */
switch ((ULONG)hObjectToWaitOn)
{
case STD_INPUT_HANDLE:
hObjectToWaitOn = NtCurrentPeb()->ProcessParameters->hStdInput;
break;
case STD_OUTPUT_HANDLE:
hObjectToWaitOn = NtCurrentPeb()->ProcessParameters->hStdOutput;
break;
case STD_ERROR_HANDLE:
hObjectToWaitOn = NtCurrentPeb()->ProcessParameters->hStdError;
break;
}
/* Check for console handle */
if (IsConsoleHandle(hObjectToWaitOn))
{
if (VerifyConsoleIoHandle(hObjectToWaitOn))
{
DPRINT1("Console handles are not supported yet!\n");
SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
}
if (dwMilliseconds == INFINITE)
{
TimePtr = NULL;
}
else
{
Time.QuadPart = -10000 * dwMilliseconds;
TimePtr = &Time;
}
Status = NtSignalAndWaitForSingleObject (hObjectToSignal,
hObjectToWaitOn,
TimePtr,
(BOOLEAN)bAlertable);
if (!NT_SUCCESS(Status))
{
SetLastErrorByStatus (Status);
return FALSE;
}
return TRUE;
}
/* EOF */