commit a5dea216ccad612784d4f0da3bdf60ad2c31f44c
author Alexandre Julliard <julliard@winehq.org> Fri Aug 09 19:57:38 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Aug 09 19:57:38 2002 +0000
tree 42889ca40d763875461d5f3fac692ac649118d6d
parent 3d8b123e5a4d9213a3c39bac21e3e74f7aefe072

Implemented the RtlImage* functions, and use them to replace the
PE_HEADER macro.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index 6a41cb5..19a7a8e 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -121,7 +121,7 @@
         if (wm->next) wm->next->prev = wm;
         MODULE_modref_list = wm;
 
-        if (!(PE_HEADER(hModule)->FileHeader.Characteristics & IMAGE_FILE_DLL))
+        if (!(RtlImageNtHeader(hModule)->FileHeader.Characteristics & IMAGE_FILE_DLL))
         {
             if (!exe_modref) exe_modref = wm;
             else FIXME( "Trying to load second .EXE file: %s\n", filename );
@@ -434,11 +434,11 @@
     /* Set version and flags */
     if (module32)
     {
-        pModule->expected_version =
-            ((PE_HEADER(module32)->OptionalHeader.MajorSubsystemVersion & 0xff) << 8 ) |
-             (PE_HEADER(module32)->OptionalHeader.MinorSubsystemVersion & 0xff);
+        IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module32 );
+        pModule->expected_version = ((nt->OptionalHeader.MajorSubsystemVersion & 0xff) << 8 ) |
+                                     (nt->OptionalHeader.MinorSubsystemVersion & 0xff);
         pModule->flags |= NE_FFLAGS_WIN32;
-        if (PE_HEADER(module32)->FileHeader.Characteristics & IMAGE_FILE_DLL)
+        if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL)
             pModule->flags |= NE_FFLAGS_LIBMODULE | NE_FFLAGS_SINGLEDATA;
     }