Commit 0f49d2a8 authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard

msi/tests: Add missing return value checks to package tests (Coverity).

parent fbb57d41
...@@ -3268,7 +3268,8 @@ static void test_states(void) ...@@ -3268,7 +3268,8 @@ static void test_states(void)
add_file_entry( hdb, "'psi_file', 'psi', 'psi.txt', 100, '', '1033', 8192, 1" ); add_file_entry( hdb, "'psi_file', 'psi', 'psi.txt', 100, '', '1033', 8192, 1" );
add_file_entry( hdb, "'upsilon_file', 'upsilon', 'upsilon.txt', 0, '', '1033', 16384, 1" ); add_file_entry( hdb, "'upsilon_file', 'upsilon', 'upsilon.txt', 0, '', '1033', 16384, 1" );
MsiDatabaseCommit(hdb); r = MsiDatabaseCommit(hdb);
ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r );
/* these properties must not be in the saved msi file */ /* these properties must not be in the saved msi file */
add_property_entry( hdb, "'ADDLOCAL', 'one,four'"); add_property_entry( hdb, "'ADDLOCAL', 'one,four'");
...@@ -7056,7 +7057,8 @@ static void test_shortlongsource(void) ...@@ -7056,7 +7057,8 @@ static void test_shortlongsource(void)
/* CostFinalize:long */ /* CostFinalize:long */
add_directory_entry(hdb, "'SubDir7', 'TARGETDIR', 'eleven|twelve'"); add_directory_entry(hdb, "'SubDir7', 'TARGETDIR', 'eleven|twelve'");
MsiDatabaseCommit(hdb); r = MsiDatabaseCommit(hdb);
ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r );
r = package_from_db(hdb, &hpkg); r = package_from_db(hdb, &hpkg);
if (r == ERROR_INSTALL_PACKAGE_REJECTED) if (r == ERROR_INSTALL_PACKAGE_REJECTED)
...@@ -8553,7 +8555,8 @@ static void test_MsiEnumComponentCosts(void) ...@@ -8553,7 +8555,8 @@ static void test_MsiEnumComponentCosts(void)
add_install_execute_sequence_entry( hdb, "'CostFinalize', '', '1000'" ); add_install_execute_sequence_entry( hdb, "'CostFinalize', '', '1000'" );
add_install_execute_sequence_entry( hdb, "'InstallValidate', '', '1100'" ); add_install_execute_sequence_entry( hdb, "'InstallValidate', '', '1100'" );
MsiDatabaseCommit( hdb ); r = MsiDatabaseCommit( hdb );
ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r );
sprintf( package, "#%u", hdb ); sprintf( package, "#%u", hdb );
r = MsiOpenPackageA( package, &hpkg ); r = MsiOpenPackageA( package, &hpkg );
...@@ -9116,8 +9119,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI ...@@ -9116,8 +9119,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI
{ {
INT retval = context ? *((INT *)context) : 0; INT retval = context ? *((INT *)context) : 0;
struct externalui_message msg; struct externalui_message msg;
char buffer[100]; char buffer[256];
DWORD length = 100; DWORD length;
UINT r;
int i; int i;
msg.message = message; msg.message = message;
...@@ -9131,8 +9135,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI ...@@ -9131,8 +9135,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI
msg.field_count = MsiRecordGetFieldCount(hrecord); msg.field_count = MsiRecordGetFieldCount(hrecord);
for (i = 0; i <= msg.field_count; i++) for (i = 0; i <= msg.field_count; i++)
{ {
length = 100; length = sizeof(buffer);
MsiRecordGetStringA(hrecord, i, buffer, &length); r = MsiRecordGetStringA(hrecord, i, buffer, &length);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
memcpy(msg.field[i], buffer, min(100, length+1)); memcpy(msg.field[i], buffer, min(100, length+1));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment