From f69d7bf0f33b3ef75d81df718c4010dc8a1943c9 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Tue, 10 Jan 2006 12:10:19 +0100
Subject: [PATCH] msi: Count the number of columns requested and allocate that
 many, as columns may be select more than once in from a table.

---
 dlls/msi/select.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/select.c b/dlls/msi/select.c
index 9bc2b964d37..7c792601cd4 100644
--- a/dlls/msi/select.c
+++ b/dlls/msi/select.c
@@ -245,20 +245,23 @@ static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name )
     return ERROR_SUCCESS;
 }
 
+int select_count_columns( column_info *col )
+{
+    int n;
+    for (n = 0; col; col = col->next)
+        n++;
+    return n;
+}
+
 UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table,
                         column_info *columns )
 {
     MSISELECTVIEW *sv = NULL;
-    UINT count = 0, r;
+    UINT count = 0, r = ERROR_SUCCESS;
 
     TRACE("%p\n", sv );
 
-    r = table->ops->get_dimensions( table, NULL, &count );
-    if( r != ERROR_SUCCESS )
-    {
-        ERR("can't get table dimensions\n");
-        return r;
-    }
+    count = select_count_columns( columns );
 
     sv = msi_alloc_zero( sizeof *sv + count*sizeof (UINT) );
     if( !sv )