April 2007 - Wine-commits - list.winehq.org

Rob Shearman : msi: All columns being temporary means the table is non-persistent.
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: 697d820eeedae307db5cc0ddbec60c6c68391812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697d820eeedae307db5cc0ddb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:26:44 2007 +0100 msi: All columns being temporary means the table is non-persistent. The HOLD keyword just means that the non-persistent data in the table should be kept around, not that the table is temporary. --- dlls/msi/create.c | 11 ++++++++++- dlls/msi/query.h | 3 ++- dlls/msi/sql.y | 7 +++++-- dlls/msi/tests/db.c | 2 -- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index ef71684..965a4a6 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -146,10 +146,12 @@ static UINT check_columns( column_info *col_info ) } UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, - column_info *col_info, BOOL temp ) + column_info *col_info, BOOL hold ) { MSICREATEVIEW *cv = NULL; UINT r; + const column_info *col; + BOOL temp = TRUE; TRACE("%p\n", cv ); @@ -161,6 +163,13 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, if( !cv ) return ERROR_FUNCTION_FAILED; + for( col = col_info; col; col = col->next ) + if( !col->temporary ) + { + temp = FALSE; + break; + } + /* fill the structure */ cv->view.ops = &create_ops; msiobj_addref( &db->hdr ); diff --git a/dlls/msi/query.h b/dlls/msi/query.h index a8a633f..69d511c 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -66,6 +66,7 @@ typedef struct _column_info LPCWSTR table; LPCWSTR column; UINT type; + BOOL temporary; struct expr *val; struct _column_info *next; } column_info; @@ -108,7 +109,7 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, struct expr *cond ); UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, - column_info *col_info, BOOL temp ); + column_info *col_info, BOOL hold ); UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, column_info *columns, column_info *values, BOOL temp ); diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 17cb957..9cbeb6f 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -40,6 +40,8 @@ static int sql_error(const char *str); WINE_DEFAULT_DEBUG_CHANNEL(msi); +#define MSITYPE_TEMPORARY 0x8000 + typedef struct tag_SQL_input { MSIDATABASE *db; @@ -278,7 +280,8 @@ column_and_type: column column_type { $$ = $1; - $$->type = $2 | MSITYPE_VALID; + $$->type = ($2 | MSITYPE_VALID) & ~MSITYPE_TEMPORARY; + $$->temporary = $2 & MSITYPE_TEMPORARY ? TRUE : FALSE; } ; @@ -293,7 +296,7 @@ column_type: } | data_type_l TK_TEMPORARY { - FIXME("temporary column\n"); + $$ = $1 | MSITYPE_TEMPORARY; } ; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9ebcd02..073cf01 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2664,10 +2664,8 @@ static void test_temporary_table(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); - todo_wine { cond = MsiDatabaseIsTablePersistent(hdb, "P2"); ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); - } query = "CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`) HOLD"; r = run_query(hdb, 0, query);

1 0

Rob Shearman : msi: Add support for adding temporary/ non-persistent data to tables.
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: 23379b3b5c5b2e008ad147a45a43221db2d94385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23379b3b5c5b2e008ad147a45… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:24:41 2007 +0100 msi: Add support for adding temporary/non-persistent data to tables. --- dlls/msi/insert.c | 2 +- dlls/msi/msipriv.h | 2 +- dlls/msi/select.c | 4 +- dlls/msi/table.c | 129 ++++++++++++++++++++++++++++++++++++++-------------- 4 files changed, 99 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23379b3b5c5b2e008ad14…

1 0

Rob Shearman : msi: The HOLD keyword implies a temporary table, whereas database importing should lead to permanent tables, so remove the HOLD keyword.
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: d8cd46ac47c71f96c67c1a25e2c29875c82ab420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8cd46ac47c71f96c67c1a25e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:23:13 2007 +0100 msi: The HOLD keyword implies a temporary table, whereas database importing should lead to permanent tables, so remove the HOLD keyword. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index ea3e964..875f440 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -423,7 +423,7 @@ static LPWSTR msi_build_createsql_postlude(LPWSTR *primary_keys, DWORD num_keys) DWORD size, key_size, i; static const WCHAR key_fmt[] = {'`','%','s','`',',',' ',0}; - static const WCHAR postlude_fmt[] = {'P','R','I','M','A','R','Y',' ','K','E','Y',' ','%','s',')',' ','H','O','L','D',0}; + static const WCHAR postlude_fmt[] = {'P','R','I','M','A','R','Y',' ','K','E','Y',' ','%','s',')',0}; for (i = 0, size = 1; i < num_keys; i++) size += lstrlenW(key_fmt) + lstrlenW(primary_keys[i]) - 2;

