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

msi: Don't terminate the string in msi_id2stringA. 

This makes sure that the last string can be fully written when saving the
string table.
This commit is contained in:
Hans Leidekker 2012-05-31 10:05:14 +02:00 committed by Alexandre Julliard
parent f86ab49be2
commit c959e38625
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/msi/string.c
View File

@ -357,14 +357,12 @@ const WCHAR *msi_string_lookup_id( const string_table *st, UINT id )
* [in/out] sz - number of bytes available in the buffer on input * [in/out] sz - number of bytes available in the buffer on input
* number of bytes used on output * number of bytes used on output
* *
* The size includes the terminating nul character. Short buffers * Returned string is not nul terminated.
* will be filled, but not nul terminated.
*/ */
static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz )
{ {
UINT len; UINT len, lenW;
const WCHAR *str; const WCHAR *str;
int n;
TRACE("Finding string %d of %d\n", id, st->maxcount); TRACE("Finding string %d of %d\n", id, st->maxcount);
@ -372,26 +370,14 @@ static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT
if( !str ) if( !str )
return ERROR_FUNCTION_FAILED; return ERROR_FUNCTION_FAILED;
len = WideCharToMultiByte( st->codepage, 0, str, -1, NULL, 0, NULL, NULL ); lenW = strlenW( str );
len = WideCharToMultiByte( st->codepage, 0, str, lenW, NULL, 0, NULL, NULL );
if( !buffer ) if( *sz < len )
{ {
*sz = len; *sz = len;
return ERROR_SUCCESS; return ERROR_MORE_DATA;
} }
*sz = WideCharToMultiByte( st->codepage, 0, str, lenW, buffer, *sz, NULL, NULL );
if( len > *sz )
{
n = strlenW( str ) + 1;
while( n && (len > *sz) )
len = WideCharToMultiByte( st->codepage, 0,
str, --n, NULL, 0, NULL, NULL );
}
else
n = -1;
*sz = WideCharToMultiByte( st->codepage, 0, str, n, buffer, len, NULL, NULL );
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
@ -588,7 +574,7 @@ UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *byt
data = msi_alloc( datasize ); data = msi_alloc( datasize );
if( ! data ) if( ! data )
{ {
WARN("Failed to alloc data %d bytes\n", poolsize ); WARN("Failed to alloc data %d bytes\n", datasize );
goto err; goto err;
} }
@ -622,8 +608,6 @@ UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *byt
ERR("failed to fetch string\n"); ERR("failed to fetch string\n");
sz = 0; sz = 0;
} }
if( sz && (sz < (datasize - used ) ) )
sz--;
if (sz) if (sz)
pool[ n*2 + 1 ] = st->strings[i].persistent_refcount; pool[ n*2 + 1 ] = st->strings[i].persistent_refcount;

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

@ -9345,7 +9345,7 @@ static void test_createtable(void)
size = sizeof(buffer); size = sizeof(buffer);
res = MsiRecordGetString(hrec, 1, buffer, &size ); res = MsiRecordGetString(hrec, 1, buffer, &size );
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
todo_wine ok(!strcmp(buffer,"b"), "b != %s\n", buffer); ok(!strcmp(buffer,"b"), "b != %s\n", buffer);
res = MsiCloseHandle( hrec ); res = MsiCloseHandle( hrec );
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);