Look reasonable to all of the experts? ;-)
dlls/winedos/module.c:
Chris Morgan <cmorgan(a)alum.wpi.edu>
Add PE support to MZ_Exec().
Index: module.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/module.c,v
retrieving revision 1.21
diff -u -r1.21 module.c
--- module.c 30 Aug 2002 00:03:25 -0000 1.21
+++ module.c 27 Sep 2002 18:33:58 -0000
@@ -342,14 +342,54 @@
*/
BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk )
{
+ DWORD binType;
+ STARTUPINFOA st;
+ PROCESS_INFORMATION pe;
+ BOOL status;
+
/* this may only be called from existing DOS processes
* (i.e. one DOS app spawning another) */
- /* FIXME: do we want to check binary type first, to check
- * whether it's a NE/PE executable? */
HANDLE hFile = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, 0, 0);
BOOL ret = FALSE;
+
+ if(!GetBinaryTypeA(filename, &binType)) /* determine what kind of binary this is */
+ {
+ return FALSE; /* binary is not an executable */
+ }
+
if (hFile == INVALID_HANDLE_VALUE) return FALSE;
+
+ /* handle PE executables */
+ if(binType == SCS_32BIT_BINARY)
+ {
+ if(func == 0) /* load and execute */
+ {
+ BYTE fullCmdLine[512];
+ LPBYTE psp_start = (LPBYTE)((DWORD)DOSVM_psp << 4);
+ PDB16 *psp = (PDB16 *)psp_start;
+ ExecBlock *blk = (ExecBlock *)paramblk;
+ LPBYTE cmdline = PTR_REAL_TO_LIN(SELECTOROF(blk->cmdline),OFFSETOF(blk->cmdline));
+ LPBYTE envblock = PTR_REAL_TO_LIN(psp->environment, 0);
+
+ cmdline[strlen(cmdline) - 1] = 0; /* remove the \r at the end */
+ cmdline++; /* the first character contains the length of the command line */
+
+ snprintf(fullCmdLine, sizeof(fullCmdLine), "%s %s", filename, cmdline); /* build the full command line */
+
+ ZeroMemory (&st, sizeof(STARTUPINFOA));
+ st.cb = sizeof(STARTUPINFOA);
+ status = CreateProcessA (NULL, fullCmdLine, NULL, NULL, TRUE,
+ 0, envblock, NULL, &st, &pe);
+ return TRUE;
+ } else
+ {
+ FIXME("EXEC type of %d not implemented for PE executables\n", func);
+ return FALSE;
+ }
+ } /* if(binType == SCS_32BIT_BINARY) */
+
+ /* handle dos executables */
switch (func) {
case 0: /* load and execute */
case 1: /* load but don't execute */