Fix for crashes on old Delphi versions

source/CEF4Delphi.dproj

@@ -255,7 +255,16 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
                         <RemoteDir>Contents\Resources</RemoteDir>
@@ -569,16 +578,7 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="DependencyModule">
+                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                </DeployClass>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

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_0=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas',0,1,1,34,49,0,0,,
-File_1=TSourceModule,'V:\dcef3-2883\src\ceflib.pas',0,1,12706,24,12734,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\uCEFLibFunctions.pas',0,1,261,51,294,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\uCEFClient.pas',0,1,504,62,536,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-2704\src\ceflib.pas',0,1,1,1,1,0,0,,
+File_4=TSourceModule,'V:\dcef3-2883\src\ceflib.pas',0,1,40,30,70,0,0,,
-File_5=TSourceModule,'V:\dcef3-2704\src\cefgui.pas',0,1,1,1,1,0,0,,
+File_5=TSourceModule,'V:\dcef3-2883\src\ceffmx.pas',0,1,1,9,30,0,0,,
-File_6=TSourceModule,'V:\dcef3-2704\src\cefvcl.pas',0,1,1,1,1,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,'V:\dcef3-2883\src\cefgui.pas',0,1,1,1,1,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,'V:\dcef3-2883\src\cefvcl.pas',0,1,806,23,830,0,0,,
+File_8=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFXmlReader.pas',0,1,79,1,92,0,0,,
-File_9=TSourceModule,'V:\2883\include\internal\cef_types.h',0,1,1,1,1,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
+Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas
-CursorX=74
+CursorX=76
-CursorY=280
+CursorY=2107
-TopLine=234
+TopLine=2077
 LeftCol=1
 Elisions=
-Bookmarks={1,927,43}{2,565,24}{3,663,6}
+Bookmarks=
-EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas
+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
+Top=0
-Width=10000
+Width=2773
-Height=1110
+Height=1424
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=10000
+ClientWidth=2773
-ClientHeight=1110
+ClientHeight=1424
-TBDockHeight=1110
+TBDockHeight=1424
 LRDockWidth=2773
 Dockable=1
 StayOnTop=0
@@ -172,12 +171,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1875
+Width=2000
-Height=6738
+Height=4339
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
+ClientWidth=2000
-ClientHeight=6738
+ClientHeight=4339
 TBDockHeight=7152
 LRDockWidth=2000
 Dockable=1
@@ -227,8 +226,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-8
+Left=-148
-Top=-30
+Top=-137
 Width=1844
 Height=3139
 MaxLeft=-1
@@ -284,14 +283,14 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=78
+Left=0
-Top=386
+Top=362
 Width=1898
-Height=7164
+Height=5370
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1773
+ClientWidth=1898
-ClientHeight=6738
+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
+Left=-898
-Top=1
+Top=-137
 Width=2844
 Height=6200
 MaxLeft=-1
@@ -342,8 +341,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-8
+Left=-1026
-Top=287
+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
+Left=0
-Top=709
+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
+Width=1898
-Height=6738
+Height=9170
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1773
+ClientWidth=1898
-ClientHeight=6738
+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
+ClientHeight=1424
-TBDockHeight=1110
+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
+ClientWidth=1898
-ClientHeight=6738
+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
+ClientWidth=2000
-ClientHeight=6738
+ClientHeight=4339
 TBDockHeight=7164
 LRDockWidth=2000
 Dockable=1

source/CEF4Delphi.stat

@@ -1,9 +1,9 @@
 [Stats]
-EditorSecs=18191
+EditorSecs=21350
 DesignerSecs=1
-InspectorSecs=5
+InspectorSecs=9
-CompileSecs=249803
+CompileSecs=356274
-OtherSecs=1208
+OtherSecs=1868
 StartTime=22/01/2017 10:49:52
 RealKeys=0
 EffectiveKeys=0

source/cef.inc

