From d5bfa05d39fbc6dfc361cf045c25b0a5cdfcc917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Thu, 2 May 2024 16:54:07 +0200 Subject: [PATCH] Added a manifest made by Wellington Torrejais da Silva to D7 demos Fixed build issue in Linux --- .../MiniBrowserD7/00-DeleteDCUs.bat | 1 - .../Delphi_VCL/MiniBrowserD7/MiniBrowser.dpr | 3 ++ demos/Delphi_VCL/MiniBrowserD7/Win7UAC.RES | Bin 0 -> 1620 bytes .../Delphi_VCL/MiniBrowserD7/Win7UAC.manifest | 29 ++++++++++++++++++ demos/Delphi_VCL/MiniBrowserD7/Win7UAC.rc | 1 + .../SimpleBrowser/00-DeleteDCUs.bat | 1 - .../SimpleBrowser/SimpleBrowser_D7.dof | 4 +++ .../SimpleBrowser/SimpleBrowser_D7.dpr | 3 ++ .../SimpleBrowser/SimpleBrowser_D7.res | Bin 0 -> 876 bytes demos/Delphi_VCL/SimpleBrowser/Win7UAC.RES | Bin 0 -> 1620 bytes .../Delphi_VCL/SimpleBrowser/Win7UAC.manifest | 29 ++++++++++++++++++ demos/Delphi_VCL/SimpleBrowser/Win7UAC.rc | 1 + .../SimpleBrowser2/00-DeleteDCUs.bat | 1 - .../SimpleBrowser2/SimpleBrowser2_D7.dof | 4 +++ .../SimpleBrowser2/SimpleBrowser2_D7.dpr | 3 ++ .../SimpleBrowser2/SimpleBrowser2_D7.res | Bin 0 -> 876 bytes demos/Delphi_VCL/SimpleBrowser2/Win7UAC.RES | Bin 0 -> 1620 bytes .../SimpleBrowser2/Win7UAC.manifest | 29 ++++++++++++++++++ demos/Delphi_VCL/SimpleBrowser2/Win7UAC.rc | 1 + source/uCEFTypes.pas | 5 +-- update_CEF4Delphi.json | 2 +- 21 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 demos/Delphi_VCL/MiniBrowserD7/Win7UAC.RES create mode 100644 demos/Delphi_VCL/MiniBrowserD7/Win7UAC.manifest create mode 100644 demos/Delphi_VCL/MiniBrowserD7/Win7UAC.rc create mode 100644 demos/Delphi_VCL/SimpleBrowser/SimpleBrowser_D7.res create mode 100644 demos/Delphi_VCL/SimpleBrowser/Win7UAC.RES create mode 100644 demos/Delphi_VCL/SimpleBrowser/Win7UAC.manifest create mode 100644 demos/Delphi_VCL/SimpleBrowser/Win7UAC.rc create mode 100644 demos/Delphi_VCL/SimpleBrowser2/SimpleBrowser2_D7.res create mode 100644 demos/Delphi_VCL/SimpleBrowser2/Win7UAC.RES create mode 100644 demos/Delphi_VCL/SimpleBrowser2/Win7UAC.manifest create mode 100644 demos/Delphi_VCL/SimpleBrowser2/Win7UAC.rc 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 0000000000000000000000000000000000000000..c796e6ae3e2ff65caf898eba748ea8ce4df38e03 GIT binary patch literal 1620 zcmb`IO>fgc5Qf8rLj?zJ9G5*JZQ_r$V^>a5R6vRVfkY|i_3mtHVecBRoi;-J_A*ZM zsiL-0yOJ&2Gnswfnb*!>Fc=U#uCH$nygXR1o^Rr>G3VJT<_(TsY?88fS5-+C(73{y z3H65_C19jgg_%$2kF$>~p~SVqC{bDi6S@RP-<`ZX%7k-J<>iuK0pljLYs|5e7f=bu zszNr_S=};et7GA+;lih+5~k4L+VlP0uoNNNVlxG%E!rh%mo;v7S(q@O#E1%Srgcqs zq~Q=*d)m6O5}dQmw2>D@3$pDR%zjHpH>DNSV6d!QuI_QO&69Szmaq;ykmJin-0){% zl)ZGrQ(INmuv2T=#+Gi6GVU2ylwDpH@)Io2>@UDZ$59&PG50x_Qu|6%QVKKg#C(N* zpC}|9{a?lI`C4z*Hl1r{M%xDtDx{k}Ignk0!`QW_f!`et5Y)G(SQI79!EJ-cv<-i_ z!k@P2sL!x~l9c^58fBr#7Klln&OjBCC~+wsmf8lZ_6bve8x@a%5<> zTC_!8l)Z)S_2of&@6e5KQP(&utYpnrUiOBuvkM@z_aukXUJ{&rp97BUr4!fHwQX9W zZ9~@fAm;_XK!mYft#uZtuiwc`P3Rv8Jm2ThnE4Tp84qQ|M5KXvUZMaXRH63%?se%A zG~>HT!pIMkJQXZbDU#@1u>=CeM8LTh1d&cd@kAua-6UKDI!GX7QJANUbMCWTq>`yP zRa|fpLzwg=r2m5S>k&;!hW_0!zK+MS9LFs2z-K%NQ-&{a&XQ1hI#!+%<0pghy`E(! z>y}#*@bp;t0n2qB;*20+II)QFM61XXek9Vp8D*nAgRVT7jSj4Tf*G4HA;CX}f3b@0 A#Q*>R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3aaf24bcc277197daefc151a440955500dc369e2 GIT binary patch literal 876 zcmZuw!D`h&6g_zf7)+_JAhf$aLTTM;$WpKsi^YZZABr?vc}QlbDP0)IqQCM=Hp1Pc zD}O_9WIIp@v{GZ_Gw5vo0y{u4hZqaM-|cx^g;xG|cZFqsiY zM1Y7bgEjw;3gCyT>N~bfi3(lUQLs%|r+vq^-y+-u9EQbN|3@1f#ULJWz-L%%kV7bHd+I z&uzl(1D8Hs44g-@ojSKC1CN__I!RL`gMmEr(rDm>#uFI~wb+3sBJ#oec<3~c1FaqJ zbI-Xh;IAW>Hm6Zo&n(YbXxs`K<|4JUHj&8JhWEi}2EOPi@5uCI+>jBA1*$-GL>Hp}XHFa%_xh_4YA$@r+R2#9O??8@wZ4;gtOt>+ix|Lx9;V@~^^PQGh?bJkfXn literal 0 HcmV?d00001 diff --git a/demos/Delphi_VCL/SimpleBrowser/Win7UAC.RES b/demos/Delphi_VCL/SimpleBrowser/Win7UAC.RES new file mode 100644 index 0000000000000000000000000000000000000000..c796e6ae3e2ff65caf898eba748ea8ce4df38e03 GIT binary patch literal 1620 zcmb`IO>fgc5Qf8rLj?zJ9G5*JZQ_r$V^>a5R6vRVfkY|i_3mtHVecBRoi;-J_A*ZM zsiL-0yOJ&2Gnswfnb*!>Fc=U#uCH$nygXR1o^Rr>G3VJT<_(TsY?88fS5-+C(73{y z3H65_C19jgg_%$2kF$>~p~SVqC{bDi6S@RP-<`ZX%7k-J<>iuK0pljLYs|5e7f=bu zszNr_S=};et7GA+;lih+5~k4L+VlP0uoNNNVlxG%E!rh%mo;v7S(q@O#E1%Srgcqs zq~Q=*d)m6O5}dQmw2>D@3$pDR%zjHpH>DNSV6d!QuI_QO&69Szmaq;ykmJin-0){% zl)ZGrQ(INmuv2T=#+Gi6GVU2ylwDpH@)Io2>@UDZ$59&PG50x_Qu|6%QVKKg#C(N* zpC}|9{a?lI`C4z*Hl1r{M%xDtDx{k}Ignk0!`QW_f!`et5Y)G(SQI79!EJ-cv<-i_ z!k@P2sL!x~l9c^58fBr#7Klln&OjBCC~+wsmf8lZ_6bve8x@a%5<> zTC_!8l)Z)S_2of&@6e5KQP(&utYpnrUiOBuvkM@z_aukXUJ{&rp97BUr4!fHwQX9W zZ9~@fAm;_XK!mYft#uZtuiwc`P3Rv8Jm2ThnE4Tp84qQ|M5KXvUZMaXRH63%?se%A zG~>HT!pIMkJQXZbDU#@1u>=CeM8LTh1d&cd@kAua-6UKDI!GX7QJANUbMCWTq>`yP zRa|fpLzwg=r2m5S>k&;!hW_0!zK+MS9LFs2z-K%NQ-&{a&XQ1hI#!+%<0pghy`E(! z>y}#*@bp;t0n2qB;*20+II)QFM61XXek9Vp8D*nAgRVT7jSj4Tf*G4HA;CX}f3b@0 A#Q*>R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3aaf24bcc277197daefc151a440955500dc369e2 GIT binary patch literal 876 zcmZuw!D`h&6g_zf7)+_JAhf$aLTTM;$WpKsi^YZZABr?vc}QlbDP0)IqQCM=Hp1Pc zD}O_9WIIp@v{GZ_Gw5vo0y{u4hZqaM-|cx^g;xG|cZFqsiY zM1Y7bgEjw;3gCyT>N~bfi3(lUQLs%|r+vq^-y+-u9EQbN|3@1f#ULJWz-L%%kV7bHd+I z&uzl(1D8Hs44g-@ojSKC1CN__I!RL`gMmEr(rDm>#uFI~wb+3sBJ#oec<3~c1FaqJ zbI-Xh;IAW>Hm6Zo&n(YbXxs`K<|4JUHj&8JhWEi}2EOPi@5uCI+>jBA1*$-GL>Hp}XHFa%_xh_4YA$@r+R2#9O??8@wZ4;gtOt>+ix|Lx9;V@~^^PQGh?bJkfXn literal 0 HcmV?d00001 diff --git a/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.RES b/demos/Delphi_VCL/SimpleBrowser2/Win7UAC.RES new file mode 100644 index 0000000000000000000000000000000000000000..c796e6ae3e2ff65caf898eba748ea8ce4df38e03 GIT binary patch literal 1620 zcmb`IO>fgc5Qf8rLj?zJ9G5*JZQ_r$V^>a5R6vRVfkY|i_3mtHVecBRoi;-J_A*ZM zsiL-0yOJ&2Gnswfnb*!>Fc=U#uCH$nygXR1o^Rr>G3VJT<_(TsY?88fS5-+C(73{y z3H65_C19jgg_%$2kF$>~p~SVqC{bDi6S@RP-<`ZX%7k-J<>iuK0pljLYs|5e7f=bu zszNr_S=};et7GA+;lih+5~k4L+VlP0uoNNNVlxG%E!rh%mo;v7S(q@O#E1%Srgcqs zq~Q=*d)m6O5}dQmw2>D@3$pDR%zjHpH>DNSV6d!QuI_QO&69Szmaq;ykmJin-0){% zl)ZGrQ(INmuv2T=#+Gi6GVU2ylwDpH@)Io2>@UDZ$59&PG50x_Qu|6%QVKKg#C(N* zpC}|9{a?lI`C4z*Hl1r{M%xDtDx{k}Ignk0!`QW_f!`et5Y)G(SQI79!EJ-cv<-i_ z!k@P2sL!x~l9c^58fBr#7Klln&OjBCC~+wsmf8lZ_6bve8x@a%5<> zTC_!8l)Z)S_2of&@6e5KQP(&utYpnrUiOBuvkM@z_aukXUJ{&rp97BUr4!fHwQX9W zZ9~@fAm;_XK!mYft#uZtuiwc`P3Rv8Jm2ThnE4Tp84qQ|M5KXvUZMaXRH63%?se%A zG~>HT!pIMkJQXZbDU#@1u>=CeM8LTh1d&cd@kAua-6UKDI!GX7QJANUbMCWTq>`yP zRa|fpLzwg=r2m5S>k&;!hW_0!zK+MS9LFs2z-K%NQ-&{a&XQ1hI#!+%<0pghy`E(! z>y}#*@bp;t0n2qB;*20+II)QFM61XXek9Vp8D*nAgRVT7jSj4Tf*G4HA;CX}f3b@0 A#Q*>R literal 0 HcmV?d00001 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" }