Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 11:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix Global/LocalFlags returns. Now pass all kernel32 heap tests.

Browse source 
svn path=/trunk/; revision=41895
This commit is contained in:
James Tabor 2009-07-11 22:14:19 +00:00
parent 1e3850cd25
commit 471fee4cfa
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/win32/kernel32/mem/global.c
View file

@ -228,14 +228,7 @@ GlobalFlags(HGLOBAL hMem)
if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSABLE) if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSABLE)
{ {
/* Set the Win32 Flag */ /* Set the Win32 Flag */
uFlags |= GMEM_DISCARDED; uFlags |= GMEM_DISCARDABLE;
}
/* Check if it's movable */
if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_MOVABLE)
{
/* Set the Win32 Flag */
uFlags |= GMEM_MOVEABLE;
} }
/* Check if it's DDE Shared */ /* Check if it's DDE Shared */
@ -244,6 +237,8 @@ GlobalFlags(HGLOBAL hMem)
/* Set the Win32 Flag */ /* Set the Win32 Flag */
uFlags |= GMEM_DDESHARE; uFlags |= GMEM_DDESHARE;
} }
if (!HandleEntry->Object) uFlags |= GMEM_DISCARDED;
} }
} }
@ -806,6 +801,7 @@ GlobalUnlock(HGLOBAL hMem)
/* It's not, fail */ /* It's not, fail */
BASE_TRACE_FAILURE(); BASE_TRACE_FAILURE();
SetLastError(ERROR_INVALID_HANDLE); SetLastError(ERROR_INVALID_HANDLE);
RetVal = FALSE;
} }
else else
{ {

9
reactos/dll/win32/kernel32/mem/local.c
View file

@ -203,17 +203,12 @@ LocalFlags(HLOCAL hMem)
/* Now check if it's discarded */ /* Now check if it's discarded */
if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSABLE) if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSABLE)
{
/* Set the Win32 Flag */
uFlags |= LMEM_DISCARDED;
}
/* Check if it's movable */
if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_MOVABLE)
{ {
/* Set the Win32 Flag */ /* Set the Win32 Flag */
uFlags |= LMEM_DISCARDABLE; uFlags |= LMEM_DISCARDABLE;
} }
if (!HandleEntry->Object) uFlags |= LMEM_DISCARDED;
} }
} }