[PATCH 1/6] shell32: Pass the object instead of the iface to an internal helper.

Michael Stefaniuc mstefani at redhat.de
Fri Jan 27 07:17:46 CST 2012


---
 dlls/shell32/folders.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index 6f49a3d..0143315 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -161,10 +161,9 @@ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface)
 	return refCount;
 }
 
-static HRESULT getIconLocationForFolder(IExtractIconW *iface, UINT uFlags,
- LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags)
+static HRESULT getIconLocationForFolder(IExtractIconWImpl *This, UINT uFlags, LPWSTR szIconFile,
+        UINT cchMax, int *piIndex, UINT *pwFlags)
 {
-    IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
     int icon_idx;
     WCHAR wszPath[MAX_PATH];
     WCHAR wszCLSIDValue[CHARS_IN_GUID];
@@ -318,8 +317,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(
 	}
 	else if (_ILIsFolder (pSimplePidl))
 	{
-            getIconLocationForFolder(iface, uFlags, szIconFile, cchMax, piIndex,
-                                     pwFlags);
+            getIconLocationForFolder(This, uFlags, szIconFile, cchMax, piIndex, pwFlags);
 	}
 	else
 	{
-- 
1.7.4.4



More information about the wine-patches mailing list