[PATCH] IShellView::ContextSensitiveHelp not implemented
Nikolay Sivov
nsivov at codeweavers.com
Mon Mar 22 18:19:34 CDT 2010
---
dlls/shell32/shlview.c | 12 +++++-------
dlls/shell32/tests/shlview.c | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index 8e9323a..13b7c92 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -1807,13 +1807,11 @@ static HRESULT WINAPI IShellView_fnGetWindow(IShellView2 * iface,HWND * phWnd)
return S_OK;
}
-static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView2 * iface,BOOL fEnterMode)
+static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView2 *iface, BOOL mode)
{
- IShellViewImpl *This = (IShellViewImpl *)iface;
-
- FIXME("(%p) stub\n",This);
-
- return E_NOTIMPL;
+ IShellViewImpl *This = (IShellViewImpl *)iface;
+ TRACE("(%p)->(%d)\n", This, mode);
+ return E_NOTIMPL;
}
/**********************************************************
@@ -3074,7 +3072,7 @@ static HRESULT WINAPI IShellFolderView_fnGetSelectedObjects(
*pidl = LocalAlloc(0, *items*sizeof(LPITEMIDLIST));
if (!*pidl) return E_OUTOFMEMORY;
- /* it's documented that caller shouldn't PIDLs, only array itself */
+ /* it's documented that caller shouldn't free PIDLs, only array itself */
memcpy((PITEMID_CHILD*)*pidl, This->apidl, *items*sizeof(LPITEMIDLIST));
}
diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c
index 82e198b..f3d3809 100644
--- a/dlls/shell32/tests/shlview.c
+++ b/dlls/shell32/tests/shlview.c
@@ -587,6 +587,28 @@ static void test_IShellFolderView(void)
IShellFolder_Release(desktop);
}
+static void test_IOleWindow(void)
+{
+ IShellFolder *desktop;
+ IShellView *view;
+ HRESULT hr;
+
+ hr = SHGetDesktopFolder(&desktop);
+ ok(hr == S_OK, "got (0x%08x)\n", hr);
+
+ hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view);
+ ok(hr == S_OK, "got (0x%08x)\n", hr);
+
+ /* IShellView::ContextSensitiveHelp */
+ hr = IShellView_ContextSensitiveHelp(view, TRUE);
+ ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr);
+ hr = IShellView_ContextSensitiveHelp(view, FALSE);
+ ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr);
+
+ IShellView_Release(view);
+ IShellFolder_Release(desktop);
+}
+
START_TEST(shlview)
{
OleInitialize(NULL);
@@ -597,6 +619,7 @@ START_TEST(shlview)
test_IFolderView();
test_GetItemObject();
test_IShellFolderView();
+ test_IOleWindow();
OleUninitialize();
}
--
1.5.6.5
--=-3785wzdvAEbKXs0/OU+h--
More information about the wine-patches
mailing list