Merge branch 'main' into novista

Projects/Compil32.dpr

@@ -14,7 +14,7 @@ uses
   Windows,
   SysUtils,
   Forms,
-  PathFunc,
+  PathFunc in '..\Components\PathFunc.pas',
   CompForm in 'CompForm.pas' {CompileForm},
   CmnFunc in 'CmnFunc.pas',
   CmnFunc2 in 'CmnFunc2.pas',
@@ -39,7 +39,14 @@ uses
   CompMsgBoxDesigner in 'CompMsgBoxDesigner.pas' {MsgBoxDesignerForm},
   CompScintEdit in 'CompScintEdit.pas',
   CompFilesDesigner in 'CompFilesDesigner.pas' {FilesDesignerForm},
-  CompWizardFilesHelper in 'CompWizardFilesHelper.pas';
+  CompWizardFilesHelper in 'CompWizardFilesHelper.pas',
+  NewTabSet in '..\Components\NewTabSet.pas',
+  dwTaskbarList in '..\Components\dwTaskbarList.pas',
+  NewStaticText in '..\Components\NewStaticText.pas',
+  BidiUtils in '..\Components\BidiUtils.pas',
+  DropListBox in '..\Components\DropListBox.pas',
+  NewCheckListBox in '..\Components\NewCheckListBox.pas',
+  NewNotebook in '..\Components\NewNotebook.pas';
 
 {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}

Projects/Compil32.dproj

@@ -35,7 +35,7 @@
         <DCC_DebugInformation>1</DCC_DebugInformation>
         <DCC_WriteableConstants>true</DCC_WriteableConstants>
         <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
-        <DCC_UnitSearchPath>..\Components;..\Components\UniPs\Source;ISPP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\Components\UniPs\Source;ISPP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_UsePackage>VCL30;vclx30;VclSmp30;vcldb30;vcldbx30;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_Define>PS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS;$(DCC_Define)</DCC_Define>
         <SanitizedProjectName>Compil32</SanitizedProjectName>
@@ -120,6 +120,13 @@
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="CompWizardFilesHelper.pas"/>
+        <DCCReference Include="..\Components\NewTabSet.pas"/>
+        <DCCReference Include="..\Components\dwTaskbarList.pas"/>
+        <DCCReference Include="..\Components\NewStaticText.pas"/>
+        <DCCReference Include="..\Components\BidiUtils.pas"/>
+        <DCCReference Include="..\Components\DropListBox.pas"/>
+        <DCCReference Include="..\Components\NewCheckListBox.pas"/>
+        <DCCReference Include="..\Components\NewNotebook.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/ISCC.dpr

@@ -16,9 +16,15 @@ program ISCC;
 
 uses
   SafeDLLPath in 'SafeDLLPath.pas',
-  Windows, SysUtils, Classes,
-  {$IFDEF STATICCOMPILER} Compile, {$ENDIF}
-  PathFunc, CmnFunc2, CompInt, FileClass, CompTypes;
+  Windows,
+  SysUtils,
+  Classes,
+  {$IFDEF STATICCOMPILER} Compile in 'Compile.pas', {$ENDIF}
+  PathFunc in '..\Components\PathFunc.pas',
+  CmnFunc2 in 'CmnFunc2.pas',
+  CompInt in 'CompInt.pas',
+  FileClass in 'FileClass.pas',
+  CompTypes in 'CompTypes.pas';
 
 {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} 
 {$SETPEOSVERSION 6.1}

Projects/ISCC.dproj

@@ -36,7 +36,7 @@
         <DCC_WriteableConstants>true</DCC_WriteableConstants>
         <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
         <DCC_ConsoleTarget>true</DCC_ConsoleTarget>
-        <DCC_UnitSearchPath>..\Components;..\Components\UniPs\Source;ISPP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\Components\UniPs\Source;ISPP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_UsePackage>VCL30;vclx30;VclSmp30;vcldb30;vcldbx30;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_Define>PS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS;$(DCC_Define)</DCC_Define>
         <SanitizedProjectName>ISCC</SanitizedProjectName>
@@ -76,6 +76,12 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="SafeDLLPath.pas"/>
+        <DCCReference Include="Compile.pas"/>
+        <DCCReference Include="..\Components\PathFunc.pas"/>
+        <DCCReference Include="CmnFunc2.pas"/>
+        <DCCReference Include="CompInt.pas"/>
+        <DCCReference Include="FileClass.pas"/>
+        <DCCReference Include="CompTypes.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/ISCmplr.dpr

