GlobalAlloc as GlobalAlloc16 should round size to 32.

Call SetLastError in GlobalLock.
This commit is contained in:
Dmitry Timoshkov 2000-11-27 01:33:25 +00:00 committed by Alexandre Julliard
parent 394e0eb19b
commit c34fe084d5
1 changed files with 2 additions and 0 deletions

View File

@ -1049,6 +1049,7 @@ HGLOBAL WINAPI GlobalAlloc(
if (!pintern) return NULL; if (!pintern) return NULL;
if(size) if(size)
{ {
size = (size + 0x1f) & ~0x1f;
if (!(palloc=HeapAlloc(heap, hpflags, size+sizeof(HGLOBAL)))) { if (!(palloc=HeapAlloc(heap, hpflags, size+sizeof(HGLOBAL)))) {
HeapFree(heap, 0, pintern); HeapFree(heap, 0, pintern);
return NULL; return NULL;
@ -1097,6 +1098,7 @@ LPVOID WINAPI GlobalLock(
{ {
WARN("invalid handle\n"); WARN("invalid handle\n");
palloc=(LPVOID) NULL; palloc=(LPVOID) NULL;
SetLastError(ERROR_INVALID_HANDLE);
} }
/* HeapUnlock(GetProcessHeap()); */; /* HeapUnlock(GetProcessHeap()); */;
return palloc; return palloc;