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

msi: Use proper return types in msi_table_apply_transform. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2016-09-14 10:06:10 +02:00 committed by Alexandre Julliard
parent 7846f0947a
commit b0b2a1a4de
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/msi/table.c
View File

@ -2738,7 +2738,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg )
IEnumSTATSTG *stgenum = NULL; IEnumSTATSTG *stgenum = NULL;
TRANSFORMDATA *transform; TRANSFORMDATA *transform;
TRANSFORMDATA *tables = NULL, *columns = NULL; TRANSFORMDATA *tables = NULL, *columns = NULL;
HRESULT r; HRESULT hr;
STATSTG stat; STATSTG stat;
string_table *strings; string_table *strings;
UINT ret = ERROR_FUNCTION_FAILED; UINT ret = ERROR_FUNCTION_FAILED;
@ -2751,8 +2751,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg )
if( !strings ) if( !strings )
goto end; goto end;
r = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum ); hr = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum );
if( FAILED( r ) ) if (FAILED( hr ))
goto end; goto end;
list_init(&transforms); list_init(&transforms);
@ -2763,8 +2763,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg )
WCHAR name[0x40]; WCHAR name[0x40];
ULONG count = 0; ULONG count = 0;
r = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); hr = IEnumSTATSTG_Next( stgenum, 1, &stat, &count );
if ( FAILED( r ) || !count ) if (FAILED( hr ) || !count)
break; break;
decode_streamname( stat.pwcsName, name ); decode_streamname( stat.pwcsName, name );
@ -2794,12 +2794,10 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg )
TRACE("transform contains stream %s\n", debugstr_w(name)); TRACE("transform contains stream %s\n", debugstr_w(name));
/* load the table */ /* load the table */
r = TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv ); if (TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv ) != ERROR_SUCCESS)
if( r != ERROR_SUCCESS )
continue; continue;
r = tv->view.ops->execute( &tv->view, NULL ); if (tv->view.ops->execute( &tv->view, NULL ) != ERROR_SUCCESS)
if( r != ERROR_SUCCESS )
{ {
tv->view.ops->delete( &tv->view ); tv->view.ops->delete( &tv->view );
continue; continue;