Permalink
Browse files

Clean up:

* remove Detours package, move code to /source/detours/
* remove Detours code from /source/vcl-styles-utils/delphi-detours-library/, so we have only one version
* remove Vcl.FormsFix.pas, as the bugs I fixed with that are most likely fixed with the move to Delphi 10. See https://www.heidisql.com/forum.php?t=19141 for the original bug report.
* only vcl-styles-utils uses the Detours lib from now on
  • Loading branch information...
ansgarbecker committed Oct 30, 2018
1 parent d169d2d commit 54a7930045c7ce19f21fba05cd7ac116f1ea36e9
Showing with 96 additions and 10,594 deletions.
  1. BIN components/detours/Demo/DetoursDemo/COM/Demo1/Demo1.res
  2. BIN components/detours/Demo/DetoursDemo/Delphi/RTL/Demo1/Demo1.res
  3. 0 components/detours/build/Win32/.gitkeep
  4. 0 components/detours/build/Win64/.gitkeep
  5. +0 −38 components/detours/packages/Delphi10.2/detours.dpk
  6. +0 −554 components/detours/packages/Delphi10.2/detours.dproj
  7. BIN components/detours/packages/Delphi10.2/detours.res
  8. +0 −38 components/detours/packages/DelphiXE5/detours.dpk
  9. +0 −173 components/detours/packages/DelphiXE5/detours.dproj
  10. +0 −2 components/detours/packages/DelphiXE5/detours.dproj.local
  11. BIN components/detours/packages/DelphiXE5/detours.res
  12. +0 −1 packages/Delphi10.2/heidisql.dpr
  13. +1 −2 packages/Delphi10.2/heidisql.dproj
  14. +3 −15 packages/Delphi10.2/heidisql.groupproj
  15. +1 −1 packages/delphiXE5/heidisql.dproj
  16. +3 −15 packages/delphiXE5/heidisql.groupproj
  17. +0 −123 source/Vcl.FormsFix.pas
  18. +57 −0 source/detours/.gitignore
  19. 0 {components → source}/detours/Clean.bat
  20. 0 {components → source}/detours/Demo/DetoursDemo/COM/Demo1/Demo1.dpr
  21. 0 {components → source}/detours/Demo/DetoursDemo/COM/Demo1/Demo1.dproj
  22. 0 {components → source}/detours/Demo/DetoursDemo/COM/Demo1/uMain.dfm
  23. 0 {components → source}/detours/Demo/DetoursDemo/COM/Demo1/uMain.pas
  24. 0 ...nents → source}/detours/Demo/DetoursDemo/Delphi/Hook_Overloaded_Method/Hook_Overloaded_Method.dpr
  25. 0 ...nts → source}/detours/Demo/DetoursDemo/Delphi/Hook_Overloaded_Method/Hook_Overloaded_Method.dproj
  26. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/Interfaces/Demo1/Demo1.dpr
  27. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/Interfaces/Demo1/Demo1.dproj
  28. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/Interfaces/Demo1/uMain.dfm
  29. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/Interfaces/Demo1/uMain.pas
  30. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/Objects/Demo1/Demo1.dpr
  31. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/Objects/Demo1/Demo1.dproj
  32. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/Objects/Demo1/uMain.dfm
  33. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/Objects/Demo1/uMain.pas
  34. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/RTL/Demo1/Demo1.dpr
  35. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/RTL/Demo1/Demo1.dproj
  36. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/RTL/Demo1/uMain.dfm
  37. 0 {components → source}/detours/Demo/DetoursDemo/Delphi/RTL/Demo1/uMain.pas
  38. 0 {components → source}/detours/Demo/DetoursDemo/MultiHook/Demo1/Demo1.dpr
  39. 0 {components → source}/detours/Demo/DetoursDemo/MultiHook/Demo1/Demo1.dproj
  40. 0 {components → source}/detours/Demo/DetoursDemo/MultiHook/Demo1/uMain.dfm
  41. 0 {components → source}/detours/Demo/DetoursDemo/MultiHook/Demo1/uMain.pas
  42. 0 {components → source}/detours/Demo/DetoursDemo/win32api/Demo1/Demo1.dpr
  43. 0 {components → source}/detours/Demo/DetoursDemo/win32api/Demo1/Demo1.dproj
  44. 0 {components → source}/detours/Demo/DetoursDemo/win32api/Demo1/uMain.dfm
  45. 0 {components → source}/detours/Demo/DetoursDemo/win32api/Demo1/uMain.pas
  46. 0 {components → source}/detours/Demo/DetoursDemo/win32api/Demo2/Demo2.dpr
  47. 0 {components → source}/detours/Demo/DetoursDemo/win32api/Demo2/Demo2.dproj
  48. 0 {components → source}/detours/Demo/DetoursDemo/win32api/Demo2/uMain.dfm
  49. 0 {components → source}/detours/Demo/DetoursDemo/win32api/Demo2/uMain.pas
  50. 0 {components → source}/detours/Demo/InstDecodeDemo/Demo1/Demo1.dpr
  51. 0 {components → source}/detours/Demo/InstDecodeDemo/Demo1/Demo1.dproj
  52. +30 −0 source/detours/README.md
  53. 0 {components → source}/detours/Source/CPUID.pas
  54. 0 {components → source}/detours/Source/DDetours.pas
  55. 0 {components → source}/detours/Source/Defs.inc
  56. 0 {components → source}/detours/Source/InstDecode.pas
  57. 0 {components → source}/detours/Source/ModRmFlagsTables.inc
  58. 0 {components → source}/detours/Source/OpCodesTables.inc
  59. +1 −1 source/main.pas
  60. +0 −270 source/vcl-styles-utils/delphi-detours-library/CPUID.pas
  61. +0 −2,871 source/vcl-styles-utils/delphi-detours-library/DDetours.pas
  62. +0 −48 source/vcl-styles-utils/delphi-detours-library/Defs.inc
  63. +0 −46 source/vcl-styles-utils/delphi-detours-library/GenericsCast.pas
  64. +0 −2,398 source/vcl-styles-utils/delphi-detours-library/InstDecode.pas
  65. +0 −140 source/vcl-styles-utils/delphi-detours-library/ModRmFlagsTables.inc
  66. +0 −1,158 source/vcl-styles-utils/delphi-detours-library/OpCodesTables.inc
  67. +0 −1,095 source/vcl-styles-utils/delphi-detours-library/v1/DDetours.pas
  68. +0 −46 source/vcl-styles-utils/delphi-detours-library/v1/GenericsCast.pas
  69. +0 −678 source/vcl-styles-utils/delphi-detours-library/v1/InstDecode.pas
  70. +0 −80 source/vcl-styles-utils/delphi-detours-library/v1/ModRMTable.inc
  71. +0 −761 source/vcl-styles-utils/delphi-detours-library/v1/OpCodesTables.inc
  72. +0 −40 source/vcl-styles-utils/delphi-detours-library/v1/dDefs.inc
