Fix MSI validation

4 files changed, 13 insertions, 5 deletions

diff --git a/src/wix/WixToolset.Core.Native/Msi/Installer.cs b/src/wix/WixToolset.Core.Native/Msi/Installer.cs
index 8a45aaa8..b2c2c630 100644
--- a/src/wix/WixToolset.Core.Native/Msi/Installer.cs
+++ b/src/wix/WixToolset.Core.Native/Msi/Installer.cs
@@ -4,6 +4,7 @@ namespace WixToolset.Core.Native.Msi
 {
     using System;
     using System.Diagnostics;
+    using System.Runtime.InteropServices;
     using System.Text;
 
     /// <summary>
@@ -15,7 +16,7 @@ namespace WixToolset.Core.Native.Msi
     /// one message box icon type, one default button, and one installation message type.</param>
     /// <param name="message">Specifies the message text.</param>
     /// <returns>-1 for an error, 0 if no action was taken, 1 if OK, 3 to abort.</returns>
-    public delegate int InstallUIHandler(IntPtr context, uint messageType, string message);
+    public delegate int InstallUIHandler(IntPtr context, uint messageType, [MarshalAs(UnmanagedType.LPWStr)] string message);
 
     /// <summary>
     /// Represents the Windows Installer, provides wrappers to
diff --git a/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs b/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs
index 9f4b26a3..8f2adf54 100644
--- a/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs
+++ b/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs
@@ -166,7 +166,7 @@ namespace WixToolset.Core.Native
                         {
                             var action = record.GetString(1);
 
-                            if (!this.SuppressedIces.Contains(action) && this.Ices.Contains(action))
+                            if (!this.SuppressedIces.Contains(action) && (this.Ices.Count == 0 || this.Ices.Contains(action)))
                             {
                                 actions.Add(action);
                             }
@@ -281,11 +281,18 @@ namespace WixToolset.Core.Native
 
             // If we're getting messges during the validation session, log them.
             // Otherwise, ignore the messages.
-            if (!this.ValidationSessionInProgress)
+            if (this.ValidationSessionInProgress)
             {
-                var parsedMessage = ParseValidationMessage(message, this.CurrentIce);
+                try
+                {
+                    var parsedMessage = ParseValidationMessage(message, this.CurrentIce);
 
-                continueValidation = this.Callback.ValidationMessage(parsedMessage);
+                    continueValidation = this.Callback.ValidationMessage(parsedMessage);
+                }
+                catch
+                {
+                    return - 1;
+                }
             }
 
             return continueValidation ? 1 : 3;
diff --git a/src/wix/WixToolset.Core.Native/cubes/darice.cub b/src/wix/WixToolset.Core.Native/cubes/darice.cub
index 4292fede..dab45677 100644
--- a/src/wix/WixToolset.Core.Native/cubes/darice.cub
+++ b/src/wix/WixToolset.Core.Native/cubes/darice.cub
diff --git a/src/wix/WixToolset.Core.Native/cubes/mergemod.cub b/src/wix/WixToolset.Core.Native/cubes/mergemod.cub
index def6dd1a..2042a99e 100644
--- a/src/wix/WixToolset.Core.Native/cubes/mergemod.cub
+++ b/src/wix/WixToolset.Core.Native/cubes/mergemod.cub