From cac264347acb90c548a17448f28b5f37356874e1 Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Sun, 10 May 2015 13:22:18 +0000
Subject: [PATCH] --- Merging r29683 into '.': 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 -
---
 packages/fcl-image/src/freetype.pp      | 1 +
 packages/libc/src/typesh.inc            | 6 +++---
 packages/winunits-base/src/eventsink.pp | 6 ++++++
 packages/winunits-jedi/src/jwawinnt.pas | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/fcl-image/src/freetype.pp b/packages/fcl-image/src/freetype.pp
index 1a60d9d5a0..cd941ed011 100644
--- a/packages/fcl-image/src/freetype.pp
+++ b/packages/fcl-image/src/freetype.pp
@@ -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;
diff --git a/packages/libc/src/typesh.inc b/packages/libc/src/typesh.inc
index 23703218ed..13e14333b3 100644
--- a/packages/libc/src/typesh.inc
+++ b/packages/libc/src/typesh.inc
@@ -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;
diff --git a/packages/winunits-base/src/eventsink.pp b/packages/winunits-base/src/eventsink.pp
index 9fce8a5fdf..48040a9150 100644
--- a/packages/winunits-base/src/eventsink.pp
+++ b/packages/winunits-base/src/eventsink.pp
@@ -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);
diff --git a/packages/winunits-jedi/src/jwawinnt.pas b/packages/winunits-jedi/src/jwawinnt.pas
index d66e5726fa..20b1e6b51a 100644
--- a/packages/winunits-jedi/src/jwawinnt.pas
+++ b/packages/winunits-jedi/src/jwawinnt.pas
@@ -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;