system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

shell32: Pass object pointers instead of ifaces to internal helpers.

Browse source
This commit is contained in:
Michael Stefaniuc 2011-06-05 23:45:04 +02:00 committed by Alexandre Julliard
parent ef4d631b19
commit d06bf13a6d
1 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
dlls/shell32/shv_item_cmenu.c
View file

@ -267,13 +267,8 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu(
* for folders only * for folders only
*/ */
static void DoOpenExplore( static void DoOpenExplore(ItemCmImpl *This, HWND hwnd, LPCSTR verb)
IContextMenu2 *iface,
HWND hwnd,
LPCSTR verb)
{ {
ItemCmImpl *This = (ItemCmImpl *)iface;
UINT i, bFolderFound = FALSE; UINT i, bFolderFound = FALSE;
LPITEMIDLIST pidlFQ; LPITEMIDLIST pidlFQ;
SHELLEXECUTEINFOA sei; SHELLEXECUTEINFOA sei;
@ -309,12 +304,8 @@ static void DoOpenExplore(
/************************************************************************** /**************************************************************************
* DoRename * DoRename
*/ */
static void DoRename( static void DoRename(ItemCmImpl *This, HWND hwnd)
IContextMenu2 *iface,
HWND hwnd)
{ {
ItemCmImpl *This = (ItemCmImpl *)iface;
LPSHELLBROWSER lpSB; LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV; LPSHELLVIEW lpSV;
@ -338,9 +329,8 @@ static void DoRename(
* *
* deletes the currently selected items * deletes the currently selected items
*/ */
static void DoDelete(IContextMenu2 *iface) static void DoDelete(ItemCmImpl *This)
{ {
ItemCmImpl *This = (ItemCmImpl *)iface;
ISFHelper * psfhlp; ISFHelper * psfhlp;
IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp);
@ -356,13 +346,8 @@ static void DoDelete(IContextMenu2 *iface)
* *
* copies the currently selected items into the clipboard * copies the currently selected items into the clipboard
*/ */
static BOOL DoCopyOrCut( static BOOL DoCopyOrCut(ItemCmImpl *This, HWND hwnd, BOOL bCut)
IContextMenu2 *iface,
HWND hwnd,
BOOL bCut)
{ {
ItemCmImpl *This = (ItemCmImpl *)iface;
LPSHELLBROWSER lpSB; LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV; LPSHELLVIEW lpSV;
LPDATAOBJECT lpDo; LPDATAOBJECT lpDo;
@ -402,9 +387,8 @@ static BOOL Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARAM lparam)
/************************************************************************** /**************************************************************************
* DoOpenProperties * DoOpenProperties
*/ */
static void DoOpenProperties(IContextMenu2 *iface, HWND hwnd) static void DoOpenProperties(ItemCmImpl *This, HWND hwnd)
{ {
ItemCmImpl *This = (ItemCmImpl *)iface;
static const UINT MAX_PROP_PAGES = 99; static const UINT MAX_PROP_PAGES = 99;
static const WCHAR wszFolder[] = {'F','o','l','d','e','r', 0}; static const WCHAR wszFolder[] = {'F','o','l','d','e','r', 0};
static const WCHAR wszFiletypeAll[] = {'*',0}; static const WCHAR wszFiletypeAll[] = {'*',0};
@ -534,31 +518,31 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand(
{ {
case FCIDM_SHVIEW_EXPLORE: case FCIDM_SHVIEW_EXPLORE:
TRACE("Verb FCIDM_SHVIEW_EXPLORE\n"); TRACE("Verb FCIDM_SHVIEW_EXPLORE\n");
DoOpenExplore(iface, lpcmi->hwnd, "explore"); DoOpenExplore(This, lpcmi->hwnd, "explore");
break; break;
case FCIDM_SHVIEW_OPEN: case FCIDM_SHVIEW_OPEN:
TRACE("Verb FCIDM_SHVIEW_OPEN\n"); TRACE("Verb FCIDM_SHVIEW_OPEN\n");
DoOpenExplore(iface, lpcmi->hwnd, "open"); DoOpenExplore(This, lpcmi->hwnd, "open");
break; break;
case FCIDM_SHVIEW_RENAME: case FCIDM_SHVIEW_RENAME:
TRACE("Verb FCIDM_SHVIEW_RENAME\n"); TRACE("Verb FCIDM_SHVIEW_RENAME\n");
DoRename(iface, lpcmi->hwnd); DoRename(This, lpcmi->hwnd);
break; break;
case FCIDM_SHVIEW_DELETE: case FCIDM_SHVIEW_DELETE:
TRACE("Verb FCIDM_SHVIEW_DELETE\n"); TRACE("Verb FCIDM_SHVIEW_DELETE\n");
DoDelete(iface); DoDelete(This);
break; break;
case FCIDM_SHVIEW_COPY: case FCIDM_SHVIEW_COPY:
TRACE("Verb FCIDM_SHVIEW_COPY\n"); TRACE("Verb FCIDM_SHVIEW_COPY\n");
DoCopyOrCut(iface, lpcmi->hwnd, FALSE); DoCopyOrCut(This, lpcmi->hwnd, FALSE);
break; break;
case FCIDM_SHVIEW_CUT: case FCIDM_SHVIEW_CUT:
TRACE("Verb FCIDM_SHVIEW_CUT\n"); TRACE("Verb FCIDM_SHVIEW_CUT\n");
DoCopyOrCut(iface, lpcmi->hwnd, TRUE); DoCopyOrCut(This, lpcmi->hwnd, TRUE);
break; break;
case FCIDM_SHVIEW_PROPERTIES: case FCIDM_SHVIEW_PROPERTIES:
TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n"); TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n");
DoOpenProperties(iface, lpcmi->hwnd); DoOpenProperties(This, lpcmi->hwnd);
break; break;
default: default:
FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb));
@ -569,9 +553,9 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand(
{ {
TRACE("Verb is %s\n",debugstr_a(lpcmi->lpVerb)); TRACE("Verb is %s\n",debugstr_a(lpcmi->lpVerb));
if (strcmp(lpcmi->lpVerb,"delete")==0) if (strcmp(lpcmi->lpVerb,"delete")==0)
DoDelete(iface); DoDelete(This);
else if (strcmp(lpcmi->lpVerb,"properties")==0) else if (strcmp(lpcmi->lpVerb,"properties")==0)
DoOpenProperties(iface, lpcmi->hwnd); DoOpenProperties(This, lpcmi->hwnd);
else { else {
FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb)); FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb));
return E_FAIL; return E_FAIL;