Enable DPI aware setting in Lazarus demos for Windows

Cleanup some useless code in Lazarus demos for Windows

demos/Lazarus_Windows/CookieVisitor/CookieVisitor.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/CookieVisitor/CookieVisitor.lpr

@@ -3,20 +3,14 @@ program CookieVisitor;
 {$I ..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
+  Forms,
-  Vcl.Forms,
+  Interfaces,
-  WinApi.Windows,
-  {$ELSE}
-  Forms, Interfaces,
   Windows,
-  {$ENDIF }
   uCEFApplication,
   uCookieVisitor in 'uCookieVisitor.pas' {CookieVisitorFrm},
   uSimpleTextViewer in 'uSimpleTextViewer.pas' {SimpleTextViewerFrm};
 
-//{$R *.res}
+{$IFDEF WIN32}
-
-{$IFDEF MSWINDOWS}
   // CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
   {$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
 {$ENDIF}
@@ -29,9 +23,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TCookieVisitorFrm, CookieVisitorFrm);
       Application.CreateForm(TSimpleTextViewerFrm, SimpleTextViewerFrm);
       Application.Run;

demos/Lazarus_Windows/CookieVisitor/uCookieVisitor.lfm

@@ -10,10 +10,11 @@ object CookieVisitorFrm: TCookieVisitorFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object AddressBarPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/CookieVisitor/uCookieVisitor.pas

@@ -5,13 +5,8 @@ unit uCookieVisitor;
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, System.StrUtils,
-  {$ELSE}
   Windows, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, StrUtils,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes, uCEFConstants,
   uCEFCookieManager, uCEFCookieVisitor, uCEFWinControl, uCEFChromiumEvents;
 

demos/Lazarus_Windows/CustomResourceBrowser/CRBrowser.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/CustomResourceBrowser/CRBrowser.lpr

@@ -3,20 +3,15 @@ program CRBrowser;
 {$I ..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
+  Forms,
-  Vcl.Forms,
+  Interfaces,
-  WinApi.Windows,
-  {$ELSE}
-  Forms, Interfaces,
   Windows,
-  {$ENDIF }
   uCEFApplication,
   uMainForm in 'uMainForm.pas' {MainForm},
   uCustomResourceHandler in 'uCustomResourceHandler.pas';
 
-//{$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
 
 {$R *.res}
 
@@ -26,9 +21,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TMainForm, MainForm);
       Application.Run;
     end;

demos/Lazarus_Windows/CustomResourceBrowser/uCustomResourceHandler.pas

@@ -4,11 +4,7 @@ unit uCustomResourceHandler;
 
 interface
 uses
-  {$IFDEF DELPHI16_UP}
-  System.Classes, WinApi.Windows, System.SysUtils,
-  {$ELSE}
   Classes, Windows, SysUtils,
-  {$ENDIF}
   uCEFInterfaces, uCEFTypes, uCEFResourceHandler;
 
 type

demos/Lazarus_Windows/CustomResourceBrowser/uMainForm.lfm

@@ -10,10 +10,11 @@ object MainForm: TMainForm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object ChromiumWindow1: TChromiumWindow
     Left = 0
     Height = 637

demos/Lazarus_Windows/CustomResourceBrowser/uMainForm.pas

@@ -5,13 +5,8 @@ unit uMainForm;
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls,
-  {$ELSE}
   Windows, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFChromiumWindow, uCEFInterfaces, uCustomResourceHandler,
   uCEFConstants, uCEFTypes;
 

demos/Lazarus_Windows/DOMVisitor/DOMVisitor.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/DOMVisitor/DOMVisitor.lpr

@@ -3,14 +3,14 @@ program DOMVisitor;
 {$I ..\..\..\source\cef.inc}
 
 uses
-  Forms, Interfaces,
+  Forms,
+  Interfaces,
   Windows,
   uCEFApplication,
   uDOMVisitor in 'uDOMVisitor.pas' {DOMVisitorFrm};
 
-//{$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
 
 {$R *.res}
 
@@ -21,8 +21,6 @@ begin
 
   if GlobalCEFApp.StartMainProcess then
     begin
-      //ReportMemoryLeaksOnShutdown := True;
-
       Application.Initialize;
       Application.MainFormOnTaskbar := True;
       Application.CreateForm(TDOMVisitorFrm, DOMVisitorFrm);

demos/Lazarus_Windows/EditorBrowser/EditorBrowser.dpr

@@ -1,31 +1,20 @@
 program EditorBrowser;
 
-{$IFDEF FPC}
+{$MODE Delphi}
-  {$MODE Delphi}
-{$ENDIF}
 
 {$I ..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
-{$IFnDEF FPC}
-{$ELSE}
-  Interfaces,
-{$ENDIF}
   Forms,
-  Windows,
+  Windows, 
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uEditorBrowser in 'uEditorBrowser.pas' {Form1};
 
 {.$R *.res}
 
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-// If you don't add this flag the rederer process will crash when you try to load large images.
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
 
 {$R *.res}
 
@@ -35,9 +24,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TForm1, Form1);
       Application.Run;
     end;

demos/Lazarus_Windows/EditorBrowser/EditorBrowser.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/ExternalPumpBrowser/ExternalPumpBrowser.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/ExternalPumpBrowser/ExternalPumpBrowser.lpr

@@ -3,22 +3,15 @@ program ExternalPumpBrowser;
 {$I ..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
+  Forms,
-  Vcl.Forms,
+  Interfaces,
-  WinApi.Windows,
-  {$ELSE}
-  Forms, Interfaces,
   Windows,
-  {$ENDIF }
   uCEFApplication,
   uCEFWorkScheduler,
   uExternalPumpBrowser in 'uExternalPumpBrowser.pas' {ExternalPumpBrowserFrm};
 
-//{$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-// If you don't add this flag the rederer process will crash when you try to load large images.
-{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
 
 {$R *.res}
 
@@ -30,9 +23,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TExternalPumpBrowserFrm, ExternalPumpBrowserFrm);
       Application.Run;
 

demos/Lazarus_Windows/ExternalPumpBrowser/uExternalPumpBrowser.lfm

@@ -10,10 +10,11 @@ object ExternalPumpBrowserFrm: TExternalPumpBrowserFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object AddressPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/ExternalPumpBrowser/uExternalPumpBrowser.pas

@@ -5,13 +5,8 @@ unit uExternalPumpBrowser;
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls,
-  {$ELSE}
   Windows, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFTypes, uCEFConstants, uCEFInterfaces, uCEFWorkScheduler,
   uCEFWinControl;
 

demos/Lazarus_Windows/FullScreenBrowser/FullScreenBrowser.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/FullScreenBrowser/FullScreenBrowser.lpr

@@ -5,19 +5,14 @@ program FullScreenBrowser;
 {$I ..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
+  Forms,
-  Vcl.Forms,
+  Windows,
-  WinApi.Windows,
+  Interfaces,
-  {$ELSE}
-  Forms, Windows,
-  LCLIntf, LCLType, LMessages, Interfaces,
-  {$ENDIF }
   uCEFApplication,
   uMainForm in 'uMainForm.pas' {MainForm};
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
 
 {$R *.res}
 

demos/Lazarus_Windows/FullScreenBrowser/uMainForm.lfm

@@ -6,16 +6,17 @@ object MainForm: TMainForm
   BorderIcons = []
   BorderStyle = bsNone
   Caption = 'MainForm'
-  ClientHeight = 728
+  ClientHeight = 751
   ClientWidth = 1396
   Color = clBtnFace
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  LCLVersion = '4.0.0.4'
+  WindowState = wsMaximized
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  WindowState = wsMaximized
   object CEFWindowParent1: TCEFWindowParent
     Left = 0
     Height = 728

demos/Lazarus_Windows/FullScreenBrowser/uMainForm.pas

@@ -5,14 +5,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
-  System.UITypes,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, ExtCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFTypes, uCEFConstants,
   uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSDialog/JSDialogBrowser.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSDialog/JSDialogBrowser.lpr

@@ -3,19 +3,14 @@ program JSDialogBrowser;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
+  Forms,
-  Vcl.Forms,
+  Interfaces,
-  WinApi.Windows,
-  {$ELSE}
-  Forms, Interfaces,
   Windows,
-  {$ENDIF }
   uCEFApplication,
   uJSDialogBrowser in 'uJSDialogBrowser.pas' {JSDialogBrowserFrm};
 
-//{$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
 
 {$R *.res}
 
@@ -25,9 +20,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSDialogBrowserFrm, JSDialogBrowserFrm);
       Application.Run;
     end;

demos/Lazarus_Windows/JavaScript/JSDialog/uJSDialogBrowser.lfm

@@ -10,12 +10,12 @@ object JSDialogBrowserFrm: TJSDialogBrowserFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnShow = FormShow
-  Position = poScreenCenter
-  LCLVersion = '3.4.0.0'
   object ChromiumWindow1: TChromiumWindow
     Left = 0
     Height = 603

demos/Lazarus_Windows/JavaScript/JSDialog/uJSDialogBrowser.pas

@@ -5,13 +5,8 @@ unit uJSDialogBrowser;
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, System.SyncObjs,
-  {$ELSE}
   Windows, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, SyncObjs,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFChromiumWindow, uCEFInterfaces, uCEFTypes,
   uCEFConstants;
 

demos/Lazarus_Windows/JavaScript/JSEval/JSEval.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSEval/JSEval.lpr

@@ -5,16 +5,15 @@ program JSEval;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  Forms, Windows,
+  Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
+  Interfaces,
   uCEFApplication,
   uJSEval in 'uJSEval.pas' {JSEvalFrm},
   uSimpleTextViewer in 'uSimpleTextViewer.pas' {SimpleTextViewerFrm};
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
 
 {$R *.res}
 
@@ -26,9 +25,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSEvalFrm, JSEvalFrm);
       Application.CreateForm(TSimpleTextViewerFrm, SimpleTextViewerFrm);
       Application.Run;

demos/Lazarus_Windows/JavaScript/JSEval/uSimpleTextViewer.lfm

@@ -13,7 +13,7 @@ object SimpleTextViewerFrm: TSimpleTextViewerFrm
   Font.Height = -11
   Font.Name = 'Tahoma'
   Position = poScreenCenter
-  LCLVersion = '2.0.1.0'
+  LCLVersion = '4.0.0.4'
   object Memo1: TMemo
     Left = 0
     Height = 572

demos/Lazarus_Windows/JavaScript/JSEval/uSimpleTextViewer.pas

@@ -5,14 +5,8 @@ unit uSimpleTextViewer;
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls;
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls;
-  {$ENDIF}
-
 
 type
   TSimpleTextViewerFrm = class(TForm)

demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/JSExecutingFunctions.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/JSExecutingFunctions.lpr

@@ -5,21 +5,15 @@ program JSExecutingFunctions;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uJSExecutingFunctions in 'uJSExecutingFunctions.pas' {JSExecutingFunctionsFrm},
   uMyV8Handler in 'uMyV8Handler.pas';
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -31,9 +25,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSExecutingFunctionsFrm, JSExecutingFunctionsFrm);
       Application.Run;
     end;

demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.lfm

@@ -10,11 +10,12 @@ object JSExecutingFunctionsFrm: TJSExecutingFunctionsFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes,
   uCEFConstants, uCEFv8Value, uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSExtension/JSExtension.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSExtension/JSExtension.lpr

@@ -5,22 +5,16 @@ program JSExtension;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uJSExtension in 'uJSExtension.pas' {JSExtensionFrm},
   uTestExtensionHandler in 'uTestExtensionHandler.pas',
   uSimpleTextViewer in 'uSimpleTextViewer.pas' {SimpleTextViewerFrm};
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -32,9 +26,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSExtensionFrm, JSExtensionFrm);
       Application.CreateForm(TSimpleTextViewerFrm, SimpleTextViewerFrm);
       Application.Run;

demos/Lazarus_Windows/JavaScript/JSExtension/uJSExtension.lfm

@@ -10,10 +10,11 @@ object JSExtensionFrm: TJSExtensionFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/JavaScript/JSExtension/uJSExtension.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes, uCEFConstants,
   uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSExtension/uSimpleTextViewer.lfm

@@ -13,7 +13,7 @@ object SimpleTextViewerFrm: TSimpleTextViewerFrm
   Font.Height = -11
   Font.Name = 'Tahoma'
   Position = poScreenCenter
-  LCLVersion = '2.0.1.0'
+  LCLVersion = '4.0.0.4'
   object Memo1: TMemo
     Left = 0
     Height = 572

demos/Lazarus_Windows/JavaScript/JSExtension/uSimpleTextViewer.pas

@@ -5,14 +5,8 @@ unit uSimpleTextViewer;
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls;
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls;
-  {$ENDIF}
-
 
 type
   TSimpleTextViewerFrm = class(TForm)

demos/Lazarus_Windows/JavaScript/JSExtension/uTestExtensionHandler.pas

@@ -7,11 +7,7 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows,
-  {$ELSE}
   LCLIntf, LCLType, LMessages,
-  {$ENDIF}
   uCEFRenderProcessHandler, uCEFBrowserProcessHandler, uCEFInterfaces, uCEFProcessMessage,
   uCEFv8Context, uCEFTypes, uCEFv8Handler;
 

demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/JSExtension.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/JSExtension.lpr

@@ -10,10 +10,8 @@ uses
   uJSExtension in 'uJSExtension.pas' {JSExtensionFrm},
   uSimpleTextViewer in 'uSimpleTextViewer.pas' {SimpleTextViewerFrm};
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 

demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/uJSExtension.lfm

@@ -10,10 +10,11 @@ object JSExtensionFrm: TJSExtensionFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/uJSExtension.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes, uCEFConstants,
   uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/uSimpleTextViewer.lfm

