Changeset 4407 for trunk/src/kernel32/winimagepeldr.cpp

Timestamp:

Oct 3, 2000, 7:28:32 PM (25 years ago)

Author:

sandervl

Message:

misc updates + fixes

File:

• trunk/src/kernel32/winimagepeldr.cpp (modified) (3 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.53 2000-08-14 19:15:37 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.54 2000-10-03 17:28:31 sandervl Exp $ */
 
 /*
@@ -1405 +1405 @@
                 }
                 lxdll->setDllHandleOS2(hInstanceNewDll);
-                lxdll->AddRef();
+                if(lxdll->AddRef() == -1) {//-1 -> load failed (attachProcess)
+                        dprintf((LOG, "Dll %s refused to be loaded; aborting", modname));
+                        delete lxdll;
+                        errorState = ERROR_INTERNAL;
+                        return(FALSE);
+                }
                 WinDll = (Win32DllBase*)lxdll;
         }
@@ -1423 +1428 @@
                 if(pedll->init(0) == FALSE) {
                     dprintf((LOG, "Internal WinDll error ", pedll->getError() ));
+                    delete pedll;
                     return(FALSE);
                 }