From c23afaba1b64c762f3d6117c1aeb2bd4cd557874 Mon Sep 17 00:00:00 2001 From: Salvador Diaz Fau Date: Sun, 5 Feb 2017 20:56:46 +0100 Subject: [PATCH] Fix for crashes on old Delphi versions --- source/CEF4Delphi.dproj | 22 +- source/CEF4Delphi.dsk | 159 +++++---- source/CEF4Delphi.identcache | Bin 12578 -> 12578 bytes source/CEF4Delphi.stat | 8 +- source/cef.inc | 335 ++++++++++++++++++ source/uCEFApplication.pas | 14 +- source/uCEFAuthCallback.pas | 2 + source/uCEFBase.pas | 2 + source/uCEFBeforeDownloadCallback.pas | 2 + source/uCEFBinaryValue.pas | 2 + source/uCEFBrowser.pas | 6 + source/uCEFBrowserProcessHandler.pas | 2 + source/uCEFCallback.pas | 2 + source/uCEFChromium.pas | 50 ++- source/uCEFChromiumEvents.pas | 6 + source/uCEFChromiumFontOptions.pas | 6 + source/uCEFChromiumOptions.pas | 6 + source/uCEFChromiumWindow.pas | 10 + source/uCEFClient.pas | 10 + source/uCEFCommandLine.pas | 6 + source/uCEFCompletionCallback.pas | 2 + source/uCEFConstants.pas | 6 + source/uCEFContextMenuHandler.pas | 2 + source/uCEFContextMenuParams.pas | 6 + source/uCEFCookieManager.pas | 6 + source/uCEFCookieVisitor.pas | 2 + source/uCEFCustomStreamReader.pas | 6 + source/uCEFDeleteCookiesCallback.pas | 2 + source/uCEFDialogHandler.pas | 6 + source/uCEFDictionaryValue.pas | 6 + source/uCEFDisplayHandler.pas | 6 + source/uCEFDomDocument.pas | 2 + source/uCEFDomNode.pas | 2 + source/uCEFDomVisitor.pas | 2 + source/uCEFDownLoadItem.pas | 2 + source/uCEFDownloadHandler.pas | 2 + source/uCEFDownloadImageCallBack.pas | 2 + source/uCEFDownloadItemCallback.pas | 2 + source/uCEFDragData.pas | 6 + source/uCEFDragHandler.pas | 2 + source/uCEFEndTracingCallback.pas | 2 + source/uCEFFileDialogCallback.pas | 6 + source/uCEFFindHandler.pas | 2 + source/uCEFFocusHandler.pas | 2 + source/uCEFFrame.pas | 4 +- source/uCEFGeolocationCallback.pas | 2 + source/uCEFGeolocationHandler.pas | 2 + source/uCEFGetGeolocationCallback.pas | 2 + source/uCEFImage.pas | 6 + source/uCEFInterfaces.pas | 6 + source/uCEFJsDialogCallback.pas | 2 + source/uCEFJsDialogHandler.pas | 2 + source/uCEFKeyboardHandler.pas | 2 + source/uCEFLibFunctions.pas | 6 + source/uCEFLifeSpanHandler.pas | 2 + source/uCEFListValue.pas | 2 + source/uCEFLoadHandler.pas | 2 + source/uCEFMenuModel.pas | 2 + source/uCEFMenuModelDelegate.pas | 2 + source/uCEFMiscFunctions.pas | 6 + source/uCEFNavigationEntry.pas | 2 + source/uCEFNavigationEntryVisitor.pas | 2 + source/uCEFPDFPrintCallback.pas | 2 + source/uCEFPDFPrintOptions.pas | 6 + source/uCEFPostData.pas | 6 + source/uCEFPostDataElement.pas | 2 + source/uCEFPrintSettings.pas | 2 + source/uCEFProcessMessage.pas | 2 + source/uCEFRegisterCDMCallback.pas | 2 + source/uCEFRegisterComponents.pas | 11 +- source/uCEFRenderHandler.pas | 2 + source/uCEFRenderProcessHandler.pas | 2 + source/uCEFRequest.pas | 2 + source/uCEFRequestCallback.pas | 2 + source/uCEFRequestContext.pas | 6 + source/uCEFRequestContextHandler.pas | 2 + source/uCEFRequestHandler.pas | 6 + source/uCEFResolveCallback.pas | 6 + source/uCEFResourceBundle.pas | 2 + source/uCEFResourceBundleHandler.pas | 2 + source/uCEFResourceHandler.pas | 2 + source/uCEFResponse.pas | 2 + source/uCEFResponseFilter.pas | 2 + source/uCEFRunContextMenuCallback.pas | 2 + source/uCEFRunFileDialogCallback.pas | 6 + source/uCEFSSLStatus.pas | 6 + source/uCEFSchemeHandlerFactory.pas | 2 + source/uCEFSchemeRegistrar.pas | 2 + .../uCEFSelectClientCertificateCallback.pas | 2 + source/uCEFSetCookieCallback.pas | 2 + source/uCEFSslInfo.pas | 6 + source/uCEFStreamReader.pas | 6 + source/uCEFStreamWriter.pas | 2 + source/uCEFStringMap.pas | 2 + source/uCEFStringMultimap.pas | 2 + source/uCEFStringVisitor.pas | 2 + source/uCEFTask.pas | 2 + source/uCEFTaskRunner.pas | 2 + source/uCEFThread.pas | 2 + source/uCEFTypes.pas | 6 + source/uCEFUrlRequest.pas | 2 + source/uCEFUrlrequestClient.pas | 2 + source/uCEFV8Exception.pas | 2 + source/uCEFValue.pas | 2 + source/uCEFWaitableEvent.pas | 2 + source/uCEFWebPluginInfo.pas | 2 + source/uCEFWebPluginInfoVisitor.pas | 2 + source/uCEFWebPluginUnstableCallback.pas | 2 + source/uCEFWindowParent.pas | 6 + source/uCEFWriteHandler.pas | 2 + source/uCEFX509CertPrincipal.pas | 10 + source/uCEFX509Certificate.pas | 6 + source/uCEFXmlReader.pas | 2 + source/uCEFZipReader.pas | 2 + source/uCEFv8Accessor.pas | 2 + source/uCEFv8Context.pas | 2 + source/uCEFv8Handler.pas | 14 + source/uCEFv8Interceptor.pas | 2 + source/uCEFv8StackFrame.pas | 2 + source/uCEFv8StackTrace.pas | 2 + source/uCEFv8Types.pas | 6 + source/uCEFv8Value.pas | 6 + 122 files changed, 875 insertions(+), 118 deletions(-) create mode 100644 source/cef.inc diff --git a/source/CEF4Delphi.dproj b/source/CEF4Delphi.dproj index 829cd8c7..4566b813 100644 --- a/source/CEF4Delphi.dproj +++ b/source/CEF4Delphi.dproj @@ -255,7 +255,16 @@ true - + + + 0 + .dll;.bpl + + + 1 + .dylib + + Contents\Resources @@ -569,16 +578,7 @@ 1 - - - 0 - .dll;.bpl - - - 1 - .dylib - - + diff --git a/source/CEF4Delphi.dsk b/source/CEF4Delphi.dsk index a34e88e9..a525a907 100644 --- a/source/CEF4Delphi.dsk +++ b/source/CEF4Delphi.dsk @@ -1,22 +1,21 @@ [Closed Files] -File_0=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFTypes.pas',0,1,219,3,248,0,0,, -File_1=TSourceModule,'V:\dcef3-2883\src\ceflib.pas',0,1,12706,24,12734,0,0,, -File_2=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFLibFunctions.pas',0,1,261,51,294,0,0,, -File_3=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFClient.pas',0,1,504,62,536,0,0,, -File_4=TSourceModule,'V:\dcef3-2704\src\ceflib.pas',0,1,1,1,1,0,0,, -File_5=TSourceModule,'V:\dcef3-2704\src\cefgui.pas',0,1,1,1,1,0,0,, -File_6=TSourceModule,'V:\dcef3-2704\src\cefvcl.pas',0,1,1,1,1,0,0,, -File_7=TSourceModule,'V:\dcef3-2883\src\cefgui.pas',0,1,1,1,1,0,0,, -File_8=TSourceModule,'V:\dcef3-2883\src\cefvcl.pas',0,1,806,23,830,0,0,, -File_9=TSourceModule,'V:\2883\include\internal\cef_types.h',0,1,1,1,1,0,0,, +File_0=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas',0,1,1,34,49,0,0,, +File_1=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\cef.inc',0,1,1,22,128,0,0,, +File_2=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFv8Types.pas',0,1,1,1,1,0,0,, +File_3=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFv8Handler.pas',0,1,449,1,488,0,0,, +File_4=TSourceModule,'V:\dcef3-2883\src\ceflib.pas',0,1,40,30,70,0,0,, +File_5=TSourceModule,'V:\dcef3-2883\src\ceffmx.pas',0,1,1,9,30,0,0,, +File_6=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source_xe\uCEFChromium.pas',0,1,2691,1,2704,0,0,, +File_7=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFX509CertPrincipal.pas',0,1,63,1,82,0,0,, +File_8=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFXmlReader.pas',0,1,79,1,92,0,0,, [Modules] -Module0=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas +Module0=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas Module1=default.htm Count=2 EditWindowCount=1 -[C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas] +[C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas] ModuleType=TSourceModule FormState=0 FormOnTop=0 @@ -26,7 +25,7 @@ ModuleType=TURLModule [EditWindow0] ViewCount=2 -CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas +CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas View0=0 View1=1 PercentageSizes=1 @@ -48,10 +47,10 @@ TopPanelSize=0 LeftPanelSize=0 RightPanelSize=2000 RightPanelClients=DockSite2 -RightPanelData=00000800010000000000A12300000000000000D90A0000000000000100000000A123000009000000446F636B5369746532FFFFFFFF +RightPanelData=00000800010100000000AA1900000000000001D0070000000000000100000000A123000009000000446F636B5369746532FFFFFFFF BottomPanelSize=0 BottomPanelClients=DockSite1,MessageView -BottomPanelData=0000080001020200000009000000446F636B53697465310F0000004D65737361676556696577466F726D3B36000000000000022B0500000000000001000000003B3600000F0000004D65737361676556696577466F726DFFFFFFFF +BottomPanelData=0000080001020200000009000000446F636B53697465310F0000004D65737361676556696577466F726D1234000000000000022506000000000000FFFFFFFF BottomMiddlePanelSize=0 BottomMiddlePanelClients=DockSite0,GraphDrawingModel BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779D1D00000000000002F306000000000000FFFFFFFF @@ -64,14 +63,14 @@ WelcomePageURL=bds:/default.htm [View1] CustomEditViewType=TEditView -Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas -CursorX=74 -CursorY=280 -TopLine=234 +Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas +CursorX=76 +CursorY=2107 +TopLine=2077 LeftCol=1 Elisions= -Bookmarks={1,927,43}{2,565,24}{3,663,6} -EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas +Bookmarks= +EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas [Watches] Count=0 @@ -87,11 +86,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=807 +Height=1121 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=807 +ClientHeight=1121 TBDockHeight=213 LRDockWidth=13602 Dockable=1 @@ -152,14 +151,14 @@ Visible=0 Docked=1 State=0 Left=0 -Top=23 -Width=10000 -Height=1110 +Top=0 +Width=2773 +Height=1424 MaxLeft=-1 MaxTop=-1 -ClientWidth=10000 -ClientHeight=1110 -TBDockHeight=1110 +ClientWidth=2773 +ClientHeight=1424 +TBDockHeight=1424 LRDockWidth=2773 Dockable=1 StayOnTop=0 @@ -172,12 +171,12 @@ Docked=1 State=0 Left=0 Top=0 -Width=1875 -Height=6738 +Width=2000 +Height=4339 MaxLeft=-1 MaxTop=-1 -ClientWidth=1875 -ClientHeight=6738 +ClientWidth=2000 +ClientHeight=4339 TBDockHeight=7152 LRDockWidth=2000 Dockable=1 @@ -227,8 +226,8 @@ Create=1 Visible=0 Docked=1 State=0 -Left=-8 -Top=-30 +Left=-148 +Top=-137 Width=1844 Height=3139 MaxLeft=-1 @@ -284,14 +283,14 @@ Create=1 Visible=0 Docked=1 State=0 -Left=78 -Top=386 +Left=0 +Top=362 Width=1898 -Height=7164 +Height=5370 MaxLeft=-1 MaxTop=-1 -ClientWidth=1773 -ClientHeight=6738 +ClientWidth=1898 +ClientHeight=5370 TBDockHeight=7164 LRDockWidth=1898 Dockable=1 @@ -307,11 +306,11 @@ State=0 Left=0 Top=0 Width=2000 -Height=6816 +Height=6861 MaxLeft=-1 MaxTop=-1 ClientWidth=2000 -ClientHeight=6816 +ClientHeight=6861 TBDockHeight=5964 LRDockWidth=2508 Dockable=1 @@ -323,8 +322,8 @@ Create=1 Visible=0 Docked=1 State=0 -Left=-946 -Top=1 +Left=-898 +Top=-137 Width=2844 Height=6200 MaxLeft=-1 @@ -342,8 +341,8 @@ Create=1 Visible=0 Docked=1 State=0 -Left=-8 -Top=287 +Left=-1026 +Top=-137 Width=273 Height=359 MaxLeft=-1 @@ -367,11 +366,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=807 +Height=1121 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=807 +ClientHeight=1121 TBDockHeight=415 LRDockWidth=4953 Dockable=1 @@ -386,11 +385,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=807 +Height=1121 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=807 +ClientHeight=1121 TBDockHeight=213 LRDockWidth=7406 Dockable=1 @@ -409,11 +408,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=807 +Height=1121 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=807 +ClientHeight=1121 TBDockHeight=1536 LRDockWidth=3484 Dockable=1 @@ -428,11 +427,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=807 +Height=1121 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=807 +ClientHeight=1121 TBDockHeight=2063 LRDockWidth=3484 Dockable=1 @@ -447,11 +446,11 @@ State=0 Left=0 Top=0 Width=2336 -Height=942 +Height=1177 MaxLeft=-1 MaxTop=-1 ClientWidth=2336 -ClientHeight=942 +ClientHeight=1177 TBDockHeight=2321 LRDockWidth=2820 Dockable=1 @@ -512,11 +511,11 @@ State=0 Left=0 Top=0 Width=2000 -Height=6816 +Height=6861 MaxLeft=-1 MaxTop=-1 ClientWidth=2000 -ClientHeight=6816 +ClientHeight=6861 TBDockHeight=4888 LRDockWidth=7148 Dockable=1 @@ -528,8 +527,8 @@ Create=1 Visible=0 Docked=1 State=0 -Left=249 -Top=709 +Left=0 +Top=0 Width=2859 Height=3206 MaxLeft=-1 @@ -550,11 +549,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=807 +Height=1121 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=807 +ClientHeight=1121 TBDockHeight=1547 LRDockWidth=8742 Dockable=1 @@ -575,12 +574,12 @@ Docked=1 State=0 Left=0 Top=0 -Width=1773 -Height=6738 +Width=1898 +Height=9170 MaxLeft=-1 MaxTop=-1 -ClientWidth=1773 -ClientHeight=6738 +ClientWidth=1898 +ClientHeight=9170 TBDockHeight=3677 LRDockWidth=1898 Dockable=1 @@ -595,11 +594,11 @@ State=0 Left=0 Top=0 Width=2000 -Height=6816 +Height=6861 MaxLeft=-1 MaxTop=-1 ClientWidth=2000 -ClientHeight=6816 +ClientHeight=6861 TBDockHeight=4888 LRDockWidth=5305 Dockable=1 @@ -660,14 +659,14 @@ Visible=0 Docked=1 State=0 Left=0 -Top=23 +Top=0 Width=3820 -Height=1110 +Height=1424 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=1110 -TBDockHeight=1110 +ClientHeight=1424 +TBDockHeight=1424 LRDockWidth=3820 Dockable=1 StayOnTop=0 @@ -708,13 +707,13 @@ Visible=0 Docked=1 State=0 Left=0 -Top=0 +Top=23 Width=1898 -Height=7164 +Height=9170 MaxLeft=-1 MaxTop=-1 -ClientWidth=1773 -ClientHeight=6738 +ClientWidth=1898 +ClientHeight=9170 TBDockHeight=7164 LRDockWidth=1898 Dockable=1 @@ -732,13 +731,13 @@ Visible=0 Docked=1 State=0 Left=0 -Top=0 +Top=454 Width=2000 -Height=7164 +Height=4339 MaxLeft=-1 MaxTop=-1 -ClientWidth=1875 -ClientHeight=6738 +ClientWidth=2000 +ClientHeight=4339 TBDockHeight=7164 LRDockWidth=2000 Dockable=1 diff --git a/source/CEF4Delphi.identcache b/source/CEF4Delphi.identcache index 84aff8df2022740c0074b78c6dca6b051b680a11..eee7e6e57fe22503e3a3d14c1527c7d8d300d745 100644 GIT binary patch delta 274 zcmZ3Kv?ytVJj>*D27Z%ov8YX!XYrf7KuUfSYdzEC`GWqF1$5abyXXi^e$8Guc|Eh= zWDk9%$qur9n^$otu}+@P>9@ItPnj7g>o++;jeB#P&@MhIU8a|HAiVA^@lh+FSZPrpc#RxKSvXX(~<^+{b zOhC8fg50y2N8>aj*n!o$YG6ZDwd5w>lkuA@#V0bE4`|D50nW{g+BS@n-wBF?eXvNU x8?2CDmt(S*O3LQ&O2ucOzN zS; + * Web site : http://www.progdigy.com + * Repository : http://code.google.com/p/delphichromiumembedded/ + * Group : http://groups.google.com/group/delphichromiumembedded + *) + + {.$define CEF_STRING_TYPE_UTF8} +{$define CEF_STRING_TYPE_UTF16} +{.$define CEF_STRING_TYPE_WIDE} + +{.$DEFINE CEF_MULTI_THREADED_MESSAGE_LOOP} + + +{$DEFINE DELPHI_VERSION_UNKNOW} + +{$IFDEF FPC} + // force multithreading message loop on FPC, still not work + {$DEFINE CEF_MULTI_THREADED_MESSAGE_LOOP} + {$DEFINE SUPPORTS_INLINE} +{$ENDIF} + +{$IFDEF VER130} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} +{$ENDIF} + +{$IFDEF VER140} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} +{$ENDIF} + +{$IFDEF VER150} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} +{$ENDIF} + +{$IFDEF VER160} + // DELPHI 8 for Dotnet + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} +{$ENDIF} + +// Delphi 2005 +{$IFDEF VER170} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} +{$ENDIF} + +{$IFDEF VER180} + {$UNDEF DELPHI_VERSION_UNKNOW} + // Delphi 2007 + {$IFDEF VER185} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + // Delphi 2006 + {$ELSE} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$ENDIF} +{$ENDIF} + +// Delphi 2009 +{$IFDEF VER200} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} +{$ENDIF} + +//Delphi 2010 +{$IFDEF VER210} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} +{$ENDIF} + +// Delphi XE +{$IFDEF VER220} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} +{$ENDIF} + +{$IFDEF VER230} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} +{$ENDIF} + +{$IFDEF VER240} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} + {$DEFINE DELPHI17_UP} +{$ENDIF} + +{$IFDEF VER250} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} + {$DEFINE DELPHI17_UP} + {$DEFINE DELPHI18_UP} +{$ENDIF} + +// Delphi XE5 +{$IFDEF VER260} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} + {$DEFINE DELPHI17_UP} + {$DEFINE DELPHI18_UP} + {$DEFINE DELPHI19_UP} +{$ENDIF} + +// Delphi XE6 +{$IFDEF VER270} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} + {$DEFINE DELPHI17_UP} + {$DEFINE DELPHI18_UP} + {$DEFINE DELPHI19_UP} + {$DEFINE DELPHI20_UP} +{$ENDIF} + +// Delphi XE7 +{$IFDEF VER280} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} + {$DEFINE DELPHI17_UP} + {$DEFINE DELPHI18_UP} + {$DEFINE DELPHI19_UP} + {$DEFINE DELPHI20_UP} + {$DEFINE DELPHI21_UP} +{$ENDIF} + +{$IFDEF VER290} // RAD Studio XE8 + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} + {$DEFINE DELPHI17_UP} + {$DEFINE DELPHI18_UP} + {$DEFINE DELPHI19_UP} + {$DEFINE DELPHI20_UP} + {$DEFINE DELPHI21_UP} + {$DEFINE DELPHI22_UP} +{$ENDIF VER290} + +// Rad Studio 10 +{$IFDEF VER300} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} + {$DEFINE DELPHI17_UP} + {$DEFINE DELPHI18_UP} + {$DEFINE DELPHI19_UP} + {$DEFINE DELPHI20_UP} + {$DEFINE DELPHI21_UP} + {$DEFINE DELPHI22_UP} + {$DEFINE DELPHI23_UP} +{$ENDIF} + +// Rad Studio 10.1 +{$IFDEF VER310} + {$UNDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} + {$DEFINE DELPHI17_UP} + {$DEFINE DELPHI18_UP} + {$DEFINE DELPHI19_UP} + {$DEFINE DELPHI20_UP} + {$DEFINE DELPHI21_UP} + {$DEFINE DELPHI22_UP} + {$DEFINE DELPHI23_UP} + {$DEFINE DELPHI24_UP} +{$ENDIF} + + +{$IFDEF DELPHI_VERSION_UNKNOW} + {$DEFINE DELPHI5_UP} + {$DEFINE DELPHI6_UP} + {$DEFINE DELPHI7_UP} + {$DEFINE DELPHI8_UP} + {$DEFINE DELPHI9_UP} + {$DEFINE DELPHI10_UP} + {$DEFINE DELPHI11_UP} + {$DEFINE DELPHI12_UP} + {$DEFINE DELPHI14_UP} + {$DEFINE DELPHI15_UP} + {$DEFINE DELPHI16_UP} + {$DEFINE DELPHI17_UP} + {$DEFINE DELPHI18_UP} + {$DEFINE DELPHI19_UP} + {$DEFINE DELPHI20_UP} + {$DEFINE DELPHI21_UP} + {$DEFINE DELPHI22_UP} + {$DEFINE DELPHI23_UP} + {$DEFINE DELPHI24_UP} +{$ENDIF} + +{$IFDEF DELPHI9_UP} + {$DEFINE SUPPORTS_INLINE} +{$ENDIF} + diff --git a/source/uCEFApplication.pas b/source/uCEFApplication.pas index 51b5f6c3..99020292 100644 --- a/source/uCEFApplication.pas +++ b/source/uCEFApplication.pas @@ -42,10 +42,16 @@ unit uCEFApplication; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, + {$ELSE} + Windows, + {$ENDIF} uCEFTypes, uCEFInterfaces, uCEFBase; type @@ -249,7 +255,11 @@ var implementation uses + {$IFDEF DELPHI16_UP} System.Math, System.IOUtils, System.SysUtils, + {$ELSE} + Math, IOUtils, SysUtils, + {$ENDIF} uCEFLibFunctions, uCEFMiscFunctions, uCEFSchemeRegistrar, uCEFCommandLine; const @@ -575,7 +585,7 @@ var TempArgs : TCefMainArgs; begin TempArgs.instance := HINSTANCE; - Result := cef_execute_process(@TempArgs, CefGetData(FAppIntf), FWindowsSandboxInfo); + Result := cef_execute_process(@TempArgs, FApp.Wrap, FWindowsSandboxInfo); end; procedure TCefApplication.InitializeSettings(var aSettings : TCefSettings); @@ -622,7 +632,7 @@ begin if FDeleteCookies and (length(FCookies) > 0) then TDirectory.Delete(FCookies, True); InitializeSettings(TempSettings); - Result := (cef_initialize(@HInstance, @TempSettings, CefGetData(FAppIntf), FWindowsSandboxInfo) <> 0); + Result := (cef_initialize(@HInstance, @TempSettings, FApp.Wrap, FWindowsSandboxInfo) <> 0); except on e : exception do begin diff --git a/source/uCEFAuthCallback.pas b/source/uCEFAuthCallback.pas index fdc058ce..df44277a 100644 --- a/source/uCEFAuthCallback.pas +++ b/source/uCEFAuthCallback.pas @@ -42,6 +42,8 @@ unit uCEFAuthCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFBase.pas b/source/uCEFBase.pas index e40810df..f41772be 100644 --- a/source/uCEFBase.pas +++ b/source/uCEFBase.pas @@ -42,6 +42,8 @@ unit uCEFBase; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFBeforeDownloadCallback.pas b/source/uCEFBeforeDownloadCallback.pas index c8af7e1b..2efb884a 100644 --- a/source/uCEFBeforeDownloadCallback.pas +++ b/source/uCEFBeforeDownloadCallback.pas @@ -42,6 +42,8 @@ unit uCEFBeforeDownloadCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFBinaryValue.pas b/source/uCEFBinaryValue.pas index ba53d094..ad7b6c2d 100644 --- a/source/uCEFBinaryValue.pas +++ b/source/uCEFBinaryValue.pas @@ -42,6 +42,8 @@ unit uCEFBinaryValue; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFBrowser.pas b/source/uCEFBrowser.pas index baf9ef46..c91a793a 100644 --- a/source/uCEFBrowser.pas +++ b/source/uCEFBrowser.pas @@ -42,10 +42,16 @@ unit uCEFBrowser; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFBrowserProcessHandler.pas b/source/uCEFBrowserProcessHandler.pas index 60561bbc..6ea1df94 100644 --- a/source/uCEFBrowserProcessHandler.pas +++ b/source/uCEFBrowserProcessHandler.pas @@ -42,6 +42,8 @@ unit uCEFBrowserProcessHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFCallback.pas b/source/uCEFCallback.pas index 6c14ed7a..7dca761e 100644 --- a/source/uCEFCallback.pas +++ b/source/uCEFCallback.pas @@ -42,6 +42,8 @@ unit uCEFCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFChromium.pas b/source/uCEFChromium.pas index b30f21bf..08ab9177 100644 --- a/source/uCEFChromium.pas +++ b/source/uCEFChromium.pas @@ -42,10 +42,16 @@ unit uCEFChromium; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, WinApi.Messages, System.Classes, Vcl.Controls, Vcl.Graphics, Vcl.Forms, + {$ELSE} + Windows, Messages, Classes, Controls, Graphics, Forms, + {$ENDIF} uCEFTypes, uCEFInterfaces, uCEFLibFunctions, uCEFMiscFunctions, uCEFClient, uCEFPDFPrintCallback, uCEFStringVisitor, uCEFConstants, uCEFTask, uCEFDeleteCookiesCallback, uCEFDomVisitor, uCEFChromiumEvents, @@ -233,8 +239,8 @@ type procedure SetWindowlessFrameRate(aValue : integer); - function CreateBrowserHost(aWindowInfo : PCefWindowInfo; const aClient : ICefClient; const aURL : ustring; const aSettings : PCefBrowserSettings; const aContext : ICefRequestContext): Boolean; - function CreateBrowserHostSync(aWindowInfo : PCefWindowInfo; const aClient : ICefClient; const aURL : ustring; const aSettings : PCefBrowserSettings; const aContext : ICefRequestContext): ICefBrowser; + function CreateBrowserHost(aWindowInfo : PCefWindowInfo; const aURL : ustring; const aSettings : PCefBrowserSettings; const aContext : ICefRequestContext): Boolean; + function CreateBrowserHostSync(aWindowInfo : PCefWindowInfo; const aURL : ustring; const aSettings : PCefBrowserSettings; const aContext : ICefRequestContext): ICefBrowser; procedure InitializeEvents; procedure InitializeSettings(var aSettings : TCefBrowserSettings); @@ -582,7 +588,11 @@ type implementation uses + {$IFDEF DELPHI16_UP} System.SysUtils, System.Math, + {$ELSE} + SysUtils, Math, + {$ENDIF} uCEFBrowser, uCEFValue, uCEFDictionaryValue, uCEFStringMultimap, uCEFCookieManager, uCEFFrame, uCEFApplication; @@ -708,7 +718,7 @@ begin Result := False; try - if (FHandler = nil) then + if (FClientHandler = nil) then begin FIsOSR := aIsOsr; FClientHandler := TVCLClientHandler.Create(Self, FIsOSR); @@ -851,10 +861,10 @@ begin if MultithreadApp then - Result := CreateBrowserHost(@TempInfo, FHandler, FDefaultUrl, @TempSettings, nil) + Result := CreateBrowserHost(@TempInfo, FDefaultUrl, @TempSettings, nil) else begin - FBrowser := CreateBrowserHostSync(@TempInfo, FHandler, FDefaultUrl, @TempSettings, nil); + FBrowser := CreateBrowserHostSync(@TempInfo, FDefaultUrl, @TempSettings, nil); if (FBrowser <> nil) then begin @@ -879,7 +889,6 @@ begin end; function TChromium.CreateBrowserHost(aWindowInfo : PCefWindowInfo; - const aClient : ICefClient; const aURL : ustring; const aSettings : PCefBrowserSettings; const aContext : ICefRequestContext): Boolean; @@ -887,11 +896,10 @@ var TempURL : TCefString; begin TempURL := CefString(aURL); - Result := cef_browser_host_create_browser(aWindowInfo, CefGetData(aClient), @TempURL, aSettings, CefGetData(aContext)) <> 0; + Result := cef_browser_host_create_browser(aWindowInfo, FClientHandler.Wrap, @TempURL, aSettings, CefGetData(aContext)) <> 0; end; function TChromium.CreateBrowserHostSync(aWindowInfo : PCefWindowInfo; - const aClient : ICefClient; const aURL : ustring; const aSettings : PCefBrowserSettings; const aContext : ICefRequestContext): ICefBrowser; @@ -900,7 +908,7 @@ var TempBrowser : PCefBrowser; begin TempURL := CefString(aURL); - TempBrowser := cef_browser_host_create_browser_sync(aWindowInfo, CefGetData(aClient), @TempURL, aSettings, CefGetData(aContext)); + TempBrowser := cef_browser_host_create_browser_sync(aWindowInfo, FClientHandler.Wrap, @TempURL, aSettings, CefGetData(aContext)); Result := TCefBrowserRef.UnWrap(TempBrowser); end; @@ -2092,8 +2100,16 @@ procedure TChromium.CloseDevTools(const aDevTools : TWinControl); begin if Initialized then begin - if (aDevTools <> nil) then WinApi.Windows.SetParent(GetWindow(aDevTools.Handle, GW_CHILD), 0); - if (FBrowser <> nil) then FBrowser.Host.CloseDevTools; + if (aDevTools <> nil) then + begin + {$IFDEF DELPHI16_UP} + WinApi.Windows.SetParent(GetWindow(aDevTools.Handle, GW_CHILD), 0); + {$ELSE} + Windows.SetParent(GetWindow(aDevTools.Handle, GW_CHILD), 0); + {$ENDIF} + end; + + if (FBrowser <> nil) then FBrowser.Host.CloseDevTools; end; end; @@ -2714,10 +2730,10 @@ begin begin TempRect.Left := min(max(x, max(screen.DesktopLeft, 0)), screen.DesktopWidth - TempForm.Width); TempRect.Top := min(max(y, max(screen.DesktopTop, 0)), screen.DesktopHeight - TempForm.Height); - TempRect.Width := TempForm.Width; - TempRect.Height := TempForm.Height; + TempRect.Right := TempRect.Left + TempForm.Width - 1; + TempRect.Bottom := TempRect.Top + TempForm.Height - 1; - TempForm.SetBounds(TempRect.Left, TempRect.Top, TempRect.Width, TempRect.Height); + TempForm.SetBounds(TempRect.Left, TempRect.Top, TempRect.Right - TempRect.Left + 1, TempRect.Bottom - TempRect.Top + 1); end; end; @@ -2732,10 +2748,10 @@ begin begin TempRect.Left := min(max(TempForm.Left + x, max(screen.DesktopLeft, 0)), screen.DesktopWidth - TempForm.Width); TempRect.Top := min(max(TempForm.Top + y, max(screen.DesktopTop, 0)), screen.DesktopHeight - TempForm.Height); - TempRect.Width := TempForm.Width; - TempRect.Height := TempForm.Height; + TempRect.Right := TempRect.Left + TempForm.Width - 1; + TempRect.Bottom := TempRect.Top + TempForm.Height - 1; - TempForm.SetBounds(TempRect.Left, TempRect.Top, TempRect.Width, TempRect.Height); + TempForm.SetBounds(TempRect.Left, TempRect.Top, TempRect.Right - TempRect.Left + 1, TempRect.Bottom - TempRect.Top + 1); end; end; diff --git a/source/uCEFChromiumEvents.pas b/source/uCEFChromiumEvents.pas index a971b0dd..1ee9ce1d 100644 --- a/source/uCEFChromiumEvents.pas +++ b/source/uCEFChromiumEvents.pas @@ -42,10 +42,16 @@ unit uCEFChromiumEvents; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFTypes, uCEFInterfaces; type diff --git a/source/uCEFChromiumFontOptions.pas b/source/uCEFChromiumFontOptions.pas index 03ca8e1d..7b03906c 100644 --- a/source/uCEFChromiumFontOptions.pas +++ b/source/uCEFChromiumFontOptions.pas @@ -42,10 +42,16 @@ unit uCEFChromiumFontOptions; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFTypes; type diff --git a/source/uCEFChromiumOptions.pas b/source/uCEFChromiumOptions.pas index a79967c0..21979de1 100644 --- a/source/uCEFChromiumOptions.pas +++ b/source/uCEFChromiumOptions.pas @@ -42,10 +42,16 @@ unit uCEFChromiumOptions; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFTypes; type diff --git a/source/uCEFChromiumWindow.pas b/source/uCEFChromiumWindow.pas index 9392e3e6..8547662e 100644 --- a/source/uCEFChromiumWindow.pas +++ b/source/uCEFChromiumWindow.pas @@ -42,10 +42,16 @@ unit uCEFChromiumWindow; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, System.Classes, WinApi.Messages, + {$ELSE} + Windows, Classes, Messages, + {$ENDIF} uCEFWindowParent, uCEFChromium, uCEFInterfaces, uCEFConstants; type @@ -76,7 +82,11 @@ type implementation uses + {$IFDEF DELPHI16_UP} System.SysUtils; + {$ELSE} + SysUtils; + {$ENDIF} constructor TChromiumWindow.Create(AOwner: TComponent); begin diff --git a/source/uCEFClient.pas b/source/uCEFClient.pas index 2a064af3..b9daf167 100644 --- a/source/uCEFClient.pas +++ b/source/uCEFClient.pas @@ -42,10 +42,16 @@ unit uCEFClient; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, + {$ELSE} + Windows, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type @@ -126,7 +132,11 @@ type implementation uses + {$IFDEF DELPHI16_UP} System.SysUtils, + {$ELSE} + SysUtils, + {$ENDIF} uCEFMiscFunctions, uCEFLibFunctions, uCEFProcessMessage, uCEFBrowser, uCEFLoadHandler, uCEFFocusHandler, uCEFContextMenuHandler, uCEFDialogHandler, uCEFKeyboardHandler, uCEFDisplayHandler, uCEFDownloadHandler, uCEFGeolocationHandler, uCEFJsDialogHandler, diff --git a/source/uCEFCommandLine.pas b/source/uCEFCommandLine.pas index 7fc9bc40..535fccfc 100644 --- a/source/uCEFCommandLine.pas +++ b/source/uCEFCommandLine.pas @@ -42,10 +42,16 @@ unit uCEFCommandLine; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFTypes, uCEFInterfaces; type diff --git a/source/uCEFCompletionCallback.pas b/source/uCEFCompletionCallback.pas index e0853e18..598c7288 100644 --- a/source/uCEFCompletionCallback.pas +++ b/source/uCEFCompletionCallback.pas @@ -42,6 +42,8 @@ unit uCEFCompletionCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFConstants.pas b/source/uCEFConstants.pas index d6d3456e..68fe0bac 100644 --- a/source/uCEFConstants.pas +++ b/source/uCEFConstants.pas @@ -42,10 +42,16 @@ unit uCEFConstants; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} Winapi.Messages; + {$ELSE} + Messages; + {$ENDIF} const // /include/internal/cef_types.h (cef_errorcode_t) diff --git a/source/uCEFContextMenuHandler.pas b/source/uCEFContextMenuHandler.pas index 47696305..94259e00 100644 --- a/source/uCEFContextMenuHandler.pas +++ b/source/uCEFContextMenuHandler.pas @@ -42,6 +42,8 @@ unit uCEFContextMenuHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFContextMenuParams.pas b/source/uCEFContextMenuParams.pas index 903046b2..9d7859ff 100644 --- a/source/uCEFContextMenuParams.pas +++ b/source/uCEFContextMenuParams.pas @@ -42,10 +42,16 @@ unit uCEFContextMenuParams; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFCookieManager.pas b/source/uCEFCookieManager.pas index f57a6280..47237a69 100644 --- a/source/uCEFCookieManager.pas +++ b/source/uCEFCookieManager.pas @@ -42,10 +42,16 @@ unit uCEFCookieManager; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFCookieVisitor.pas b/source/uCEFCookieVisitor.pas index dd0b11a6..9d66cd52 100644 --- a/source/uCEFCookieVisitor.pas +++ b/source/uCEFCookieVisitor.pas @@ -42,6 +42,8 @@ unit uCEFCookieVisitor; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFCustomStreamReader.pas b/source/uCEFCustomStreamReader.pas index ae74c6e3..9a40401f 100644 --- a/source/uCEFCustomStreamReader.pas +++ b/source/uCEFCustomStreamReader.pas @@ -42,10 +42,16 @@ unit uCEFCustomStreamReader; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, System.SysUtils, + {$ELSE} + Classes, SysUtils, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFDeleteCookiesCallback.pas b/source/uCEFDeleteCookiesCallback.pas index f033ed2f..f54fba03 100644 --- a/source/uCEFDeleteCookiesCallback.pas +++ b/source/uCEFDeleteCookiesCallback.pas @@ -42,6 +42,8 @@ unit uCEFDeleteCookiesCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFDialogHandler.pas b/source/uCEFDialogHandler.pas index f6186bc5..2d8e8080 100644 --- a/source/uCEFDialogHandler.pas +++ b/source/uCEFDialogHandler.pas @@ -42,10 +42,16 @@ unit uCEFDialogHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFDictionaryValue.pas b/source/uCEFDictionaryValue.pas index 976c0037..b00ec729 100644 --- a/source/uCEFDictionaryValue.pas +++ b/source/uCEFDictionaryValue.pas @@ -42,10 +42,16 @@ unit uCEFDictionaryValue; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFDisplayHandler.pas b/source/uCEFDisplayHandler.pas index 6067f04b..4f1cfabd 100644 --- a/source/uCEFDisplayHandler.pas +++ b/source/uCEFDisplayHandler.pas @@ -42,10 +42,16 @@ unit uCEFDisplayHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFDomDocument.pas b/source/uCEFDomDocument.pas index 772dc80b..43632a38 100644 --- a/source/uCEFDomDocument.pas +++ b/source/uCEFDomDocument.pas @@ -42,6 +42,8 @@ unit uCEFDomDocument; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFDomNode.pas b/source/uCEFDomNode.pas index b4c3de92..75244625 100644 --- a/source/uCEFDomNode.pas +++ b/source/uCEFDomNode.pas @@ -42,6 +42,8 @@ unit uCEFDomNode; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFDomVisitor.pas b/source/uCEFDomVisitor.pas index 034c30bf..0314007d 100644 --- a/source/uCEFDomVisitor.pas +++ b/source/uCEFDomVisitor.pas @@ -42,6 +42,8 @@ unit uCEFDomVisitor; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFDownLoadItem.pas b/source/uCEFDownLoadItem.pas index 60588d29..e953e904 100644 --- a/source/uCEFDownLoadItem.pas +++ b/source/uCEFDownLoadItem.pas @@ -42,6 +42,8 @@ unit uCEFDownLoadItem; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFDownloadHandler.pas b/source/uCEFDownloadHandler.pas index b6ecb2db..be7a035a 100644 --- a/source/uCEFDownloadHandler.pas +++ b/source/uCEFDownloadHandler.pas @@ -42,6 +42,8 @@ unit uCEFDownloadHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFDownloadImageCallBack.pas b/source/uCEFDownloadImageCallBack.pas index 2df2783c..681fbbfe 100644 --- a/source/uCEFDownloadImageCallBack.pas +++ b/source/uCEFDownloadImageCallBack.pas @@ -42,6 +42,8 @@ unit uCEFDownloadImageCallBack; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFDownloadItemCallback.pas b/source/uCEFDownloadItemCallback.pas index e3b61704..39356779 100644 --- a/source/uCEFDownloadItemCallback.pas +++ b/source/uCEFDownloadItemCallback.pas @@ -42,6 +42,8 @@ unit uCEFDownloadItemCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFDragData.pas b/source/uCEFDragData.pas index 89e9a272..db0c6c29 100644 --- a/source/uCEFDragData.pas +++ b/source/uCEFDragData.pas @@ -42,10 +42,16 @@ unit uCEFDragData; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFDragHandler.pas b/source/uCEFDragHandler.pas index e1be1017..dadef26a 100644 --- a/source/uCEFDragHandler.pas +++ b/source/uCEFDragHandler.pas @@ -42,6 +42,8 @@ unit uCEFDragHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFEndTracingCallback.pas b/source/uCEFEndTracingCallback.pas index 0f17f69c..25ec7519 100644 --- a/source/uCEFEndTracingCallback.pas +++ b/source/uCEFEndTracingCallback.pas @@ -42,6 +42,8 @@ unit uCEFEndTracingCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFFileDialogCallback.pas b/source/uCEFFileDialogCallback.pas index 0e069d84..75232734 100644 --- a/source/uCEFFileDialogCallback.pas +++ b/source/uCEFFileDialogCallback.pas @@ -42,10 +42,16 @@ unit uCEFFileDialogCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFFindHandler.pas b/source/uCEFFindHandler.pas index 47dabd7f..8b031173 100644 --- a/source/uCEFFindHandler.pas +++ b/source/uCEFFindHandler.pas @@ -42,6 +42,8 @@ unit uCEFFindHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFFocusHandler.pas b/source/uCEFFocusHandler.pas index 82a8f2e5..be76a410 100644 --- a/source/uCEFFocusHandler.pas +++ b/source/uCEFFocusHandler.pas @@ -42,6 +42,8 @@ unit uCEFFocusHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFFrame.pas b/source/uCEFFrame.pas index e442aad9..7d590eba 100644 --- a/source/uCEFFrame.pas +++ b/source/uCEFFrame.pas @@ -42,10 +42,12 @@ unit uCEFFrame; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses - uCEFBAse, uCEFInterfaces, uCEFTypes; + uCEFBase, uCEFInterfaces, uCEFTypes; type TCefFrameRef = class(TCefBaseRef, ICefFrame) diff --git a/source/uCEFGeolocationCallback.pas b/source/uCEFGeolocationCallback.pas index 4fdd7506..d08ebd8a 100644 --- a/source/uCEFGeolocationCallback.pas +++ b/source/uCEFGeolocationCallback.pas @@ -42,6 +42,8 @@ unit uCEFGeolocationCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFGeolocationHandler.pas b/source/uCEFGeolocationHandler.pas index 45021f19..024d9214 100644 --- a/source/uCEFGeolocationHandler.pas +++ b/source/uCEFGeolocationHandler.pas @@ -42,6 +42,8 @@ unit uCEFGeolocationHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFGetGeolocationCallback.pas b/source/uCEFGetGeolocationCallback.pas index 5895c9c5..1ba2e80a 100644 --- a/source/uCEFGetGeolocationCallback.pas +++ b/source/uCEFGetGeolocationCallback.pas @@ -42,6 +42,8 @@ unit uCEFGetGeolocationCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFImage.pas b/source/uCEFImage.pas index fd236c7c..4dd216dc 100644 --- a/source/uCEFImage.pas +++ b/source/uCEFImage.pas @@ -42,10 +42,16 @@ unit uCEFImage; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, + {$ELSE} + Windows, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFInterfaces.pas b/source/uCEFInterfaces.pas index 2e60def1..a96b0884 100644 --- a/source/uCEFInterfaces.pas +++ b/source/uCEFInterfaces.pas @@ -42,10 +42,16 @@ unit uCEFInterfaces; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, System.Classes, + {$ELSE} + Windows, Classes, + {$ENDIF} uCEFTypes; type diff --git a/source/uCEFJsDialogCallback.pas b/source/uCEFJsDialogCallback.pas index 8bd2456a..764d424d 100644 --- a/source/uCEFJsDialogCallback.pas +++ b/source/uCEFJsDialogCallback.pas @@ -42,6 +42,8 @@ unit uCEFJsDialogCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFJsDialogHandler.pas b/source/uCEFJsDialogHandler.pas index 53ff4ea9..149472b0 100644 --- a/source/uCEFJsDialogHandler.pas +++ b/source/uCEFJsDialogHandler.pas @@ -42,6 +42,8 @@ unit uCEFJsDialogHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFKeyboardHandler.pas b/source/uCEFKeyboardHandler.pas index 3917baad..82fad1cd 100644 --- a/source/uCEFKeyboardHandler.pas +++ b/source/uCEFKeyboardHandler.pas @@ -42,6 +42,8 @@ unit uCEFKeyboardHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFLibFunctions.pas b/source/uCEFLibFunctions.pas index f7ed3fe5..0ea74cd5 100644 --- a/source/uCEFLibFunctions.pas +++ b/source/uCEFLibFunctions.pas @@ -42,10 +42,16 @@ unit uCEFLibFunctions; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, System.Math, + {$ELSE} + Windows, Math, + {$ENDIF} uCEFTypes; var diff --git a/source/uCEFLifeSpanHandler.pas b/source/uCEFLifeSpanHandler.pas index 67361b61..a440dc7d 100644 --- a/source/uCEFLifeSpanHandler.pas +++ b/source/uCEFLifeSpanHandler.pas @@ -42,6 +42,8 @@ unit uCEFLifeSpanHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFListValue.pas b/source/uCEFListValue.pas index c15042a1..8015cc8c 100644 --- a/source/uCEFListValue.pas +++ b/source/uCEFListValue.pas @@ -42,6 +42,8 @@ unit uCEFListValue; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFLoadHandler.pas b/source/uCEFLoadHandler.pas index 26647477..4693bc76 100644 --- a/source/uCEFLoadHandler.pas +++ b/source/uCEFLoadHandler.pas @@ -42,6 +42,8 @@ unit uCEFLoadHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFMenuModel.pas b/source/uCEFMenuModel.pas index dddad037..6a8f21cf 100644 --- a/source/uCEFMenuModel.pas +++ b/source/uCEFMenuModel.pas @@ -42,6 +42,8 @@ unit uCEFMenuModel; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFMenuModelDelegate.pas b/source/uCEFMenuModelDelegate.pas index 8855202d..f0bcd7f4 100644 --- a/source/uCEFMenuModelDelegate.pas +++ b/source/uCEFMenuModelDelegate.pas @@ -42,6 +42,8 @@ unit uCEFMenuModelDelegate; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFMiscFunctions.pas b/source/uCEFMiscFunctions.pas index 84cc2780..0e9610ad 100644 --- a/source/uCEFMiscFunctions.pas +++ b/source/uCEFMiscFunctions.pas @@ -42,10 +42,16 @@ unit uCEFMiscFunctions; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, System.Classes, System.SysUtils, + {$ELSE} + Windows, Classes, SysUtils, + {$ENDIF} uCEFTypes, uCEFInterfaces, uCEFLibFunctions; const diff --git a/source/uCEFNavigationEntry.pas b/source/uCEFNavigationEntry.pas index e3c0c248..2b1e494c 100644 --- a/source/uCEFNavigationEntry.pas +++ b/source/uCEFNavigationEntry.pas @@ -42,6 +42,8 @@ unit uCEFNavigationEntry; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFNavigationEntryVisitor.pas b/source/uCEFNavigationEntryVisitor.pas index 1aac5025..c906ca56 100644 --- a/source/uCEFNavigationEntryVisitor.pas +++ b/source/uCEFNavigationEntryVisitor.pas @@ -42,6 +42,8 @@ unit uCEFNavigationEntryVisitor; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFPDFPrintCallback.pas b/source/uCEFPDFPrintCallback.pas index 6de30cb9..d0338fee 100644 --- a/source/uCEFPDFPrintCallback.pas +++ b/source/uCEFPDFPrintCallback.pas @@ -42,6 +42,8 @@ unit uCEFPDFPrintCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFPDFPrintOptions.pas b/source/uCEFPDFPrintOptions.pas index 92cbe89a..4e5b1931 100644 --- a/source/uCEFPDFPrintOptions.pas +++ b/source/uCEFPDFPrintOptions.pas @@ -42,10 +42,16 @@ unit uCEFPDFPrintOptions; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFTypes; type diff --git a/source/uCEFPostData.pas b/source/uCEFPostData.pas index ddd67581..c8e460a7 100644 --- a/source/uCEFPostData.pas +++ b/source/uCEFPostData.pas @@ -42,10 +42,16 @@ unit uCEFPostData; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFPostDataElement.pas b/source/uCEFPostDataElement.pas index f001ac0a..0193e6c0 100644 --- a/source/uCEFPostDataElement.pas +++ b/source/uCEFPostDataElement.pas @@ -42,6 +42,8 @@ unit uCEFPostDataElement; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFPrintSettings.pas b/source/uCEFPrintSettings.pas index ea6ca54e..55aff94e 100644 --- a/source/uCEFPrintSettings.pas +++ b/source/uCEFPrintSettings.pas @@ -42,6 +42,8 @@ unit uCEFPrintSettings; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFProcessMessage.pas b/source/uCEFProcessMessage.pas index f2fc87c6..e097374a 100644 --- a/source/uCEFProcessMessage.pas +++ b/source/uCEFProcessMessage.pas @@ -42,6 +42,8 @@ unit uCEFProcessMessage; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFRegisterCDMCallback.pas b/source/uCEFRegisterCDMCallback.pas index 7b57818b..5ea77462 100644 --- a/source/uCEFRegisterCDMCallback.pas +++ b/source/uCEFRegisterCDMCallback.pas @@ -42,6 +42,8 @@ unit uCEFRegisterCDMCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFRegisterComponents.pas b/source/uCEFRegisterComponents.pas index 9e24bb66..aa4e4c59 100644 --- a/source/uCEFRegisterComponents.pas +++ b/source/uCEFRegisterComponents.pas @@ -39,16 +39,21 @@ unit uCEFRegisterComponents; {$R chromium.dcr} +{$I cef.inc} + interface procedure Register; implementation + uses + {$IFDEF DELPHI16_UP} System.Classes, - uCEFChromium, - uCEFWindowParent, - uCEFChromiumWindow; + {$ELSE} + Classes, + {$ENDIF} + uCEFChromium, uCEFWindowParent, uCEFChromiumWindow; procedure Register; begin diff --git a/source/uCEFRenderHandler.pas b/source/uCEFRenderHandler.pas index 45e007f2..4ca7c392 100644 --- a/source/uCEFRenderHandler.pas +++ b/source/uCEFRenderHandler.pas @@ -42,6 +42,8 @@ unit uCEFRenderHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFRenderProcessHandler.pas b/source/uCEFRenderProcessHandler.pas index 2309f791..3185ebe0 100644 --- a/source/uCEFRenderProcessHandler.pas +++ b/source/uCEFRenderProcessHandler.pas @@ -42,6 +42,8 @@ unit uCEFRenderProcessHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFRequest.pas b/source/uCEFRequest.pas index 9fb4ffff..dd4bf3c2 100644 --- a/source/uCEFRequest.pas +++ b/source/uCEFRequest.pas @@ -42,6 +42,8 @@ unit uCEFRequest; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFRequestCallback.pas b/source/uCEFRequestCallback.pas index 138ccbb3..ac0da2c1 100644 --- a/source/uCEFRequestCallback.pas +++ b/source/uCEFRequestCallback.pas @@ -42,6 +42,8 @@ unit uCEFRequestCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFRequestContext.pas b/source/uCEFRequestContext.pas index 08684480..4137cf07 100644 --- a/source/uCEFRequestContext.pas +++ b/source/uCEFRequestContext.pas @@ -42,10 +42,16 @@ unit uCEFRequestContext; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFRequestContextHandler.pas b/source/uCEFRequestContextHandler.pas index 39e20fdc..220b3314 100644 --- a/source/uCEFRequestContextHandler.pas +++ b/source/uCEFRequestContextHandler.pas @@ -42,6 +42,8 @@ unit uCEFRequestContextHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFRequestHandler.pas b/source/uCEFRequestHandler.pas index 46045987..a40c6111 100644 --- a/source/uCEFRequestHandler.pas +++ b/source/uCEFRequestHandler.pas @@ -42,6 +42,8 @@ unit uCEFRequestHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses @@ -100,7 +102,11 @@ type implementation uses + {$IFDEF DELPHI16_UP} WinApi.Windows, System.SysUtils, + {$ELSE} + Windows, SysUtils, + {$ENDIF} uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCEFRequestCallback, uCEFResponse, uCEFAuthCallback, uCEFSslInfo, uCEFSelectClientCertificateCallback, uCEFX509Certificate; diff --git a/source/uCEFResolveCallback.pas b/source/uCEFResolveCallback.pas index bb8b4d4a..db10c07a 100644 --- a/source/uCEFResolveCallback.pas +++ b/source/uCEFResolveCallback.pas @@ -42,10 +42,16 @@ unit uCEFResolveCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFResourceBundle.pas b/source/uCEFResourceBundle.pas index 9ff4aedf..a9fc5250 100644 --- a/source/uCEFResourceBundle.pas +++ b/source/uCEFResourceBundle.pas @@ -42,6 +42,8 @@ unit uCEFResourceBundle; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFResourceBundleHandler.pas b/source/uCEFResourceBundleHandler.pas index 9458bb6b..805d8b38 100644 --- a/source/uCEFResourceBundleHandler.pas +++ b/source/uCEFResourceBundleHandler.pas @@ -42,6 +42,8 @@ unit uCEFResourceBundleHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFResourceHandler.pas b/source/uCEFResourceHandler.pas index e37cd3f3..8e703f36 100644 --- a/source/uCEFResourceHandler.pas +++ b/source/uCEFResourceHandler.pas @@ -42,6 +42,8 @@ unit uCEFResourceHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFResponse.pas b/source/uCEFResponse.pas index 23b60537..997c9b8e 100644 --- a/source/uCEFResponse.pas +++ b/source/uCEFResponse.pas @@ -42,6 +42,8 @@ unit uCEFResponse; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFResponseFilter.pas b/source/uCEFResponseFilter.pas index bacf159c..33f168ab 100644 --- a/source/uCEFResponseFilter.pas +++ b/source/uCEFResponseFilter.pas @@ -42,6 +42,8 @@ unit uCEFResponseFilter; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFRunContextMenuCallback.pas b/source/uCEFRunContextMenuCallback.pas index 33192384..2b2b6c35 100644 --- a/source/uCEFRunContextMenuCallback.pas +++ b/source/uCEFRunContextMenuCallback.pas @@ -42,6 +42,8 @@ unit uCEFRunContextMenuCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFRunFileDialogCallback.pas b/source/uCEFRunFileDialogCallback.pas index db26374c..0a761bf8 100644 --- a/source/uCEFRunFileDialogCallback.pas +++ b/source/uCEFRunFileDialogCallback.pas @@ -42,10 +42,16 @@ unit uCEFRunFileDialogCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces; type diff --git a/source/uCEFSSLStatus.pas b/source/uCEFSSLStatus.pas index 584daf9f..59264c39 100644 --- a/source/uCEFSSLStatus.pas +++ b/source/uCEFSSLStatus.pas @@ -42,10 +42,16 @@ unit uCEFSSLStatus; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFSchemeHandlerFactory.pas b/source/uCEFSchemeHandlerFactory.pas index df37e53c..30807ac4 100644 --- a/source/uCEFSchemeHandlerFactory.pas +++ b/source/uCEFSchemeHandlerFactory.pas @@ -42,6 +42,8 @@ unit uCEFSchemeHandlerFactory; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFSchemeRegistrar.pas b/source/uCEFSchemeRegistrar.pas index 24ad96e2..d325e8f9 100644 --- a/source/uCEFSchemeRegistrar.pas +++ b/source/uCEFSchemeRegistrar.pas @@ -42,6 +42,8 @@ unit uCEFSchemeRegistrar; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFSelectClientCertificateCallback.pas b/source/uCEFSelectClientCertificateCallback.pas index e236782a..03b19dbb 100644 --- a/source/uCEFSelectClientCertificateCallback.pas +++ b/source/uCEFSelectClientCertificateCallback.pas @@ -42,6 +42,8 @@ unit uCEFSelectClientCertificateCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFSetCookieCallback.pas b/source/uCEFSetCookieCallback.pas index 75584674..771ca37a 100644 --- a/source/uCEFSetCookieCallback.pas +++ b/source/uCEFSetCookieCallback.pas @@ -42,6 +42,8 @@ unit uCEFSetCookieCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFSslInfo.pas b/source/uCEFSslInfo.pas index 19b2bb83..1f6105ef 100644 --- a/source/uCEFSslInfo.pas +++ b/source/uCEFSslInfo.pas @@ -42,10 +42,16 @@ unit uCEFSslInfo; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFStreamReader.pas b/source/uCEFStreamReader.pas index 147f2850..d825c660 100644 --- a/source/uCEFStreamReader.pas +++ b/source/uCEFStreamReader.pas @@ -42,10 +42,16 @@ unit uCEFStreamReader; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFStreamWriter.pas b/source/uCEFStreamWriter.pas index 5c14e4c8..162d3a8c 100644 --- a/source/uCEFStreamWriter.pas +++ b/source/uCEFStreamWriter.pas @@ -42,6 +42,8 @@ unit uCEFStreamWriter; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFStringMap.pas b/source/uCEFStringMap.pas index 1931e570..2df05d35 100644 --- a/source/uCEFStringMap.pas +++ b/source/uCEFStringMap.pas @@ -42,6 +42,8 @@ unit uCEFStringMap; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFStringMultimap.pas b/source/uCEFStringMultimap.pas index 47a5a5ec..d71408f9 100644 --- a/source/uCEFStringMultimap.pas +++ b/source/uCEFStringMultimap.pas @@ -42,6 +42,8 @@ unit uCEFStringMultimap; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFStringVisitor.pas b/source/uCEFStringVisitor.pas index b91c556a..681fe0ed 100644 --- a/source/uCEFStringVisitor.pas +++ b/source/uCEFStringVisitor.pas @@ -42,6 +42,8 @@ unit uCEFStringVisitor; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFTask.pas b/source/uCEFTask.pas index 82e61706..7f4a1916 100644 --- a/source/uCEFTask.pas +++ b/source/uCEFTask.pas @@ -42,6 +42,8 @@ unit uCEFTask; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFTaskRunner.pas b/source/uCEFTaskRunner.pas index 5634788a..9e1a9cd3 100644 --- a/source/uCEFTaskRunner.pas +++ b/source/uCEFTaskRunner.pas @@ -42,6 +42,8 @@ unit uCEFTaskRunner; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFThread.pas b/source/uCEFThread.pas index cfd04f86..d09fd027 100644 --- a/source/uCEFThread.pas +++ b/source/uCEFThread.pas @@ -42,6 +42,8 @@ unit uCEFThread; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas index 8a6b9093..e29ce72b 100644 --- a/source/uCEFTypes.pas +++ b/source/uCEFTypes.pas @@ -42,10 +42,16 @@ unit uCEFTypes; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, System.Math; + {$ELSE} + Windows, Math; + {$ENDIF} type PCefStringWide = ^TCefStringWide; diff --git a/source/uCEFUrlRequest.pas b/source/uCEFUrlRequest.pas index 90698fb1..e3dab53c 100644 --- a/source/uCEFUrlRequest.pas +++ b/source/uCEFUrlRequest.pas @@ -42,6 +42,8 @@ unit uCEFUrlRequest; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFUrlrequestClient.pas b/source/uCEFUrlrequestClient.pas index 7a2d9dbc..e17c170d 100644 --- a/source/uCEFUrlrequestClient.pas +++ b/source/uCEFUrlrequestClient.pas @@ -42,6 +42,8 @@ unit uCEFUrlrequestClient; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFV8Exception.pas b/source/uCEFV8Exception.pas index de33356c..bf099a8a 100644 --- a/source/uCEFV8Exception.pas +++ b/source/uCEFV8Exception.pas @@ -42,6 +42,8 @@ unit uCEFV8Exception; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFValue.pas b/source/uCEFValue.pas index 03c93a69..9c2c59ad 100644 --- a/source/uCEFValue.pas +++ b/source/uCEFValue.pas @@ -42,6 +42,8 @@ unit uCEFValue; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFWaitableEvent.pas b/source/uCEFWaitableEvent.pas index 914970be..afd51d7f 100644 --- a/source/uCEFWaitableEvent.pas +++ b/source/uCEFWaitableEvent.pas @@ -42,6 +42,8 @@ unit uCEFWaitableEvent; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFWebPluginInfo.pas b/source/uCEFWebPluginInfo.pas index 76c21eb6..88aaa4ff 100644 --- a/source/uCEFWebPluginInfo.pas +++ b/source/uCEFWebPluginInfo.pas @@ -42,6 +42,8 @@ unit uCEFWebPluginInfo; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFWebPluginInfoVisitor.pas b/source/uCEFWebPluginInfoVisitor.pas index 81bfb025..fb71f2ef 100644 --- a/source/uCEFWebPluginInfoVisitor.pas +++ b/source/uCEFWebPluginInfoVisitor.pas @@ -42,6 +42,8 @@ unit uCEFWebPluginInfoVisitor; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFWebPluginUnstableCallback.pas b/source/uCEFWebPluginUnstableCallback.pas index e3238ddb..1b75f026 100644 --- a/source/uCEFWebPluginUnstableCallback.pas +++ b/source/uCEFWebPluginUnstableCallback.pas @@ -42,6 +42,8 @@ unit uCEFWebPluginUnstableCallback; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFWindowParent.pas b/source/uCEFWindowParent.pas index 0b4789f5..57906e47 100644 --- a/source/uCEFWindowParent.pas +++ b/source/uCEFWindowParent.pas @@ -42,10 +42,16 @@ unit uCEFWindowParent; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} WinApi.Windows, WinApi.Messages, System.Classes, Vcl.Controls, + {$ELSE} + Windows, Messages, Classes, Controls, + {$ENDIF} uCEFTypes, uCEFInterfaces; type diff --git a/source/uCEFWriteHandler.pas b/source/uCEFWriteHandler.pas index 3b617469..674504d4 100644 --- a/source/uCEFWriteHandler.pas +++ b/source/uCEFWriteHandler.pas @@ -42,6 +42,8 @@ unit uCEFWriteHandler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFX509CertPrincipal.pas b/source/uCEFX509CertPrincipal.pas index bb0eaf82..233009eb 100644 --- a/source/uCEFX509CertPrincipal.pas +++ b/source/uCEFX509CertPrincipal.pas @@ -42,10 +42,16 @@ unit uCEFX509CertPrincipal; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type @@ -68,7 +74,11 @@ type implementation uses + {$IFDEF DELPHI16_UP} WinApi.Windows, System.SysUtils, + {$ELSE} + Windows, SysUtils, + {$ENDIF} uCEFMiscFunctions, uCEFLibFunctions; function TCefX509CertPrincipalRef.GetDisplayName: ustring; diff --git a/source/uCEFX509Certificate.pas b/source/uCEFX509Certificate.pas index 1efc8436..ba44a075 100644 --- a/source/uCEFX509Certificate.pas +++ b/source/uCEFX509Certificate.pas @@ -42,10 +42,16 @@ unit uCEFX509Certificate; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFXmlReader.pas b/source/uCEFXmlReader.pas index 7b4e68e0..6370f95e 100644 --- a/source/uCEFXmlReader.pas +++ b/source/uCEFXmlReader.pas @@ -42,6 +42,8 @@ unit uCEFXmlReader; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFZipReader.pas b/source/uCEFZipReader.pas index d4ea3815..480cf026 100644 --- a/source/uCEFZipReader.pas +++ b/source/uCEFZipReader.pas @@ -42,6 +42,8 @@ unit uCEFZipReader; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFv8Accessor.pas b/source/uCEFv8Accessor.pas index d8623f86..ba659dec 100644 --- a/source/uCEFv8Accessor.pas +++ b/source/uCEFv8Accessor.pas @@ -42,6 +42,8 @@ unit uCEFv8Accessor; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFv8Context.pas b/source/uCEFv8Context.pas index 4040797d..d0274343 100644 --- a/source/uCEFv8Context.pas +++ b/source/uCEFv8Context.pas @@ -42,6 +42,8 @@ unit uCEFv8Context; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFv8Handler.pas b/source/uCEFv8Handler.pas index e069b49e..79b82ce8 100644 --- a/source/uCEFv8Handler.pas +++ b/source/uCEFv8Handler.pas @@ -42,11 +42,17 @@ unit uCEFv8Handler; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Rtti, System.TypInfo, System.Variants, System.SysUtils, System.Classes, System.Math, System.SyncObjs, WinApi.Windows, + {$ELSE} + Rtti, TypInfo, Variants, SysUtils, Classes, Math, SyncObjs, Windows, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes; type @@ -410,7 +416,11 @@ function TCefRTTIExtension.GetValue(pi: PTypeInfo; const v: ICefv8Value; var ret if v.IsObject then begin TValue.Make(nil, pi, ret); + {$IFDEF DELPHI15_UP} rec := TValueData(ret).FValueData.GetReferenceToRawData; + {$ELSE} + rec := IValueData(TValueData(ret).FHeapData).GetReferenceToRawData; + {$ENDIF} for r in FCtx.GetType(pi).GetFields do begin if not GetValue(r.FieldType.Handle, v.GetValueByKey(r.Name), f) then @@ -470,7 +480,11 @@ function TCefRTTIExtension.SetValue(const v: TValue; var ret: ICefv8Value): Bool ret := TCefv8ValueRef.NewObject(nil, nil); ret.SetUserData(ud); +{$IFDEF DELPHI15_UP} rec := TValueData(v).FValueData.GetReferenceToRawData; +{$ELSE} + rec := IValueData(TValueData(v).FHeapData).GetReferenceToRawData; +{$ENDIF} if FSyncMainThread then begin diff --git a/source/uCEFv8Interceptor.pas b/source/uCEFv8Interceptor.pas index e98d208d..067c5204 100644 --- a/source/uCEFv8Interceptor.pas +++ b/source/uCEFv8Interceptor.pas @@ -42,6 +42,8 @@ unit uCEFv8Interceptor; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFv8StackFrame.pas b/source/uCEFv8StackFrame.pas index 46971412..b94c13d7 100644 --- a/source/uCEFv8StackFrame.pas +++ b/source/uCEFv8StackFrame.pas @@ -42,6 +42,8 @@ unit uCEFv8StackFrame; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFv8StackTrace.pas b/source/uCEFv8StackTrace.pas index 7003d86f..e6eb92aa 100644 --- a/source/uCEFv8StackTrace.pas +++ b/source/uCEFv8StackTrace.pas @@ -42,6 +42,8 @@ unit uCEFv8StackTrace; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses diff --git a/source/uCEFv8Types.pas b/source/uCEFv8Types.pas index aa868150..229a2c0f 100644 --- a/source/uCEFv8Types.pas +++ b/source/uCEFv8Types.pas @@ -42,10 +42,16 @@ unit uCEFv8Types; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFInterfaces, uCEFTypes; type diff --git a/source/uCEFv8Value.pas b/source/uCEFv8Value.pas index a6b10aef..6ac31bd9 100644 --- a/source/uCEFv8Value.pas +++ b/source/uCEFv8Value.pas @@ -42,10 +42,16 @@ unit uCEFv8Value; {$MINENUMSIZE 4} {$ENDIF} +{$I cef.inc} + interface uses + {$IFDEF DELPHI16_UP} System.Classes, + {$ELSE} + Classes, + {$ENDIF} uCEFBase, uCEFInterfaces, uCEFTypes, uCEFv8Types; type