Commit 07c85fe8 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

msi: Avoid reading the transform table data twice.

parent e9c5e93f
...@@ -1833,6 +1833,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, ...@@ -1833,6 +1833,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg,
TRACE("%p %p %p %s\n", db, stg, st, debugstr_w(name) ); TRACE("%p %p %p %s\n", db, stg, st, debugstr_w(name) );
/* read the transform data */
read_stream_data( stg, name, &rawdata, &rawsize ); read_stream_data( stg, name, &rawdata, &rawsize );
if ( !rawdata ) if ( !rawdata )
{ {
...@@ -1849,15 +1850,6 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, ...@@ -1849,15 +1850,6 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg,
if( r != ERROR_SUCCESS ) if( r != ERROR_SUCCESS )
goto err; goto err;
/* read the transform data */
r = ERROR_FUNCTION_FAILED;
read_stream_data( stg, name, &rawdata, &rawsize );
if( !rawdata || (rawsize < 2) )
{
ERR("odd sized transform for table %s\n", debugstr_w(name));
goto err;
}
TRACE("name = %s columns = %u row_size = %u raw size = %u\n", TRACE("name = %s columns = %u row_size = %u raw size = %u\n",
debugstr_w(name), tv->num_cols, tv->row_size, rawsize ); debugstr_w(name), tv->num_cols, tv->row_size, rawsize );
......
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