Hans Leidekker : msi: Include the dialog in the check for duplicate event subscriptions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8fe7ee31a1cb4665068a94ea108716e4df6a4402
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8fe7ee31a1cb4665068a94ea10...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Tue Jan 26 11:16:05 2016 +0100

msi: Include the dialog in the check for duplicate event subscriptions.

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msi/dialog.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 245bfdc..b0f0e5d 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -704,11 +704,13 @@ static void event_subscribe( msi_dialog *dialog, const WCHAR *event, const WCHAR
 {
     struct subscriber *sub;
 
-    TRACE("event %s control %s attribute %s\n", debugstr_w(event), debugstr_w(control), debugstr_w(attribute));
+    TRACE("dialog %s event %s control %s attribute %s\n", debugstr_w(dialog->name), debugstr_w(event),
+          debugstr_w(control), debugstr_w(attribute));
 
     LIST_FOR_EACH_ENTRY( sub, &dialog->package->subscriptions, struct subscriber, entry )
     {
-        if (!strcmpiW( sub->event, event ) &&
+        if (sub->dialog == dialog &&
+            !strcmpiW( sub->event, event ) &&
             !strcmpiW( sub->control, control ) &&
             !strcmpiW( sub->attribute, attribute ))
         {