paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 23:29:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Remove dead code. Close handle before raising exception.

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-12-17 15:19:26 +01:00
parent 7eb9ee390a
commit 09be1dfee1
1 changed files with 25 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
packages/fcl-process/src/win/process.inc
View File

@ -160,67 +160,6 @@ begin
SI.dwX:=P.WindowLeft; SI.dwX:=P.WindowLeft;
end; end;
{ The handles that are to be passed to the child process must be
inheritable. On the other hand, only non-inheritable handles
allow the sending of EOF when the write-end is closed. This
function is used to duplicate the child process's ends of the
handles into inheritable ones, leaving the parent-side handles
non-inheritable.
}
function DuplicateHandleFP(var handle: THandle): Boolean;
var
oldHandle: THandle;
begin
oldHandle := handle;
Result := DuplicateHandle
( GetCurrentProcess(),
oldHandle,
GetCurrentProcess(),
@handle,
0,
true,
DUPLICATE_SAME_ACCESS
);
if Result then
Result := CloseHandle(oldHandle);
end;
Procedure CreatePipes(Var HI,HO,HE : Thandle; Var SI : TStartupInfoW; CI, CE : Boolean; APipeBufferSize : Cardinal);
begin
if CI then
begin
CreatePipeHandles(SI.hStdInput,HI, APipeBufferSize);
DuplicateHandleFP(SI.hStdInput);
end
else
begin
SI.hStdInput:=StdInputHandle;
end;
CreatePipeHandles(HO,Si.hStdOutput, APipeBufferSize);
DuplicateHandleFP( Si.hStdOutput);
if CE then begin
CreatePipeHandles(HE,SI.hStdError, APipeBufferSize);
DuplicateHandleFP( SI.hStdError);
end
else
begin
SI.hStdError:=SI.hStdOutput;
HE:=HO;
end;
end;
{Function MaybeQuote(Const S : String) : String;
begin
If (Pos(' ',S)<>0) then
Result:='"'+S+'"'
else
Result:=S;
end;
}
Function MaybeQuoteIfNotQuoted(Const S : TProcessString) : TProcessString; Function MaybeQuoteIfNotQuoted(Const S : TProcessString) : TProcessString;
begin begin
@ -400,9 +339,32 @@ end;
function TIODescriptor.SysPrepareCreatedHandleForProcess(aHandle: THandle): THandle; function TIODescriptor.SysPrepareCreatedHandleForProcess(aHandle: THandle): THandle;
var
oldHandle: THandle;
Res : Boolean;
begin begin
if not DuplicateHandleFP(aHandle) then if IOType in [iotNone,iotFile] then
Raise EProcess.CreateFmt('Could not duplicate handle %d',[aHandle]); exit;
oldHandle := ahandle;
ahandle:=THandle(INVALID_HANDLE_VALUE);
Res := DuplicateHandle
( GetCurrentProcess(),
oldHandle,
GetCurrentProcess(),
@aHandle,
0,
true,
DUPLICATE_SAME_ACCESS
);
if Res then
Res:=CloseHandle(oldHandle);
if not Res then
begin
FileClose(aHandle);
Raise EProcess.CreateFmt('Could not make handle %d inheritable',[aHandle]);
end;
Result:=aHandle; Result:=aHandle;
end; end;