Michael Stefaniuc : shell32: Avoid the forward declaration of the IEnumIDList vtbl.

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Mon Oct 10 00:55:51 2011 +0200

shell32: Avoid the forward declaration of the IEnumIDList vtbl.

---

 dlls/shell32/enumidlist.c |   42 +++++++++++++++++-------------------------
 1 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index 02868db..f04ddd5 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -53,8 +53,6 @@ typedef struct
 
 } IEnumIDListImpl;
 
-static const IEnumIDListVtbl eidlvt;
-
 /**************************************************************************
  *  AddToEnumList()
  */
@@ -186,29 +184,6 @@ static inline IEnumIDListImpl *impl_from_IEnumIDList(IEnumIDList *iface)
 }
 
 /**************************************************************************
- *  IEnumIDList_Folder_Constructor
- *
- */
-
-IEnumIDList * IEnumIDList_Constructor(void)
-{
-    IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(),
-     HEAP_ZERO_MEMORY, sizeof(IEnumIDListImpl));
-
-    if (lpeidl)
-    {
-        lpeidl->ref = 1;
-        lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt;
-    }
-    else
-        return NULL;
-
-    TRACE("-- (%p)->()\n",lpeidl);
-
-    return &lpeidl->IEnumIDList_iface;
-}
-
-/**************************************************************************
  *  IEnumIDList::QueryInterface
  */
 static HRESULT WINAPI IEnumIDList_fnQueryInterface(IEnumIDList *iface, REFIID riid, void **ppvObj)
@@ -365,3 +340,20 @@ static const IEnumIDListVtbl eidlvt =
 	IEnumIDList_fnReset,
 	IEnumIDList_fnClone,
 };
+
+IEnumIDList *IEnumIDList_Constructor(void)
+{
+    IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lpeidl));
+
+    if (lpeidl)
+    {
+        lpeidl->ref = 1;
+        lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt;
+    }
+    else
+        return NULL;
+
+    TRACE("-- (%p)->()\n",lpeidl);
+
+    return &lpeidl->IEnumIDList_iface;
+}