1 0

Rob Shearman : msi: Move table creation to table.c.
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: ba0507a178b223e7d21ea29e19c54e23e2db5107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0507a178b223e7d21ea29e1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:21:32 2007 +0100 msi: Move table creation to table.c. --- dlls/msi/create.c | 93 +------------------------------------------------ dlls/msi/query.h | 3 ++ dlls/msi/table.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 91 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 740f563..ef71684 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -59,101 +59,12 @@ static UINT CREATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSICREATEVIEW *cv = (MSICREATEVIEW*)view; - column_info *col; - UINT r, nField; - static const WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; - static const WCHAR szColumns[] = { '_','C','o','l','u','m','n','s',0 }; - MSIVIEW *tv = NULL; - MSIRECORD *rec = NULL; + MSITABLE *table; TRACE("%p Table %s (%s)\n", cv, debugstr_w(cv->name), cv->bIsTemp?"temporary":"permanent"); - /* only add tables that don't exist already */ - if( TABLE_Exists(cv->db, cv->name ) ) - return ERROR_BAD_QUERY_SYNTAX; - - r = TABLE_CreateView( cv->db, szTables, &tv ); - TRACE("CreateView returned %x\n", r); - if( r ) - return r; - - r = tv->ops->execute( tv, 0 ); - TRACE("tv execute returned %x\n", r); - if( r ) - goto err; - - rec = MSI_CreateRecord( 1 ); - if( !rec ) - goto err; - - r = MSI_RecordSetStringW( rec, 1, cv->name ); - if( r ) - goto err; - - r = tv->ops->insert_row( tv, rec ); - TRACE("insert_row returned %x\n", r); - if( r ) - goto err; - - tv->ops->delete( tv ); - tv = NULL; - - msiobj_release( &rec->hdr ); - - /* add each column to the _Columns table */ - r = TABLE_CreateView( cv->db, szColumns, &tv ); - if( r ) - return r; - - r = tv->ops->execute( tv, 0 ); - TRACE("tv execute returned %x\n", r); - if( r ) - goto err; - - rec = MSI_CreateRecord( 4 ); - if( !rec ) - goto err; - - r = MSI_RecordSetStringW( rec, 1, cv->name ); - if( r ) - goto err; - - /* - * need to set the table, column number, col name and type - * for each column we enter in the table - */ - nField = 1; - for( col = cv->col_info; col; col = col->next ) - { - r = MSI_RecordSetInteger( rec, 2, nField ); - if( r ) - goto err; - - r = MSI_RecordSetStringW( rec, 3, col->column ); - if( r ) - goto err; - - r = MSI_RecordSetInteger( rec, 4, col->type ); - if( r ) - goto err; - - r = tv->ops->insert_row( tv, rec ); - if( r ) - goto err; - - nField++; - } - if( !col ) - r = ERROR_SUCCESS; - -err: - if (rec) - msiobj_release( &rec->hdr ); - /* FIXME: remove values from the string table on error */ - if( tv ) - tv->ops->delete( tv ); - return r; + return msi_create_table( cv->db, cv->name, cv->col_info, !cv->bIsTemp, &table); } static UINT CREATE_close( struct tagMSIVIEW *view ) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 86773ad..a8a633f 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -127,4 +127,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType); MSIRECORD *msi_query_merge_record( UINT fields, column_info *vl, MSIRECORD *rec ); +UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, + BOOL persistent, MSITABLE **table_ret); + #endif /* __WINE_MSI_QUERY_H */ diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e414517..dbc292d 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -593,6 +593,106 @@ static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO return r; } +static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ); + +UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, + BOOL persistent, MSITABLE **table_ret) +{ + UINT r, nField; + MSIVIEW *tv = NULL; + MSIRECORD *rec = NULL; + column_info *col; + + /* only add tables that don't exist already */ + if( TABLE_Exists(db, name ) ) + return ERROR_BAD_QUERY_SYNTAX; + + r = TABLE_CreateView( db, szTables, &tv ); + TRACE("CreateView returned %x\n", r); + if( r ) + return r; + + r = tv->ops->execute( tv, 0 ); + TRACE("tv execute returned %x\n", r); + if( r ) + goto err; + + rec = MSI_CreateRecord( 1 ); + if( !rec ) + goto err; + + r = MSI_RecordSetStringW( rec, 1, name ); + if( r ) + goto err; + + r = tv->ops->insert_row( tv, rec ); + TRACE("insert_row returned %x\n", r); + if( r ) + goto err; + + tv->ops->delete( tv ); + tv = NULL; + + msiobj_release( &rec->hdr ); + + /* add each column to the _Columns table */ + r = TABLE_CreateView( db, szColumns, &tv ); + if( r ) + return r; + + r = tv->ops->execute( tv, 0 ); + TRACE("tv execute returned %x\n", r); + if( r ) + goto err; + + rec = MSI_CreateRecord( 4 ); + if( !rec ) + goto err; + + r = MSI_RecordSetStringW( rec, 1, name ); + if( r ) + goto err; + + /* + * need to set the table, column number, col name and type + * for each column we enter in the table + */ + nField = 1; + for( col = col_info; col; col = col->next ) + { + r = MSI_RecordSetInteger( rec, 2, nField ); + if( r ) + goto err; + + r = MSI_RecordSetStringW( rec, 3, col->column ); + if( r ) + goto err; + + r = MSI_RecordSetInteger( rec, 4, col->type ); + if( r ) + goto err; + + r = tv->ops->insert_row( tv, rec ); + if( r ) + goto err; + + nField++; + } + if( !col ) + r = ERROR_SUCCESS; + +err: + if (rec) + msiobj_release( &rec->hdr ); + /* FIXME: remove values from the string table on error */ + if( tv ) + tv->ops->delete( tv ); + + if (r == ERROR_SUCCESS) + r = get_table( db, name, table_ret ); + return r; +} + static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ) { MSITABLE *table;

