[hbelusca] 62843: [KERNEL32][CONSRV] Implement console part of Get/SetHandleInformation, needed by msvcrt / cmd.exe (at least the windows version) and other console apps...
20 Apr
2014
20 Apr
'14
2:39 p.m.
Author: hbelusca
Date: Sun Apr 20 14:39:38 2014
New Revision: 62843
URL: http://svn.reactos.org/svn/reactos?rev=62843&view=rev
Log:
[KERNEL32][CONSRV]
Implement console part of Get/SetHandleInformation, needed by msvcrt / cmd.exe (at least
the windows version) and other console apps...
Modified:
trunk/reactos/dll/win32/kernel32/client/console/console.c
trunk/reactos/dll/win32/kernel32/client/handle.c
trunk/reactos/dll/win32/kernel32/include/console.h
trunk/reactos/include/reactos/subsys/win/conmsg.h
trunk/reactos/win32ss/user/winsrv/consrv/handle.c
Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sun Apr 20
14:39:38 2014
@@ -305,6 +305,67 @@
}
return DuplicateHandleRequest->TargetHandle;
+}
+
+
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+GetConsoleHandleInformation(IN HANDLE hHandle,
+ OUT LPDWORD lpdwFlags)
+{
+ CONSOLE_API_MESSAGE ApiMessage;
+ PCONSOLE_GETHANDLEINFO GetHandleInfoRequest =
&ApiMessage.Data.GetHandleInfoRequest;
+
+ GetHandleInfoRequest->ConsoleHandle =
NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+ GetHandleInfoRequest->Handle = hHandle;
+
+ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+ NULL,
+ CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX,
ConsolepGetHandleInformation),
+ sizeof(*GetHandleInfoRequest));
+ if (!NT_SUCCESS(ApiMessage.Status))
+ {
+ BaseSetLastNTError(ApiMessage.Status);
+ return FALSE;
+ }
+
+ *lpdwFlags = GetHandleInfoRequest->Flags;
+
+ return TRUE;
+}
+
+
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+SetConsoleHandleInformation(IN HANDLE hHandle,
+ IN DWORD dwMask,
+ IN DWORD dwFlags)
+{
+ CONSOLE_API_MESSAGE ApiMessage;
+ PCONSOLE_SETHANDLEINFO SetHandleInfoRequest =
&ApiMessage.Data.SetHandleInfoRequest;
+
+ SetHandleInfoRequest->ConsoleHandle =
NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+ SetHandleInfoRequest->Handle = hHandle;
+ SetHandleInfoRequest->Mask = dwMask;
+ SetHandleInfoRequest->Flags = dwFlags;
+
+ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+ NULL,
+ CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX,
ConsolepSetHandleInformation),
+ sizeof(*SetHandleInfoRequest));
+ if (!NT_SUCCESS(ApiMessage.Status))
+ {
+ BaseSetLastNTError(ApiMessage.Status);
+ return FALSE;
+ }
+
+ return TRUE;
}
Modified: trunk/reactos/dll/win32/kernel32/client/handle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/handle.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/handle.c [iso-8859-1] Sun Apr 20 14:39:38
2014
@@ -50,10 +50,7 @@
if (IsConsoleHandle(hObject))
{
- /* FIXME: GetConsoleHandleInformation required */
- UNIMPLEMENTED;
- BaseSetLastNTError(STATUS_NOT_IMPLEMENTED);
- return FALSE;
+ return GetConsoleHandleInformation(hObject, lpdwFlags);
}
Status = NtQueryObject(hObject,
@@ -91,10 +88,7 @@
if (IsConsoleHandle(hObject))
{
- /* FIXME: SetConsoleHandleInformation required */
- UNIMPLEMENTED;
- BaseSetLastNTError(STATUS_NOT_IMPLEMENTED);
- return FALSE;
+ return SetConsoleHandleInformation(hObject, dwMask, dwFlags);
}
Status = NtQueryObject(hObject,
Modified: trunk/reactos/dll/win32/kernel32/include/console.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/include/console.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/include/console.h [iso-8859-1] Sun Apr 20 14:39:38
2014
@@ -39,6 +39,15 @@
DWORD dwOptions);
BOOL WINAPI
+GetConsoleHandleInformation(IN HANDLE hHandle,
+ OUT LPDWORD lpdwFlags);
+
+BOOL WINAPI
+SetConsoleHandleInformation(IN HANDLE hHandle,
+ IN DWORD dwMask,
+ IN DWORD dwFlags);
+
+BOOL WINAPI
VerifyConsoleIoHandle(HANDLE Handle);
BOOL WINAPI
Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win…
==============================================================================
--- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sun Apr 20 14:39:38
2014
@@ -547,6 +547,21 @@
HANDLE TargetHandle;
} CONSOLE_DUPLICATEHANDLE, *PCONSOLE_DUPLICATEHANDLE;
+typedef struct
+{
+ HANDLE ConsoleHandle;
+ HANDLE Handle;
+ DWORD Flags;
+} CONSOLE_GETHANDLEINFO, *PCONSOLE_GETHANDLEINFO;
+
+typedef struct
+{
+ HANDLE ConsoleHandle;
+ HANDLE Handle;
+ DWORD Mask;
+ DWORD Flags;
+} CONSOLE_SETHANDLEINFO, *PCONSOLE_SETHANDLEINFO;
+
/*
* Type of handles.
*/
@@ -748,6 +763,8 @@
CONSOLE_CLOSEHANDLE CloseHandleRequest;
CONSOLE_VERIFYHANDLE VerifyHandleRequest;
CONSOLE_DUPLICATEHANDLE DuplicateHandleRequest;
+ CONSOLE_GETHANDLEINFO GetHandleInfoRequest;
+ CONSOLE_SETHANDLEINFO SetHandleInfoRequest;
/* Cursor */
CONSOLE_SHOWCURSOR ShowCursorRequest;
Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Sun Apr 20 14:39:38
2014
@@ -377,7 +377,6 @@
HANDLE Handle)
{
ULONG Index = HandleToULong(Handle) >> 2;
- PCONSOLE_IO_OBJECT Object;
RtlEnterCriticalSection(&ProcessData->HandleTableLock);
@@ -386,7 +385,7 @@
// (ProcessData->HandleTable != NULL &&
ProcessData->HandleTableSize != 0) );
if (Index >= ProcessData->HandleTableSize ||
- (Object = ProcessData->HandleTable[Index].Object) == NULL)
+ ProcessData->HandleTable[Index].Object == NULL)
{
RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
return STATUS_INVALID_HANDLE;
@@ -814,14 +813,100 @@
CSR_API(SrvGetHandleInformation)
{
- DPRINT1("%s not yet implemented\n", __FUNCTION__);
- return STATUS_NOT_IMPLEMENTED;
+ NTSTATUS Status;
+ PCONSOLE_GETHANDLEINFO GetHandleInfoRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetHandleInfoRequest;
+ PCONSOLE_PROCESS_DATA ProcessData =
ConsoleGetPerProcessData(CsrGetClientThread()->Process);
+ PCONSOLE Console;
+
+ HANDLE Handle = GetHandleInfoRequest->Handle;
+ ULONG Index = HandleToULong(Handle) >> 2;
+ PCONSOLE_IO_HANDLE Entry;
+
+ Status = ConSrvGetConsole(ProcessData, &Console, TRUE);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("Can't get console\n");
+ return Status;
+ }
+
+ RtlEnterCriticalSection(&ProcessData->HandleTableLock);
+
+ ASSERT(ProcessData->HandleTable);
+ // ASSERT( (ProcessData->HandleTable == NULL &&
ProcessData->HandleTableSize == 0) ||
+ // (ProcessData->HandleTable != NULL &&
ProcessData->HandleTableSize != 0) );
+
+ if (!IsConsoleHandle(Handle) ||
+ Index >= ProcessData->HandleTableSize ||
+ (Entry = &ProcessData->HandleTable[Index])->Object == NULL)
+ {
+ Status = STATUS_INVALID_HANDLE;
+ goto Quit;
+ }
+
+ /*
+ * Retrieve the handle information flags. The console server
+ * doesn't support HANDLE_FLAG_PROTECT_FROM_CLOSE.
+ */
+ GetHandleInfoRequest->Flags = 0;
+ if (Entry->Inheritable) GetHandleInfoRequest->Flags |= HANDLE_FLAG_INHERIT;
+
+ Status = STATUS_SUCCESS;
+
+Quit:
+ RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
+
+ ConSrvReleaseConsole(Console, TRUE);
+ return Status;
}
CSR_API(SrvSetHandleInformation)
{
- DPRINT1("%s not yet implemented\n", __FUNCTION__);
- return STATUS_NOT_IMPLEMENTED;
+ NTSTATUS Status;
+ PCONSOLE_SETHANDLEINFO SetHandleInfoRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHandleInfoRequest;
+ PCONSOLE_PROCESS_DATA ProcessData =
ConsoleGetPerProcessData(CsrGetClientThread()->Process);
+ PCONSOLE Console;
+
+ HANDLE Handle = SetHandleInfoRequest->Handle;
+ ULONG Index = HandleToULong(Handle) >> 2;
+ PCONSOLE_IO_HANDLE Entry;
+
+ Status = ConSrvGetConsole(ProcessData, &Console, TRUE);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("Can't get console\n");
+ return Status;
+ }
+
+ RtlEnterCriticalSection(&ProcessData->HandleTableLock);
+
+ ASSERT(ProcessData->HandleTable);
+ // ASSERT( (ProcessData->HandleTable == NULL &&
ProcessData->HandleTableSize == 0) ||
+ // (ProcessData->HandleTable != NULL &&
ProcessData->HandleTableSize != 0) );
+
+ if (!IsConsoleHandle(Handle) ||
+ Index >= ProcessData->HandleTableSize ||
+ (Entry = &ProcessData->HandleTable[Index])->Object == NULL)
+ {
+ Status = STATUS_INVALID_HANDLE;
+ goto Quit;
+ }
+
+ /*
+ * Modify the handle information flags. The console server
+ * doesn't support HANDLE_FLAG_PROTECT_FROM_CLOSE.
+ */
+ if (SetHandleInfoRequest->Mask & HANDLE_FLAG_INHERIT)
+ {
+ Entry->Inheritable = ((SetHandleInfoRequest->Flags &
HANDLE_FLAG_INHERIT) != 0);
+ }
+
+ Status = STATUS_SUCCESS;
+
+Quit:
+ RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
+
+ ConSrvReleaseConsole(Console, TRUE);
+ return Status;
}
CSR_API(SrvCloseHandle)
3906
days inactive
3906
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org