aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBevan Weiss <bevan.weiss@gmail.com>2025-01-02 23:45:35 +1100
committerRob Mensching <rob@firegiant.com>2025-02-11 23:14:49 -0800
commitfcae786168ee7c148ac932d725357f9714ad6631 (patch)
tree719b82a32883ccc652313e418f8a633d4c6ae9ad
parenteda11c7eb726da970de68c5b353f946d1da0a7a3 (diff)
downloadwix-fcae786168ee7c148ac932d725357f9714ad6631.tar.gz
wix-fcae786168ee7c148ac932d725357f9714ad6631.tar.bz2
wix-fcae786168ee7c148ac932d725357f9714ad6631.zip
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 <bevan.weiss@gmail.com>
Diffstat
-rw-r--r--src/ext/Util/ca/sca.h12
-rw-r--r--src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs132
-rw-r--r--src/ext/Util/wixext/Symbols/GroupSymbol.cs12
3 files changed, 78 insertions, 78 deletions
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
22// group creation attributes definitions 22// group creation attributes definitions
23enum SCAG_ATTRIBUTES 23enum SCAG_ATTRIBUTES
24{ 24{
25 SCAG_FAIL_IF_EXISTS = 0x00000001, 25 SCAG_FAIL_IF_EXISTS = 0x00000010,
26 SCAG_UPDATE_IF_EXISTS = 0x00000002, 26 SCAG_UPDATE_IF_EXISTS = 0x00000020,
27 27
28 SCAG_DONT_REMOVE_ON_UNINSTALL = 0x00000004, 28 SCAG_DONT_REMOVE_ON_UNINSTALL = 0x00000100,
29 SCAG_DONT_CREATE_GROUP = 0x00000008, 29 SCAG_DONT_CREATE_GROUP = 0x00000200,
30 SCAG_NON_VITAL = 0x00000010, 30 SCAG_NON_VITAL = 0x00000400,
31 SCAG_REMOVE_COMMENT = 0x00000020, 31 SCAG_REMOVE_COMMENT = 0x00000800,
32}; 32};
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
480 "Wix4Group:TEST_GROUP66\tComponent1\ttestName66\ttestDomain02", 480 "Wix4Group:TEST_GROUP66\tComponent1\ttestName66\ttestDomain02",
481 "Wix4Group:TEST_GROUP67\tComponent1\ttestName67\ttestDomain03", 481 "Wix4Group:TEST_GROUP67\tComponent1\ttestName67\ttestDomain03",
482 "Wix6Group:TEST_GROUP00\tTest Comment 1\t0", 482 "Wix6Group:TEST_GROUP00\tTest Comment 1\t0",
483 "Wix6Group:TEST_GROUP01\tTest Comment 1\t1", 483 "Wix6Group:TEST_GROUP01\tTest Comment 1\t16",
484 "Wix6Group:TEST_GROUP02\t\t2", 484 "Wix6Group:TEST_GROUP02\t\t32",
485 "Wix6Group:TEST_GROUP03\t\t3", 485 "Wix6Group:TEST_GROUP03\t\t48",
486 "Wix6Group:TEST_GROUP04\tTest Comment 1\t4", 486 "Wix6Group:TEST_GROUP04\tTest Comment 1\t256",
487 "Wix6Group:TEST_GROUP05\tTest Comment 1\t5", 487 "Wix6Group:TEST_GROUP05\tTest Comment 1\t272",
488 "Wix6Group:TEST_GROUP06\t\t6", 488 "Wix6Group:TEST_GROUP06\t\t288",
489 "Wix6Group:TEST_GROUP07\t\t7", 489 "Wix6Group:TEST_GROUP07\t\t304",
490 "Wix6Group:TEST_GROUP08\tTest Comment 1\t8", 490 "Wix6Group:TEST_GROUP08\tTest Comment 1\t512",
491 "Wix6Group:TEST_GROUP09\tTest Comment 1\t9", 491 "Wix6Group:TEST_GROUP09\tTest Comment 1\t528",
492 "Wix6Group:TEST_GROUP10\t\t10", 492 "Wix6Group:TEST_GROUP10\t\t544",
493 "Wix6Group:TEST_GROUP11\t\t11", 493 "Wix6Group:TEST_GROUP11\t\t560",
494 "Wix6Group:TEST_GROUP12\tTest Comment 1\t12", 494 "Wix6Group:TEST_GROUP12\tTest Comment 1\t768",
495 "Wix6Group:TEST_GROUP13\tTest Comment 1\t13", 495 "Wix6Group:TEST_GROUP13\tTest Comment 1\t784",
496 "Wix6Group:TEST_GROUP14\t\t14", 496 "Wix6Group:TEST_GROUP14\t\t800",
497 "Wix6Group:TEST_GROUP15\t\t15", 497 "Wix6Group:TEST_GROUP15\t\t816",
498 "Wix6Group:TEST_GROUP16\tTest Comment 1\t16", 498 "Wix6Group:TEST_GROUP16\tTest Comment 1\t1024",
499 "Wix6Group:TEST_GROUP17\tTest Comment 1\t17", 499 "Wix6Group:TEST_GROUP17\tTest Comment 1\t1040",
500 "Wix6Group:TEST_GROUP18\t\t18", 500 "Wix6Group:TEST_GROUP18\t\t1056",
501 "Wix6Group:TEST_GROUP19\t\t19", 501 "Wix6Group:TEST_GROUP19\t\t1072",
502 "Wix6Group:TEST_GROUP20\tTest Comment 1\t20", 502 "Wix6Group:TEST_GROUP20\tTest Comment 1\t1280",
503 "Wix6Group:TEST_GROUP21\tTest Comment 1\t21", 503 "Wix6Group:TEST_GROUP21\tTest Comment 1\t1296",
504 "Wix6Group:TEST_GROUP22\t\t22", 504 "Wix6Group:TEST_GROUP22\t\t1312",
505 "Wix6Group:TEST_GROUP23\t\t23", 505 "Wix6Group:TEST_GROUP23\t\t1328",
506 "Wix6Group:TEST_GROUP24\tTest Comment 1\t24", 506 "Wix6Group:TEST_GROUP24\tTest Comment 1\t1536",
507 "Wix6Group:TEST_GROUP25\tTest Comment 1\t25", 507 "Wix6Group:TEST_GROUP25\tTest Comment 1\t1552",
508 "Wix6Group:TEST_GROUP26\t\t26", 508 "Wix6Group:TEST_GROUP26\t\t1568",
509 "Wix6Group:TEST_GROUP27\t\t27", 509 "Wix6Group:TEST_GROUP27\t\t1584",
510 "Wix6Group:TEST_GROUP28\tTest Comment 1\t28", 510 "Wix6Group:TEST_GROUP28\tTest Comment 1\t1792",
511 "Wix6Group:TEST_GROUP29\tTest Comment 1\t29", 511 "Wix6Group:TEST_GROUP29\tTest Comment 1\t1808",
512 "Wix6Group:TEST_GROUP30\t\t30", 512 "Wix6Group:TEST_GROUP30\t\t1824",
513 "Wix6Group:TEST_GROUP31\t\t31", 513 "Wix6Group:TEST_GROUP31\t\t1840",
514 "Wix6Group:TEST_GROUP32\t\t32", 514 "Wix6Group:TEST_GROUP32\t\t2048",
515 "Wix6Group:TEST_GROUP33\t\t33", 515 "Wix6Group:TEST_GROUP33\t\t2064",
516 "Wix6Group:TEST_GROUP34\t\t34", 516 "Wix6Group:TEST_GROUP34\t\t2080",
517 "Wix6Group:TEST_GROUP35\t\t35", 517 "Wix6Group:TEST_GROUP35\t\t2096",
518 "Wix6Group:TEST_GROUP36\t\t36", 518 "Wix6Group:TEST_GROUP36\t\t2304",
519 "Wix6Group:TEST_GROUP37\t\t37", 519 "Wix6Group:TEST_GROUP37\t\t2320",
520 "Wix6Group:TEST_GROUP38\t\t38", 520 "Wix6Group:TEST_GROUP38\t\t2336",
521 "Wix6Group:TEST_GROUP39\t\t39", 521 "Wix6Group:TEST_GROUP39\t\t2352",
522 "Wix6Group:TEST_GROUP40\t\t40", 522 "Wix6Group:TEST_GROUP40\t\t2560",
523 "Wix6Group:TEST_GROUP41\t\t41", 523 "Wix6Group:TEST_GROUP41\t\t2576",
524 "Wix6Group:TEST_GROUP42\t\t42", 524 "Wix6Group:TEST_GROUP42\t\t2592",
525 "Wix6Group:TEST_GROUP43\t\t43", 525 "Wix6Group:TEST_GROUP43\t\t2608",
526 "Wix6Group:TEST_GROUP44\t\t44", 526 "Wix6Group:TEST_GROUP44\t\t2816",
527 "Wix6Group:TEST_GROUP45\t\t45", 527 "Wix6Group:TEST_GROUP45\t\t2832",
528 "Wix6Group:TEST_GROUP46\t\t46", 528 "Wix6Group:TEST_GROUP46\t\t2848",
529 "Wix6Group:TEST_GROUP47\t\t47", 529 "Wix6Group:TEST_GROUP47\t\t2864",
530 "Wix6Group:TEST_GROUP48\t\t48", 530 "Wix6Group:TEST_GROUP48\t\t3072",
531 "Wix6Group:TEST_GROUP49\t\t49", 531 "Wix6Group:TEST_GROUP49\t\t3088",
532 "Wix6Group:TEST_GROUP50\t\t50", 532 "Wix6Group:TEST_GROUP50\t\t3104",
533 "Wix6Group:TEST_GROUP51\t\t51", 533 "Wix6Group:TEST_GROUP51\t\t3120",
534 "Wix6Group:TEST_GROUP52\t\t52", 534 "Wix6Group:TEST_GROUP52\t\t3328",
535 "Wix6Group:TEST_GROUP53\t\t53", 535 "Wix6Group:TEST_GROUP53\t\t3344",
536 "Wix6Group:TEST_GROUP54\t\t54", 536 "Wix6Group:TEST_GROUP54\t\t3360",
537 "Wix6Group:TEST_GROUP55\t\t55", 537 "Wix6Group:TEST_GROUP55\t\t3376",
538 "Wix6Group:TEST_GROUP56\t\t56", 538 "Wix6Group:TEST_GROUP56\t\t3584",
539 "Wix6Group:TEST_GROUP57\t\t57", 539 "Wix6Group:TEST_GROUP57\t\t3600",
540 "Wix6Group:TEST_GROUP58\t\t58", 540 "Wix6Group:TEST_GROUP58\t\t3616",
541 "Wix6Group:TEST_GROUP59\t\t59", 541 "Wix6Group:TEST_GROUP59\t\t3632",
542 "Wix6Group:TEST_GROUP60\t\t60", 542 "Wix6Group:TEST_GROUP60\t\t3840",
543 "Wix6Group:TEST_GROUP61\t\t61", 543 "Wix6Group:TEST_GROUP61\t\t3856",
544 "Wix6Group:TEST_GROUP62\t\t62", 544 "Wix6Group:TEST_GROUP62\t\t3872",
545 "Wix6Group:TEST_GROUP63\t\t63", 545 "Wix6Group:TEST_GROUP63\t\t3888",
546 "Wix6Group:TEST_GROUP64\tTest Comment 1\t0", 546 "Wix6Group:TEST_GROUP64\tTest Comment 1\t0",
547 "Wix6Group:TEST_GROUP65\tTest Comment 1\t1", 547 "Wix6Group:TEST_GROUP65\tTest Comment 1\t16",
548 "Wix6Group:TEST_GROUP66\t\t2", 548 "Wix6Group:TEST_GROUP66\t\t32",
549 "Wix6Group:TEST_GROUP67\t\t3", 549 "Wix6Group:TEST_GROUP67\t\t48",
550 }, results.OrderBy(s => s).ToArray()); 550 }, results.OrderBy(s => s).ToArray());
551 } 551 }
552 552
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
78 public enum SymbolAttributes 78 public enum SymbolAttributes
79 { 79 {
80 None = 0x00000000, 80 None = 0x00000000,
81 FailIfExists = 0x00000001, 81 FailIfExists = 0x00000010,
82 UpdateIfExists = 0x00000002, 82 UpdateIfExists = 0x00000020,
83 DontRemoveOnUninstall = 0x00000004, 83 DontRemoveOnUninstall = 0x00000100,
84 DontCreateGroup = 0x00000008, 84 DontCreateGroup = 0x00000200,
85 NonVital = 0x00000010, 85 NonVital = 0x00000400,
86 RemoveComment = 0x00000020, 86 RemoveComment = 0x00000800,
87 } 87 }
88 88
89 public enum SymbolFields 89 public enum SymbolFields
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 16:21:13 +0000