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

msi: Model the media_info structure members after the columns in the media table.

This commit is contained in:
James Hawkins 2006-11-07 15:10:52 -08:00 committed by Alexandre Julliard
parent 842ffc3545
commit de3b84df09
1 changed files with 42 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
dlls/msi/files.c
View File

@ -58,10 +58,12 @@ extern const WCHAR szRemoveFiles[];
static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0}; static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0};
struct media_info { struct media_info {
UINT disk_id;
UINT last_sequence; UINT last_sequence;
LPWSTR last_volume; LPWSTR disk_prompt;
LPWSTR last_path; LPWSTR cabinet;
DWORD count; LPWSTR volume_label;
BOOL is_continuous;
WCHAR source[MAX_PATH]; WCHAR source[MAX_PATH];
}; };
@ -112,7 +114,7 @@ end:
typedef struct typedef struct
{ {
MSIPACKAGE* package; MSIPACKAGE* package;
LPCSTR cab_path; struct media_info *mi;
} CabData; } CabData;
static void * cabinet_alloc(ULONG cb) static void * cabinet_alloc(ULONG cb)
@ -282,53 +284,43 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
*/ */
static BOOL extract_cabinet_file(MSIPACKAGE* package, struct media_info *mi) static BOOL extract_cabinet_file(MSIPACKAGE* package, struct media_info *mi)
{ {
LPSTR cabinet, cab_path = NULL;
LPWSTR ptr;
HFDI hfdi; HFDI hfdi;
ERF erf; ERF erf;
BOOL ret; BOOL ret = FALSE;
char *cabinet;
char *cab_path;
static CHAR empty[] = "";
CabData data; CabData data;
TRACE("Extracting %s to %s\n",debugstr_w(mi->source), debugstr_w(mi->last_path)); TRACE("Extracting %s\n", debugstr_w(mi->source));
hfdi = FDICreate(cabinet_alloc, hfdi = FDICreate(cabinet_alloc, cabinet_free, cabinet_open, cabinet_read,
cabinet_free, cabinet_write, cabinet_close, cabinet_seek, 0, &erf);
cabinet_open,
cabinet_read,
cabinet_write,
cabinet_close,
cabinet_seek,
0,
&erf);
if (!hfdi) if (!hfdi)
{ {
ERR("FDICreate failed\n"); ERR("FDICreate failed\n");
return FALSE; return FALSE;
} }
if (!(cabinet = strdupWtoA( mi->source ))) ptr = strrchrW(mi->source, '\\') + 1;
{ cabinet = strdupWtoA(ptr);
FDIDestroy(hfdi); if (!cabinet)
return FALSE; goto done;
}
if (!(cab_path = strdupWtoA( mi->last_path ))) cab_path = strdupWtoA(mi->source);
{ if (!cab_path)
FDIDestroy(hfdi); goto done;
msi_free(cabinet);
return FALSE; cab_path[ptr - mi->source] = '\0';
}
data.package = package; data.package = package;
data.cab_path = cab_path; data.mi = mi;
ret = FDICopy(hfdi, cabinet, empty, 0, cabinet_notify, NULL, &data);
ret = FDICopy(hfdi, cabinet, cab_path, 0, cabinet_notify, NULL, &data);
if (!ret) if (!ret)
ERR("FDICopy failed\n"); ERR("FDICopy failed\n");
done:
FDIDestroy(hfdi); FDIDestroy(hfdi);
msi_free(cabinet); msi_free(cabinet);
msi_free(cab_path); msi_free(cab_path);
@ -356,7 +348,9 @@ static VOID set_file_source(MSIPACKAGE* package, MSIFILE* file, LPCWSTR path)
static void free_media_info( struct media_info *mi ) static void free_media_info( struct media_info *mi )
{ {
msi_free( mi->last_path ); msi_free( mi->disk_prompt );
msi_free( mi->cabinet );
msi_free( mi->volume_label );
msi_free( mi ); msi_free( mi );
} }
@ -441,19 +435,18 @@ static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi,
' ','%', 'i',' ','O','R','D','E','R',' ','B','Y',' ', ' ','%', 'i',' ','O','R','D','E','R',' ','B','Y',' ',
'`','D','i','s','k','I','d','`',0}; '`','D','i','s','k','I','d','`',0};
LPCWSTR cab, volume; LPCWSTR cab, volume;
LPWSTR source_dir;
DWORD sz; DWORD sz;
INT seq; INT seq;
LPCWSTR prompt; LPCWSTR prompt;
MSICOMPONENT *comp = file->Component;
if (file->Sequence <= mi->last_sequence) if (file->Sequence <= mi->last_sequence)
{ {
set_file_source(package, file, mi->last_path); set_file_source(package, file, mi->source);
TRACE("Media already ready (%u, %u)\n",file->Sequence,mi->last_sequence); TRACE("Media already ready (%u, %u)\n",file->Sequence,mi->last_sequence);
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
mi->count ++;
row = MSI_QueryGetRecord(package->db, ExecSeqQuery, file->Sequence); row = MSI_QueryGetRecord(package->db, ExecSeqQuery, file->Sequence);
if (!row) if (!row)
{ {
@ -464,22 +457,21 @@ static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi,
volume = MSI_RecordGetString(row, 5); volume = MSI_RecordGetString(row, 5);
prompt = MSI_RecordGetString(row, 3); prompt = MSI_RecordGetString(row, 3);
msi_free(mi->last_path); source_dir = msi_dup_property(package, cszSourceDir);
mi->last_path = NULL;
if (!file->IsCompressed) if (!file->IsCompressed)
{ {
mi->last_path = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); lstrcpyW(mi->source, source_dir);
set_file_source(package, file, mi->last_path); set_file_source(package, file, mi->source);
MsiSourceListAddMediaDiskW(package->ProductCode, NULL, MsiSourceListAddMediaDiskW(package->ProductCode, NULL,
MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, volume, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, volume,
prompt); prompt);
MsiSourceListSetInfoW(package->ProductCode, NULL, MsiSourceListSetInfoW(package->ProductCode, NULL,
MSIINSTALLCONTEXT_USERMANAGED, MSIINSTALLCONTEXT_USERMANAGED,
MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA,
INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source);
msiobj_release(&row->hdr); msiobj_release(&row->hdr);
return rc; return rc;
} }
@ -494,21 +486,16 @@ static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi,
/* the stream does not contain the # character */ /* the stream does not contain the # character */
if (cab[0]=='#') if (cab[0]=='#')
{ {
LPWSTR path, p; LPWSTR path;
rc = writeout_cabinet_stream(package,&cab[1],mi->source); rc = writeout_cabinet_stream(package,&cab[1],mi->source);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
return rc; return rc;
mi->last_path = strdupW(mi->source);
p = strrchrW(mi->last_path,'\\');
if (p)
p[1] = 0;
path = msi_dup_property( package, cszSourceDir ); path = msi_dup_property( package, cszSourceDir );
MsiSourceListAddMediaDiskW(package->ProductCode, NULL, MsiSourceListAddMediaDiskW(package->ProductCode, NULL,
MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id,
volume, prompt); volume, prompt);
MsiSourceListSetInfoW(package->ProductCode, NULL, MsiSourceListSetInfoW(package->ProductCode, NULL,
@ -521,7 +508,6 @@ static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi,
else else
{ {
sz = MAX_PATH; sz = MAX_PATH;
mi->last_path = msi_alloc(MAX_PATH*sizeof(WCHAR));
if (MSI_GetPropertyW(package, cszSourceDir, mi->source, &sz)) if (MSI_GetPropertyW(package, cszSourceDir, mi->source, &sz))
{ {
ERR("No Source dir defined\n"); ERR("No Source dir defined\n");
@ -529,7 +515,6 @@ static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi,
} }
else else
{ {
strcpyW(mi->last_path,mi->source);
strcatW(mi->source,cab); strcatW(mi->source,cab);
if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES)
@ -541,13 +526,7 @@ static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi,
MsiSourceListSetInfoW(package->ProductCode, NULL, MsiSourceListSetInfoW(package->ProductCode, NULL,
MSIINSTALLCONTEXT_USERMANAGED, MSIINSTALLCONTEXT_USERMANAGED,
MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA,
INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source);
/* extract the cab file into a folder in the temp folder */
sz = MAX_PATH;
if (MSI_GetPropertyW(package, cszTempFolder,mi->last_path, &sz)
!= ERROR_SUCCESS)
GetTempPathW(MAX_PATH,mi->last_path);
} }
} }
@ -565,22 +544,21 @@ static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi,
else else
{ {
sz = MAX_PATH; sz = MAX_PATH;
mi->last_path = msi_alloc(MAX_PATH*sizeof(WCHAR));
MSI_GetPropertyW(package,cszSourceDir,mi->source,&sz); MSI_GetPropertyW(package,cszSourceDir,mi->source,&sz);
strcpyW(mi->last_path,mi->source);
MsiSourceListSetInfoW(package->ProductCode, NULL, MsiSourceListSetInfoW(package->ProductCode, NULL,
MSIINSTALLCONTEXT_USERMANAGED, MSIINSTALLCONTEXT_USERMANAGED,
MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA,
INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source);
} }
set_file_source(package, file, mi->last_path); set_file_source(package, file, mi->source);
MsiSourceListAddMediaDiskW(package->ProductCode, NULL, MsiSourceListAddMediaDiskW(package->ProductCode, NULL,
MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, volume, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, volume,
prompt); prompt);
done: done:
msi_free(source_dir);
msiobj_release(&row->hdr); msiobj_release(&row->hdr);
return rc; return rc;