From f111627a1a1fcb6b83b6cf8bdaacfa72cf3a3f6f Mon Sep 17 00:00:00 2001
From: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Thu, 16 May 2013 01:54:01 +0200
Subject: wixl: handle CustomAction of type DLL_BINARY

---
 tools/wixl/builder.vala | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/wixl/builder.vala b/tools/wixl/builder.vala
index b57cac8..0855fe5 100644
--- a/tools/wixl/builder.vala
+++ b/tools/wixl/builder.vala
@@ -1019,8 +1019,13 @@ namespace Wixl {
         }
 
         public override void visit_custom_action (WixCustomAction action) throws GLib.Error {
+            CustomActionType type;
+
             // FIXME: so many missing things here...
-            var type = CustomActionType.EXE_PROPERTY;
+            if (action.DllEntry != null)
+                type = CustomActionType.DLL_BINARY;
+            else
+                type = CustomActionType.EXE_PROPERTY;
 
             if (action.Return == "ignore")
                 type |= CustomActionType.CONTINUE;
@@ -1029,7 +1034,10 @@ namespace Wixl {
             if (!parse_yesno (action.Impersonate))
                 type |= CustomActionType.NO_IMPERSONATE;
 
-            db.table_custom_action.add (action.Id, type, action.Property, action.ExeCommand);
+            string source = action.Property ?? action.BinaryKey;
+            string target = action.ExeCommand ?? action.DllEntry;
+
+            db.table_custom_action.add (action.Id, type, source, target);
         }
 
         public override void visit_binary (WixBinary binary) throws GLib.Error {
-- 
cgit