Skip to content

W
wine-winehq
Commit f8dc7c22 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

msi: Use the last sequence number specified for patch media when updating media records.

parent cd73576e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
dlls/msi/msipriv.h
View file @ f8dc7c22
...@@ -193,7 +193,6 @@ typedef struct tagMSIPATCHINFO ...@@ -193,7 +193,6 @@ typedef struct tagMSIPATCHINFO
MSIPATCHSTATE state; MSIPATCHSTATE state;
BOOL delete_on_close; BOOL delete_on_close;
UINT disk_id; UINT disk_id;
UINT last_sequence;
} MSIPATCHINFO; } MSIPATCHINFO;
typedef struct tagMSIBINARY typedef struct tagMSIBINARY
......
dlls/msi/patch.c
View file @ f8dc7c22
...@@ -741,7 +741,7 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF ...@@ -741,7 +741,7 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF
disk_id = package->db->media_transform_disk_id; disk_id = package->db->media_transform_disk_id;
TRACE("disk id %u\n", disk_id); TRACE("disk id %u\n", disk_id);
TRACE("last sequence %u\n", patch->last_sequence); TRACE("last sequence %u\n", media->last_sequence);
TRACE("prompt %s\n", debugstr_w(media->prompt)); TRACE("prompt %s\n", debugstr_w(media->prompt));
TRACE("cabinet %s\n", debugstr_w(media->cabinet)); TRACE("cabinet %s\n", debugstr_w(media->cabinet));
TRACE("volume %s\n", debugstr_w(media->volume)); TRACE("volume %s\n", debugstr_w(media->volume));
...@@ -749,7 +749,7 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF ...@@ -749,7 +749,7 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF
rec = MSI_CreateRecord( 6 ); rec = MSI_CreateRecord( 6 );
MSI_RecordSetInteger( rec, 1, disk_id ); MSI_RecordSetInteger( rec, 1, disk_id );
MSI_RecordSetInteger( rec, 2, patch->last_sequence ); MSI_RecordSetInteger( rec, 2, media->last_sequence );
MSI_RecordSetStringW( rec, 3, media->prompt ); MSI_RecordSetStringW( rec, 3, media->prompt );
MSI_RecordSetStringW( rec, 4, media->cabinet ); MSI_RecordSetStringW( rec, 4, media->cabinet );
MSI_RecordSetStringW( rec, 5, media->volume ); MSI_RecordSetStringW( rec, 5, media->volume );
...@@ -828,7 +828,6 @@ static UINT patch_set_offsets( MSIDATABASE *db, MSIPATCHINFO *patch ) ...@@ -828,7 +828,6 @@ static UINT patch_set_offsets( MSIDATABASE *db, MSIPATCHINFO *patch )
if (r != ERROR_SUCCESS) if (r != ERROR_SUCCESS)
ERR("Failed to update Media table entry, expect breakage (%u)\n", r); ERR("Failed to update Media table entry, expect breakage (%u)\n", r);
patch->last_sequence = last_sequence;
db->media_transform_offset = last_sequence + 1; db->media_transform_offset = last_sequence + 1;
patch_offset_list_free( pos ); patch_offset_list_free( pos );
......
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