pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-05-23 21:50:21 +02:00
Code Issues Actions 1 Releases Activity

Fix for issue #277

Browse Source 
- Added attribution links to other projects in the readme file.
This commit is contained in:
Salvador Díaz Fau 2020-05-09 11:41:20 +02:00
parent 1d750fac10
commit e47b526c33
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -32,6 +32,11 @@ Additional:
Delphinus-Support Delphinus-Support
## Attribution ## Attribution
Other projects :
* [DCEF3](https://github.com/hgourvest/dcef3)
* [CEF](https://bitbucket.org/chromiumembedded/cef/)
* [DCPcrypt](http://www.cityinthesky.co.uk/opensource/dcpcrypt/)
* [Chromium](https://chromium.googlesource.com/chromium/src/)
Some icons used in this project belong to these icon packages : Some icons used in this project belong to these icon packages :
* [Fugue & Diagona icons](http://yusukekamiyamane.com/) * [Fugue & Diagona icons](http://yusukekamiyamane.com/)
* [FatCow Farm-Fresh Web Icons](https://www.fatcow.com/free-icons) * [FatCow Farm-Fresh Web Icons](https://www.fatcow.com/free-icons)

36
source/uCEFMiscFunctions.pas
View File

@ -170,7 +170,6 @@ function PathIsUNCAnsi(pszPath: LPCSTR): BOOL; stdcall; external SHLWAPIDLL name
function PathIsUNCUnicode(pszPath: LPCWSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsUNCW'; function PathIsUNCUnicode(pszPath: LPCWSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsUNCW';
function PathIsURLAnsi(pszPath: LPCSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsURLA'; function PathIsURLAnsi(pszPath: LPCSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsURLA';
function PathIsURLUnicode(pszPath: LPCWSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsURLW'; function PathIsURLUnicode(pszPath: LPCWSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsURLW';
function CustomRtlGetVersion(var lpVersionInformation : TOSVersionInfoEx): LongInt; stdcall; external NTDLL name 'RtlGetVersion';
{$IFNDEF DELPHI12_UP} {$IFNDEF DELPHI12_UP}
const const
@ -2129,21 +2128,42 @@ begin
end; end;
function GetWindowsMajorMinorVersion(var wMajorVersion, wMinorVersion : DWORD) : boolean; function GetWindowsMajorMinorVersion(var wMajorVersion, wMinorVersion : DWORD) : boolean;
type
TRtlGetVersionFunc = function(var lpVersionInformation : TOSVersionInfoEx): LongInt; stdcall;
var var
TempHandle : THandle;
TempInfo : TOSVersionInfoEx; TempInfo : TOSVersionInfoEx;
TempRtlGetVersionFunc : TRtlGetVersionFunc;
begin begin
Result := False; Result := False;
wMajorVersion := 0; wMajorVersion := 0;
wMinorVersion := 0; wMinorVersion := 0;
ZeroMemory(@TempInfo, SizeOf(TOSVersionInfoEx)); try
TempHandle := LoadLibrary(NTDLL);
if (CustomRtlGetVersion(TempInfo) = 0) then if (TempHandle <> 0) then
begin try
Result := True; {$IFDEF FPC}Pointer({$ENDIF}TempRtlGetVersionFunc{$IFDEF FPC}){$ENDIF} := GetProcAddress(TempHandle, 'RtlGetVersion');
wMajorVersion := TempInfo.dwMajorVersion;
wMinorVersion := TempInfo.dwMinorVersion; if assigned(TempRtlGetVersionFunc) then
end; begin
ZeroMemory(@TempInfo, SizeOf(TOSVersionInfoEx));
if (TempRtlGetVersionFunc(TempInfo) = 0) then
begin
Result := True;
wMajorVersion := TempInfo.dwMajorVersion;
wMinorVersion := TempInfo.dwMinorVersion;
end;
end;
finally
FreeLibrary(TempHandle);
end;
except
on e : exception do
if CustomExceptionHandler('GetWindowsMajorMinorVersion', e) then raise;
end;
end; end;
function GetDefaultCEFUserAgent : string; function GetDefaultCEFUserAgent : string;

2
update_CEF4Delphi.json
View File

@ -2,7 +2,7 @@
"UpdateLazPackages" : [ "UpdateLazPackages" : [
{ {
"ForceNotify" : true, "ForceNotify" : true,
"InternalVersion" : 134, "InternalVersion" : 135,
"Name" : "cef4delphi_lazarus.lpk", "Name" : "cef4delphi_lazarus.lpk",
"Version" : "81.3.2.0" "Version" : "81.3.2.0"
} }