kernel32: In Win9x mode UnmapViewOfFile requires base address of a mapping.

Signed-off-by: Michael Müller <michael@fds-team.de> Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32: In Win9x mode UnmapViewOfFile requires base address of a mapping.
1b26d380 · Michael Müller · Alexandre Julliard · 1311c815 · 1b26d380
Commit 1b26d380 authored Jul 19, 2016 by Michael Müller Committed by Alexandre Julliard Jul 19, 2016
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

virtual.c dlls/kernel32/virtual.c +13 -1

No files found.
--- a/dlls/kernel32/virtual.c
+++ b/dlls/kernel32/virtual.c
@@ -576,7 +576,19 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access,
 */
 BOOL WINAPI UnmapViewOfFile( LPCVOID addr )
 {
-    NTSTATUS status = NtUnmapViewOfSection( GetCurrentProcess(), (void *)addr );
+    NTSTATUS status;
+
+    if (GetVersion() & 0x80000000)
+    {
+        MEMORY_BASIC_INFORMATION info;
+        if (!VirtualQuery( addr, &info, sizeof(info) ) || info.AllocationBase != addr)
+        {
+            SetLastError( ERROR_INVALID_ADDRESS );
+            return FALSE;
+        }
+    }
+
+    status = NtUnmapViewOfSection( GetCurrentProcess(), (void *)addr );
    if (status) SetLastError( RtlNtStatusToDosError(status) );
    return !status;
 }