diff --git a/components/aarre/tools/README.txt b/components/aarre/tools/README.txt index c7436434e1..4af5596df8 100644 --- a/components/aarre/tools/README.txt +++ b/components/aarre/tools/README.txt @@ -1,5 +1,5 @@ aarreupdatelist This tool is under construction. -It's goal is to scan a directory and gather information of all lpk files. +The goal is to scan a directory and gather information of all lpk files. diff --git a/components/printers/carbon/carbonprinters.inc b/components/printers/carbon/carbonprinters.inc index c8bf6d416a..ec4e967387 100644 --- a/components/printers/carbon/carbonprinters.inc +++ b/components/printers/carbon/carbonprinters.inc @@ -15,6 +15,7 @@ begin Result.Y := 0; if Printer = nil then Exit; + R:=CleanPMRect; if OSError(PMGetAdjustedPaperRect((Printer as TCarbonPrinter).PageFormat, R), Self, 'GetSize', 'PMGetUnadjustedPaperRect') then Exit; @@ -80,6 +81,7 @@ begin try if I < 0 then begin + Result:=nil; if OSError(PMCreatePageFormat(Result), Self, SName, 'PMCreatePageFormat') then raise EPrinter.Create('Error initializing printing for Carbon: Unable to create page format!'); @@ -117,6 +119,7 @@ end; function TCarbonPrinter.GetCurrentPrinter: PMPrinter; begin + Result:=nil; OSError(PMSessionGetCurrentPrinter(PrintSession, Result), Self, 'GetCurrentPrinter', 'PMSessionGetCurrentPrinter'); end; @@ -168,6 +171,7 @@ var I, C: CFIndex; pa: CFArrayRef; begin + pa:=nil; if OSError(PMServerCreatePrinterList(kPMServerLocal, pa), Self, 'DoEnumPrinters', 'PMServerCreatePrinterList') then Exit; @@ -232,6 +236,7 @@ begin for I := 0 to C - 1 do begin P := CFArrayGetValueAtIndex(FPaperArray, I); + CFString:=nil; if OSError(PMPaperGetName(P, CFString), Self, SName, 'PMPaperGetName') then Continue; PaperName := CFStringToStr(CFString); //MacOSX 10.4 returns wrong paper name in case of US Letter. @@ -389,8 +394,10 @@ const SName = 'DoGetPaperName'; begin Result := ''; - + + P:=nil; if OSError(PMGetPageFormatPaper(PageFormat, P), Self, SName, 'PMGetPageFormatPaper') then Exit; + CFString:=nil; if OSError(PMPaperGetName(P, CFString), Self, SName, 'PMPaperGetName') then Exit; Result := CFStringToStr(CFString); @@ -440,18 +447,22 @@ begin T := CreatePageFormat(AName); try // copy scale + S:=0.0; OSError(PMGetScale(PageFormat, S), Self, SName, 'PMGetScale'); OSError(PMSetScale(T, S), Self, SName, 'PMSetScale'); // copy orientation + O:=CleanPMOrientation; OSError(PMGetOrientation(PageFormat, O), Self, SName, 'PMGetOrientation'); OSError(PMSetOrientation(T, O, False), Self, SName, 'PMSetOrientation'); // update OSError(PMSessionValidatePageFormat(PrintSession, T, nil), Self, SName, 'PMSessionValidatePageFormat'); - + + PaperRect:=CleanPMRect; OSError(PMGetAdjustedPaperRect(T, PaperRect), Self, SName, 'PMGetAdjustedPaperRect'); + PageRect:=CleanPMRect; OSError(PMGetAdjustedPageRect(T, PageRect), Self, SName, 'PMGetAdjustedPageRect'); finally PMRelease(PMObject(T)); @@ -502,6 +513,7 @@ var C: UInt32; begin Result := inherited DoGetCopies; + C:=0; if OSError(PMGetCopies(PrintSettings, C), Self, 'DoGetCopies', 'PMGetCopies') then Exit; Result := C; end; @@ -519,6 +531,7 @@ var O: PMOrientation; begin Result := inherited DoGetOrientation; + O:=CleanPMOrientation; if OSError(PMGetOrientation(PageFormat, O), Self, 'DoGetOrientation', 'PMGetOrientation') then Exit; case O of @@ -551,6 +564,7 @@ var IsRemote: Boolean; begin Result := ptLocal; + IsRemote:=false; OSError(PMPrinterIsRemote(GetCurrentPrinter,IsRemote), Self, 'GetPrinterType', 'PMPrinterIsRemote'); if IsRemote then Result := ptNetwork end; @@ -561,7 +575,8 @@ var State: PMPrinterState; begin Result := psNoDefine; - + + State:=0; if OSError(PMPrinterGetState(GetCurrentPrinter, State), Self, 'DoGetPrinterState', 'PMPrinterGetState') then Exit; case State of diff --git a/components/printers/carbon/carbonprinters_h.inc b/components/printers/carbon/carbonprinters_h.inc index 6af0eac149..76407996d6 100644 --- a/components/printers/carbon/carbonprinters_h.inc +++ b/components/printers/carbon/carbonprinters_h.inc @@ -81,7 +81,7 @@ type public constructor Create; override; destructor Destroy; override; - function Write(const Buffer; Count:Integer; var Written: Integer): Boolean; override; + function Write(const {%H-}Buffer; {%H-}Count:Integer; var {%H-}Written: Integer): Boolean; override; // Warning not portable functions here property CurrentPrinterName: String read GetCurrentPrinterName; property PrintSession: PMPrintSession read FPrintSession; diff --git a/components/printers/carbon/carbonprndialogs.inc b/components/printers/carbon/carbonprndialogs.inc index dadf86ec9e..582a7125f6 100644 --- a/components/printers/carbon/carbonprndialogs.inc +++ b/components/printers/carbon/carbonprndialogs.inc @@ -43,7 +43,7 @@ function TPrintDialog.Execute: Boolean; var CarbonPrinter: TCarbonPrinter; DialogSettings: PMPrintSettings; - U, V: UInt32; + V: UInt32; B: Boolean; PMin, PMax, PFrom, PTo: Integer; begin @@ -54,7 +54,8 @@ begin CarbonPrinter := Printer as TCarbonPrinter; //DebugLn('TPrintDialog.Execute ' + CarbonPrinter.CurrentPrinterName); - + + DialogSettings:=nil; if OSError(PMCreatePrintSettings(DialogSettings), Self, SExecute, 'PMCreatePrintSettings') then Exit; try diff --git a/lcl/interfaces/carbon/carbonproc.pp b/lcl/interfaces/carbon/carbonproc.pp index 2020da16ca..ff11b4a819 100644 --- a/lcl/interfaces/carbon/carbonproc.pp +++ b/lcl/interfaces/carbon/carbonproc.pp @@ -38,6 +38,10 @@ uses Classes, SysUtils, Types, LCLType, LCLProc, Controls, Forms, Graphics, Math, GraphType; +const + CleanPMRect: PMRect = (top: 0; left: 0; bottom: 0; right: 0); + CleanPMOrientation: PMOrientation = 0; + function OSError(AResult: OSStatus; const AMethodName, ACallName: String; const AText: String = ''): Boolean; function OSError(AResult: OSStatus; const AObject: TObject; const AMethodName, ACallName: String; diff --git a/lcl/interfaces/carbon/carbonwinapi.inc b/lcl/interfaces/carbon/carbonwinapi.inc index b07f21c1ac..a73e5f3d67 100644 --- a/lcl/interfaces/carbon/carbonwinapi.inc +++ b/lcl/interfaces/carbon/carbonwinapi.inc @@ -3098,7 +3098,7 @@ const var ACtl: TCarbonControl; R, R1: CGRect; - RR: TRect; + {%H-}RR: TRect; begin {$IFDEF VerboseWinAPI} DebugLn('TCarbonWidgetSet.ScrollWindowEx() HWnd=',dbgs(hWnd),' prcScroll ',prcScroll <> nil,