mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-27 18:53:48 +02:00
* 64 bit patch from Peter Vreman
git-svn-id: trunk@6977 -
This commit is contained in:
parent
ce88621c1d
commit
b9a3f7efef
@ -1093,7 +1093,11 @@ procedure TheTextDrawer.ExtTextOut(X, Y: Integer; fuOptions: UINT;
|
||||
TmpLen := ((not (EtoBlockSize - 1)) and Length) + EtoBlockSize;
|
||||
NewSize := TmpLen * SizeOf(Integer);
|
||||
ReallocMem(FETODist, NewSize);
|
||||
{$IFDEF FPC}
|
||||
p := PInteger(FETODist + (FETOSizeInChar * SizeOf(Integer)));
|
||||
{$ELSE}
|
||||
p := PInteger(Integer(FETODist) + FETOSizeInChar * SizeOf(Integer));
|
||||
{$ENDIF}
|
||||
for i := 1 to TmpLen - FETOSizeInChar do
|
||||
begin
|
||||
p^ := InitValue;
|
||||
@ -1230,7 +1234,11 @@ var
|
||||
begin
|
||||
pCrnt := Text;
|
||||
pRun := Text;
|
||||
{$IFDEF FPC}
|
||||
pTail := PChar(Pointer(Text) + Length);
|
||||
{$ELSE}
|
||||
pTail := PChar(Integer(Text) + Length);
|
||||
{$ENDIF}
|
||||
TmpRect := ARect;
|
||||
while pCrnt < pTail do
|
||||
begin
|
||||
@ -1238,7 +1246,11 @@ begin
|
||||
if pRun <> pCrnt then
|
||||
begin
|
||||
SetTextCharacterExtra(StockDC, FCharExtra + FCrntDx);
|
||||
{$IFDEF FPC}
|
||||
Len := PtrInt(pRun) - PtrInt(pCrnt);
|
||||
{$ELSE}
|
||||
Len := Integer(pRun) - Integer(pCrnt);
|
||||
{$ENDIF}
|
||||
with TmpRect do
|
||||
begin
|
||||
n := GetCharWidth * Len;
|
||||
@ -1255,10 +1267,14 @@ begin
|
||||
pCrnt := pRun;
|
||||
if pRun = pTail then
|
||||
break;
|
||||
|
||||
|
||||
GetDBCharRange;
|
||||
SetTextCharacterExtra(StockDC, FCharExtra + FCrntDBDx);
|
||||
{$IFDEF FPC}
|
||||
Len := PtrInt(pRun) - PtrInt(pCrnt);
|
||||
{$ELSE}
|
||||
Len := Integer(pRun) - Integer(pCrnt);
|
||||
{$ENDIF}
|
||||
with TmpRect do
|
||||
begin
|
||||
n := GetCharWidth * Len;
|
||||
|
Loading…
Reference in New Issue
Block a user