diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-05 10:11:47 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-06 20:30:34 +0100 |
| commit | 1222609fc5d9c980c1da9fb839f86455047c7c91 (patch) | |
| tree | 745775fe5729f7cfa13dc99f9ff085f7aa52caca /libmsi/insert.c | |
| parent | 175346aac4942eb97ccf2f00ca127cf700cd2eff (diff) | |
| download | msitools-1222609fc5d9c980c1da9fb839f86455047c7c91.tar.gz msitools-1222609fc5d9c980c1da9fb839f86455047c7c91.tar.xz msitools-1222609fc5d9c980c1da9fb839f86455047c7c91.zip | |
eliminate WCHAR
Diffstat (limited to 'libmsi/insert.c')
| -rw-r--r-- | libmsi/insert.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libmsi/insert.c b/libmsi/insert.c index 1ff1293..5f7c422 100644 --- a/libmsi/insert.c +++ b/libmsi/insert.c @@ -78,8 +78,8 @@ LibmsiRecord *msi_query_merge_record( unsigned fields, const column_info *vl, Li switch( vl->val->type ) { case EXPR_SVAL: - TRACE("field %d -> %s\n", i, debugstr_w(vl->val->u.sval)); - _libmsi_record_set_stringW( merged, i, vl->val->u.sval ); + TRACE("field %d -> %s\n", i, debugstr_a(vl->val->u.sval)); + libmsi_record_set_string( merged, i, vl->val->u.sval ); break; case EXPR_IVAL: libmsi_record_set_int( merged, i, vl->val->u.ival ); @@ -107,8 +107,8 @@ err: */ static bool msi_columns_in_order(LibmsiInsertView *iv, unsigned col_count) { - const WCHAR *a; - const WCHAR *b; + const char *a; + const char *b; unsigned i; for (i = 1; i <= col_count; i++) @@ -116,7 +116,7 @@ static bool msi_columns_in_order(LibmsiInsertView *iv, unsigned col_count) iv->sv->ops->get_column_info(iv->sv, i, &a, NULL, NULL, NULL); iv->table->ops->get_column_info(iv->table, i, &b, NULL, NULL, NULL); - if (strcmpW( a, b )) return false; + if (strcmp( a, b )) return false; } return true; } @@ -129,8 +129,8 @@ static unsigned msi_arrange_record(LibmsiInsertView *iv, LibmsiRecord **values) LibmsiRecord *padded; unsigned col_count, val_count; unsigned r, i, colidx; - const WCHAR *a; - const WCHAR *b; + const char *a; + const char *b; r = iv->table->ops->get_dimensions(iv->table, NULL, &col_count); if (r != LIBMSI_RESULT_SUCCESS) @@ -161,7 +161,7 @@ static unsigned msi_arrange_record(LibmsiInsertView *iv, LibmsiRecord **values) if (r != LIBMSI_RESULT_SUCCESS) goto err; - if (!strcmpW( a, b )) + if (!strcmp( a, b )) { _libmsi_record_copy_field(*values, colidx, padded, i); break; @@ -278,8 +278,8 @@ static unsigned insert_view_get_dimensions( LibmsiView *view, unsigned *rows, un return sv->ops->get_dimensions( sv, rows, cols ); } -static unsigned insert_view_get_column_info( LibmsiView *view, unsigned n, const WCHAR **name, - unsigned *type, bool *temporary, const WCHAR **table_name ) +static unsigned insert_view_get_column_info( LibmsiView *view, unsigned n, const char **name, + unsigned *type, bool *temporary, const char **table_name ) { LibmsiInsertView *iv = (LibmsiInsertView*)view; LibmsiView *sv; @@ -348,7 +348,7 @@ static unsigned count_column_info( const column_info *ci ) return n; } -unsigned insert_view_create( LibmsiDatabase *db, LibmsiView **view, const WCHAR *table, +unsigned insert_view_create( LibmsiDatabase *db, LibmsiView **view, const char *table, column_info *columns, column_info *values, bool temp ) { LibmsiInsertView *iv = NULL; |