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

msi: Move msi_get_cabinet_stream() up and make it static.

This commit is contained in:
Francois Gouget 2011-04-18 11:19:31 +02:00 committed by Alexandre Julliard
parent d69dd163ba
commit d685bfa548
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/msi/media.c
View File

@ -117,6 +117,17 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi)
return r;
}
static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id )
{
MSICABINETSTREAM *cab;
LIST_FOR_EACH_ENTRY( cab, &package->cabinet_streams, MSICABINETSTREAM, entry )
{
if (cab->disk_id == disk_id) return cab;
}
return NULL;
}
static void * CDECL cabinet_alloc(ULONG cb)
{
return msi_alloc(cb);
@ -919,14 +930,3 @@ UINT msi_add_cabinet_stream( MSIPACKAGE *package, UINT disk_id, IStorage *storag
return ERROR_SUCCESS;
}
MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id )
{
MSICABINETSTREAM *cab;
LIST_FOR_EACH_ENTRY( cab, &package->cabinet_streams, MSICABINETSTREAM, entry )
{
if (cab->disk_id == disk_id) return cab;
}
return NULL;
}

1
dlls/msi/msipriv.h
View File

@ -1018,7 +1018,6 @@ extern UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, M
extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi);
extern void msi_free_media_info(MSIMEDIAINFO *mi);
extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data);
extern MSICABINETSTREAM *msi_get_cabinet_stream(MSIPACKAGE *, UINT);
extern UINT msi_add_cabinet_stream(MSIPACKAGE *, UINT, IStorage *, const WCHAR *);
/* control event stuff */