commit 2a343853ad7e8fa49725bd46edef0985a357e4ed
author Ulrich Weigand <weigand@informatik.uni-erlangen.de> Wed Oct 13 12:21:06 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Oct 13 12:21:06 1999 +0000
tree fb474ea76dfee63f25a692ac1a3e4b9ba60b77cc
parent 92418ee65c3e6c8c72f3d3211379feea4c638628

Bugfix: When loading an executable module fails, don't perform module
cleanup before the corresponding task is destroyed.

loader/ne/module.c

diff --git a/loader/ne/module.c b/loader/ne/module.c
index 7a79201..5b7ebb2 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -797,18 +797,12 @@
 
     if (!NE_CreateSegments( pModule ) ||
         !(hInstance = NE_CreateInstance( pModule, NULL, FALSE )))
-    {
-        GlobalFreeAll16( pModule->self );
         return 8;  /* Insufficient memory */
-    }
 
     /* Load the referenced DLLs */
 
     if (!NE_LoadDLLs( pModule ))
-    {
-        NE_FreeModule( pModule->self, 0 );
         return 2;
-    }
 
     /* Load the segments */
 
@@ -845,6 +839,7 @@
 {
     NE_MODULE *pModule;
     HMODULE16 hModule;
+    HINSTANCE16 hInstance;
     HFILE16 hFile;
     OFSTRUCT ofs;
 
@@ -872,7 +867,14 @@
     if ( !lib_only && !( pModule->flags & NE_FFLAGS_LIBMODULE ) )
         return hModule;
 
-    return NE_DoLoadModule( pModule );
+    hInstance = NE_DoLoadModule( pModule );
+    if ( hInstance < 32 )
+    {
+        /* cleanup ... */
+        NE_FreeModule( hModule, 0 );
+    }
+
+    return hInstance;
 }
 
 
@@ -1179,12 +1181,14 @@
 
         hInstance = NE_DoLoadModule( pModule );
         hPrevInstance = 0;
+    }
 
-        if ( hInstance < 32 )
-        {
-            SetLastError( hInstance );
-            retv = FALSE;
-        }
+    if ( hInstance < 32 )
+    {
+        SYSLEVEL_LeaveWin16Lock();
+
+        SetLastError( hInstance );
+        return FALSE;
     }
 
     /* Enter instance handles into task struct */