Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
1cd6da26
Commit
1cd6da26
authored
Mar 30, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 30, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use proper helpers in IHTMLStyle::color implementation.
parent
75dd422c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
12 deletions
+14
-12
htmlstyle.c
dlls/mshtml/htmlstyle.c
+2
-12
style.c
dlls/mshtml/tests/style.c
+12
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
1cd6da26
...
...
@@ -885,16 +885,7 @@ static HRESULT WINAPI HTMLStyle_put_color(IHTMLStyle *iface, VARIANT v)
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
v
));
switch
(
V_VT
(
&
v
))
{
case
VT_BSTR
:
TRACE
(
"%s
\n
"
,
debugstr_w
(
V_BSTR
(
&
v
)));
return
set_style_attr
(
This
,
STYLEID_COLOR
,
V_BSTR
(
&
v
),
0
);
default:
FIXME
(
"unsupported vt=%d
\n
"
,
V_VT
(
&
v
));
}
return
E_NOTIMPL
;
return
set_nsstyle_attr_var
(
This
->
nsstyle
,
STYLEID_COLOR
,
&
v
,
ATTR_HEX_INT
);
}
static
HRESULT
WINAPI
HTMLStyle_get_color
(
IHTMLStyle
*
iface
,
VARIANT
*
p
)
...
...
@@ -903,8 +894,7 @@ static HRESULT WINAPI HTMLStyle_get_color(IHTMLStyle *iface, VARIANT *p)
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
V_VT
(
p
)
=
VT_BSTR
;
return
get_style_attr
(
This
,
STYLEID_COLOR
,
&
V_BSTR
(
p
));
return
get_nsstyle_attr_var
(
This
->
nsstyle
,
STYLEID_COLOR
,
p
,
0
);
}
static
HRESULT
WINAPI
HTMLStyle_put_background
(
IHTMLStyle
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/tests/style.c
View file @
1cd6da26
...
...
@@ -572,6 +572,18 @@ static void test_body_style(IHTMLStyle *style)
ok
(
V_VT
(
&
v
)
==
VT_BSTR
,
"V_VT(color) = %d
\n
"
,
V_VT
(
&
v
));
ok
(
!
V_BSTR
(
&
v
),
"V_BSTR(color) = %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
V_VT
(
&
v
)
=
VT_I4
;
V_I4
(
&
v
)
=
0xfdfd
;
hres
=
IHTMLStyle_put_color
(
style
,
v
);
ok
(
hres
==
S_OK
,
"put_color failed: %08x
\n
"
,
hres
);
V_VT
(
&
v
)
=
VT_NULL
;
hres
=
IHTMLStyle_get_color
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_color failed: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_BSTR
,
"V_VT(color) = %d
\n
"
,
V_VT
(
&
v
));
todo_wine
ok
(
!
strcmp_wa
(
V_BSTR
(
&
v
),
"#00fdfd"
),
"V_BSTR(color) = %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
b
=
0xfefe
;
hres
=
IHTMLStyle_get_textDecorationUnderline
(
style
,
&
b
);
ok
(
hres
==
S_OK
,
"get_textDecorationUnderline 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