ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 12:23:30 +00:00
Code Issues Packages Projects Releases 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
dll/win32/kernel32/client/console/console.c
-17
View File
@@ -381,23 +381,6 @@ HANDLE
WINAPI
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;
}
include/reactos/subsys/win/conmsg.h
-10
View File
@@ -425,13 +425,6 @@ typedef struct
DWORD ShareMode;
} CONSOLE_OPENCONSOLE, *PCONSOLE_OPENCONSOLE;
#if 0
typedef struct
{
HANDLE InputWaitHandle;
} CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE;
#endif
/*
* Console hardware states.
@@ -576,9 +569,6 @@ typedef struct _CONSOLE_API_MESSAGE
CONSOLE_CLOSEHANDLE CloseHandleRequest;
CONSOLE_VERIFYHANDLE VerifyHandleRequest;
CONSOLE_DUPLICATEHANDLE DuplicateHandleRequest;
#if 0
CSRSS_GET_INPUT_WAIT_HANDLE GetConsoleInputWaitHandle;
#endif
/* Cursor */
CONSOLE_GETSETCURSORINFO CursorInfoRequest;
subsystems/win/basesrv/dosdev.c
+2 -2
View File
@@ -99,7 +99,7 @@ CSR_API(BaseSrvDefineDosDevice)
DWORD dwFlags;
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->DeviceName,
&DefineDosDeviceRequest->TargetName);
@@ -549,7 +549,7 @@ CSR_API(BaseSrvDefineDosDevice)
}
_SEH2_END
DPRINT("CsrDefineDosDevice Exit, Statux: 0x%x\n", Status);
DPRINT("BaseSrvDefineDosDevice exit, Status: 0x%x\n", Status);
return Status;
}
subsystems/win/basesrv/proc.c
+2 -2
View File
@@ -17,11 +17,11 @@
CSR_API(BaseSrvGetTempFile)
{
static UINT CsrGetTempFileUnique = 0;
static UINT BaseGetTempFileUnique = 0;
PBASE_GET_TEMP_FILE GetTempFile = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetTempFile;
/* Return 16-bits ID */
GetTempFile->UniqueID = (++CsrGetTempFileUnique & 0xFFFF);
GetTempFile->UniqueID = (++BaseGetTempFileUnique & 0xFFFF);
DPRINT("Returning: %u\n", GetTempFile->UniqueID);
win32ss/user/consrv/consrv.h
-1
View File
@@ -148,7 +148,6 @@ CSR_API(SrvGetConsoleSelectionInfo);
CSR_API(SrvCloseHandle);
CSR_API(SrvVerifyConsoleIoHandle);
CSR_API(SrvDuplicateHandle);
/// CSR_API(CsrGetInputWaitHandle);
NTSTATUS FASTCALL ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData,
OUT PHANDLE pInputHandle,
win32ss/user/consrv/handle.c
-12
View File
@@ -856,16 +856,4 @@ CSR_API(SrvDuplicateHandle)
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 */