paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-25 03:48:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r29683 into '.':

Browse Source 
U    packages/fcl-image/src/freetype.pp
--- Merging r29723 into '.':
U    packages/libc/src/typesh.inc
--- Merging r29760 into '.':
U    packages/winunits-base/src/eventsink.pp
--- Merging r30184 into '.':
U    packages/winunits-jedi/src/jwawinnt.pas

# revisions: 29683,29723,29760,30184

git-svn-id: branches/fixes_3_0@30840 -
This commit is contained in:
marco 2015-05-10 13:22:18 +00:00
parent 25b9f31f0f
commit cac264347a
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/fcl-image/src/freetype.pp
View File

@ -461,6 +461,7 @@ begin
CurSize := CreateSize (aSize,aResolution)
else
CurSize := PMgrSize(CurFont.FSizes[r]);
SetPixelSize(CurSize^.Size, CurSize^.resolution);
CurFont.LastSize := CurSize;
end;
end;

6
packages/libc/src/typesh.inc
View File

@ -37,7 +37,7 @@ type
__val : array[0..1] of longint;
end;
__daddr_t = longint;
__caddr_t = char;
__caddr_t = pchar;
__time_t = longint;
__useconds_t = dword;
__suseconds_t = longint;
@ -169,7 +169,7 @@ Type
Ppid_t = ^pid_t;
Pssize_t = ^ssize_t;
Pdaddr_t = ^daddr_t;
Pcaddr_t = ^caddr_t;
// Pcaddr_t = ^caddr_t;
Pkey_t = ^key_t;
Puseconds_t = ^useconds_t;
Psuseconds_t = ^suseconds_t;
@ -207,7 +207,7 @@ Type
P__id_t = ^__id_t;
P__fsid_t = ^__fsid_t;
P__daddr_t = ^__daddr_t;
P__caddr_t = ^__caddr_t;
//P__caddr_t = ^__caddr_t;
P__time_t = ^__time_t;
P__useconds_t = ^__useconds_t;
P__suseconds_t = ^__suseconds_t;

6
packages/winunits-base/src/eventsink.pp
View File

@ -81,6 +81,7 @@ type
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
procedure Connect(AnAppDispatch: IDispatch; const AnAppDispIntfIID: TGUID);
procedure Disconnect;
published
property OnInvoke: TInvokeEvent read FOnInvoke write FOnInvoke;
end;
@ -182,6 +183,11 @@ begin
FSink.Connect(AnAppDispatch, AnAppDispIntfIID);
end;
procedure TEventSink.Disconnect;
begin
FSink.Disconnect;
end;
constructor TEventSink.Create(AOwner: TComponent);
begin
inherited Create(AOwner);

2
packages/winunits-jedi/src/jwawinnt.pas
View File

@ -9155,7 +9155,7 @@ end;
function IMAGE_FIRST_SECTION(NtHeader: PImageNtHeaders): PImageSectionHeader;
begin
Result := PImageSectionHeader(Cardinal(NtHeader) +
Result := PImageSectionHeader(ptruint(NtHeader) +
FieldOffset(NtHeader^, NtHeader^.OptionalHeader) +
NtHeader^.FileHeader.SizeOfOptionalHeader);
end;