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
15bd593f
Commit
15bd593f
authored
Aug 25, 2009
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Aug 25, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Implement IHTMLStyle get/put letterSpacing.
parent
15da6c94
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
4 deletions
+28
-4
htmlstyle.c
dlls/mshtml/htmlstyle.c
+7
-4
htmlstyle.h
dlls/mshtml/htmlstyle.h
+1
-0
dom.c
dlls/mshtml/tests/dom.c
+20
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
15bd593f
...
...
@@ -95,6 +95,8 @@ static const WCHAR attrHeight[] =
{
'h'
,
'e'
,
'i'
,
'g'
,
'h'
,
't'
,
0
};
static
const
WCHAR
attrLeft
[]
=
{
'l'
,
'e'
,
'f'
,
't'
,
0
};
static
const
WCHAR
attrLetterSpacing
[]
=
{
'l'
,
'e'
,
't'
,
't'
,
'e'
,
'r'
,
'-'
,
's'
,
'p'
,
'a'
,
'c'
,
'i'
,
'n'
,
'g'
,
0
};
static
const
WCHAR
attrMargin
[]
=
{
'm'
,
'a'
,
'r'
,
'g'
,
'i'
,
'n'
,
0
};
static
const
WCHAR
attrMarginLeft
[]
=
...
...
@@ -162,6 +164,7 @@ static const struct{
{
attrFontWeight
,
DISPID_IHTMLSTYLE_FONTWEIGHT
},
{
attrHeight
,
DISPID_IHTMLSTYLE_HEIGHT
},
{
attrLeft
,
DISPID_IHTMLSTYLE_LEFT
},
{
attrLetterSpacing
,
DISPID_IHTMLSTYLE_LETTERSPACING
},
{
attrMargin
,
DISPID_IHTMLSTYLE_MARGIN
},
{
attrMarginLeft
,
DISPID_IHTMLSTYLE_MARGINLEFT
},
{
attrMarginRight
,
DISPID_IHTMLSTYLE_MARGINRIGHT
},
...
...
@@ -940,15 +943,15 @@ static HRESULT WINAPI HTMLStyle_get_wordSpacing(IHTMLStyle *iface, VARIANT *p)
static
HRESULT
WINAPI
HTMLStyle_put_letterSpacing
(
IHTMLStyle
*
iface
,
VARIANT
v
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
FIXM
E
(
"(%p)->(v%d)
\n
"
,
This
,
V_VT
(
&
v
));
return
E_NOTIMPL
;
TRAC
E
(
"(%p)->(v%d)
\n
"
,
This
,
V_VT
(
&
v
));
return
set_nsstyle_attr_var
(
This
->
nsstyle
,
STYLEID_LETTER_SPACING
,
&
v
,
0
)
;
}
static
HRESULT
WINAPI
HTMLStyle_get_letterSpacing
(
IHTMLStyle
*
iface
,
VARIANT
*
p
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
FIXM
E
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
TRAC
E
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
get_nsstyle_attr_var
(
This
->
nsstyle
,
STYLEID_LETTER_SPACING
,
p
,
0
)
;
}
static
HRESULT
WINAPI
HTMLStyle_put_textDecoration
(
IHTMLStyle
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlstyle.h
View file @
15bd593f
...
...
@@ -65,6 +65,7 @@ typedef enum {
STYLEID_FONT_WEIGHT
,
STYLEID_HEIGHT
,
STYLEID_LEFT
,
STYLEID_LETTER_SPACING
,
STYLEID_MARGIN
,
STYLEID_MARGIN_LEFT
,
STYLEID_MARGIN_RIGHT
,
...
...
dlls/mshtml/tests/dom.c
View file @
15bd593f
...
...
@@ -3747,6 +3747,26 @@ static void test_default_style(IHTMLStyle *style)
ok
(
hres
==
S_OK
,
"put_wordSpacing: %08x
\n
"
,
hres
);
VariantClear
(
&
vDefault
);
/* letterSpacing */
hres
=
IHTMLStyle_get_letterSpacing
(
style
,
&
vDefault
);
ok
(
hres
==
S_OK
,
"get_letterSpacing: %08x
\n
"
,
hres
);
V_VT
(
&
v
)
=
VT_BSTR
;
V_BSTR
(
&
v
)
=
a2bstr
(
"11"
);
hres
=
IHTMLStyle_put_letterSpacing
(
style
,
v
);
ok
(
hres
==
S_OK
,
"put_letterSpacing: %08x
\n
"
,
hres
);
VariantClear
(
&
v
);
hres
=
IHTMLStyle_get_letterSpacing
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_letterSpacing: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_BSTR
,
"V_VT(v)=%d
\n
"
,
V_VT
(
&
v
));
ok
(
!
strcmp_wa
(
V_BSTR
(
&
v
),
"11px"
),
"expected 10px = %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
VariantClear
(
&
v
);
hres
=
IHTMLStyle_put_letterSpacing
(
style
,
vDefault
);
ok
(
hres
==
S_OK
,
"put_letterSpacing: %08x
\n
"
,
hres
);
VariantClear
(
&
vDefault
);
hres
=
IHTMLStyle_QueryInterface
(
style
,
&
IID_IHTMLStyle2
,
(
void
**
)
&
style2
);
ok
(
hres
==
S_OK
,
"Could not get IHTMLStyle2 iface: %08x
\n
"
,
hres
);
if
(
SUCCEEDED
(
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