marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleacc: Add Client_accHitTest implementation.

oldstable
Piotr Caban 2014-05-09 13:59:51 +02:00 committed by Alexandre Julliard
parent 6474f8c1df
commit e99dc1aced
2 changed files with 67 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/oleacc/client.c
View File

@ -340,8 +340,26 @@ static HRESULT WINAPI Client_accHitTest(IAccessible *iface,
LONG xLeft, LONG yTop, VARIANT *pvarID)
{
Client *This = impl_from_Client(iface);
FIXME("(%p)->(%d %d %p)\n", This, xLeft, yTop, pvarID);
return E_NOTIMPL;
HWND child;
POINT pt;
TRACE("(%p)->(%d %d %p)\n", This, xLeft, yTop, pvarID);
V_VT(pvarID) = VT_I4;
V_I4(pvarID) = 0;
pt.x = xLeft;
pt.y = yTop;
if(!IsWindowVisible(This->hwnd) || !ScreenToClient(This->hwnd, &pt))
return S_OK;
child = ChildWindowFromPointEx(This->hwnd, pt, CWP_SKIPINVISIBLE);
if(!child || child==This->hwnd)
return S_OK;
V_VT(pvarID) = VT_DISPATCH;
return AccessibleObjectFromWindow(child, OBJID_WINDOW,
&IID_IDispatch, (void**)&V_DISPATCH(pvarID));
}
static HRESULT WINAPI Client_accDoDefaultAction(IAccessible *iface, VARIANT varID)

50
dlls/oleacc/tests/main.c
View File

@ -315,13 +315,14 @@ static void test_default_client_accessible_object(void)
HRESULT hr;
VARIANT vid, v;
BSTR str;
POINT pt;
LONG l;
hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW,
0, 0, 0, 0, NULL, NULL, NULL, NULL);
0, 0, 100, 100, NULL, NULL, NULL, NULL);
ok(hwnd != NULL, "CreateWindow failed\n");
chld = CreateWindowA("static", "message", WS_CHILD,
0, 0, 0, 0, hwnd, NULL, NULL, NULL);
chld = CreateWindowA("static", "message", WS_CHILD | WS_VISIBLE,
0, 0, 50, 50, hwnd, NULL, NULL, NULL);
ok(chld != NULL, "CreateWindow failed\n");
hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc);
@ -388,6 +389,44 @@ static void test_default_client_accessible_object(void)
ok(hr == S_FALSE, "got %x\n", hr);
ok(!str, "str != NULL\n");
pt.x = pt.y = 60;
ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n");
hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v);
ok(hr == S_OK, "got %x\n", hr);
ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v));
ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v));
pt.x = pt.y = 25;
ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n");
hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v);
ok(hr == S_OK, "got %x\n", hr);
ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v));
ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v));
ShowWindow(hwnd, TRUE);
pt.x = pt.y = 60;
ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n");
hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v);
ok(hr == S_OK, "got %x\n", hr);
ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v));
ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v));
pt.x = pt.y = 25;
ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n");
hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v);
ok(hr == S_OK, "got %x\n", hr);
ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v));
ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v));
VariantClear(&v);
ShowWindow(chld, FALSE);
pt.x = pt.y = 25;
ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n");
hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v);
ok(hr == S_OK, "got %x\n", hr);
ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v));
ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v));
DestroyWindow(hwnd);
hr = IAccessible_get_accChildCount(acc, &l);
@ -410,6 +449,11 @@ static void test_default_client_accessible_object(void)
ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v));
ok(V_I4(&v) == STATE_SYSTEM_INVISIBLE, "V_I4(&v) = %x\n", V_I4(&v));
hr = IAccessible_accHitTest(acc, 200, 200, &v);
ok(hr == S_OK, "got %x\n", hr);
ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v));
ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v));
IAccessible_Release(acc);
}