paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-23 11:49:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed SafeArrayGetLBound,SafeArrayGetUBound,CheckVarArrayAndCalculateAddress (variant array bounds are stored in reverse order).

Browse Source 
* It fixes test/testv9.pp for non Windows targets. 

git-svn-id: trunk@6008 -
This commit is contained in:
yury 2007-01-17 01:12:03 +00:00
parent 8ecdbbc515
commit 9d3a3f3c49
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
rtl/objpas/varutils.inc
View File

@ -236,17 +236,8 @@ end;
Function CheckVarArrayAndCalculateAddress(psa: PVarArray;
Indices: PVarArrayCoorArray; var Address: Pointer; Lockit: Boolean): HRESULT;
Function CountElements(D: Longint): Longint;
begin
if (D<psa^.DimCount) then
Result:=CountElements(D+1)+psa^.Bounds[D-1].ElementCount
else
Result:=1;
end;
var
LB,HB,I,Count : LongInt;
I,D,Count,Idx : LongInt;
begin
Result:=CheckVarArray(psa);
@ -254,14 +245,18 @@ begin
Count:=0;
If Result<>VAR_OK then
exit;
for I:=1 to psa^.DimCount do
D:=0;
for I:=0 to psa^.DimCount-1 do
begin
LB:=psa^.Bounds[I-1].LowBound;
HB:=LB+psa^.Bounds[I-1].ElementCount;
if (LB=HB) or ((Indices^[I-1]< LB) or(Indices^[I-1]>HB)) then
Exit(VAR_BADINDEX);
Count:=Count+(Indices^[I-1]-LB)*CountElements(I+1);
end;
Idx:=Indices^[psa^.DimCount-I-1] - psa^.Bounds[I].LowBound;
if (Idx<0) or (Idx>=psa^.Bounds[I].ElementCount) then
Exit(VAR_BADINDEX);
if I=0 then
Count:=Idx
else
Inc(Count,Idx*D);
Inc(D,psa^.Bounds[I].ElementCount);
end;
Address:=SafeArrayCalculateElementAddress(psa, Count);
if LockIt then
Result:=SafeArrayLock(psa);
@ -639,7 +634,7 @@ begin
if Result<>VAR_OK then
exit;
if (Dim>0) and (Dim<=psa^.DimCount) then
LBound:=psa^.Bounds[Dim-1].LowBound
LBound:=psa^.Bounds[psa^.dimcount-Dim].LowBound
else
Result:=VAR_BADINDEX;
end;
@ -650,8 +645,8 @@ begin
if Result<>VAR_OK then
exit;
if (Dim>0) and (Dim<=psa^.DimCount) then
UBound:=psa^.Bounds[Dim-1].LowBound +
psa^.Bounds[Dim-1].ElementCount-1
UBound:=psa^.Bounds[psa^.dimcount-Dim].LowBound +
psa^.Bounds[psa^.dimcount-Dim].ElementCount-1
else
Result:=VAR_BADINDEX
end;