commit c34fe084d54be73bc35cfb97e00b992f78baefd5
author Dmitry Timoshkov <dtimoshkov@codeweavers.com> Mon Nov 27 01:33:25 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Nov 27 01:33:25 2000 +0000
tree 6f48750e375620d9473e3c4ebda8ba911709e24b
parent 394e0eb19b2fcff9dac604dacc0c754bf553bdb6

GlobalAlloc as GlobalAlloc16 should round size to 32.
Call SetLastError in GlobalLock.

memory/global.c

diff --git a/memory/global.c b/memory/global.c
index 0b00ee2..57d1e7f 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -1049,6 +1049,7 @@
       if (!pintern) return NULL;
       if(size)
       {
+	 size = (size + 0x1f) & ~0x1f;
 	 if (!(palloc=HeapAlloc(heap, hpflags, size+sizeof(HGLOBAL)))) {
 	    HeapFree(heap, 0, pintern);
 	    return NULL;
@@ -1097,6 +1098,7 @@
    {
       WARN("invalid handle\n");
       palloc=(LPVOID) NULL;
+      SetLastError(ERROR_INVALID_HANDLE);
    }
    /* HeapUnlock(GetProcessHeap()); */;
    return palloc;