paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 23:58:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: Fixes crash due to ReleaseDC freeing wrongly control DCs

Browse Source 
git-svn-id: trunk@49602 -
This commit is contained in:
sekelsenmat 2015-08-06 06:43:36 +00:00
parent 15a40e33f7
commit 77e8b6e2d1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/interfaces/cocoa/cocoagdiobjects.pas
View File

@ -386,6 +386,7 @@ type
procedure ClearClipping;
public
ctx: NSGraphicsContext;
isControlDC: Boolean; // control DCs should never be freed by ReleaseDC as the control will free it by itself
constructor Create(AGraphicsContext: NSGraphicsContext); virtual;
destructor Destroy; override;
@ -1942,11 +1943,13 @@ end;
procedure TCocoaContext.ClearClipping;
var
Trans: CGAffineTransform;
cgc: CGContextRef;
begin
if FClipped then
begin
Trans := CGContextGetCTM(CGContext);
CGContextRestoreGState(CGContext());
cgc := CGContext();
Trans := CGContextGetCTM(cgc);
CGContextRestoreGState(cgc);
ApplyTransform(Trans);
end;
end;

4
lcl/interfaces/cocoa/cocoawinapi.inc
View File

@ -1842,7 +1842,7 @@ var
dc: TCocoaContext;
gdi: TCocoaGDIObject;
const
SName = 'TCarbonWidgetSet.SelectObject';
SName = 'TCocoaWidgetSet.SelectObject';
begin
{$IFDEF VerboseWinAPI}
DebugLn(Format('TCocoaWidgetSet.SelectObject DC: %x GDIObj: %x', [ADC, GDIObj]));
@ -2007,7 +2007,7 @@ begin
ctx := CheckDC(DC);
if not Assigned(ctx) then
Exit;
if (ctx <> DefaultContext) and (ctx<>ScreenContext) then
if (ctx <> DefaultContext) and (ctx<>ScreenContext) and (not ctx.isControlDC) then
ctx.Free;
Result := 1;
end;

1
lcl/interfaces/cocoa/cocoawscommon.pas
View File

@ -1028,6 +1028,7 @@ begin
if Assigned(FContext) then
Exit;
FContext := TCocoaContext.Create(ControlContext);
FContext.isControlDC := True;
try
// debugln('Draw '+Target.name+' bounds='+Dbgs(NSRectToRect(bounds))+' dirty='+Dbgs(NSRectToRect(dirty)));
if FContext.InitDraw(Round(bounds.size.width), Round(bounds.size.height)) then