Changeset 3376 for trunk/src

Timestamp:

Apr 15, 2000, 12:56:11 AM (25 years ago)

Author:

sandervl

Message:

pe loader command line fixes + support for names with spaces

File:

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

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.15 2000-04-13 18:54:41 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.16 2000-04-14 22:56:11 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 char szInteralErrorMsg[]= "Internal Error";
 char szNoKernel32Msg[]  = "Can't load/find kernel32.dll (rc=%d)";
+char szDosInfoBlocks[]  = "DosInfoBlocks failed!";
 
 char fullpath[CCHMAXPATH];
@@ -62 +63 @@
 
 //should be the same as in ..\kernel32\winexepeldr.h
-typedef BOOL (* WIN32API WIN32CTOR)(char *, ULONG);
+typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, ULONG);
 
 WIN32CTOR              CreateWin32Exe       = 0;
@@ -77 +78 @@
  HMQ    hmq = 0;                             /* Message queue handle         */
  char   exeName[CCHMAXPATH];
+ char   fullpath[CCHMAXPATH];
  APIRET  rc;
  HMODULE hmodPMWin = 0, hmodKernel32 = 0;
+ PTIB   ptib;
+ PPIB   ppib;
+ char  *cmdline, *win32cmdline;
 
   if(argc >= 2) {
-        strcpy(exeName, argv[1]);
-        strupr(exeName);
+        if(DosGetInfoBlocks(&ptib, &ppib) == 0) {
+                cmdline = ppib->pib_pchcmd;
+                cmdline += strlen(cmdline)+1;   //skip pe.exe
+                while(*cmdline == ' ')  cmdline++; //skip leading space
+                if(*cmdline == '"')     cmdline++;
+                win32cmdline = cmdline;
+
+                strncpy(exeName, cmdline, sizeof(exeName)-1);
+                exeName[sizeof(exeName)-1] = 0;
+                strupr(exeName);
+                cmdline = strstr(exeName, ".EXE");
+                if(cmdline) {
+                        cmdline[4] = 0;
+                        win32cmdline += ((ULONG)cmdline - (ULONG)exeName) + 4;
+                }
+                else {
+                        cmdline = exeName;
+                        while(*cmdline && *cmdline != ' ')      cmdline++; //skip exe name
+                        *cmdline = 0;
+                        win32cmdline += ((ULONG)cmdline - (ULONG)exeName);
+                        if(strstr(exeName, ".") == NULL) {
+                                strcat(exeName, ".EXE");
+                        }
+                }
+                while(*win32cmdline == ' ') win32cmdline++; //skip spaces
+
+                cmdline = exeName + strlen(exeName) - 1;
+                while(*cmdline == ' ') cmdline--;
+                cmdline[1] = 0;
+                if(DosQueryPathInfo(exeName, FIL_QUERYFULLNAME, (PVOID)fullpath, sizeof(fullpath)) == 0) {
+                        strcpy(exeName, fullpath);
+                }
+        }
+        else {//should never happen!
+                DebugInt3();
+                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;
+        }
         AllocateExeMem(exeName);
   }
@@ -109 +152 @@
         goto fail;
   }
-  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@8", (PFN *)&CreateWin32Exe);
-
-  strcpy(exeName, argv[1]);
-  strupr(exeName);
-  if(CreateWin32Exe(exeName, reservedMemory) == FALSE) {
+  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@12", (PFN *)&CreateWin32Exe);
+
+  if(CreateWin32Exe(exeName, win32cmdline, reservedMemory) == FALSE) {
         goto fail;
   }
@@ -154 +195 @@
 
   strcpy(szFileName, filename);
-  tmp = szFileName;
-  while(*tmp != ' ' && *tmp != 0)
-        tmp++;
-  *tmp = 0;
-
-  if(!strchr(szFileName, '.')) {
-        strcat(szFileName,".EXE");
-  }
+
   rc = DosOpen(szFileName, &dllfile, &action, 0, FILE_READONLY, OPEN_ACTION_OPEN_IF_EXISTS|OPEN_ACTION_FAIL_IF_NEW, OPEN_SHARE_DENYNONE|OPEN_ACCESS_READONLY, NULL);
   if(rc != 0) {