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
7d18377b
Commit
7d18377b
authored
Jan 26, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Jan 26, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle::put_marginLeft implementation.
parent
737dba7a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
19 deletions
+13
-19
htmlstyle.c
dlls/mshtml/htmlstyle.c
+2
-19
style.c
dlls/mshtml/tests/style.c
+11
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
7d18377b
...
...
@@ -1523,26 +1523,9 @@ static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v)
{
HTMLStyle
*
This
=
impl_from_IHTMLStyle
(
iface
);
switch
(
V_VT
(
&
v
))
{
case
VT_NULL
:
TRACE
(
"(%p)->(NULL)
\n
"
,
This
);
return
set_style_attr
(
This
,
STYLEID_MARGIN_LEFT
,
emptyW
,
0
);
case
VT_I4
:
{
WCHAR
buf
[
14
];
TRACE
(
"(%p)->(%d)
\n
"
,
This
,
V_I4
(
&
v
));
wsprintfW
(
buf
,
px_formatW
,
V_I4
(
&
v
));
return
set_style_attr
(
This
,
STYLEID_MARGIN_LEFT
,
buf
,
0
);
}
case
VT_BSTR
:
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
V_BSTR
(
&
v
)));
return
set_style_attr
(
This
,
STYLEID_MARGIN_LEFT
,
V_BSTR
(
&
v
),
0
);
default:
FIXME
(
"Unsupported vt=%d
\n
"
,
V_VT
(
&
v
));
}
TRACE
(
"(%p)->(v%d)
\n
"
,
This
,
V_VT
(
&
v
));
return
E_NOTIMPL
;
return
set_nsstyle_attr_var
(
This
->
nsstyle
,
STYLEID_MARGIN_LEFT
,
&
v
,
ATTR_FIX_PX
)
;
}
static
HRESULT
WINAPI
HTMLStyle_put_margin
(
IHTMLStyle
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/tests/style.c
View file @
7d18377b
...
...
@@ -404,6 +404,17 @@ static void test_body_style(IHTMLStyle *style)
ok
(
V_VT
(
&
v
)
==
VT_BSTR
,
"V_VT(marginLeft) = %d
\n
"
,
V_VT
(
&
v
));
ok
(
!
V_BSTR
(
&
v
),
"V_BSTR(marginLeft) = %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
V_VT
(
&
v
)
=
VT_I4
;
V_I4
(
&
v
)
=
6
;
hres
=
IHTMLStyle_put_marginLeft
(
style
,
v
);
ok
(
hres
==
S_OK
,
"put_marginLeft failed: %08x
\n
"
,
hres
);
V_VT
(
&
v
)
=
VT_NULL
;
hres
=
IHTMLStyle_get_marginLeft
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_marginLeft failed: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_BSTR
,
"V_VT(marginLeft) = %d
\n
"
,
V_VT
(
&
v
));
ok
(
!
strcmp_wa
(
V_BSTR
(
&
v
),
"6px"
),
"V_BSTR(marginLeft) = %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
str
=
(
void
*
)
0xdeadbeef
;
hres
=
IHTMLStyle_get_fontFamily
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_fontFamily 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