1 0

Rob Shearman : msi: Create the table directly in create_table instead of requiring it to be loaded after saving .
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: 338568886c1611d4a68ee920539381a303701fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338568886c1611d4a68ee9205… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:22:27 2007 +0100 msi: Create the table directly in create_table instead of requiring it to be loaded after saving. --- dlls/msi/table.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index dbc292d..712a4af 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -102,6 +102,7 @@ static const MSICOLUMNINFO _Tables_cols[1] = { static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO **pcols, UINT *pcount ); +static void table_calc_column_offsets( MSICOLUMNINFO *colinfo, DWORD count ); static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz); static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ); @@ -593,8 +594,6 @@ static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO return r; } -static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ); - UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, BOOL persistent, MSITABLE **table_ret) { @@ -602,15 +601,51 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, MSIVIEW *tv = NULL; MSIRECORD *rec = NULL; column_info *col; + MSITABLE *table; + UINT i; /* only add tables that don't exist already */ if( TABLE_Exists(db, name ) ) return ERROR_BAD_QUERY_SYNTAX; + table = msi_alloc( sizeof (MSITABLE) + lstrlenW(name)*sizeof (WCHAR) ); + if( !table ) + return ERROR_FUNCTION_FAILED; + + table->row_count = 0; + table->data = NULL; + table->colinfo = NULL; + table->col_count = 0; + lstrcpyW( table->name, name ); + + for( col = col_info; col; col = col->next ) + table->col_count++; + + table->colinfo = msi_alloc( table->col_count * sizeof(MSICOLUMNINFO) ); + if (!table->colinfo) + { + free_table( table ); + return ERROR_FUNCTION_FAILED; + } + + for( i = 0, col = col_info; col; i++, col = col->next ) + { + table->colinfo[ i ].tablename = strdupW( col->table ); + table->colinfo[ i ].number = i + 1; + table->colinfo[ i ].colname = strdupW( col->column ); + table->colinfo[ i ].type = col->type; + table->colinfo[ i ].offset = 0; + table->colinfo[ i ].hash_table = NULL; + } + table_calc_column_offsets( table->colinfo, table->col_count); + r = TABLE_CreateView( db, szTables, &tv ); TRACE("CreateView returned %x\n", r); if( r ) + { + free_table( table ); return r; + } r = tv->ops->execute( tv, 0 ); TRACE("tv execute returned %x\n", r); @@ -689,7 +724,13 @@ err: tv->ops->delete( tv ); if (r == ERROR_SUCCESS) - r = get_table( db, name, table_ret ); + { + list_add_head( &db->tables, &table->entry ); + *table_ret = table; + } + else + free_table( table ); + return r; }

