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

Handle loading strings over 64k from the string table.

This commit is contained in:
Mike McCormack 2005-08-08 11:01:56 +00:00 committed by Alexandre Julliard
parent bf0cb12bbc
commit bcd8fa3c78
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/msi/table.c
View File

@ -731,15 +731,40 @@ UINT load_string_table( MSIDATABASE *db )
db->strings = msi_init_stringtable( count, codepage ); db->strings = msi_init_stringtable( count, codepage );
offset = 0; offset = 0;
n = 1;
for( i=1; i<count; i++ ) for( i=1; i<count; i++ )
{ {
len = pool[i*2]; len = pool[i*2];
n = msi_addstring( db->strings, i, data+offset, len, pool[i*2+1] );
if( n != i ) /*
ERR("Failed to add string %ld\n", i ); * If a string is over 64k, the previous string entry is made null
* and its the high word of the length is inserted in the null string's
* reference count field.
*/
if( pool[i*2-2] == 0 )
len += pool[i*2-1] * 0x10000;
if( (offset + len) > datasize )
{
ERR("string table corrupt?\n");
break;
}
/* don't add the high word of a string's length as a string */
if ( len || !pool[i*2+1] )
{
r = msi_addstring( db->strings, n, data+offset, len, pool[i*2+1] );
if( r != n )
ERR("Failed to add string %ld\n", n );
n++;
}
offset += len; offset += len;
} }
if ( datasize != offset )
ERR("string table load failed! (%08x != %08lx)\n", datasize, offset );
TRACE("Loaded %ld strings\n", count); TRACE("Loaded %ld strings\n", count);
ret = ERROR_SUCCESS; ret = ERROR_SUCCESS;