From b3c847a4b44744559e24a6a87e504b11dcf98c7c Mon Sep 17 00:00:00 2001 From: salvadordf Date: Wed, 23 Feb 2022 12:44:37 +0100 Subject: [PATCH] Added WebView4Delphi source path to search path in all demos Removed TWVWinControl.TakeSnapshot Added the TARGET_64BITS define in webview2.inc --- .../SimpleFMXBrowser/SimpleFMXBrowser.dproj | 7 +++-- .../AddHostObject/AddHostObject.dproj | 5 ++- .../BrowserHostAppCommunication.dproj | 3 +- .../ClientCertsBrowser.dproj | 5 ++- .../CookieManager/CookieManager.dproj | 5 ++- .../EditorBrowser/EditorBrowser.dproj | 5 ++- .../KioskBrowser/KioskBrowser.dproj | 8 +++-- .../Delphi_VCL/KioskBrowser/uKioskBrowser.pas | 2 -- demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj | 4 +-- .../Delphi_VCL/MiniBrowser/MiniBrowser.dproj | 5 ++- .../PopupBrowser/PopupBrowser.dproj | 5 ++- .../SimpleBrowser/SimpleBrowser.dproj | 7 ++++- .../TabbedBrowser/TabbedBrowser.dproj | 5 ++- .../VirtualHostBrowser.dproj | 8 +++-- .../WindowlessBrowser/WindowlessBrowser.dproj | 4 +-- source/uWVWinControl.pas | 31 ------------------- source/webview2.inc | 18 ++++++++--- update_CEF4Delphi.json | 2 +- 18 files changed, 70 insertions(+), 59 deletions(-) diff --git a/demos/Delphi_FMX/SimpleFMXBrowser/SimpleFMXBrowser.dproj b/demos/Delphi_FMX/SimpleFMXBrowser/SimpleFMXBrowser.dproj index dcc6158..c147786 100644 --- a/demos/Delphi_FMX/SimpleFMXBrowser/SimpleFMXBrowser.dproj +++ b/demos/Delphi_FMX/SimpleFMXBrowser/SimpleFMXBrowser.dproj @@ -69,6 +69,9 @@ $(BDS)\bin\delphi_PROJECTICON.ico $(BDS)\bin\delphi_PROJECTICNS.icns SimpleFMXBrowser + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;CEF4Delphi_FMX;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;WebView4Delphi_runtime;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -982,9 +985,9 @@ - - + + diff --git a/demos/Delphi_VCL/AddHostObject/AddHostObject.dproj b/demos/Delphi_VCL/AddHostObject/AddHostObject.dproj index 3bb89a5..4aa27f5 100644 --- a/demos/Delphi_VCL/AddHostObject/AddHostObject.dproj +++ b/demos/Delphi_VCL/AddHostObject/AddHostObject.dproj @@ -70,6 +70,9 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png AddHostObject + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;Componentes;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;CEF4Delphi_runtime;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -976,9 +979,9 @@ + - diff --git a/demos/Delphi_VCL/BrowserHostAppCommunication/BrowserHostAppCommunication.dproj b/demos/Delphi_VCL/BrowserHostAppCommunication/BrowserHostAppCommunication.dproj index d1d9977..cfd7ab3 100644 --- a/demos/Delphi_VCL/BrowserHostAppCommunication/BrowserHostAppCommunication.dproj +++ b/demos/Delphi_VCL/BrowserHostAppCommunication/BrowserHostAppCommunication.dproj @@ -72,6 +72,7 @@ BrowserHostAppCommunication 3082 CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + ..\..\..\source;$(DCC_UnitSearchPath) vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;Componentes;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;CEF4Delphi_runtime;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -964,10 +965,10 @@ + - diff --git a/demos/Delphi_VCL/ClientCertsBrowser/ClientCertsBrowser.dproj b/demos/Delphi_VCL/ClientCertsBrowser/ClientCertsBrowser.dproj index 421f51c..d140248 100644 --- a/demos/Delphi_VCL/ClientCertsBrowser/ClientCertsBrowser.dproj +++ b/demos/Delphi_VCL/ClientCertsBrowser/ClientCertsBrowser.dproj @@ -70,6 +70,9 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png ClientCertsBrowser + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;Componentes;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;CEF4Delphi_runtime;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -970,8 +973,8 @@ - + diff --git a/demos/Delphi_VCL/CookieManager/CookieManager.dproj b/demos/Delphi_VCL/CookieManager/CookieManager.dproj index af58edc..3517c69 100644 --- a/demos/Delphi_VCL/CookieManager/CookieManager.dproj +++ b/demos/Delphi_VCL/CookieManager/CookieManager.dproj @@ -70,6 +70,9 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png CookieManager + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;Componentes;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;CEF4Delphi_runtime;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -964,10 +967,10 @@ + - diff --git a/demos/Delphi_VCL/EditorBrowser/EditorBrowser.dproj b/demos/Delphi_VCL/EditorBrowser/EditorBrowser.dproj index 1c21619..8c39988 100644 --- a/demos/Delphi_VCL/EditorBrowser/EditorBrowser.dproj +++ b/demos/Delphi_VCL/EditorBrowser/EditorBrowser.dproj @@ -70,6 +70,9 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png EditorBrowser + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;Componentes;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;CEF4Delphi_runtime;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -965,9 +968,9 @@ + - diff --git a/demos/Delphi_VCL/KioskBrowser/KioskBrowser.dproj b/demos/Delphi_VCL/KioskBrowser/KioskBrowser.dproj index 0544bd1..04ef902 100644 --- a/demos/Delphi_VCL/KioskBrowser/KioskBrowser.dproj +++ b/demos/Delphi_VCL/KioskBrowser/KioskBrowser.dproj @@ -70,6 +70,9 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png KioskBrowser + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;Componentes;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;CEF4Delphi_runtime;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -132,9 +135,8 @@ MainSource - +
MainForm
- dfm Base @@ -965,10 +967,10 @@ + - diff --git a/demos/Delphi_VCL/KioskBrowser/uKioskBrowser.pas b/demos/Delphi_VCL/KioskBrowser/uKioskBrowser.pas index 8df3e92..b377f04 100644 --- a/demos/Delphi_VCL/KioskBrowser/uKioskBrowser.pas +++ b/demos/Delphi_VCL/KioskBrowser/uKioskBrowser.pas @@ -102,8 +102,6 @@ procedure TMainForm.WVBrowser1AcceleratorKeyPressed(Sender: TObject; end; procedure TMainForm.WVBrowser1AfterCreated(Sender: TObject); -var - TempScript: wvstring; begin WVWindowParent1.UpdateSize; diff --git a/demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj b/demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj index d1ff11a..b037e06 100644 --- a/demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj +++ b/demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj @@ -68,7 +68,7 @@ Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) MDIAPP.exe 00400000 - $(BDS)\units;$(BDS)\vcl;$(BDS)\rtl;$(BDS)\db;$(BDS)\app\ui\res;$(BDS)\app\ed\res;$(BDS)\app\design;$(BDS)\qt;$(BDS)\clx;$(DCC_UnitSearchPath) + $(BDS)\units;$(BDS)\vcl;$(BDS)\rtl;$(BDS)\db;$(BDS)\app\ui\res;$(BDS)\app\ed\res;$(BDS)\app\design;$(BDS)\qt;$(BDS)\clx;..\..\..\source;$(DCC_UnitSearchPath) x86 1 true @@ -996,9 +996,9 @@ + - diff --git a/demos/Delphi_VCL/MiniBrowser/MiniBrowser.dproj b/demos/Delphi_VCL/MiniBrowser/MiniBrowser.dproj index be624ae..c7d69b8 100644 --- a/demos/Delphi_VCL/MiniBrowser/MiniBrowser.dproj +++ b/demos/Delphi_VCL/MiniBrowser/MiniBrowser.dproj @@ -70,6 +70,9 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png MiniBrowser + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;WebView4Delphi_runtime;CEF4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -968,9 +971,9 @@ + - diff --git a/demos/Delphi_VCL/PopupBrowser/PopupBrowser.dproj b/demos/Delphi_VCL/PopupBrowser/PopupBrowser.dproj index ea02b51..722d4b6 100644 --- a/demos/Delphi_VCL/PopupBrowser/PopupBrowser.dproj +++ b/demos/Delphi_VCL/PopupBrowser/PopupBrowser.dproj @@ -70,6 +70,9 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png PopupBrowser + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;Componentes;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;CEF4Delphi_runtime;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -971,8 +974,8 @@ - + diff --git a/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser.dproj b/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser.dproj index b1061f0..1a76899 100644 --- a/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser.dproj +++ b/demos/Delphi_VCL/SimpleBrowser/SimpleBrowser.dproj @@ -70,6 +70,10 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png SimpleBrowser + ..\..\..\source;$(BRCC_IncludePath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + ..\..\..\source;$(DCC_UnitSearchPath) vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;Componentes;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;CEF4Delphi_runtime;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -107,6 +111,7 @@ PerMonitorV2 true 1033 + ..\..\..\source;$(BRCC_IncludePath) true @@ -965,10 +970,10 @@ + - diff --git a/demos/Delphi_VCL/TabbedBrowser/TabbedBrowser.dproj b/demos/Delphi_VCL/TabbedBrowser/TabbedBrowser.dproj index 0f8e66f..dc0585a 100644 --- a/demos/Delphi_VCL/TabbedBrowser/TabbedBrowser.dproj +++ b/demos/Delphi_VCL/TabbedBrowser/TabbedBrowser.dproj @@ -70,6 +70,9 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png TabbedBrowser + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;CEF4Delphi_FMX;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -974,9 +977,9 @@ + - diff --git a/demos/Delphi_VCL/VirtualHostBrowser/VirtualHostBrowser.dproj b/demos/Delphi_VCL/VirtualHostBrowser/VirtualHostBrowser.dproj index 1b9c462..f37c876 100644 --- a/demos/Delphi_VCL/VirtualHostBrowser/VirtualHostBrowser.dproj +++ b/demos/Delphi_VCL/VirtualHostBrowser/VirtualHostBrowser.dproj @@ -70,6 +70,9 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png VirtualHostBrowser + ..\..\..\source;$(DCC_UnitSearchPath) + 3082 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= vclwinx;DataSnapServer;IndySystem270;fmx;vclie;DbxCommonDriver;bindengine;VCLRESTComponents;FireDACCommonODBC;DBXMSSQLDriver;emsclient;FireDACCommonDriver;appanalytics;vclx;dbxcds;bindcompvclwinx;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;FireDACOracleDriver;fmxdae;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;Componentes_UI;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;vcldb;VirtualTreesR;Componentes;IndyProtocols270;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;CEF4Delphi_runtime;WebView4Delphi_runtime;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VisualStyles_runtime;RESTComponents;DBXSqliteDriver;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;DBXDb2Driver;SVGPackage;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;IndyCore270;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) @@ -132,9 +135,8 @@ MainSource - +
MainForm
- dfm Base @@ -965,10 +967,10 @@ + - diff --git a/demos/Delphi_VCL/WindowlessBrowser/WindowlessBrowser.dproj b/demos/Delphi_VCL/WindowlessBrowser/WindowlessBrowser.dproj index 6863d0e..0c359fa 100644 --- a/demos/Delphi_VCL/WindowlessBrowser/WindowlessBrowser.dproj +++ b/demos/Delphi_VCL/WindowlessBrowser/WindowlessBrowser.dproj @@ -70,7 +70,7 @@ $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png WindowlessBrowser - $(MFPACK)\src;$(DCC_UnitSearchPath) + $(MFPACK)\src;..\..\..\source;$(DCC_UnitSearchPath) 3082 CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= @@ -970,9 +970,9 @@ + - diff --git a/source/uWVWinControl.pas b/source/uWVWinControl.pas index eab4bd0..918d6e3 100644 --- a/source/uWVWinControl.pas +++ b/source/uWVWinControl.pas @@ -18,7 +18,6 @@ TWVWinControl = class(TWinControl) procedure Resize; override; public - function TakeSnapshot(var aBitmap : TBitmap) : boolean; procedure CreateHandle; override; procedure InvalidateChildren; procedure UpdateSize; virtual; @@ -90,36 +89,6 @@ procedure TWVWinControl.UpdateSize; SWP_NOZORDER); end; -function TWVWinControl.TakeSnapshot(var aBitmap : TBitmap) : boolean; -var - TempHWND : HWND; - TempDC : HDC; - TempRect : TRect; - TempWidth : Integer; - TempHeight : Integer; -begin - Result := False; - if (aBitmap = nil) then exit; - - TempHWND := ChildWindowHandle; - if (TempHWND = 0) then exit; - - {$IFNDEF FPC}Winapi.{$ENDIF}Windows.GetClientRect(TempHWND, TempRect); - - TempDC := GetDC(TempHWND); - TempWidth := TempRect.Right - TempRect.Left; - TempHeight := TempRect.Bottom - TempRect.Top; - - aBitmap := TBitmap.Create; - aBitmap.Height := TempHeight; - aBitmap.Width := TempWidth; - - Result := BitBlt(aBitmap.Canvas.Handle, 0, 0, TempWidth, TempHeight, - TempDC, 0, 0, SRCCOPY); - - ReleaseDC(TempHWND, TempDC); -end; - procedure TWVWinControl.Resize; begin inherited Resize; diff --git a/source/webview2.inc b/source/webview2.inc index 6efd5c3..48af002 100644 --- a/source/webview2.inc +++ b/source/webview2.inc @@ -431,10 +431,7 @@ {$ENDIF} {$IF DEFINED(CPUX32) OR - DEFINED(CPU386) OR - DEFINED(CPUi386) OR - DEFINED(CPUPOWERPC32) OR - DEFINED(CPUSPARC32) OR + DEFINED(CPU32) OR DEFINED(CPU32BITS) OR DEFINED(CPUARM32) OR DEFINED(WIN32) OR @@ -444,6 +441,19 @@ DEFINED(POSIX32) OR DEFINED(ANDROID32)} {$DEFINE TARGET_32BITS} +{$ELSE} + {$IF DEFINED(CPUX64) OR + DEFINED(CPU64) OR + DEFINED(CPU64BITS) OR + DEFINED(CPUARM64) OR + DEFINED(WIN64) OR + DEFINED(IOS64) OR + DEFINED(MACOS64) OR + DEFINED(LINUX64) OR + DEFINED(POSIX64) OR + DEFINED(ANDROID64)} + {$DEFINE TARGET_64BITS} + {$IFEND} {$IFEND} // Delphi uses MACOS for the new MacOSX and DARWIN is not defined diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 4b19abe..1fca7f8 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 35, + "InternalVersion" : 36, "Name" : "webview4delphi.lpk", "Version" : "1.0.1108.44" }