Use MSI_IterateRecords for DuplicateFiles.

dlls/msi/files.c

@@ -562,46 +562,16 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
     return rc;
 }
 
-UINT ACTION_DuplicateFiles(MSIPACKAGE *package)
+static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param)
 {
-    UINT rc;
-    MSIQUERY * view;
-    MSIRECORD * row = 0;
-    static const WCHAR ExecSeqQuery[] =
-        {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',
-         '`','D','u','p','l','i','c','a','t','e','F','i','l','e','`',0};
-
-    if (!package)
-        return ERROR_INVALID_HANDLE;
-
-    rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view);
-    if (rc != ERROR_SUCCESS)
-        return ERROR_SUCCESS;
-
-    rc = MSI_ViewExecute(view, 0);
-    if (rc != ERROR_SUCCESS)
-    {
-        MSI_ViewClose(view);
-        msiobj_release(&view->hdr);
-        return rc;
-    }
-
-    while (1)
-    {
+    MSIPACKAGE *package = (MSIPACKAGE*)param;
     WCHAR *file_source = NULL;
     WCHAR dest_name[0x100];
     LPWSTR dest_path, dest;
     LPCWSTR file_key, component;
     INT component_index;
-
     DWORD sz;
-
-        rc = MSI_ViewFetch(view,&row);
-        if (rc != ERROR_SUCCESS)
-        {
-            rc = ERROR_SUCCESS;
-            break;
-        }
+    DWORD rc;
 
     component = MSI_RecordGetString(row,2);
     component_index = get_loaded_component(package,component);
@@ -616,8 +586,7 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package)
         package->components[component_index].Action =
             package->components[component_index].Installed;
 
-            msiobj_release(&row->hdr);
-            continue;
+        return ERROR_SUCCESS;
     }
 
     package->components[component_index].Action = INSTALLSTATE_LOCAL;
@@ -626,8 +595,7 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package)
     if (!file_key)
     {
         ERR("Unable to get file key\n");
-            msiobj_release(&row->hdr);
-            break;
+        return ERROR_FUNCTION_FAILED;
     }
 
     rc = get_file_target(package,file_key,&file_source);
@@ -635,9 +603,8 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package)
     if (rc != ERROR_SUCCESS)
     {
         ERR("Original file unknown %s\n",debugstr_w(file_key));
-            msiobj_release(&row->hdr);
         HeapFree(GetProcessHeap(),0,file_source);
-            continue;
+        return ERROR_SUCCESS;
     }
 
     if (MSI_RecordIsNull(row,4))
@@ -667,9 +634,8 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package)
         if (!dest_path)
         {
             ERR("Unable to get destination folder\n");
-                msiobj_release(&row->hdr);
             HeapFree(GetProcessHeap(),0,file_source);
-                break;
+            return ERROR_FUNCTION_FAILED;
         }
     }
 
@@ -688,12 +654,30 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package)
 
     FIXME("We should track these duplicate files as well\n");   
 
-        msiobj_release(&row->hdr);
     HeapFree(GetProcessHeap(),0,dest_path);
     HeapFree(GetProcessHeap(),0,dest);
     HeapFree(GetProcessHeap(),0,file_source);
-    }
-    MSI_ViewClose(view);
+
+    return ERROR_SUCCESS;
+}
+
+UINT ACTION_DuplicateFiles(MSIPACKAGE *package)
+{
+    UINT rc;
+    MSIQUERY * view;
+    static const WCHAR ExecSeqQuery[] =
+        {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',
+         '`','D','u','p','l','i','c','a','t','e','F','i','l','e','`',0};
+
+    if (!package)
+        return ERROR_INVALID_HANDLE;
+
+    rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view);
+    if (rc != ERROR_SUCCESS)
+        return ERROR_SUCCESS;
+
+    rc = MSI_IterateRecords(view, NULL, ITERATE_DuplicateFiles, package);
     msiobj_release(&view->hdr);
+
     return rc;
 }