database: remove libmsi_database_get_summary_info()

2 files changed, 20 insertions, 23 deletions

diff --git a/tests/testdatabase.c b/tests/testdatabase.c
index 7652e24..6aebd5e 100644
--- a/tests/testdatabase.c
+++ b/tests/testdatabase.c
@@ -1150,8 +1150,8 @@ static void test_streamtable(void)
     g_object_unref( query );
 
     /* create a summary information stream */
-    r = libmsi_database_get_summary_info( hdb, 1, &hsi );
-    ok( r == LIBMSI_RESULT_SUCCESS, "Failed to get summary information handle: %u\n", r );
+    hsi = libmsi_summary_info_new (hdb, 1, NULL);
+    ok(hsi, "Failed to get summary information handle: %u\n", r );
 
     libmsi_summary_info_set_int(hsi, LIBMSI_PROPERTY_SECURITY, 2, &error);
     ok(!error, "Failed to set property\n");
@@ -1731,8 +1731,8 @@ static void test_suminfo_import(void)
 
     /* ...its data is added to the special summary information stream */
 
-    r = libmsi_database_get_summary_info(hdb, 0, &hsi);
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r);
+    hsi = libmsi_summary_info_new(hdb, 0, NULL);
+    ok(hsi, "libmsi_summary_info_new() failed");
 
     r = libmsi_summary_info_get_property_count(hsi, &count);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r);
@@ -2409,8 +2409,8 @@ static unsigned set_summary_info(LibmsiDatabase *hdb)
     LibmsiSummaryInfo *suminfo;
 
     /* build summary info */
-    res = libmsi_database_get_summary_info(hdb, 7, &suminfo);
-    ok( res == LIBMSI_RESULT_SUCCESS , "Failed to open summaryinfo\n" );
+    suminfo = libmsi_summary_info_new(hdb, 7, NULL);
+    ok(suminfo , "Failed to open summaryinfo\n" );
 
     libmsi_summary_info_set_string (suminfo, 2, "Installation Database", &error);
     ok(!error, "Failed to set summary info\n");
diff --git a/tests/testsuminfo.c b/tests/testsuminfo.c
index 5a6d40d..76a7911 100644
--- a/tests/testsuminfo.c
+++ b/tests/testsuminfo.c
@@ -50,16 +50,13 @@ static void test_suminfo(void)
     hdb = libmsi_database_new(msifile, LIBMSI_DB_OPEN_CREATE, NULL);
     ok(hdb, "libmsi_database_new failed\n");
 
-    r = libmsi_database_get_summary_info(hdb, 0, NULL);
-    ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "libmsi_database_get_summary_info wrong error\n");
-
-    r = libmsi_database_get_summary_info(hdb, 0, &hsuminfo);
-    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed %u\n", r);
+    hsuminfo = libmsi_summary_info_new(hdb, 0, NULL);
+    ok(hsuminfo, "libmsi_database_get_summary_info failed\n");
 
     g_object_unref(hsuminfo);
 
-    r = libmsi_database_get_summary_info(hdb, 0, &hsuminfo);
-    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed %u\n", r);
+    hsuminfo = libmsi_summary_info_new(hdb, 0, NULL);
+    ok(hsuminfo, "libmsi_database_get_summary_info failed\n");
 
     r = libmsi_summary_info_get_property_count(0, NULL);
     ok(r == LIBMSI_RESULT_INVALID_HANDLE, "getpropcount failed\n");
@@ -87,8 +84,8 @@ static void test_suminfo(void)
     g_object_unref(hsuminfo);
 
     /* try again with the update count set */
-    r = libmsi_database_get_summary_info(hdb, 1, &hsuminfo);
-    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed\n");
+    hsuminfo = libmsi_summary_info_new(hdb, 1, NULL);
+    ok(hsuminfo, "libmsi_database_get_summary_info failed\n");
 
     libmsi_summary_info_set_string(hsuminfo, 0, NULL, &error);
     g_assert_error(error, LIBMSI_RESULT_ERROR, LIBMSI_RESULT_DATATYPE_MISMATCH);
@@ -143,8 +140,8 @@ static void test_suminfo(void)
     g_object_unref(hsuminfo);
 
     /* try again with a higher update count */
-    r = libmsi_database_get_summary_info(hdb, 10, &hsuminfo);
-    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed\n");
+    hsuminfo = libmsi_summary_info_new(hdb, 10, NULl);
+    ok(hsuminfo, "libmsi_database_get_summary_info failed\n");
 
     libmsi_summary_info_set_string(hsuminfo, LIBMSI_PROPERTY_TITLE, "JungAh", &error);
     ok(!error, "libmsi_summary_info_set_property failed\n");
@@ -175,8 +172,8 @@ static void test_suminfo(void)
     hdb = libmsi_database_new(msifile, LIBMSI_DB_OPEN_TRANSACT, NULL);
     ok(hdb, "libmsi_database_new failed\n");
 
-    r = libmsi_database_get_summary_info(hdb, 1, &hsuminfo);
-    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed\n");
+    hsuminfo = libmsi_summary_info_new(hdb, 1, NULl);
+    ok(hsuminfo, "libmsi_database_get_summary_info failed\n");
 
     r = libmsi_summary_info_set_string(hsuminfo, LIBMSI_PROPERTY_AUTHOR, "Mike", error);
     ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_set_property wrong error\n");
@@ -192,8 +189,8 @@ static void test_suminfo(void)
     hdb = libmsi_database_new(msifile, LIBMSI_DB_OPEN_READONLY, NULL);
     ok(hdb, "libmsi_database_new failed\n");
 
-    r = libmsi_database_get_summary_info(hdb, 0, &hsuminfo);
-    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed %u\n", r);
+    hsuminfo = libmsi_summary_info_new(hdb, 0, NULL);
+    ok(hsuminfo, "libmsi_database_get_summary_info failed\n");
 
     libmsi_summary_info_set_string(hsuminfo, LIBMSI_PROPERTY_AUTHOR, "Mike", &error);
     todo_wine ok(error, "libmsi_summary_info_set_property wrong error\n");
@@ -342,8 +339,8 @@ static void test_summary_binary(void)
     hdb = libmsi_database_new(msifile, LIBMSI_DB_OPEN_READONLY, NULl);
     ok(hdb, "libmsi_database_new failed\n");
 
-    r = libmsi_database_get_summary_info(hdb, 0, &hsuminfo);
-    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed\n");
+    hsuminfo = libmsi_summary_info_new(hdb, 0, NULL);
+    ok(hsuminfo, "libmsi_database_get_summary_info failed\n");
 
     /*
      * Check what reading LIBMSI_PROPERTY_LASTPRINTED does...