Compatibility with both Lazarus and (hopefully) Delphi Linux

Author: pyscripter

PythonForDelphi/Components/P4DFpc.lpk

@@ -179,10 +179,10 @@ procedure GetCodeMem(var ptr: PByte; size: integer);
 	{$IFDEF MSWINDOWS}	
     page:=VirtualAlloc(nil, PageSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
 	{$ELSE}
-    page := GetMem(PageSize);
-    //page := mmap(Pointer($10000000), PageSize, PROT_NONE, MAP_PRIVATE or MAP_ANON, -1, 0);
+    //page := GetMem(PageSize);
+    page := mmap(Pointer($10000000), PageSize, PROT_NONE, MAP_PRIVATE or MAP_ANON, -1, 0);
     mprotect(page, PageSize, PROT_READ or PROT_WRITE or PROT_EXEC);
-	{$ENDIF}	
+	{$ENDIF}
     page^.next:=CodeMemPages;
     CodeMemPages:=page;
     // init pointer to end of page

PythonForDelphi/Components/P4DFpc.pas

@@ -67,12 +67,17 @@
 interface
 
 uses
+  Types,
 {$IFDEF MSWINDOWS}
   Windows,
-{$ENDIF}
-{$IFDEF LINUX}
-  Types,
+{$ELSE}
+{$IFDEF FPC}
   dynlibs,
+{$ELSE}
+{$IFDEF LINUX}
+  Libc,
+{$ENDIF}
+{$ENDIF}
 {$ENDIF}
   Classes,
   SysUtils,
@@ -3462,10 +3467,13 @@ procedure TDynamicDll.Quit;
 {$IFDEF MSWINDOWS}
     MessageBox( GetActiveWindow, PChar(GetQuitMessage), 'Error', MB_TASKMODAL or MB_ICONSTOP );
     ExitProcess( 1 );
-{$ENDIF}
-{$IFDEF LINUX}
+{$ELSE}
     WriteLn(ErrOutput, GetQuitMessage);
+{$IFDEF FPC}
     Halt( 1 );
+{$ELSE}
+    __exit(1);
+{$ENDIF}
 {$ENDIF}
   end;
 end;
@@ -3512,7 +3520,7 @@ constructor TPythonInterface.Create(AOwner: TComponent);
 procedure TPythonInterface.AfterLoad;
 begin
   inherited;
-  FIsPython3000 := Pos('PYTHON3', UpperCase(DLLName)) = 1;
+  FIsPython3000 := Pos('PYTHON3', UpperCase(DLLName)) >  0;
   FMajorVersion := StrToInt(DLLName[7 {$IFDEF LINUX}+3{$ENDIF}]);
   FMinorVersion := StrToInt(DLLName[8{$IFDEF LINUX}+4{$ENDIF}]);
 
@@ -3529,8 +3537,7 @@ procedure TPythonInterface.AfterLoad;
       if FatalMsgDlg then
 {$IFDEF MSWINDOWS}
         MessageBox( GetActiveWindow, PChar(E.Message), 'Error', MB_TASKMODAL or MB_ICONSTOP );
-{$ENDIF}
-{$IFDEF LINUX}
+{$ELSE}
         WriteLn( ErrOutput, E.Message );
 {$ENDIF}
       if FatalAbort then Quit;

PythonForDelphi/Components/Sources/Core/MethodCallBack.pas

@@ -127,9 +127,9 @@   TNamedParamDesc = record
 {$IFDEF DELPHIXE2_OR_HIGHER}
   {$DEFINE USESYSTEMDISPINVOKE}  //Delphi 2010 DispInvoke is buggy
 {$ENDIF}
-{$IF DEFINED(FPC_FULLVERSION) and (FPC_FULLVERSION >= 20500)}
-  {$DEFINE USESYSTEMDISPINVOKE}
-{$IFEND}
+{$.IF DEFINED(FPC_FULLVERSION) and (FPC_FULLVERSION >= 20500)}
+  {.$DEFINE USESYSTEMDISPINVOKE}
+{.$IFEND}
 
   { Python variant type handler }
   TPythonVariantType = class(TInvokeableVariantType, IVarInstanceReference)
@@ -146,7 +146,7 @@   TPythonVariantType = class(TInvokeableVariantType, IVarInstanceReference)
     procedure PythonObjectToVarData( var Dest : TVarData; AObject : PPyObject; APythonAtomCompatible : Boolean );
     procedure PyhonVarDataCreate( var Dest : TVarData; AObject : PPyObject );
     {$IFNDEF USESYSTEMDISPINVOKE}
-    procedure DoDispInvoke(Dest: PVarData; const Source: TVarData;
+    procedure DoDispInvoke(Dest: PVarData; var Source: TVarData;
       CallDesc: PCallDesc; Params: Pointer); virtual;
     function GetPropertyWithArg(var Dest: TVarData; const V: TVarData;
       const AName: AnsiString; AArg : TVarData): Boolean; virtual;
@@ -180,14 +180,14 @@   TPythonVariantType = class(TInvokeableVariantType, IVarInstanceReference)
       const Arguments: TVarDataArray): Boolean; override;
     function GetProperty(var Dest: TVarData; const V: TVarData;
       const AName: string): Boolean; override;
-    function SetProperty(const V: TVarData; const AName: string;
+    function SetProperty({$IFDEF FPC}var{$ELSE}const{$ENDIF} V: TVarData; const AName: string;
       const Value: TVarData): Boolean; override;
     {$IFDEF DELPHIXE7_OR_HIGHER}
     procedure DispInvoke(Dest: PVarData;
       [Ref] const Source: TVarData; CallDesc: PCallDesc; Params: Pointer);override;
     {$ELSE}
     procedure DispInvoke(Dest: PVarData;
-       const Source: TVarData; CallDesc: PCallDesc; Params: Pointer);override;
+       var Source: TVarData; CallDesc: PCallDesc; Params: Pointer);override;
     {$ENDIF}
   end;
 
@@ -941,7 +941,7 @@ procedure TPythonVariantType.DispInvoke(Dest: PVarData;
   [Ref] const Source: TVarData; CallDesc: PCallDesc; Params: Pointer);
 {$ELSE}
 procedure TPythonVariantType.DispInvoke(Dest: PVarData;
-   const Source: TVarData; CallDesc: PCallDesc; Params: Pointer);
+   var Source: TVarData; CallDesc: PCallDesc; Params: Pointer);
 {$ENDIF}
 {$IFDEF USESYSTEMDISPINVOKE}
 {$IFDEF DELPHIXE2_OR_HIGHER}
