Commit 4686efd2 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

msi: Get rid of the msistring typedef.

parent 540d1890
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
WINE_DEFAULT_DEBUG_CHANNEL(msidb); WINE_DEFAULT_DEBUG_CHANNEL(msidb);
typedef struct _msistring struct msistring
{ {
USHORT persistent_refcount; USHORT persistent_refcount;
USHORT nonpersistent_refcount; USHORT nonpersistent_refcount;
LPWSTR str; LPWSTR str;
} msistring; };
struct string_table struct string_table
{ {
...@@ -54,7 +54,7 @@ struct string_table ...@@ -54,7 +54,7 @@ struct string_table
UINT freeslot; UINT freeslot;
UINT codepage; UINT codepage;
UINT sortcount; UINT sortcount;
msistring *strings; /* an array of strings */ struct msistring *strings; /* an array of strings */
UINT *sorted; /* index */ UINT *sorted; /* index */
}; };
...@@ -81,7 +81,7 @@ static string_table *init_stringtable( int entries, UINT codepage ) ...@@ -81,7 +81,7 @@ static string_table *init_stringtable( int entries, UINT codepage )
if( entries < 1 ) if( entries < 1 )
entries = 1; entries = 1;
st->strings = msi_alloc_zero( sizeof (msistring) * entries ); st->strings = msi_alloc_zero( sizeof(struct msistring) * entries );
if( !st->strings ) if( !st->strings )
{ {
msi_free( st ); msi_free( st );
...@@ -122,7 +122,7 @@ VOID msi_destroy_stringtable( string_table *st ) ...@@ -122,7 +122,7 @@ VOID msi_destroy_stringtable( string_table *st )
static int st_find_free_entry( string_table *st ) static int st_find_free_entry( string_table *st )
{ {
UINT i, sz, *s; UINT i, sz, *s;
msistring *p; struct msistring *p;
TRACE("%p\n", st); TRACE("%p\n", st);
...@@ -140,7 +140,7 @@ static int st_find_free_entry( string_table *st ) ...@@ -140,7 +140,7 @@ static int st_find_free_entry( string_table *st )
/* dynamically resize */ /* dynamically resize */
sz = st->maxcount + 1 + st->maxcount/2; sz = st->maxcount + 1 + st->maxcount/2;
p = msi_realloc_zero( st->strings, sz*sizeof(msistring) ); p = msi_realloc_zero( st->strings, sz * sizeof(struct msistring) );
if( !p ) if( !p )
return -1; return -1;
......
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