system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 20:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

msi: Preserve strings with embedded nulls when copying from the string table to a record.

Browse source
This commit is contained in:
Hans Leidekker 2012-10-29 12:14:19 +01:00 committed by Alexandre Julliard
parent 32aed60786
commit 9588deb54c
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/msi/msiquery.c
View file

@ -345,10 +345,9 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec)
if (type & MSITYPE_STRING)
{
LPCWSTR sval;
sval = msi_string_lookup(db->strings, ival, NULL);
MSI_RecordSetStringW(*rec, i, sval);
int len;
const WCHAR *sval = msi_string_lookup( db->strings, ival, &len );
msi_record_set_string( *rec, i, sval, len );
}
else
{

2
dlls/msi/package.c
View file

@ -2181,7 +2181,7 @@ UINT msi_get_property( MSIDATABASE *db, LPCWSTR szName,
}
if (rc == ERROR_SUCCESS)
TRACE("returning %s for property %s\n", debugstr_w(szValueBuf),
TRACE("returning %s for property %s\n", debugstr_wn(szValueBuf, *pchValueBuf),
debugstr_w(szName));
else if (rc == ERROR_MORE_DATA)
TRACE("need %d sized buffer for %s\n", *pchValueBuf,

5
dlls/msi/select.c
View file

@ -276,8 +276,9 @@ static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row)
}
else if (type & MSITYPE_STRING)
{
str = MSI_RecordGetString(rec, i + 1);
r = MSI_RecordSetStringW(mod, col, str);
int len;
str = msi_record_get_string( rec, i + 1, &len );
r = msi_record_set_string( mod, col, str, len );
}
else
{

9
dlls/msi/table.c
View file

@ -2340,12 +2340,13 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string
}
else if( columns[i].type & MSITYPE_STRING )
{
LPCWSTR sval;
int len;
const WCHAR *sval;
val = read_raw_int(rawdata, ofs, bytes_per_strref);
sval = msi_string_lookup( st, val, NULL );
MSI_RecordSetStringW( rec, i+1, sval );
TRACE(" field %d [%s]\n", i+1, debugstr_w(sval));
sval = msi_string_lookup( st, val, &len );
msi_record_set_string( rec, i+1, sval, len );
TRACE(" field %d [%s]\n", i+1, debugstr_wn(sval, len));
ofs += bytes_per_strref;
}
else