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

msi: Create the _Tables table when creating a database.

This commit is contained in:
James Hawkins 2007-11-11 18:05:56 -06:00 committed by Alexandre Julliard
parent ef1277d462
commit 7dffb518c0
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/database.c
View File

@ -82,6 +82,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb)
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];
static const WCHAR backslash[] = {'\\',0}; static const WCHAR backslash[] = {'\\',0};
static WCHAR szTables[] = { '_','T','a','b','l','e','s',0 };
TRACE("%s %s\n",debugstr_w(szDBPath),debugstr_w(szPersist) ); TRACE("%s %s\n",debugstr_w(szDBPath),debugstr_w(szPersist) );
@ -114,6 +115,9 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb)
if( r == ERROR_SUCCESS ) if( r == ERROR_SUCCESS )
{ {
IStorage_SetClass( stg, &CLSID_MsiDatabase ); IStorage_SetClass( stg, &CLSID_MsiDatabase );
/* create the _Tables stream */
r = write_stream_data(stg, szTables, NULL, 0, TRUE);
if (!FAILED(r))
r = msi_init_string_table( stg ); r = msi_init_string_table( stg );
} }
created = TRUE; created = TRUE;

10
dlls/msi/tests/db.c
View File

@ -4497,11 +4497,8 @@ void enum_stream_names(IStorage *stg)
if(FAILED(hr) || !count) if(FAILED(hr) || !count)
break; break;
todo_wine
{
ok(!lstrcmpW(stat.pwcsName, database_table_data[n].name), ok(!lstrcmpW(stat.pwcsName, database_table_data[n].name),
"Expected table %d name to match\n", n); "Expected table %d name to match\n", n);
}
stm = NULL; stm = NULL;
hr = IStorage_OpenStream(stg, stat.pwcsName, NULL, hr = IStorage_OpenStream(stg, stat.pwcsName, NULL,
@ -4514,15 +4511,11 @@ void enum_stream_names(IStorage *stg)
hr = IStream_Read(stm, data, sz, &count); hr = IStream_Read(stm, data, sz, &count);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
if (n == 1) todo_wine
ok(count == database_table_data[n].size, ok(count == database_table_data[n].size,
"Expected %d, got %d\n", database_table_data[n].size, count); "Expected %d, got %d\n", database_table_data[n].size, count);
if (!database_table_data[n].size) if (!database_table_data[n].size)
{
if (n == 1) todo_wine
ok(!memcmp(data, check, MAX_PATH), "data should not be changed\n"); ok(!memcmp(data, check, MAX_PATH), "data should not be changed\n");
}
else else
ok(!memcmp(data, database_table_data[n].data, database_table_data[n].size), ok(!memcmp(data, database_table_data[n].data, database_table_data[n].size),
"Expected table %d data to match\n", n); "Expected table %d data to match\n", n);
@ -4531,10 +4524,7 @@ void enum_stream_names(IStorage *stg)
n++; n++;
} }
todo_wine
{
ok(n == 3, "Expected 3, got %d\n", n); ok(n == 3, "Expected 3, got %d\n", n);
}
IEnumSTATSTG_Release(stgenum); IEnumSTATSTG_Release(stgenum);
} }