[ros-diffs] [ion] 22647: - Same fixes for LocalAlloc/LocalReAlloc - We now pass all 278+49 WINE Regression Tests related to Heap/Memory.

Author: ion
Date: Tue Jun 27 02:50:02 2006
New Revision: 22647

URL: http://svn.reactos.org/svn/reactos?rev=22647&view=rev
Log:
- Same fixes for LocalAlloc/LocalReAlloc
- We now pass all 278+49 WINE Regression Tests related to Heap/Memory.

Modified:
    trunk/reactos/dll/win32/kernel32/mem/local.c

Modified: trunk/reactos/dll/win32/kernel32/mem/local.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loca...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/mem/local.c (original)
+++ trunk/reactos/dll/win32/kernel32/mem/local.c Tue Jun 27 02:50:02 2006
@@ -113,7 +113,7 @@
         if (!Ptr)
         {
             /* We don't have a valid pointer, but so reuse this handle */
-            HandleEntry->Flags = BASE_HEAP_ENTRY_FLAG_REUSE;
+            HandleEntry->Flags |= BASE_HEAP_ENTRY_FLAG_REUSE;
         }

/* Check if the handle is discardable */
@@ -319,7 +319,7 @@
                 if (Ptr)
                 {
                     /* Make sure the handle isn't locked */
-                    if ((uFlags & LMEM_MOVEABLE) & !(HandleEntry->LockCount))
+                    if ((uFlags & LMEM_MOVEABLE) && !(HandleEntry->LockCount))
                     {
                         /* Free the current heap */
                         RtlFreeHeap(hProcessHeap, Flags, Ptr);