|
@@ -604,7 +604,7 @@ var
|
|
|
begin
|
|
|
case (PropInfo^.PropProcs shr 4) and 3 of
|
|
|
ptfield:
|
|
|
- Result:=PBoolean(Pointer(Instance)+Longint(PropInfo^.StoredProc))^;
|
|
|
+ Result:=PBoolean(Pointer(Instance)+PtrUInt(PropInfo^.StoredProc))^;
|
|
|
ptconst:
|
|
|
Result:=LongBool(PropInfo^.StoredProc);
|
|
|
ptstatic,
|
|
@@ -613,7 +613,7 @@ begin
|
|
|
if (PropInfo^.PropProcs shr 4) and 3=ptstatic then
|
|
|
AMethod.Code:=PropInfo^.StoredProc
|
|
|
else
|
|
|
- AMethod.Code:=ppointer(Pointer(Instance.ClassType)+Longint(PropInfo^.StoredProc))^;
|
|
|
+ AMethod.Code:=ppointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.StoredProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
if ((PropInfo^.PropProcs shr 6) and 1)<>0 then
|
|
|
Result:=TBooleanIndexFunc(AMethod)(PropInfo^.Index)
|
|
@@ -809,17 +809,17 @@ begin
|
|
|
ptfield:
|
|
|
if Signed then begin
|
|
|
case DataSize of
|
|
|
- 1: Result:=PShortInt(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
- 2: Result:=PSmallInt(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
- 4: Result:=PLongint(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
- 8: Result:=PInt64(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ 1: Result:=PShortInt(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
+ 2: Result:=PSmallInt(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
+ 4: Result:=PLongint(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
+ 8: Result:=PInt64(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
end;
|
|
|
end else begin
|
|
|
case DataSize of
|
|
|
- 1: Result:=PByte(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
- 2: Result:=PWord(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
- 4: Result:=PLongint(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
- 8: Result:=PInt64(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ 1: Result:=PByte(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
+ 2: Result:=PWord(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
+ 4: Result:=PLongint(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
+ 8: Result:=PInt64(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
end;
|
|
|
end;
|
|
|
ptstatic,
|
|
@@ -828,7 +828,7 @@ begin
|
|
|
if (PropInfo^.PropProcs and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.GetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
if ((PropInfo^.PropProcs shr 6) and 1)<>0 then begin
|
|
|
case DataSize of
|
|
@@ -896,10 +896,10 @@ begin
|
|
|
case (PropInfo^.PropProcs shr 2) and 3 of
|
|
|
ptfield:
|
|
|
case DataSize of
|
|
|
- 1: PByte(Pointer(Instance)+Ptrint(PropInfo^.SetProc))^:=Byte(Value);
|
|
|
- 2: PWord(Pointer(Instance)+Ptrint(PropInfo^.SetProc))^:=Word(Value);
|
|
|
- 4: PLongint(Pointer(Instance)+Ptrint(PropInfo^.SetProc))^:=Longint(Value);
|
|
|
- 8: PInt64(Pointer(Instance)+Ptrint(PropInfo^.SetProc))^:=Value;
|
|
|
+ 1: PByte(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Byte(Value);
|
|
|
+ 2: PWord(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Word(Value);
|
|
|
+ 4: PLongint(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Longint(Value);
|
|
|
+ 8: PInt64(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Value;
|
|
|
end;
|
|
|
ptstatic,
|
|
|
ptvirtual :
|
|
@@ -907,7 +907,7 @@ begin
|
|
|
if ((PropInfo^.PropProcs shr 2) and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.SetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.SetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.SetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
if datasize=8 then
|
|
|
begin
|
|
@@ -1118,7 +1118,7 @@ begin
|
|
|
if (PropInfo^.PropProcs and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.GetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
if ((PropInfo^.PropProcs shr 6) and 1)<>0 then
|
|
|
Result:=TGetShortStrProcIndex(AMethod)(PropInfo^.Index)
|
|
@@ -1138,7 +1138,7 @@ begin
|
|
|
if (PropInfo^.PropProcs and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.GetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
if ((PropInfo^.PropProcs shr 6) and 1)<>0 then
|
|
|
Result:=TGetAnsiStrProcIndex(AMethod)(PropInfo^.Index)
|
|
@@ -1174,7 +1174,7 @@ begin
|
|
|
if (PropInfo^.PropProcs and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.SetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.SetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.SetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
if ((PropInfo^.PropProcs shr 6) and 1)<>0 then
|
|
|
TSetShortStrProcIndex(AMethod)(PropInfo^.Index,Value)
|
|
@@ -1194,7 +1194,7 @@ begin
|
|
|
if ((PropInfo^.PropProcs shr 2) and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.SetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.SetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.SetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
if ((PropInfo^.PropProcs shr 6) and 1)<>0 then
|
|
|
TSetAnsiStrProcIndex(AMethod)(PropInfo^.Index,Value)
|
|
@@ -1323,15 +1323,15 @@ begin
|
|
|
ptField:
|
|
|
Case GetTypeData(PropInfo^.PropType)^.FloatType of
|
|
|
ftSingle:
|
|
|
- Result:=PSingle(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ Result:=PSingle(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
ftDouble:
|
|
|
- Result:=PDouble(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ Result:=PDouble(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
ftExtended:
|
|
|
- Result:=PExtended(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ Result:=PExtended(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
ftcomp:
|
|
|
- Result:=PComp(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ Result:=PComp(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
ftcurr:
|
|
|
- Result:=PCurrency(Pointer(Instance)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ Result:=PCurrency(Pointer(Instance)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
end;
|
|
|
ptStatic,
|
|
|
ptVirtual:
|
|
@@ -1339,7 +1339,7 @@ begin
|
|
|
if (PropInfo^.PropProcs and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.GetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
Case GetTypeData(PropInfo^.PropType)^.FloatType of
|
|
|
ftSingle:
|
|
@@ -1385,11 +1385,11 @@ begin
|
|
|
ptfield:
|
|
|
Case GetTypeData(PropInfo^.PropType)^.FloatType of
|
|
|
ftSingle:
|
|
|
- PSingle(Pointer(Instance)+Ptrint(PropInfo^.SetProc))^:=Value;
|
|
|
+ PSingle(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Value;
|
|
|
ftDouble:
|
|
|
- PDouble(Pointer(Instance)+Ptrint(PropInfo^.SetProc))^:=Value;
|
|
|
+ PDouble(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Value;
|
|
|
ftExtended:
|
|
|
- PExtended(Pointer(Instance)+Ptrint(PropInfo^.SetProc))^:=Value;
|
|
|
+ PExtended(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Value;
|
|
|
{$ifdef FPC_COMP_IS_INT64}
|
|
|
ftComp:
|
|
|
PComp(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=trunc(Value);
|
|
@@ -1398,7 +1398,7 @@ begin
|
|
|
PComp(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Value;
|
|
|
{$endif FPC_COMP_IS_INT64}
|
|
|
ftCurr:
|
|
|
- PCurrency(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Value;
|
|
|
+ PCurrency(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^:=Value;
|
|
|
end;
|
|
|
ptStatic,
|
|
|
ptVirtual:
|
|
@@ -1406,7 +1406,7 @@ begin
|
|
|
if ((PropInfo^.PropProcs shr 2) and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.SetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.SetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.SetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
Case GetTypeData(PropInfo^.PropType)^.FloatType of
|
|
|
ftSingle:
|
|
@@ -1465,7 +1465,7 @@ begin
|
|
|
case (PropInfo^.PropProcs) and 3 of
|
|
|
ptfield:
|
|
|
begin
|
|
|
- Value:=PMethod(Pointer(Instance)+Ptrint(PropInfo^.GetProc));
|
|
|
+ Value:=PMethod(Pointer(Instance)+PtrUInt(PropInfo^.GetProc));
|
|
|
if Value<>nil then
|
|
|
Result:=Value^;
|
|
|
end;
|
|
@@ -1475,7 +1475,7 @@ begin
|
|
|
if (PropInfo^.PropProcs and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.GetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.GetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.GetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
if ((PropInfo^.PropProcs shr 6) and 1)<>0 then
|
|
|
Result:=TGetMethodProcIndex(AMethod)(PropInfo^.Index)
|
|
@@ -1495,14 +1495,14 @@ var
|
|
|
begin
|
|
|
case (PropInfo^.PropProcs shr 2) and 3 of
|
|
|
ptfield:
|
|
|
- PMethod(Pointer(Instance)+Ptrint(PropInfo^.SetProc))^ := Value;
|
|
|
+ PMethod(Pointer(Instance)+PtrUInt(PropInfo^.SetProc))^ := Value;
|
|
|
ptstatic,
|
|
|
ptvirtual :
|
|
|
begin
|
|
|
if ((PropInfo^.PropProcs shr 2) and 3)=ptStatic then
|
|
|
AMethod.Code:=PropInfo^.SetProc
|
|
|
else
|
|
|
- AMethod.Code:=PPointer(Pointer(Instance.ClassType)+Ptrint(PropInfo^.SetProc))^;
|
|
|
+ AMethod.Code:=PPointer(Pointer(Instance.ClassType)+PtrUInt(PropInfo^.SetProc))^;
|
|
|
AMethod.Data:=Instance;
|
|
|
if ((PropInfo^.PropProcs shr 6) and 1)<>0 then
|
|
|
TSetMethodProcIndex(AMethod)(PropInfo^.Index,Value)
|