Commit 65ef97c

authored

Merge pull request #413 from norayr/lazarus_fixes

changes to fix Lazarus and FreePascal compilation issues.

2 parents 1cd6621 + 6b24861 commit 65ef97cCopy full SHA for 65ef97c

File tree

3 files changed

+15

-5

lines changed

Source

3 files changed

+15

-5

lines changed

`‎Source/PythonEngine.pas‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6066,7 +6066,8 @@ function TPythonEngine.PyUnicodeAsString(obj : PPyObject): UnicodeString;`
`6066`	`6066`	`Exit;`
`6067`	`6067`
`6068`	`6068`	`// The second argument is the size of the destination (Result) including #0`
`6069`		`- NewSize := Utf8ToUnicode(PChar(Result), Cardinal(Size + 1), Buffer, Cardinal(Size));`
	`6069`	`+ NewSize := Utf8ToUnicode(PWideChar(Result), Cardinal(Size + 1), Buffer, Cardinal(Size));`
	`6070`	`+`
`6070`	`6071`	`// NewSize includes #0`
`6071`	`6072`	`SetLength(Result, NewSize - 1);`
`6072`	`6073`	`end`

`‎Source/WrapDelphi.pas‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2571,12 +2571,14 @@ function TPyDelphiObject.Dir_Wrapper(args: PPyObject): PPyObject;`
`2571`	`2571`
`2572`	`2572`	`var`
`2573`	`2573`	`PyType: PPyTypeObject;`
	`2574`	`+`
`2574`	`2575`	`{$IFDEF EXTENDED_RTTI}`
`2575`	`2576`	`Context: TRttiContext;`
`2576`	`2577`	`RttiType: TRTTIType;`
`2577`	`2578`	`{$ELSE}`
`2578`	`2579`	`_PropList: PPropList;`
`2579`	`2580`	`_propCount : Integer;`
	`2581`	`+ i: Integer;`
`2580`	`2582`	`{$ENDIF}`
`2581`	`2583`	`begin`
`2582`	`2584`	`Adjust(@Self);`

`‎Source/WrapDelphiClasses.pas‎`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`	`interface`
`6`	`6`
`7`	`7`	`uses`
`8`		`- Classes, SysUtils, PythonEngine, WrapDelphi;`
	`8`	`+ Classes, SysUtils, PythonEngine, WrapDelphi`
	`9`	`+ {$IFDEF FPC}, bufstream{$ENDIF};`
`9`	`10`
`10`	`11`	`type`
`11`	`12`	`{`
`@@ -367,6 +368,7 @@ implementation`
`367`	`368`	`uses`
`368`	`369`	`TypInfo {$IFNDEF FPC}, System.Rtti{$ENDIF};`
`369`	`370`
	`371`	`+`
`370`	`372`	`{$IFNDEF FPC}`
`371`	`373`	`type`
`372`	`374`	`TPyReader = class(TReader)`
`@@ -2223,7 +2225,12 @@ TBufferedFileStreamClass = class of TBufferedFileStream;`
`2223`	`2225`	`DelphiObject := TBufferedFileStreamClass(DelphiObjectClass).Create(String(LFileName), LMode, LBufferSize);`
`2224`	`2226`	`end else if (LArgCount = 3) then begin`
`2225`	`2227`	`if (APythonType.Engine.PyArg_ParseTupleAndKeywords(args, kwds, 'sHI\|i:Create', @LKwArgs2[0], @LFileName, @LMode, @LRights, @LBufferSize) <> 0) then`
`2226`		`- DelphiObject := TBufferedFileStreamClass(DelphiObjectClass).Create(String(LFileName), LMode, LRights, LBufferSize);`
	`2228`	`+ {$IFDEF FPC}`
	`2229`	`+ DelphiObject := TBufferedFileStreamClass(DelphiObjectClass).Create(String(LFileName), LMode, LRights);`
	`2230`	`+ DelphiObject.Size:= LBufferSize;`
	`2231`	`+ {$ELSE}`
	`2232`	`+ DelphiObject := TBufferedFileStreamClass(DelphiObjectClass).Create(String(LFileName), LMode, LRights, LBufferSize);`
	`2233`	`+ {$ENDIF}`
`2227`	`2234`	`end;`
`2228`	`2235`
`2229`	`2236`	`//Maybe it was created on the next attempt...`
`@@ -2385,14 +2392,14 @@ TResourceStreamClass = class of TResourceStream;`
`2385`	`2392`	`{$ELSE}`
`2386`	`2393`	`if APythonType.Engine.PyArg_ParseTuple(args, 'Iss:Create', @LHandle, @LResName, @LResType) <> 0 then`
`2387`	`2394`	`{$ENDIF}`
`2388`		`- DelphiObject := TResourceStreamClass(DelphiObjectClass).Create(LHandle, String(LResName), PWideChar(String(LResType)))`
	`2395`	`+ DelphiObject := TResourceStreamClass(DelphiObjectClass).Create(LHandle, String(LResName), PChar(String(LResType)))`
`2389`	`2396`	`else`
`2390`	`2397`	`{$IFDEF CPUX64}`
`2391`	`2398`	`if APythonType.Engine.PyArg_ParseTuple(args, 'Kis:Create', @LHandle, @LResId, @LResType) <> 0 then`
`2392`	`2399`	`{$ELSE}`
`2393`	`2400`	`if APythonType.Engine.PyArg_ParseTuple(args, 'Iis:Create', @LHandle, @LResId, @LResType) <> 0 then`
`2394`	`2401`	`{$ENDIF}`
`2395`		`- DelphiObject := TResourceStreamClass(DelphiObjectClass).CreateFromID(LHandle, LResId, PWideChar(String(LResType)));`
	`2402`	`+ DelphiObject := TResourceStreamClass(DelphiObjectClass).CreateFromID(LHandle, LResId, PChar(String(LResType)));`
`2396`	`2403`	`except`
`2397`	`2404`	`on E: Exception do`
`2398`	`2405`	`with GetPythonEngine do`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 65ef97c

File tree

3 files changed

3 files changed

`‎Source/PythonEngine.pas‎`

`‎Source/WrapDelphi.pas‎`

`‎Source/WrapDelphiClasses.pas‎`

0 commit comments