ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: COM cleanup in shv_bg_cmenu.c.

This commit is contained in:
Michael Stefaniuc 2011-08-31 14:15:45 +02:00 committed by Alexandre Julliard
parent 2cf8335d70
commit 47a705965b
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/shell32/shv_bg_cmenu.c
View File

@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
*/ */
typedef struct typedef struct
{ {
const IContextMenu2Vtbl *lpVtbl; IContextMenu2 IContextMenu2_iface;
IShellFolder* pSFParent; IShellFolder* pSFParent;
LONG ref; LONG ref;
BOOL bDesktop; BOOL bDesktop;
@ -52,6 +52,11 @@ typedef struct
static const IContextMenu2Vtbl cmvt; static const IContextMenu2Vtbl cmvt;
static inline BgCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface)
{
return CONTAINING_RECORD(iface, BgCmImpl, IContextMenu2_iface);
}
/************************************************************************** /**************************************************************************
* ISVBgCm_Constructor() * ISVBgCm_Constructor()
*/ */
@ -60,14 +65,14 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder* pSFParent, BOOL bDesktop)
BgCmImpl* cm; BgCmImpl* cm;
cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(BgCmImpl)); cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(BgCmImpl));
cm->lpVtbl = &cmvt; cm->IContextMenu2_iface.lpVtbl = &cmvt;
cm->ref = 1; cm->ref = 1;
cm->pSFParent = pSFParent; cm->pSFParent = pSFParent;
cm->bDesktop = bDesktop; cm->bDesktop = bDesktop;
if(pSFParent) IShellFolder_AddRef(pSFParent); if(pSFParent) IShellFolder_AddRef(pSFParent);
TRACE("(%p)->()\n",cm); TRACE("(%p)->()\n",cm);
return (IContextMenu2*)cm; return &cm->IContextMenu2_iface;
} }
/************************************************************************** /**************************************************************************
@ -75,7 +80,7 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder* pSFParent, BOOL bDesktop)
*/ */
static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj)
{ {
BgCmImpl *This = (BgCmImpl *)iface; BgCmImpl *This = impl_from_IContextMenu2(iface);
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
@ -107,7 +112,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid
*/ */
static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface) static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface)
{ {
BgCmImpl *This = (BgCmImpl *)iface; BgCmImpl *This = impl_from_IContextMenu2(iface);
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%u)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
@ -120,7 +125,7 @@ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface)
*/ */
static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface) static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface)
{ {
BgCmImpl *This = (BgCmImpl *)iface; BgCmImpl *This = impl_from_IContextMenu2(iface);
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%i)\n", This, refCount + 1); TRACE("(%p)->(count=%i)\n", This, refCount + 1);
@ -149,12 +154,11 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu(
UINT idCmdLast, UINT idCmdLast,
UINT uFlags) UINT uFlags)
{ {
HMENU hMyMenu; BgCmImpl *This = impl_from_IContextMenu2(iface);
UINT idMax; HMENU hMyMenu;
UINT idMax;
HRESULT hr; HRESULT hr;
BgCmImpl *This = (BgCmImpl *)iface;
TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",
This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
@ -318,9 +322,8 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
IContextMenu2 *iface, IContextMenu2 *iface,
LPCMINVOKECOMMANDINFO lpcmi) LPCMINVOKECOMMANDINFO lpcmi)
{ {
BgCmImpl *This = (BgCmImpl *)iface; BgCmImpl *This = impl_from_IContextMenu2(iface);
LPSHELLBROWSER lpSB;
LPSHELLBROWSER lpSB;
LPSHELLVIEW lpSV = NULL; LPSHELLVIEW lpSV = NULL;
HWND hWndSV = 0; HWND hWndSV = 0;
@ -405,7 +408,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString(
LPSTR lpszName, LPSTR lpszName,
UINT uMaxNameLen) UINT uMaxNameLen)
{ {
BgCmImpl *This = (BgCmImpl *)iface; BgCmImpl *This = impl_from_IContextMenu2(iface);
TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
@ -437,7 +440,7 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg(
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
BgCmImpl *This = (BgCmImpl *)iface; BgCmImpl *This = impl_from_IContextMenu2(iface);
FIXME("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); FIXME("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam);