From 5c2204b207bb607a58e16282c639b3363caf9b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Tue, 5 May 2020 19:20:23 +0200 Subject: [PATCH] Fixed issue #277 --- source/uCEFConstants.pas | 6 ++++++ source/uCEFMiscFunctions.pas | 4 ++-- update_CEF4Delphi.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/uCEFConstants.pas b/source/uCEFConstants.pas index e6a0d9ad..6cd22604 100644 --- a/source/uCEFConstants.pas +++ b/source/uCEFConstants.pas @@ -610,10 +610,14 @@ const CEF_BEFORECLOSE = {$IFDEF MSWINDOWS}WM_APP +{$ENDIF} $A0C; // Lazarus and some old Delphi versions don't have these message contants + {$IF NOT DECLARED(WM_TOUCH)} WM_TOUCH = $0240; + {$IFEND} + {$IF NOT DECLARED(WM_POINTERUPDATE)} WM_POINTERUPDATE = $0245; WM_POINTERDOWN = $0246; WM_POINTERUP = $0247; + {$IFEND} CEF_TIMER_MINIMUM = $0000000A; CEF_TIMER_MAXIMUM = $7FFFFFFF; @@ -630,7 +634,9 @@ const CEF_IMAGE_FILE_MACHINE_I386 = $014C; CEF_IMAGE_FILE_MACHINE_AMD64 = $8664; + {$IF NOT DECLARED(USER_DEFAULT_SCREEN_DPI)} USER_DEFAULT_SCREEN_DPI = 96; + {$IFEND} implementation diff --git a/source/uCEFMiscFunctions.pas b/source/uCEFMiscFunctions.pas index 43eab458..99fc2071 100644 --- a/source/uCEFMiscFunctions.pas +++ b/source/uCEFMiscFunctions.pas @@ -170,7 +170,7 @@ function PathIsUNCAnsi(pszPath: LPCSTR): BOOL; stdcall; external SHLWAPIDLL name function PathIsUNCUnicode(pszPath: LPCWSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsUNCW'; function PathIsURLAnsi(pszPath: LPCSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsURLA'; function PathIsURLUnicode(pszPath: LPCWSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsURLW'; -function RtlGetVersion(var lpVersionInformation : TOSVersionInfoEx): LongInt; stdcall; external NTDLL; +function CustomRtlGetVersion(var lpVersionInformation : TOSVersionInfoEx): LongInt; stdcall; external NTDLL name 'RtlGetVersion'; {$IFNDEF DELPHI12_UP} const @@ -2138,7 +2138,7 @@ begin ZeroMemory(@TempInfo, SizeOf(TOSVersionInfoEx)); - if (RtlGetVersion(TempInfo) = 0) then + if (CustomRtlGetVersion(TempInfo) = 0) then begin Result := True; wMajorVersion := TempInfo.dwMajorVersion; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 466450de..489ad5cb 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 130, + "InternalVersion" : 131, "Name" : "cef4delphi_lazarus.lpk", "Version" : "81.3.1.0" }