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
7152077b
Commit
7152077b
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::get_pixelWidth implementation.
parent
387257dd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
htmlstyle.c
dlls/mshtml/htmlstyle.c
+4
-2
style.c
dlls/mshtml/tests/style.c
+18
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
7152077b
...
@@ -2501,8 +2501,10 @@ static HRESULT WINAPI HTMLStyle_put_pixelWidth(IHTMLStyle *iface, LONG v)
...
@@ -2501,8 +2501,10 @@ static HRESULT WINAPI HTMLStyle_put_pixelWidth(IHTMLStyle *iface, LONG v)
static
HRESULT
WINAPI
HTMLStyle_get_pixelWidth
(
IHTMLStyle
*
iface
,
LONG
*
p
)
static
HRESULT
WINAPI
HTMLStyle_get_pixelWidth
(
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_WIDTH
,
p
);
}
}
static
HRESULT
WINAPI
HTMLStyle_put_pixelHeight
(
IHTMLStyle
*
iface
,
LONG
v
)
static
HRESULT
WINAPI
HTMLStyle_put_pixelHeight
(
IHTMLStyle
*
iface
,
LONG
v
)
...
...
dlls/mshtml/tests/style.c
View file @
7152077b
...
@@ -963,6 +963,11 @@ static void test_body_style(IHTMLStyle *style)
...
@@ -963,6 +963,11 @@ static void test_body_style(IHTMLStyle *style)
f
==
2
.
2
f
,
/* IE8 */
f
==
2
.
2
f
,
/* IE8 */
"f = %f
\n
"
,
f
);
"f = %f
\n
"
,
f
);
l
=
0xdeadbeef
;
hres
=
IHTMLStyle_get_pixelWidth
(
style
,
&
l
);
ok
(
hres
==
S_OK
,
"get_pixelWidth failed: %08x
\n
"
,
hres
);
ok
(
l
==
2
,
"pixelWidth = %d
\n
"
,
l
);
V_VT
(
&
v
)
=
VT_BSTR
;
V_VT
(
&
v
)
=
VT_BSTR
;
V_BSTR
(
&
v
)
=
a2bstr
(
"auto"
);
V_BSTR
(
&
v
)
=
a2bstr
(
"auto"
);
hres
=
IHTMLStyle_put_width
(
style
,
v
);
hres
=
IHTMLStyle_put_width
(
style
,
v
);
...
@@ -981,6 +986,11 @@ static void test_body_style(IHTMLStyle *style)
...
@@ -981,6 +986,11 @@ static void test_body_style(IHTMLStyle *style)
hres
=
IHTMLStyle_put_width
(
style
,
v
);
hres
=
IHTMLStyle_put_width
(
style
,
v
);
ok
(
hres
==
S_OK
,
"put_width failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"put_width failed: %08x
\n
"
,
hres
);
l
=
0xdeadbeef
;
hres
=
IHTMLStyle_get_pixelWidth
(
style
,
&
l
);
ok
(
hres
==
S_OK
,
"get_pixelWidth failed: %08x
\n
"
,
hres
);
ok
(
l
==
100
,
"pixelWidth = %d
\n
"
,
l
);
V_VT
(
&
v
)
=
VT_EMPTY
;
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
IHTMLStyle_get_width
(
style
,
&
v
);
hres
=
IHTMLStyle_get_width
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_width failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"get_width failed: %08x
\n
"
,
hres
);
...
@@ -991,6 +1001,14 @@ static void test_body_style(IHTMLStyle *style)
...
@@ -991,6 +1001,14 @@ static void test_body_style(IHTMLStyle *style)
hres
=
IHTMLStyle_put_pixelWidth
(
style
,
50
);
hres
=
IHTMLStyle_put_pixelWidth
(
style
,
50
);
ok
(
hres
==
S_OK
,
"put_pixelWidth failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"put_pixelWidth failed: %08x
\n
"
,
hres
);
l
=
0xdeadbeef
;
hres
=
IHTMLStyle_get_pixelWidth
(
style
,
&
l
);
ok
(
hres
==
S_OK
,
"get_pixelWidth failed: %08x
\n
"
,
hres
);
ok
(
l
==
50
,
"pixelWidth = %d
\n
"
,
l
);
hres
=
IHTMLStyle_get_pixelWidth
(
style
,
NULL
);
ok
(
hres
==
E_POINTER
,
"get_pixelWidth failed: %08x
\n
"
,
hres
);
V_VT
(
&
v
)
=
VT_EMPTY
;
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
IHTMLStyle_get_width
(
style
,
&
v
);
hres
=
IHTMLStyle_get_width
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_width failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"get_width 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