Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 09:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dmitry Timoshkov <dmitry@codeweavers.com>

Browse source 
- Switch to using 'long' for INT_PTR type for 64-bit compatibility.
Andrew Talbot <Andrew.Talbot@talbotville.com>
- Exclude unused headers.
Hans Leidekker <hans@it.vu.nl>
- Win64 printf format warning fixes.
James Hawkins <truiken@gmail.com>
- Remove redundant NULL checks before SHFree.
Jonathan Ernst <jonathan@ernstfamily.ch>
- Update the address of the Free Software Foundation.
------------------------
- readd ReactOS changes (the properties menu item was removed, readd it + code to show properties dialogs)

svn path=/trunk/; revision=29499
This commit is contained in:
Johannes Anderwald 2007-10-11 10:48:31 +00:00
parent 3e278e062e
commit 12be971541
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/dll/win32/shell32/shv_item_cmenu.c
View file

@ -15,7 +15,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <string.h> #include <string.h>
@ -30,7 +30,6 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "pidl.h" #include "pidl.h"
#include "shlguid.h"
#include "undocshell.h" #include "undocshell.h"
#include "shlobj.h" #include "shlobj.h"
@ -39,9 +38,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* ugly hack for cut&psate files */
BOOL fileMoving = FALSE;
/************************************************************************** /**************************************************************************
* IContextMenu Implementation * IContextMenu Implementation
*/ */
@ -147,7 +143,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface)
ItemCmImpl *This = (ItemCmImpl *)iface; ItemCmImpl *This = (ItemCmImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
@ -160,7 +156,7 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface)
ItemCmImpl *This = (ItemCmImpl *)iface; ItemCmImpl *This = (ItemCmImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%li)\n", This, refCount + 1); TRACE("(%p)->(count=%i)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -169,8 +165,7 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface)
if(This->pSFParent) if(This->pSFParent)
IShellFolder_Release(This->pSFParent); IShellFolder_Release(This->pSFParent);
if(This->pidl) SHFree(This->pidl);
SHFree(This->pidl);
/*make sure the pidl is freed*/ /*make sure the pidl is freed*/
_ILFreeaPidl(This->apidl, This->cidl); _ILFreeaPidl(This->apidl, This->cidl);
@ -257,14 +252,11 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu(
_InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, "&Delete", MFS_ENABLED); _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, "&Delete", MFS_ENABLED);
if(uFlags & CMF_CANRENAME) if(uFlags & CMF_CANRENAME)
{
_InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, "&Rename", ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, "&Rename", ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED);
}
_InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0);
_InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED);
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (FCIDM_SHVIEWLAST)); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (FCIDM_SHVIEWLAST));
} }
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0);
@ -376,8 +368,6 @@ static BOOL DoCopyOrCut(
LPSHELLVIEW lpSV; LPSHELLVIEW lpSV;
LPDATAOBJECT lpDo; LPDATAOBJECT lpDo;
fileMoving = bCut;
TRACE("(%p)->(wnd=%p,bCut=0x%08x)\n",This, hwnd, bCut); TRACE("(%p)->(wnd=%p,bCut=0x%08x)\n",This, hwnd, bCut);
/* get the active IShellView */ /* get the active IShellView */
@ -525,7 +515,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString(
HRESULT hr = E_INVALIDARG; HRESULT hr = E_INVALIDARG;
TRACE("(%p)->(idcom=%x 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);
switch(uFlags) switch(uFlags)
{ {
@ -578,7 +568,7 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg(
{ {
ItemCmImpl *This = (ItemCmImpl *)iface; ItemCmImpl *This = (ItemCmImpl *)iface;
TRACE("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam); TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam);
return E_NOTIMPL; return E_NOTIMPL;
} }