[SOLVED] Removal of CDCS_*, GPS_* and SIATTRIBFLAGS_* constants from LCL

[lagprogramming]

CDCS_*, GPS_* and SIATTRIBFLAGS_* constants are declared but never used in LCL. The same constants are declared in fpc's packages/winunits-base/src/shlobj.pp.
Third party applications should use FPC's declarations.
The following patch removes the declarations from lcl/interfaces/win32/win32extra.pas and lcl/interfaces/customdrawn/customdrawn_winextra.pas.

Code: Pascal  [Select][+][-]

1. diff --git a/lcl/interfaces/customdrawn/customdrawn_winextra.pas b/lcl/interfaces/customdrawn/customdrawn_winextra.pas
2. index 1d7a36da24..4e2c1a7d1f 100644
3. --- a/lcl/interfaces/customdrawn/customdrawn_winextra.pas
4. +++ b/lcl/interfaces/customdrawn/customdrawn_winextra.pas
5. @@ -225,31 +225,6 @@ const
6.    CLSID_FileOpenDialog: TGUID = '{DC1C5A9C-E88A-4dde-A5A1-60F82A20AEF7}';
7.    CLSID_FileSaveDialog: TGUID = '{C0B4E2F3-BA21-4773-8DBA-335EC946EB8B}';
8.  
9. -  // GETPROPERTYSTOREFLAGS enum
10. -  GPS_DEFAULT              = 0;
11. -  GPS_HANDLERPROPERTIESONLY = $1;
12. -  GPS_READWRITE                    = $2;
13. -  GPS_TEMPORARY                    = $4;
14. -  GPS_FASTPROPERTIESONLY    = $8;
15. -  GPS_OPENSLOWITEM         = $10;
16. -  GPS_DELAYCREATION         = $20;
17. -  GPS_BESTEFFORT            = $40;
18. -  GPS_NO_OPLOCK                    = $80;
19. -  GPS_MASK_VALID            = $ff;
20. -
21. -  // SIATTRIBFLAGS enum
22. -  SIATTRIBFLAGS_AND       = $1;
23. -  SIATTRIBFLAGS_OR        = $2;
24. -  SIATTRIBFLAGS_APPCOMPAT = $3;
25. -  SIATTRIBFLAGS_MASK      = $3;
26. -  SIATTRIBFLAGS_ALLITEMS  = $4000;
27. -
28. -  // CDCONTROLSTATEF enum
29. -  CDCS_INACTIVE       = 0;
30. -  CDCS_ENABLED        = $1;
31. -  CDCS_VISIBLE        = $2;
32. -  CDCS_ENABLEDVISIBLE = $3;
33. -
34.  type
35.    GETPROPERTYSTOREFLAGS = DWord;
36.    SIATTRIBFLAGS = DWord;
37. diff --git a/lcl/interfaces/win32/win32extra.pas b/lcl/interfaces/win32/win32extra.pas
38. index 5997d81fe4..b7603bcf24 100644
39. --- a/lcl/interfaces/win32/win32extra.pas
40. +++ b/lcl/interfaces/win32/win32extra.pas
41. @@ -210,31 +210,6 @@ const
42.    CLSID_FileOpenDialog: TGUID = '{DC1C5A9C-E88A-4dde-A5A1-60F82A20AEF7}';
43.    CLSID_FileSaveDialog: TGUID = '{C0B4E2F3-BA21-4773-8DBA-335EC946EB8B}';
44.  
45. -  // GETPROPERTYSTOREFLAGS enum
46. -  GPS_DEFAULT              = 0;
47. -  GPS_HANDLERPROPERTIESONLY = $1;
48. -  GPS_READWRITE                    = $2;
49. -  GPS_TEMPORARY                    = $4;
50. -  GPS_FASTPROPERTIESONLY    = $8;
51. -  GPS_OPENSLOWITEM         = $10;
52. -  GPS_DELAYCREATION         = $20;
53. -  GPS_BESTEFFORT            = $40;
54. -  GPS_NO_OPLOCK                    = $80;
55. -  GPS_MASK_VALID            = $ff;
56. -
57. -  // SIATTRIBFLAGS enum
58. -  SIATTRIBFLAGS_AND       = $1;
59. -  SIATTRIBFLAGS_OR        = $2;
60. -  SIATTRIBFLAGS_APPCOMPAT = $3;
61. -  SIATTRIBFLAGS_MASK      = $3;
62. -  SIATTRIBFLAGS_ALLITEMS  = $4000;
63. -
64. -  // CDCONTROLSTATEF enum
65. -  CDCS_INACTIVE       = 0;
66. -  CDCS_ENABLED        = $1;
67. -  CDCS_VISIBLE        = $2;
68. -  CDCS_ENABLEDVISIBLE = $3;
69. -
70.  type
71.    GETPROPERTYSTOREFLAGS = DWord;
72.    SIATTRIBFLAGS = DWord;

[AlexTP]

Posted to https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/40451