From 28bf09272d6e7dfb0cc2cd90bb3cc67dc8e84b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= <briskbard@briskbard.com>
Date: Sat, 10 Feb 2018 18:53:22 +0100
Subject: [PATCH] Added two optional properties to GlobalCEFApp to wait for the
 child processes before shutting down.

Added GlobalCEFApp.WaitForChildProcesses and GlobalCEFApp.WaitTime.
---
 packages/CEF4Delphi_FMX.res | Bin 676 -> 724 bytes
 source/uCEFApplication.pas  | 134 +++++++++++++++++++++++++++++++-----
 2 files changed, 116 insertions(+), 18 deletions(-)

diff --git a/packages/CEF4Delphi_FMX.res b/packages/CEF4Delphi_FMX.res
index 2b6bf397780fb584fc767b5ef780f54b506d6cb3..0b1d7bfebb7dc1e50dd62d97ee57ed52405f8ff3 100644
GIT binary patch
delta 82
zcmZ3&dWCg@0%OQTMR_3M7|pn8;#_6MzKI9jWz87485kKn8S)rP7*ZLEfOH~54uc<%
g%w<TOyq8g&odF1dswO{XG-PC$%*uFsvI0{J0DgEBDgXcg

delta 46
zcmcb@x`cIt0;9@AMR_3M7|qx;ajr6B+{A<KlPef+FxxTkPj+TBocxE8XL0~j3jk4|
B4u}8%

diff --git a/source/uCEFApplication.pas b/source/uCEFApplication.pas
index 9f67a91b..1dd47be0 100644
--- a/source/uCEFApplication.pas
+++ b/source/uCEFApplication.pas
@@ -72,6 +72,8 @@ type
   TCefApplication = class
     protected
       FMustShutDown                  : boolean;
+      FWaitForChildProcesses         : boolean;
+      FWaitTime                      : cardinal;
       FCache                         : ustring;
       FCookies                       : ustring;
       FUserDataPath                  : ustring;
@@ -162,6 +164,10 @@ type
       FOnFocusedNodeChanged          : TOnFocusedNodeChangedEvent;
       FOnProcessMessageReceived      : TOnProcessMessageReceivedEvent;
 
+      procedure DestroyResourceBundleHandler;
+      procedure DestroyBrowserProcessHandler;
+      procedure DestroyRenderProcessHandler;
+
       procedure SetFrameworkDirPath(const aValue : ustring);
       procedure SetResourcesDirPath(const aValue : ustring);
       procedure SetLocalesDirPath(const aValue : ustring);
@@ -232,13 +238,14 @@ type
       function  FindFlashDLL(var aFileName : string) : boolean;
       procedure ShowErrorMessageDlg(const aError : string); virtual;
       function  ParseProcessType : TCefProcessType;
-      procedure RemoveAppReferences;
       procedure CreateAppHandlers;
+      procedure EnumerateAndWaitForChildProcesses;
 
     public
       constructor Create;
       destructor  Destroy; override;
       procedure   AfterConstruction; override;
+      procedure   BeforeDestruction; override;
       procedure   AddCustomCommandLine(const aCommandLine : string; const aValue : string = '');
       function    StartMainProcess : boolean;
       function    StartSubProcess : boolean;
@@ -348,6 +355,8 @@ type
       property OsmodalLoop                       : boolean                                                                     write SetOsmodalLoop;
       property Status                            : TCefAplicationStatus                read FStatus;
       property MissingLibFiles                   : string                              read FMissingLibFiles;
+      property WaitForChildProcesses             : boolean                             read FWaitForChildProcesses             write FWaitForChildProcesses;
+      property WaitTime                          : cardinal                            read FWaitTime                          write FWaitTime;
 
       property OnRegCustomSchemes                : TOnRegisterCustomSchemes            read FOnRegisterCustomSchemes           write FOnRegisterCustomSchemes;
 
@@ -382,9 +391,9 @@ implementation
 
 uses
   {$IFDEF DELPHI16_UP}
-  System.Math, System.IOUtils, System.SysUtils,
+  System.Math, System.IOUtils, System.SysUtils, {$IFDEF MSWINDOWS}WinApi.TlHelp32,{$ENDIF}
   {$ELSE}
-  Math, {$IFDEF DELPHI14_UP}IOUtils,{$ENDIF} SysUtils,
+  Math, {$IFDEF DELPHI14_UP}IOUtils,{$ENDIF} SysUtils, {$IFDEF MSWINDOWS}TlHelp32,{$ENDIF}
   {$ENDIF}
   uCEFLibFunctions, uCEFMiscFunctions, uCEFCommandLine, uCEFConstants,
   uCEFSchemeHandlerFactory, uCEFCookieManager, uCEFApp,
@@ -398,6 +407,8 @@ begin
   FMissingLibFiles               := '';
   FLibHandle                     := 0;
   FMustShutDown                  := False;
+  FWaitForChildProcesses         := True;
+  FWaitTime                      := 5000;
   FCache                         := '';
   FCookies                       := '';
   FUserDataPath                  := '';
@@ -501,9 +512,11 @@ end;
 
 destructor TCefApplication.Destroy;
 begin
-  if FMustShutDown then ShutDown;
-
-  RemoveAppReferences;
+  if FMustShutDown then
+    begin
+      if FWaitForChildProcesses then EnumerateAndWaitForChildProcesses;
+      ShutDown;
+    end;
 
   if (FLibHandle <> 0) then
     begin
@@ -520,18 +533,6 @@ begin
   inherited Destroy;
 end;
 
-procedure TCefApplication.RemoveAppReferences;
-begin
-  try
-    if (FResourceBundleHandler <> nil) then FResourceBundleHandler.RemoveReferences;
-    if (FBrowserProcessHandler <> nil) then FBrowserProcessHandler.RemoveReferences;
-    if (FRenderProcessHandler  <> nil) then FRenderProcessHandler.RemoveReferences;
-  except
-    on e : exception do
-      if CustomExceptionHandler('TCefApplication.RemoveAppReferences', e) then raise;
-  end;
-end;
-
 procedure TCefApplication.AfterConstruction;
 begin
   inherited AfterConstruction;
@@ -540,6 +541,57 @@ begin
   FCustomCommandLineValues := TStringList.Create;
 end;
 
+procedure TCefApplication.BeforeDestruction;
+begin
+  DestroyResourceBundleHandler;
+  DestroyBrowserProcessHandler;
+  DestroyRenderProcessHandler;
+
+  inherited BeforeDestruction;
+end;
+
+procedure TCefApplication.DestroyResourceBundleHandler;
+begin
+  try
+    if (FResourceBundleHandler <> nil) then
+      begin
+        FResourceBundleHandler.RemoveReferences;
+        FResourceBundleHandler := nil;
+      end;
+  except
+    on e : exception do
+      if CustomExceptionHandler('TCefApplication.DestroyResourceBundleHandler', e) then raise;
+  end;
+end;
+
+procedure TCefApplication.DestroyBrowserProcessHandler;
+begin
+  try
+    if (FBrowserProcessHandler <> nil) then
+      begin
+        FBrowserProcessHandler.RemoveReferences;
+        FBrowserProcessHandler := nil;
+      end;
+  except
+    on e : exception do
+      if CustomExceptionHandler('TCefApplication.DestroyBrowserProcessHandler', e) then raise;
+  end;
+end;
+
+procedure TCefApplication.DestroyRenderProcessHandler;
+begin
+  try
+    if (FRenderProcessHandler <> nil) then
+      begin
+        FRenderProcessHandler.RemoveReferences;
+        FRenderProcessHandler := nil;
+      end;
+  except
+    on e : exception do
+      if CustomExceptionHandler('TCefApplication.DestroyRenderProcessHandler', e) then raise;
+  end;
+end;
+
 procedure TCefApplication.AddCustomCommandLine(const aCommandLine, aValue : string);
 begin
   if (FCustomCommandLines      <> nil) then FCustomCommandLines.Add(aCommandLine);
@@ -1015,6 +1067,52 @@ begin
     FRenderProcessHandler := TCefCustomRenderProcessHandler.Create(self);
 end;
 
+procedure TCefApplication.EnumerateAndWaitForChildProcesses;
+{$IFDEF MSWINDOWS}
+var
+  TempHandle  : THandle;
+  TempProcess : TProcessEntry32;
+  TempArray   : array [0 .. pred(MAXIMUM_WAIT_OBJECTS)] of THandle;
+  TempPID     : DWORD;
+  i           : integer;
+  TempMain, TempSubProc, TempName : string;
+{$ENDIF}
+begin
+{$IFDEF MSWINDOWS}
+  for i := 0 to pred(MAXIMUM_WAIT_OBJECTS) do TempArray[i] := 0;
+
+  TempHandle         := CreateToolHelp32SnapShot(TH32CS_SNAPPROCESS, 0);
+  TempProcess.dwSize := Sizeof(TProcessEntry32);
+  TempPID            := GetCurrentProcessID;
+  TempMain           := ExtractFileName(paramstr(0));
+  TempSubProc        := ExtractFileName(FBrowserSubprocessPath);
+
+  Process32First(TempHandle, TempProcess);
+
+  i := 0;
+  repeat
+    if (TempProcess.th32ProcessID       <> TempPID) and
+       (TempProcess.th32ParentProcessID =  TempPID) then
+      begin
+        TempName := TempProcess.szExeFile;
+        TempName := ExtractFileName(TempName);
+
+        if (CompareText(TempName, TempMain) = 0) or
+           ((length(TempSubProc) > 0) and (CompareText(TempName, TempSubProc) = 0)) then
+          begin
+            TempArray[i] := TempProcess.th32ProcessID;
+            inc(i);
+          end;
+      end;
+  until not(Process32Next(TempHandle, TempProcess)) or (i = MAXIMUM_WAIT_OBJECTS);
+
+  CloseHandle(TempHandle);
+
+  if (i > 0) then
+    WaitForMultipleObjects(i, @TempArray, True, FWaitTime);
+{$ENDIF}
+end;
+
 procedure TCefApplication.Internal_OnContextInitialized;
 begin
   InitializeCookies;