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
e402bb56
Commit
e402bb56
authored
Sep 09, 2014
by
Jactry Zeng
Committed by
Alexandre Julliard
Sep 09, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Add IHTMLStyle::pixelTop property implementation.
parent
042b881b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
4 deletions
+29
-4
htmlstyle.c
dlls/mshtml/htmlstyle.c
+8
-4
style.c
dlls/mshtml/tests/style.c
+21
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
e402bb56
...
@@ -2460,15 +2460,19 @@ static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p)
...
@@ -2460,15 +2460,19 @@ static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p)
static
HRESULT
WINAPI
HTMLStyle_put_pixelTop
(
IHTMLStyle
*
iface
,
LONG
v
)
static
HRESULT
WINAPI
HTMLStyle_put_pixelTop
(
IHTMLStyle
*
iface
,
LONG
v
)
{
{
HTMLStyle
*
This
=
impl_from_IHTMLStyle
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle
(
iface
);
FIXME
(
"(%p)->()
\n
"
,
This
);
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%d)
\n
"
,
This
,
v
);
return
set_style_pxattr
(
This
->
nsstyle
,
STYLEID_TOP
,
v
);
}
}
static
HRESULT
WINAPI
HTMLStyle_get_pixelTop
(
IHTMLStyle
*
iface
,
LONG
*
p
)
static
HRESULT
WINAPI
HTMLStyle_get_pixelTop
(
IHTMLStyle
*
iface
,
LONG
*
p
)
{
{
HTMLStyle
*
This
=
impl_from_IHTMLStyle
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle
(
iface
);
FIXME
(
"(%p)->()
\n
"
,
This
);
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
get_nsstyle_pixel_val
(
This
,
STYLEID_TOP
,
p
);
}
}
static
HRESULT
WINAPI
HTMLStyle_put_pixelLeft
(
IHTMLStyle
*
iface
,
LONG
v
)
static
HRESULT
WINAPI
HTMLStyle_put_pixelLeft
(
IHTMLStyle
*
iface
,
LONG
v
)
...
...
dlls/mshtml/tests/style.c
View file @
e402bb56
...
@@ -1210,6 +1210,17 @@ static void test_body_style(IHTMLStyle *style)
...
@@ -1210,6 +1210,17 @@ static void test_body_style(IHTMLStyle *style)
f
==
4
.
9
f
,
/* IE8 */
f
==
4
.
9
f
,
/* IE8 */
"expected 4.0 or 4.9 (IE8) got %f
\n
"
,
f
);
"expected 4.0 or 4.9 (IE8) got %f
\n
"
,
f
);
hres
=
IHTMLStyle_put_pixelTop
(
style
,
6
);
ok
(
hres
==
S_OK
,
"put_pixelTop failed: %08x
\n
"
,
hres
);
l
=
0xdeadbeef
;
hres
=
IHTMLStyle_get_pixelTop
(
style
,
&
l
);
ok
(
hres
==
S_OK
,
"get_pixelTop failed: %08x
\n
"
,
hres
);
ok
(
l
==
6
,
"pixelTop = %d
\n
"
,
l
);
hres
=
IHTMLStyle_get_pixelTop
(
style
,
NULL
);
ok
(
hres
==
E_POINTER
,
"get_pixelTop failed: %08x
\n
"
,
hres
);
V_VT
(
&
v
)
=
VT_BSTR
;
V_VT
(
&
v
)
=
VT_BSTR
;
V_BSTR
(
&
v
)
=
a2bstr
(
"3px"
);
V_BSTR
(
&
v
)
=
a2bstr
(
"3px"
);
hres
=
IHTMLStyle_put_top
(
style
,
v
);
hres
=
IHTMLStyle_put_top
(
style
,
v
);
...
@@ -1227,6 +1238,11 @@ static void test_body_style(IHTMLStyle *style)
...
@@ -1227,6 +1238,11 @@ static void test_body_style(IHTMLStyle *style)
ok
(
hres
==
S_OK
,
"get_posTop failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"get_posTop failed: %08x
\n
"
,
hres
);
ok
(
f
==
3
.
0
,
"expected 3.0 got %f
\n
"
,
f
);
ok
(
f
==
3
.
0
,
"expected 3.0 got %f
\n
"
,
f
);
l
=
0xdeadbeef
;
hres
=
IHTMLStyle_get_pixelTop
(
style
,
&
l
);
ok
(
hres
==
S_OK
,
"get_pixelTop failed: %08x
\n
"
,
hres
);
ok
(
l
==
3
,
"pixelTop = %d
\n
"
,
l
);
V_VT
(
&
v
)
=
VT_NULL
;
V_VT
(
&
v
)
=
VT_NULL
;
hres
=
IHTMLStyle_put_top
(
style
,
v
);
hres
=
IHTMLStyle_put_top
(
style
,
v
);
ok
(
hres
==
S_OK
,
"put_top failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"put_top failed: %08x
\n
"
,
hres
);
...
@@ -1238,6 +1254,11 @@ static void test_body_style(IHTMLStyle *style)
...
@@ -1238,6 +1254,11 @@ static void test_body_style(IHTMLStyle *style)
ok
(
!
V_BSTR
(
&
v
),
"V_BSTR(v) != NULL
\n
"
);
ok
(
!
V_BSTR
(
&
v
),
"V_BSTR(v) != NULL
\n
"
);
VariantClear
(
&
v
);
VariantClear
(
&
v
);
l
=
0xdeadbeef
;
hres
=
IHTMLStyle_get_pixelTop
(
style
,
&
l
);
ok
(
hres
==
S_OK
,
"get_pixelTop failed: %08x
\n
"
,
hres
);
ok
(
!
l
,
"pixelTop = %d
\n
"
,
l
);
/* Test posHeight */
/* Test posHeight */
hres
=
IHTMLStyle_get_posHeight
(
style
,
NULL
);
hres
=
IHTMLStyle_get_posHeight
(
style
,
NULL
);
ok
(
hres
==
E_POINTER
,
"get_posHeight failed: %08x
\n
"
,
hres
);
ok
(
hres
==
E_POINTER
,
"get_posHeight failed: %08x
\n
"
,
hres
);
...
...
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