commit 96c08d817c598eb5c0056389ae209613ebb19e57
author Alexandre Julliard <julliard@winehq.org> Sun Feb 28 13:27:56 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Feb 28 13:27:56 1999 +0000
tree 84cf84b95b2fbd28a54d965daa59c0fad5aa11e8
parent ee517e863e400aac2a7475498ee64ee8be843c24

Use server handles directly for Win32 handles. Removed use of K32OBJ.

misc/toolhelp.c

diff --git a/misc/toolhelp.c b/misc/toolhelp.c
index a04764c..8541336 100644
--- a/misc/toolhelp.c
+++ b/misc/toolhelp.c
@@ -16,17 +16,10 @@
 #include "tlhelp32.h"
 #include "toolhelp.h"
 #include "heap.h"
-#include "k32obj.h"
 #include "server.h"
 #include "debug.h"
 
 
-/* The K32 snapshot object object */
-typedef struct
-{
-    K32OBJ header;
-} SNAPSHOT_OBJECT;
-
 /* FIXME: to make this working, we have to callback all these registered 
  * functions from all over the WINE code. Someone with more knowledge than
  * me please do that. -Marcus
@@ -121,7 +114,6 @@
  */
 HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process ) 
 {
-    SNAPSHOT_OBJECT *snapshot;
     struct create_snapshot_request req;
     struct create_snapshot_reply reply;
 
@@ -133,21 +125,13 @@
         SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
         return INVALID_HANDLE_VALUE;
     }
-    /* Now do the snapshot */
-    if (!(snapshot = HeapAlloc( SystemHeap, 0, sizeof(*snapshot) )))
-        return INVALID_HANDLE_VALUE;
-    snapshot->header.type = K32OBJ_TOOLHELP_SNAPSHOT;
-    snapshot->header.refcount = 1;
 
+    /* Now do the snapshot */
     req.flags   = flags & ~TH32CS_INHERIT;
     req.inherit = (flags & TH32CS_INHERIT) != 0;
     CLIENT_SendRequest( REQ_CREATE_SNAPSHOT, -1, 1, &req, sizeof(req) );
-    if (CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL ))
-    {
-        HeapFree( SystemHeap, 0, snapshot );
-        return INVALID_HANDLE_VALUE;
-    }
-    return HANDLE_Alloc( PROCESS_Current(), &snapshot->header, 0, req.inherit, reply.handle );
+    CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL );
+    return reply.handle;
 }
 
 
@@ -167,9 +151,7 @@
         ERR (toolhelp, "Result buffer too small\n");
         return FALSE;
     }
-    if ((req.handle = HANDLE_GetServerHandle( PROCESS_Current(), handle,
-                                              K32OBJ_TOOLHELP_SNAPSHOT, 0 )) == -1)
-        return FALSE;
+    req.handle = handle;
     req.reset = first;
     CLIENT_SendRequest( REQ_NEXT_PROCESS, -1, 1, &req, sizeof(req) );
     if (CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL )) return FALSE;