commit cd3afa895bf8b588006d92821822c3eed3cbd687
author Alexandre Julliard <julliard@winehq.org> Thu Jan 31 23:32:57 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 31 23:32:57 2002 +0000
tree 0cbb6f445d0b76712302ec5c19c6ae8395e10c19
parent f94462fb75f98079b451f23a4120073b3a7947b8

LOAD_LIBRARY_AS_DATAFILE modules must be mapped like normal files, not
like PE images. Fixed resource loading to handle that.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index c8f716d..08efd21 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -1284,7 +1284,18 @@
                                             NULL, OPEN_EXISTING, 0, 0 );
                 if (hFile != INVALID_HANDLE_VALUE)
                 {
-                    hmod = PE_LoadImage( hFile, filename, flags );
+                    DWORD type;
+                    MODULE_GetBinaryType( hFile, filename, &type );
+                    if (type == SCS_32BIT_BINARY)
+                    {
+                        HANDLE mapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY,
+                                                             0, 0, NULL );
+                        if (mapping)
+                        {
+                            hmod = (HMODULE)MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 );
+                            CloseHandle( mapping );
+                        }
+                    }
                     CloseHandle( hFile );
                 }
                 if (hmod) return (HMODULE)((ULONG_PTR)hmod + 1);