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

msi: Make msi_makestring static.

Browse Source
This commit is contained in:
Mike McCormack 2006-10-10 20:03:09 +09:00 committed by Alexandre Julliard
parent 891e016653
commit 175c407bfc
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/msi/msipriv.h
View File

@ -325,7 +325,6 @@ extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data,
extern UINT msi_id2stringW( string_table *st, UINT string_no, LPWSTR buffer, UINT *sz ); extern UINT msi_id2stringW( string_table *st, UINT string_no, LPWSTR buffer, UINT *sz );
extern UINT msi_id2stringA( string_table *st, UINT string_no, LPSTR buffer, UINT *sz ); extern UINT msi_id2stringA( string_table *st, UINT string_no, LPSTR buffer, UINT *sz );
extern LPWSTR MSI_makestring( MSIDATABASE *db, UINT stringid);
extern UINT msi_string2idW( string_table *st, LPCWSTR buffer, UINT *id ); extern UINT msi_string2idW( string_table *st, LPCWSTR buffer, UINT *id );
extern UINT msi_string2idA( string_table *st, LPCSTR str, UINT *id ); extern UINT msi_string2idA( string_table *st, LPCSTR str, UINT *id );
extern string_table *msi_init_stringtable( int entries, UINT codepage ); extern string_table *msi_init_stringtable( int entries, UINT codepage );

6
dlls/msi/table.c
View File

@ -917,7 +917,7 @@ static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count )
} }
} }
LPWSTR MSI_makestring( MSIDATABASE *db, UINT stringid) static LPWSTR msi_makestring( MSIDATABASE *db, UINT stringid)
{ {
return strdupW(msi_string_lookup_id( db->strings, stringid )); return strdupW(msi_string_lookup_id( db->strings, stringid ));
} }
@ -958,9 +958,9 @@ static UINT get_tablecolumns( MSIDATABASE *db,
if( colinfo ) if( colinfo )
{ {
UINT id = table->data[ i ] [ 2 ]; UINT id = table->data[ i ] [ 2 ];
colinfo[n].tablename = MSI_makestring( db, table_id ); colinfo[n].tablename = msi_makestring( db, table_id );
colinfo[n].number = table->data[ i ][ 1 ] - (1<<15); colinfo[n].number = table->data[ i ][ 1 ] - (1<<15);
colinfo[n].colname = MSI_makestring( db, id ); colinfo[n].colname = msi_makestring( db, id );
colinfo[n].type = table->data[ i ] [ 3 ] ^ 0x8000; colinfo[n].type = table->data[ i ] [ 3 ] ^ 0x8000;
colinfo[n].hash_table = NULL; colinfo[n].hash_table = NULL;
/* this assumes that columns are in order in the table */ /* this assumes that columns are in order in the table */