fixes, merge with main branch

project-jedi · Jul 7, 2022 · 415dfa9 · 415dfa9
1 parent c96b4a7
commit 415dfa9
Show file tree

Hide file tree

Showing 5 changed files with 275 additions and 131 deletions.
diff --git a/jcl/source/common/JclResources.pas b/jcl/source/common/JclResources.pas
@@ -1960,6 +1960,7 @@ interface
   RsOSVersionWinServer2016      = 'Windows Server 2016';
   RsOSVersionWinServer2019      = 'Windows Server 2019';
   RsOSVersionWinServer          = 'Windows Server';
+  RsOSVersionWin11              = 'Windows 11';
 
   RsEditionWinXPHome            = 'Home Edition';
   RsEditionWinXPPro             = 'Professional';

diff --git a/jcl/source/common/JclStreams.pas b/jcl/source/common/JclStreams.pas
@@ -792,7 +792,7 @@ constructor TJclHandleStream.Create(AHandle: THandle);
 
 function TJclHandleStream.Read(var Buffer; Count: Longint): Longint;
 begin
-  Result := 0;
+  //Result := 0;
   {$IFDEF MSWINDOWS}
   if (Count <= 0) or not ReadFile(Handle, Buffer, DWORD(Count), DWORD(Result), nil) then
     Result := 0;
@@ -810,7 +810,7 @@ function TJclHandleStream.Read(var Buffer; Count: Longint): Longint;
 
 function TJclHandleStream.Write(const Buffer; Count: Longint): Longint;
 begin
-  Result := 0;
+  //Result := 0;
   {$IFDEF MSWINDOWS}
   if (Count <= 0) or not WriteFile(Handle, Buffer, DWORD(Count), DWORD(Result), nil) then
     Result := 0;