Changeset 4445 for trunk/src/peldr

Timestamp:

Oct 6, 2000, 5:16:07 PM (25 years ago)

Author:

sandervl

Message:

changes for setting current dir of new process

File:

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

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.22 2000-10-06 11:04:42 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.23 2000-10-06 15:15:25 sandervl Exp $ */
 
 /*
  * PELDR main exe loader code
  *
- * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
+ * Copyright 1998-2000 Sander van Leeuwen (sandervl@xs4all.nl)
  *
+ * Command line options:
+ *   /OPT:[x1=y,x2=z,..]         
+ *   x = CURDIR    -> set current directory to y
+ *   (not other options available at this time)
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -63 +67 @@
 
 //should be the same as in ..\kernel32\winexepeldr.h
-typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, ULONG, BOOL);
+typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, char *, ULONG, BOOL);
 
 WIN32CTOR   CreateWin32Exe       = 0;
@@ -83 +87 @@
  PTIB   ptib;
  PPIB   ppib;
- char  *cmdline, *win32cmdline;
+ char  *cmdline, *win32cmdline, *peoptions, *newcmdline;
  BOOL   fQuote = FALSE;
  int    nrTries = 1;
@@ -92 +96 @@
                 cmdline = ppib->pib_pchcmd;
                 cmdline += strlen(cmdline)+1;   //skip pe.exe
+                peoptions = strstr(cmdline, "/OPT:[");
+                if(peoptions) {
+                        newcmdline = strchr(peoptions, ']');
+                        if(newcmdline) {
+                                cmdline = newcmdline+1;
+                        }
+                        else    DebugInt3();    //should not happen!
+                }               
                 while(*cmdline == ' ')  cmdline++; //skip leading space
                 if(*cmdline == '"') {
@@ -186 +198 @@
         goto fail;
   }
-  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@16", (PFN *)&CreateWin32Exe);
-
-  if(CreateWin32Exe(exeName, win32cmdline, reservedMemory, fConsoleApp) == FALSE) {
+  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@20", (PFN *)&CreateWin32Exe);
+
+  if(CreateWin32Exe(exeName, win32cmdline, peoptions, reservedMemory, fConsoleApp) == FALSE) {
         goto fail;
   }