Author: tfaber
Date: Sun May 8 08:07:11 2016
New Revision: 71279
URL: http://svn.reactos.org/svn/reactos?rev=71279&view=rev
Log:
[RTL]
- In RtlpGrowBlockInPlace, copy the heap block's user value if the old block has the HEAP_ENTRY_EXTRA_PRESENT flag, instead of looking at the flags of the following block (where this will never be set).
CORE-11196 #resolve
Modified:
trunk/reactos/sdk/lib/rtl/heap.c
Modified: trunk/reactos/sdk/lib/rtl/heap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/heap.c?rev=712…
==============================================================================
--- trunk/reactos/sdk/lib/rtl/heap.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/rtl/heap.c [iso-8859-1] Sun May 8 08:07:11 2016
@@ -2359,7 +2359,7 @@
}
/* Process extra stuff */
- if (RememberFlags & HEAP_ENTRY_EXTRA_PRESENT)
+ if (EntryFlags & HEAP_ENTRY_EXTRA_PRESENT)
{
/* Calculate pointers */
OldExtra = (PHEAP_ENTRY_EXTRA)(InUseEntry + InUseEntry->Size - 1);
Author: hbelusca
Date: Sat May 7 23:17:09 2016
New Revision: 71277
URL: http://svn.reactos.org/svn/reactos?rev=71277&view=rev
Log:
[CONSRV]: Use cmd's terminal icon that doesn't include crazy sizes.
Added:
trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/res/terminal.ico
- copied unchanged from r71275, trunk/reactos/base/shell/cmd/res/terminal.ico