Changeset 9537 for trunk/src

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.

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• kernel32dbg.def (modified) (2 diffs)
• winexepeldr.cpp (modified) (7 diffs)
• winexepeldr.h (modified) (2 diffs)
• winimagebase.h (modified) (3 diffs)
• winimagepe2lx.cpp (modified) (12 diffs)
• winimagepe2lx.h (modified) (2 diffs)
• winimagepeldr.cpp (modified) (23 diffs)
• winimagepeldr.h (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.146 2002-12-13 16:46:43 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.147 2002-12-20 11:39:40 sandervl Exp $
 
 ;Basis is Windows95 KERNEL32
@@ -1077 +1077 @@
     _RegisterPe2LxDll@12                                          @1209
 
-    _CreateWin32PeLdrExe@28                                       @1236
+    _CreateWin32PeLdrExe@36                                       @1236
 
     _RegisterLxExe@8                                              @1237

trunk/src/kernel32/kernel32dbg.def

@@ -1 @@
-; $Id: kernel32dbg.def,v 1.21 2002-12-13 16:46:44 sandervl Exp $
+; $Id: kernel32dbg.def,v 1.22 2002-12-20 11:39:41 sandervl Exp $
 
 ;Basis is Windows95 KERNEL32
@@ -1077 +1077 @@
     _RegisterPe2LxDll@12                                          @1209
 
-    _CreateWin32PeLdrExe@28                                       @1236
+    _CreateWin32PeLdrExe@36                                       @1236
 
     _RegisterLxExe@8                                              @1237

trunk/src/kernel32/winexepeldr.cpp

@@ -1 @@
-/* $Id: winexepeldr.cpp,v 1.20 2002-12-20 10:38:58 sandervl Exp $ */
+/* $Id: winexepeldr.cpp,v 1.21 2002-12-20 11:39:41 sandervl Exp $ */
 
 /*
@@ -46 +46 @@
 
 
-extern char szErrorTitle[];
 extern char szErrorModule[];
 
@@ -58 +57 @@
 //   (not other options available at this time)
 //******************************************************************************
-BOOL WIN32API CreateWin32PeLdrExe(char *szFileName, char *szCmdLine,
-                                  char *peoptions, 
-                                  ULONG reservedMem, ULONG ulPEOffset,
-                                  BOOL fConsoleApp, BOOL fVioConsole)
+DWORD WIN32API CreateWin32PeLdrExe(char *szFileName, char *szCmdLine,
+                                   char *peoptions, 
+                                   ULONG reservedMem, ULONG ulPEOffset,
+                                   BOOL fConsoleApp, BOOL fVioConsole,
+                                   char *pszErrorModule, ULONG cbErrorModule)
 {
  APIRET  rc;
@@ -76 +76 @@
   rc = DosGetInfoBlocks(&ptib, &ppib);
   if(rc) {
-        WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szInteralErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
-        delete WinExe;
-        return FALSE;
+      delete WinExe;
+      return LDRERROR_INTERNAL;
   }
   //Handle special pe cmd line options here (/OPT:[x1=y,x2=z,..])
@@ -123 +122 @@
   if(WinExe->isConsoleApp()) 
   {
-        dprintf(("Console application!\n"));
+      dprintf(("Console application!\n"));
 
-        APIRET rc = iConsoleInit(fVioConsole);                /* initialize console subsystem */
-        if (rc != NO_ERROR)                                  /* check for errors */
-                dprintf(("KERNEL32:Win32Image:Init ConsoleInit failed with %u.\n", rc));
+      rc = iConsoleInit(fVioConsole);                /* initialize console subsystem */
+      if (rc != NO_ERROR)                                  /* check for errors */
+          dprintf(("KERNEL32:Win32Image:Init ConsoleInit failed with %u.\n", rc));
   }
 
   OS2SetExceptionHandler(&exceptFrame);
