Merge branch source:main into main

compiler/.gitignore

@@ -0,0 +1 @@
+msg2inc

packages/fcl-net/src/ssockets.pp

@@ -161,7 +161,6 @@ type
     FOnIdle : TNotifyEvent;
     FNonBlocking : Boolean;
     FSocket : longint;
-    FListened : Boolean;
     FAccepting : Boolean;
     FMaxConnections : Longint;
     FQueueSize : Longint;
@@ -341,7 +340,6 @@ uses
   resolve;
 
 Const
-  SocketWouldBlock = -2;
   SocketBlockingMode = 0;
   SocketNonBlockingMode = 1;
 
@@ -868,8 +866,11 @@ begin
 end;
 
 procedure TSocketServer.Abort;
+{$if defined(unix) or defined(mswindows) or defined(hasamiga)}
+{$else}
 var
   ASocket: longint;
+{$endif}
 begin
 {$if defined(unix)}
   fpShutdown(FSocket,SHUT_RDWR);
@@ -1003,11 +1004,10 @@ begin
   Listen;
   Repeat
     Repeat
+      Stream:=Nil;
       Try
         If (AcceptIdleTimeOut=0) or RunIdleLoop then
-          Stream:=GetConnection
-        else
-          Stream:=Nil;
+          Stream:=GetConnection;
         if Assigned(Stream) then
           if (MaxSimultaneousConnections>0) and (ConnectionCount>=MaxSimultaneousConnections) then
             begin
@@ -1257,7 +1257,7 @@ end;
 function TInetServer.SockToStream(ASocket: Longint): TSocketStream;
 Var
   H : TSocketHandler;
-  A : Boolean;
+  ok : Boolean;
   aClass : TInetSocketClass;
 
   procedure ShutDownH;
@@ -1266,7 +1266,6 @@ Var
     FreeAndNil(Result);
   end;
 
-
 begin
   H:=GetClientSocketHandler(aSocket);
   aClass:=DefaultInetSocketClass;
@@ -1276,14 +1275,13 @@ begin
   (Result as TInetSocket).FHost:='';
   (Result as TInetSocket).FPort:=FPort;
 
+  ok:=false;
   try
-    A:=H.Accept;
-  except
-    ShutDownH;
-    raise;
+    ok:=H.Accept;
+  finally
+    if not ok then
+      ShutDownH;
   end;
-  if Not A then
-    ShutDownH;
 end;
 
 function TInetServer.Accept: Longint;

packages/fcl-web/examples/httpserver/simplehttpserver.compiled

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CONFIG>
-  <Compiler Value="/usr/lib/fpc/3.3.1/ppcx64" Date="1680458816"/>
-  <Params Value=" -MObjFPC -Scghi -Cg -O1 -g -gl -l -vewnhibq -Fu/home/mattias/pascal/fpc_sources/3.3.1/packages/fcl-web/examples/echo/webmodule -Fu/home/mattias/pascal/fpc_sources/3.3.1/packages/fcl-web/examples/httpserver/ -o/home/mattias/pascal/fpc_sources/3.3.1/packages/fcl-web/examples/httpserver/simplehttpserver simplehttpserver.pas"/>
-</CONFIG>

packages/winunits-base/src/commctrl.pp

@@ -9930,6 +9930,9 @@ const
   TDF_RTL_LAYOUT                      = $2000;
   TDF_NO_DEFAULT_RADIO_BUTTON         = $4000;
   TDF_CAN_BE_MINIMIZED                = $8000;
+  TDF_NO_SET_FOREGROUND               = $00010000;
+  TDF_SIZE_TO_CONTENT                 = $01000000;
+
 
 type
   TASKDIALOG_FLAGS = Integer;                         // Note: _TASKDIALOG_FLAGS is an int