diff --git a/README.md b/README.md index a6c021c0..9db9df9a 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro CEF4Delphi is based on DCEF3 and fpCEF3. The original license of those projects still applies to CEF4Delphi. Read the license terms in the first lines of any *.pas file. -CEF4Delphi uses CEF 103.0.11 which includes Chromium 103.0.5060.114. +CEF4Delphi uses CEF 103.0.12 which includes Chromium 103.0.5060.134. The CEF binaries used by CEF4Delphi are available for download at Spotify : -* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.11%2Bgb1e93e1%2Bchromium-103.0.5060.114_windows32.tar.bz2) -* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.11%2Bgb1e93e1%2Bchromium-103.0.5060.114_windows64.tar.bz2) -* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.11%2Bgb1e93e1%2Bchromium-103.0.5060.114_linux64.tar.bz2) -* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.11%2Bgb1e93e1%2Bchromium-103.0.5060.114_linuxarm.tar.bz2) -* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.11%2Bgb1e93e1%2Bchromium-103.0.5060.114_linuxarm64.tar.bz2) -* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.11%2Bgb1e93e1%2Bchromium-103.0.5060.114_macosx64.tar.bz2) +* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.12%2Bg8eb56c7%2Bchromium-103.0.5060.134_windows32.tar.bz2) +* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.12%2Bg8eb56c7%2Bchromium-103.0.5060.134_windows64.tar.bz2) +* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.12%2Bg8eb56c7%2Bchromium-103.0.5060.134_linux64.tar.bz2) +* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.12%2Bg8eb56c7%2Bchromium-103.0.5060.134_linuxarm.tar.bz2) +* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.12%2Bg8eb56c7%2Bchromium-103.0.5060.134_linuxarm64.tar.bz2) +* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_103.0.12%2Bg8eb56c7%2Bchromium-103.0.5060.134_macosx64.tar.bz2) CEF4Delphi was developed and tested on Delphi 11.1 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2, Delphi 10.3, Delphi 10.4 and Lazarus 2.2.2/FPC 3.2.2. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/source/uCEFApplicationCore.pas b/source/uCEFApplicationCore.pas index a4eeb7f1..69975162 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -68,13 +68,13 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 103; CEF_SUPPORTED_VERSION_MINOR = 0; - CEF_SUPPORTED_VERSION_RELEASE = 11; + CEF_SUPPORTED_VERSION_RELEASE = 12; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 103; CEF_CHROMEELF_VERSION_MINOR = 0; CEF_CHROMEELF_VERSION_RELEASE = 5060; - CEF_CHROMEELF_VERSION_BUILD = 114; + CEF_CHROMEELF_VERSION_BUILD = 134; {$IFDEF MSWINDOWS} LIBCEF_DLL = 'libcef.dll'; @@ -1443,7 +1443,7 @@ begin RenameAndDeleteDir(FCache) else if FDeleteCookies then - DeleteCookiesDB(FCache) + DeleteCookiesDB(IncludeTrailingPathDelimiter(FCache) + 'Network') else if FDeleteCache then RenameAndDeleteDir(FCache, True); @@ -1502,14 +1502,23 @@ end; procedure TCefApplicationCore.MoveCookiesDB(const aSrcDirectory, aDstDirectory : string); var TempFiles : TStringList; + TempSrc, TempDst : string; begin TempFiles := TStringList.Create; try + TempFiles.Add('LocalPrefs.json'); + + MoveFileList(TempFiles, aSrcDirectory, aDstDirectory); + + TempSrc := IncludeTrailingPathDelimiter(aSrcDirectory) + 'Network'; + TempDst := IncludeTrailingPathDelimiter(aDstDirectory) + 'Network'; + + TempFiles.Clear; TempFiles.Add('Cookies'); TempFiles.Add('Cookies-journal'); - MoveFileList(TempFiles, aSrcDirectory, aDstDirectory); + MoveFileList(TempFiles, TempSrc, TempDst); finally FreeAndNil(TempFiles); end; @@ -1533,7 +1542,7 @@ begin repeat inc(i); - TempNewDir := TempOldDir + '(' + inttostr(i) + ')'; + TempNewDir := TempOldDir + '_' + inttostr(i); until not(DirectoryExists(TempNewDir)); if RenameFile(TempOldDir, TempNewDir) then diff --git a/source/uCEFMiscFunctions.pas b/source/uCEFMiscFunctions.pas index cc636309..965e2d14 100644 --- a/source/uCEFMiscFunctions.pas +++ b/source/uCEFMiscFunctions.pas @@ -2472,7 +2472,7 @@ begin if (TempRec.Name <> '.') and (TempRec.Name <> '..') then begin if DeleteDirContents(TempPath, aExcludeFiles) then - Result := RemoveDir(TempPath) and Result + Result := ((TempRec.Name = 'Network') or RemoveDir(TempPath)) and Result else Result := False; end; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index f35212a2..92b013c3 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 416, + "InternalVersion" : 417, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "103.0.11.0" + "Version" : "103.0.12.0" } ], "UpdatePackageData" : {