Commit 60d92d42 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

msi: Fix a couple of test cases for MsiDatabaseIsTablePersistent.

parent ad045d6e
...@@ -338,6 +338,7 @@ extern UINT msi_string_get_codepage( string_table *st ); ...@@ -338,6 +338,7 @@ extern UINT msi_string_get_codepage( string_table *st );
extern BOOL TABLE_Exists( MSIDATABASE *db, LPWSTR name ); extern BOOL TABLE_Exists( MSIDATABASE *db, LPWSTR name );
extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table );
extern UINT read_raw_stream_data( MSIDATABASE*, LPCWSTR stname, extern UINT read_raw_stream_data( MSIDATABASE*, LPCWSTR stname,
USHORT **pdata, UINT *psz ); USHORT **pdata, UINT *psz );
......
...@@ -898,6 +898,18 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( ...@@ -898,6 +898,18 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(
MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(
MSIHANDLE hDatabase, LPCWSTR szTableName) MSIHANDLE hDatabase, LPCWSTR szTableName)
{ {
FIXME("%lx %s\n", hDatabase, debugstr_w(szTableName)); MSIDATABASE *db;
return MSICONDITION_FALSE; MSICONDITION r;
TRACE("%lx %s\n", hDatabase, debugstr_w(szTableName));
db = msihandle2msiinfo( hDatabase, MSIHANDLETYPE_DATABASE );
if( !db )
return MSICONDITION_ERROR;
r = MSI_DatabaseIsTablePersistent( db, szTableName );
msiobj_release( &db->hdr );
return r;
} }
...@@ -1643,6 +1643,14 @@ UINT MSI_CommitTables( MSIDATABASE *db ) ...@@ -1643,6 +1643,14 @@ UINT MSI_CommitTables( MSIDATABASE *db )
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table )
{
if (!table)
return MSICONDITION_ERROR;
return MSICONDITION_FALSE;
}
static MSIRECORD *msi_get_transform_record( MSITABLEVIEW *tv, string_table *st, USHORT *rawdata ) static MSIRECORD *msi_get_transform_record( MSITABLEVIEW *tv, string_table *st, USHORT *rawdata )
{ {
UINT i, val, ofs = 0; UINT i, val, ofs = 0;
......
...@@ -2170,15 +2170,15 @@ static void test_temporary_table(void) ...@@ -2170,15 +2170,15 @@ static void test_temporary_table(void)
DWORD sz; DWORD sz;
cond = MsiDatabaseIsTablePersistent(0, NULL); cond = MsiDatabaseIsTablePersistent(0, NULL);
todo_wine ok( cond == MSICONDITION_ERROR, "wrong return condition\n"); ok( cond == MSICONDITION_ERROR, "wrong return condition\n");
hdb = create_db(); hdb = create_db();
ok( hdb, "failed to create db\n"); ok( hdb, "failed to create db\n");
todo_wine {
cond = MsiDatabaseIsTablePersistent(hdb, NULL); cond = MsiDatabaseIsTablePersistent(hdb, NULL);
ok( cond == MSICONDITION_ERROR, "wrong return condition\n"); ok( cond == MSICONDITION_ERROR, "wrong return condition\n");
todo_wine {
cond = MsiDatabaseIsTablePersistent(hdb, "_Tables"); cond = MsiDatabaseIsTablePersistent(hdb, "_Tables");
ok( cond == MSICONDITION_NONE, "wrong return condition\n"); ok( cond == MSICONDITION_NONE, "wrong return condition\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment