Changeset 1002

Timestamp:

Sep 21, 1999, 8:35:01 PM (26 years ago)

Author:

sandervl

Message:

Update for new kernel32 images classes

Location:

trunk/src/peldr

Files:

• makefile (modified) (2 diffs)
• pe.cpp (modified) (5 diffs)

trunk/src/peldr/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.8 1999-08-21 19:11:27 sandervl Exp $
+# $Id: makefile,v 1.9 1999-09-21 18:35:01 sandervl Exp $
 
 #
@@ -46 +46 @@
 initterm.obj: initterm.cpp
 misc.obj: misc.cpp
-pe.obj: pe.cpp pe.h $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\winexe.h
+pe.obj: pe.cpp pe.h $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winexebase.h $(PDWIN32_INCLUDE)\exceptions.h ..\kernel32\exceptutil.h
 
 clean:

trunk/src/peldr/pe.cpp ¶

@@ -1 @@
-/* $Id: pe.cpp,v 1.8 1999-08-28 07:38:15 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.9 1999-09-21 18:35:01 sandervl Exp $ */
 
 /*
@@ -25 +25 @@
 #include <win32type.h>
 #include <misc.h>
-#include <winexe.h>
-#include <windll.h>
+#include <winexepeldr.h>
 #include <wprocess.h>
 #include "pe.h"
-#include "exceptions.h"
-#include "..\kernel32\exceptutil.h"
 
 char INFO_BANNER[]      = "Usage: PE winexe commandline";
@@ -69 +66 @@
  HAB    hab = 0;                             /* PM anchor block handle       */
  HMQ    hmq = 0;                             /* Message queue handle         */
- char  *szCmdLine;
  char   exeName[CCHMAXPATH];
- PPIB   ppib;
- PTIB   ptib;
- Win32Exe *WinExe;
  APIRET  rc;
  HMODULE hmodPMWin = 0, hmodKernel32 = 0;
- WINEXCEPTION_FRAME exceptFrame;
 
   rc = DosLoadModule(exeName, sizeof(exeName), "PMWIN.DLL", &hmodPMWin);
@@ -86 +78 @@
 
   rc = DosLoadModule(exeName, sizeof(exeName), "KERNEL32.DLL", &hmodKernel32);
-  rc = DosQueryProcAddr(hmodKernel32, 0, "CreateWin32Exe", (PFN *)&CreateWin32Exe);
-  rc = DosQueryProcAddr(hmodKernel32, 0, "OS2SetExceptionHandler", (PFN *)&Krnl32SetExceptionHandler);
-  rc = DosQueryProcAddr(hmodKernel32, 0, "OS2UnsetExceptionHandler", (PFN *)&Krnl32UnsetExceptionHandler);
+  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@8", (PFN *)&CreateWin32Exe);
 
   if ((hab = MyWinInitialize(0)) == 0L) /* Initialize PM     */
@@ -105 +95 @@
         strcat(exeName, ".EXE");
   }
-  WinExe = CreateWin32Exe(exeName);
-  if(WinExe == NULL) {
+  if(CreateWin32Exe(exeName, ReserveMem()) == FALSE) {
         MyWinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szMemErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
         goto fail;
   }
-  rc = DosGetInfoBlocks(&ptib, &ppib);
-  if(rc) {
-        MyWinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szInteralErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
-        delete WinExe;
-        goto fail;
-  }
-  szCmdLine = ppib->pib_pchcmd;
-  while(*szCmdLine == ' ' && *szCmdLine )       //skip leading spaces
-        szCmdLine++;
-  while(*szCmdLine != ' ' && *szCmdLine )       //skip pe (.exe)
-        szCmdLine++;
-  while(*szCmdLine == ' ' && *szCmdLine )       //skip spaces
-        szCmdLine++;
-
-  WinExe->setCommandLine(szCmdLine);
-
-  Krnl32SetExceptionHandler(&exceptFrame);
-  if(WinExe->init(ReserveMem()) == FALSE) {
-        delete WinExe;
-        goto fail;
-  }
-  Krnl32UnsetExceptionHandler(&exceptFrame);
-  WinExe->start();
-
-  delete WinExe;
 
   if(hmq) MyWinDestroyMsgQueue( hmq );             /* Tidy up...                   */