@@ -29,7 +29,8 @@ uses
   LZMA in 'LZMA.pas',
   FileClass in 'FileClass.pas',
   ArcFour in 'ArcFour.pas',
-  VerInfo in 'VerInfo.pas';
+  VerInfo in 'VerInfo.pas',
+  PathFunc in '..\Components\PathFunc.pas';
 
 {$IMAGEBASE $00800000}
 {$SETPEOSVERSION 6.1}

Projects/ISCmplr.dproj

@@ -35,7 +35,7 @@
         <DCC_DebugInformation>1</DCC_DebugInformation>
         <DCC_WriteableConstants>true</DCC_WriteableConstants>
         <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
-        <DCC_UnitSearchPath>..\Components;..\Components\UniPs\Source;ISPP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\Components\UniPs\Source;ISPP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_UsePackage>VCL30;vclx30;VclSmp30;vcldb30;vcldbx30;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_Define>PS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS;$(DCC_Define)</DCC_Define>
         <GenDll>true</GenDll>
@@ -98,6 +98,7 @@
         <DCCReference Include="FileClass.pas"/>
         <DCCReference Include="ArcFour.pas"/>
         <DCCReference Include="VerInfo.pas"/>
+        <DCCReference Include="..\Components\PathFunc.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/ISPP/IsppFuncs.pas

@@ -1368,7 +1368,7 @@ begin
         try
           MakeInt(ResPtr^, 1);
           if not DoAppend and (CodePage = CP_UTF8) then
