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
6f9e67e0
Commit
6f9e67e0
authored
Nov 12, 2011
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 14, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use set_nsstyle_attr_var in IHTMLStyle::put_height implementation.
parent
4222ccf1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
htmlstyle.c
dlls/mshtml/htmlstyle.c
+1
-9
style.c
dlls/mshtml/tests/style.c
+13
-1
No files found.
dlls/mshtml/htmlstyle.c
View file @
6f9e67e0
...
...
@@ -2069,15 +2069,7 @@ static HRESULT WINAPI HTMLStyle_put_height(IHTMLStyle *iface, VARIANT v)
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
v
));
switch
(
V_VT
(
&
v
))
{
case
VT_BSTR
:
return
set_style_attr
(
This
,
STYLEID_HEIGHT
,
V_BSTR
(
&
v
),
0
);
default:
FIXME
(
"unimplemented vt %d
\n
"
,
V_VT
(
&
v
));
return
E_NOTIMPL
;
}
return
S_OK
;
return
set_nsstyle_attr_var
(
This
->
nsstyle
,
STYLEID_HEIGHT
,
&
v
,
ATTR_FIX_PX
);
}
static
HRESULT
WINAPI
HTMLStyle_get_height
(
IHTMLStyle
*
iface
,
VARIANT
*
p
)
...
...
dlls/mshtml/tests/style.c
View file @
6f9e67e0
...
...
@@ -872,7 +872,7 @@ static void test_body_style(IHTMLStyle *style)
"expected 4.0 or 4.9 (IE8) got %f
\n
"
,
f
);
V_VT
(
&
v
)
=
VT_BSTR
;
V_BSTR
(
&
v
)
=
a2bstr
(
"
64
px"
);
V_BSTR
(
&
v
)
=
a2bstr
(
"
70
px"
);
hres
=
IHTMLStyle_put_height
(
style
,
v
);
ok
(
hres
==
S_OK
,
"put_height failed: %08x
\n
"
,
hres
);
VariantClear
(
&
v
);
...
...
@@ -881,6 +881,18 @@ static void test_body_style(IHTMLStyle *style)
hres
=
IHTMLStyle_get_height
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_height failed: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_BSTR
,
"V_VT(v)=%d
\n
"
,
V_VT
(
&
v
));
ok
(
!
strcmp_wa
(
V_BSTR
(
&
v
),
"70px"
),
"V_BSTR(v) = %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
VariantClear
(
&
v
);
V_VT
(
&
v
)
=
VT_I4
;
V_I4
(
&
v
)
=
64
;
hres
=
IHTMLStyle_put_height
(
style
,
v
);
ok
(
hres
==
S_OK
,
"put_height failed: %08x
\n
"
,
hres
);
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
IHTMLStyle_get_height
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_height failed: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_BSTR
,
"V_VT(v)=%d
\n
"
,
V_VT
(
&
v
));
ok
(
!
strcmp_wa
(
V_BSTR
(
&
v
),
"64px"
),
"V_BSTR(v) = %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
VariantClear
(
&
v
);
...
...
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