From 5ee3e62691e09ffd3edc9bfafa4deddb26f155c5 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 14 Oct 2019 14:48:50 -0700 Subject: Fix lock permissions --- src/WixToolset.Core/Compiler_2.cs | 5 ++--- src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index 445e8dfa..7eeb2e2e 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs @@ -1053,7 +1053,6 @@ namespace WixToolset.Core var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); var bits = new BitArray(32); string domain = null; - var permission = 0; string[] specialPermissions = null; string user = null; @@ -1115,13 +1114,13 @@ namespace WixToolset.Core } } - permission = this.Core.CreateIntegerFromBitArray(bits); - if (null == user) { this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "User")); } + var permission = this.Core.CreateIntegerFromBitArray(bits); + if (Int32.MinValue == permission) // just GENERIC_READ, which is MSI_NULL { this.Core.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index 00a573d4..bbce87cd 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs @@ -412,7 +412,7 @@ namespace WixToolsetTest.CoreIntegration } } - [Fact(Skip = "Test demonstrates failure")] + [Fact] public void PopulatesLockPermissionsTableWithEmptyPermissions() { var folder = TestData.Get(@"TestData"); -- cgit v1.2.3-55-g6feb