Binary file not shown.
Binary file not shown.
No changes.
No changes.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Binary file not shown.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Binary file not shown.
@@ -43,7 +43,6 @@ uses
JumpList in '..\..\source\JumpList.pas',
extra_controls in '..\..\source\extra_controls.pas',
change_password in '..\..\source\change_password.pas' {frmPasswordChange},
Vcl.FormsFix in '..\..\source\Vcl.FormsFix.pas',
Vcl.Themes,
Vcl.Styles;
@@ -62,7 +62,7 @@
<DCC_UNIT_PLATFORM>false</DCC_UNIT_PLATFORM>
<DCC_ExeOutput>..\..\out\</DCC_ExeOutput>
<DCC_DcuOutput>..\..\build\$(Platform)</DCC_DcuOutput>
<DCC_UnitSearchPath>..\..\components\synedit\build\$(Platform);..\..\components\virtualtreeview\build\$(Platform);..\..\components\synedit\source;..\..\components\virtualtreeview\source;..\..\components\detours\Source;..\..\components\detours\build\$(Platform);..\..\source\vcl-styles-utils;..\..\source\sizegrip;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<DCC_UnitSearchPath>..\..\components\synedit\build\$(Platform);..\..\components\virtualtreeview\build\$(Platform);..\..\components\synedit\source;..\..\components\virtualtreeview\source;..\..\source\detours\Source;..\..\source\vcl-styles-utils;..\..\source\sizegrip;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
<DCC_E>false</DCC_E>
<DCC_K>false</DCC_K>
@@ -233,7 +233,6 @@
<Form>frmPasswordChange</Form>
<FormType>dfm</FormType>
</DCCReference>
<DCCReference Include="..\..\source\Vcl.FormsFix.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
@@ -15,9 +15,6 @@
<Projects Include="..\..\components\synedit\Packages\delphiXE5\SynEditD.dproj">
<Dependencies/>
</Projects>
<Projects Include="..\..\components\detours\packages\DelphiXE5\detours.dproj">
<Dependencies/>
</Projects>
<Projects Include="heidisql.dproj">
<Dependencies/>
</Projects>
@@ -65,15 +62,6 @@
<Target Name="SynEditD:Make">
<MSBuild Projects="..\..\components\synedit\Packages\delphiXE5\SynEditD.dproj" Targets="Make"/>
</Target>
<Target Name="detours">
<MSBuild Projects="..\..\components\detours\packages\DelphiXE5\detours.dproj"/>
</Target>
<Target Name="detours:Clean">
<MSBuild Projects="..\..\components\detours\packages\DelphiXE5\detours.dproj" Targets="Clean"/>
</Target>
<Target Name="detours:Make">
<MSBuild Projects="..\..\components\detours\packages\DelphiXE5\detours.dproj" Targets="Make"/>
</Target>
<Target Name="heidisql">
<MSBuild Projects="heidisql.dproj"/>
</Target>
@@ -84,13 +72,13 @@
<MSBuild Projects="heidisql.dproj" Targets="Make"/>
</Target>
<Target Name="Build">
<CallTarget Targets="VirtualTreesR;VirtualTreesD;SynEditR;SynEditD;detours;heidisql"/>
<CallTarget Targets="VirtualTreesR;VirtualTreesD;SynEditR;SynEditD;heidisql"/>
</Target>
<Target Name="Clean">
<CallTarget Targets="VirtualTreesR:Clean;VirtualTreesD:Clean;SynEditR:Clean;SynEditD:Clean;detours:Clean;heidisql:Clean"/>
<CallTarget Targets="VirtualTreesR:Clean;VirtualTreesD:Clean;SynEditR:Clean;SynEditD:Clean;heidisql:Clean"/>
</Target>
<Target Name="Make">
<CallTarget Targets="VirtualTreesR:Make;VirtualTreesD:Make;SynEditR:Make;SynEditD:Make;detours:Make;heidisql:Make"/>
<CallTarget Targets="VirtualTreesR:Make;VirtualTreesD:Make;SynEditR:Make;SynEditD:Make;heidisql:Make"/>
</Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
</Project>
@@ -62,7 +62,7 @@
<DCC_UNIT_PLATFORM>false</DCC_UNIT_PLATFORM>
<DCC_ExeOutput>..\..\out\</DCC_ExeOutput>
<DCC_DcuOutput>..\..\build\$(Platform)</DCC_DcuOutput>
<DCC_UnitSearchPath>..\..\components\synedit\build\$(Platform);..\..\components\virtualtreeview\build\$(Platform);..\..\components\synedit\source;..\..\components\virtualtreeview\source;..\..\components\detours\Source;..\..\components\detours\build\$(Platform);$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<DCC_UnitSearchPath>..\..\components\synedit\build\$(Platform);..\..\components\virtualtreeview\build\$(Platform);..\..\components\synedit\source;..\..\components\virtualtreeview\source;..\..\source\detours\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
<DCC_E>false</DCC_E>
<DCC_K>false</DCC_K>
@@ -15,9 +15,6 @@
<Projects Include="..\..\components\synedit\Packages\delphiXE5\SynEditD.dproj">
<Dependencies/>
</Projects>
<Projects Include="..\..\components\detours\packages\DelphiXE5\detours.dproj">
<Dependencies/>
</Projects>
<Projects Include="heidisql.dproj">
<Dependencies/>
</Projects>
@@ -65,15 +62,6 @@
<Target Name="SynEditD:Make">
<MSBuild Projects="..\..\components\synedit\Packages\delphiXE5\SynEditD.dproj" Targets="Make"/>
</Target>
<Target Name="detours">
<MSBuild Projects="..\..\components\detours\packages\DelphiXE5\detours.dproj"/>
</Target>
<Target Name="detours:Clean">
<MSBuild Projects="..\..\components\detours\packages\DelphiXE5\detours.dproj" Targets="Clean"/>
</Target>
<Target Name="detours:Make">
<MSBuild Projects="..\..\components\detours\packages\DelphiXE5\detours.dproj" Targets="Make"/>
</Target>
<Target Name="heidisql">
<MSBuild Projects="heidisql.dproj"/>
</Target>
@@ -84,13 +72,13 @@
<MSBuild Projects="heidisql.dproj" Targets="Make"/>
</Target>
<Target Name="Build">
<CallTarget Targets="VirtualTreesR;VirtualTreesD;SynEditR;SynEditD;detours;heidisql"/>
<CallTarget Targets="VirtualTreesR;VirtualTreesD;SynEditR;SynEditD;heidisql"/>
</Target>
<Target Name="Clean">
<CallTarget Targets="VirtualTreesR:Clean;VirtualTreesD:Clean;SynEditR:Clean;SynEditD:Clean;detours:Clean;heidisql:Clean"/>
<CallTarget Targets="VirtualTreesR:Clean;VirtualTreesD:Clean;SynEditR:Clean;SynEditD:Clean;heidisql:Clean"/>
</Target>
<Target Name="Make">
<CallTarget Targets="VirtualTreesR:Make;VirtualTreesD:Make;SynEditR:Make;SynEditD:Make;detours:Make;heidisql:Make"/>
<CallTarget Targets="VirtualTreesR:Make;VirtualTreesD:Make;SynEditR:Make;SynEditD:Make;heidisql:Make"/>
</Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
</Project>
Oops, something went wrong.

0 comments on commit 54a7930

Please sign in to comment.