From fcae786168ee7c148ac932d725357f9714ad6631 Mon Sep 17 00:00:00 2001 From: Bevan Weiss Date: Thu, 2 Jan 2025 23:45:35 +1100 Subject: Re-align enumeration values to those for User account modifications. Since there's no reason to not have them identical where practical. Signed-off-by: Bevan Weiss --- src/ext/Util/ca/sca.h | 12 +- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 132 ++++++++++----------- src/ext/Util/wixext/Symbols/GroupSymbol.cs | 12 +- 3 files changed, 78 insertions(+), 78 deletions(-) (limited to 'src') diff --git a/src/ext/Util/ca/sca.h b/src/ext/Util/ca/sca.h index 0e25a19a..c5034bd1 100644 --- a/src/ext/Util/ca/sca.h +++ b/src/ext/Util/ca/sca.h @@ -22,11 +22,11 @@ enum SCAU_ATTRIBUTES // group creation attributes definitions enum SCAG_ATTRIBUTES { - SCAG_FAIL_IF_EXISTS = 0x00000001, - SCAG_UPDATE_IF_EXISTS = 0x00000002, + SCAG_FAIL_IF_EXISTS = 0x00000010, + SCAG_UPDATE_IF_EXISTS = 0x00000020, - SCAG_DONT_REMOVE_ON_UNINSTALL = 0x00000004, - SCAG_DONT_CREATE_GROUP = 0x00000008, - SCAG_NON_VITAL = 0x00000010, - SCAG_REMOVE_COMMENT = 0x00000020, + SCAG_DONT_REMOVE_ON_UNINSTALL = 0x00000100, + SCAG_DONT_CREATE_GROUP = 0x00000200, + SCAG_NON_VITAL = 0x00000400, + SCAG_REMOVE_COMMENT = 0x00000800, }; diff --git a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs index ad56a32d..13c39091 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -480,73 +480,73 @@ namespace WixToolsetTest.Util "Wix4Group:TEST_GROUP66\tComponent1\ttestName66\ttestDomain02", "Wix4Group:TEST_GROUP67\tComponent1\ttestName67\ttestDomain03", "Wix6Group:TEST_GROUP00\tTest Comment 1\t0", - "Wix6Group:TEST_GROUP01\tTest Comment 1\t1", - "Wix6Group:TEST_GROUP02\t\t2", - "Wix6Group:TEST_GROUP03\t\t3", - "Wix6Group:TEST_GROUP04\tTest Comment 1\t4", - "Wix6Group:TEST_GROUP05\tTest Comment 1\t5", - "Wix6Group:TEST_GROUP06\t\t6", - "Wix6Group:TEST_GROUP07\t\t7", - "Wix6Group:TEST_GROUP08\tTest Comment 1\t8", - "Wix6Group:TEST_GROUP09\tTest Comment 1\t9", - "Wix6Group:TEST_GROUP10\t\t10", - "Wix6Group:TEST_GROUP11\t\t11", - "Wix6Group:TEST_GROUP12\tTest Comment 1\t12", - "Wix6Group:TEST_GROUP13\tTest Comment 1\t13", - "Wix6Group:TEST_GROUP14\t\t14", - "Wix6Group:TEST_GROUP15\t\t15", - "Wix6Group:TEST_GROUP16\tTest Comment 1\t16", - "Wix6Group:TEST_GROUP17\tTest Comment 1\t17", - "Wix6Group:TEST_GROUP18\t\t18", - "Wix6Group:TEST_GROUP19\t\t19", - "Wix6Group:TEST_GROUP20\tTest Comment 1\t20", - "Wix6Group:TEST_GROUP21\tTest Comment 1\t21", - "Wix6Group:TEST_GROUP22\t\t22", - "Wix6Group:TEST_GROUP23\t\t23", - "Wix6Group:TEST_GROUP24\tTest Comment 1\t24", - "Wix6Group:TEST_GROUP25\tTest Comment 1\t25", - "Wix6Group:TEST_GROUP26\t\t26", - "Wix6Group:TEST_GROUP27\t\t27", - "Wix6Group:TEST_GROUP28\tTest Comment 1\t28", - "Wix6Group:TEST_GROUP29\tTest Comment 1\t29", - "Wix6Group:TEST_GROUP30\t\t30", - "Wix6Group:TEST_GROUP31\t\t31", - "Wix6Group:TEST_GROUP32\t\t32", - "Wix6Group:TEST_GROUP33\t\t33", - "Wix6Group:TEST_GROUP34\t\t34", - "Wix6Group:TEST_GROUP35\t\t35", - "Wix6Group:TEST_GROUP36\t\t36", - "Wix6Group:TEST_GROUP37\t\t37", - "Wix6Group:TEST_GROUP38\t\t38", - "Wix6Group:TEST_GROUP39\t\t39", - "Wix6Group:TEST_GROUP40\t\t40", - "Wix6Group:TEST_GROUP41\t\t41", - "Wix6Group:TEST_GROUP42\t\t42", - "Wix6Group:TEST_GROUP43\t\t43", - "Wix6Group:TEST_GROUP44\t\t44", - "Wix6Group:TEST_GROUP45\t\t45", - "Wix6Group:TEST_GROUP46\t\t46", - "Wix6Group:TEST_GROUP47\t\t47", - "Wix6Group:TEST_GROUP48\t\t48", - "Wix6Group:TEST_GROUP49\t\t49", - "Wix6Group:TEST_GROUP50\t\t50", - "Wix6Group:TEST_GROUP51\t\t51", - "Wix6Group:TEST_GROUP52\t\t52", - "Wix6Group:TEST_GROUP53\t\t53", - "Wix6Group:TEST_GROUP54\t\t54", - "Wix6Group:TEST_GROUP55\t\t55", - "Wix6Group:TEST_GROUP56\t\t56", - "Wix6Group:TEST_GROUP57\t\t57", - "Wix6Group:TEST_GROUP58\t\t58", - "Wix6Group:TEST_GROUP59\t\t59", - "Wix6Group:TEST_GROUP60\t\t60", - "Wix6Group:TEST_GROUP61\t\t61", - "Wix6Group:TEST_GROUP62\t\t62", - "Wix6Group:TEST_GROUP63\t\t63", + "Wix6Group:TEST_GROUP01\tTest Comment 1\t16", + "Wix6Group:TEST_GROUP02\t\t32", + "Wix6Group:TEST_GROUP03\t\t48", + "Wix6Group:TEST_GROUP04\tTest Comment 1\t256", + "Wix6Group:TEST_GROUP05\tTest Comment 1\t272", + "Wix6Group:TEST_GROUP06\t\t288", + "Wix6Group:TEST_GROUP07\t\t304", + "Wix6Group:TEST_GROUP08\tTest Comment 1\t512", + "Wix6Group:TEST_GROUP09\tTest Comment 1\t528", + "Wix6Group:TEST_GROUP10\t\t544", + "Wix6Group:TEST_GROUP11\t\t560", + "Wix6Group:TEST_GROUP12\tTest Comment 1\t768", + "Wix6Group:TEST_GROUP13\tTest Comment 1\t784", + "Wix6Group:TEST_GROUP14\t\t800", + "Wix6Group:TEST_GROUP15\t\t816", + "Wix6Group:TEST_GROUP16\tTest Comment 1\t1024", + "Wix6Group:TEST_GROUP17\tTest Comment 1\t1040", + "Wix6Group:TEST_GROUP18\t\t1056", + "Wix6Group:TEST_GROUP19\t\t1072", + "Wix6Group:TEST_GROUP20\tTest Comment 1\t1280", + "Wix6Group:TEST_GROUP21\tTest Comment 1\t1296", + "Wix6Group:TEST_GROUP22\t\t1312", + "Wix6Group:TEST_GROUP23\t\t1328", + "Wix6Group:TEST_GROUP24\tTest Comment 1\t1536", + "Wix6Group:TEST_GROUP25\tTest Comment 1\t1552", + "Wix6Group:TEST_GROUP26\t\t1568", + "Wix6Group:TEST_GROUP27\t\t1584", + "Wix6Group:TEST_GROUP28\tTest Comment 1\t1792", + "Wix6Group:TEST_GROUP29\tTest Comment 1\t1808", + "Wix6Group:TEST_GROUP30\t\t1824", + "Wix6Group:TEST_GROUP31\t\t1840", + "Wix6Group:TEST_GROUP32\t\t2048", + "Wix6Group:TEST_GROUP33\t\t2064", + "Wix6Group:TEST_GROUP34\t\t2080", + "Wix6Group:TEST_GROUP35\t\t2096", + "Wix6Group:TEST_GROUP36\t\t2304", + "Wix6Group:TEST_GROUP37\t\t2320", + "Wix6Group:TEST_GROUP38\t\t2336", + "Wix6Group:TEST_GROUP39\t\t2352", + "Wix6Group:TEST_GROUP40\t\t2560", + "Wix6Group:TEST_GROUP41\t\t2576", + "Wix6Group:TEST_GROUP42\t\t2592", + "Wix6Group:TEST_GROUP43\t\t2608", + "Wix6Group:TEST_GROUP44\t\t2816", + "Wix6Group:TEST_GROUP45\t\t2832", + "Wix6Group:TEST_GROUP46\t\t2848", + "Wix6Group:TEST_GROUP47\t\t2864", + "Wix6Group:TEST_GROUP48\t\t3072", + "Wix6Group:TEST_GROUP49\t\t3088", + "Wix6Group:TEST_GROUP50\t\t3104", + "Wix6Group:TEST_GROUP51\t\t3120", + "Wix6Group:TEST_GROUP52\t\t3328", + "Wix6Group:TEST_GROUP53\t\t3344", + "Wix6Group:TEST_GROUP54\t\t3360", + "Wix6Group:TEST_GROUP55\t\t3376", + "Wix6Group:TEST_GROUP56\t\t3584", + "Wix6Group:TEST_GROUP57\t\t3600", + "Wix6Group:TEST_GROUP58\t\t3616", + "Wix6Group:TEST_GROUP59\t\t3632", + "Wix6Group:TEST_GROUP60\t\t3840", + "Wix6Group:TEST_GROUP61\t\t3856", + "Wix6Group:TEST_GROUP62\t\t3872", + "Wix6Group:TEST_GROUP63\t\t3888", "Wix6Group:TEST_GROUP64\tTest Comment 1\t0", - "Wix6Group:TEST_GROUP65\tTest Comment 1\t1", - "Wix6Group:TEST_GROUP66\t\t2", - "Wix6Group:TEST_GROUP67\t\t3", + "Wix6Group:TEST_GROUP65\tTest Comment 1\t16", + "Wix6Group:TEST_GROUP66\t\t32", + "Wix6Group:TEST_GROUP67\t\t48", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/ext/Util/wixext/Symbols/GroupSymbol.cs b/src/ext/Util/wixext/Symbols/GroupSymbol.cs index ef1dc33f..ac6f6608 100644 --- a/src/ext/Util/wixext/Symbols/GroupSymbol.cs +++ b/src/ext/Util/wixext/Symbols/GroupSymbol.cs @@ -78,12 +78,12 @@ namespace WixToolset.Util.Symbols public enum SymbolAttributes { None = 0x00000000, - FailIfExists = 0x00000001, - UpdateIfExists = 0x00000002, - DontRemoveOnUninstall = 0x00000004, - DontCreateGroup = 0x00000008, - NonVital = 0x00000010, - RemoveComment = 0x00000020, + FailIfExists = 0x00000010, + UpdateIfExists = 0x00000020, + DontRemoveOnUninstall = 0x00000100, + DontCreateGroup = 0x00000200, + NonVital = 0x00000400, + RemoveComment = 0x00000800, } public enum SymbolFields -- cgit v1.2.3-55-g6feb