Hans Leidekker : msi: Use proper return types in msi_table_apply_transform.
Alexandre Julliard
julliard at winehq.org
Wed Sep 14 10:28:52 CDT 2016
Module: wine
Branch: master
Commit: b0b2a1a4deee25474beb32573ce2fa770ff89cc6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b2a1a4deee25474beb32573ce2fa770ff89cc6
Author: Hans Leidekker <hans at codeweavers.com>
Date: Wed Sep 14 10:06:10 2016 +0200
msi: Use proper return types in msi_table_apply_transform.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/table.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index 9c31992..2b36091 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -2738,7 +2738,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg )
IEnumSTATSTG *stgenum = NULL;
TRANSFORMDATA *transform;
TRANSFORMDATA *tables = NULL, *columns = NULL;
- HRESULT r;
+ HRESULT hr;
STATSTG stat;
string_table *strings;
UINT ret = ERROR_FUNCTION_FAILED;
@@ -2751,8 +2751,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg )
if( !strings )
goto end;
- r = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum );
- if( FAILED( r ) )
+ hr = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum );
+ if (FAILED( hr ))
goto end;
list_init(&transforms);
@@ -2763,8 +2763,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg )
WCHAR name[0x40];
ULONG count = 0;
- r = IEnumSTATSTG_Next( stgenum, 1, &stat, &count );
- if ( FAILED( r ) || !count )
+ hr = IEnumSTATSTG_Next( stgenum, 1, &stat, &count );
+ if (FAILED( hr ) || !count)
break;
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));
/* load the table */
- r = TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv );
- if( r != ERROR_SUCCESS )
+ if (TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv ) != ERROR_SUCCESS)
continue;
- r = tv->view.ops->execute( &tv->view, NULL );
- if( r != ERROR_SUCCESS )
+ if (tv->view.ops->execute( &tv->view, NULL ) != ERROR_SUCCESS)
{
tv->view.ops->delete( &tv->view );
continue;
More information about the wine-cvs
mailing list