LoadDLLInExtensionModule added

Author: pyscripter

Modules/DemoModule/uMain.pas

@@ -50,16 +50,14 @@ function PyInit_DemoModule: PPyObject;
     gEngine := TPythonEngine.Create(nil);
     gEngine.AutoFinalize := False;
     gEngine.UseLastKnownVersion := False;
-    // Adapt to the desired python version
-    gEngine.RegVersion := '3.8';
-    gEngine.DllName := 'python38.dll';
+    gEngine.UseLastKnownVersion := True;
 
     gModule := TPythonModule.Create(nil);
     gModule.Engine := gEngine;
     gModule.ModuleName := 'DemoModule';
     gModule.AddMethod('is_prime', delphi_is_prime, 'is_prime(n) -> bool' );
 
-    gEngine.LoadDll;
+    gEngine.LoadDllInExtensionModule;
   except
   end;
   Result := gModule.Module;

Source/PythonEngine.pas

@@ -1170,6 +1170,7 @@   TDynamicDll = class(TComponent)
     FOnBeforeLoad       : TNotifyEvent;
     FOnAfterLoad        : TNotifyEvent;
     FOnBeforeUnload     : TNotifyEvent;
+    FInExtensionModule   : Boolean;
 
     function  Import(const funcname: AnsiString; canFail : Boolean = True): Pointer;
     procedure Loaded; override;
@@ -1189,6 +1190,7 @@   TDynamicDll = class(TComponent)
     procedure OpenDll(const aDllName : string);
     function  IsHandleValid : Boolean;
     procedure LoadDll;
+    procedure LoadDllInExtensionModule;
     procedure UnloadDll;
     procedure Quit;
 
@@ -2978,7 +2980,7 @@ function  TDynamicDll.GetDllPath : string;
 begin
   Result := DllPath;
 
-  if DLLPath = '' then begin
+  if (DLLPath = '') and not FInExtensionModule then begin
     {$IFDEF MSWINDOWS}
     IsPythonVersionRegistered(RegVersion, Result, AllUserInstall);
     {$ENDIF}
@@ -3086,6 +3088,12 @@ procedure TDynamicDll.LoadDll;
   OpenDll( DllName );
 end;
 
+procedure TDynamicDll.LoadDllInExtensionModule;
+begin
+  FInExtensionModule := True;
+  LoadDLL;
+end;
+
 procedure TDynamicDll.UnloadDll;
 begin
   if IsHandleValid then begin
@@ -4223,26 +4231,34 @@ procedure TPythonEngine.Initialize;
     raise Exception.Create('There is already one instance of TPythonEngine running' );
 
   gPythonEngine := Self;
-  CheckRegistry;
-  if Assigned(Py_SetProgramName) and (Length(FProgramName) > 0) then
-    Py_SetProgramName(PWCharT(FProgramName));
-  AssignPyFlags;
-  if Length(FPythonHome) > 0 then
-    Py_SetPythonHome(PWCharT(FPythonHome));
-  Py_Initialize;
-  if Assigned(Py_IsInitialized) then
-    FInitialized := Py_IsInitialized() <> 0
-  else
-    FInitialized := True;
+
   FIORedirected := False;
-  InitSysPath;
-  SetProgramArgs;
+  if FInExtensionModule then
+    FInitialized := True
+  else
+  begin
+    CheckRegistry;
+    if Assigned(Py_SetProgramName) and (Length(FProgramName) > 0) then
+      Py_SetProgramName(PWCharT(FProgramName));
+    AssignPyFlags;
+    if Length(FPythonHome) > 0 then
+      Py_SetPythonHome(PWCharT(FPythonHome));
+    Py_Initialize;
+    if Assigned(Py_IsInitialized) then
+      FInitialized := Py_IsInitialized() <> 0
+    else
+      FInitialized := True;
+    InitSysPath;
+    SetProgramArgs;
+    if InitThreads and Assigned(PyEval_InitThreads) then
+      PyEval_InitThreads;
+    if RedirectIO and Assigned(FIO) then
+      DoRedirectIO;
+  end;
+
   GetTimeStructType;
   GetDateTimeTypes;
-  if InitThreads and Assigned(PyEval_InitThreads) then
-    PyEval_InitThreads;
-  if RedirectIO and Assigned(FIO) then
-    DoRedirectIO;
+
   for i := 0 to ClientCount - 1 do
     with Clients[i] do
       if not Initialized then