diff --git a/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas b/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas index 45bc96d8..c06aef0a 100644 --- a/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas +++ b/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas @@ -1114,12 +1114,13 @@ end; procedure TMiniBrowserFrm.Useragent1Click(Sender: TObject); var - TempUA : string; + TempOldUA, TempNewUA : string; begin - TempUA := inputbox('MiniBrowser demo', 'Set new user agent string', ''); + TempOldUA := GetDefaultCEFUserAgent; + TempNewUA := inputbox('MiniBrowser demo', 'Set new user agent string', TempOldUA); - if (length(TempUA) > 0) then - Chromium1.SetUserAgentOverride(TempUA); + if (length(TempNewUA) > 0) and (TempOldUA <> TempNewUA) then + Chromium1.SetUserAgentOverride(TempNewUA); end; procedure TMiniBrowserFrm.BrowserCreatedMsg(var aMessage : TMessage); diff --git a/source/uCEFApplicationCore.pas b/source/uCEFApplicationCore.pas index 121dae2c..69d7593d 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -2303,7 +2303,7 @@ begin {$IFDEF MSWINDOWS} ZeroMemory(@TempMemStatus, SizeOf(TMyMemoryStatusEx)); TempMemStatus.dwLength := SizeOf(TMyMemoryStatusEx); - if GetGlobalMemoryStatusEx(TempMemStatus) then + if GetGlobalMemoryStatusEx(@TempMemStatus) then Result := TempMemStatus.ullTotalPhys; {$ENDIF} end; @@ -2318,7 +2318,7 @@ begin {$IFDEF MSWINDOWS} ZeroMemory(@TempMemStatus, SizeOf(TMyMemoryStatusEx)); TempMemStatus.dwLength := SizeOf(TMyMemoryStatusEx); - if GetGlobalMemoryStatusEx(TempMemStatus) then + if GetGlobalMemoryStatusEx(@TempMemStatus) then Result := TempMemStatus.ullAvailPhys; {$ENDIF} end; @@ -2334,7 +2334,8 @@ begin {$IFDEF MSWINDOWS} ZeroMemory(@TempMemStatus, SizeOf(TMyMemoryStatusEx)); TempMemStatus.dwLength := SizeOf(TMyMemoryStatusEx); - if GetGlobalMemoryStatusEx(TempMemStatus) then Result := TempMemStatus.dwMemoryLoad; + if GetGlobalMemoryStatusEx(@TempMemStatus) then + Result := TempMemStatus.dwMemoryLoad; {$ENDIF} end; diff --git a/source/uCEFMiscFunctions.pas b/source/uCEFMiscFunctions.pas index 34a29ed7..07c41083 100644 --- a/source/uCEFMiscFunctions.pas +++ b/source/uCEFMiscFunctions.pas @@ -154,10 +154,10 @@ procedure WindowInfoAsWindowless(var aWindowInfo : TCefWindowInfo; aParent : TCe {$ENDIF} {$IFDEF MSWINDOWS} -function ProcessUnderWow64(hProcess: THandle; var Wow64Process: BOOL): BOOL; stdcall; external Kernel32DLL name 'IsWow64Process'; +function ProcessUnderWow64(hProcess: THandle; Wow64Process: PBOOL): BOOL; stdcall; external Kernel32DLL name 'IsWow64Process'; function PathIsRelativeAnsi(pszPath: LPCSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsRelativeA'; function PathIsRelativeUnicode(pszPath: LPCWSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsRelativeW'; -function GetGlobalMemoryStatusEx(var Buffer: TMyMemoryStatusEx): BOOL; stdcall; external Kernel32DLL name 'GlobalMemoryStatusEx'; +function GetGlobalMemoryStatusEx(lpBuffer: LPMEMORYSTATUSEX): BOOL; stdcall; external Kernel32DLL name 'GlobalMemoryStatusEx'; function PathCanonicalizeAnsi(pszBuf: LPSTR; pszPath: LPCSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathCanonicalizeA'; function PathCanonicalizeUnicode(pszBuf: LPWSTR; pszPath: LPCWSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathCanonicalizeW'; function PathIsUNCAnsi(pszPath: LPCSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsUNCA'; @@ -1463,7 +1463,8 @@ function Is32BitProcessRunningIn64BitOS : boolean; var TempResult : BOOL; begin - Result := ProcessUnderWow64(GetCurrentProcess, TempResult) and TempResult; + Result := ProcessUnderWow64(GetCurrentProcess, @TempResult) and + TempResult; end; {$ENDIF} @@ -2141,7 +2142,7 @@ begin TempOS := TempOS + ' ' + inttostr(TempMajorVer) + '.' + inttostr(TempMinorVer); - if ProcessUnderWow64(GetCurrentProcess(), Temp64bit) and Temp64bit then + if ProcessUnderWow64(GetCurrentProcess(), @Temp64bit) and Temp64bit then TempOS := TempOS + '; WOW64'; if (GlobalCEFApp <> nil) then diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas index b366b1e8..64564e06 100644 --- a/source/uCEFTypes.pas +++ b/source/uCEFTypes.pas @@ -366,6 +366,7 @@ type ullAvailVirtual : uint64; ullAvailExtendedVirtual : uint64; end; + LPMEMORYSTATUSEX = ^TMyMemoryStatusEx; TOSVersionInfoEx = record dwOSVersionInfoSize: DWORD; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index f8dda99a..174c20ec 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 331, + "InternalVersion" : 332, "Name" : "cef4delphi_lazarus.lpk", "Version" : "95.7.12.0" }