From c44cc56a9a2ddc6eb604f2eaa21ee2696b364771 Mon Sep 17 00:00:00 2001
From: sg <sg>
Date: Wed, 5 Jan 2000 18:59:56 +0000
Subject: [PATCH] * Fixed missing () in InsertProp which caused memory
 corruptions * GetOrdProp handles Char and WChar now. (there are still some  
 property types missing!)

---
 rtl/objpas/typinfo.pp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/rtl/objpas/typinfo.pp b/rtl/objpas/typinfo.pp
index 8f7c33ca11..70c6d0b651 100644
--- a/rtl/objpas/typinfo.pp
+++ b/rtl/objpas/typinfo.pp
@@ -432,7 +432,7 @@ unit typinfo;
      I:=0;
      While (I<Count) and (PI^.Name>PL^[I]^.Name) do Inc(I);
      If I<Count then
-       Move(PL^[I],PL[I+1],Count-I*SizeOf(Pointer));
+       Move(PL^[I], PL^[I+1], (Count - I) * SizeOf(Pointer));
      PL^[I]:=PI;
     end;
 
@@ -498,9 +498,9 @@ unit typinfo;
          end;
          { cut off unnecessary stuff }
          case GetTypeData(PropInfo^.PropType)^.OrdType of
-            otSWord,otUWord:
+            otSWord,otUWord,otWChar:
               Value:=Value and $ffff;
-            otSByte,otUByte:
+            otSByte,otUByte,otChar:
               Value:=Value and $ff;
          end;
          GetOrdProp:=Value;
@@ -807,7 +807,12 @@ end.
 
 {
   $Log$
-  Revision 1.31  1999-12-28 12:19:36  jonas
+  Revision 1.32  2000-01-05 18:59:56  sg
+  * Fixed missing () in InsertProp which caused memory corruptions
+  * GetOrdProp handles Char and WChar now. (there are still some
+    property types missing!)
+
+  Revision 1.31  1999/12/28 12:19:36  jonas
     * replaced "movl mem,%eax; xorl %eax,%eax" with "movl mem,%eax;
       testl %eax,%eax"