Changeset 5956 for trunk/src

Timestamp:

Jun 11, 2001, 12:00:04 AM (24 years ago)

Author:

sandervl

Message:

Launch win16 loader for NE apps

File:

• trunk/src/peldr/pe.cpp (modified) (13 diffs)

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.27 2001-04-10 17:09:08 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.28 2001-06-10 22:00:04 sandervl Exp $ */
 
 /*
  * PELDR main exe loader code
  *
- * Copyright 1998-2000 Sander van Leeuwen (sandervl@xs4all.nl)
+ * Copyright 1998-2001 Sander van Leeuwen (sandervl@xs4all.nl)
  *
  * Command line options:
@@ -19 +19 @@
 #define INCL_DOSMISC             /* DOS Miscellanous values  */
 #define INCL_DOSMODULEMGR
+#define INCL_DOSSESMGR
 #define INCL_WIN
 #include <os2.h>
@@ -43 +44 @@
 char szNoKernel32Msg[]  = "Can't load/find kernel32.dll (rc=%d, module %s)";
 char szDosInfoBlocks[]  = "DosInfoBlocks failed!";
+char szErrDosStartSession[] = "Failed to start win16 session (rc=%d)";
 
 char fullpath[CCHMAXPATH];
@@ -73 +75 @@
 BOOL        fConsoleApp          = FALSE;
 
-void AllocateExeMem(char *filename);
+BOOL AllocateExeMem(char *filename, BOOL *fNEExe);
 
 //******************************************************************************
@@ -84 +86 @@
  char   fullpath[CCHMAXPATH];
  char   errorMod[CCHMAXPATH];
+ char  *pszErrorMsg = NULL;
  APIRET  rc;
  HMODULE hmodPMWin = 0, hmodKernel32 = 0;
@@ -89 +92 @@
  PPIB   ppib;
  char  *cmdline, *win32cmdline, *peoptions, *newcmdline;
- BOOL   fQuote = FALSE, fVioConsole;
+ BOOL   fQuote = FALSE, fVioConsole, fIsNEExe;
  int    nrTries = 1;
 
@@ -162 +165 @@
         else {//should never happen!
 filenotfound:
-                rc = DosLoadModule(exeName, sizeof(exeName), "PMWIN.DLL", &hmodPMWin);
-                rc = DosQueryProcAddr(hmodPMWin, ORD_WIN32MESSAGEBOX, NULL, (PFN *)&MyWinMessageBox);
-                MyWinMessageBox(HWND_DESKTOP, NULL, szDosInfoBlocks, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
-                goto fail;
+                pszErrorMsg = szDosInfoBlocks;
+                goto failerror;
         }
-        AllocateExeMem(exeName);
+        AllocateExeMem(exeName, &fIsNEExe);
+        if(fIsNEExe) {
+            STARTDATA sdata = {0};
+            ULONG idSession;
+            PID   pid;
+            sdata.Length    = sizeof(sdata);
+            sdata.PgmName   = "w16odin.exe";
+            strcpy(fullpath, exeName);
+            strcat(fullpath, " ");
+            strcat(fullpath, win32cmdline);
+            sdata.PgmInputs = fullpath;
+            sdata.SessionType = SSF_TYPE_WINDOWEDVDM;
+            rc = DosStartSession(&sdata, &idSession, &pid);
+            if(rc) {
+                sprintf(fullpath, szErrDosStartSession, rc);
+                pszErrorMsg = fullpath;
+                goto failerror;
+            }
+            return 0;
+        }
   }
 
@@ -227 +247 @@
   if(hmodKernel32)      DosFreeModule(hmodKernel32);
   return(1);
+
+failerror:
+  rc = DosLoadModule(exeName, sizeof(exeName), "PMWIN.DLL", &hmodPMWin);
+  rc = DosQueryProcAddr(hmodPMWin, ORD_WIN32INITIALIZE, NULL, (PFN *)&MyWinInitialize);
+  rc = DosQueryProcAddr(hmodPMWin, ORD_WIN32TERMINATE, NULL, (PFN *)&MyWinTerminate);
+  rc = DosQueryProcAddr(hmodPMWin, ORD_WIN32CREATEMSGQUEUE, NULL, (PFN *)&MyWinCreateMsgQueue);
+  rc = DosQueryProcAddr(hmodPMWin, ORD_WIN32DESTROYMSGQUEUE, NULL, (PFN *)&MyWinDestroyMsgQueue);
+  rc = DosQueryProcAddr(hmodPMWin, ORD_WIN32MESSAGEBOX, NULL, (PFN *)&MyWinMessageBox);
+  if(rc == 0) {
+      if ((hab = MyWinInitialize(0)) == 0L) /* Initialize PM     */
+        goto fail;
+
+      hmq = MyWinCreateMsgQueue(hab, 0);
+
+      MyWinMessageBox(HWND_DESKTOP, NULL, pszErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+  }
+  if(hmq) MyWinDestroyMsgQueue( hmq );             /* Tidy up...                   */
+  if(hab) MyWinTerminate( hab );                   /* Terminate the application    */
+  if(hmodPMWin)         DosFreeModule(hmodPMWin);
+  return 1;
 }
 //******************************************************************************
@@ -233 +273 @@
 //     a very low virtual address. (which is exactly what we want)
 //******************************************************************************
-void AllocateExeMem(char *filename)
+BOOL AllocateExeMem(char *filename, BOOL *fNEExe)
 {
  HFILE  dllfile = 0;
@@ -248 +288 @@
  ULONG  diff, i, baseAddress;
  ULONG  ulSysinfo, flAllocMem = 0;
-
+ BOOL   ret = FALSE;
+
+  *fNEExe = FALSE;
   strcpy(szFileName, filename);
 
@@ -291 +333 @@
   }
   if(doshdr.e_magic != IMAGE_DOS_SIGNATURE || signature != IMAGE_NT_SIGNATURE) {
+        if(LOWORD(signature) == IMAGE_OS2_SIGNATURE) {
+            *fNEExe = TRUE;
+        }
         goto end;
   }
@@ -312 +357 @@
   }
   else {
-        if(flAllocMem == 0) {
-                goto end; //no support for > 512 MB
+        if(flAllocMem == 0) {
+            goto end; //no support for > 512 MB
         }
   }
@@ -346 +391 @@
         DosFreeMem((PVOID)memallocs[i]);
   }
+  ret = TRUE;
 end:
   if(dllfile) DosClose(dllfile);
-  return;
+  return ret;
 }
 //******************************************************************************