2
0
Эх сурвалжийг харах

Enable typed @ operator in Compil32 and ISCmplr. So now it's enabled in all projects, including ISHelpGen.

Martijn Laan 1 долоо хоног өмнө
parent
commit
629ba03c08

+ 2 - 2
Components/ScintEdit.pas

@@ -2659,13 +2659,13 @@ end;
 procedure TScintEditStrings.CheckIndexRange(const Index: Integer);
 begin
   if (Index < 0) or (Index >= GetCount) then
-    Error(@SListIndexError, Index);
+    Error(SListIndexError, Index);
 end;
 
 procedure TScintEditStrings.CheckIndexRangePlusOne(const Index: Integer);
 begin
   if (Index < 0) or (Index > GetCount) then
-    Error(@SListIndexError, Index);
+    Error(SListIndexError, Index);
 end;
 
 procedure TScintEditStrings.Clear;

+ 2 - 2
ISHelp/ISHelpGen/compile.bat

@@ -28,14 +28,14 @@ rem -------------------------------------------------------------------------
 
 set DELPHIXEDISABLEDWARNINGS=-W-SYMBOL_DEPRECATED -W-SYMBOL_PLATFORM -W-UNSAFE_CAST -W-EXPLICIT_STRING_CAST -W-EXPLICIT_STRING_CAST_LOSS -W-IMPLICIT_INTEGER_CAST_LOSS -W-IMPLICIT_CONVERSION_LOSS
 
-set FLAGS=--no-config -Q -B -$L- -$C- -H -W %DELPHIXEDISABLEDWARNINGS% %1
+set FLAGS=--no-config -Q -B -$L- -$C- -H -W -$T+ %DELPHIXEDISABLEDWARNINGS% %1
 set FLAGSCONSOLE=%FLAGS% -CC
 set NAMESPACES=System;System.Win;Winapi
 set DCUDIR_WIN32=Dcu\Win32\Release
 
 echo Compiling ISHelpGen.exe:
 mkdir %DCUDIR_WIN32%\ISHelpGen.dpr 2>nul
-"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSCONSOLE% -$T+ -NS%NAMESPACES% -U"%DELPHIXELIB_WIN32%" -NU%DCUDIR_WIN32%\ISHelpGen.dpr ISHelpGen.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSCONSOLE% -NS%NAMESPACES% -U"%DELPHIXELIB_WIN32%" -NU%DCUDIR_WIN32%\ISHelpGen.dpr ISHelpGen.dpr
 if errorlevel 1 goto failed
 
 echo Success!

+ 1 - 0
Projects/Compil32.dproj

@@ -46,6 +46,7 @@
         <DCC_EXPLICIT_STRING_CAST_LOSS>false</DCC_EXPLICIT_STRING_CAST_LOSS>
         <DCC_IMPLICIT_INTEGER_CAST_LOSS>false</DCC_IMPLICIT_INTEGER_CAST_LOSS>
         <DCC_IMPLICIT_CONVERSION_LOSS>false</DCC_IMPLICIT_CONVERSION_LOSS>
+        <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
         <Custom_Styles>&quot;Windows11 Modern Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Dark.vsf&quot;</Custom_Styles>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">

+ 1 - 0
Projects/ISCmplr.dproj

@@ -47,6 +47,7 @@
         <DCC_EXPLICIT_STRING_CAST_LOSS>false</DCC_EXPLICIT_STRING_CAST_LOSS>
         <DCC_IMPLICIT_INTEGER_CAST_LOSS>false</DCC_IMPLICIT_INTEGER_CAST_LOSS>
         <DCC_IMPLICIT_CONVERSION_LOSS>false</DCC_IMPLICIT_CONVERSION_LOSS>
+        <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <BT_BuildType>Debug</BT_BuildType>

+ 3 - 3
Projects/Src/Compression.LZMACompressor.pas

@@ -539,7 +539,7 @@ begin
 
   H[0] := FEvents.TerminateWorkerEvent;
   H[1] := FEvents.StartEncodeEvent;
-  while WaitForMultipleObjects(2, @H, False, INFINITE) = WAIT_OBJECT_0 + 1 do begin
+  while WaitForMultipleObjects(2, PWOHandleArray(@H), False, INFINITE) = WAIT_OBJECT_0 + 1 do begin
     FShared.EncodeResult := LZMA_Encode(FLZMAHandle, InStream, OutStream,
       CompressProgress);
     if not SetEvent(FEvents.WorkerEncodeFinishedEvent) then
