projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Merge from trunk
[reactos.git]
/
dll
/
win32
/
msi
/
msiquery.c
diff --git
a/dll/win32/msi/msiquery.c
b/dll/win32/msi/msiquery.c
index
df81a74
..
cf69593
100644
(file)
--- a/
dll/win32/msi/msiquery.c
+++ b/
dll/win32/msi/msiquery.c
@@
-382,7
+382,7
@@
UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec)
if (r == ERROR_SUCCESS)
{
query->row ++;
if (r == ERROR_SUCCESS)
{
query->row ++;
- MSI_RecordSetInt
eger(*prec, 0, (int
)query);
+ MSI_RecordSetInt
Ptr(*prec, 0, (INT_PTR
)query);
}
return r;
}
return r;
@@
-617,7
+617,7
@@
UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec )
if ( !view || !view->ops->modify)
return ERROR_FUNCTION_FAILED;
if ( !view || !view->ops->modify)
return ERROR_FUNCTION_FAILED;
- if ( mode == MSIMODIFY_UPDATE && MSI_RecordGetInt
eger( rec, 0 ) != (int
)query )
+ if ( mode == MSIMODIFY_UPDATE && MSI_RecordGetInt
Ptr( rec, 0 ) != (INT_PTR
)query )
return ERROR_FUNCTION_FAILED;
r = view->ops->modify( view, mode, rec, query->row );
return ERROR_FUNCTION_FAILED;
r = view->ops->modify( view, mode, rec, query->row );
@@
-901,6
+901,9
@@
UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db,
MSIQUERY *query = NULL;
UINT r;
MSIQUERY *query = NULL;
UINT r;
+ if (!TABLE_Exists( db, table ))
+ return ERROR_INVALID_TABLE;
+
r = MSI_OpenQuery( db, &query, sql, table );
if( r != ERROR_SUCCESS )
return r;
r = MSI_OpenQuery( db, &query, sql, table );
if( r != ERROR_SUCCESS )
return r;