Merge branch 'pre-gsf'

8 files changed, 162 insertions, 173 deletions

diff --git a/include/libmsi-record.h b/include/libmsi-record.h
index f3f3989..d47727c 100644
--- a/include/libmsi-record.h
+++ b/include/libmsi-record.h
@@ -42,12 +42,12 @@ struct _LibmsiRecordClass
 GType libmsi_record_get_type (void) G_GNUC_CONST;
 
 LibmsiRecord *    libmsi_record_new (guint count);
-LibmsiResult      libmsi_record_clear_data (LibmsiRecord *);
+LibmsiResult      libmsi_record_clear (LibmsiRecord *);
 LibmsiResult      libmsi_record_set_int (LibmsiRecord *,unsigned,int);
 LibmsiResult      libmsi_record_set_string (LibmsiRecord *,unsigned,const char *);
 LibmsiResult      libmsi_record_get_string (const LibmsiRecord *,unsigned,char *,unsigned *);
 unsigned          libmsi_record_get_field_count (const LibmsiRecord *);
-int               libmsi_record_get_integer (const LibmsiRecord *,unsigned);
+int               libmsi_record_get_int (const LibmsiRecord *,unsigned);
 gboolean          libmsi_record_is_null (const LibmsiRecord *,unsigned);
 
 LibmsiResult      libmsi_record_load_stream (LibmsiRecord *,unsigned,const char *);
diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c
index 765be66..596fc0c 100644
--- a/libmsi/libmsi-database.c
+++ b/libmsi/libmsi-database.c
@@ -2404,7 +2404,7 @@ static unsigned msi_primary_key_iterator( LibmsiRecord *rec, void *param )
     const char *table;
     unsigned type;
 
-    type = libmsi_record_get_integer( rec, 4 );
+    type = libmsi_record_get_int( rec, 4 );
     if( type & MSITYPE_KEY )
     {
         info->n++;
diff --git a/libmsi/libmsi-record.c b/libmsi/libmsi-record.c
index a725049..12e96aa 100644
--- a/libmsi/libmsi-record.c
+++ b/libmsi/libmsi-record.c
@@ -212,7 +212,7 @@ unsigned _libmsi_record_copy_field( LibmsiRecord *in_rec, unsigned in_n,
     return r;
 }
 
-int libmsi_record_get_integer( const LibmsiRecord *rec, unsigned iField)
+int libmsi_record_get_int( const LibmsiRecord *rec, unsigned iField)
 {
     int ret = 0;
 
@@ -239,7 +239,7 @@ int libmsi_record_get_integer( const LibmsiRecord *rec, unsigned iField)
     return LIBMSI_NULL_INT;
 }
 
-LibmsiResult libmsi_record_clear_data( LibmsiRecord *rec )
+LibmsiResult libmsi_record_clear( LibmsiRecord *rec )
 {
     unsigned i;
 
diff --git a/libmsi/table.c b/libmsi/table.c
index 03d1646..c7a7e36 100644
--- a/libmsi/table.c
+++ b/libmsi/table.c
@@ -1286,7 +1286,7 @@ static unsigned get_table_value_from_record( LibmsiTableView *tv, LibmsiRecord *
     }
     else if ( bytes_per_column( tv->db, &columninfo, LONG_STR_BYTES ) == 2 )
     {
-        *pvalue = 0x8000 + libmsi_record_get_integer( rec, iField );
+        *pvalue = 0x8000 + libmsi_record_get_int( rec, iField );
         if ( *pvalue & 0xffff0000 )
         {
             ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000);
@@ -1295,7 +1295,7 @@ static unsigned get_table_value_from_record( LibmsiTableView *tv, LibmsiRecord *
     }
     else
     {
-        int ival = libmsi_record_get_integer( rec, iField );
+        int ival = libmsi_record_get_int( rec, iField );
         *pvalue = ival ^ 0x80000000;
     }
 
@@ -1545,7 +1545,7 @@ static unsigned table_validate_new( LibmsiTableView *tv, LibmsiRecord *rec, unsi
         {
             unsigned n;
 
-            n = libmsi_record_get_integer( rec, i+1 );
+            n = libmsi_record_get_int( rec, i+1 );
             if (n == LIBMSI_NULL_INT)
             {
                 if (column) *column = i;
@@ -2242,7 +2242,7 @@ static void dump_record( LibmsiRecord *rec )
         else if( (sval = _libmsi_record_get_string_raw( rec, i )) )
             TRACE("row -> [%s]\n", debugstr_a(sval));
         else
-            TRACE("row -> [0x%08x]\n", libmsi_record_get_integer( rec, i ) );
+            TRACE("row -> [0x%08x]\n", libmsi_record_get_int( rec, i ) );
     }
 }
 
@@ -2292,7 +2292,7 @@ static unsigned* msi_record_to_row( const LibmsiTableView *tv, LibmsiRecord *rec
         }
         else
         {
-            data[i] = libmsi_record_get_integer( rec, i+1 );
+            data[i] = libmsi_record_get_int( rec, i+1 );
 
             if (data[i] == LIBMSI_NULL_INT)
                 data[i] = 0;
@@ -2464,7 +2464,7 @@ static unsigned msi_table_load_transform( LibmsiDatabase *db, GsfInfile *stg,
             if (!strcmp( name, szColumns ))
             {
                 _libmsi_record_get_string( rec, 1, table, &sz );
-                number = libmsi_record_get_integer( rec, 2 );
+                number = libmsi_record_get_int( rec, 2 );
 
                 /*
                  * Native msi seems writes nul into the Number (2nd) column of
diff --git a/libmsi/where.c b/libmsi/where.c
index 18473ec..fac7fa1 100644
--- a/libmsi/where.c
+++ b/libmsi/where.c
@@ -580,7 +580,7 @@ static unsigned where_view_evaluate( LibmsiWhereView *wv, const unsigned rows[],
         return expr_eval_strcmp( wv, rows, &cond->u.expr, val, record );
 
     case EXPR_WILDCARD:
-        *val = libmsi_record_get_integer( record, ++wv->rec_index );
+        *val = libmsi_record_get_int( record, ++wv->rec_index );
         return LIBMSI_RESULT_SUCCESS;
 
     default:
diff --git a/tests/testdatabase.c b/tests/testdatabase.c
index 8d2f16e..a8c29b5 100644
--- a/tests/testdatabase.c
+++ b/tests/testdatabase.c
@@ -347,7 +347,7 @@ static void test_msiinsert(void)
     r = libmsi_record_is_null(hrec, 0);
     ok(r == true, "Expected true, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 1, "field 1 contents wrong\n");
     sz = sizeof buf;
     r = libmsi_record_get_string(hrec, 2, buf, &sz);
@@ -804,9 +804,9 @@ static unsigned get_columns_table_type(LibmsiDatabase *hdb, const char *table, u
             r = libmsi_query_fetch( hquery, &rec );
             if( r != LIBMSI_RESULT_SUCCESS)
                 break;
-            r = libmsi_record_get_integer( rec, 2 );
+            r = libmsi_record_get_int( rec, 2 );
             if (r == field)
-                type = libmsi_record_get_integer( rec, 4 );
+                type = libmsi_record_get_int( rec, 4 );
             g_object_unref( rec );
         }
     }
@@ -1571,9 +1571,9 @@ static void test_where(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_fetch failed: %d\n", r);
     ok( check_record( rec, 4, "one.cab"), "wrong cabinet\n");
 
-    r = libmsi_record_get_integer(rec, 1);
+    r = libmsi_record_get_int(rec, 1);
     ok( 2 == r, "field wrong\n");
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok( 1 == r, "field wrong\n");
     g_object_unref( rec );
 
@@ -1926,19 +1926,19 @@ static void test_msiimport(void)
     ok(check_record(rec, 8, "localizable"), "Expected 'localizable'\n");
     ok(check_record(rec, 9, "duh"), "Expected 'duh'\n");
 
-    i = libmsi_record_get_integer(rec, 2);
+    i = libmsi_record_get_int(rec, 2);
     ok(i == 5, "Expected 5, got %d\n", i);
 
-    i = libmsi_record_get_integer(rec, 3);
+    i = libmsi_record_get_int(rec, 3);
     ok(i == 2, "Expected 2, got %d\n", i);
 
-    i = libmsi_record_get_integer(rec, 4);
+    i = libmsi_record_get_int(rec, 4);
     ok(i == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", i);
 
-    i = libmsi_record_get_integer(rec, 5);
+    i = libmsi_record_get_int(rec, 5);
     ok(i == 2147483640, "Expected 2147483640, got %d\n", i);
 
-    i = libmsi_record_get_integer(rec, 6);
+    i = libmsi_record_get_int(rec, 6);
     ok(i == -2147483640, "Expected -2147483640, got %d\n", i);
 
     g_object_unref(rec);
@@ -2671,7 +2671,7 @@ static void test_try_transform(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "query fetch failed\n");
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     sz = sizeof buffer;
@@ -2679,10 +2679,10 @@ static void test_try_transform(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "record get string failed\n");
     ok(!strcmp(buffer, "c"), "Expected c, got %s\n", buffer);
 
-    r = libmsi_record_get_integer(hrec, 3);
+    r = libmsi_record_get_int(hrec, 3);
     ok(r == 0x80000000, "Expected 0x80000000, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 4);
+    r = libmsi_record_get_int(hrec, 4);
     ok(r == 5, "Expected 5, got %d\n", r);
 
     g_object_unref(hrec);
@@ -2690,7 +2690,7 @@ static void test_try_transform(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "query fetch failed\n");
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     sz = sizeof buffer;
@@ -2698,10 +2698,10 @@ static void test_try_transform(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "record get string failed\n");
     ok(!strcmp(buffer, "b"), "Expected b, got %s\n", buffer);
 
-    r = libmsi_record_get_integer(hrec, 3);
+    r = libmsi_record_get_int(hrec, 3);
     ok(r == 0x80000000, "Expected 0x80000000, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 4);
+    r = libmsi_record_get_int(hrec, 4);
     ok(r == 0x80000000, "Expected 0x80000000, got %d\n", r);
 
     g_object_unref(hrec);
@@ -3357,27 +3357,27 @@ static void test_join(void)
         count = libmsi_record_get_field_count( hrec );
         ok( count == 6, "Expected 6 record fields, got %d\n", count );
 
-        r = libmsi_record_get_integer( hrec, 1 );
+        r = libmsi_record_get_int( hrec, 1 );
         if( r != join_res_ninth[i].one )
             data_correct = false;
 
-        r = libmsi_record_get_integer( hrec, 2 );
+        r = libmsi_record_get_int( hrec, 2 );
         if( r != join_res_ninth[i].two )
             data_correct = false;
 
-        r = libmsi_record_get_integer( hrec, 3 );
+        r = libmsi_record_get_int( hrec, 3 );
         if( r != join_res_ninth[i].three )
             data_correct = false;
 
-        r = libmsi_record_get_integer( hrec, 4 );
+        r = libmsi_record_get_int( hrec, 4 );
         if( r != join_res_ninth[i].four )
             data_correct = false;
 
-        r = libmsi_record_get_integer( hrec, 5 );
+        r = libmsi_record_get_int( hrec, 5 );
         if( r != join_res_ninth[i].five )
             data_correct = false;
 
-        r = libmsi_record_get_integer( hrec, 6);
+        r = libmsi_record_get_int( hrec, 6);
         if( r != join_res_ninth[i].six )
             data_correct = false;
 
@@ -3820,21 +3820,21 @@ static void test_integers(void)
     r = libmsi_record_get_field_count(rec);
     ok(r == 8, "record count wrong: %d\n", r);
 
-    i = libmsi_record_get_integer(rec, 1);
+    i = libmsi_record_get_int(rec, 1);
     ok(i == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", i);
-    i = libmsi_record_get_integer(rec, 3);
+    i = libmsi_record_get_int(rec, 3);
     ok(i == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", i);
-    i = libmsi_record_get_integer(rec, 2);
+    i = libmsi_record_get_int(rec, 2);
     ok(i == 2, "Expected 2, got %d\n", i);
-    i = libmsi_record_get_integer(rec, 4);
+    i = libmsi_record_get_int(rec, 4);
     ok(i == 4, "Expected 4, got %d\n", i);
-    i = libmsi_record_get_integer(rec, 5);
+    i = libmsi_record_get_int(rec, 5);
     ok(i == 5, "Expected 5, got %d\n", i);
-    i = libmsi_record_get_integer(rec, 6);
+    i = libmsi_record_get_int(rec, 6);
     ok(i == 6, "Expected 6, got %d\n", i);
-    i = libmsi_record_get_integer(rec, 7);
+    i = libmsi_record_get_int(rec, 7);
     ok(i == 7, "Expected 7, got %d\n", i);
-    i = libmsi_record_get_integer(rec, 8);
+    i = libmsi_record_get_int(rec, 8);
     ok(i == 8, "Expected 8, got %d\n", i);
 
     g_object_unref(rec);
@@ -4126,7 +4126,7 @@ static void test_update(void)
     r = libmsi_query_fetch(query, &rec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 1);
+    r = libmsi_record_get_int(rec, 1);
     ok(r == 8, "Expected 8, got %d\n", r);
 
     g_object_unref(rec);
@@ -4134,7 +4134,7 @@ static void test_update(void)
     r = libmsi_query_fetch(query, &rec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 1);
+    r = libmsi_record_get_int(rec, 1);
     ok(r == 8, "Expected 8, got %d\n", r);
 
     g_object_unref(rec);
@@ -4142,7 +4142,7 @@ static void test_update(void)
     r = libmsi_query_fetch(query, &rec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 1);
+    r = libmsi_record_get_int(rec, 1);
     ok(r == 5, "Expected 5, got %d\n", r);
 
     g_object_unref(rec);
@@ -4683,7 +4683,7 @@ static void test_select_markers(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "two"), "Expected two, got %s\n", buf);
 
-    r = libmsi_record_get_integer(res, 3);
+    r = libmsi_record_get_int(res, 3);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     g_object_unref(res);
@@ -4701,7 +4701,7 @@ static void test_select_markers(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "two"), "Expected two, got %s\n", buf);
 
-    r = libmsi_record_get_integer(res, 3);
+    r = libmsi_record_get_int(res, 3);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     g_object_unref(res);
@@ -4737,7 +4737,7 @@ static void test_select_markers(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "two"), "Expected two, got %s\n", buf);
 
-    r = libmsi_record_get_integer(res, 3);
+    r = libmsi_record_get_int(res, 3);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     g_object_unref(res);
@@ -4755,7 +4755,7 @@ static void test_select_markers(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "three"), "Expected three, got %s\n", buf);
 
-    r = libmsi_record_get_integer(res, 3);
+    r = libmsi_record_get_int(res, 3);
     ok(r == 3, "Expected 3, got %d\n", r);
 
     g_object_unref(res);
@@ -4880,7 +4880,7 @@ static void test_stringtable(void)
     r = libmsi_record_get_field_count(hrec);
     ok(r == 2, "Expected 2, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     sz = sizeof(buffer);
@@ -4911,7 +4911,7 @@ static void test_stringtable(void)
     r = libmsi_record_get_field_count(hrec);
     ok(r == 2, "Expected 2, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     sz = sizeof(buffer);
@@ -4927,7 +4927,7 @@ static void test_stringtable(void)
     r = libmsi_record_get_field_count(hrec);
     ok(r == 2, "Expected 2, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 5, "Expected 5, got %d\n", r);
 
     sz = sizeof(buffer);
@@ -5179,10 +5179,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 3, "Expected 3, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 4, "Expected 3, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5190,10 +5190,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 5, "Expected 5, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 6, "Expected 6, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5201,10 +5201,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 1, "Expected 1, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 2, "Expected 2, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5224,10 +5224,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 1, "Expected 1, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 12, "Expected 12, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5235,10 +5235,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 3, "Expected 3, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 12, "Expected 12, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5246,10 +5246,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 5, "Expected 5, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 12, "Expected 12, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5257,10 +5257,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 1, "Expected 1, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 14, "Expected 14, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5268,10 +5268,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 3, "Expected 3, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 14, "Expected 14, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5279,10 +5279,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 5, "Expected 5, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 14, "Expected 14, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5290,10 +5290,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 1, "Expected 1, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 10, "Expected 10, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5301,10 +5301,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 3, "Expected 3, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 10, "Expected 10, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5312,10 +5312,10 @@ static void test_order(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(hrec, 1);
+    val = libmsi_record_get_int(hrec, 1);
     ok(val == 5, "Expected 5, got %d\n", val);
 
-    val = libmsi_record_get_integer(hrec, 2);
+    val = libmsi_record_get_int(hrec, 2);
     ok(val == 10, "Expected 10, got %d\n", val);
 
     g_object_unref(hrec);
@@ -5368,7 +5368,7 @@ static void test_order(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buffer, "dos"), "Expected \"dos\", got \"%s\"\n", buffer);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 3, "Expected 3, got %d\n", r);
 
     g_object_unref(hrec);
@@ -5833,7 +5833,7 @@ static void test_noquotes(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "Table"), "Expected \"Table\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     size = sizeof(buf);
@@ -5851,7 +5851,7 @@ static void test_noquotes(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "Table2"), "Expected \"Table2\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     size = sizeof(buf);
@@ -5869,7 +5869,7 @@ static void test_noquotes(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "Table3"), "Expected \"Table3\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     size = sizeof(buf);
@@ -6248,7 +6248,7 @@ static void test_droptable(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "One"), "Expected \"One\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     size = sizeof(buf);
@@ -6360,7 +6360,7 @@ static void test_droptable(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "One"), "Expected \"One\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     size = sizeof(buf);
@@ -6378,7 +6378,7 @@ static void test_droptable(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "One"), "Expected \"One\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     size = sizeof(buf);
@@ -6628,13 +6628,13 @@ static void test_dbmerge(void)
     r = do_query(hdb, sql, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 1, "Expected 1, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 2, "Expected 2, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 3);
+    r = libmsi_record_get_int(hrec, 3);
     ok(r == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", r);
 
     g_object_unref(hrec);
@@ -6673,13 +6673,13 @@ static void test_dbmerge(void)
     r = do_query(hdb, sql, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 1, "Expected 1, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 2, "Expected 2, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 3);
+    r = libmsi_record_get_int(hrec, 3);
     ok(r == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", r);
 
     g_object_unref(hrec);
@@ -6737,7 +6737,7 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "One"), "Expected \"One\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     g_object_unref(hrec);
@@ -6808,7 +6808,7 @@ static void test_dbmerge(void)
     r = do_query(hdb, sql, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     size = sizeof(buf);
@@ -6859,7 +6859,7 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "hi"), "Expected \"hi\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(hrec, 2);
+    r = libmsi_record_get_int(hrec, 2);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     g_object_unref(hrec);
@@ -6905,7 +6905,7 @@ static void test_dbmerge(void)
     r = do_query(hdb, sql, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     size = sizeof(buf);
@@ -6955,7 +6955,7 @@ static void test_dbmerge(void)
     r = do_query(hdb, sql, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     size = sizeof(buf);
@@ -7007,7 +7007,7 @@ static void test_dbmerge(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     size = sizeof(buf);
@@ -7020,7 +7020,7 @@ static void test_dbmerge(void)
     r = libmsi_query_fetch(hquery, &hrec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(hrec, 1);
+    r = libmsi_record_get_int(hrec, 1);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     size = sizeof(buf);
@@ -7104,10 +7104,10 @@ static void test_select_with_tablenames(void)
         r = libmsi_query_fetch(query, &rec);
         ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-        r = libmsi_record_get_integer(rec, 1);
+        r = libmsi_record_get_int(rec, 1);
         ok(r == vals[i][0], "Expected %d, got %d\n", vals[i][0], r);
 
-        r = libmsi_record_get_integer(rec, 2);
+        r = libmsi_record_get_int(rec, 2);
         ok(r == vals[i][1], "Expected %d, got %d\n", vals[i][1], r);
 
         g_object_unref(rec);
@@ -7213,13 +7213,13 @@ static void test_insertorder(void)
         r = libmsi_query_fetch(query, &rec);
         ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-        r = libmsi_record_get_integer(rec, 1);
+        r = libmsi_record_get_int(rec, 1);
         ok(r == ordervals[i][0], "Expected %d, got %d\n", ordervals[i][0], r);
 
-        r = libmsi_record_get_integer(rec, 2);
+        r = libmsi_record_get_int(rec, 2);
         ok(r == ordervals[i][1], "Expected %d, got %d\n", ordervals[i][1], r);
 
-        r = libmsi_record_get_integer(rec, 3);
+        r = libmsi_record_get_int(rec, 3);
         ok(r == ordervals[i][2], "Expected %d, got %d\n", ordervals[i][2], r);
 
         g_object_unref(rec);
@@ -7251,13 +7251,13 @@ static void test_insertorder(void)
         r = libmsi_query_fetch(query, &rec);
         ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-        r = libmsi_record_get_integer(rec, 1);
+        r = libmsi_record_get_int(rec, 1);
         ok(r == ordervals[i][0], "Expected %d, got %d\n", ordervals[i][0], r);
 
-        r = libmsi_record_get_integer(rec, 2);
+        r = libmsi_record_get_int(rec, 2);
         ok(r == ordervals[i][1], "Expected %d, got %d\n", ordervals[i][1], r);
 
-        r = libmsi_record_get_integer(rec, 3);
+        r = libmsi_record_get_int(rec, 3);
         ok(r == ordervals[i][2], "Expected %d, got %d\n", ordervals[i][2], r);
 
         g_object_unref(rec);
@@ -7405,7 +7405,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("bc", buf), "Expected \"bc\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 3, "Expected 3, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7414,10 +7414,10 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("a", buf), "Expected \"a\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 4);
+    r = libmsi_record_get_int(rec, 4);
     ok(r == 2, "Expected 2, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 5);
+    r = libmsi_record_get_int(rec, 5);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     g_object_unref(rec);
@@ -7438,7 +7438,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7458,7 +7458,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7478,7 +7478,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 3, "Expected 3, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7498,7 +7498,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 4, "Expected 4, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7518,7 +7518,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 5, "Expected 5, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7629,7 +7629,7 @@ static void test_columnorder(void)
     r = do_query(hdb, sql, &rec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 1);
+    r = libmsi_record_get_int(rec, 1);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7644,10 +7644,10 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("bc", buf), "Expected \"bc\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 4);
+    r = libmsi_record_get_int(rec, 4);
     ok(r == 3, "Expected 3, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 5);
+    r = libmsi_record_get_int(rec, 5);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     g_object_unref(rec);
@@ -7668,7 +7668,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 1, "Expected 1, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7688,7 +7688,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 2, "Expected 2, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7708,7 +7708,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 3, "Expected 3, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7728,7 +7728,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 4, "Expected 4, got %d\n", r);
 
     sz = sizeof(buf);
@@ -7748,7 +7748,7 @@ static void test_columnorder(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp("T", buf), "Expected \"T\", got \"%s\"\n", buf);
 
-    r = libmsi_record_get_integer(rec, 2);
+    r = libmsi_record_get_int(rec, 2);
     ok(r == 5, "Expected 5, got %d\n", r);
 
     sz = sizeof(buf);
diff --git a/tests/testrecord.c b/tests/testrecord.c
index 373cc2d..9977912 100644
--- a/tests/testrecord.c
+++ b/tests/testrecord.c
@@ -31,30 +31,21 @@
 
 static const char *msifile = "winetest-record.msi";
 
-static bool create_temp_file(char *name)
+static bool create_temp_file (char *name)
 {
-    unsigned r;
     unsigned char buffer[26], i;
-    unsigned sz;
     int fd;
     
-#ifdef _WIN32
-    r = GetTempFileName(".", "msitest",0,name);
-    if(!r)
-        return r;
-    fd = open(name, O_WRONLY);
-#else
-    strcpy(name, "msitext-XXXXXX.tmp");
-    fd = mkstemp(name);
-#endif
+    strcpy (name, "msitext-XXXXXX.tmp");
+    fd = g_mkstemp (name);
+    g_return_val_if_fail (fd != -1, FALSE);
+
+    for (i = 0; i < 26; i++)
+        buffer[i] = i + 'a';
+    write (fd, buffer, sizeof (buffer));
+    close (fd);
 
-    if(fd == -1)
-        return false;
-    for(i=0; i<26; i++)
-        buffer[i]=i+'a';
-    write(fd, buffer, sizeof(buffer));
-    close(fd);
-    return true;
+    return TRUE;
 }
 
 static void test_msirecord(void)
@@ -71,14 +62,14 @@ static void test_msirecord(void)
     ok(r==-1, "field count for invalid record not -1\n");
     r = libmsi_record_is_null(0, 0);
     ok(r==0, "invalid handle not considered to be non-null...\n");
-    r = libmsi_record_get_integer(0,0);
+    r = libmsi_record_get_int(0,0);
     ok(r == LIBMSI_NULL_INT, "got integer from invalid record\n");
     r = libmsi_record_set_int(0,0,0);
     ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_set_int returned wrong error\n");
     r = libmsi_record_set_int(0,-1,0);
     ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_set_int returned wrong error\n");
-    r = libmsi_record_clear_data(0);
-    ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_clear_data returned wrong error\n");
+    r = libmsi_record_clear(0);
+    ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_clear returned wrong error\n");
 
 
     /* check behaviour of a record with 0 elements */
@@ -112,7 +103,7 @@ static void test_msirecord(void)
     ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "set integer at -1\n");
     r = libmsi_record_is_null(h,0);
     ok(r==0, "new record is null after setting an integer\n");
-    r = libmsi_record_get_integer(h, 0);
+    r = libmsi_record_get_int(h, 0);
     ok(r == 1, "failed to get integer\n");
 
     /* same record, but add a null or empty string to it */
@@ -140,7 +131,7 @@ static void test_msirecord(void)
     /* same record, but add a string to it */
     r = libmsi_record_set_string(h,0,str);
     ok(r == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    r = libmsi_record_get_integer(h, 0);
+    r = libmsi_record_get_int(h, 0);
     ok(r == LIBMSI_NULL_INT, "should get invalid integer\n");
     buf[0]=0;
     sz = sizeof buf;
@@ -179,9 +170,9 @@ static void test_msirecord(void)
     ok('x'==buf[0], "libmsi_record_get_string returned the wrong string\n");
 
     /* same record, check we can wipe all the data */
-    r = libmsi_record_clear_data(h);
+    r = libmsi_record_clear(h);
     ok(r == LIBMSI_RESULT_SUCCESS, "Failed to clear record\n");
-    r = libmsi_record_clear_data(h);
+    r = libmsi_record_clear(h);
     ok(r == LIBMSI_RESULT_SUCCESS, "Failed to clear record again\n");
     r = libmsi_record_is_null(h,0);
     ok(r, "cleared record wasn't null\n");
@@ -189,55 +180,55 @@ static void test_msirecord(void)
     /* same record, try converting strings to integers */
     i = libmsi_record_set_string(h,0,"42");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == 42, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"-42");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == -42, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0," 42");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == LIBMSI_NULL_INT, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"42 ");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == LIBMSI_NULL_INT, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"42.0");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == LIBMSI_NULL_INT, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"0x42");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == LIBMSI_NULL_INT, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"1000000000000000");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == -1530494976, "should get truncated integer\n");
     i = libmsi_record_set_string(h,0,"2147483647");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == 2147483647, "should get maxint\n");
     i = libmsi_record_set_string(h,0,"-2147483647");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == -2147483647, "should get -maxint-1\n");
     i = libmsi_record_set_string(h,0,"4294967297");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == 1, "should get one\n");
     i = libmsi_record_set_string(h,0,"foo");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == LIBMSI_NULL_INT, "should get zero\n");
     i = libmsi_record_set_string(h,0,"");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == LIBMSI_NULL_INT, "should get zero\n");
     i = libmsi_record_set_string(h,0,"+1");
     ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
