marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Fix integer conversion in get_table_value_from_record.

oldstable
Hans Leidekker 2013-07-30 11:09:54 +02:00 committed by Alexandre Julliard
parent 7dfdcf3034
commit 1257db2109
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/msi/table.c
View File

@ -1259,6 +1259,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT
{
MSICOLUMNINFO columninfo;
UINT r;
int ival;
if ( (iField <= 0) ||
(iField > tv->num_cols) ||
@ -1285,16 +1286,21 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT
}
else if ( bytes_per_column( tv->db, &columninfo, LONG_STR_BYTES ) == 2 )
{
*pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField );
if ( *pvalue & 0xffff0000 )
ival = MSI_RecordGetInteger( rec, iField );
if (ival == 0x80000000) *pvalue = 0x8000;
else
{
ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000);
return ERROR_FUNCTION_FAILED;
*pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField );
if (*pvalue & 0xffff0000)
{
ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000);
return ERROR_FUNCTION_FAILED;
}
}
}
else
{
INT ival = MSI_RecordGetInteger( rec, iField );
ival = MSI_RecordGetInteger( rec, iField );
*pvalue = ival ^ 0x80000000;
}