commit b44595283fac60b84339a1e7f655095fa9507338
author Alexandre Julliard <julliard@winehq.org> Sat Apr 15 21:00:55 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Apr 15 21:00:55 2000 +0000
tree ac9d1e15527fccac0852f3736620382bf56968fc
parent f0deb8a17e99b6cfdf61cdda8a8b01d425f0bc3d

Improved Winelib apps initialisation code. No longer need to link
winestub.o with Winelib apps.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index 7bb5667..10189e3 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -336,7 +336,7 @@
  *
  * Create a dummy NE module for Win32 or Winelib.
  */
-HMODULE MODULE_CreateDummyModule( LPCSTR filename, WORD version )
+HMODULE MODULE_CreateDummyModule( LPCSTR filename, HMODULE module32 )
 {
     HMODULE hModule;
     NE_MODULE *pModule;
@@ -388,8 +388,19 @@
     pModule->nrname_size      = 0;
     pModule->fileinfo         = sizeof(NE_MODULE);
     pModule->os_flags         = NE_OSFLAGS_WINDOWS;
-    pModule->expected_version = version;
     pModule->self             = hModule;
+    pModule->module32         = module32;
+
+    /* Set version and flags */
+    if (module32)
+    {
+        pModule->expected_version =
+            ((PE_HEADER(module32)->OptionalHeader.MajorSubsystemVersion & 0xff) << 8 ) |
+             (PE_HEADER(module32)->OptionalHeader.MinorSubsystemVersion & 0xff);
+        pModule->flags |= NE_FFLAGS_WIN32;
+        if (PE_HEADER(module32)->FileHeader.Characteristics & IMAGE_FILE_DLL)
+            pModule->flags |= NE_FFLAGS_LIBMODULE | NE_FFLAGS_SINGLEDATA;
+    }
 
     /* Set loaded file information */
     ofs = (OFSTRUCT *)(pModule + 1);