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

shell32: Add IFolderView::Item implementation.

Browse Source
This commit is contained in:
Nikolay Sivov 2010-03-23 05:08:10 +03:00 committed by Alexandre Julliard
parent edcaf53f94
commit 34577a84d9
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/shell32/shlview.c
View File

@ -2741,9 +2741,24 @@ static HRESULT WINAPI IFView_GetFolder(IFolderView *iface, REFIID riid, void **p
static HRESULT WINAPI IFView_Item(IFolderView *iface, int index, PITEMID_CHILD *ppidl) static HRESULT WINAPI IFView_Item(IFolderView *iface, int index, PITEMID_CHILD *ppidl)
{ {
IShellViewImpl *This = impl_from_IFolderView(iface); IShellViewImpl *This = impl_from_IFolderView(iface);
FIXME("(%p)->(%d %p), stub\n", This, index, ppidl); LVITEMW item;
return E_NOTIMPL;
TRACE("(%p)->(%d %p)\n", This, index, ppidl);
item.mask = LVIF_PARAM;
item.iItem = index;
if (SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM)&item))
{
*ppidl = ILClone((PITEMID_CHILD)item.lParam);
return S_OK;
}
else
{
*ppidl = 0;
return E_INVALIDARG;
}
} }
static HRESULT WINAPI IFView_ItemCount(IFolderView *iface, UINT flags, int *items) static HRESULT WINAPI IFView_ItemCount(IFolderView *iface, UINT flags, int *items)

12
dlls/shell32/tests/shlview.c
View File

@ -370,6 +370,7 @@ static void test_IFolderView(void)
IShellBrowser *browser; IShellBrowser *browser;
IFolderView *fv; IFolderView *fv;
HWND hwnd_view, hwnd_list; HWND hwnd_view, hwnd_list;
PITEMID_CHILD pidl;
HRESULT hr; HRESULT hr;
INT ret; INT ret;
POINT pt; POINT pt;
@ -395,6 +396,11 @@ static void test_IFolderView(void)
hr = IFolderView_GetSpacing(fv, NULL); hr = IFolderView_GetSpacing(fv, NULL);
ok(hr == S_FALSE || broken(hr == S_OK) /* win7 */, "got (0x%08x)\n", hr); ok(hr == S_FALSE || broken(hr == S_OK) /* win7 */, "got (0x%08x)\n", hr);
pidl = (void*)0xdeadbeef;
hr = IFolderView_Item(fv, 0, &pidl);
ok(hr == E_INVALIDARG || broken(hr == E_FAIL) /* < Vista */, "got (0x%08x)\n", hr);
ok(pidl == 0 || broken(pidl == (void*)0xdeadbeef) /* < Vista */, "got %p\n", pidl);
if (0) if (0)
{ {
/* crashes on Vista and Win2k8 - List not created yet case */ /* crashes on Vista and Win2k8 - List not created yet case */
@ -403,6 +409,9 @@ if (0)
/* crashes on XP */ /* crashes on XP */
hr = IFolderView_GetSelectionMarkedItem(fv, NULL); hr = IFolderView_GetSelectionMarkedItem(fv, NULL);
hr = IFolderView_GetFocusedItem(fv, NULL); hr = IFolderView_GetFocusedItem(fv, NULL);
/* crashes on Vista+ */
hr = IFolderView_Item(fv, 0, NULL);
} }
browser = IShellBrowserImpl_Construct(); browser = IShellBrowserImpl_Construct();
@ -585,7 +594,8 @@ static void test_IShellFolderView(void)
i = 0xdeadbeef; i = 0xdeadbeef;
hr = IShellFolderView_RemoveObject(folderview, NULL, &i); hr = IShellFolderView_RemoveObject(folderview, NULL, &i);
ok(hr == S_OK, "got (0x%08x)\n", hr); ok(hr == S_OK, "got (0x%08x)\n", hr);
ok(i == 0, "got %d\n", i); ok(i == 0 || i == -1 /* Win7 */ || broken(i == 0xdeadbeef) /* Vista, 2k8 */,
"got %d\n", i);
IShellFolderView_Release(folderview); IShellFolderView_Release(folderview);