Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32-CONSRV]

Browse source 
Remove the old implementation of GetConsoleInputWaitHandle which was commented-out for some time.

[BASESRV]
Correct few names.

svn path=/branches/ros-csrss/; revision=58454
This commit is contained in:
Hermès Bélusca-Maïto 2013-03-09 21:21:37 +00:00
parent c708f46621
commit 62f4efcc97
6 changed files with 4 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dll/win32/kernel32/client/console/console.c
View file

@ -381,23 +381,6 @@ HANDLE
WINAPI WINAPI
GetConsoleInputWaitHandle(VOID) GetConsoleInputWaitHandle(VOID)
{ {
#if 0
NTSTATUS Status;
CONSOLE_API_MESSAGE ApiMessage;
Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, GET_INPUT_WAIT_HANDLE),
sizeof(CSRSS_GET_INPUT_WAIT_HANDLE));
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
{
BaseSetLastNTError(Status);
return 0;
}
return ApiMessage.Data.GetConsoleInputWaitHandle.InputWaitHandle;
#endif
return InputWaitHandle; return InputWaitHandle;
} }

10
include/reactos/subsys/win/conmsg.h
View file

@ -425,13 +425,6 @@ typedef struct
DWORD ShareMode; DWORD ShareMode;
} CONSOLE_OPENCONSOLE, *PCONSOLE_OPENCONSOLE; } CONSOLE_OPENCONSOLE, *PCONSOLE_OPENCONSOLE;
#if 0
typedef struct
{
HANDLE InputWaitHandle;
} CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE;
#endif
/* /*
* Console hardware states. * Console hardware states.
@ -576,9 +569,6 @@ typedef struct _CONSOLE_API_MESSAGE
CONSOLE_CLOSEHANDLE CloseHandleRequest; CONSOLE_CLOSEHANDLE CloseHandleRequest;
CONSOLE_VERIFYHANDLE VerifyHandleRequest; CONSOLE_VERIFYHANDLE VerifyHandleRequest;
CONSOLE_DUPLICATEHANDLE DuplicateHandleRequest; CONSOLE_DUPLICATEHANDLE DuplicateHandleRequest;
#if 0
CSRSS_GET_INPUT_WAIT_HANDLE GetConsoleInputWaitHandle;
#endif
/* Cursor */ /* Cursor */
CONSOLE_GETSETCURSORINFO CursorInfoRequest; CONSOLE_GETSETCURSORINFO CursorInfoRequest;

4
subsystems/win/basesrv/dosdev.c
View file

@ -99,7 +99,7 @@ CSR_API(BaseSrvDefineDosDevice)
DWORD dwFlags; DWORD dwFlags;
PWSTR lpBuffer; PWSTR lpBuffer;
DPRINT("CsrDefineDosDevice entered, Flags:%d, DeviceName:%wZ, TargetName:%wZ\n", DPRINT("BaseSrvDefineDosDevice entered, Flags:%d, DeviceName:%wZ, TargetName:%wZ\n",
DefineDosDeviceRequest->dwFlags, DefineDosDeviceRequest->dwFlags,
&DefineDosDeviceRequest->DeviceName, &DefineDosDeviceRequest->DeviceName,
&DefineDosDeviceRequest->TargetName); &DefineDosDeviceRequest->TargetName);
@ -549,7 +549,7 @@ CSR_API(BaseSrvDefineDosDevice)
} }
_SEH2_END _SEH2_END
DPRINT("CsrDefineDosDevice Exit, Statux: 0x%x\n", Status); DPRINT("BaseSrvDefineDosDevice exit, Status: 0x%x\n", Status);
return Status; return Status;
} }

4
subsystems/win/basesrv/proc.c
View file

@ -17,11 +17,11 @@
CSR_API(BaseSrvGetTempFile) CSR_API(BaseSrvGetTempFile)
{ {
static UINT CsrGetTempFileUnique = 0; static UINT BaseGetTempFileUnique = 0;
PBASE_GET_TEMP_FILE GetTempFile = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetTempFile; PBASE_GET_TEMP_FILE GetTempFile = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetTempFile;
/* Return 16-bits ID */ /* Return 16-bits ID */
GetTempFile->UniqueID = (++CsrGetTempFileUnique & 0xFFFF); GetTempFile->UniqueID = (++BaseGetTempFileUnique & 0xFFFF);
DPRINT("Returning: %u\n", GetTempFile->UniqueID); DPRINT("Returning: %u\n", GetTempFile->UniqueID);

1
win32ss/user/consrv/consrv.h
View file

@ -148,7 +148,6 @@ CSR_API(SrvGetConsoleSelectionInfo);
CSR_API(SrvCloseHandle); CSR_API(SrvCloseHandle);
CSR_API(SrvVerifyConsoleIoHandle); CSR_API(SrvVerifyConsoleIoHandle);
CSR_API(SrvDuplicateHandle); CSR_API(SrvDuplicateHandle);
/// CSR_API(CsrGetInputWaitHandle);
NTSTATUS FASTCALL ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, NTSTATUS FASTCALL ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData,
OUT PHANDLE pInputHandle, OUT PHANDLE pInputHandle,

12
win32ss/user/consrv/handle.c
View file

@ -856,16 +856,4 @@ CSR_API(SrvDuplicateHandle)
return ApiMessage->Status; return ApiMessage->Status;
} }
/**
CSR_API(CsrGetInputWaitHandle)
{
PCSRSS_GET_INPUT_WAIT_HANDLE GetConsoleInputWaitHandle = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetConsoleInputWaitHandle;
GetConsoleInputWaitHandle->InputWaitHandle =
ConsoleGetPerProcessData(CsrGetClientThread()->Process)->ConsoleEvent;
return STATUS_SUCCESS;
}
**/
/* EOF */ /* EOF */