From ae4c81e4fca5bb5816b5cbabb17a7dcc22f58a3b Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Mon, 10 Dec 2012 00:01:22 +0100 Subject: convert to GObject --- tests/testdatabase.c | 881 +++++++++++++++++++++++---------------------------- 1 file changed, 396 insertions(+), 485 deletions(-) (limited to 'tests/testdatabase.c') diff --git a/tests/testdatabase.c b/tests/testdatabase.c index 6547d25..b7d3739 100644 --- a/tests/testdatabase.c +++ b/tests/testdatabase.c @@ -72,8 +72,8 @@ static void test_msidatabase(void) ok( -1 != access( msifile, F_OK ), "database should exist\n"); - res = libmsi_unref( hdb ); - ok( res == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb ); + res = libmsi_database_open( msifile, msifile2, &hdb2 ); ok( res == LIBMSI_RESULT_SUCCESS , "Failed to open database\n" ); @@ -82,14 +82,12 @@ static void test_msidatabase(void) ok( -1 != access( msifile2, F_OK ), "database should exist\n"); - res = libmsi_unref( hdb2 ); - ok( res == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb2 ); res = libmsi_database_open( msifile, msifile2, &hdb2 ); ok( res == LIBMSI_RESULT_SUCCESS , "Failed to open database\n" ); - res = libmsi_unref( hdb2 ); - ok( res == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb2 ); ok( -1 == access( msifile2, F_OK ), "uncommitted database should not exist\n"); @@ -99,8 +97,7 @@ static void test_msidatabase(void) res = libmsi_database_commit( hdb2 ); ok( res == LIBMSI_RESULT_SUCCESS , "Failed to commit database\n" ); - res = libmsi_unref( hdb2 ); - ok( res == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb2 ); ok( -1 != access( msifile2, F_OK ), "committed database should exist\n"); @@ -110,14 +107,12 @@ static void test_msidatabase(void) res = libmsi_database_commit( hdb ); ok( res == LIBMSI_RESULT_SUCCESS , "Failed to commit database\n" ); - res = libmsi_unref( hdb ); - ok( res == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb ); res = libmsi_database_open( msifile, LIBMSI_DB_OPEN_TRANSACT, &hdb ); ok( res == LIBMSI_RESULT_SUCCESS , "Failed to open database\n" ); - res = libmsi_unref( hdb ); - ok( res == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb ); ok( -1 != access( msifile, F_OK ), "database should exist\n"); unlink( msifile ); @@ -126,8 +121,7 @@ static void test_msidatabase(void) res = libmsi_database_open( msifile, LIBMSI_DB_OPEN_CREATE, &hdb ); ok( res == LIBMSI_RESULT_SUCCESS , "Failed to open database\n" ); - res = libmsi_unref( hdb ); - ok( res == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb ); ok( -1 == access( msifile, F_OK ), "database should not exist\n"); @@ -139,8 +133,7 @@ static void test_msidatabase(void) ok( -1 != access( msifile, F_OK ), "database should exist\n"); - res = libmsi_unref( hdb ); - ok( res == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb ); res = unlink( msifile2 ); ok( res == 0, "Failed to delete database\n" ); @@ -168,9 +161,8 @@ static unsigned do_query(LibmsiDatabase *hdb, const char *sql, LibmsiRecord **ph r = libmsi_query_close(hquery); if (r != LIBMSI_RESULT_SUCCESS) return r; - r = libmsi_unref(hquery); - if (r != LIBMSI_RESULT_SUCCESS) - return r; + g_object_unref(hquery); + return ret; } @@ -186,7 +178,7 @@ static unsigned run_query( LibmsiDatabase *hdb, LibmsiRecord *hrec, const char * r = libmsi_query_execute(hquery, hrec); if( r == LIBMSI_RESULT_SUCCESS ) r = libmsi_query_close(hquery); - libmsi_unref(hquery); + g_object_unref(hquery); return r; } @@ -311,8 +303,7 @@ static void test_msiinsert(void) ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_execute failed\n"); r = libmsi_query_close(hquery); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_close failed\n"); - r = libmsi_unref(hquery); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hquery); sql = "SELECT * FROM phone WHERE number = '8675309'"; r = libmsi_database_open_query(hdb, sql, &hquery2); @@ -331,8 +322,7 @@ static void test_msiinsert(void) ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_execute failed\n"); r = libmsi_query_close(hquery); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_close failed\n"); - r = libmsi_unref(hquery); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hquery); r = libmsi_query_fetch(hquery2, &hrec); ok(r == LIBMSI_RESULT_NO_MORE_ITEMS, "libmsi_query_fetch produced items\n"); @@ -341,12 +331,10 @@ static void test_msiinsert(void) r = libmsi_query_fetch(hquery2, &hrec); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_fetch failed: %u\n", r); - r = libmsi_unref(hrec); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hrec); r = libmsi_query_close(hquery2); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_close failed\n"); - r = libmsi_unref(hquery2); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hquery2); sql = "SELECT * FROM `phone` WHERE `id` = 1"; r = do_query(hdb, sql, &hrec); @@ -370,8 +358,7 @@ static void test_msiinsert(void) ok(r == LIBMSI_RESULT_SUCCESS, "field 3 content fetch failed\n"); ok(!strcmp(buf,"8675309"), "field 3 content incorrect\n"); - r = libmsi_unref(hrec); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hrec); /* open a select query */ hrec = NULL; @@ -380,8 +367,7 @@ static void test_msiinsert(void) ok(r == LIBMSI_RESULT_NO_MORE_ITEMS, "libmsi_query_fetch failed\n"); ok(hrec == 0, "hrec should be null\n"); - r = libmsi_unref(hrec); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hrec); sql = "SELECT * FROM `phone` WHERE `id` < 0"; r = do_query(hdb, sql, &hrec); @@ -426,11 +412,9 @@ static void test_msiinsert(void) ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_execute failed\n"); r = libmsi_query_close(hquery); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_close failed\n"); - r = libmsi_unref(hquery); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hquery); } - r = libmsi_unref(hrec); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hrec); r = libmsi_query_fetch(0, NULL); ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "libmsi_query_fetch failed\n"); @@ -438,8 +422,7 @@ static void test_msiinsert(void) r = libmsi_database_commit(hdb); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_commit failed\n"); - r = libmsi_unref(hdb); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hdb); r = unlink(msifile); ok(r == 0, "file didn't exist after commit\n"); @@ -463,9 +446,7 @@ static unsigned try_query_param( LibmsiDatabase *hdb, const char *szQuery, Libms if(r != LIBMSI_RESULT_SUCCESS ) res = r; - r = libmsi_unref( htab ); - if(r != LIBMSI_RESULT_SUCCESS ) - res = r; + g_object_unref( htab ); } return res; } @@ -485,7 +466,7 @@ static unsigned try_insert_query( LibmsiDatabase *hdb, const char *szQuery ) r = try_query_param( hdb, szQuery, hrec ); - libmsi_unref( hrec ); + g_object_unref( hrec ); return r; } @@ -503,8 +484,7 @@ static void test_msibadqueries(void) r = libmsi_database_commit( hdb ); ok(r == LIBMSI_RESULT_SUCCESS , "Failed to commit database\n"); - r = libmsi_unref( hdb ); - ok(r == LIBMSI_RESULT_SUCCESS , "Failed to close database\n"); + g_object_unref( hdb ); /* open it readonly */ r = libmsi_database_open(msifile, LIBMSI_DB_OPEN_READONLY, &hdb ); @@ -514,8 +494,7 @@ static void test_msibadqueries(void) r = try_query( hdb, "select * from _Tables"); ok(r == LIBMSI_RESULT_SUCCESS , "query 1 failed\n"); - r = libmsi_unref( hdb ); - ok(r == LIBMSI_RESULT_SUCCESS , "Failed to close database r/o\n"); + g_object_unref( hdb ); /* open it read/write */ r = libmsi_database_open(msifile, LIBMSI_DB_OPEN_TRANSACT, &hdb ); @@ -701,8 +680,7 @@ static void test_msibadqueries(void) r = try_query( hdb, "SELECT * FROM a-" ); ok( r == LIBMSI_RESULT_SUCCESS , "query failed: %u\n", r ); - r = libmsi_unref( hdb ); - ok(r == LIBMSI_RESULT_SUCCESS , "Failed to close database transact\n"); + g_object_unref( hdb ); r = unlink( msifile ); ok(r == 0, "file didn't exist after commit\n"); @@ -755,8 +733,7 @@ static void test_getcolinfo(void) r = libmsi_record_get_string(rec, 1, buffer, &sz ); ok( r == LIBMSI_RESULT_SUCCESS, "failed to get string\n"); ok( !strcmp(buffer,"Name"), "_Tables has wrong column name\n"); - r = libmsi_unref( rec ); - ok( r == LIBMSI_RESULT_SUCCESS, "failed to close record handle\n"); + g_object_unref( rec ); /* check that TYPES works */ rec = 0; @@ -766,8 +743,7 @@ static void test_getcolinfo(void) r = libmsi_record_get_string(rec, 1, buffer, &sz ); ok( r == LIBMSI_RESULT_SUCCESS, "failed to get string\n"); ok( !strcmp(buffer,"s64"), "_Tables has wrong column type\n"); - r = libmsi_unref( rec ); - ok( r == LIBMSI_RESULT_SUCCESS, "failed to close record handle\n"); + g_object_unref( rec ); /* check that invalid values fail */ rec = 0; @@ -783,10 +759,8 @@ static void test_getcolinfo(void) r = libmsi_query_close(hquery); ok( r == LIBMSI_RESULT_SUCCESS, "failed to close query\n"); - r = libmsi_unref(hquery); - ok( r == LIBMSI_RESULT_SUCCESS, "failed to close query handle\n"); - r = libmsi_unref(hdb); - ok( r == LIBMSI_RESULT_SUCCESS, "failed to close database\n"); + g_object_unref(hquery); + g_object_unref(hdb); } static LibmsiRecord *get_column_info(LibmsiDatabase *hdb, const char *sql, LibmsiColInfo type) @@ -805,7 +779,7 @@ static LibmsiRecord *get_column_info(LibmsiDatabase *hdb, const char *sql, Libms libmsi_query_get_column_info( hquery, type, &rec ); } libmsi_query_close(hquery); - libmsi_unref(hquery); + g_object_unref(hquery); return rec; } @@ -833,11 +807,11 @@ static unsigned get_columns_table_type(LibmsiDatabase *hdb, const char *table, u r = libmsi_record_get_integer( rec, 2 ); if (r == field) type = libmsi_record_get_integer( rec, 4 ); - libmsi_unref( rec ); + g_object_unref( rec ); } } libmsi_query_close(hquery); - libmsi_unref(hquery); + g_object_unref(hquery); return type; } @@ -885,7 +859,7 @@ static void test_querygetcolumninfo(void) ok( check_record( rec, 6, "I4"), "wrong record type\n"); ok( check_record( rec, 7, "S0"), "wrong record type\n"); - libmsi_unref( rec ); + g_object_unref( rec ); /* check the type in _Columns */ ok( 0x3dff == get_columns_table_type(hdb, "Properties", 1 ), "_columns table wrong\n"); @@ -908,7 +882,7 @@ static void test_querygetcolumninfo(void) ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n"); - libmsi_unref( rec ); + g_object_unref( rec ); r = run_query( hdb, 0, "CREATE TABLE `Binary` " @@ -922,7 +896,7 @@ static void test_querygetcolumninfo(void) ok( check_record( rec, 1, "S255"), "wrong record type\n"); ok( check_record( rec, 2, "V0"), "wrong record type\n"); - libmsi_unref( rec ); + g_object_unref( rec ); /* check the type in _Columns */ ok( 0x3dff == get_columns_table_type(hdb, "Binary", 1 ), "_columns table wrong\n"); @@ -934,7 +908,7 @@ static void test_querygetcolumninfo(void) ok( check_record( rec, 1, "Name"), "wrong record type\n"); ok( check_record( rec, 2, "Data"), "wrong record type\n"); - libmsi_unref( rec ); + g_object_unref( rec ); r = run_query( hdb, 0, "CREATE TABLE `UIText` " @@ -948,15 +922,15 @@ static void test_querygetcolumninfo(void) ok( rec, "failed to get column info record\n" ); ok( check_record( rec, 1, "Key"), "wrong record type\n"); ok( check_record( rec, 2, "Text"), "wrong record type\n"); - libmsi_unref( rec ); + g_object_unref( rec ); rec = get_column_info( hdb, "select * from `UIText`", LIBMSI_COL_INFO_TYPES ); ok( rec, "failed to get column info record\n" ); ok( check_record( rec, 1, "s72"), "wrong record type\n"); ok( check_record( rec, 2, "L255"), "wrong record type\n"); - libmsi_unref( rec ); + g_object_unref( rec ); - libmsi_unref( hdb ); + g_object_unref( hdb ); } static void test_msiexport(void) @@ -991,8 +965,7 @@ static void test_msiexport(void) ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_execute failed\n"); r = libmsi_query_close(hquery); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_close failed\n"); - r = libmsi_unref(hquery); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hquery); /* insert a value into it */ sql = "INSERT INTO `phone` ( `id`, `name`, `number` )" @@ -1003,8 +976,7 @@ static void test_msiexport(void) ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_execute failed\n"); r = libmsi_query_close(hquery); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_close failed\n"); - r = libmsi_unref(hquery); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hquery); fd = open(file, O_WRONLY | O_BINARY | O_CREAT, 0644); ok(fd != -1, "open failed\n"); @@ -1014,7 +986,7 @@ static void test_msiexport(void) close(fd); - libmsi_unref(hdb); + g_object_unref(hdb); /* check the data that was written */ length = 0; @@ -1069,7 +1041,7 @@ static void test_longstrings(void) r = libmsi_database_commit(hdb); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_commit failed\n"); - libmsi_unref(hdb); + g_object_unref(hdb); r = libmsi_database_open(msifile, LIBMSI_DB_OPEN_READONLY, &hdb); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_open failed\n"); @@ -1084,14 +1056,14 @@ static void test_longstrings(void) ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_fetch failed\n"); libmsi_query_close(hquery); - libmsi_unref(hquery); + g_object_unref(hquery); r = libmsi_record_get_string(hrec, 2, NULL, &len); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_fetch failed\n"); ok(len == STRING_LENGTH, "string length wrong\n"); - libmsi_unref(hrec); - libmsi_unref(hdb); + g_object_unref(hrec); + g_object_unref(hdb); unlink(msifile); } @@ -1140,7 +1112,7 @@ static void test_streamtable(void) r = libmsi_database_commit( hdb ); ok( r == LIBMSI_RESULT_SUCCESS , "Failed to commit database\n" ); - libmsi_unref( hdb ); + g_object_unref( hdb ); r = libmsi_database_open(msifile, LIBMSI_DB_OPEN_TRANSACT, &hdb ); ok( r == LIBMSI_RESULT_SUCCESS , "Failed to open database\n" ); @@ -1152,7 +1124,7 @@ static void test_streamtable(void) ok( check_record( rec, 1, "s62"), "wrong record type\n"); ok( check_record( rec, 2, "V0"), "wrong record type\n"); - libmsi_unref( rec ); + g_object_unref( rec ); /* now try the names */ rec = get_column_info( hdb, "select * from `_Streams`", LIBMSI_COL_INFO_NAMES ); @@ -1161,7 +1133,7 @@ static void test_streamtable(void) ok( check_record( rec, 1, "Name"), "wrong record type\n"); ok( check_record( rec, 2, "Data"), "wrong record type\n"); - libmsi_unref( rec ); + g_object_unref( rec ); query = NULL; r = libmsi_database_open_query( hdb, @@ -1174,9 +1146,9 @@ static void test_streamtable(void) r = libmsi_query_fetch( query, &rec ); ok( r == LIBMSI_RESULT_NO_MORE_ITEMS, "Unexpected result: %u\n", r ); - libmsi_unref( rec ); + g_object_unref( rec ); libmsi_query_close( query ); - libmsi_unref( query ); + g_object_unref( query ); /* create a summary information stream */ r = libmsi_database_get_summary_info( hdb, 1, &hsi ); @@ -1188,7 +1160,7 @@ static void test_streamtable(void) r = libmsi_summary_info_persist( hsi ); ok( r == LIBMSI_RESULT_SUCCESS, "Failed to save summary information: %u\n", r ); - libmsi_unref( hsi ); + g_object_unref( hsi ); query = NULL; r = libmsi_database_open_query( hdb, @@ -1201,9 +1173,9 @@ static void test_streamtable(void) r = libmsi_query_fetch( query, &rec ); ok( r == LIBMSI_RESULT_SUCCESS, "Unexpected result: %u\n", r ); - libmsi_unref( rec ); + g_object_unref( rec ); libmsi_query_close( query ); - libmsi_unref( query ); + g_object_unref( query ); /* insert a file into the _Streams table */ create_file( "test.txt" ); @@ -1224,9 +1196,9 @@ static void test_streamtable(void) r = libmsi_query_execute( query, rec ); ok( r == LIBMSI_RESULT_SUCCESS, "Failed to execute query: %d\n", r); - libmsi_unref( rec ); + g_object_unref( rec ); libmsi_query_close( query ); - libmsi_unref( query ); + g_object_unref( query ); /* insert another one */ create_file( "test1.txt" ); @@ -1247,9 +1219,9 @@ static void test_streamtable(void) r = libmsi_query_execute( query, rec ); ok( r == LIBMSI_RESULT_SUCCESS, "Failed to execute query: %d\n", r); - libmsi_unref( rec ); + g_object_unref( rec ); libmsi_query_close( query ); - libmsi_unref( query ); + g_object_unref( query ); query = NULL; r = libmsi_database_open_query( hdb, @@ -1273,9 +1245,9 @@ static void test_streamtable(void) ok( r == LIBMSI_RESULT_SUCCESS, "Failed to get stream: %d\n", r); ok( !strcmp(buf, "test.txt\n"), "Expected 'test.txt\\n', got %s\n", buf); - libmsi_unref( rec ); + g_object_unref( rec ); libmsi_query_close( query ); - libmsi_unref( query ); + g_object_unref( query ); query = NULL; r = libmsi_database_open_query( hdb, @@ -1299,9 +1271,9 @@ static void test_streamtable(void) ok( r == LIBMSI_RESULT_SUCCESS, "Failed to get stream: %d\n", r); ok( !strcmp(buf, "test1.txt\n"), "Expected 'test1.txt\\n', got %s\n", buf); - libmsi_unref( rec ); + g_object_unref( rec ); libmsi_query_close( query ); - libmsi_unref( query ); + g_object_unref( query ); /* perform an update */ create_file( "test2.txt" ); @@ -1320,9 +1292,9 @@ static void test_streamtable(void) r = libmsi_query_execute( query, rec ); ok( r == LIBMSI_RESULT_SUCCESS, "Failed to execute query: %d\n", r); - libmsi_unref( rec ); + g_object_unref( rec ); libmsi_query_close( query ); - libmsi_unref( query ); + g_object_unref( query ); query = NULL; r = libmsi_database_open_query( hdb, @@ -1346,9 +1318,9 @@ static void test_streamtable(void) ok( r == LIBMSI_RESULT_SUCCESS, "Failed to get stream: %d\n", r); todo_wine ok( !strcmp(buf, "test2.txt\n"), "Expected 'test2.txt\\n', got %s\n", buf); - libmsi_unref( rec ); + g_object_unref( rec ); libmsi_query_close( query ); - libmsi_unref( query ); + g_object_unref( query ); r = run_query( hdb, 0, "DELETE FROM `_Streams` WHERE `Name` = 'data1'" ); ok( r == LIBMSI_RESULT_SUCCESS, "Cannot create Binary table: %d\n", r ); @@ -1365,8 +1337,8 @@ static void test_streamtable(void) ok( r == LIBMSI_RESULT_NO_MORE_ITEMS, "Expected LIBMSI_RESULT_NO_MORE_ITEMS,, got %d\n", r); libmsi_query_close( query ); - libmsi_unref( query ); - libmsi_unref( hdb ); + g_object_unref( query ); + g_object_unref( hdb ); unlink(msifile); } @@ -1398,14 +1370,12 @@ static void test_binary(void) r = run_query( hdb, rec, sql ); ok( r == LIBMSI_RESULT_SUCCESS, "Insert into Binary table failed: %d\n", r ); - r = libmsi_unref( rec ); - ok( r == LIBMSI_RESULT_SUCCESS , "Failed to close record handle\n" ); + g_object_unref( rec ); r = libmsi_database_commit( hdb ); ok( r == LIBMSI_RESULT_SUCCESS , "Failed to commit database\n" ); - r = libmsi_unref( hdb ); - ok( r == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb ); /* read file from the Stream table */ r = libmsi_database_open( msifile, LIBMSI_DB_OPEN_READONLY, &hdb ); @@ -1426,8 +1396,7 @@ static void test_binary(void) ok( r == LIBMSI_RESULT_SUCCESS, "Failed to get stream: %d\n", r ); ok( !strcmp(buf, "test.txt\n"), "Expected 'test.txt\\n', got %s\n", buf ); - r = libmsi_unref( rec ); - ok( r == LIBMSI_RESULT_SUCCESS , "Failed to close record handle\n" ); + g_object_unref( rec ); /* read file from the Binary table */ sql = "SELECT * FROM `Binary`"; @@ -1445,11 +1414,9 @@ static void test_binary(void) ok( r == LIBMSI_RESULT_SUCCESS, "Failed to get stream: %d\n", r ); ok( !strcmp(buf, "test.txt\n"), "Expected 'test.txt\\n', got %s\n", buf ); - r = libmsi_unref( rec ); - ok( r == LIBMSI_RESULT_SUCCESS , "Failed to close record handle\n" ); + g_object_unref( rec ); - r = libmsi_unref( hdb ); - ok( r == LIBMSI_RESULT_SUCCESS , "Failed to close database\n" ); + g_object_unref( hdb ); unlink( msifile ); } @@ -1537,17 +1504,17 @@ static void test_where_not_in_selected(void) ok( check_record( rec, 1, "cond2"), "wrong condition\n"); - libmsi_unref( rec ); + g_object_unref( rec ); r = libmsi_query_fetch(query, &rec); ok( r == LIBMSI_RESULT_SUCCESS, "failed to fetch query: %d\n", r ); ok( check_record( rec, 1, "cond3"), "wrong condition\n"); - libmsi_unref( rec ); + g_object_unref( rec ); libmsi_query_close(query); - libmsi_unref(query); + g_object_unref(query); - libmsi_unref( hdb ); + g_object_unref( hdb ); unlink(msifile); } @@ -1597,7 +1564,7 @@ static void test_where(void) r = do_query(hdb, sql, &rec); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_fetch failed: %d\n", r); ok( check_record( rec, 4, "zero.cab"), "wrong cabinet\n"); - libmsi_unref( rec ); + g_object_unref( rec ); sql = "SELECT * FROM `Media` WHERE `LastSequence` >= 1"; r = do_query(hdb, sql, &rec); @@ -1608,7 +1575,7 @@ static void test_where(void) ok( 2 == r, "field wrong\n"); r = libmsi_record_get_integer(rec, 2); ok( 1 == r, "field wrong\n"); - libmsi_unref( rec ); + g_object_unref( rec ); sql = "SELECT `DiskId` FROM `Media` WHERE `LastSequence` >= 1 AND DiskId >= 0"; query = NULL; @@ -1629,7 +1596,7 @@ static void test_where(void) ok( r == LIBMSI_RESULT_SUCCESS, "failed to get record string: %d\n", r ); ok( !strcmp( buf, "2" ), "For (row %d, column 1) expected '%d', got %s\n", 0, 2, buf ); - libmsi_unref( rec ); + g_object_unref( rec ); r = libmsi_query_fetch(query, &rec); ok( r == LIBMSI_RESULT_SUCCESS, "failed to fetch query: %d\n", r ); @@ -1639,45 +1606,45 @@ static void test_where(void) ok( r == LIBMSI_RESULT_SUCCESS, "failed to get record string: %d\n", r ); ok( !strcmp( buf, "3" ), "For (row %d, column 1) expected '%d', got %s\n", 1, 3, buf ); - libmsi_unref( rec ); + g_object_unref( rec ); r = libmsi_query_fetch(query, &rec); ok( r == LIBMSI_RESULT_NO_MORE_ITEMS, "expected no more items: %d\n", r ); libmsi_query_close(query); - libmsi_unref(query); + g_object_unref(query); - libmsi_unref( rec ); + g_object_unref( rec ); rec = 0; sql = "SELECT * FROM `Media` WHERE `DiskPrompt` IS NULL"; r = do_query(hdb, sql, &rec); ok( r == LIBMSI_RESULT_SUCCESS, "query failed: %d\n", r ); - libmsi_unref( rec ); + g_object_unref( rec ); rec = 0; sql = "SELECT * FROM `Media` WHERE `DiskPrompt` < 'Cabinet'"; r = do_query(hdb, sql, &rec); ok( r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "query failed: %d\n", r ); - libmsi_unref( rec ); + g_object_unref( rec ); rec = 0; sql = "SELECT * FROM `Media` WHERE `DiskPrompt` > 'Cabinet'"; r = do_query(hdb, sql, &rec); ok( r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "query failed: %d\n", r ); - libmsi_unref( rec ); + g_object_unref( rec ); rec = 0; sql = "SELECT * FROM `Media` WHERE `DiskPrompt` <> 'Cabinet'"; r = do_query(hdb, sql, &rec); ok( r == LIBMSI_RESULT_SUCCESS, "query failed: %d\n", r ); - libmsi_unref( rec ); + g_object_unref( rec ); rec = 0; sql = "SELECT * FROM `Media` WHERE `DiskPrompt` = 'Cabinet'"; r = do_query(hdb, sql, &rec); ok( r == LIBMSI_RESULT_NO_MORE_ITEMS, "query failed: %d\n", r ); - libmsi_unref( rec ); + g_object_unref( rec ); rec = libmsi_record_new(1); libmsi_record_set_string(rec, 1, ""); @@ -1690,16 +1657,16 @@ static void test_where(void) r = libmsi_query_execute(query, rec); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); r = libmsi_query_fetch(query, &rec); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); libmsi_query_close(query); - libmsi_unref(query); + g_object_unref(query); - libmsi_unref( hdb ); + g_object_unref( hdb ); unlink(msifile); } @@ -1790,7 +1757,7 @@ static void test_suminfo_import(void) sql = "SELECT * FROM `_SummaryInformation`"; r = libmsi_database_open_query(hdb, sql, &query); ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "Expected LIBMSI_RESULT_BAD_QUERY_SYNTAX, got %u\n", r); - libmsi_unref(query); + g_object_unref(query); /* ...its data is added to the special summary information stream */ @@ -1885,8 +1852,8 @@ static void test_suminfo_import(void) ok(type == LIBMSI_PROPERTY_TYPE_STRING, "Expected VT_LPSTR, got %u\n", type); ok(!strcmp(str_value, "Vim"), "Expected \"Vim\", got %s\n", str_value); - libmsi_unref(hsi); - libmsi_unref(hdb); + g_object_unref(hsi); + g_object_unref(hdb); unlink(msifile); } @@ -1933,7 +1900,7 @@ static void test_msiimport(void) ok(check_record(rec, 7, "String"), "Expected String\n"); ok(check_record(rec, 8, "LocalizableString"), "Expected LocalizableString\n"); ok(check_record(rec, 9, "LocalizableStringNullable"), "Expected LocalizableStringNullable\n"); - libmsi_unref(rec); + g_object_unref(rec); rec = NULL; r = libmsi_query_get_column_info(query, LIBMSI_COL_INFO_TYPES, &rec); @@ -1949,7 +1916,7 @@ static void test_msiimport(void) ok(check_record(rec, 7, "S255"), "Expected S255\n"); ok(check_record(rec, 8, "S0"), "Expected S0\n"); ok(check_record(rec, 9, "s0"), "Expected s0\n"); - libmsi_unref(rec); + g_object_unref(rec); sql = "SELECT * FROM `TestTable`"; r = do_query(hdb, sql, &rec); @@ -1974,9 +1941,9 @@ static void test_msiimport(void) i = libmsi_record_get_integer(rec, 6); ok(i == -2147483640, "Expected -2147483640, got %d\n", i); - libmsi_unref(rec); + g_object_unref(rec); libmsi_query_close(query); - libmsi_unref(query); + g_object_unref(query); query = NULL; sql = "SELECT * FROM `TwoPrimary`"; @@ -1991,7 +1958,7 @@ static void test_msiimport(void) ok(check_record(rec, 1, "PrimaryOne"), "Expected PrimaryOne\n"); ok(check_record(rec, 2, "PrimaryTwo"), "Expected PrimaryTwo\n"); - libmsi_unref(rec); + g_object_unref(rec); rec = NULL; r = libmsi_query_get_column_info(query, LIBMSI_COL_INFO_TYPES, &rec); @@ -2000,7 +1967,7 @@ static void test_msiimport(void) ok(count == 2, "Expected 2, got %d\n", count); ok(check_record(rec, 1, "s255"), "Expected s255\n"); ok(check_record(rec, 2, "s255"), "Expected s255\n"); - libmsi_unref(rec); + g_object_unref(rec); r = libmsi_query_execute(query, 0); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); @@ -2011,7 +1978,7 @@ static void test_msiimport(void) ok(check_record(rec, 1, "papaya"), "Expected 'papaya'\n"); ok(check_record(rec, 2, "leaf"), "Expected 'leaf'\n"); - libmsi_unref(rec); + g_object_unref(rec); r = libmsi_query_fetch(query, &rec); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); @@ -2019,7 +1986,7 @@ static void test_msiimport(void) ok(check_record(rec, 1, "papaya"), "Expected 'papaya'\n"); ok(check_record(rec, 2, "flower"), "Expected 'flower'\n"); - libmsi_unref(rec); + g_object_unref(rec); r = libmsi_query_fetch(query, &rec); ok(r == LIBMSI_RESULT_NO_MORE_ITEMS, @@ -2028,7 +1995,7 @@ static void test_msiimport(void) r = libmsi_query_close(query); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); - libmsi_unref(query); + g_object_unref(query); query = NULL; sql = "SELECT * FROM `Table`"; @@ -2046,7 +2013,7 @@ static void test_msiimport(void) ok(check_record(rec, 4, "D"), "Expected D\n"); ok(check_record(rec, 5, "E"), "Expected E\n"); ok(check_record(rec, 6, "F"), "Expected F\n"); - libmsi_unref(rec); + g_object_unref(rec); rec = NULL; r = libmsi_query_get_column_info(query, LIBMSI_COL_INFO_TYPES, &rec); @@ -2059,10 +2026,10 @@ static void test_msiimport(void) ok(check_record(rec, 4, "s72"), "Expected s72\n"); ok(check_record(rec, 5, "s72"), "Expected s72\n"); ok(check_record(rec, 6, "s72"), "Expected s72\n"); - libmsi_unref(rec); + g_object_unref(rec); libmsi_query_close(query); - libmsi_unref(query); + g_object_unref(query); query = NULL; sql = "SELECT * FROM `Table`"; @@ -2081,7 +2048,7 @@ static void test_msiimport(void) ok(check_record(rec, 5, "e"), "Expected 'e'\n"); ok(check_record(rec, 6, "f"), "Expected 'f'\n"); - libmsi_unref(rec); + g_object_unref(rec); r = libmsi_query_fetch(query, &rec); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); @@ -2092,15 +2059,15 @@ static void test_msiimport(void) ok(check_record(rec, 5, "k"), "Expected 'k'\n"); ok(check_record(rec, 6, "l"), "Expected 'l'\n"); - libmsi_unref(rec); + g_object_unref(rec); r = libmsi_query_fetch(query, &rec); ok(r == LIBMSI_RESULT_NO_MORE_ITEMS, "Expected LIBMSI_RESULT_NO_MORE_ITEMS, got %d\n", r); libmsi_query_close(query); - libmsi_unref(query); - libmsi_unref(hdb); + g_object_unref(query); + g_object_unref(hdb); unlink(msifile); } @@ -2149,11 +2116,9 @@ static void test_binary_import(void) ok(!strcmp(buf, "just some words"), "Expected 'just some words', got %s\n", buf); - r = libmsi_unref(rec); - ok(r == LIBMSI_RESULT_SUCCESS , "Failed to close record handle\n"); + g_object_unref(rec); - r = libmsi_unref(hdb); - ok(r == LIBMSI_RESULT_SUCCESS , "Failed to close database\n"); + g_object_unref(hdb); unlink("bin_import/filename1.ibd"); rmdir("bin_import"); @@ -2179,7 +2144,7 @@ static void test_markers(void) sql = "CREATE TABLE `Table` ( `One` SHORT NOT NULL, `Two` CHAR(255) PRIMARY KEY `One`)"; r = run_query(hdb, 0, sql); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try table name as marker */ rec = libmsi_record_new(1); @@ -2206,7 +2171,7 @@ static void test_markers(void) sql = "CREATE TABLE `Mable` ( `?` SHORT NOT NULL, `Two` CHAR(255) PRIMARY KEY `One`)"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "Expected LIBMSI_RESULT_BAD_QUERY_SYNTAX, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try column names as markers */ rec = libmsi_record_new(2); @@ -2215,7 +2180,7 @@ static void test_markers(void) sql = "CREATE TABLE `Mable` ( `?` SHORT NOT NULL, `?` CHAR(255) PRIMARY KEY `One`)"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "Expected LIBMSI_RESULT_BAD_QUERY_SYNTAX, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try names with backticks */ rec = libmsi_record_new(3); @@ -2235,7 +2200,7 @@ static void test_markers(void) sql = "CREATE TABLE `Mable` ( ? SHORT NOT NULL, ? CHAR(255) PRIMARY KEY ?)"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "Expected LIBMSI_RESULT_BAD_QUERY_SYNTAX, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try one long marker */ rec = libmsi_record_new(1); @@ -2243,7 +2208,7 @@ static void test_markers(void) sql = "CREATE TABLE `Mable` ( ? )"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "Expected LIBMSI_RESULT_BAD_QUERY_SYNTAX, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try all names as markers */ rec = libmsi_record_new(4); @@ -2254,7 +2219,7 @@ static void test_markers(void) sql = "CREATE TABLE `?` ( `?` SHORT NOT NULL, `?` CHAR(255) PRIMARY KEY `?`)"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "Expected LIBMSI_RESULT_BAD_QUERY_SYNTAX, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try a legit insert */ sql = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( 5, 'hello' )"; @@ -2271,7 +2236,7 @@ static void test_markers(void) sql = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try column names and values as markers */ rec = libmsi_record_new(4); @@ -2282,7 +2247,7 @@ static void test_markers(void) sql = "INSERT INTO `Table` ( `?`, `?` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "Expected LIBMSI_RESULT_BAD_QUERY_SYNTAX, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try column names as markers */ rec = libmsi_record_new(2); @@ -2291,7 +2256,7 @@ static void test_markers(void) sql = "INSERT INTO `Table` ( `?`, `?` ) VALUES ( 3, 'yellow' )"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "Expected LIBMSI_RESULT_BAD_QUERY_SYNTAX, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try table name as a marker */ rec = libmsi_record_new(1); @@ -2299,7 +2264,7 @@ static void test_markers(void) sql = "INSERT INTO `?` ( `One`, `Two` ) VALUES ( 2, 'green' )"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try table name and values as markers */ rec = libmsi_record_new(3); @@ -2309,7 +2274,7 @@ static void test_markers(void) sql = "INSERT INTO `?` ( `One`, `Two` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "Expected LIBMSI_RESULT_FUNCTION_FAILED, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* try all markers */ rec = libmsi_record_new(5); @@ -2321,7 +2286,7 @@ static void test_markers(void) sql = "INSERT INTO `?` ( `?`, `?` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "Expected LIBMSI_RESULT_BAD_QUERY_SYNTAX, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* insert an integer as a string */ rec = libmsi_record_new(2); @@ -2330,7 +2295,7 @@ static void test_markers(void) sql = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( ?, '?' )"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); /* leave off the '' for the string */ rec = libmsi_record_new(2); @@ -2339,9 +2304,9 @@ static void test_markers(void) sql = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( ?, ? )"; r = run_query(hdb, rec, sql); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); - libmsi_unref(rec); + g_object_unref(rec); - libmsi_unref(hdb); + g_object_unref(hdb); unlink(msifile); } @@ -2373,16 +2338,13 @@ static void test_handle_limit(void) for (i=0; i