Changeset 4501 for trunk/src

Timestamp:

Oct 20, 2000, 1:45:25 PM (25 years ago)

Author:

sandervl

Message:

build special VIO version of PE loader

Location:

trunk/src/peldr

Files:

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

trunk/src/peldr/makefile

@@ -1 @@
-# $Id: makefile,v 1.16 2000-03-07 11:11:10 bird Exp $
+# $Id: makefile,v 1.17 2000-10-20 11:45:25 sandervl Exp $
 
 #
@@ -27 +27 @@
 # Object files. All objects should be prefixed with $(OBJDIR)!
 OBJS = $(OBJDIR)\pe.obj
-
+OBJS1= $(OBJDIR)\pec.obj
 
 # Target name - name of the dll without extention and path.
-TARGET = pe
-
+TARGET  = pe
+TARGET1 = pec
 
 # All rule - build objs, target dll, copies dll to bin and makes libs.
 all:    $(OBJDIR) \
         $(OBJDIR)\$(TARGET).exe \
-        $(PDWIN32_BIN)\$(TARGET).exe
+        $(PDWIN32_BIN)\$(TARGET).exe \
+        $(OBJDIR)\$(TARGET1).exe \
+        $(PDWIN32_BIN)\$(TARGET1).exe
 
 
@@ -47 +49 @@
     $(LD2) $(LD2FLAGS_ODINCRT) @$(OBJDIR)\$(TARGET).lrf
 
+$(OBJDIR)\$(TARGET1).exe: $(OBJS1) $(OBJDIR)\$(TARGET1).lrf
+    $(LD2) $(LD2FLAGS_ODINCRT) @$(OBJDIR)\$(TARGET1).lrf
+
+$(PDWIN32_BIN)\$(TARGET1).exe: $(OBJDIR)\$(TARGET1).exe
+    cd $(OBJDIR)
+    $(MAPSYM) $(TARGET1).map
+    cd ..\..
+    $(CP) $(OBJDIR)\$(TARGET1).sym $(PDWIN32_BIN)
+    $(CP) $** $@
+    -$(CP) $** $(@D)..\..\$(@F)
+    -$(CP) $(OBJDIR)\$(TARGET1).sym $(@D)..\..
+
+$(OBJDIR)\pec.obj:   pe.cpp
+    $(CC) -C $(CXXFLAGS) -DCOMMAND_LINE_VERSION -Fo$@ pe.cpp
 
 # Linker file - creates the parameter file passed on to the linker.
@@ -61 +77 @@
 
 
+$(OBJDIR)\$(TARGET1).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET1).exe
+/MAP:$(OBJDIR)\$(TARGET1).map
+/PMTYPE:vio
+/STACK:0x100000
+/NOBASE
+$(OBJS1)
+os2386.lib
+<<keep
+
 # Dep rule - makes depenencies for C, C++ and Asm files.
 dep:

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.23 2000-10-06 15:15:25 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.24 2000-10-20 11:45:25 sandervl Exp $ */
 
 /*
@@ -67 +67 @@
 
 //should be the same as in ..\kernel32\winexepeldr.h
-typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, char *, ULONG, BOOL);
+typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, char *, ULONG, BOOL, BOOL);
 
 WIN32CTOR   CreateWin32Exe       = 0;
@@ -88 +88 @@
  PPIB   ppib;
  char  *cmdline, *win32cmdline, *peoptions, *newcmdline;
- BOOL   fQuote = FALSE;
+ BOOL   fQuote = FALSE, fVioConsole;
  int    nrTries = 1;
 
@@ -175 +175 @@
   }
 
+#ifdef COMMAND_LINE_VERSION
+  if(DosGetInfoBlocks(&ptib, &ppib) == 0) {
+        //switch process type to PM so the command line app can create PM
+        //windows
+        ppib->pib_ultype = 3; 
+  }
+#endif
+
   rc = DosLoadModule(exeName, sizeof(exeName), "PMWIN.DLL", &hmodPMWin);
   rc = DosQueryProcAddr(hmodPMWin, ORD_WIN32INITIALIZE, NULL, (PFN *)&MyWinInitialize);
@@ -198 +206 @@
         goto fail;
   }
-  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@20", (PFN *)&CreateWin32Exe);
-
-  if(CreateWin32Exe(exeName, win32cmdline, peoptions, reservedMemory, fConsoleApp) == FALSE) {
+  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@24", (PFN *)&CreateWin32Exe);
+
+#ifdef COMMAND_LINE_VERSION
+  fVioConsole = TRUE;
+#else
+  fVioConsole = FALSE;
+#endif
+  if(CreateWin32Exe(exeName, win32cmdline, peoptions, reservedMemory, fConsoleApp, fVioConsole) == FALSE) {
         goto fail;
   }