-  if(WinExe->init(reservedMem, ulPEOffset) == FALSE) 
+  rc = WinExe->init(reservedMem, ulPEOffset);
+  if(rc != LDRERROR_SUCCESS)
   {
         if(szErrorModule[0] != 0) {
-                char szErrorMsg[128];
-
-                sprintf(szErrorMsg, "Can't execute %s due to bad or missing %s", OSLibStripPath(szFileName), szErrorModule);
-                WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+            strncpy(pszErrorModule, szErrorModule, cbErrorModule-1);
+            pszErrorModule[cbErrorModule-1] = 0;
         }
         delete WinExe;
         OS2UnsetExceptionHandler(&exceptFrame);
-        return FALSE;
+        return rc;
   }
   OS2UnsetExceptionHandler(&exceptFrame);
@@ -158 +156 @@
   delete WinExe;
 
-  return TRUE;
+  return LDRERROR_SUCCESS;
 }
 //******************************************************************************
@@ -167 +165 @@
                    Win32PeLdrImage(szFileName, TRUE)
 {
-  dprintf(("Win32PeLdrExe ctor: %s", szFileName));
-  this->fConsoleApp = fConsoleApp;
+    dprintf(("Win32PeLdrExe ctor: %s", szFileName));
+    this->fConsoleApp = fConsoleApp;
 
-  //SvL: set temporary full path here as console init needs it
-  setFullPath(szFileName);
+    //SvL: set temporary full path here as console init needs it
+    setFullPath(szFileName);
 }
 //******************************************************************************

trunk/src/kernel32/winexepeldr.h

