Michael Stefaniuc : shell32: Pass objects instead of ifaces to helpers.

Alexandre Julliard julliard at winehq.org
Wed Aug 31 13:19:23 CDT 2011


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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Wed Aug 31 14:14:10 2011 +0200

shell32: Pass objects instead of ifaces to helpers.

---

 dlls/shell32/shv_bg_cmenu.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index 5b1b434..bd99d3a 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -189,10 +189,9 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu(
 * DoNewFolder
 */
 static void DoNewFolder(
-	IContextMenu2 *iface,
+        BgCmImpl *This,
 	IShellView *psv)
 {
-	BgCmImpl *This = (BgCmImpl *)iface;
 	ISFHelper * psfhlp;
 	WCHAR wszName[MAX_PATH];
 
@@ -220,9 +219,8 @@ static void DoNewFolder(
 * DoPaste
 */
 static BOOL DoPaste(
-	IContextMenu2 *iface)
+        BgCmImpl *This)
 {
-	BgCmImpl *This = (BgCmImpl *)iface;
 	BOOL bSuccess = FALSE;
 	IDataObject * pda;
 
@@ -343,7 +341,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
 
 	    if (! strcmp(lpcmi->lpVerb,CMDSTR_NEWFOLDERA))
 	    {
-                DoNewFolder(iface, lpSV);
+                DoNewFolder(This, lpSV);
 	    }
 	    else if (! strcmp(lpcmi->lpVerb,CMDSTR_VIEWLISTA))
 	    {
@@ -367,11 +365,11 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
 	        break;
 
 	      case FCIDM_SHVIEW_NEWFOLDER:
-	        DoNewFolder(iface, lpSV);
+                DoNewFolder(This, lpSV);
 		break;
 
 	      case FCIDM_SHVIEW_INSERT:
-	        DoPaste(iface);
+                DoPaste(This);
 	        break;
 
 	      case FCIDM_SHVIEW_PROPERTIES:




More information about the wine-cvs mailing list