From: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Date: Sat, 9 Mar 2013 21:21:37 +0000 (+0000)
Subject: [KERNEL32-CONSRV]
X-Git-Tag: backups/ros-csrss@60644~43
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=62f4efcc97f01bb4e5d5b4573da01f765462f414

[KERNEL32-CONSRV]
Remove the old implementation of GetConsoleInputWaitHandle which was commented-out for some time.

[BASESRV]
Correct few names.

svn path=/branches/ros-csrss/; revision=58454
---

diff --git a/dll/win32/kernel32/client/console/console.c b/dll/win32/kernel32/client/console/console.c
index 9dc56290943..d27b8d5fa6b 100644
--- a/dll/win32/kernel32/client/console/console.c
+++ b/dll/win32/kernel32/client/console/console.c
@@ -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;
 }
 
diff --git a/include/reactos/subsys/win/conmsg.h b/include/reactos/subsys/win/conmsg.h
index 2417aefbffa..9b8fe746e2d 100644
--- a/include/reactos/subsys/win/conmsg.h
+++ b/include/reactos/subsys/win/conmsg.h
@@ -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;
diff --git a/subsystems/win/basesrv/dosdev.c b/subsystems/win/basesrv/dosdev.c
index dd31b8f5f4d..dd4a8019f9c 100644
--- a/subsystems/win/basesrv/dosdev.c
+++ b/subsystems/win/basesrv/dosdev.c
@@ -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;
 }
 
diff --git a/subsystems/win/basesrv/proc.c b/subsystems/win/basesrv/proc.c
index 41a0dea7631..b302260e177 100644
--- a/subsystems/win/basesrv/proc.c
+++ b/subsystems/win/basesrv/proc.c
@@ -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);
 
diff --git a/win32ss/user/consrv/consrv.h b/win32ss/user/consrv/consrv.h
index 67c64ab28e1..442eda7dd32 100644
--- a/win32ss/user/consrv/consrv.h
+++ b/win32ss/user/consrv/consrv.h
@@ -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,
diff --git a/win32ss/user/consrv/handle.c b/win32ss/user/consrv/handle.c
index 44a4fba0619..9c1536cb836 100644
--- a/win32ss/user/consrv/handle.c
+++ b/win32ss/user/consrv/handle.c
@@ -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 */