diff options
| -rw-r--r-- | libmsi/alter.c | 2 | ||||
| -rw-r--r-- | libmsi/create.c | 2 | ||||
| -rw-r--r-- | libmsi/database.c | 2 | ||||
| -rw-r--r-- | libmsi/delete.c | 2 | ||||
| -rw-r--r-- | libmsi/distinct.c | 2 | ||||
| -rw-r--r-- | libmsi/drop.c | 2 | ||||
| -rw-r--r-- | libmsi/insert.c | 2 | ||||
| -rw-r--r-- | libmsi/msipriv.h | 1 | ||||
| -rw-r--r-- | libmsi/select.c | 2 | ||||
| -rw-r--r-- | libmsi/storages.c | 2 | ||||
| -rw-r--r-- | libmsi/streams.c | 2 | ||||
| -rw-r--r-- | libmsi/table.c | 2 | ||||
| -rw-r--r-- | libmsi/update.c | 2 | ||||
| -rw-r--r-- | libmsi/where.c | 2 |
14 files changed, 13 insertions, 14 deletions
diff --git a/libmsi/alter.c b/libmsi/alter.c index 0c25e35..2c238b8 100644 --- a/libmsi/alter.c +++ b/libmsi/alter.c @@ -246,7 +246,7 @@ unsigned alter_view_create( LibmsiDatabase *db, LibmsiView **view, const WCHAR * TRACE("%p %p %s %d\n", view, colinfo, debugstr_w(name), hold ); - av = alloc_msiobject( sizeof *av , NULL); + av = msi_alloc_zero( sizeof *av ); if( !av ) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/create.c b/libmsi/create.c index c9b8ea4..49a021d 100644 --- a/libmsi/create.c +++ b/libmsi/create.c @@ -160,7 +160,7 @@ unsigned create_view_create( LibmsiDatabase *db, LibmsiView **view, const WCHAR if( r != LIBMSI_RESULT_SUCCESS ) return r; - cv = alloc_msiobject( sizeof *cv, NULL ); + cv = msi_alloc_zero( sizeof *cv ); if( !cv ) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/database.c b/libmsi/database.c index 249fc5e..283350d 100644 --- a/libmsi/database.c +++ b/libmsi/database.c @@ -1255,7 +1255,7 @@ static unsigned msi_add_records_to_table(LibmsiDatabase *db, WCHAR **columns, WC } done: - msiobj_release(&view->hdr); + msi_free(view); return r; } diff --git a/libmsi/delete.c b/libmsi/delete.c index df00bdc..3f06018 100644 --- a/libmsi/delete.c +++ b/libmsi/delete.c @@ -189,7 +189,7 @@ unsigned delete_view_create( LibmsiDatabase *db, LibmsiView **view, LibmsiView * TRACE("%p\n", dv ); - dv = alloc_msiobject( sizeof *dv, NULL ); + dv = msi_alloc_zero( sizeof *dv ); if( !dv ) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/distinct.c b/libmsi/distinct.c index c899fbe..3d2bee6 100644 --- a/libmsi/distinct.c +++ b/libmsi/distinct.c @@ -289,7 +289,7 @@ unsigned distinct_view_create( LibmsiDatabase *db, LibmsiView **view, LibmsiView return r; } - dv = alloc_msiobject( sizeof *dv, NULL ); + dv = msi_alloc_zero( sizeof *dv ); if( !dv ) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/drop.c b/libmsi/drop.c index d1da239..ba59eb4 100644 --- a/libmsi/drop.c +++ b/libmsi/drop.c @@ -119,7 +119,7 @@ unsigned drop_view_create(LibmsiDatabase *db, LibmsiView **view, const WCHAR *na TRACE("%p %s\n", view, debugstr_w(name)); - dv = alloc_msiobject(sizeof *dv, NULL); + dv = msi_alloc_zero(sizeof *dv ); if(!dv) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/insert.c b/libmsi/insert.c index bd2199a..1ff1293 100644 --- a/libmsi/insert.c +++ b/libmsi/insert.c @@ -373,7 +373,7 @@ unsigned insert_view_create( LibmsiDatabase *db, LibmsiView **view, const WCHAR return r; } - iv = alloc_msiobject( sizeof *iv, NULL ); + iv = msi_alloc_zero( sizeof *iv ); if( !iv ) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h index 9d42a58..32f8d93 100644 --- a/libmsi/msipriv.h +++ b/libmsi/msipriv.h @@ -254,7 +254,6 @@ typedef struct LibmsiViewOps struct LibmsiView { - LibmsiObject hdr; const LibmsiViewOps *ops; LibmsiDBError error; const WCHAR *error_column; diff --git a/libmsi/select.c b/libmsi/select.c index cf16413..b8a649d 100644 --- a/libmsi/select.c +++ b/libmsi/select.c @@ -354,7 +354,7 @@ unsigned select_view_create( LibmsiDatabase *db, LibmsiView **view, LibmsiView * count = select_count_columns( columns ); - sv = alloc_msiobject( sizeof *sv + count*sizeof (unsigned), NULL ); + sv = msi_alloc_zero( sizeof *sv + count*sizeof (unsigned) ); if( !sv ) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/storages.c b/libmsi/storages.c index a81bce0..c66369b 100644 --- a/libmsi/storages.c +++ b/libmsi/storages.c @@ -355,7 +355,7 @@ unsigned storages_view_create(LibmsiDatabase *db, LibmsiView **view) TRACE("(%p, %p)\n", db, view); - sv = alloc_msiobject( sizeof(LibmsiStorageView), NULL ); + sv = msi_alloc_zero( sizeof *sv ); if (!sv) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/streams.c b/libmsi/streams.c index a486d01..f443c80 100644 --- a/libmsi/streams.c +++ b/libmsi/streams.c @@ -391,7 +391,7 @@ unsigned streams_view_create(LibmsiDatabase *db, LibmsiView **view) TRACE("(%p, %p)\n", db, view); - sv = alloc_msiobject( sizeof(LibmsiStreamsView), NULL ); + sv = msi_alloc_zero( sizeof(LibmsiStreamsView) ); if (!sv) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/table.c b/libmsi/table.c index 8dedd55..489d450 100644 --- a/libmsi/table.c +++ b/libmsi/table.c @@ -2067,7 +2067,7 @@ unsigned table_view_create( LibmsiDatabase *db, const WCHAR *name, LibmsiView ** return storages_view_create( db, view ); sz = sizeof *tv + strlenW(name)*sizeof name[0] ; - tv = alloc_msiobject( sz, NULL ); + tv = msi_alloc_zero( sz ); if( !tv ) return LIBMSI_RESULT_FUNCTION_FAILED; diff --git a/libmsi/update.c b/libmsi/update.c index 5311f2d..f1f3d8d 100644 --- a/libmsi/update.c +++ b/libmsi/update.c @@ -237,7 +237,7 @@ unsigned update_view_create( LibmsiDatabase *db, LibmsiView **view, WCHAR *table return r; } - uv = alloc_msiobject( sizeof *uv, NULL ); + uv = msi_alloc_zero( sizeof *uv ); if( !uv ) { wv->ops->delete( wv ); diff --git a/libmsi/where.c b/libmsi/where.c index cbe06d7..010ee19 100644 --- a/libmsi/where.c +++ b/libmsi/where.c @@ -1106,7 +1106,7 @@ unsigned where_view_create( LibmsiDatabase *db, LibmsiView **view, WCHAR *tables TRACE("(%s)\n", debugstr_w(tables) ); - wv = alloc_msiobject( sizeof *wv, NULL ); + wv = msi_alloc_zero( sizeof *wv ); if( !wv ) return LIBMSI_RESULT_FUNCTION_FAILED; |