@@ -0,0 +1,335 @@
+(*
+ *                       Delphi Chromium Embedded
+ *
+ * Usage allowed under the restrictions of the Lesser GNU General Public License
+ * or alternatively the restrictions of the Mozilla Public License 1.1
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ *
+ * Unit owner : Henri Gourvest <hgourvest@gmail.com>
+ * 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}
+

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

source/uCEFAuthCallback.pas

@@ -42,6 +42,8 @@ unit uCEFAuthCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFBase.pas

@@ -42,6 +42,8 @@ unit uCEFBase;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFBeforeDownloadCallback.pas

@@ -42,6 +42,8 @@ unit uCEFBeforeDownloadCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFBinaryValue.pas

@@ -42,6 +42,8 @@ unit uCEFBinaryValue;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

source/uCEFBrowserProcessHandler.pas

@@ -42,6 +42,8 @@ unit uCEFBrowserProcessHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFCallback.pas

@@ -42,6 +42,8 @@ unit uCEFCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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  CreateBrowserHost(aWindowInfo : PCefWindowInfo; 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  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 (aDevTools <> nil) then
-      if (FBrowser  <> nil) then FBrowser.Host.CloseDevTools;
+        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.Right  := TempRect.Left + TempForm.Width  - 1;
-      TempRect.Height := TempForm.Height;
+      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.Right  := TempRect.Left + TempForm.Width  - 1;
-      TempRect.Height := TempForm.Height;
+      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;
 

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

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

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

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

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,

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

source/uCEFCompletionCallback.pas

@@ -42,6 +42,8 @@ unit uCEFCompletionCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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)

source/uCEFContextMenuHandler.pas

@@ -42,6 +42,8 @@ unit uCEFContextMenuHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

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

source/uCEFCookieVisitor.pas

@@ -42,6 +42,8 @@ unit uCEFCookieVisitor;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

source/uCEFDeleteCookiesCallback.pas

@@ -42,6 +42,8 @@ unit uCEFDeleteCookiesCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

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

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

source/uCEFDomDocument.pas

@@ -42,6 +42,8 @@ unit uCEFDomDocument;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFDomNode.pas

@@ -42,6 +42,8 @@ unit uCEFDomNode;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFDomVisitor.pas

@@ -42,6 +42,8 @@ unit uCEFDomVisitor;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFDownLoadItem.pas

@@ -42,6 +42,8 @@ unit uCEFDownLoadItem;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFDownloadHandler.pas

@@ -42,6 +42,8 @@ unit uCEFDownloadHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFDownloadImageCallBack.pas

@@ -42,6 +42,8 @@ unit uCEFDownloadImageCallBack;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFDownloadItemCallback.pas

@@ -42,6 +42,8 @@ unit uCEFDownloadItemCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

source/uCEFDragHandler.pas

@@ -42,6 +42,8 @@ unit uCEFDragHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFEndTracingCallback.pas

@@ -42,6 +42,8 @@ unit uCEFEndTracingCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

source/uCEFFindHandler.pas

@@ -42,6 +42,8 @@ unit uCEFFindHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFFocusHandler.pas

@@ -42,6 +42,8 @@ unit uCEFFocusHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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)

source/uCEFGeolocationCallback.pas

@@ -42,6 +42,8 @@ unit uCEFGeolocationCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFGeolocationHandler.pas

@@ -42,6 +42,8 @@ unit uCEFGeolocationHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFGetGeolocationCallback.pas

@@ -42,6 +42,8 @@ unit uCEFGetGeolocationCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

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

source/uCEFJsDialogCallback.pas

@@ -42,6 +42,8 @@ unit uCEFJsDialogCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFJsDialogHandler.pas

@@ -42,6 +42,8 @@ unit uCEFJsDialogHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFKeyboardHandler.pas

@@ -42,6 +42,8 @@ unit uCEFKeyboardHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

source/uCEFLifeSpanHandler.pas

@@ -42,6 +42,8 @@ unit uCEFLifeSpanHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFListValue.pas

