From c521db616a947d5d8356288e1b202f416177abe5 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sun, 14 Feb 1999 18:04:20 +0000
Subject: [PATCH] Removed CONSOLE_Ops.

---
 scheduler/k32obj.c |  6 ++----
 win32/console.c    | 37 -------------------------------------
 2 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/scheduler/k32obj.c b/scheduler/k32obj.c
index e64cb89344d..befacfcc901 100644
--- a/scheduler/k32obj.c
+++ b/scheduler/k32obj.c
@@ -16,8 +16,6 @@
 extern const K32OBJ_OPS PROCESS_Ops;
 extern const K32OBJ_OPS THREAD_Ops;
 extern const K32OBJ_OPS MEM_MAPPED_FILE_Ops;
-extern const K32OBJ_OPS CONSOLE_Ops;
-extern const K32OBJ_OPS SNAPSHOT_Ops;
 
 static const K32OBJ_OPS K32OBJ_NullOps =
 {
@@ -43,14 +41,14 @@ const K32OBJ_OPS * const K32OBJ_Ops[K32OBJ_NBOBJECTS] =
     &THREAD_Ops,            /* K32OBJ_THREAD */
     &K32OBJ_DefaultOps,     /* K32OBJ_FILE */
     &K32OBJ_DefaultOps,     /* K32OBJ_CHANGE */
-    &CONSOLE_Ops,           /* K32OBJ_CONSOLE */
+    &K32OBJ_DefaultOps,     /* K32OBJ_CONSOLE */
     &K32OBJ_NullOps,        /* K32OBJ_SCREEN_BUFFER */
     &MEM_MAPPED_FILE_Ops,   /* K32OBJ_MEM_MAPPED_FILE */
     &K32OBJ_NullOps,        /* K32OBJ_SERIAL */
     &K32OBJ_NullOps,        /* K32OBJ_DEVICE_IOCTL */
     &K32OBJ_DefaultOps,     /* K32OBJ_PIPE */
     &K32OBJ_NullOps,        /* K32OBJ_MAILSLOT */
-    &K32OBJ_NullOps,        /* K32OBJ_TOOLHELP_SNAPSHOT */
+    &K32OBJ_DefaultOps,     /* K32OBJ_TOOLHELP_SNAPSHOT */
     &K32OBJ_NullOps         /* K32OBJ_SOCKET */
 };
 
diff --git a/win32/console.c b/win32/console.c
index 68931b3c3f1..3453952b54c 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -52,41 +52,11 @@ typedef struct _CONSOLE {
 	K32OBJ  		header;
 } CONSOLE;
 
-static void CONSOLE_Destroy( K32OBJ *obj );
-
-const K32OBJ_OPS CONSOLE_Ops =
-{
-	CONSOLE_Destroy		/* destroy */
-};
-
 /* FIXME:  Should be in an internal header file.  OK, so which one?
    Used by CONSOLE_makecomplex. */
 FILE *wine_openpty(int *master, int *slave, char *name,
                    struct termios *term, struct winsize *winsize);
 
-/***********************************************************************
- * CONSOLE_Destroy
- */
-static void CONSOLE_Destroy(K32OBJ *obj)
-{
-	CONSOLE *console = (CONSOLE *)obj;
-	assert(obj->type == K32OBJ_CONSOLE);
-
-	obj->type = K32OBJ_UNKNOWN;
-
-	HeapFree(SystemHeap, 0, console);
-}
-
-
-/***********************************************************************
- * CONSOLE_GetPtr
- */
-static CONSOLE *CONSOLE_GetPtr( HANDLE32 handle )
-{
-    return (CONSOLE*)HANDLE_GetObjPtr( PROCESS_Current(), handle,
-                                       K32OBJ_CONSOLE, 0, NULL );
-}
-
 /****************************************************************************
  *		CONSOLE_GetInfo
  */
@@ -1279,15 +1249,8 @@ BOOL32 WINAPI SetConsoleCursorPosition( HANDLE32 hcon, COORD pos )
  */
 BOOL32 WINAPI GetNumberOfConsoleInputEvents(HANDLE32 hcon,LPDWORD nrofevents)
 {
-    CONSOLE *console = CONSOLE_GetPtr( hcon );
-
-    if (!console) {
-    	FIXME(console,"(%d,%p), no console handle!\n",hcon,nrofevents);
-    	return FALSE;
-    }
     CONSOLE_get_input(hcon,FALSE);
     *nrofevents = 1; /* UMM */
-    K32OBJ_DecCount(&console->header);
     return TRUE;
 }