@@ -559,7 +559,7 @@ begin
   end;
   H[0] := FEvents.TerminateWorkerEvent;
   H[1] := AWaitEvent;
-  case WaitForMultipleObjects(2, @H, False, INFINITE) of
+  case WaitForMultipleObjects(2, PWOHandleArray(@H), False, INFINITE) of
     WAIT_OBJECT_0 + 0: Result := E_ABORT;
     WAIT_OBJECT_0 + 1: Result := S_OK;
   else
@@ -1101,7 +1101,7 @@ begin
   H[2] := FProgressTimer;
   H[3] := FEvents.WorkerWaitingOnInputEvent;
   H[4] := FEvents.WorkerWaitingOnOutputEvent;
-  case WaitForMultipleObjects(5, @H, False, INFINITE) of
+  case WaitForMultipleObjects(5, PWOHandleArray(@H), False, INFINITE) of
     WAIT_OBJECT_0 + 0: FWorker.UnexpectedTerminationError;
     WAIT_OBJECT_0 + 1: FEncodeFinished := True;
     WAIT_OBJECT_0 + 2: FProgressTimerSignaled := True;

+ 2 - 2
Projects/Src/IDE.MainForm.MRUHelper.pas

@@ -132,7 +132,7 @@ begin
     { Ignore any exceptions. }
   end;
   try
-    ModifyMRUList(FMRUMainFilesList, 'ScriptFileHistoryNew', 'History', AFileName, AddNewItem, @PathCompare);
+    ModifyMRUList(FMRUMainFilesList, 'ScriptFileHistoryNew', 'History', AFileName, AddNewItem, TMRUItemCompareProc(@PathCompare));
   except
     { Handle exceptions locally; failure to save the MRU list should not be
       a fatal error. }
@@ -159,7 +159,7 @@ begin
     { Ignore any exceptions. }
   end;
   try
-    ModifyMRUList(FMRUParametersList, 'ParametersHistory', 'History', AParameter, AddNewItem, @CompareText);
+    ModifyMRUList(FMRUParametersList, 'ParametersHistory', 'History', AParameter, AddNewItem, TMRUItemCompareProc(@CompareText));
   except
     { Handle exceptions locally; failure to save the MRU list should not be
       a fatal error. }

+ 8 - 8
compile.bat

@@ -35,7 +35,7 @@ rem  if multiple projects are specified on the command line.
 
 set DELPHIXEDISABLEDWARNINGS=-W-SYMBOL_DEPRECATED -W-SYMBOL_PLATFORM -W-UNSAFE_CAST -W-EXPLICIT_STRING_CAST -W-EXPLICIT_STRING_CAST_LOSS
 
-set FLAGS=--no-config -Q -B -$L- -$C- -H -W %DELPHIXEDISABLEDWARNINGS% %1 -E..\Files
+set FLAGS=--no-config -Q -B -$L- -$C- -H -W -$T+ %DELPHIXEDISABLEDWARNINGS% %1 -E..\Files
 set FLAGSCONSOLE=%FLAGS% -CC
 set FLAGSE32=%FLAGS% -TX.e32
 set FLAGSE64=%FLAGS% -TX.e64
@@ -57,7 +57,7 @@ if not "%1"=="" goto failed
 
 echo - ISPP.dll
 mkdir %DCUDIR_WIN32%\ISPP.dpr 2>nul
-"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSCONSOLE% -$T+ -NS%NAMESPACES%  -U"%DELPHIXELIB_WIN32%"  -NU%DCUDIR_WIN32%\ISPP.dpr ISPP.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSCONSOLE% -NS%NAMESPACES%  -U"%DELPHIXELIB_WIN32%"  -NU%DCUDIR_WIN32%\ISPP.dpr ISPP.dpr
 if errorlevel 1 goto failed
 
 echo - Compil32.exe
@@ -69,7 +69,7 @@ if errorlevel 1 goto failed
 
 echo - ISCC.exe
 mkdir %DCUDIR_WIN32%\ISCC.dpr 2>nul
-"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGS% -$T+ -NS%NAMESPACES% -U"%DELPHIXELIB_WIN32%;%ROPSSRC%" -NU%DCUDIR_WIN32%\ISCC.dpr -D%ROPSDEF% ISCC.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGS% -NS%NAMESPACES% -U"%DELPHIXELIB_WIN32%;%ROPSSRC%" -NU%DCUDIR_WIN32%\ISCC.dpr -D%ROPSDEF% ISCC.dpr
 if errorlevel 1 goto failed
 
 echo - ISCmplr.dll
