From e612bf49d2b27534fdba5faed42aac19cf2867c6 Mon Sep 17 00:00:00 2001 From: chuacw <1757930+chuacw@users.noreply.github.com> Date: Thu, 15 Jan 2026 18:18:09 +0800 Subject: [PATCH 1/2] Standardize targets in all projects Enable both 32-bit and 64-bit targets in all projects. 1{ Cleanup MVCDemo (missing unit scopes, change ANSI to UTF8, fix wrong author name due to ANSI encoding), 2) add missing unit MVCTypes uses clause to MVCDemo 3) Added build groups --- Demos/Advanced/Advanced.dproj | 962 +----------------- Demos/Interfaces/charityevents.dproj | 47 +- Demos/Minimal/Minimal.dproj | 56 +- Demos/OLE/OLE.dproj | 39 +- Demos/Objects/MVCDemo.dpr | 11 +- Demos/Objects/MVCDemo.dproj | 17 +- Demos/Objects/MVCDemoMain.pas | 14 +- Demos/Objects/MVCPanel.pas | 11 +- Demos/Objects/MVCTypes.pas | 15 +- Packages/RAD Studio 10.4+/VirtualTreesD.dproj | 9 +- Packages/RAD Studio 10.4+/VirtualTreesR.dpk | 2 +- Packages/RAD Studio 10.4+/VirtualTreesR.dproj | 9 +- VirtualTreesDevelopment.groupproj | 56 + 13 files changed, 244 insertions(+), 1004 deletions(-) diff --git a/Demos/Advanced/Advanced.dproj b/Demos/Advanced/Advanced.dproj index 2740d8da4..5c343f943 100644 --- a/Demos/Advanced/Advanced.dproj +++ b/Demos/Advanced/Advanced.dproj @@ -64,16 +64,18 @@ C:\windows\microsoft.net\framework\v1.1.4322\system.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.data.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.drawing.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.windows.forms.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.xml.dll;vcl;rtl;$(DCC_UsePackage) FileVersion=1.0.0.0 1031 + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) - true System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) $(BDS)\bin\default_app.manifest - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png true CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) 1033 + $(BDS)\bin\delphi_PROJECTICON.ico + PerMonitorV2 System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) @@ -82,7 +84,9 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 $(BDS)\bin\default_app.manifest - true + PerMonitorV2 + .\$(Platform)\$(Config) + $(BDS)\bin\delphi_PROJECTICON.ico RELEASE;$(DCC_Define) @@ -176,6 +180,8 @@ Advanced.dpr + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components @@ -202,954 +208,6 @@ True True - - - - Advanced.exe - true - - - - - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - res\xml - 1 - - - res\xml - 1 - - - - - library\lib\armeabi - 1 - - - library\lib\armeabi - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - library\lib\mips - 1 - - - library\lib\mips - 1 - - - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable-anydpi-v21 - 1 - - - res\drawable-anydpi-v21 - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - res\values-v21 - 1 - - - res\values-v21 - 1 - - - - - res\values-v31 - 1 - - - res\values-v31 - 1 - - - - - res\drawable-anydpi-v26 - 1 - - - res\drawable-anydpi-v26 - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable-anydpi-v33 - 1 - - - res\drawable-anydpi-v33 - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - res\values-night-v21 - 1 - - - res\values-night-v21 - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable-xxhdpi - 1 - - - res\drawable-xxhdpi - 1 - - - - - res\drawable-xxxhdpi - 1 - - - res\drawable-xxxhdpi - 1 - - - - - res\drawable-ldpi - 1 - - - res\drawable-ldpi - 1 - - - - - res\drawable-mdpi - 1 - - - res\drawable-mdpi - 1 - - - - - res\drawable-hdpi - 1 - - - res\drawable-hdpi - 1 - - - - - res\drawable-xhdpi - 1 - - - res\drawable-xhdpi - 1 - - - - - res\drawable-mdpi - 1 - - - res\drawable-mdpi - 1 - - - - - res\drawable-hdpi - 1 - - - res\drawable-hdpi - 1 - - - - - res\drawable-xhdpi - 1 - - - res\drawable-xhdpi - 1 - - - - - res\drawable-xxhdpi - 1 - - - res\drawable-xxhdpi - 1 - - - - - res\drawable-xxxhdpi - 1 - - - res\drawable-xxxhdpi - 1 - - - - - res\drawable-small - 1 - - - res\drawable-small - 1 - - - - - res\drawable-normal - 1 - - - res\drawable-normal - 1 - - - - - res\drawable-large - 1 - - - res\drawable-large - 1 - - - - - res\drawable-xlarge - 1 - - - res\drawable-xlarge - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - res\drawable-anydpi-v24 - 1 - - - res\drawable-anydpi-v24 - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable-night-anydpi-v21 - 1 - - - res\drawable-night-anydpi-v21 - 1 - - - - - res\drawable-anydpi-v31 - 1 - - - res\drawable-anydpi-v31 - 1 - - - - - res\drawable-night-anydpi-v31 - 1 - - - res\drawable-night-anydpi-v31 - 1 - - - - - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - Contents\MacOS - 1 - .framework - - - Contents\MacOS - 1 - .framework - - - Contents\MacOS - 1 - .framework - - - 0 - - - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - 0 - .dll;.bpl - - - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - 0 - .bpl - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - Contents\Resources\StartUp\ - 0 - - - Contents\Resources\StartUp\ - 0 - - - Contents\Resources\StartUp\ - 0 - - - 0 - - - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - ..\ - 1 - - - ..\ - 1 - - - ..\ - 1 - - - - - Contents - 1 - - - Contents - 1 - - - Contents - 1 - - - - - Contents\Resources - 1 - - - Contents\Resources - 1 - - - Contents\Resources - 1 - - - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - Contents\MacOS - 1 - - - Contents\MacOS - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - library\lib\armeabi-v7a - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - ..\ - 1 - - - ..\ - 1 - - - ..\ - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 - - - - - 1 - - - 1 - - - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - - - - - - - - - - - 12 diff --git a/Demos/Interfaces/charityevents.dproj b/Demos/Interfaces/charityevents.dproj index 12c050aa9..5e4c469da 100644 --- a/Demos/Interfaces/charityevents.dproj +++ b/Demos/Interfaces/charityevents.dproj @@ -6,8 +6,8 @@ charityevents.dpr True Debug - Win32 - 1 + Win64 + 3 Application charityevents @@ -35,11 +35,23 @@ true true + + true + Cfg_1 + true + true + true Base true + + true + Cfg_2 + true + true + ..\..\Source;$(DCC_UnitSearchPath) System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) @@ -52,6 +64,9 @@ false false charityevents + .\$(Platform)\$(Config) + 2057 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= true @@ -60,13 +75,16 @@ CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) $(BDS)\bin\default_app.manifest Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + PerMonitorV2 dxBarRS18;dxPSCoreRS18;dxSkinOffice2007GreenRS18;dxPScxPCProdRS18;dxSkinBlueRS18;cxTreeListRS18;dxDockingRS18;dxThemeRS18;dxPSdxOCLnkRS18;dxSkinsdxRibbonPainterRS18;dxSkinOffice2007BlueRS18;DBXInterBaseDriver;DataSnapCommon;cxTreeListdxBarPopupMenuRS18;dxSkinsdxBarPainterRS18;dxGaugeControlRS18;DbxCommonDriver;vclimg;dxPSdxGaugeControlLnkRS18;dbxcds;dxSkinscxPCPainterRS18;vcldb;dxSkinDarkRoomRS18;cxExportRS18;dxSkinVisualStudio2013BlueRS18;CustomIPTransport;dxSkinBlueprintRS18;dsnap;IndyIPServer;dxSkinOffice2010BlueRS18;IndyCore;cxVerticalGridRS18;CloudService;dxPSdxDBOCLnkRS18;FmxTeeUI;dxADOServerModeRS18;dxSkinDarkSideRS18;dxPScxExtCommonRS18;cxSchedulerRibbonStyleEventEditorRS18;cxEditorsRS18;cxSchedulerRS18;dxSpellCheckerRS18;dxPScxVGridLnkRS18;dxSkinSharpPlusRS18;dxSkinValentineRS18;dxRibbonRS18;dxSkinGlassOceansRS18;bindcompfmx;dxRibbonCustomizationFormRS18;cxPageControlRS18;dxSkinSharpRS18;dbrtl;dxSkinDevExpressDarkStyleRS18;bindcomp;dxMapControlRS18;dxSkinVisualStudio2013LightRS18;dxSkinXmas2008BlueRS18;dxPSdxSpreadSheetLnkRS18;xmlrtl;ibxpress;dxBarExtItemsRS18;dxSkinLiquidSkyRS18;dxSkinPumpkinRS18;dxSkinOffice2013WhiteRS18;vclactnband;bindengine;soaprtl;FMXTee;dxSkinMetropolisRS18;bindcompvcl;dxPsPrVwAdvRS18;cxPivotGridRS18;vclie;dxmdsRS18;dxBarDBNavRS18;dxTileControlRS18;dxComnRS18;dxWizardControlRS18;dxBarExtDBItemsRS18;dxPScxSchedulerLnkRS18;dxNavBarRS18;dsnapcon;dxPSTeeChartRS18;inet;dxSkinOffice2016DarkRS18;dxSkinscxSchedulerPainterRS18;dxPScxCommonRS18;dxSkinWhiteprintRS18;vclx;dxorgcRS18;dbexpress;dxSkinOffice2007BlackRS18;dxSkinSummer2008RS18;IndyIPClient;dxSkinBlackRS18;dxGDIPlusRS18;dxSkinCoffeeRS18;dxLayoutControlRS18;dxSkinMoneyTwinsRS18;dxSkinVS2010RS18;DBXSqliteDriver;dxPSdxMapControlLnkRS18;fmx;IndySystem;TeeDB;vclib;dxPScxTLLnkRS18;dxSkinOffice2013DarkGrayRS18;cxSchedulerGridRS18;dxtrmdRS18;dxSkinSilverRS18;dxHttpIndyRequestRS18;dxTabbedMDIRS18;MetropolisUILiveTile;dxPSLnksRS18;vcldsnap;dxPScxPivotGridLnkRS18;dxSkinVisualStudio2013DarkRS18;dxSkinOffice2010SilverRS18;dxServerModeRS18;vclribbon;dxdborRS18;dxRichEditControlRS18;dxSkinsdxDLPainterRS18;fmxase;vcl;IndyIPCommon;cxPivotGridChartRS18;inetdbxpress;webdsnap;dxPScxGridLnkRS18;dxSkinsCoreRS18;dxSkinLondonLiquidSkyRS18;cxLibraryRS18;dxSpreadSheetConditionalFormattingDialogsRS18;adortl;dxSkinOffice2013LightGrayRS18;dxSkinDevExpressStyleRS18;dxSkinTheAsphaltWorldRS18;dxSkinSpringTimeRS18;dxSkinHighContrastRS18;dxPSdxDBTVLnkRS18;dxSpreadSheetRS18;dxSkinCaramelRS18;dxSkinOffice2007SilverRS18;rtl;DbxClientDriver;dxSkinMetropolisDarkRS18;Tee;dxSkinStardustRS18;dxDBXServerModeRS18;IndyProtocols;DBXMySQLDriver;dxSkiniMaginaryRS18;dxSkinOffice2016ColorfulRS18;dxFlowChartRS18;dxPSRichEditControlLnkRS18;bindcompdbx;TeeUI;dxSkinMcSkinRS18;vcltouch;dxPSPrVwRibbonRS18;dxSkinOffice2007PinkRS18;dxPSdxFCLnkRS18;VclSmp;cxGridRS18;dxSkinSevenRS18;dxSkinOffice2010BlackRS18;cxSchedulerTreeBrowserRS18;dxPSDBTeeChartRS18;dxdbtrRS18;dxCoreRS18;fmxobj;dxSkinFoggyRS18;dxSkinSevenClassicRS18;dxSkinsdxNavBarPainterRS18;dxSkinLilianRS18;dxPSdxLCLnkRS18;fmxdae;cxPivotGridOLAPRS18;cxDataRS18;VirtualTreesR;$(DCC_UsePackage) - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + 1033 + $(BDS)\bin\default_app.manifest + PerMonitorV2 DEBUG;$(DCC_Define) @@ -82,12 +100,20 @@ false Debug + + PerMonitorV2 + true + 1033 + false RELEASE;$(DCC_Define) 0 0 + + PerMonitorV2 + MainSource @@ -160,14 +186,15 @@ charityevents.dpr - Microsoft Office 2000 Sample Automation Server Wrapper Components - Microsoft Office XP Sample Automation Server Wrapper Components + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components - True - False + True 12 diff --git a/Demos/Minimal/Minimal.dproj b/Demos/Minimal/Minimal.dproj index c6ac5a90a..04ca7a2c3 100644 --- a/Demos/Minimal/Minimal.dproj +++ b/Demos/Minimal/Minimal.dproj @@ -5,10 +5,10 @@ Debug VCL Minimal.dpr - Win32 + Win64 {9ED56071-1730-40BE-A992-27309A7C55CB} 20.2 - 1 + 3 Minimal @@ -19,11 +19,22 @@ Base true + + true + Base + true + true Base true + + true + Cfg_1 + true + true + true Base @@ -35,6 +46,12 @@ true true + + true + Cfg_2 + true + true + Minimal 00400000 @@ -45,16 +62,27 @@ vcl;rtl;vclx;$(DCC_UsePackage) CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= 1031 + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) PerMonitor - true System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) $(BDS)\bin\default_app.manifest - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png true 1033 + $(BDS)\bin\delphi_PROJECTICON.ico + + + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + $(BDS)\bin\default_app.manifest + $(BDS)\bin\delphi_PROJECTICON.ico + PerMonitorV2 0 @@ -62,6 +90,9 @@ false 0 + + PerMonitorV2 + DEBUG;$(DCC_Define) true @@ -70,6 +101,12 @@ Debug + + PerMonitorV2 + true + 1033 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + MainSource @@ -124,14 +161,21 @@ 1.0.0.0 + + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + True - False + True 12 + diff --git a/Demos/OLE/OLE.dproj b/Demos/OLE/OLE.dproj index 772b60813..02ba66bb0 100644 --- a/Demos/OLE/OLE.dproj +++ b/Demos/OLE/OLE.dproj @@ -5,10 +5,10 @@ Debug VCL OLE.dpr - Win32 + Win64 {3C00F0E3-8F50-46FC-A49D-A7B9DC7DF0A7} 20.2 - 1 + 3 OLE @@ -19,11 +19,22 @@ Base true + + true + Base + true + true Base true + + true + Cfg_1 + true + true + true Base @@ -35,6 +46,12 @@ true true + + true + Cfg_2 + true + true + OLE 00400000 @@ -50,17 +67,26 @@ true System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) $(BDS)\bin\default_app.manifest - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png true 1033 + + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + $(BDS)\bin\default_app.manifest + 0 RELEASE;$(DCC_Define) false 0 + + PerMonitorV2 + DEBUG;$(DCC_Define) true @@ -69,6 +95,9 @@ Debug + + PerMonitorV2 + MainSource @@ -126,7 +155,7 @@ True - False + True 12 diff --git a/Demos/Objects/MVCDemo.dpr b/Demos/Objects/MVCDemo.dpr index f5d13a3b2..55df96954 100644 --- a/Demos/Objects/MVCDemo.dpr +++ b/Demos/Objects/MVCDemo.dpr @@ -1,7 +1,7 @@ -program MVCDemo; +program MVCDemo; -{ (c) 2000 Marian Aldenhövel - Hainstraße 8 +{ (c) 2000 Marian Aldenhövel + Hainstraße 8 53121 Bonn +49 228 6203366 Fax: +49 228 624031 @@ -12,12 +12,13 @@ program MVCDemo; uses Forms, MVCDemoMain in 'MVCDemoMain.pas' {fmMVCDemo}, - MVCPanel in 'MVCPanel.pas'; + MVCPanel in 'MVCPanel.pas', + MVCTypes in 'MVCTypes.pas'; {$R *.RES} begin Application.Initialize; - Application.CreateForm(TfmMVCDemo,fmMVCDemo); + Application.CreateForm(TfmMVCDemo, fmMVCDemo); Application.Run; end. diff --git a/Demos/Objects/MVCDemo.dproj b/Demos/Objects/MVCDemo.dproj index dfc5c6ff2..ff7c8b132 100644 --- a/Demos/Objects/MVCDemo.dproj +++ b/Demos/Objects/MVCDemo.dproj @@ -61,19 +61,22 @@ ..\..\Source;$(DCC_UnitSearchPath) true MVCDemo + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) 1033 true System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) $(BDS)\bin\default_app.manifest - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + $(BDS)\bin\delphi_PROJECTICON.ico + PerMonitorV2 - MVCDemo_Icon.ico - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + $(BDS)\bin\delphi_PROJECTICON.ico + (None) + PerMonitorV2 0 @@ -103,6 +106,7 @@
fmMVCDemo
+ Base @@ -151,6 +155,8 @@ + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components @@ -164,4 +170,5 @@ + diff --git a/Demos/Objects/MVCDemoMain.pas b/Demos/Objects/MVCDemoMain.pas index 5fdee2ff8..532ded4e6 100644 --- a/Demos/Objects/MVCDemoMain.pas +++ b/Demos/Objects/MVCDemoMain.pas @@ -1,7 +1,7 @@ -unit MVCDemoMain; +unit MVCDemoMain; -{ (c) 2000 Marian Aldenhövel - Hainstraße 8 +{ (c) 2000 Marian Aldenhövel + Hainstraße 8 53121 Bonn +49 228 6203366 Fax: +49 228 624031 @@ -13,9 +13,11 @@ interface -uses Windows,Messages,SysUtils,Classes,Graphics,Controls,Forms,Dialogs, - MVCTypes,MVCPanel,StdCtrls,ExtCtrls,ImgList,VirtualTrees,ComCtrls, - Buttons, System.ImageList; +uses + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics, + Vcl.Controls, Vcl.Forms, Vcl.Dialogs, MVCTypes, MVCPanel, Vcl.StdCtrls, + Vcl.ExtCtrls, Vcl.ImgList, VirtualTrees, Vcl.ComCtrls, Vcl.Buttons, + System.ImageList; type TfmMVCDemo=class(TForm) pnlControls:TPanel; diff --git a/Demos/Objects/MVCPanel.pas b/Demos/Objects/MVCPanel.pas index 8b09cd108..8047fcea5 100644 --- a/Demos/Objects/MVCPanel.pas +++ b/Demos/Objects/MVCPanel.pas @@ -1,7 +1,7 @@ -unit MVCPanel; +unit MVCPanel; -{ (c) 2000 Marian Aldenhövel - Hainstraße 8 +{ (c) 2000 Marian Aldenhövel + Hainstraße 8 53121 Bonn +49 228 6203366 Fax: +49 228 624031 @@ -23,8 +23,9 @@ interface -uses Windows,Controls,Graphics,SysUtils,Classes,ExtCtrls,StdCtrls, - MVCTypes,VirtualTrees, VirtualTrees.BaseTree; +uses + Winapi.Windows, Vcl.Controls, Vcl.Graphics, System.SysUtils, System.Classes, + Vcl.ExtCtrls, Vcl.StdCtrls, MVCTypes, VirtualTrees, VirtualTrees.BaseTree; type TMVCPanel=class(TCustomPanel) private diff --git a/Demos/Objects/MVCTypes.pas b/Demos/Objects/MVCTypes.pas index bb39264e8..6b39ca644 100644 --- a/Demos/Objects/MVCTypes.pas +++ b/Demos/Objects/MVCTypes.pas @@ -1,7 +1,7 @@ -unit MVCTypes; +unit MVCTypes; -{ (c) 2000 Marian Aldenhövel - Hainstraße 8 +{ (c) 2000 Marian Aldenhövel + Hainstraße 8 53121 Bonn +49 228 6203366 Fax: +49 228 624031 @@ -54,9 +54,10 @@ interface -uses Windows,Messages,SysUtils,Graphics,VirtualTrees,Classes,StdCtrls, - Controls,Forms,ImgList, VirtualTrees.Types, VirtualTrees.BaseTree, - System.Types, System.UITypes; +uses + Winapi.Windows, Winapi.Messages, System.SysUtils, Vcl.Graphics, VirtualTrees, + System.Classes, Vcl.StdCtrls, Vcl.Controls, Vcl.Forms, Vcl.ImgList, + VirtualTrees.Types, VirtualTrees.BaseTree, System.Types, System.UITypes; type { TMVCNode is the encapsulation of a single Node in the structure. This implementation is a bit bloated because in my project @@ -568,7 +569,7 @@ function TMVCTreeView.GetNodeText(aNode:TMVCNode;aColumn:integer):string; 63:Result:='Max.'; else Result:='What?'; end; (* of case Incidence *) - else Result:='What *"§ added columns without giving data?'; + else Result:='What *"§ added columns without giving data?'; end; (* of case aColumn *) end; diff --git a/Packages/RAD Studio 10.4+/VirtualTreesD.dproj b/Packages/RAD Studio 10.4+/VirtualTreesD.dproj index b0cc108a4..7c97dcc69 100644 --- a/Packages/RAD Studio 10.4+/VirtualTreesD.dproj +++ b/Packages/RAD Studio 10.4+/VirtualTreesD.dproj @@ -51,6 +51,8 @@ true CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= 1053 + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) @@ -101,7 +103,12 @@ VirtualTreesD.dpk - + + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + True False diff --git a/Packages/RAD Studio 10.4+/VirtualTreesR.dpk b/Packages/RAD Studio 10.4+/VirtualTreesR.dpk index f65fc3b6e..fd8bf7ad0 100644 --- a/Packages/RAD Studio 10.4+/VirtualTreesR.dpk +++ b/Packages/RAD Studio 10.4+/VirtualTreesR.dpk @@ -9,7 +9,7 @@ package VirtualTreesR; {$EXTENDEDSYNTAX ON} {$IMPORTEDDATA ON} {$IOCHECKS ON} -{$LOCALSYMBOLS ON} +{$LOCALSYMBOLS OFF} {$LONGSTRINGS ON} {$OPENSTRINGS ON} {$OPTIMIZATION ON} diff --git a/Packages/RAD Studio 10.4+/VirtualTreesR.dproj b/Packages/RAD Studio 10.4+/VirtualTreesR.dproj index 10230a053..82e9103f0 100644 --- a/Packages/RAD Studio 10.4+/VirtualTreesR.dproj +++ b/Packages/RAD Studio 10.4+/VirtualTreesR.dproj @@ -50,6 +50,8 @@ true CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= 1053 + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) @@ -121,7 +123,12 @@ VirtualTreesR.dpk - + + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + True False diff --git a/VirtualTreesDevelopment.groupproj b/VirtualTreesDevelopment.groupproj index 59756a938..0ccd7286d 100644 --- a/VirtualTreesDevelopment.groupproj +++ b/VirtualTreesDevelopment.groupproj @@ -129,4 +129,60 @@ + + + {A34BA07B-19B6-4C21-9DEE-65FCA52D00AB} + Debug;Release + Win32;Win64 + True + + + {E5FD8257-AE07-4A8D-AB79-44170493F9A2} + Debug;Release + Win32;Win64 + True + + + {9ED56071-1730-40BE-A992-27309A7C55CB} + Debug;Release + Win32;Win64 + True + + + {6F55E0E5-85F8-4FA9-A27A-459F45DA2FA4} + Debug;Release + Win32;Win64 + True + + + {3C00F0E3-8F50-46FC-A49D-A7B9DC7DF0A7} + Debug;Release + Win32;Win64 + True + + + {527B0DE7-5A48-4EA5-9810-F0952ADD7A9C} + Debug;Release + Win32;Win64 + True + + + {B90F6CEF-381E-4531-ACD8-5F0D652EC358} + Debug;Release + Win32;Win64 + True + + + {B62F3689-96E1-47D5-9FB2-2A2718281FDB} + Debug;Release + Win32;Win64 + True + + + {D37CFA56-3B13-4C93-91F7-DDC227C20116} + Debug;Release + Win32;Win64 + True + + From 21cbb066c761bab38d8df0d0da4d0dad67d56ede Mon Sep 17 00:00:00 2001 From: chuacw <1757930+chuacw@users.noreply.github.com> Date: Thu, 15 Jan 2026 18:56:26 +0800 Subject: [PATCH 2/2] Fix missing unit scope Fix missing unit scope --- Demos/Objects/MVCTypes.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Demos/Objects/MVCTypes.pas b/Demos/Objects/MVCTypes.pas index 6b39ca644..4df0859b8 100644 --- a/Demos/Objects/MVCTypes.pas +++ b/Demos/Objects/MVCTypes.pas @@ -678,7 +678,7 @@ procedure TMVCTreeView.DoPaintNode(var PaintInfo: TVTPaintInfo); else Brush.Color:=clBlack; SaveFontColor:=Font.Color; Font.Color:=Self.Color; - Windows.DrawFocusRect(Handle,ContentRect); + Winapi.Windows.DrawFocusRect(Handle,ContentRect); Font.Color:=SaveFontColor; end;