@@ -13,7 +13,7 @@ object SimpleTextViewerFrm: TSimpleTextViewerFrm
   Font.Height = -11
   Font.Name = 'Tahoma'
   Position = poScreenCenter
-  LCLVersion = '2.0.1.0'
+  LCLVersion = '4.0.0.4'
   object Memo1: TMemo
     Left = 0
     Height = 572

demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/uSimpleTextViewer.pas

@@ -5,14 +5,8 @@ unit uSimpleTextViewer;
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls;
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls;
-  {$ENDIF}
-
 
 type
   TSimpleTextViewerFrm = class(TForm)

demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/JSExtensionWithFunction.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/JSExtensionWithFunction.lpr

@@ -5,21 +5,15 @@ program JSExtensionWithFunction;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uJSExtensionWithFunction in 'uJSExtensionWithFunction.pas' {JSExtensionWithFunctionFrm},
   uMyV8Handler in 'uMyV8Handler.pas';
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -31,9 +25,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSExtensionWithFunctionFrm, JSExtensionWithFunctionFrm);
       Application.Run;
     end;

demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.lfm

@@ -10,10 +10,11 @@ object JSExtensionWithFunctionFrm: TJSExtensionWithFunctionFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes, uCEFConstants,
   uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/JSExtensionWithObjectParameter.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/JSExtensionWithObjectParameter.lpr

@@ -5,21 +5,15 @@ program JSExtensionWithObjectParameter;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uJSExtensionWithObjectParameter in 'uJSExtensionWithObjectParameter.pas' {JSExtensionWithObjectParameterFrm},
   uMyV8Handler in 'uMyV8Handler.pas';
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -31,9 +25,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSExtensionWithObjectParameterFrm, JSExtensionWithObjectParameterFrm);
       Application.Run;
     end;

demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.lfm

@@ -10,10 +10,11 @@ object JSExtensionWithObjectParameterFrm: TJSExtensionWithObjectParameterFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes, uCEFConstants,
   uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/JSSharedMemoryProcMessage.lpi

@@ -15,6 +15,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes>
       <Item Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/JSSharedMemoryProcMessage.lpr

@@ -6,14 +6,13 @@ program JSSharedMemoryProcMessage;
 
 uses
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
+  Interfaces,
   uCEFApplication,
   uMainForm in 'uMainForm.pas' {MainForm};
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -24,8 +23,6 @@ begin
 
   if GlobalCEFApp.StartMainProcess then
     begin
-      //ReportMemoryLeaksOnShutdown := True;
-
       Application.Initialize;
       Application.MainFormOnTaskbar := True;
       Application.CreateForm(TMainForm, MainForm);

demos/Lazarus_Windows/JavaScript/JSSimpleExtension/JSSimpleExtension.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSSimpleExtension/JSSimpleExtension.lpr

@@ -5,20 +5,14 @@ program JSSimpleExtension;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uJSSimpleExtension in 'uJSSimpleExtension.pas' {JSSimpleExtensionFrm};
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -30,9 +24,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSSimpleExtensionFrm, JSSimpleExtensionFrm);
       Application.Run;
     end;

demos/Lazarus_Windows/JavaScript/JSSimpleExtension/uJSSimpleExtension.lfm

@@ -10,10 +10,11 @@ object JSSimpleExtensionFrm: TJSSimpleExtensionFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes, uCEFConstants,
   uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/JSSimpleWindowBinding.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/JSSimpleWindowBinding.lpr

@@ -5,20 +5,14 @@ program JSSimpleWindowBinding;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uJSSimpleWindowBinding in 'uJSSimpleWindowBinding.pas' {JSSimpleWindowBindingFrm};
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -30,9 +24,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSSimpleWindowBindingFrm, JSSimpleWindowBindingFrm);
       Application.Run;
     end;

demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.lfm

@@ -10,10 +10,11 @@ object JSSimpleWindowBindingFrm: TJSSimpleWindowBindingFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes,
   uCEFConstants, uCEFv8Value, uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/JSSimpleWindowBinding.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/JSSimpleWindowBinding.lpr

