diff options
Diffstat (limited to 'libmsi/create.c')
-rw-r--r-- | libmsi/create.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/libmsi/create.c b/libmsi/create.c index 3cdc576..745a0e1 100644 --- a/libmsi/create.c +++ b/libmsi/create.c @@ -20,16 +20,9 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" -#include "unicode.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" @@ -41,7 +34,7 @@ typedef struct _LibmsiCreateView { LibmsiView view; LibmsiDatabase *db; - const WCHAR * name; + const char * name; bool bIsTemp; bool hold; column_info *col_info; @@ -61,7 +54,7 @@ static unsigned create_view_execute( LibmsiView *view, LibmsiRecord *record ) LibmsiCreateView *cv = (LibmsiCreateView*)view; bool persist = (cv->bIsTemp) ? LIBMSI_CONDITION_FALSE : LIBMSI_CONDITION_TRUE; - TRACE("%p Table %s (%s)\n", cv, debugstr_w(cv->name), + TRACE("%p Table %s (%s)\n", cv, debugstr_a(cv->name), cv->bIsTemp?"temporary":"permanent"); if (cv->bIsTemp && !cv->hold) @@ -88,8 +81,8 @@ static unsigned create_view_get_dimensions( LibmsiView *view, unsigned *rows, un return LIBMSI_RESULT_FUNCTION_FAILED; } -static unsigned create_view_get_column_info( LibmsiView *view, unsigned n, const WCHAR **name, - unsigned *type, bool *temporary, const WCHAR **table_name ) +static unsigned create_view_get_column_info( LibmsiView *view, unsigned n, const char **name, + unsigned *type, bool *temporary, const char **table_name ) { LibmsiCreateView *cv = (LibmsiCreateView*)view; @@ -139,13 +132,13 @@ static unsigned check_columns( const column_info *col_info ) /* check for two columns with the same name */ for( c1 = col_info; c1; c1 = c1->next ) for( c2 = c1->next; c2; c2 = c2->next ) - if (!strcmpW( c1->column, c2->column )) + if (!strcmp( c1->column, c2->column )) return LIBMSI_RESULT_BAD_QUERY_SYNTAX; return LIBMSI_RESULT_SUCCESS; } -unsigned create_view_create( LibmsiDatabase *db, LibmsiView **view, const WCHAR *table, +unsigned create_view_create( LibmsiDatabase *db, LibmsiView **view, const char *table, column_info *col_info, bool hold ) { LibmsiCreateView *cv = NULL; |