Mike McCormack : msi: Clean up parameters of msi_media_get_disk_info().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ebf2733527b2f3c65a522e03ecef0923492bca2a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ebf2733527b2f3c65a522e03ec...

Author: Mike McCormack 
Date:   Mon Nov 20 16:15:40 2006 +0900

msi: Clean up parameters of msi_media_get_disk_info().

---

dlls/msi/files.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index f913c9b..00f2a01 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -243,9 +243,8 @@ static void msi_file_update_ui( MSIPACKA
     ui_progress( package, 2, f->FileSize, 0, 0);
 }

-static UINT msi_media_get_disk_info( CabData *data )
+static UINT msi_media_get_disk_info( MSIPACKAGE *package, struct media_info *mi )
 {
-    MSIPACKAGE *package = data->package;
     MSIRECORD *row;
     LPWSTR ptr;

@@ -254,18 +253,18 @@ static UINT msi_media_get_disk_info( Cab
          '`','M','e','d','i','a','`',' ','W','H','E','R','E',' ',
          '`','D','i','s','k','I','d','`',' ','=',' ','%','i',0};

-    row = MSI_QueryGetRecord(package->db, query, data->mi->disk_id);
+    row = MSI_QueryGetRecord(package->db, query, mi->disk_id);
     if (!row)
     {
         TRACE("Unable to query row\n");
         return ERROR_FUNCTION_FAILED;
     }

-    data->mi->disk_prompt = strdupW(MSI_RecordGetString(row, 3));
-    data->mi->cabinet = strdupW(MSI_RecordGetString(row, 4));
+    mi->disk_prompt = strdupW(MSI_RecordGetString(row, 3));
+    mi->cabinet = strdupW(MSI_RecordGetString(row, 4));

-    ptr = strrchrW(data->mi->source, '\') + 1;
-    lstrcpyW(ptr, data->mi->cabinet);
+    ptr = strrchrW(mi->source, '\') + 1;
+    lstrcpyW(ptr, mi->cabinet);
     msiobj_release(&row->hdr);

return ERROR_SUCCESS;
@@ -295,7 +294,7 @@ static INT_PTR cabinet_notify(FDINOTIFIC
         mi->disk_id++;
         mi->is_continuous = TRUE;

-        rc = msi_media_get_disk_info(data);
+        rc = msi_media_get_disk_info(data->package, mi);
         if (rc != ERROR_SUCCESS)
         {
             ERR("Failed to get next cabinet information: %d\n", rc);