@@ -6,14 +6,13 @@ program JSSimpleWindowBinding;
 
 uses
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
+  Interfaces,
   uCEFApplication,
   uJSSimpleWindowBinding in 'uJSSimpleWindowBinding.pas' {JSSimpleWindowBindingFrm};
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -35,9 +34,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSSimpleWindowBindingFrm, JSSimpleWindowBindingFrm);
       Application.Run;
     end;

demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/SubProcess.lpr

@@ -5,18 +5,14 @@ program SubProcess;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  WinApi.Windows,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Forms, Interfaces,
-  {$ENDIF}
   uCEFApplicationCore,
   uCEFConstants,
   uCEFv8Value,
   uCEFInterfaces;
 
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
+{$IFDEF WIN32}{$SetPEFlags $20}{$ENDIF}
 
 procedure GlobalCEFApp_OnContextCreated(const browser: ICefBrowser; const frame: ICefFrame; const context: ICefv8Context);
 var

demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.lfm

@@ -10,10 +10,11 @@ object JSSimpleWindowBindingFrm: TJSSimpleWindowBindingFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes,
   uCEFConstants, uCEFv8Value, uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/JSWindowBindingWithArrayBuffer.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/JSWindowBindingWithArrayBuffer.lpr

@@ -5,20 +5,14 @@ program JSWindowBindingWithArrayBuffer;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uJSWindowBindingWithArrayBuffer in 'uJSWindowBindingWithArrayBuffer.pas' {JSWindowBindingWithArrayBufferFrm};
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -30,11 +24,8 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSWindowBindingWithArrayBufferFrm, JSWindowBindingWithArrayBufferFrm);
-  Application.Run;
+      Application.Run;
     end;
 
   DestroyGlobalCEFApp;

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.lfm

@@ -10,10 +10,11 @@ object JSWindowBindingWithArrayBufferFrm: TJSWindowBindingWithArrayBufferFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 20

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes, uCEFConstants,
   uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/JSWindowBindingWithFunction.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/JSWindowBindingWithFunction.lpr

@@ -5,21 +5,15 @@ program JSWindowBindingWithFunction;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uJSWindowBindingWithFunction in 'uJSWindowBindingWithFunction.pas' {JSWindowBindingWithFunctionFrm},
   uMyV8Handler in 'uMyV8Handler.pas';
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -31,9 +25,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSWindowBindingWithFunctionFrm, JSWindowBindingWithFunctionFrm);
       Application.Run;
     end;

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.lfm

@@ -10,10 +10,11 @@ object JSWindowBindingWithFunctionFrm: TJSWindowBindingWithFunctionFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas

@@ -7,13 +7,8 @@
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.ComCtrls,
-  {$ELSE}
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
   Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  {$ENDIF}
   uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFApplication, uCEFTypes, uCEFConstants,
   uCEFWinControl;
 

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/JSWindowBindingWithObject.lpi

@@ -16,6 +16,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True/PM_V2"/>
+      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/JSWindowBindingWithObject.lpr

@@ -5,21 +5,15 @@ program JSWindowBindingWithObject;
 {$I ..\..\..\..\source\cef.inc}
 
 uses
-  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
-  WinApi.Windows,
-  {$ELSE}
   Forms,
-  LCLIntf, LCLType, LMessages, Interfaces,
+  Windows,
-  {$ENDIF }
+  Interfaces,
   uCEFApplication,
   uJSWindowBindingWithObject in 'uJSWindowBindingWithObject.pas' {JSWindowBindingWithObjectFrm},
   uMyV8Accessor in 'uMyV8Accessor.pas';
 
-{.$R *.res}
+// CEF needs to set the LARGEADDRESSAWARE ($20) flag which allows 32-bit processes to use up to 3GB of RAM.
-
+{$IFDEF WIN32}{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}{$ENDIF}
-// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
-{$SetPEFlags $20}
 
 {$R *.res}
 
@@ -31,9 +25,6 @@ begin
   if GlobalCEFApp.StartMainProcess then
     begin
       Application.Initialize;
-      {$IFDEF DELPHI11_UP}
-      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
       Application.CreateForm(TJSWindowBindingWithObjectFrm, JSWindowBindingWithObjectFrm);
       Application.Run;
     end;

demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.lfm

@@ -10,10 +10,11 @@ object JSWindowBindingWithObjectFrm: TJSWindowBindingWithObjectFrm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Position = poScreenCenter
+  LCLVersion = '4.0.0.4'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  Position = poScreenCenter
   object NavControlPnl: TPanel
     Left = 0
     Height = 21