1 0

Rob Shearman : msi: Store the column info in the MSITABLE structure.
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: 3aa9a25cb3302f12d331827f5d9b7146c01fb81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa9a25cb3302f12d331827f5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:20:21 2007 +0100 msi: Store the column info in the MSITABLE structure. Load the data on view creation for simplicity instead of view execution. --- dlls/msi/table.c | 216 +++++++++++++++++++++++++----------------------------- 1 files changed, 101 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3aa9a25cb3302f12d3318…

1 0

Rob Shearman : msi: Remove the hash table for a column when one of its values is modified since it will now be invalid .
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: 94d48238ffe8edc3778f71b3467100c9beff0a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d48238ffe8edc3778f71b34… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:19:07 2007 +0100 msi: Remove the hash table for a column when one of its values is modified since it will now be invalid. --- dlls/msi/table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 1f8e118..2e83477 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -996,6 +996,9 @@ static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) return ERROR_FUNCTION_FAILED; } + msi_free( tv->columns[col-1].hash_table ); + tv->columns[col-1].hash_table = NULL; + n = bytes_per_column( &tv->columns[col-1] ); switch( n ) {

1 0

Dmitry Timoshkov : comctl32: Add more image list tests, fix one problem found.
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: 83f51d08df8a642e58a55950f758bd5011c4f60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f51d08df8a642e58a55950f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Apr 24 18:33:59 2007 +0900 comctl32: Add more image list tests, fix one problem found. --- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/tests/imagelist.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a49ac45..0c23d19 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2070,7 +2070,7 @@ ImageList_Remove (HIMAGELIST himl, INT i) return TRUE; } - himl->cMaxImage = himl->cInitial + 1; + himl->cMaxImage = himl->cInitial + himl->cGrow - 1; himl->cCurImage = 0; for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 7a3d7ec..8b7cd6a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -897,7 +897,15 @@ static void image_list_init(HIMAGELIST himl) static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, INT width, INT height, INT bpp, const char *comment) { - BOOL ret; + INT ret, cxx, cyy; + + ret = ImageList_GetImageCount(himl); + ok(ret == cur, "expected cur %d got %d\n", cur, ret); + + ret = ImageList_GetIconSize(himl, &cxx, &cyy); + ok(ret, "ImageList_GetIconSize failed\n"); + ok(cxx == cx, "wrong cx %d (expected %d)\n", cxx, cx); + ok(cyy == cy, "wrong cy %d (expected %d)\n", cyy, cy); iml_clear_stream_data(); ret = ImageList_Write(himl, &Test_Stream.is); @@ -941,6 +949,18 @@ static void test_imagelist_storage(void) ok(ret, "ImageList_Remove failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, BMP_CX * 4, BMP_CX * 7, 24, "4"); + ret = ImageList_Remove(himl, -2); + ok(!ret, "ImageList_Remove(-2) should fail\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, BMP_CX * 4, BMP_CX * 7, 24, "5"); + + ret = ImageList_Remove(himl, 20); + ok(!ret, "ImageList_Remove(20) should fail\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, BMP_CX * 4, BMP_CX * 7, 24, "6"); + + ret = ImageList_Remove(himl, -1); + ok(ret, "ImageList_Remove(-1) failed\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 4, BMP_CX * 4, BMP_CX * 1, 24, "7"); + ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n");

1 0

Rob Shearman : msi: Add support for non-persistent strings.
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: 2e3289ca6c76627073f8960057a599452654c646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3289ca6c76627073f896005… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:17:00 2007 +0100 msi: Add support for non-persistent strings. Store the loaded refcount in the string table. --- dlls/msi/msipriv.h | 12 +++++++-- dlls/msi/string.c | 63 ++++++++++++++++++++++++++++++++++++--------------- dlls/msi/table.c | 9 +++++-- 3 files changed, 59 insertions(+), 25 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b160443..b8a4bef 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -542,8 +542,14 @@ extern HRESULT init_string_table( IStorage *stg ); /* string table functions */ -extern BOOL msi_addstring( string_table *st, UINT string_no, const CHAR *data, int len, UINT refcount ); -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount ); +enum StringPersistence +{ + StringPersistent = 0, + StringNonPersistent = 1 +}; + +extern BOOL msi_addstring( string_table *st, UINT string_no, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence ); +extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); extern UINT msi_id2stringW( string_table *st, UINT string_no, LPWSTR buffer, UINT *sz ); extern UINT msi_id2stringA( string_table *st, UINT string_no, LPSTR buffer, UINT *sz ); @@ -552,7 +558,7 @@ extern UINT msi_string2idA( string_table *st, LPCSTR str, UINT *id ); extern string_table *msi_init_stringtable( int entries, UINT codepage ); extern VOID msi_destroy_stringtable( string_table *st ); extern UINT msi_string_count( string_table *st ); -extern UINT msi_id_refcount( string_table *st, UINT i ); +extern UINT msi_id_persistent_refcount( string_table *st, UINT i ); extern UINT msi_string_totalsize( string_table *st, UINT *datasize, UINT *poolsize ); extern UINT msi_strcmp( string_table *st, UINT lval, UINT rval, UINT *res ); extern const WCHAR *msi_string_lookup_id( string_table *st, UINT id ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 7a80663..16ed478 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -42,7 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct _msistring { int hash_next; - UINT refcount; + UINT persistent_refcount; + UINT nonpersistent_refcount; LPWSTR str; } msistring; @@ -103,7 +104,8 @@ VOID msi_destroy_stringtable( string_table *st ) for( i=0; i<st->maxcount; i++ ) { - if( st->strings[i].refcount ) + if( st->strings[i].persistent_refcount || + st->strings[i].nonpersistent_refcount ) msi_free( st->strings[i].str ); } msi_free( st->strings ); @@ -120,11 +122,13 @@ static int st_find_free_entry( string_table *st ) if( st->freeslot ) { for( i = st->freeslot; i < st->maxcount; i++ ) - if( !st->strings[i].refcount ) + if( !st->strings[i].persistent_refcount && + !st->strings[i].nonpersistent_refcount ) return i; } for( i = 1; i < st->maxcount; i++ ) - if( !st->strings[i].refcount ) + if( !st->strings[i].persistent_refcount && + !st->strings[i].nonpersistent_refcount ) return i; /* dynamically resize */ @@ -135,16 +139,27 @@ static int st_find_free_entry( string_table *st ) st->strings = p; st->freeslot = st->maxcount; st->maxcount = sz; - if( st->strings[st->freeslot].refcount ) + if( st->strings[st->freeslot].persistent_refcount || + st->strings[st->freeslot].nonpersistent_refcount ) ERR("oops. expected freeslot to be free...\n"); return st->freeslot; } -static void set_st_entry( string_table *st, UINT n, LPWSTR str ) +static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence ) { UINT hash = msistring_makehash( str ); - st->strings[n].refcount = 1; + if (persistence == StringPersistent) + { + st->strings[n].persistent_refcount = refcount; + st->strings[n].nonpersistent_refcount = 0; + } + else + { + st->strings[n].persistent_refcount = 0; + st->strings[n].nonpersistent_refcount = refcount; + } + st->strings[n].str = str; st->strings[n].hash_next = st->hash[hash]; @@ -154,7 +169,7 @@ static void set_st_entry( string_table *st, UINT n, LPWSTR str ) st->freeslot = n + 1; } -int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount ) +int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; @@ -165,14 +180,18 @@ int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT ref return 0; if( n > 0 ) { - if( st->strings[n].refcount ) + if( st->strings[n].persistent_refcount || + st->strings[n].nonpersistent_refcount ) return -1; } else { if( ERROR_SUCCESS == msi_string2idA( st, data, &n ) ) { - st->strings[n].refcount++; + if (persistence == StringPersistent) + st->strings[n].persistent_refcount += refcount; + else + st->strings[n].nonpersistent_refcount += refcount; return n; } n = st_find_free_entry( st ); @@ -196,12 +215,12 @@ int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT ref MultiByteToWideChar( st->codepage, 0, data, len, str, sz ); str[sz] = 0; - set_st_entry( st, n, str ); + set_st_entry( st, n, str, refcount, persistence ); return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT refcount ) +int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ) { LPWSTR str; @@ -213,14 +232,18 @@ int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT r return 0; if( n > 0 ) { - if( st->strings[n].refcount ) + if( st->strings[n].persistent_refcount || + st->strings[n].nonpersistent_refcount ) return -1; } else { if( ERROR_SUCCESS == msi_string2idW( st, data, &n ) ) { - st->strings[n].refcount++; + if (persistence == StringPersistent) + st->strings[n].persistent_refcount += refcount; + else + st->strings[n].nonpersistent_refcount += refcount; return n; } n = st_find_free_entry( st ); @@ -246,7 +269,7 @@ int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT r memcpy( str, data, len*sizeof(WCHAR) ); str[len] = 0; - set_st_entry( st, n, str ); + set_st_entry( st, n, str, refcount, persistence ); return n; } @@ -261,7 +284,7 @@ const WCHAR *msi_string_lookup_id( string_table *st, UINT id ) if( id >= st->maxcount ) return NULL; - if( id && !st->strings[id].refcount ) + if( id && !st->strings[id].persistent_refcount && !st->strings[id].nonpersistent_refcount) return NULL; return st->strings[id].str; @@ -428,18 +451,18 @@ UINT msi_string_count( string_table *st ) return st->maxcount; } -UINT msi_id_refcount( string_table *st, UINT i ) +UINT msi_id_persistent_refcount( string_table *st, UINT i ) { if( i >= st->maxcount ) return 0; - return st->strings[i].refcount; + return st->strings[i].persistent_refcount; } UINT msi_string_totalsize( string_table *st, UINT *datasize, UINT *poolsize ) { UINT i, len, max, holesize; - if( st->strings[0].str || st->strings[0].refcount ) + if( st->strings[0].str || st->strings[0].persistent_refcount || st->strings[0].nonpersistent_refcount) ERR("oops. element 0 has a string\n"); *poolsize = 4; @@ -448,6 +471,8 @@ UINT msi_string_totalsize( string_table *st, UINT *datasize, UINT *poolsize ) holesize = 0; for( i=1; i<st->maxcount; i++ ) { + if( !st->strings[i].persistent_refcount ) + continue; if( st->strings[i].str ) { TRACE("[%u] = %s\n", i, debugstr_w(st->strings[i].str)); diff --git a/dlls/msi/table.c b/dlls/msi/table.c index ce5df79..f256726 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -743,7 +743,7 @@ string_table *load_string_table( IStorage *stg ) break; } - r = msi_addstring( st, n, data+offset, len, refs ); + r = msi_addstring( st, n, data+offset, len, refs, StringPersistent ); if( r != n ) ERR("Failed to add string %d\n", n ); n++; @@ -796,6 +796,9 @@ static UINT save_string_table( MSIDATABASE *db ) n = 1; for( i=1; i<count; i++ ) { + UINT refcount = msi_id_persistent_refcount( db->strings, i ); + if( !refcount ) + continue; sz = datasize - used; r = msi_id2stringA( db->strings, i, data+used, &sz ); if( r != ERROR_SUCCESS ) @@ -807,7 +810,7 @@ static UINT save_string_table( MSIDATABASE *db ) sz--; if (sz) - pool[ n*2 + 1 ] = msi_id_refcount( db->strings, i ); + pool[ n*2 + 1 ] = refcount; else pool[ n*2 + 1 ] = 0; if (sz < 0x10000) @@ -1258,7 +1261,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI else if ( tv->columns[i].type & MSITYPE_STRING ) { LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); - val = msi_addstringW( tv->db->strings, 0, sval, -1, 1 ); + val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, StringPersistent ); } else if ( 2 == bytes_per_column( &tv->columns[ i ] ) ) {

1 0

Rob Shearman : msi: Move string loading and saving to string.c.
by Alexandre Julliard 24 Apr '07

24 Apr '07

Module: wine Branch: master Commit: 37b11baaa3448df1662ca6a970f56dc4f0ce3523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b11baaa3448df1662ca6a97… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:17:40 2007 +0100 msi: Move string loading and saving to string.c. --- dlls/msi/database.c | 4 +- dlls/msi/msipriv.h | 9 ++- dlls/msi/string.c | 200 ++++++++++++++++++++++++++++++++++++++++++ dlls/msi/table.c | 242 +++------------------------------------------------ 4 files changed, 222 insertions(+), 233 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37b11baaa3448df1662ca…

1 0