CVS: winex/dlls/ntdll heap.c, 1.12, 1.13 oldheap.c, 1.1, 1.2

Subject: winex/dlls/ntdll heap.c,1.12,1.13 oldheap.c,1.1,1.2Update of /var/lib/cvsd/cvsroot/winex/dlls/ntdll
In directory agravaine:/tmp/cvs-serv31694/dlls/ntdll

Modified Files:
	heap.c oldheap.c 
Log Message:

- don't bother setting global heap in the heap creation functions; that's already done as part of process startup


Index: heap.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/ntdll/heap.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- heap.c	30 Mar 2007 20:11:32 -0000	1.12
+++ heap.c	31 Jul 2007 19:41:46 -0000	1.13
@@ -50,18 +50,6 @@
 #endif
 }
 
-/* set the process main heap */
-inline static void set_process_heap (HeapInfo_t *heap)
-{
-    HANDLE *pdb = (HANDLE *)NtCurrentTeb ()->process;
-
-    /* heap is at offset 0x18 in pdb */
-    pdb[0x18 / sizeof (HANDLE)] = (HANDLE)heap;
-
-    gProcessHeap = heap;
-}
-
-
 /* Get heap ptr from handle, doing necessary error checking */
 inline static HeapInfo_t *get_heap_ptr (HANDLE hHeap)
 {
@@ -134,7 +122,7 @@
 
    /* Assume first call is to set up process heap */
    if (!gProcessHeap)
-      set_process_heap (NewHeap);
+      gProcessHeap = NewHeap;
 
    TRACE ("=> 0x%x\n", (HANDLE)NewHeap);
    return (HANDLE)NewHeap;

Index: oldheap.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/ntdll/oldheap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- oldheap.c	30 Mar 2007 18:17:21 -0000	1.1
+++ oldheap.c	31 Jul 2007 19:41:46 -0000	1.2
@@ -127,15 +127,6 @@
 #endif
 }
 
-/* set the process main heap */
-static void set_process_heap( HANDLE heap )
-{
-    HANDLE *pdb = (HANDLE *)NtCurrentTeb()->process;
-    pdb[0x18 / sizeof(HANDLE)] = heap;  /* heap is at offset 0x18 in pdb */
-    processHeap = heap;
-}
-
-
 /***********************************************************************
  *           HEAP_Dump
  */
@@ -984,9 +975,7 @@
         RtlUnlockHeap( processHeap );
     }
     else  /* assume the first heap we create is the process main heap */
-    {
-        set_process_heap( (HANDLE)subheap->heap );
-    }
+       processHeap = (HANDLE)subheap->heap;
     return (HANDLE)subheap;
 }