Nikolay Sivov : shell32: Move SelectItem implementation to IFolderView and use it for IShellView:: SelectItem.

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Thu Mar  4 22:29:23 2010 +0300

shell32: Move SelectItem implementation to IFolderView and use it for IShellView::SelectItem.

---

dlls/shell32/shlview.c |   89 +++++++++++++++++++++++-------------------------
 1 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index 6d09771..8114546 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -1960,54 +1960,26 @@ static HRESULT WINAPI IShellView_fnSaveViewState(IShellView2 * iface)
 static HRESULT WINAPI IShellView_fnSelectItem(
    IShellView2 * iface,
    LPCITEMIDLIST pidl,
-	UINT uFlags)
+	UINT flags)
 {
-	IShellViewImpl *This = (IShellViewImpl *)iface;
-	int i;
-
-	TRACE("(%p)->(pidl=%p, 0x%08x) stub\n",This, pidl, uFlags);
-
-	i = LV_FindItemByPidl(This, pidl);
-
-	if (i != -1)
-	{
-	  LVITEMW lvItem;
-
-	  if(uFlags & SVSI_ENSUREVISIBLE)
-	    SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0);
-
-	  lvItem.mask = LVIF_STATE;
-	  lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
-	  lvItem.iItem = 0;
-	  lvItem.iSubItem = 0;
-
-          while(SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem))
-	  {
-	    if (lvItem.iItem == i)
-	    {
-	      if (uFlags & SVSI_SELECT)
-	        lvItem.state |= LVIS_SELECTED;
-	      else
-		lvItem.state &= ~LVIS_SELECTED;
+    IShellViewImpl *This = (IShellViewImpl *)iface;
+    IFolderView *view;
+    HRESULT hr;
+    int i;

-	      if(uFlags & SVSI_FOCUSED)
-	        lvItem.state &= ~LVIS_FOCUSED;
-	    }
-	    else
-	    {
-	      if (uFlags & SVSI_DESELECTOTHERS)
-	        lvItem.state &= ~LVIS_SELECTED;
-	    }
-	    SendMessageW(This->hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem);
-	    lvItem.iItem++;
-	  }
+    TRACE("(%p)->(pidl=%p, 0x%08x)\n",This, pidl, flags);

+    i = LV_FindItemByPidl(This, pidl);
+    if (i == -1) return S_OK;

-	  if(uFlags & SVSI_EDIT)
-	    SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0);
+    hr = IShellView2_QueryInterface(iface, &IID_IFolderView, (void**)&view);
+    if (hr == S_OK)
+    {
+        hr = IFolderView_SelectItem(view, i, flags);
+        IFolderView_Release(view);
+    }

-	}
-	return S_OK;
+    return hr;
 }

static HRESULT WINAPI IShellView_fnGetItemObject(IShellView2 * iface, UINT uItem, REFIID riid, LPVOID *ppvOut)
@@ -2783,9 +2755,34 @@ static HRESULT WINAPI IFView_GetAutoArrange(IFolderView *iface)

static HRESULT WINAPI IFView_SelectItem(IFolderView *iface, int item, DWORD flags)
 {
-	IShellViewImpl *This = impl_from_IFolderView(iface);
-	FIXME("(%p)->(%d, %x), stub\n", This, item, flags);
-	return E_NOTIMPL;
+    IShellViewImpl *This = impl_from_IFolderView(iface);
+    LVITEMW lvItem;
+
+    TRACE("(%p)->(%d, %x)\n", This, item, flags);
+
+    lvItem.state = 0;
+    lvItem.stateMask = LVIS_SELECTED;
+
+    if (flags & SVSI_ENSUREVISIBLE)
+        SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, item, 0);
+
+    /* all items */
+    if (flags & SVSI_DESELECTOTHERS)
+        SendMessageW(This->hWndList, LVM_SETITEMSTATE, -1, (LPARAM)&lvItem);
+
+    /* this item */
+    if (flags & SVSI_SELECT)
+        lvItem.state |= LVIS_SELECTED;
+
+    if (flags & SVSI_FOCUSED)
+        lvItem.stateMask |= LVIS_FOCUSED;
+
+    SendMessageW(This->hWndList, LVM_SETITEMSTATE, item, (LPARAM)&lvItem);
+
+    if (flags & SVSI_EDIT)
+        SendMessageW(This->hWndList, LVM_EDITLABELW, item, 0);
+
+    return S_OK;
 }

static HRESULT WINAPI IFView_SelectAndPositionItems(IFolderView *iface, UINT cidl,