@@ -79,30 +79,30 @@ if errorlevel 1 goto failed
 
 echo - SetupLdr.e32
 mkdir %DCUDIR_WIN32%\SetupLdr.dpr 2>nul
-"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSE32% -$T+ -NS%NAMESPACES% -U"%DELPHIXELIB_WIN32%" -NU%DCUDIR_WIN32%\SetupLdr.dpr -DSETUPLDRPROJ SetupLdr.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSE32% -NS%NAMESPACES% -U"%DELPHIXELIB_WIN32%" -NU%DCUDIR_WIN32%\SetupLdr.dpr -DSETUPLDRPROJ SetupLdr.dpr
 if errorlevel 1 goto failed
 
 echo - SetupLdr.e64
 mkdir %DCUDIR_WIN64%\SetupLdr.dpr 2>nul
-"%DELPHIXEROOT%\bin\dcc64.exe" %FLAGSE64% -$T+ -NS%NAMESPACES% -U"%DELPHIXELIB_WIN64%" -NU%DCUDIR_WIN64%\SetupLdr.dpr -DSETUPLDRPROJ SetupLdr.dpr
+"%DELPHIXEROOT%\bin\dcc64.exe" %FLAGSE64% -NS%NAMESPACES% -U"%DELPHIXELIB_WIN64%" -NU%DCUDIR_WIN64%\SetupLdr.dpr -DSETUPLDRPROJ SetupLdr.dpr
 if errorlevel 1 goto failed
 
 echo - Setup.e32
 mkdir %DCUDIR_WIN32%\Setup.dpr 2>nul
-"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSE32% -$T+ -W-IMPLICIT_INTEGER_CAST_LOSS -W-IMPLICIT_CONVERSION_LOSS -NS%NAMESPACES%;Vcl -U"%DELPHIXELIB_WIN32%;%ROPSSRC%" -NU%DCUDIR_WIN32%\Setup.dpr -DSETUPPROJ;%ROPSDEF% Setup.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSE32% -W-IMPLICIT_INTEGER_CAST_LOSS -W-IMPLICIT_CONVERSION_LOSS -NS%NAMESPACES%;Vcl -U"%DELPHIXELIB_WIN32%;%ROPSSRC%" -NU%DCUDIR_WIN32%\Setup.dpr -DSETUPPROJ;%ROPSDEF% Setup.dpr
 if errorlevel 1 goto failed
 
 echo - SetupCustomStyle.e32
 msbuild.exe SetupCustomStyle.dproj /t:BuildVersionResource /p:Config=Release;Platform=Win32 /nologo /v:q
 if errorlevel 1 goto failed
 mkdir %DCUDIR_WIN32%\SetupCustomStyle.dpr 2>nul
-"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSE32% -$T+ -W-IMPLICIT_INTEGER_CAST_LOSS -W-IMPLICIT_CONVERSION_LOSS -NS%NAMESPACES%;Vcl -U"%DELPHIXELIB_WIN32%;%ROPSSRC%" -NU%DCUDIR_WIN32%\SetupCustomStyle.dpr -DSETUPPROJ;VCLSTYLES;%ROPSDEF% SetupCustomStyle.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSE32% -W-IMPLICIT_INTEGER_CAST_LOSS -W-IMPLICIT_CONVERSION_LOSS -NS%NAMESPACES%;Vcl -U"%DELPHIXELIB_WIN32%;%ROPSSRC%" -NU%DCUDIR_WIN32%\SetupCustomStyle.dpr -DSETUPPROJ;VCLSTYLES;%ROPSDEF% SetupCustomStyle.dpr
 if errorlevel 1 goto failed
 
 :issigtool
 echo - ISSigTool.exe
 mkdir %DCUDIR_WIN32%\ISSigTool.dpr 2>nul
-"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSCONSOLE% -$T+ -NS%NAMESPACES% -U"%DELPHIXELIB_WIN32%" -NU%DCUDIR_WIN32%\ISSigTool.dpr ISSigTool.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" %FLAGSCONSOLE% -NS%NAMESPACES% -U"%DELPHIXELIB_WIN32%" -NU%DCUDIR_WIN32%\ISSigTool.dpr ISSigTool.dpr
 if errorlevel 1 goto failed
 
 cd ..