ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: Allocate global memory with execute permission.

This commit is contained in:
Mikołaj Zalewski 2007-08-13 10:55:08 -07:00 committed by Alexandre Julliard
parent 454a612223
commit 216c3b0d0a
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/kernel32/global16.c
View File

@ -93,6 +93,16 @@ static inline UINT DOSMEM_ResizeBlock(void *ptr, UINT size, BOOL exact)
return winedos.ResizeDosBlock ? winedos.ResizeDosBlock(ptr, size, TRUE) : 0; return winedos.ResizeDosBlock ? winedos.ResizeDosBlock(ptr, size, TRUE) : 0;
} }
static HANDLE get_win16_heap(void)
{
static HANDLE win16_heap;
/* we create global memory block with execute permission. The access can be limited
* for 16-bit code on selector level */
if (!win16_heap) win16_heap = HeapCreate(HEAP_CREATE_ENABLE_EXECUTE, 0, 0);
return win16_heap;
}
/*********************************************************************** /***********************************************************************
* GLOBAL_GetArena * GLOBAL_GetArena
* *
@ -235,7 +245,7 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, unsigned cha
size = (size + 0x1f) & ~0x1f; size = (size + 0x1f) & ~0x1f;
/* Allocate the linear memory */ /* Allocate the linear memory */
ptr = HeapAlloc( GetProcessHeap(), 0, size ); ptr = HeapAlloc( get_win16_heap(), 0, size );
/* FIXME: free discardable blocks and try again? */ /* FIXME: free discardable blocks and try again? */
if (!ptr) return 0; if (!ptr) return 0;
@ -244,7 +254,7 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, unsigned cha
handle = GLOBAL_CreateBlock( flags, ptr, size, hOwner, selflags ); handle = GLOBAL_CreateBlock( flags, ptr, size, hOwner, selflags );
if (!handle) if (!handle)
{ {
HeapFree( GetProcessHeap(), 0, ptr ); HeapFree( get_win16_heap(), 0, ptr );
return 0; return 0;
} }
@ -293,6 +303,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16(
void *ptr, *newptr; void *ptr, *newptr;
GLOBALARENA *pArena, *pNewArena; GLOBALARENA *pArena, *pNewArena;
WORD sel = GlobalHandleToSel16( handle ); WORD sel = GlobalHandleToSel16( handle );
HANDLE heap = get_win16_heap();
TRACE("%04x %d flags=%04x\n", TRACE("%04x %d flags=%04x\n",
handle, size, flags ); handle, size, flags );
@ -315,7 +326,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16(
if (pArena->flags & GA_DOSMEM) if (pArena->flags & GA_DOSMEM)
DOSMEM_FreeBlock( (void *)pArena->base ); DOSMEM_FreeBlock( (void *)pArena->base );
else else
HeapFree( GetProcessHeap(), 0, (void *)pArena->base ); HeapFree( heap, 0, (void *)pArena->base );
pArena->base = 0; pArena->base = 0;
/* Note: we rely on the fact that SELECTOR_ReallocBlock won't /* Note: we rely on the fact that SELECTOR_ReallocBlock won't
@ -374,13 +385,11 @@ HGLOBAL16 WINAPI GlobalReAlloc16(
*/ */
if (ptr) if (ptr)
newptr = HeapReAlloc( GetProcessHeap(), newptr = HeapReAlloc( heap,
(pArena->pageLockCount > 0) ? HEAP_REALLOC_IN_PLACE_ONLY : 0, (pArena->pageLockCount > 0) ? HEAP_REALLOC_IN_PLACE_ONLY : 0,
ptr, size ); ptr, size );
else else
newptr = HeapAlloc( GetProcessHeap(), newptr = HeapAlloc( heap, 0, size );
(pArena->pageLockCount > 0) ? HEAP_REALLOC_IN_PLACE_ONLY : 0,
size );
} }
@ -392,7 +401,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16(
if (pArena->flags & GA_DOSMEM) if (pArena->flags & GA_DOSMEM)
DOSMEM_FreeBlock( (void *)pArena->base ); DOSMEM_FreeBlock( (void *)pArena->base );
else else
HeapFree( GetProcessHeap(), 0, ptr ); HeapFree( heap, 0, ptr );
SELECTOR_FreeBlock( sel ); SELECTOR_FreeBlock( sel );
memset( pArena, 0, sizeof(GLOBALARENA) ); memset( pArena, 0, sizeof(GLOBALARENA) );
} }
@ -408,7 +417,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16(
if (pArena->flags & GA_DOSMEM) if (pArena->flags & GA_DOSMEM)
DOSMEM_FreeBlock( (void *)pArena->base ); DOSMEM_FreeBlock( (void *)pArena->base );
else else
HeapFree( GetProcessHeap(), 0, ptr ); HeapFree( heap, 0, ptr );
memset( pArena, 0, sizeof(GLOBALARENA) ); memset( pArena, 0, sizeof(GLOBALARENA) );
return 0; return 0;
} }
@ -419,7 +428,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16(
if (pArena->flags & GA_DOSMEM) if (pArena->flags & GA_DOSMEM)
DOSMEM_FreeBlock( (void *)pArena->base ); DOSMEM_FreeBlock( (void *)pArena->base );
else else
HeapFree( GetProcessHeap(), 0, ptr ); HeapFree( heap, 0, ptr );
SELECTOR_FreeBlock( sel ); SELECTOR_FreeBlock( sel );
return 0; return 0;
} }
@ -463,7 +472,7 @@ HGLOBAL16 WINAPI GlobalFree16(
TRACE("%04x\n", handle ); TRACE("%04x\n", handle );
if (!GLOBAL_FreeBlock( handle )) return handle; /* failed */ if (!GLOBAL_FreeBlock( handle )) return handle; /* failed */
HeapFree( GetProcessHeap(), 0, ptr ); HeapFree( get_win16_heap(), 0, ptr );
return 0; return 0;
} }