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

shell32/shlview: Remove redundant message sent on every iteration, fix a helper interface leak.

This commit is contained in:
Nikolay Sivov 2010-04-27 01:17:47 +04:00 committed by Alexandre Julliard
parent 7ea711964b
commit fc59d0b2f8
1 changed files with 65 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dlls/shell32/shlview.c
View File

@ -1517,24 +1517,16 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
case LVN_KEYDOWN: case LVN_KEYDOWN:
{ {
/* MSG msg;
msg.hwnd = This->hWnd;
msg.message = WM_KEYDOWN;
msg.wParam = plvKeyDown->wVKey;
msg.lParam = 0;
msg.time = 0;
msg.pt = 0;*/
LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh; LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh;
/* initiate a rename of the selected file or directory */ /* initiate a rename of the selected file or directory */
if(plvKeyDown->wVKey == VK_F2) switch (plvKeyDown->wVKey)
{ {
/* see how many files are selected */ case VK_F2:
int i = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0); {
INT i = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0);
/* get selected item */ if (i == 1)
if(i == 1)
{ {
/* get selected item */ /* get selected item */
i = SendMessageW(This->hWndList, LVM_GETNEXTITEM, -1, MAKELPARAM (LVNI_SELECTED, 0)); i = SendMessageW(This->hWndList, LVM_GETNEXTITEM, -1, MAKELPARAM (LVNI_SELECTED, 0));
@ -1543,41 +1535,40 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0);
} }
} }
#if 0 break;
TranslateAccelerator(This->hWnd, This->hAccel, &msg) case VK_DELETE:
#endif
else if(plvKeyDown->wVKey == VK_DELETE)
{ {
UINT i; UINT i, count;
int item_index; int item_index;
LVITEMA item; LVITEMW item;
LPITEMIDLIST* pItems; LPITEMIDLIST* pItems;
ISFHelper *psfhlp; ISFHelper *psfhlp;
HRESULT hr;
IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, hr = IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (void**)&psfhlp);
(LPVOID*)&psfhlp); if (hr != S_OK) return 0;
if (psfhlp == NULL) if(!(count = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0)))
break; {
ISFHelper_Release(psfhlp);
if(!(i = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0))) return 0;
break; }
/* allocate memory for the pidl array */ /* allocate memory for the pidl array */
pItems = HeapAlloc(GetProcessHeap(), 0, pItems = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST) * count);
sizeof(LPITEMIDLIST) * i);
/* retrieve all selected items */ /* retrieve all selected items */
i = 0; i = 0;
item_index = -1; item_index = -1;
while(SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0) > i)
while (count > i)
{ {
/* get selected item */ /* get selected item */
item_index = SendMessageW(This->hWndList, LVM_GETNEXTITEM, item_index, item_index = SendMessageW(This->hWndList, LVM_GETNEXTITEM, item_index,
MAKELPARAM (LVNI_SELECTED, 0)); MAKELPARAM (LVNI_SELECTED, 0));
item.iItem = item_index; item.iItem = item_index;
item.mask = LVIF_PARAM; item.mask = LVIF_PARAM;
SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &item); SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM)&item);
/* get item pidl */ /* get item pidl */
pItems[i] = (LPITEMIDLIST)item.lParam; pItems[i] = (LPITEMIDLIST)item.lParam;
@ -1587,18 +1578,19 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
/* perform the item deletion */ /* perform the item deletion */
ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST*)pItems); ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST*)pItems);
ISFHelper_Release(psfhlp);
/* free pidl array memory */ /* free pidl array memory */
HeapFree(GetProcessHeap(), 0, pItems); HeapFree(GetProcessHeap(), 0, pItems);
} }
break;
case VK_F5:
/* Initiate a refresh */ /* Initiate a refresh */
else if(plvKeyDown->wVKey == VK_F5)
{
IShellView_Refresh((IShellView*)This); IShellView_Refresh((IShellView*)This);
} break;
else if(plvKeyDown->wVKey == VK_BACK) case VK_BACK:
{ {
LPSHELLBROWSER lpSb; LPSHELLBROWSER lpSb;
if((lpSb = (LPSHELLBROWSER)SendMessageW(This->hWndParent, CWM_GETISHELLBROWSER, 0, 0))) if((lpSb = (LPSHELLBROWSER)SendMessageW(This->hWndParent, CWM_GETISHELLBROWSER, 0, 0)))
@ -1606,9 +1598,11 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
IShellBrowser_BrowseObject(lpSb, NULL, SBSP_PARENT); IShellBrowser_BrowseObject(lpSb, NULL, SBSP_PARENT);
} }
} }
break;
else default:
FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey); FIXME("LVN_KEYDOWN key=0x%08x\n", plvKeyDown->wVKey);
}
} }
break; break;