78595: Subject: [2/8] msi/test: Mark some test results as broken.

[buildbot at kegel.com]

This is an experimental automated build and test service.
Please feel free to ignore this email while we work the kinks out.

The Buildbot has detected a failed build on builder runtests-gcc295 while building Wine.
Full details are available at: http://buildbot.kegel.com/builders/runtests-gcc295/builds/6 (though maybe not for long, as I'm still reinstalling the buildbot periodically while experimenting)
BUILD FAILED: failed shell_2


For more info about this message, see http://wiki.winehq.org/BuildBot


-------------- next part --------------
From: Hans Leidekker <hans at codeweavers.com>
Subject: [1/8] msi: Respect the indirect attribute in the SelectionPath event handler.
Message-Id: <1315558765.4177.19.camel at t400>
Date: Fri, 09 Sep 2011 10:59:18 +0200

---
 dlls/msi/dialog.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 2210f17..caad21c 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -691,7 +691,8 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control,
     }
     else if ( !strcmpW( attribute, szSelectionPath ) )
     {
-        LPWSTR path = msi_dialog_dup_property( dialog, ctrl->property, TRUE );
+        BOOL indirect = ctrl->attributes & msidbControlAttributesIndirect;
+        LPWSTR path = msi_dialog_dup_property( dialog, ctrl->property, indirect );
         if (!path) return;
         SetWindowTextW( ctrl->hwnd, path );
         msi_free(path);
-- 
1.7.5.4

From: Hans Leidekker <hans at codeweavers.com>
Subject: [2/8] msi/test: Mark some test results as broken.
Message-Id: <1315558783.4177.20.camel at t400>
Date: Fri, 09 Sep 2011 10:59:36 +0200

---
 dlls/msi/tests/install.c |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 1ebdd5d..04c709f 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3154,12 +3154,14 @@ static void test_samesequence(void)
     MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
 
     r = MsiInstallProductA(msifile, NULL);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
-    ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
-    ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n");
-    ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
-    ok(delete_pf("msitest", FALSE), "Directory not created\n");
-
+    ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r);
+    if (r == ERROR_SUCCESS)
+    {
+        ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
+        ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n");
+        ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
+        ok(delete_pf("msitest", FALSE), "Directory not created\n");
+    }
     delete_cab_files();
     DeleteFile(msifile);
 }
@@ -3174,12 +3176,14 @@ static void test_uiLevelFlags(void)
     MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL);
 
     r = MsiInstallProductA(msifile, NULL);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
-    ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n");
-    ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n");
-    ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
-    ok(delete_pf("msitest", FALSE), "Directory not created\n");
-
+    ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r);
+    if (r == ERROR_SUCCESS)
+    {
+        ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n");
+        ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n");
+        ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
+        ok(delete_pf("msitest", FALSE), "Directory not created\n");
+    }
     delete_cab_files();
     DeleteFile(msifile);
 }
-- 
1.7.5.4