@@ -1 @@
-/* $Id: winexepeldr.h,v 1.7 2002-07-23 13:51:48 sandervl Exp $ */
+/* $Id: winexepeldr.h,v 1.8 2002-12-20 11:39:41 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #include <winexebase.h>
 #include <winimagepeldr.h>
-
-typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, char *, ULONG, ULONG, BOOL, BOOL);
 
 //Class for executables run by the ring 3 PE loader

trunk/src/kernel32/winimagebase.h

@@ -1 @@
-/* $Id: winimagebase.h,v 1.21 2002-02-06 16:33:39 sandervl Exp $ */
+/* $Id: winimagebase.h,v 1.22 2002-12-20 11:39:41 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #include <peexe.h>
 #include "queue.h"
+#include <odinpe.h>
 #ifdef OS2_INCLUDED
 #include <winconst.h>
@@ -29 +30 @@
 
 #define ID_GETFIRST             0xF0000000
-
-#ifndef ENUMRESNAMEPROC
-    typedef BOOL (* CALLBACK ENUMRESTYPEPROCA)(HMODULE,LPSTR,LONG);
-    typedef BOOL (* CALLBACK ENUMRESTYPEPROCW)(HMODULE,LPWSTR,LONG);
-    typedef BOOL (* CALLBACK ENUMRESNAMEPROCA)(HMODULE,LPCSTR,LPSTR,LONG);
-    typedef BOOL (* CALLBACK ENUMRESNAMEPROCW)(HMODULE,LPCWSTR,LPWSTR,LONG);
-    typedef BOOL (* CALLBACK ENUMRESLANGPROCA)(HMODULE,LPCSTR,LPCSTR,WORD,LONG);
-    typedef BOOL (* CALLBACK ENUMRESLANGPROCW)(HMODULE,LPCWSTR,LPCWSTR,WORD,LONG);
-#endif
 
 class Win32Resource;

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;
 }
 

trunk/src/kernel32/winimagepe2lx.h

@@ -1 @@
-/* $Id: winimagepe2lx.h,v 1.8 2001-07-10 20:18:49 bird Exp $ */
+/* $Id: winimagepe2lx.h,v 1.9 2002-12-20 11:39:42 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
     Win32Pe2LxImage(HINSTANCE hinstance, BOOL fWin32k);
     virtual         ~Win32Pe2LxImage();
-    virtual BOOL    init();
+    virtual DWORD   init();
 
     /** @cat Exports */

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.101 2002-07-26 10:46:56 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.102 2002-12-20 11:39:42 sandervl Exp $ */
 
 /*
@@ -66 +66 @@
 //#endif
 
-char szErrorTitle[]     = "Odin";
-char szMemErrorMsg[]    = "Memory allocation failure";
-char szFileErrorMsg[]   = "File IO error";
-char szPEErrorMsg[]     = "Not a valid win32 exe. (perhaps 16 bits windows)";
-char szCPUErrorMsg[]    = "Executable doesn't run on x86 machines";
-char szExeErrorMsg[]    = "File isn't an executable";
-char szInteralErrorMsg[]= "Internal Error";
-char szErrorModule[128] = "";
+char szErrorModule[260] = "";
 
 #ifdef DEBUG
@@ -175 +168 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32PeLdrImage::init(ULONG reservedMem, ULONG ulPEOffset)
+DWORD Win32PeLdrImage::init(ULONG reservedMem, ULONG ulPEOffset)
 {
  LPVOID win32file = NULL;
@@ -186 +179 @@
  IMAGE_DOS_HEADER doshdr;
  ULONG  signature;
+ DWORD  lasterror = LDRERROR_INTERNAL;
 
     //offset in executable image where real PE file starts (default 0)
@@ -199 +193 @@
     if(ulPEOffset) {
         if(OSLibDosSetFilePtr(hFile, ulPEOffset, OSLIB_SETPTR_FILE_BEGIN) == -1) {
+            lasterror = LDRERROR_INVALID_MODULE;
             goto failure;
         }
@@ -206 +201 @@
     strcpy(szErrorModule, OSLibStripPath(szFileName));
     if(hFile == NULL) {
+        lasterror = LDRERROR_INTERNAL;
         goto failure;
     }
     //read dos header
     if(DosRead(hFile, (LPVOID)&doshdr, sizeof(doshdr), &ulRead)) {
+        lasterror = LDRERROR_INVALID_MODULE;
         goto failure;
     }
     if(OSLibDosSetFilePtr(hFile, ulPEOffset+doshdr.e_lfanew, OSLIB_SETPTR_FILE_BEGIN) == -1) {
+        lasterror = LDRERROR_INVALID_MODULE;
         goto failure;
     }
     //read signature dword
     if(DosRead(hFile, (LPVOID)&signature, sizeof(signature), &ulRead)) {
+        lasterror = LDRERROR_INVALID_MODULE;
         goto failure;
     }
     //read pe header
     if(DosRead(hFile, (LPVOID)&fh, sizeof(fh), &ulRead)) {
+        lasterror = LDRERROR_INVALID_MODULE;
         goto failure;
     }
     //read optional header
     if(DosRead(hFile, (LPVOID)&oh, sizeof(oh), &ulRead)) {
+        lasterror = LDRERROR_INVALID_MODULE;
         goto failure;
     }
     if(doshdr.e_magic != IMAGE_DOS_SIGNATURE || signature != IMAGE_NT_SIGNATURE) {
         dprintf((LOG, "Not a valid PE file (probably a 16 bits windows exe/dll)!"));
-        WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szPEErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+        lasterror = LDRERROR_INVALID_MODULE;
         goto failure;
     }
@@ -241 +242 @@
     if(allocSections(reservedMem) == FALSE) {
         dprintf((LOG, "Failed to allocate image memory for %s at %x, rc %d", szFileName, oh.ImageBase, errorState));;
+        lasterror = LDRERROR_MEMORY;
         goto failure;
     }
@@ -246 +248 @@
     memmap = new Win32MemMap(this, realBaseAddress, imageSize);
     if(memmap == NULL || !memmap->Init()) {
+        lasterror = LDRERROR_MEMORY;
         goto failure;
     }
@@ -256 +259 @@
     if(!(fh.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) {//not valid
         dprintf((LOG, "Not a valid PE file!"));
-        WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szPEErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+        lasterror = LDRERROR_INVALID_MODULE;
         goto failure;
     }
     if(fh.Machine != IMAGE_FILE_MACHINE_I386) {
         dprintf((LOG, "Doesn't run on x86 processors!"));
-        WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szCPUErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+        lasterror = LDRERROR_INVALID_CPU;
         goto failure;
     }
@@ -267 +270 @@
     if(fh.Characteristics & IMAGE_FILE_SYSTEM) {
         dprintf((LOG, "Can't convert system files"));
-        WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szExeErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+        lasterror = LDRERROR_FILE_SYSTEM;
         goto failure;
     }
@@ -303 +306 @@
     if(section == NULL) {
         DebugInt3();
+        lasterror = LDRERROR_MEMORY;
         goto failure;
     }
@@ -423 +427 @@
             }
             dprintf((LOG, "Unknown section" ));
+            lasterror = LDRERROR_INVALID_SECTION;
             goto failure;
         }
@@ -455 +460 @@
     if(setMemFlags() == FALSE) {
         dprintf((LOG, "Failed to set memory protection" ));
-        goto failure;
+        lasterror = LDRERROR_MEMORY;
     }
 
@@ -486 +491 @@
             if(sect == NULL) {
                 dprintf((LOG, "Couldn't find TLS section!!" ));
+                lasterror = LDRERROR_INVALID_HEADER;
                 goto failure;
             }
@@ -502 +508 @@
             if(sect == NULL) {
                 dprintf((LOG, "Couldn't find TLS AddressOfIndex section!!" ));
+                lasterror = LDRERROR_INVALID_HEADER;
                 goto failure;
             }
@@ -524 +531 @@
                 if(sect == NULL) {
                     dprintf((LOG, "Couldn't find TLS AddressOfCallBacks section!!" ));
+                    lasterror = LDRERROR_INVALID_HEADER;
                     goto failure;
                 }
@@ -547 +555 @@
                     if(sect == NULL) {
                         dprintf((LOG, "Couldn't find TLS callback section!!" ));
+                        lasterror = LDRERROR_INVALID_HEADER;
                         goto failure;
                     }
@@ -609 +618 @@
         if(processExports((char *)win32file) == FALSE) {
             dprintf((LOG, "Failed to process exported apis" ));
+            lasterror = LDRERROR_EXPORTS;
             goto failure;
         }
@@ -649 +659 @@
         if(processImports((char *)win32file) == FALSE) {
             dprintf((LOG, "Failed to process imports!" ));
+            lasterror = LDRERROR_IMPORTS;
             goto failure;
         }
     }
-    return(TRUE);
+    return LDRERROR_SUCCESS;
 
 failure:
@@ -664 +675 @@
     }
     errorState = ERROR_INTERNAL;
-    return FALSE;
+    return lasterror;
 }
 //******************************************************************************
@@ -1606 +1617 @@
             if(pedll == NULL) {
                 dprintf((LOG, "pedll: Error allocating memory" ));
-                WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szMemErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
                 errorState = ERROR_INTERNAL;
                 return NULL;
@@ -1613 +1623 @@
             dprintf((LOG, "**********************     Loading Module        *********************" ));
             dprintf((LOG, "**********************************************************************" ));
-            if(pedll->init(0) == FALSE) {
+            if(pedll->init(0) != LDRERROR_SUCCESS) {
                 dprintf((LOG, "Internal WinDll error ", pedll->getError() ));
                 delete pedll;
@@ -2069 +2079 @@
     do {
         r = WinMessageBox(HWND_DESKTOP, NULLHANDLE, message,
-                          "Internal Odin Error", 0, MB_ABORTRETRYIGNORE | MB_ICONEXCLAMATION | MB_MOVEABLE);
+                          "Internal Error", 0, MB_ABORTRETRYIGNORE | MB_ICONEXCLAMATION | MB_MOVEABLE);
     }
     while(r == MBID_RETRY); //giggle

trunk/src/kernel32/winimagepeldr.h

@@ -1 @@
-/* $Id: winimagepeldr.h,v 1.17 2002-07-23 13:51:49 sandervl Exp $ */
+/* $Id: winimagepeldr.h,v 1.18 2002-12-20 11:39:43 sandervl Exp $ */
 
 /*
@@ -80 +80 @@
     //             loaded at a low address)
     //ulPEOffset:  offset in file where real PE image starts
-    virtual BOOL  init(ULONG reservedMem, ULONG ulPEOffset = 0);
+    virtual DWORD init(ULONG reservedMem, ULONG ulPEOffset = 0);
 
     virtual BOOL  insideModule(ULONG address);