From 83693d9611659eca62ae260ba6f6309e310594a5 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Fri, 27 Jan 2012 14:42:22 +0100
Subject: [PATCH] shell32: Avoid an unsafe IExtractIconW to object cast.

---
 dlls/shell32/folders.c | 69 ++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index bab2b1cf9d5..b57fcf4c784 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -70,32 +70,7 @@ static inline IExtractIconWImpl *impl_from_IPersistFile(IPersistFile *iface)
     return CONTAINING_RECORD(iface, IExtractIconWImpl, IPersistFile_iface);
 }
 
-static const IExtractIconAVtbl eiavt;
-static const IExtractIconWVtbl eivt;
-static const IPersistFileVtbl pfvt;
 
-
-/**************************************************************************
-*  IExtractIconW_Constructor
-*/
-IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl)
-{
-	IExtractIconWImpl* ei;
-	
-	TRACE("%p\n", pidl);
-
-	ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl));
-	ei->ref=1;
-	ei->IExtractIconW_iface.lpVtbl = &eivt;
-	ei->IExtractIconA_iface.lpVtbl = &eiavt;
-	ei->IPersistFile_iface.lpVtbl = &pfvt;
-	ei->pidl=ILClone(pidl);
-
-	pdump(pidl);
-
-	TRACE("(%p)\n", ei);
-	return &ei->IExtractIconW_iface;
-}
 /**************************************************************************
  *  IExtractIconW::QueryInterface
  */
@@ -403,17 +378,6 @@ static const IExtractIconWVtbl eivt =
 	IExtractIconW_fnExtract
 };
 
-/**************************************************************************
-*  IExtractIconA_Constructor
-*/
-IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl)
-{
-	IExtractIconWImpl *This = (IExtractIconWImpl *)IExtractIconW_Constructor(pidl);
-	IExtractIconA *eia = &This->IExtractIconA_iface;
-	
-	TRACE("(%p)->(%p)\n", This, eia);
-	return eia;
-}
 /**************************************************************************
  *  IExtractIconA::QueryInterface
  */
@@ -564,3 +528,36 @@ static const IPersistFileVtbl pfvt =
 	(void *) 0xdeadbeef /* IEIPersistFile_fnSaveCompleted */,
 	(void *) 0xdeadbeef /* IEIPersistFile_fnGetCurFile */
 };
+
+IExtractIconWImpl *extracticon_create(LPCITEMIDLIST pidl)
+{
+    IExtractIconWImpl *ei;
+
+    TRACE("%p\n", pidl);
+
+    ei = HeapAlloc(GetProcessHeap(), 0, sizeof(*ei));
+    ei->ref=1;
+    ei->IExtractIconW_iface.lpVtbl = &eivt;
+    ei->IExtractIconA_iface.lpVtbl = &eiavt;
+    ei->IPersistFile_iface.lpVtbl = &pfvt;
+    ei->pidl=ILClone(pidl);
+
+    pdump(pidl);
+
+    TRACE("(%p)\n", ei);
+    return ei;
+}
+
+IExtractIconW *IExtractIconW_Constructor(LPCITEMIDLIST pidl)
+{
+    IExtractIconWImpl *ei = extracticon_create(pidl);
+
+    return &ei->IExtractIconW_iface;
+}
+
+IExtractIconA *IExtractIconA_Constructor(LPCITEMIDLIST pidl)
+{
+    IExtractIconWImpl *ei = extracticon_create(pidl);
+
+    return &ei->IExtractIconA_iface;
+}