From c34fe084d54be73bc35cfb97e00b992f78baefd5 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
Date: Mon, 27 Nov 2000 01:33:25 +0000
Subject: [PATCH] GlobalAlloc as GlobalAlloc16 should round size to 32. Call
 SetLastError in GlobalLock.

---
 memory/global.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/memory/global.c b/memory/global.c
index 0b00ee23c3d..57d1e7f8711 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -1049,6 +1049,7 @@ HGLOBAL WINAPI GlobalAlloc(
       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 @@ LPVOID WINAPI GlobalLock(
    {
       WARN("invalid handle\n");
       palloc=(LPVOID) NULL;
+      SetLastError(ERROR_INVALID_HANDLE);
    }
    /* HeapUnlock(GetProcessHeap()); */;
    return palloc;
-- 
2.11.4.GIT