@@ -1088,7 +1088,7 @@     TStringDesc = record
 end;
 
 procedure TPythonVariantType.DoDispInvoke(Dest: PVarData;
-  const Source: TVarData; CallDesc: PCallDesc; Params: Pointer);
+  var Source: TVarData; CallDesc: PCallDesc; Params: Pointer);
 type
   PParamRec = ^TParamRec;
   TParamRec = array[0..3] of LongInt;
@@ -1863,7 +1863,7 @@ function TPythonVariantType.RightPromotion(const V: TVarData;
     Result := False;
 end;
 
-function TPythonVariantType.SetProperty(const V: TVarData;
+function TPythonVariantType.SetProperty({$IFDEF FPC}var{$ELSE}const{$ENDIF} V: TVarData;
   const AName: string; const Value: TVarData): Boolean;
 var
   _newValue : PPyObject;

PythonForDelphi/Components/Sources/Core/PythonEngine.pas

@@ -1106,12 +1106,12 @@ function PythonToSet(ASet : PPyObject; APropInfo: PPropInfo) : Integer;
 {$IFDEF FPC}
 function GetPropValue(Instance: TObject; PropInfo: PPropInfo): Variant;
 begin
-  Result := Variants.GetPropValue(Instance, PropInfo^.Name);
+  Result := Variants.GetPropValue(Instance, PropInfo, False);
 end;
 
 procedure SetPropValue(Instance: TObject; PropInfo: PPropInfo; const Value: Variant);
 begin
-  Variants.SetPropValue(Instance, PropInfo^.Name, Value);
+  Variants.SetPropValue(Instance, PropInfo, Value);
 end;
 {$ENDIF}