aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Arnson <bob@joyofsetup.com>2020-03-09 19:50:20 -0400
committerBob Arnson <bob@firegiant.com>2020-03-09 20:00:58 -0400
commit00b945dfc182304a7999aa999f4303078beb2e52 (patch)
treeec4291205630b013762c17a59edafb17d0fd8e34 /src
parente9d10933bedb8215ec50ca85db272d6647426b31 (diff)
downloadwix-00b945dfc182304a7999aa999f4303078beb2e52.tar.gz
wix-00b945dfc182304a7999aa999f4303078beb2e52.tar.bz2
wix-00b945dfc182304a7999aa999f4303078beb2e52.zip
Make the SecureObjectsTuple Id a bit more resilient.
Diffstat (limited to 'src')
-rw-r--r--src/test/WixToolsetTest.Util/UtilExtensionFixture.cs2
-rw-r--r--src/wixext/UtilCompiler.cs3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 750098d6..8f33eff5 100644
--- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -105,7 +105,7 @@ namespace WixToolsetTest.Util
105 "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t", 105 "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t",
106 "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t", 106 "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t",
107 "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t", 107 "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t",
108 "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", 108 "Wix4SecureObject:secJTI3ywlGOTsHWSdR4bEtGDc.veU\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
109 }, results.OrderBy(s => s).ToArray()); 109 }, results.OrderBy(s => s).ToArray());
110 } 110 }
111 111
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index a8d59ca3..6b359591 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -2452,7 +2452,8 @@ namespace WixToolset.Util
2452 { 2452 {
2453 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X64 | CustomActionPlatforms.X86); 2453 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
2454 2454
2455 var tuple = new SecureObjectsTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, objectId)) 2455 var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user);
2456 var tuple = new SecureObjectsTuple(sourceLineNumbers, id)
2456 { 2457 {
2457 Table = tableName, 2458 Table = tableName,
2458 Domain = domain, 2459 Domain = domain,