[hbelusca] 58454: [KERNEL32-CONSRV] Remove the old implementation of GetConsoleInputWaitHandle which was commented-out for some time. [BASESRV] Correct few names.
Author: hbelusca Date: Sat Mar 9 21:21:37 2013 New Revision: 58454
URL: http://svn.reactos.org/svn/reactos?rev=58454&view=rev Log: [KERNEL32-CONSRV] Remove the old implementation of GetConsoleInputWaitHandle which was commented-out for some time.
[BASESRV] Correct few names.
Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/subsystems/win/basesrv/dosdev.c branches/ros-csrss/subsystems/win/basesrv/proc.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/handle.c
Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cli... ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sat Mar 9 21:21:37 2013 @@ -381,23 +381,6 @@ 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; }
Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsys... ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sat Mar 9 21:21:37 2013 @@ -425,13 +425,6 @@ 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 @@ CONSOLE_CLOSEHANDLE CloseHandleRequest; CONSOLE_VERIFYHANDLE VerifyHandleRequest; CONSOLE_DUPLICATEHANDLE DuplicateHandleRequest; -#if 0 - CSRSS_GET_INPUT_WAIT_HANDLE GetConsoleInputWaitHandle; -#endif
/* Cursor */ CONSOLE_GETSETCURSORINFO CursorInfoRequest;
Modified: branches/ros-csrss/subsystems/win/basesrv/dosdev.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesrv... ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/dosdev.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/dosdev.c [iso-8859-1] Sat Mar 9 21:21:37 2013 @@ -99,7 +99,7 @@ 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 @@ } _SEH2_END
- DPRINT("CsrDefineDosDevice Exit, Statux: 0x%x\n", Status); + DPRINT("BaseSrvDefineDosDevice exit, Status: 0x%x\n", Status); return Status; }
Modified: branches/ros-csrss/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesrv... ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/proc.c [iso-8859-1] Sat Mar 9 21:21:37 2013 @@ -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);
Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/co... ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Sat Mar 9 21:21:37 2013 @@ -148,7 +148,6 @@ CSR_API(SrvCloseHandle); CSR_API(SrvVerifyConsoleIoHandle); CSR_API(SrvDuplicateHandle); -/// CSR_API(CsrGetInputWaitHandle);
NTSTATUS FASTCALL ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, OUT PHANDLE pInputHandle,
Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/ha... ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sat Mar 9 21:21:37 2013 @@ -856,16 +856,4 @@ 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 */
-
hbelusca＠svn.reactos.org