diff --git a/demos/Delphi_VCL/MiniBrowserD7/00-DeleteDCUs.bat b/demos/Delphi_VCL/MiniBrowserD7/00-DeleteDCUs.bat index a9a84095..a04481aa 100644 --- a/demos/Delphi_VCL/MiniBrowserD7/00-DeleteDCUs.bat +++ b/demos/Delphi_VCL/MiniBrowserD7/00-DeleteDCUs.bat @@ -1,6 +1,5 @@ del /s /q *.dcu del /s /q *.exe -del /s /q *.res del /s /q *.rsm del /s /q *.log del /s /q *.dsk diff --git a/demos/Delphi_VCL/MiniBrowserD7/MiniBrowser.dpr b/demos/Delphi_VCL/MiniBrowserD7/MiniBrowser.dpr index 84c0ea2e..5b6348bf 100644 --- a/demos/Delphi_VCL/MiniBrowserD7/MiniBrowser.dpr +++ b/demos/Delphi_VCL/MiniBrowserD7/MiniBrowser.dpr @@ -8,6 +8,9 @@ uses uMiniBrowser in 'uMiniBrowser.pas' {MiniBrowserFrm}; {$R *.res} +{$R 'Win7UAC.res'} +// Manifest made by Wellington Torrejais da Silva +// https://gist.github.com/hotsoft-desenv2/5f722f1c44ed3abfc4f3d5d62ed644eb const IMAGE_FILE_LARGE_ADDRESS_AWARE = $0020; diff --git a/demos/Delphi_VCL/MiniBrowserD7/Win7UAC.RES b/demos/Delphi_VCL/MiniBrowserD7/Win7UAC.RES new file mode 100644 index 00000000..c796e6ae Binary files /dev/null and b/demos/Delphi_VCL/MiniBrowserD7/Win7UAC.RES differ diff --git a/demos/Delphi_VCL/MiniBrowserD7/Win7UAC.manifest b/demos/Delphi_VCL/MiniBrowserD7/Win7UAC.manifest new file mode 100644 index 00000000..2c938419 --- /dev/null +++ b/demos/Delphi_VCL/MiniBrowserD7/Win7UAC.manifest @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/demos/Delphi_VCL/MiniBrowserD7/Win7UAC.rc b/demos/Delphi_VCL/MiniBrowserD7/Win7UAC.rc new file mode 100644 index 00000000..ab4a581a --- /dev/null +++ b/demos/Delphi_VCL/MiniBrowserD7/Win7UAC.rc @@ -0,0 +1 @@ +1 24 "Win7UAC.manifest" \ No newline at end of file diff --git a/demos/Delphi_VCL/SimpleBrowser/00-DeleteDCUs.bat b/demos/Delphi_VCL/SimpleBrowser/00-DeleteDCUs.bat index a9a84095..a04481aa 100644 --- a/demos/Delphi_VCL/SimpleBrowser/00-DeleteDCUs.bat +++ b/demos/Delphi_VCL/SimpleBrowser/00-DeleteDCUs.bat @@ -1,6 +1,5 @@ del /s /q *.dcu del /s /q *.exe -del /s /q *.res del /s /q *.rsm del /s /q *.log del /s /q *.dsk diff --git a/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.dof b/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.dof index 122f1188..7eb53f5c 100644 --- a/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.dof +++ b/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.dof @@ -105,6 +105,10 @@ HostApplication= Launcher= UseLauncher=0 DebugCWD= +[Language] +ActiveLang= +ProjectLang= +RootDir= [Version Info] IncludeVerInfo=0 AutoIncBuild=0 diff --git a/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.dpr b/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.dpr index bda52edf..c29bde50 100644 --- a/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.dpr +++ b/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.dpr @@ -9,6 +9,9 @@ uses {$R *.res} +{$R 'Win7UAC.res'} +// Manifest made by Wellington Torrejais da Silva +// https://gist.github.com/hotsoft-desenv2/5f722f1c44ed3abfc4f3d5d62ed644eb // CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM. {$SetPEFlags $20} diff --git a/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.res b/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.res new file mode 100644 index 00000000..3aaf24bc Binary files /dev/null and b/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.res differ diff --git a/demos/Delphi_VCL/SimpleBrowser/Win7UAC.RES b/demos/Delphi_VCL/SimpleBrowser/Win7UAC.RES new file mode 100644 index 00000000..c796e6ae Binary files /dev/null and b/demos/Delphi_VCL/SimpleBrowser/Win7UAC.RES differ diff --git a/demos/Delphi_VCL/SimpleBrowser/Win7UAC.manifest b/demos/Delphi_VCL/SimpleBrowser/Win7UAC.manifest new file mode 100644 index 00000000..2c938419 --- /dev/null +++ b/demos/Delphi_VCL/SimpleBrowser/Win7UAC.manifest @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/demos/Delphi_VCL/SimpleBrowser/Win7UAC.rc b/demos/Delphi_VCL/SimpleBrowser/Win7UAC.rc new file mode 100644 index 00000000..ab4a581a --- /dev/null +++ b/demos/Delphi_VCL/SimpleBrowser/Win7UAC.rc @@ -0,0 +1 @@ +1 24 "Win7UAC.manifest" \ No newline at end of file diff --git a/demos/Delphi_VCL/SimpleBrowser2/00-DeleteDCUs.bat b/demos/Delphi_VCL/SimpleBrowser2/00-DeleteDCUs.bat index a9a84095..a04481aa 100644 --- a/demos/Delphi_VCL/SimpleBrowser2/00-DeleteDCUs.bat +++ b/demos/Delphi_VCL/SimpleBrowser2/00-DeleteDCUs.bat @@ -1,6 +1,5 @@ del /s /q *.dcu del /s /q *.exe -del /s /q *.res del /s /q *.rsm del /s /q *.log del /s /q *.dsk diff --git a/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.dof b/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.dof index 122f1188..7eb53f5c 100644 --- a/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.dof +++ b/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.dof @@ -105,6 +105,10 @@ HostApplication= Launcher= UseLauncher=0 DebugCWD= +[Language] +ActiveLang= +ProjectLang= +RootDir= [Version Info] IncludeVerInfo=0 AutoIncBuild=0 diff --git a/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.dpr b/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.dpr index d536b119..a84e2576 100644 --- a/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.dpr +++ b/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.dpr @@ -9,6 +9,9 @@ uses {$R *.res} +{$R 'Win7UAC.res'} +// Manifest made by Wellington Torrejais da Silva +// https://gist.github.com/hotsoft-desenv2/5f722f1c44ed3abfc4f3d5d62ed644eb // CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM. {$SetPEFlags $20} diff --git a/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.res b/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.res new file mode 100644 index 00000000..3aaf24bc Binary files /dev/null and b/demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.res differ diff --git a/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.RES b/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.RES new file mode 100644 index 00000000..c796e6ae Binary files /dev/null and b/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.RES differ diff --git a/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.manifest b/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.manifest new file mode 100644 index 00000000..2c938419 --- /dev/null +++ b/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.manifest @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.rc b/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.rc new file mode 100644 index 00000000..ab4a581a --- /dev/null +++ b/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.rc @@ -0,0 +1 @@ +1 24 "Win7UAC.manifest" \ No newline at end of file diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas index 3d5f64ba..a07f42e9 100644 --- a/source/uCEFTypes.pas +++ b/source/uCEFTypes.pas @@ -18,11 +18,12 @@ uses {$ELSE} System.Types, {$IFDEF LINUX}uCEFLinuxTypes,{$ENDIF} {$ENDIF} - System.Math; + System.Math, {$ELSE} {$IFDEF FPC}{$IFDEF LINUX}xlib, ctypes,{$ENDIF}{$ENDIF} - {$IFDEF MSWINDOWS}Windows,{$ENDIF} Math; + {$IFDEF MSWINDOWS}Windows,{$ENDIF} Math, {$ENDIF} + uCEFConstants; type PCefStringWide = ^TCefStringWide; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index a1f2ee50..bbc19916 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 589, + "InternalVersion" : 590, "Name" : "cef4delphi_lazarus.lpk", "Version" : "124.3.1" }