Commit 5cb10c96 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

msi: Don't skip the media check for the first volume.

Some installers require the first volume to be reinserted.
parent e94d2e04
...@@ -298,9 +298,6 @@ static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) ...@@ -298,9 +298,6 @@ static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi)
mi->cabinet = strdupW(MSI_RecordGetString(row, 4)); mi->cabinet = strdupW(MSI_RecordGetString(row, 4));
mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); mi->volume_label = strdupW(MSI_RecordGetString(row, 5));
if (!mi->first_volume)
mi->first_volume = strdupW(mi->volume_label);
msiobj_release(&row->hdr); msiobj_release(&row->hdr);
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
...@@ -673,7 +670,6 @@ void msi_free_media_info(MSIMEDIAINFO *mi) ...@@ -673,7 +670,6 @@ void msi_free_media_info(MSIMEDIAINFO *mi)
msi_free(mi->disk_prompt); msi_free(mi->disk_prompt);
msi_free(mi->cabinet); msi_free(mi->cabinet);
msi_free(mi->volume_label); msi_free(mi->volume_label);
msi_free(mi->first_volume);
msi_free(mi); msi_free(mi);
} }
...@@ -719,9 +715,6 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) ...@@ -719,9 +715,6 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi)
mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); mi->volume_label = strdupW(MSI_RecordGetString(row, 5));
msiobj_release(&row->hdr); msiobj_release(&row->hdr);
if (!mi->first_volume)
mi->first_volume = strdupW(mi->volume_label);
msi_set_sourcedir_props(package, FALSE); msi_set_sourcedir_props(package, FALSE);
source_dir = msi_dup_property(package->db, szSourceDir); source_dir = msi_dup_property(package->db, szSourceDir);
lstrcpyW(mi->sourcedir, source_dir); lstrcpyW(mi->sourcedir, source_dir);
...@@ -891,7 +884,7 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) ...@@ -891,7 +884,7 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi )
} }
} }
/* check volume matches, change media if not */ /* check volume matches, change media if not */
if (mi->volume_label && mi->disk_id > 1 && strcmpW( mi->first_volume, mi->volume_label )) if (mi->volume_label && mi->disk_id > 1)
{ {
WCHAR *source = msi_dup_property( package->db, szSourceDir ); WCHAR *source = msi_dup_property( package->db, szSourceDir );
BOOL match = source_matches_volume( mi, source ); BOOL match = source_matches_volume( mi, source );
......
...@@ -154,7 +154,6 @@ typedef struct tagMSIMEDIAINFO ...@@ -154,7 +154,6 @@ typedef struct tagMSIMEDIAINFO
UINT last_sequence; UINT last_sequence;
LPWSTR disk_prompt; LPWSTR disk_prompt;
LPWSTR cabinet; LPWSTR cabinet;
LPWSTR first_volume;
LPWSTR volume_label; LPWSTR volume_label;
BOOL is_continuous; BOOL is_continuous;
BOOL is_extracted; BOOL is_extracted;
......
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