krnl386.exe: Page-align the GlobalAlloc() size when the selector limit is in pages.

GlobalSize() uses the selector limit and that needs to match the allocated size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52082Signed-off-by: Alexandre Julliard <julliard@winehq.org>

krnl386.exe: Page-align the GlobalAlloc() size when the selector limit is in pages.
1c5e4d06 · Alexandre Julliard · 40d706ca · 1c5e4d06
Commit 1c5e4d06 authored Dec 12, 2021 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

global.c dlls/krnl386.exe16/global.c +4 -2

No files found.
--- a/dlls/krnl386.exe16/global.c
+++ b/dlls/krnl386.exe16/global.c
@@ -196,6 +196,7 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, unsigned cha
 {
    void *ptr;
    HGLOBAL16 handle;
+    DWORD align = 0x1f;

    TRACE("%d flags=%04x\n", size, flags );

@@ -205,8 +206,9 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, unsigned cha

    /* Fixup the size */

-    if (size >= GLOBAL_MAX_ALLOC_SIZE - 0x1f) return 0;
-    size = (size + 0x1f) & ~0x1f;
+    if (size > 0x100000) align = 0xfff;  /* selector limit will be in pages */
+    if (size >= GLOBAL_MAX_ALLOC_SIZE - align) return 0;
+    size = (size + align) & ~align;

    /* Allocate the linear memory */
    ptr = HeapAlloc( get_win16_heap(), 0, size );