did not compile under FPC

maximmasiutin · Apr 6, 2023 · c935e41 · c935e41
1 parent 5b30308
commit c935e41
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/SRC/SrvMain.pas b/SRC/SrvMain.pas
@@ -380,6 +380,7 @@ function StrToFileTime(AStr: AnsiString): DWORD;
   if v = INVALID_VALUE then
     Exit;
   d.wSecond := v;
+  Clear(T, SizeOf(T));
   if not SystemTimeToFileTime(d, T) then
     Exit;
   Result := uCvtGetFileTime(T.dwLowDateTime, T.dwHighDateTime);
@@ -833,6 +834,8 @@ function ExecuteScript(const AExecutable, APath, AScript, AQueryParam, AEnvStr,
   CreatePipe(so_r, so_w, @Security, 0);
   CreatePipe(se_r, se_w, @Security, 0);
 
+  FillChar(PI, SizeOf(PI), 0);
+
   FillChar(SI, SizeOf(SI), 0);
   SI.CB := SizeOf(SI);
   SI.dwFlags := STARTF_USESTDHANDLES or STARTF_USESHOWWINDOW;
@@ -1645,6 +1648,8 @@ function WebServerHttpResponse(thr: THTTPServerThread; d: THTTPData)
   IsCGI: Boolean;
   CheckedURI, CDoubleDot, CDoubleBackslash, CDotEncosed: AnsiString;
 begin
+  Result := nil; // to avoid the uninitialized warning
+
   CBackSlash := '\';
   CForwardSlash := '/';
   ResponseEntityHeader := nil;
@@ -1952,6 +1957,7 @@ procedure THTTPServerThread.Execute;
       if s <> '' then
       begin
         k := s;
+        z := '';
         GetWrd(k, z, ' ');
         v := Vl(z);
         if (v <> INVALID_VALUE) and (v < 1000) and (v > 0) then
@@ -2036,6 +2042,7 @@ procedure THTTPServerThread.Execute;
         Socket.WriteStr(s);
         FPOS := 0;
         repeat
+          Actually := 0;
           ReadFile(FHandle, Buffer, CHTTPServerThreadBufSize, Actually, nil);
           Inc(FPOS, Actually);
           if FPOS > FileNfo.Size then
@@ -2316,11 +2323,13 @@ procedure THTTPServerThread.Execute;
   FSetProcessWorkingSetSize: TSetProcessWorkingSetSizeFunc;
 
 procedure FreeWorkingSetMemory;
+var
+  P: Pointer;
 begin
   if not Assigned(FSetProcessWorkingSetSize) then
   begin
-    FSetProcessWorkingSetSize := GetProcAddress(GetModuleHandle(kernel32),
-      'SetProcessWorkingSetSize');
+    P := GetProcAddress(GetModuleHandle(kernel32), 'SetProcessWorkingSetSize');
+    FSetProcessWorkingSetSize := TSetProcessWorkingSetSizeFunc(P);
   end;
   if Assigned(FSetProcessWorkingSetSize) then
   begin

diff --git a/SRC/xBase.pas b/SRC/xBase.pas
@@ -420,7 +420,7 @@ function __unsafe(c: AnsiChar): Boolean;
 { --- Basic Routines }
 
 function Buf2Str(const Buffer): AnsiString;
-procedure Clear(var Buf; Count: Integer);
+procedure Clear(out Buf; Count: Integer);
 function CompareMem(P1, P2: Pointer; Length: Integer): Boolean; assembler;
 procedure FreeObject(var O);
 procedure LowerPrec(var a, B: Integer; Bits: Byte);
@@ -1167,7 +1167,7 @@ procedure DeleteLeft(var S: AnsiString; I: Integer);
 // //
 /// /////////////////////////////////////////////////////////////////////
 
-procedure Clear(var Buf; Count: Integer);
+procedure Clear(out Buf; Count: Integer);
 begin
   FillChar(Buf, Count, 0);
 end;
@@ -1538,6 +1538,7 @@ function OpenRegKeyEx(const AName: AnsiString; AMode: DWORD): HKey;
     Result := INVALID_REGISTRY_KEY;
     Exit;
   end;
+  Result := 0;
   if RegOpenKeyExA(HKEY_LOCAL_MACHINE, // handle of an open key
     @(AName[1]), // subkey name
     0, // Reserved
@@ -1559,6 +1560,7 @@ function CreateRegKey(const AFName: AnsiString): HKey;
     Result := INVALID_REGISTRY_KEY;
     Exit;
   end;
+  Result := 0;
   if RegCreateKeyExA(HKEY_LOCAL_MACHINE, // handle of an open key
     @(AFName[1]), // subkey name
     0, // reserved, must be zero
@@ -1702,6 +1704,7 @@ function SysErrorMsg(ErrorCode: DWORD): AnsiString;
   Len: Integer;
   Buffer: array [0 .. 255] of AnsiChar;
 begin
+  Clear(Buffer, SizeOf(Buffer));
   Len := FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM or
     FORMAT_MESSAGE_ARGUMENT_ARRAY, nil, ErrorCode, 0, Buffer,
     SizeOf(Buffer), nil);
@@ -2278,6 +2281,7 @@ function GetEnvVariable(const Name: AnsiString): AnsiString;
     Result := '';
     Exit;
   end;
+  Clear(Buf, SizeOf(Buf));
   I := GetEnvironmentVariableA(@(Name[1]), Buf, BufSize);
   case I of
     1 .. BufSize:
@@ -3249,7 +3253,7 @@ procedure TResetterThread.Execute;
   until Terminated;
 end;
 
-constructor TFileFlusherThread.Create;
+constructor TFileFlusherThread.Create(AFileHandle: THandle; ACriticalSection: PRTLCriticalSection);
 begin
   inherited Create(True);
   FileHandle := AFileHandle;