@@ -42,6 +42,8 @@ unit uCEFListValue;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFLoadHandler.pas

@@ -42,6 +42,8 @@ unit uCEFLoadHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFMenuModel.pas

@@ -42,6 +42,8 @@ unit uCEFMenuModel;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFMenuModelDelegate.pas

@@ -42,6 +42,8 @@ unit uCEFMenuModelDelegate;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

source/uCEFNavigationEntry.pas

@@ -42,6 +42,8 @@ unit uCEFNavigationEntry;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFNavigationEntryVisitor.pas

@@ -42,6 +42,8 @@ unit uCEFNavigationEntryVisitor;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFPDFPrintCallback.pas

@@ -42,6 +42,8 @@ unit uCEFPDFPrintCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

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

source/uCEFPostDataElement.pas

@@ -42,6 +42,8 @@ unit uCEFPostDataElement;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFPrintSettings.pas

@@ -42,6 +42,8 @@ unit uCEFPrintSettings;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFProcessMessage.pas

@@ -42,6 +42,8 @@ unit uCEFProcessMessage;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFRegisterCDMCallback.pas

@@ -42,6 +42,8 @@ unit uCEFRegisterCDMCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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,
+  {$ELSE}
-  uCEFWindowParent,
+  Classes,
-  uCEFChromiumWindow;
+  {$ENDIF}
+  uCEFChromium, uCEFWindowParent, uCEFChromiumWindow;
 
 procedure Register;
 begin

source/uCEFRenderHandler.pas

@@ -42,6 +42,8 @@ unit uCEFRenderHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFRenderProcessHandler.pas

@@ -42,6 +42,8 @@ unit uCEFRenderProcessHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFRequest.pas

@@ -42,6 +42,8 @@ unit uCEFRequest;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFRequestCallback.pas

@@ -42,6 +42,8 @@ unit uCEFRequestCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

source/uCEFRequestContextHandler.pas

@@ -42,6 +42,8 @@ unit uCEFRequestContextHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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;
 

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

source/uCEFResourceBundle.pas

@@ -42,6 +42,8 @@ unit uCEFResourceBundle;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFResourceBundleHandler.pas

@@ -42,6 +42,8 @@ unit uCEFResourceBundleHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFResourceHandler.pas

@@ -42,6 +42,8 @@ unit uCEFResourceHandler;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFResponse.pas

@@ -42,6 +42,8 @@ unit uCEFResponse;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFResponseFilter.pas

@@ -42,6 +42,8 @@ unit uCEFResponseFilter;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFRunContextMenuCallback.pas

@@ -42,6 +42,8 @@ unit uCEFRunContextMenuCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

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

source/uCEFSchemeHandlerFactory.pas

@@ -42,6 +42,8 @@ unit uCEFSchemeHandlerFactory;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFSchemeRegistrar.pas

@@ -42,6 +42,8 @@ unit uCEFSchemeRegistrar;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFSelectClientCertificateCallback.pas

@@ -42,6 +42,8 @@ unit uCEFSelectClientCertificateCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFSetCookieCallback.pas

@@ -42,6 +42,8 @@ unit uCEFSetCookieCallback;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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

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

source/uCEFStreamWriter.pas

@@ -42,6 +42,8 @@ unit uCEFStreamWriter;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFStringMap.pas

@@ -42,6 +42,8 @@ unit uCEFStringMap;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFStringMultimap.pas

@@ -42,6 +42,8 @@ unit uCEFStringMultimap;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFStringVisitor.pas

@@ -42,6 +42,8 @@ unit uCEFStringVisitor;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFTask.pas

@@ -42,6 +42,8 @@ unit uCEFTask;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFTaskRunner.pas

@@ -42,6 +42,8 @@ unit uCEFTaskRunner;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

source/uCEFThread.pas

@@ -42,6 +42,8 @@ unit uCEFThread;
   {$MINENUMSIZE 4}
 {$ENDIF}
 
+{$I cef.inc}
+
 interface
 
 uses

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;