-    i = libmsi_record_get_integer(h, 0);
+    i = libmsi_record_get_int(h, 0);
     ok(i == LIBMSI_NULL_INT, "should get zero\n");
 
     /* same record, try converting integers to strings */
@@ -277,9 +268,7 @@ static void test_msirecord(void)
     g_object_unref(h);
 
     /* now try streams in a new record - need to create a file to play with */
-    r = create_temp_file(filename); 
-    if(!r)
-        return;
+    g_assert (create_temp_file(filename));
 
     /* streams can't be inserted in field 0 for some reason */
     h = libmsi_record_new(2);
@@ -409,19 +398,19 @@ static void test_MsiRecordGetInteger(void)
     r = libmsi_record_set_string(rec, 1, "5");
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(rec, 1);
+    val = libmsi_record_get_int(rec, 1);
     ok(val == 5, "Expected 5, got %d\n", val);
 
     r = libmsi_record_set_string(rec, 1, "-5");
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(rec, 1);
+    val = libmsi_record_get_int(rec, 1);
     ok(val == -5, "Expected -5, got %d\n", val);
 
     r = libmsi_record_set_string(rec, 1, "5apple");
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    val = libmsi_record_get_integer(rec, 1);
+    val = libmsi_record_get_int(rec, 1);
     ok(val == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", val);
 
     g_object_unref(rec);
@@ -440,7 +429,7 @@ static void test_fieldzero(void)
     rec = libmsi_record_new(1);
     ok(rec != 0, "Expected a valid handle\n");
 
-    r = libmsi_record_get_integer(rec, 0);
+    r = libmsi_record_get_int(rec, 0);
     ok(r == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", r);
 
     sz = sizeof(buf);
@@ -453,13 +442,13 @@ static void test_fieldzero(void)
     r = libmsi_record_is_null(rec, 0);
     ok(r == true, "Expected true, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 1);
+    r = libmsi_record_get_int(rec, 1);
     ok(r == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", r);
 
     r = libmsi_record_set_int(rec, 1, 42);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 0);
+    r = libmsi_record_get_int(rec, 0);
     ok(r == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", r);
 
     sz = sizeof(buf);
@@ -472,13 +461,13 @@ static void test_fieldzero(void)
     r = libmsi_record_is_null(rec, 0);
     ok(r == true, "Expected true, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 1);
+    r = libmsi_record_get_int(rec, 1);
     ok(r == 42, "Expected 42, got %d\n", r);
 
     r = libmsi_record_set_string(rec, 1, "bologna");
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 0);
+    r = libmsi_record_get_int(rec, 0);
     ok(r == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", r);
 
     sz = sizeof(buf);
@@ -528,7 +517,7 @@ static void test_fieldzero(void)
     r = libmsi_database_get_primary_keys(hdb, "drone", &rec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 0);
+    r = libmsi_record_get_int(rec, 0);
     ok(r == LIBMSI_NULL_INT, "Expected LIBMSI_NULL_INT, got %d\n", r);
 
     sz = sizeof(buf);
@@ -554,7 +543,7 @@ static void test_fieldzero(void)
     r = libmsi_query_fetch(hview, &rec);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_record_get_integer(rec, 0);
+    r = libmsi_record_get_int(rec, 0);
     ok(r == LIBMSI_NULL_INT, "Expected NULL value, got %d\n", r);
     r = libmsi_record_is_null(rec, 0);
     ok(r == true, "Expected true, got %d\n", r);
diff --git a/tools/msiinfo.c b/tools/msiinfo.c
index 2a53f7d..228740e 100644
--- a/tools/msiinfo.c
+++ b/tools/msiinfo.c
@@ -588,7 +588,7 @@ static unsigned export_insert(const char *table,
                 break;
 
             case 'i': case 'I':
-                printf("%d", libmsi_record_get_integer(vals, i));
+                printf("%d", libmsi_record_get_int(vals, i));
                 break;
             case 'v': case 'V':
                 printf("''", s);