ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Allocate 3 bytes instead of 2 for in-memory string references. 

Fixes an installer that stores string references as 2 byte integers and
grows the number of strings beyond the limit of 64k during installation.
This commit is contained in:
Hans Leidekker 2010-10-11 12:09:45 +02:00 committed by Alexandre Julliard
parent b719338433
commit cf6e820106
4 changed files with 132 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msi/msipriv.h
View File

@ -46,6 +46,7 @@
#define MSITYPE_TEMPORARY 0x4000
#define MAX_STREAM_NAME_LEN 62
#define LONG_STR_BYTES 3
/* Install UI level mask for AND operation to exclude flags */
#define INSTALLUILEVEL_MASK 0x0007
@ -684,7 +685,7 @@ extern VOID msi_destroy_stringtable( string_table *st );
extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id );
extern HRESULT msi_init_string_table( IStorage *stg );
extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref );
extern UINT msi_save_string_table( const string_table *st, IStorage *storage );
extern UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *bytes_per_strref );
extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name );
extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table );

17
dlls/msi/string.c
View File

@ -3,6 +3,7 @@
*
* Copyright 2002-2004, Mike McCormack for CodeWeavers
* Copyright 2007 Robert Shearman for CodeWeavers
* Copyright 2010 Hans Leidekker for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -40,8 +41,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(msidb);
#define LONG_STR_BYTES 3
typedef struct _msistring
{
USHORT persistent_refcount;
@ -564,7 +563,7 @@ end:
return st;
}
UINT msi_save_string_table( const string_table *st, IStorage *storage )
UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *bytes_per_strref )
{
UINT i, datasize = 0, poolsize = 0, sz, used, r, codepage, n;
UINT ret = ERROR_FUNCTION_FAILED;
@ -593,8 +592,16 @@ UINT msi_save_string_table( const string_table *st, IStorage *storage )
used = 0;
codepage = st->codepage;
pool[0]=codepage&0xffff;
pool[1]=(codepage>>16);
pool[0] = codepage & 0xffff;
pool[1] = codepage >> 16;
if (st->maxcount > 0xffff)
{
pool[1] |= 0x8000;
*bytes_per_strref = LONG_STR_BYTES;
}
else
*bytes_per_strref = sizeof(USHORT);
n = 1;
for( i=1; i<st->maxcount; i++ )
{

178
dlls/msi/table.c
View File

@ -42,7 +42,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(msidb);
#define MSITABLE_HASH_TABLE_SIZE 37
#define LONG_STR_BYTES 3
typedef struct tagMSICOLUMNHASHENTRY
{
@ -117,13 +116,13 @@ static UINT get_tablecolumns( MSIDATABASE *db,
LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz);
static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count );
static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col )
static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col, UINT bytes_per_strref )
{
if( MSITYPE_IS_BINARY(col->type) )
return 2;
if( col->type & MSITYPE_STRING )
return db->bytes_per_strref;
return bytes_per_strref;
if( (col->type & 0xff) <= 2)
return 2;
@ -399,24 +398,33 @@ static void free_table( MSITABLE *table )
msi_free( table );
}
static UINT msi_table_get_row_size( MSIDATABASE *db,const MSICOLUMNINFO *cols,
UINT count )
static UINT msi_table_get_row_size( MSIDATABASE *db, const MSICOLUMNINFO *cols, UINT count, UINT bytes_per_strref )
{
const MSICOLUMNINFO *last_col = &cols[count-1];
const MSICOLUMNINFO *last_col;
if (!count)
return 0;
return last_col->offset + bytes_per_column( db, last_col );
if (bytes_per_strref != LONG_STR_BYTES)
{
UINT i, size = 0;
for (i = 0; i < count; i++) size += bytes_per_column( db, &cols[i], bytes_per_strref );
return size;
}
last_col = &cols[count - 1];
return last_col->offset + bytes_per_column( db, last_col, bytes_per_strref );
}
/* add this table to the list of cached tables in the database */
static UINT read_table_from_storage( MSIDATABASE *db, MSITABLE *t, IStorage *stg )
{
BYTE *rawdata = NULL;
UINT rawsize = 0, i, j, row_size = 0;
UINT rawsize = 0, i, j, row_size, row_size_mem;
TRACE("%s\n",debugstr_w(t->name));
row_size = msi_table_get_row_size( db, t->colinfo, t->col_count );
row_size = msi_table_get_row_size( db, t->colinfo, t->col_count, db->bytes_per_strref );
row_size_mem = msi_table_get_row_size( db, t->colinfo, t->col_count, LONG_STR_BYTES );
/* if we can't read the table, just assume that it's empty */
read_stream_data( stg, t->name, TRUE, &rawdata, &rawsize );
@ -441,17 +449,19 @@ static UINT read_table_from_storage( MSIDATABASE *db, MSITABLE *t, IStorage *stg
/* transpose all the data */
TRACE("Transposing data from %d rows\n", t->row_count );
for( i=0; i<t->row_count; i++ )
for (i = 0; i < t->row_count; i++)
{
t->data[i] = msi_alloc( row_size );
UINT ofs = 0, ofs_mem = 0;
t->data[i] = msi_alloc( row_size_mem );
if( !t->data[i] )
goto err;
t->data_persistent[i] = TRUE;
for( j=0; j<t->col_count; j++ )
for (j = 0; j < t->col_count; j++)
{
UINT ofs = t->colinfo[j].offset;
UINT n = bytes_per_column( db, &t->colinfo[j] );
UINT m = bytes_per_column( db, &t->colinfo[j], LONG_STR_BYTES );
UINT n = bytes_per_column( db, &t->colinfo[j], db->bytes_per_strref );
UINT k;
if ( n != 2 && n != 3 && n != 4 )
@ -459,9 +469,23 @@ static UINT read_table_from_storage( MSIDATABASE *db, MSITABLE *t, IStorage *stg
ERR("oops - unknown column width %d\n", n);
goto err;
}
for ( k = 0; k < n; k++ )
t->data[i][ofs + k] = rawdata[ofs*t->row_count + i * n + k];
if (t->colinfo[j].type & MSITYPE_STRING && n < m)
{
for (k = 0; k < m; k++)
{
if (k < n)
t->data[i][ofs_mem + k] = rawdata[ofs * t->row_count + i * n + k];
else
t->data[i][ofs_mem + k] = 0;
}
}
else
{
for (k = 0; k < n; k++)
t->data[i][ofs_mem + k] = rawdata[ofs * t->row_count + i * n + k];
}
ofs_mem += m;
ofs += n;
}
}
@ -729,10 +753,20 @@ static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret )
return ERROR_SUCCESS;
}
static UINT save_table( MSIDATABASE *db, const MSITABLE *t )
static UINT read_table_int(BYTE *const *data, UINT row, UINT col, UINT bytes)
{
BYTE *rawdata = NULL, *p;
UINT rawsize, r, i, j, row_size;
UINT ret = 0, i;
for (i = 0; i < bytes; i++)
ret += data[row][col + i] << i * 8;
return ret;
}
static UINT save_table( MSIDATABASE *db, const MSITABLE *t, UINT bytes_per_strref )
{
BYTE *rawdata = NULL;
UINT rawsize, r, i, j, row_size, row_count;
/* Nothing to do for non-persistent tables */
if( t->persistent == MSICONDITION_FALSE )
@ -740,9 +774,17 @@ static UINT save_table( MSIDATABASE *db, const MSITABLE *t )
TRACE("Saving %s\n", debugstr_w( t->name ) );
row_size = msi_table_get_row_size( db, t->colinfo, t->col_count );
rawsize = t->row_count * row_size;
row_size = msi_table_get_row_size( db, t->colinfo, t->col_count, bytes_per_strref );
row_count = t->row_count;
for (i = 0; i < t->row_count; i++)
{
if (!t->data_persistent[i])
{
row_count = 1; /* yes, this is bizarre */
break;
}
}
rawsize = row_count * row_size;
rawdata = msi_alloc_zero( rawsize );
if( !rawdata )
{
@ -751,25 +793,41 @@ static UINT save_table( MSIDATABASE *db, const MSITABLE *t )
}
rawsize = 0;
p = rawdata;
for( i=0; i<t->col_count; i++ )
for (i = 0; i < t->row_count; i++)
{
for( j=0; j<t->row_count; j++ )
UINT ofs = 0, ofs_mem = 0;
if (!t->data_persistent[i]) break;
for (j = 0; j < t->col_count; j++)
{
UINT offset = t->colinfo[i].offset;
UINT m = bytes_per_column( db, &t->colinfo[j], LONG_STR_BYTES );
UINT n = bytes_per_column( db, &t->colinfo[j], bytes_per_strref );
UINT k;
if (!t->data_persistent[j]) continue;
if (i == 0)
rawsize += row_size;
*p++ = t->data[j][offset];
*p++ = t->data[j][offset + 1];
if( 4 == bytes_per_column( db, &t->colinfo[i] ) )
if (n != 2 && n != 3 && n != 4)
{
*p++ = t->data[j][offset + 2];
*p++ = t->data[j][offset + 3];
ERR("oops - unknown column width %d\n", n);
goto err;
}
if (t->colinfo[j].type & MSITYPE_STRING && n < m)
{
UINT id = read_table_int( t->data, i, ofs_mem, LONG_STR_BYTES );
if (id > 1 << bytes_per_strref * 8)
{
ERR("string id %u out of range\n", id);
r = ERROR_FUNCTION_FAILED;
goto err;
}
}
for (k = 0; k < n; k++)
{
rawdata[ofs * row_count + i * n + k] = t->data[i][ofs_mem + k];
}
ofs_mem += m;
ofs += n;
}
rawsize += row_size;
}
TRACE("writing %d bytes\n", rawsize);
@ -777,12 +835,10 @@ static UINT save_table( MSIDATABASE *db, const MSITABLE *t )
err:
msi_free( rawdata );
return r;
}
static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo,
DWORD count )
static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo, DWORD count )
{
DWORD i;
@ -791,7 +847,7 @@ static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo,
assert( (i+1) == colinfo[ i ].number );
if (i)
colinfo[i].offset = colinfo[ i - 1 ].offset
+ bytes_per_column( db, &colinfo[ i - 1 ] );
+ bytes_per_column( db, &colinfo[ i - 1 ], LONG_STR_BYTES );
else
colinfo[i].offset = 0;
TRACE("column %d is [%s] with type %08x ofs %d\n",
@ -855,16 +911,6 @@ static LPWSTR msi_makestring( const MSIDATABASE *db, UINT stringid)
return strdupW(msi_string_lookup_id( db->strings, stringid ));
}
static UINT read_table_int(BYTE *const *data, UINT row, UINT col, UINT bytes)
{
UINT ret = 0, i;
for (i = 0; i < bytes; i++)
ret += (data[row][col + i] << i * 8);
return ret;
}
static UINT get_tablecolumns( MSIDATABASE *db,
LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz)
{
@ -902,11 +948,11 @@ static UINT get_tablecolumns( MSIDATABASE *db,
count = table->row_count;
for( i=0; i<count; i++ )
{
if( read_table_int(table->data, i, 0, db->bytes_per_strref) != table_id )
if( read_table_int(table->data, i, 0, LONG_STR_BYTES) != table_id )
continue;
if( colinfo )
{
UINT id = read_table_int(table->data, i, table->colinfo[2].offset, db->bytes_per_strref);
UINT id = read_table_int(table->data, i, table->colinfo[2].offset, LONG_STR_BYTES);
UINT col = read_table_int(table->data, i, table->colinfo[1].offset, sizeof(USHORT)) - (1<<15);
/* check the column number is in range */
@ -971,7 +1017,7 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name )
if (!table->col_count)
goto done;
size = msi_table_get_row_size( db, table->colinfo, table->col_count );
size = msi_table_get_row_size( db, table->colinfo, table->col_count, LONG_STR_BYTES );
offset = table->colinfo[table->col_count - 1].offset;
for ( n = 0; n < table->row_count; n++ )
@ -1014,7 +1060,7 @@ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name )
for( i = 0; i < table->row_count; i++ )
{
if( read_table_int( table->data, i, 0, db->bytes_per_strref ) == table_id )
if( read_table_int( table->data, i, 0, LONG_STR_BYTES ) == table_id )
return TRUE;
}
@ -1060,7 +1106,7 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *
if (tv->order)
row = tv->order->reorder[row];
n = bytes_per_column( tv->db, &tv->columns[col-1] );
n = bytes_per_column( tv->db, &tv->columns[col - 1], LONG_STR_BYTES );
if (n != 2 && n != 3 && n != 4)
{
ERR("oops! what is %d bytes per column?\n", n );
@ -1117,7 +1163,7 @@ static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname )
{
static const WCHAR fmt[] = { '%','d',0 };
WCHAR number[0x20];
UINT n = bytes_per_column( tv->db, &tv->columns[i] );
UINT n = bytes_per_column( tv->db, &tv->columns[i], LONG_STR_BYTES );
switch( n )
{
@ -1214,7 +1260,7 @@ static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val )
msi_free( tv->columns[col-1].hash_table );
tv->columns[col-1].hash_table = NULL;
n = bytes_per_column( tv->db, &tv->columns[col-1] );
n = bytes_per_column( tv->db, &tv->columns[col - 1], LONG_STR_BYTES );
if ( n != 2 && n != 3 && n != 4 )
{
ERR("oops! what is %d bytes per column?\n", n );
@ -1305,7 +1351,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT
if (r != ERROR_SUCCESS)
return ERROR_NOT_FOUND;
}
else if ( 2 == bytes_per_column( tv->db, &columninfo ) )
else if ( bytes_per_column( tv->db, &columninfo, LONG_STR_BYTES ) == 2 )
{
*pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField );
if ( *pvalue & 0xffff0000 )
@ -2324,7 +2370,7 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view )
tv->db = db;
tv->columns = tv->table->colinfo;
tv->num_cols = tv->table->col_count;
tv->row_size = msi_table_get_row_size( db, tv->table->colinfo, tv->table->col_count );
tv->row_size = msi_table_get_row_size( db, tv->table->colinfo, tv->table->col_count, LONG_STR_BYTES );
TRACE("%s one row is %d bytes\n", debugstr_w(name), tv->row_size );
@ -2336,13 +2382,13 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view )
UINT MSI_CommitTables( MSIDATABASE *db )
{
UINT r;
UINT r, bytes_per_strref;
HRESULT hr;
MSITABLE *table = NULL;
TRACE("%p\n",db);
r = msi_save_string_table( db->strings, db->storage );
r = msi_save_string_table( db->strings, db->storage, &bytes_per_strref );
if( r != ERROR_SUCCESS )
{
WARN("failed to save string table r=%08x\n",r);
@ -2351,7 +2397,7 @@ UINT MSI_CommitTables( MSIDATABASE *db )
LIST_FOR_EACH_ENTRY( table, &db->tables, MSITABLE, entry )
{
r = save_table( db, table );
r = save_table( db, table, bytes_per_strref );
if( r != ERROR_SUCCESS )
{
WARN("failed to save table %s (r=%08x)\n",
@ -2488,7 +2534,7 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string
IStream *stm = NULL;
UINT r;
ofs += bytes_per_column( tv->db, &columns[i] );
ofs += bytes_per_column( tv->db, &columns[i], bytes_per_strref );
r = msi_record_encoded_stream_name( tv, rec, &encname );
if ( r != ERROR_SUCCESS )
@ -2515,7 +2561,7 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string
}
else
{
UINT n = bytes_per_column( tv->db, &columns[i] );
UINT n = bytes_per_column( tv->db, &columns[i], bytes_per_strref );
switch( n )
{
case 2:
@ -2729,7 +2775,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg,
! MSITYPE_IS_BINARY(tv->columns[i].type) )
sz += bytes_per_strref;
else
sz += bytes_per_column( tv->db, &tv->columns[i] );
sz += bytes_per_column( tv->db, &tv->columns[i], bytes_per_strref );
}
}
else
@ -2751,7 +2797,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg,
! MSITYPE_IS_BINARY(tv->columns[i].type) )
sz += bytes_per_strref;
else
sz += bytes_per_column( tv->db, &tv->columns[i] );
sz += bytes_per_column( tv->db, &tv->columns[i], bytes_per_strref );
}
}
}

18
dlls/msi/tests/db.c
View File

@ -5498,16 +5498,13 @@ static void test_stringtable(void)
sz = sizeof(buffer);
r = MsiRecordGetString(hrec, 2, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmp(buffer, "one"), "Expected one, got %s\n", buffer);
ok(!lstrcmp(buffer, "one"), "Expected one, got '%s'\n", buffer);
r = MsiCloseHandle(hrec);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
r = MsiViewFetch(hview, &hrec);
todo_wine
{
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
}
ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
r = MsiViewClose(hview);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@ -5535,7 +5532,7 @@ static void test_stringtable(void)
sz = sizeof(buffer);
r = MsiRecordGetString(hrec, 2, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmp(buffer, "two"), "Expected two, got %s\n", buffer);
ok(!lstrcmp(buffer, "two"), "Expected two, got '%s'\n", buffer);
r = MsiCloseHandle(hrec);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@ -5552,7 +5549,7 @@ static void test_stringtable(void)
sz = sizeof(buffer);
r = MsiRecordGetString(hrec, 2, buffer, &sz);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(!lstrcmp(buffer, "five"), "Expected five, got %s\n", buffer);
ok(!lstrcmp(buffer, "five"), "Expected five, got '%s'\n", buffer);
r = MsiCloseHandle(hrec);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@ -5580,11 +5577,8 @@ static void test_stringtable(void)
hr = IStream_Read(stm, data, MAX_PATH, &read);
ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
todo_wine
{
ok(read == 4, "Expected 4, got %d\n", read);
ok(!memcmp(data, data10, read), "Unexpected data\n");
}
ok(read == 4, "Expected 4, got %d\n", read);
todo_wine ok(!memcmp(data, data10, read), "Unexpected data\n");
hr = IStream_Release(stm);
ok(hr == S_OK, "Expected S_OK, got %d\n", hr);