ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi/tests: Some cleanup for external UI tests. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2017-09-14 01:03:56 -05:00 committed by Alexandre Julliard
parent 92118091f8
commit 13cb6a5b78
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/msi/tests/package.c
View File

@ -9301,7 +9301,7 @@ static void ok_sequence_(const struct externalui_message *expected, const char *
{ {
if (expected->message == actual->message) if (expected->message == actual->message)
{ {
if (expected->field_count != actual->field_count) if (expected->field_count < actual->field_count)
{ {
todo_wine_if (todo) todo_wine_if (todo)
ok_(file, line) (FALSE, "%s: in msg 0x%08x expecting field count %d got %d\n", ok_(file, line) (FALSE, "%s: in msg 0x%08x expecting field count %d got %d\n",
@ -9323,6 +9323,10 @@ static void ok_sequence_(const struct externalui_message *expected, const char *
expected++; expected++;
actual++; actual++;
} }
else if (expected->optional)
{
expected++;
}
else else
{ {
todo_wine_if (todo) todo_wine_if (todo)
@ -9357,6 +9361,26 @@ done:
#define ok_sequence(exp, contx, todo) \ #define ok_sequence(exp, contx, todo) \
ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__) ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__)
/* don't use PROGRESS, which is timing-dependent,
* or SHOWDIALOG, which due to a bug causes a hang on XP */
static const INSTALLLOGMODE MSITEST_INSTALLLOGMODE =
INSTALLLOGMODE_FATALEXIT |
INSTALLLOGMODE_ERROR |
INSTALLLOGMODE_WARNING |
INSTALLLOGMODE_USER |
INSTALLLOGMODE_INFO |
INSTALLLOGMODE_FILESINUSE |
INSTALLLOGMODE_RESOLVESOURCE |
INSTALLLOGMODE_OUTOFDISKSPACE |
INSTALLLOGMODE_ACTIONSTART |
INSTALLLOGMODE_ACTIONDATA |
INSTALLLOGMODE_COMMONDATA |
INSTALLLOGMODE_INITIALIZE |
INSTALLLOGMODE_TERMINATE |
INSTALLLOGMODE_RMFILESINUSE |
INSTALLLOGMODE_INSTALLSTART |
INSTALLLOGMODE_INSTALLEND;
static const struct externalui_message empty_sequence[] = { static const struct externalui_message empty_sequence[] = {
{0} {0}
}; };
@ -9534,9 +9558,8 @@ static void test_externalui_message(void)
MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL);
/* processing SHOWDIALOG with a record handler causes a crash on XP */
MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, &retval); MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, &retval);
r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, &retval, &prev); r = MsiSetExternalUIRecord(externalui_message_callback, MSITEST_INSTALLLOGMODE, &retval, &prev);
flush_sequence(); flush_sequence();
@ -9759,9 +9782,8 @@ static void test_controlevent(void)
MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL);
/* processing SHOWDIALOG with a record handler causes a crash on XP */
MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, NULL); MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, NULL);
r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, NULL, &prev); r = MsiSetExternalUIRecord(externalui_message_callback, MSITEST_INSTALLLOGMODE, NULL, &prev);
flush_sequence(); flush_sequence();