paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 16:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

* allow running any type of session from Exec

Browse Source
This commit is contained in:
Tomas Hajny 2004-12-06 21:50:04 +00:00
parent 1e1b20bd44
commit 46aad77754
1 changed files with 71 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
rtl/os2/dos.pas
View File

@ -156,14 +156,28 @@ var Args: PByteArray;
ArgSize: word; ArgSize: word;
Res: TResultCodes; Res: TResultCodes;
ObjName: string; ObjName: string;
RC: longint;
HQ: THandle;
SPID, STID, QName: string;
SD: TStartData;
SID, PID: cardinal;
RD: TRequestData;
PCI: PChildInfo;
CISize: cardinal;
Prio: byte;
const const
MaxArgsSize = 2048; (* Amount of memory reserved for arguments in bytes. *) MaxArgsSize = 2048; (* Amount of memory reserved for arguments in bytes. *)
begin begin
{ LastDosExitCode := Exec (Path, ExecRunFlags (ExecFlags), efDefault, ComLine);} { LastDosExitCode := Exec (Path, ExecRunFlags (ExecFlags), efDefault, ComLine);}
QName := FExpand (Path);
if ComLine = '' then
Args := nil
else
begin
GetMem (Args, MaxArgsSize); GetMem (Args, MaxArgsSize);
ArgSize := 0; ArgSize := 0;
Move (Path [1], Args^ [ArgSize], Length (Path)); Move (QName [1], Args^ [ArgSize], Length (QName));
Inc (ArgSize, Length (Path)); Inc (ArgSize, Length (QName));
Args^ [ArgSize] := 0; Args^ [ArgSize] := 0;
Inc (ArgSize); Inc (ArgSize);
{Now do the real arguments.} {Now do the real arguments.}
@ -172,18 +186,61 @@ begin
Args^ [ArgSize] := 0; Args^ [ArgSize] := 0;
Inc (ArgSize); Inc (ArgSize);
Args^ [ArgSize] := 0; Args^ [ArgSize] := 0;
DosError := DosExecPgm (ObjName, cardinal (ExecFlags), Args, nil, Res, Path); end;
if DosError = 0 then RC := DosExecPgm (ObjName, cardinal (ExecFlags), Args, nil, Res, Path);
if RC = 0 then
begin
LastDosExitCode := Res.ExitCode;
LastDosErrorModuleName := '';
end
else
if (RC = 190) or (RC = 191) then
begin
FillChar (SD, SizeOf (SD), 0);
SD.Length := 24;
SD.Related := ssf_Related_Child;
if Args = nil then
(* No parameters passed, Args not allocated for DosExecPgm, so allocate now. *)
begin begin
LastDosExitCode := Res.ExitCode; GetMem (Args, MaxArgsSize);
LastDosErrorModuleName := ''; Move (QName [1], Args^ [0], Length (QName));
Args^ [Length (QName)] := 0;
end end
else else
SD.PgmInputs := PChar (@Args^ [Length (QName) + 1]);
SD.PgmName := PChar (Args);
SD.InheritOpt := ssf_InhertOpt_Parent;
Str (GetProcessID, SPID);
Str (ThreadID, STID);
QName := '\QUEUES\FPC_Dos_Exec_p' + SPID + 't' + STID + '.QUE'#0;
SD.TermQ := @QName [1];
RC := DosCreateQueue (HQ, quFIFO or quConvert_Address, @QName [1]);
if RC = 0 then
begin begin
LastDosErrorModuleName := ObjName; RC := DosStartSession (SD, SID, PID);
LastDosExitCode := 0; (* Needed for TP/BP compatibility *) if (RC = 0) or (RC = 457) then
begin
RC := DosReadQueue (HQ, RD, CISize, PCI, 0, 0, Prio, 0);
if RC = 0 then
begin
LastDosExitCode := PCI^.Return;
DosCloseQueue (HQ);
DosFreeMem (PCI);
end
else
DosCloseQueue (HQ);
end
else
DosCloseQueue (HQ);
end; end;
FreeMem (Args, MaxArgsSize); end
else
LastDosErrorModuleName := ObjName;
if RC <> 0 then
LastDosExitCode := 0; (* Needed for TP/BP compatibility *)
DosError := RC;
if Args <> nil then
FreeMem (Args, MaxArgsSize);
end; end;
@ -477,7 +534,10 @@ end.
{ {
$Log$ $Log$
Revision 1.42 2004-12-05 19:16:54 hajny Revision 1.43 2004-12-06 21:50:04 hajny
* allow running any type of session from Exec
Revision 1.42 2004/12/05 19:16:54 hajny
* GetMsCount added, platform independent routines moved to single include file * GetMsCount added, platform independent routines moved to single include file
Revision 1.41 2004/05/23 21:47:34 hajny Revision 1.41 2004/05/23 21:47:34 hajny