# revisions: 45877,46843,46844,46845,47275,47364,47505

git-svn-id: branches/fixes_3_2@47574 -

packages/fcl-net/src/ssockets.pp

@@ -1143,7 +1143,7 @@ begin
   TimeOutResult:=ctrError;
   {$ifdef unix}
   Err:=ESysEINTR;
-  While IsError and (Err in [ESysEINTR, ESysEAGAIN]) do
+  While IsError and ((Err=ESysEINTR) or (Err=ESysEAGAIN)) do
   {$endif}
     begin
     IsError:=fpConnect(Handle, @addr, sizeof(addr))<>0;

packages/rtl-extra/src/win/serial.pp

@@ -463,7 +463,7 @@ begin
     Timeouts.ReadTotalTimeoutConstant := mSec;
     SetCommTimeouts(Handle, Timeouts)
   end;
-  if not ReadFile(Handle, Buffer, count, BytesRead, nil) then
+  if not ReadFile(Handle, Buffer[0], count, BytesRead, nil) then
     result := 0
   else
     result := BytesRead

packages/rtl-generics/src/generics.collections.pas

@@ -1179,6 +1179,7 @@ var
   i: SizeInt;
   LEnumerator: TEnumerator<T>;
 begin
+  Result := nil;
   SetLength(Result, ACount);
 
   try
@@ -1620,6 +1621,7 @@ begin
   if (ACount < 0) or (AIndex < 0) or (AIndex + ACount > Count) then
     raise EArgumentOutOfRangeException.CreateRes(@SArgumentOutOfRange);
 
+  LDeleted := nil;
   SetLength(LDeleted, ACount);
   System.Move(FItems[AIndex], LDeleted[0], ACount * SizeOf(T));
 
@@ -2021,6 +2023,9 @@ end;
 
 function TQueue<T>.DoRemove(AIndex: SizeInt; ACollectionNotification: TCollectionNotification): T;
 begin
+  if Count = 0 then
+    raise EArgumentOutOfRangeException.CreateRes(@SArgumentOutOfRange);
+
   Result := FItems[AIndex];
   FItems[AIndex] := Default(T);
   Inc(FLow);
@@ -2151,7 +2156,7 @@ end;
 
 function TStack<T>.DoRemove(AIndex: SizeInt; ACollectionNotification: TCollectionNotification): T;
 begin
-  if AIndex < 0 then
+  if (AIndex < 0) or (Count = 0) then
     raise EArgumentOutOfRangeException.CreateRes(@SArgumentOutOfRange);
 
   Result := FItems[AIndex];

packages/rtl-generics/src/inc/generics.dictionaries.inc

@@ -138,6 +138,7 @@ var
   i: SizeInt;
   LEnumerator: TEnumerator<TDictionaryPair>;
 begin
+  Result := nil;
   SetLength(Result, ACount);
   LEnumerator := DoGetEnumerator;
 
@@ -292,6 +293,7 @@ var
   i: SizeInt;
   LEnumerator: TPointersEnumerator;
 begin
+  Result := nil;
   SetLength(Result, GetCount);
 
   try
@@ -480,6 +482,7 @@ begin
   if ASizePow2 < 0 then
     OutOfMemoryError;
 
+  LNewItems := nil;
   SetLength(LNewItems, ASizePow2);
   UpdateItemsThreshold(ASizePow2);
 

packages/rtl-generics/tests/tests.generics.dictionary.pas

@@ -351,6 +351,7 @@ Var
 begin
   DoAdd(3);
   A:=Dict.ToArray;
+  specialize TArrayHelper<TMyPair>.Sort(A{$ifndef fpc}, specialize TComparer<TMySimpleDict.TMyPair>.Default{$endif});
   AssertEquals('Length Ok',3,Length(A));
   For I:=1 to 3 do
     begin
@@ -370,6 +371,7 @@ Var
 begin
   DoAdd(3);
   A:=Dict.Keys.ToArray;
+  specialize TArrayHelper<Integer>.Sort(A{$ifndef fpc}, specialize TComparer<Integer>.Default{$endif});
   AssertEquals('Length Ok',3,Length(A));
   For I:=1 to 3 do
     begin
@@ -387,6 +389,7 @@ Var
 begin
   DoAdd(3);
   A:=Dict.Values.ToArray;
+  specialize TArrayHelper<String>.Sort(A{$ifndef fpc}, specialize TComparer<String>.Default{$endif});
   AssertEquals('Length Ok',3,Length(A));
   For I:=1 to 3 do
     begin
@@ -396,6 +399,9 @@ begin
 end;
 
 procedure TTestSimpleDictionary.TestEnumerator;
+type
+  TStringList = specialize TList<String>;
+  TIntegerList = specialize TList<Integer>;
 
 Var
 {$ifdef fpc}
@@ -403,19 +409,36 @@ Var
 {$else}
   A : TMySimpleDict.TMyPair;
 {$endif}
-  I : Integer;
+  I,J : Integer;
   SI : String;
-
+  IL: TIntegerList;
+  SL: TStringList;
 begin
   DoAdd(3);
-  I:=1;
-  For A in Dict do
-    begin
-    SI:=IntToStr(I);
-    AssertEquals('key '+SI,I,A.Key);
-    AssertEquals('Value '+SI,SI,A.Value);
-    Inc(I);
+  IL:=Nil;
+  SL:=TStringList.Create;
+  try
+    IL:=TIntegerList.Create;
+    for I:=1 to 3 do begin
+      IL.Add(I);
+      SL.Add(IntToStr(I));
     end;
+    I:=1;
+    For A in Dict do
+      begin
+      SI:=IntToStr(I);
+      J:=IL.IndexOf(A.Key);
+      AssertTrue('key '+SI,J>=0);
+      IL.Delete(J);
+      J:=SL.IndexOf(A.Value);
+      AssertTrue('value '+SI,J>=0);
+      SL.Delete(J);
+      Inc(I);
+      end;
+  finally
+    IL.Free;
+    SL.Free;
+  end;
 end;
 
 procedure TTestSimpleDictionary.TestNotification;

packages/rtl-generics/tests/tests.generics.queue.pas

@@ -377,7 +377,7 @@ procedure TTestSimpleQueue.TestValueNotificationDelete;
 begin
   DoAdd(3);
   Queue.OnNotify:=@DoValueNotify;
-  SetExpectValues('Clear',['1','2','3'],[cnRemoved,cnRemoved,cnRemoved],{$IFDEF FPC}true{$ELSE}False{$endif});
+  SetExpectValues('Clear',['1','2','3'],[cnRemoved,cnRemoved,cnRemoved]);
   Queue.Clear;
   DoneExpectValues;
 end;

rtl/win/wininc/base.inc

@@ -206,7 +206,6 @@
      LPPTSTR = ^LPTSTR;
 
      PWINBOOL = ^WINBOOL;
-     PBOOLEAN = ^BYTE {$ifndef VER2_2} deprecated {$endif};
 
      PBYTE = System.PByte;