-            Write(F, #$FEFF); //UTF8 BOM as a single Unicode character
+            Write(F, #$FEFF); //Strings are UTF-16 so this UTF-16 BOM will actually be saved as an UTF-8 BOM
           Write(F, Get(1).AsStr);
         finally
           CloseFile(F);

Projects/Setup.dpr

@@ -16,7 +16,7 @@ uses
   Windows,
   SysUtils,
   Messages,
-  RichEditViewer,
+  RichEditViewer in '..\Components\RichEditViewer.pas',
   CmnFunc in 'CmnFunc.pas',
   CmnFunc2 in 'CmnFunc2.pas',
   Main in 'Main.pas' {MainForm},
@@ -67,7 +67,22 @@ uses
   SpawnCommon in 'SpawnCommon.pas',
   SpawnServer in 'SpawnServer.pas',
   SpawnClient in 'SpawnClient.pas',
-  TaskDialog in 'TaskDialog.pas';
+  TaskDialog in 'TaskDialog.pas',
+  BidiUtils in '..\Components\BidiUtils.pas',
+  PathFunc in '..\Components\PathFunc.pas',
+  BidiCtrls in '..\Components\BidiCtrls.pas',
+  BitmapImage in '..\Components\BitmapImage.pas',
+  FolderTreeView in '..\Components\FolderTreeView.pas',
+  NewCheckListBox in '..\Components\NewCheckListBox.pas',
+  NewNotebook in '..\Components\NewNotebook.pas',
+  NewProgressBar in '..\Components\NewProgressBar.pas',
+  NewStaticText in '..\Components\NewStaticText.pas',
+  PasswordEdit in '..\Components\PasswordEdit.pas',
+  TmSchema in '..\Components\TmSchema.pas',
+  RestartManager in '..\Components\RestartManager.pas',
+  Resample in '..\Components\Resample.pas',
+  dwTaskbarList in '..\Components\dwTaskbarList.pas',
+  ASMInline in '..\Components\ASMInline.pas';
 
 {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}
@@ -284,7 +299,7 @@ begin
     Application.Initialize;
     InitializeSetup;
     Application.CreateForm(TMainForm, MainForm);
-    MainForm.InitializeWizard;
+  MainForm.InitializeWizard;
   except
     { Halt on any exception }
     ShowExceptionMsg;

Projects/Setup.dproj

@@ -35,7 +35,7 @@
         <DCC_DebugInformation>1</DCC_DebugInformation>
         <DCC_WriteableConstants>true</DCC_WriteableConstants>
         <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
-        <DCC_UnitSearchPath>..\Components;..\Components\UniPs\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\Components\UniPs\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_Define>PS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS;$(DCC_Define)</DCC_Define>
         <SanitizedProjectName>Setup</SanitizedProjectName>
         <VerInfo_Locale>1043</VerInfo_Locale>
@@ -76,6 +76,7 @@
         </DelphiCompile>
         <DCCReference Include="SafeDLLPath.pas"/>
         <DCCReference Include="XPTheme.pas"/>
+        <DCCReference Include="..\Components\RichEditViewer.pas"/>
         <DCCReference Include="CmnFunc.pas"/>
         <DCCReference Include="CmnFunc2.pas"/>
         <DCCReference Include="Main.pas">
@@ -141,6 +142,21 @@
         <DCCReference Include="SpawnServer.pas"/>
         <DCCReference Include="SpawnClient.pas"/>
         <DCCReference Include="TaskDialog.pas"/>
+        <DCCReference Include="..\Components\BidiUtils.pas"/>
+        <DCCReference Include="..\Components\PathFunc.pas"/>
+        <DCCReference Include="..\Components\BidiCtrls.pas"/>
+        <DCCReference Include="..\Components\BitmapImage.pas"/>
+        <DCCReference Include="..\Components\FolderTreeView.pas"/>
+        <DCCReference Include="..\Components\NewCheckListBox.pas"/>
+        <DCCReference Include="..\Components\NewNotebook.pas"/>
+        <DCCReference Include="..\Components\NewProgressBar.pas"/>
+        <DCCReference Include="..\Components\NewStaticText.pas"/>
+        <DCCReference Include="..\Components\PasswordEdit.pas"/>
+        <DCCReference Include="..\Components\TmSchema.pas"/>
+        <DCCReference Include="..\Components\RestartManager.pas"/>
+        <DCCReference Include="..\Components\Resample.pas"/>
+        <DCCReference Include="..\Components\dwTaskbarList.pas"/>
+        <DCCReference Include="..\Components\ASMInline.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/SetupLdr.dpr

@@ -18,7 +18,7 @@ uses
   Compress in 'Compress.pas',
   LZMADecompSmall in 'LZMADecompSmall.pas',
   SetupEnt in 'SetupEnt.pas',
-  PathFunc,
+  PathFunc in '..\Components\PathFunc.pas',
   CmnFunc2 in 'CmnFunc2.pas',
   Msgs in 'Msgs.pas',
   MsgIDs in 'MsgIDs.pas',

Projects/SetupLdr.dproj

@@ -35,7 +35,6 @@
         <DCC_DebugInformation>1</DCC_DebugInformation>
         <DCC_WriteableConstants>true</DCC_WriteableConstants>
         <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
-        <DCC_UnitSearchPath>..\Components;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <SanitizedProjectName>SetupLdr</SanitizedProjectName>
         <VerInfo_Locale>1043</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
@@ -77,6 +76,7 @@
         <DCCReference Include="Compress.pas"/>
         <DCCReference Include="LZMADecompSmall.pas"/>
         <DCCReference Include="SetupEnt.pas"/>
+        <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="CmnFunc2.pas"/>
         <DCCReference Include="Msgs.pas"/>
         <DCCReference Include="MsgIDs.pas"/>

compile.bat

@@ -43,23 +43,23 @@ if errorlevel 1 goto failed
 cd ..
 
 echo - Compil32.dpr
-"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi;vcl;vcl.imaging -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components;..\Components\UniPs\Source;ISPP" -E..\Files -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS Compil32.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi;vcl;vcl.imaging -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components\UniPs\Source;ISPP" -E..\Files -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS Compil32.dpr
 if errorlevel 1 goto failed
 
 echo - ISCC.dpr
-"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components;..\Components\UniPs\Source" -E..\Files -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS ISCC.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components\UniPs\Source" -E..\Files -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS ISCC.dpr
 if errorlevel 1 goto failed
 
 echo - ISCmplr.dpr
-"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi;vcl -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components;..\Components\UniPs\Source;ISPP" -E..\Files -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS ISCmplr.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi;vcl -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components\UniPs\Source;ISPP" -E..\Files -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS ISCmplr.dpr
 if errorlevel 1 goto failed
 
 echo - SetupLdr.dpr
-"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components" -E..\Files SetupLdr.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release" -E..\Files SetupLdr.dpr
 if errorlevel 1 goto failed
 
 echo - Setup.dpr
-"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi;vcl -Q -B -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components;..\Components\UniPs\Source" -E..\Files -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS Setup.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSsystem;system.win;winapi;vcl -Q -B -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components\UniPs\Source" -E..\Files -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS Setup.dpr
 if errorlevel 1 goto failed
 
 echo - Renaming E32 files