From a7409837695aeb19a77778375df3842a7e5f6ed0 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 30 Jul 2024 19:16:31 +0200 Subject: [PATCH 1/2] * manually added the fix done in main in f35a565f4eedb53ef47faf2bd12fabe9f02b848c --- packages/fcl-process/src/win/process.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fcl-process/src/win/process.inc b/packages/fcl-process/src/win/process.inc index 2478578d39..743afd4a0b 100644 --- a/packages/fcl-process/src/win/process.inc +++ b/packages/fcl-process/src/win/process.inc @@ -40,7 +40,7 @@ Function TProcessnamemacro.PeekExitStatus : Boolean; begin Result:=GetExitCodeProcess(ProcessHandle,FExitCode) and (FExitCode<>Still_Active); // wait up to 10ms extra till process really done to get rest of input bug #39821 - if not Result Then + if Result Then WaitForSingleObject(FProcessHandle,10); end; From 22da36f83e742a62408afe0ed3116dd7bfa9829e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Wed, 8 Sep 2021 23:00:51 +0200 Subject: [PATCH 2/2] * Fix issue #39350 : strip extension dot in windows loadknowntypes (cherry picked from commit 25450a99ed7d01fa0df4b6a156fcbeb8e62a8d94) --- packages/fcl-web/src/base/fpmimetypes.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fcl-web/src/base/fpmimetypes.pp b/packages/fcl-web/src/base/fpmimetypes.pp index 6d737ed9b3..db431cc355 100644 --- a/packages/fcl-web/src/base/fpmimetypes.pp +++ b/packages/fcl-web/src/base/fpmimetypes.pp @@ -266,7 +266,7 @@ begin aType:= Reg.ReadString('Content Type'); Reg.CloseKey; if aType<>'' then - AddType(aType,Ext); + AddType(aType,Copy(Ext,2,Length(Ext)-1)); end; end; Reg.CloseKey;