GlobalAlloc as GlobalAlloc16 should round size to 32.

Call SetLastError in GlobalLock.

GlobalAlloc as GlobalAlloc16 should round size to 32.
c34fe084 · Dmitry Timoshkov · Alexandre Julliard · 394e0eb1 · c34fe084
Commit c34fe084 authored Nov 27, 2000 by Dmitry Timoshkov Committed by Alexandre Julliard Nov 27, 2000
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

global.c memory/global.c +2 -0

No files found.
--- 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;