Hans Leidekker : wbemprox: Fill tables at latest possible moment.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Wed May 22 10:07:26 2013 +0200

wbemprox: Fill tables at latest possible moment.

---

 dlls/wbemprox/query.c |    4 +++-
 dlls/wbemprox/table.c |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c
index 1850368..8ac42cc 100644
--- a/dlls/wbemprox/query.c
+++ b/dlls/wbemprox/query.c
@@ -245,7 +245,9 @@ static HRESULT execute_view( struct view *view )
 {
     UINT i, j = 0, len;
 
-    if (!view->table || !view->table->num_rows) return S_OK;
+    if (!view->table) return S_OK;
+    if (view->table->fill && !view->table->data) view->table->fill( view->table );
+    if (!view->table->num_rows) return S_OK;
 
     len = min( view->table->num_rows, 16 );
     if (!(view->result = heap_alloc( len * sizeof(UINT) ))) return E_OUTOFMEMORY;
diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c
index c114e53..126dc0a 100644
--- a/dlls/wbemprox/table.c
+++ b/dlls/wbemprox/table.c
@@ -336,7 +336,6 @@ struct table *grab_table( const WCHAR *name )
     {
         if (!strcmpiW( table->name, name ))
         {
-            if (table->fill && !table->data) table->fill( table );
             TRACE("returning %p\n", table);
             return addref_table( table );
         }