Changeset 9540 for trunk/src/kernel32

Timestamp:

Dec 20, 2002, 1:40:44 PM (23 years ago)

Author:

sandervl

Message:

dll/exe load fix

Location:

trunk/src/kernel32

Files:

• windllpe2lx.cpp (modified) (3 diffs)
• winexepe2lx.cpp (modified) (4 diffs)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/windllpe2lx.cpp

@@ -1 @@
-/* $Id: windllpe2lx.cpp,v 1.12 2002-12-20 10:38:57 sandervl Exp $ */
+/* $Id: windllpe2lx.cpp,v 1.13 2002-12-20 12:40:43 sandervl Exp $ */
 
 /*
@@ -30 +30 @@
 #include <winexepe2lx.h>
 #include <wprocess.h>
+#include <odinpe.h>
 
 #include "oslibmisc.h"      // OSLibGetDllName
@@ -100 +101 @@
             return 0;
         }
-        if (!pWinMod->init())
+        if (pWinMod->init() != LDRERROR_SUCCESS)
         {
             eprintf(("RegisterPe2LxDll: init-method failed.\n"));

trunk/src/kernel32/winexepe2lx.cpp

@@ -1 @@
-/* $Id: winexepe2lx.cpp,v 1.12 2002-12-20 10:38:58 sandervl Exp $ */
+/* $Id: winexepe2lx.cpp,v 1.13 2002-12-20 12:40:43 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 #include <wprocess.h>
 #include <win32api.h>
+#include <odinpe.h>
 
 #include "oslibmisc.h"      // OSLibGetDllName
@@ -96 +97 @@
             return;
         }
-        if (!pWinPe2LxExe->init())
+        if (pWinPe2LxExe->init() != LDRERROR_SUCCESS)
         {
             eprintf(("RegisterPe2LxExe: init-method failed.\n"));
@@ -190 +191 @@
     if (pExe)
     {
-        if (pExe->init())
+        if (pExe->init() == LDRERROR_SUCCESS)
         {
             WinExe = pExe;

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.167 2002-12-20 10:38:58 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.168 2002-12-20 12:40:44 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 #include <vmutex.h>
 #include <handlemanager.h>
+#include <odinpe.h>
 
 #include "odin32validate.h"
@@ -1085 +1086 @@
          *  Endif.
          */
-        if (peldrDll->init(0))
+        if(peldrDll->init(0) == LDRERROR_SUCCESS)
         {
             peldrDll->AddRef();