Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
f3c8b830
Commit
f3c8b830
authored
Jul 19, 2004
by
Mike McCormack
Committed by
Alexandre Julliard
Jul 19, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the return code of MsiDatabaseOpenView.
parent
429d3059
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
action.c
dlls/msi/action.c
+1
-1
msiquery.c
dlls/msi/msiquery.c
+1
-1
sql.y
dlls/msi/sql.y
+12
-1
No files found.
dlls/msi/action.c
View file @
f3c8b830
...
@@ -3107,7 +3107,7 @@ static UINT ACTION_InstallValidate(MSIPACKAGE *package)
...
@@ -3107,7 +3107,7 @@ static UINT ACTION_InstallValidate(MSIPACKAGE *package)
static
UINT
ACTION_LaunchConditions
(
MSIPACKAGE
*
package
)
static
UINT
ACTION_LaunchConditions
(
MSIPACKAGE
*
package
)
{
{
UINT
rc
;
UINT
rc
;
MSIQUERY
*
view
;
MSIQUERY
*
view
=
NULL
;
MSIRECORD
*
row
=
0
;
MSIRECORD
*
row
=
0
;
static
const
WCHAR
ExecSeqQuery
[]
=
{
static
const
WCHAR
ExecSeqQuery
[]
=
{
'S'
,
'E'
,
'L'
,
'E'
,
'C'
,
'T'
,
' '
,
'*'
,
' '
,
'S'
,
'E'
,
'L'
,
'E'
,
'C'
,
'T'
,
' '
,
'*'
,
' '
,
...
...
dlls/msi/msiquery.c
View file @
f3c8b830
...
@@ -152,7 +152,7 @@ UINT MSI_DatabaseOpenViewW(MSIDATABASE *db,
...
@@ -152,7 +152,7 @@ UINT MSI_DatabaseOpenViewW(MSIDATABASE *db,
}
}
msiobj_release
(
&
query
->
hdr
);
msiobj_release
(
&
query
->
hdr
);
return
ERROR_SUCCESS
;
return
r
;
}
}
UINT
WINAPI
MsiDatabaseOpenViewW
(
MSIHANDLE
hdb
,
UINT
WINAPI
MsiDatabaseOpenViewW
(
MSIHANDLE
hdb
,
...
...
dlls/msi/sql.y
View file @
f3c8b830
...
@@ -342,7 +342,11 @@ unorderedsel:
...
@@ -342,7 +342,11 @@ unorderedsel:
if( !$3 )
if( !$3 )
YYABORT;
YYABORT;
if( $2 )
if( $2 )
{
$$ = do_one_select( sql->db, $3, $2 );
$$ = do_one_select( sql->db, $3, $2 );
if( !$$ )
YYABORT;
}
else
else
$$ = $3;
$$ = $3;
}
}
...
@@ -354,7 +358,11 @@ unorderedsel:
...
@@ -354,7 +358,11 @@ unorderedsel:
if( !view )
if( !view )
YYABORT;
YYABORT;
if( $3 )
if( $3 )
{
view = do_one_select( sql->db, view, $3 );
view = do_one_select( sql->db, view, $3 );
if( !view )
YYABORT;
}
DISTINCT_CreateView( sql->db, & $$, view );
DISTINCT_CreateView( sql->db, & $$, view );
}
}
;
;
...
@@ -396,10 +404,13 @@ from:
...
@@ -396,10 +404,13 @@ from:
TK_FROM table
TK_FROM table
{
{
SQL_input* sql = (SQL_input*) info;
SQL_input* sql = (SQL_input*) info;
UINT r;
$$ = NULL;
$$ = NULL;
TRACE("From table: %s\n",debugstr_w($2));
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
| TK_FROM table TK_WHERE expr
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment