Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
7a0fd9cf
Commit
7a0fd9cf
authored
May 12, 2014
by
Piotr Caban
Committed by
Alexandre Julliard
May 12, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleacc: Add Client_accLocation implementation.
parent
a709e3f9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
3 deletions
+49
-3
client.c
dlls/oleacc/client.c
+24
-2
main.c
dlls/oleacc/tests/main.c
+25
-1
No files found.
dlls/oleacc/client.c
View file @
7a0fd9cf
...
...
@@ -326,9 +326,31 @@ static HRESULT WINAPI Client_accLocation(IAccessible *iface, LONG *pxLeft,
LONG
*
pyTop
,
LONG
*
pcxWidth
,
LONG
*
pcyHeight
,
VARIANT
varID
)
{
Client
*
This
=
impl_from_Client
(
iface
);
FIXME
(
"(%p)->(%p %p %p %p %s)
\n
"
,
This
,
pxLeft
,
pyTop
,
RECT
rect
;
POINT
pt
;
TRACE
(
"(%p)->(%p %p %p %p %s)
\n
"
,
This
,
pxLeft
,
pyTop
,
pcxWidth
,
pcyHeight
,
debugstr_variant
(
&
varID
));
return
E_NOTIMPL
;
*
pxLeft
=
*
pyTop
=
*
pcxWidth
=
*
pcyHeight
=
0
;
if
(
convert_child_id
(
&
varID
)
!=
CHILDID_SELF
)
return
E_INVALIDARG
;
if
(
!
GetClientRect
(
This
->
hwnd
,
&
rect
))
return
S_OK
;
pt
.
x
=
rect
.
left
,
pt
.
y
=
rect
.
top
;
MapWindowPoints
(
This
->
hwnd
,
NULL
,
&
pt
,
1
);
*
pxLeft
=
pt
.
x
;
*
pyTop
=
pt
.
y
;
pt
.
x
=
rect
.
right
;
pt
.
y
=
rect
.
bottom
;
MapWindowPoints
(
This
->
hwnd
,
NULL
,
&
pt
,
1
);
*
pcxWidth
=
pt
.
x
-
*
pxLeft
;
*
pcyHeight
=
pt
.
y
-
*
pyTop
;
return
S_OK
;
}
static
HRESULT
WINAPI
Client_accNavigate
(
IAccessible
*
iface
,
...
...
dlls/oleacc/tests/main.c
View file @
7a0fd9cf
...
...
@@ -319,7 +319,8 @@ static void test_default_client_accessible_object(void)
VARIANT
vid
,
v
;
BSTR
str
;
POINT
pt
;
LONG
l
;
RECT
rect
;
LONG
l
,
left
,
top
,
width
,
height
;
hwnd
=
CreateWindowA
(
"oleacc_test"
,
"test &t &junk"
,
WS_OVERLAPPEDWINDOW
,
0
,
0
,
100
,
100
,
NULL
,
NULL
,
NULL
,
NULL
);
...
...
@@ -435,6 +436,22 @@ static void test_default_client_accessible_object(void)
ok
(
disp
!=
NULL
,
"disp == NULL
\n
"
);
IDispatch_Release
(
disp
);
ok
(
GetClientRect
(
hwnd
,
&
rect
),
"GetClientRect failed
\n
"
);
pt
.
x
=
rect
.
left
;
pt
.
y
=
rect
.
top
;
MapWindowPoints
(
hwnd
,
NULL
,
&
pt
,
1
);
rect
.
left
=
pt
.
x
;
rect
.
top
=
pt
.
y
;
pt
.
x
=
rect
.
right
;
pt
.
y
=
rect
.
bottom
;
MapWindowPoints
(
hwnd
,
NULL
,
&
pt
,
1
);
hr
=
IAccessible_accLocation
(
acc
,
&
left
,
&
top
,
&
width
,
&
height
,
vid
);
ok
(
hr
==
S_OK
,
"got %x
\n
"
,
hr
);
ok
(
left
==
rect
.
left
,
"left = %d, expected %d
\n
"
,
left
,
rect
.
left
);
ok
(
top
==
rect
.
top
,
"top = %d, expected %d
\n
"
,
top
,
rect
.
top
);
ok
(
width
==
pt
.
x
-
rect
.
left
,
"width = %d, expected %d
\n
"
,
width
,
pt
.
x
-
rect
.
left
);
ok
(
height
==
pt
.
y
-
rect
.
top
,
"height = %d, expected %d
\n
"
,
height
,
pt
.
y
-
rect
.
top
);
DestroyWindow
(
hwnd
);
hr
=
IAccessible_get_accChildCount
(
acc
,
&
l
);
...
...
@@ -467,6 +484,13 @@ static void test_default_client_accessible_object(void)
ok
(
hr
==
E_FAIL
,
"got %x
\n
"
,
hr
);
ok
(
disp
==
NULL
,
"disp = %p
\n
"
,
disp
);
hr
=
IAccessible_accLocation
(
acc
,
&
left
,
&
top
,
&
width
,
&
height
,
vid
);
ok
(
hr
==
S_OK
,
"got %x
\n
"
,
hr
);
ok
(
left
==
0
,
"left = %d
\n
"
,
left
);
ok
(
top
==
0
,
"top = %d
\n
"
,
top
);
ok
(
width
==
0
,
"width = %d
\n
"
,
width
);
ok
(
height
==
0
,
"height = %d
\n
"
,
height
);
IAccessible_Release
(
acc
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment