Changeset 9537 for trunk/src/kernel32/winimagepe2lx.cpp

Timestamp:

Dec 20, 2002, 12:39:43 PM (23 years ago)

Author:

sandervl

Message:

Don't display message boxes for module load errors. Pass errors back to the PE loader.

File:

• trunk/src/kernel32/winimagepe2lx.cpp (modified) (12 diffs)

trunk/src/kernel32/winimagepe2lx.cpp

@@ -1 @@
-/* $Id: winimagepe2lx.cpp,v 1.20 2002-06-08 00:26:59 bird Exp $ */
+/* $Id: winimagepe2lx.cpp,v 1.21 2002-12-20 11:39:42 sandervl Exp $ */
 
 /*
@@ -179 +179 @@
  * Initiates the object.
  * Must be called immediately after the object construction.
- * @returns   Success indicator, TRUE == success; FALSE = failure.
+ * @returns   Error value, LDRERROR_SUCCESS == success; failure otherwise.
  * @sketch    Get section placement and sizes for this module. (paSections, cSections)
  *            Verify that there is at least one section - the header section.
@@ -194 +194 @@
  * @remark    Object must be destroyed if failure!
  */
-BOOL Win32Pe2LxImage::init()
+DWORD Win32Pe2LxImage::init()
 {
     APIRET rc;
@@ -204 +204 @@
         dprintf(("Win32Pe2LxImage::Win32Pe2LxImage: error - getSection failed with rc=%d\n",
                  rc));
-        return FALSE;
+        return LDRERROR_INVALID_HEADER;
     }
 
@@ -211 +211 @@
     {
         dprintf(("Win32Pe2LxImage::Win32Pe2LxImage: no header section, cSections is 0\n"));
-        return FALSE;
+        return LDRERROR_INVALID_HEADER;
     }
 
@@ -224 +224 @@
     {
         dprintf(("Win32Pe2LxImage::Win32Pe2LxImage: Not a pe2lx image!(?)\n"));
-        return FALSE;
+        return LDRERROR_INVALID_HEADER;
     }
 
@@ -245 +245 @@
     {
         dprintf(("Win32Pe2LxImage::Win32Pe2LxImage: Not a pe2lx image!(?)\n"));
-        return FALSE;
+        return LDRERROR_INVALID_HEADER;
     }
 
@@ -253 +253 @@
     {
         dprintf(("Win32Pe2LxImage::Win32Pe2LxImage: setSectionRVAs failed with rc=%d\n", rc));
-        return FALSE;
+        return LDRERROR_INVALID_HEADER;
     }
 
@@ -268 +268 @@
         dprintf(("Win32Pe2LxImage::Win32Pe2LxImage: entrypoint is incorrect, AddrOfEP=0x%08x, entryPoint=0x%08x\n",
                  pNtHdrs->OptionalHeader.AddressOfEntryPoint, entryPoint));
-        return FALSE;
+        return LDRERROR_NO_ENTRYPOINT;
     }
 
@@ -367 +367 @@
                             eprintf(("Win32Pe2LxImage::init: invalid RVA to TLS AddressOfIndex - %#8x.\n",
                                      pTLSDir->AddressOfIndex));
-                            return FALSE;
+                            return LDRERROR_INVALID_HEADER;
                         }
                         setTLSIndexAddr((LPDWORD)pv);
@@ -387 +387 @@
                             eprintf(("Win32Pe2LxImage::init: invalid pointer to TLS AddressOfCallBacks - %#8x.\n",
                                      pTLSDir->AddressOfIndex));
-                            return FALSE;
+                            return LDRERROR_INVALID_HEADER;
                         }
                         setTLSCallBackAddr((PIMAGE_TLS_CALLBACK*)pv);
@@ -398 +398 @@
             eprintf(("Win32Pe2LxImage::init: invalid RVA to TLS Dir - %#8x. (getPointerFromRVA failed)\n",
                      pNtHdrs->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress));
-            return FALSE;
+            return LDRERROR_INVALID_HEADER;
         }
     }
-    return TRUE;
+    return LDRERROR_SUCCESS;
 }