marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Remove the string index parameter from msi_addstringW.

oldstable
Hans Leidekker 2010-04-19 12:37:38 +02:00 committed by Alexandre Julliard
parent fc15e565d3
commit 8f53405544
5 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msi/msipriv.h
View File

@ -660,8 +660,7 @@ enum StringPersistence
StringNonPersistent = 1 StringNonPersistent = 1
}; };
extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); extern BOOL msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence );
extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id );
extern VOID msi_destroy_stringtable( string_table *st ); extern VOID msi_destroy_stringtable( string_table *st );
extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id );

2
dlls/msi/storages.c
View File

@ -77,7 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg)
if (!storage) if (!storage)
return NULL; return NULL;
storage->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); storage->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent);
storage->storage = stg; storage->storage = stg;
if (storage->storage) if (storage->storage)

2
dlls/msi/streams.c
View File

@ -84,7 +84,7 @@ static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, ISt
name = decoded; name = decoded;
} }
stream->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); stream->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent);
stream->stream = stm; stream->stream = stm;
return stream; return stream;
} }

24
dlls/msi/string.c
View File

@ -288,25 +288,17 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U
return n; return n;
} }
int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence )
{ {
UINT n;
LPWSTR str; LPWSTR str;
/* TRACE("[%2d] = %s\n", string_no, debugstr_an(data,len) ); */
if( !data ) if( !data )
return 0; return 0;
if( !data[0] ) if( !data[0] )
return 0; return 0;
if( n > 0 )
{ if( msi_string2idW( st, data, &n ) == ERROR_SUCCESS )
if( st->strings[n].persistent_refcount ||
st->strings[n].nonpersistent_refcount )
return -1;
}
else
{
if( ERROR_SUCCESS == msi_string2idW( st, data, &n ) )
{ {
if (persistence == StringPersistent) if (persistence == StringPersistent)
st->strings[n].persistent_refcount += refcount; st->strings[n].persistent_refcount += refcount;
@ -314,16 +306,10 @@ int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT
st->strings[n].nonpersistent_refcount += refcount; st->strings[n].nonpersistent_refcount += refcount;
return n; return n;
} }
n = st_find_free_entry( st ); n = st_find_free_entry( st );
if( n == -1 ) if( n == -1 )
return -1; return -1;
}
if( n < 1 )
{
ERR("invalid index adding %s (%d)\n", debugstr_w( data ), n );
return -1;
}
/* allocate a new string */ /* allocate a new string */
if(len<0) if(len<0)

2
dlls/msi/table.c
View File

@ -1383,7 +1383,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI
if ( r != ERROR_SUCCESS ) if ( r != ERROR_SUCCESS )
{ {
LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); LPCWSTR sval = MSI_RecordGetString( rec, i + 1 );
val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, val = msi_addstringW( tv->db->strings, sval, -1, 1,
persistent ? StringPersistent : StringNonPersistent ); persistent ? StringPersistent : StringNonPersistent );
} }