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

Fix the return code of MsiDatabaseOpenView.

This commit is contained in:
Mike McCormack 2004-07-19 19:35:05 +00:00 committed by Alexandre Julliard
parent 429d3059b1
commit f3c8b83055
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/action.c
View File

@ -3107,7 +3107,7 @@ static UINT ACTION_InstallValidate(MSIPACKAGE *package)
static UINT ACTION_LaunchConditions(MSIPACKAGE *package)
{
UINT rc;
MSIQUERY * view;
MSIQUERY * view = NULL;
MSIRECORD * row = 0;
static const WCHAR ExecSeqQuery[] = {
'S','E','L','E','C','T',' ','*',' ',

2
dlls/msi/msiquery.c
View File

@ -152,7 +152,7 @@ UINT MSI_DatabaseOpenViewW(MSIDATABASE *db,
}
msiobj_release( &query->hdr );
return ERROR_SUCCESS;
return r;
}
UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb,

13
dlls/msi/sql.y
View File

@ -342,7 +342,11 @@ unorderedsel:
if( !$3 )
YYABORT;
if( $2 )
{
$$ = do_one_select( sql->db, $3, $2 );
if( !$$ )
YYABORT;
}
else
$$ = $3;
}
@ -354,7 +358,11 @@ unorderedsel:
if( !view )
YYABORT;
if( $3 )
{
view = do_one_select( sql->db, view, $3 );
if( !view )
YYABORT;
}
DISTINCT_CreateView( sql->db, & $$, view );
}
;
@ -396,10 +404,13 @@ from:
TK_FROM table
{
SQL_input* sql = (SQL_input*) info;
UINT r;
$$ = NULL;
TRACE("From table: %s\n",debugstr_w($2));
TABLE_CreateView( sql->db, $2, & $$ );
r = TABLE_CreateView( sql->db, $2, & $$ );
if( r != ERROR_SUCCESS )
YYABORT;
}
| TK_FROM table TK_WHERE expr
{