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
91cb239f
Commit
91cb239f
authored
Oct 06, 2008
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 07, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLStyle::[get|put]_verticalAlign implementation.
parent
173f7f57
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
4 deletions
+49
-4
htmlstyle.c
dlls/mshtml/htmlstyle.c
+27
-4
htmlstyle.h
dlls/mshtml/htmlstyle.h
+1
-0
dom.c
dlls/mshtml/tests/dom.c
+21
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
91cb239f
...
...
@@ -71,6 +71,8 @@ static const WCHAR attrTextDecoration[] =
{
't'
,
'e'
,
'x'
,
't'
,
'-'
,
'd'
,
'e'
,
'c'
,
'o'
,
'r'
,
'a'
,
't'
,
'i'
,
'o'
,
'n'
,
0
};
static
const
WCHAR
attrTop
[]
=
{
't'
,
'o'
,
'p'
,
0
};
static
const
WCHAR
attrVerticalAlign
[]
=
{
'v'
,
'e'
,
'r'
,
't'
,
'i'
,
'c'
,
'a'
,
'l'
,
'-'
,
'a'
,
'l'
,
'i'
,
'g'
,
'n'
,
0
};
static
const
WCHAR
attrVisibility
[]
=
{
'v'
,
'i'
,
's'
,
'i'
,
'b'
,
'i'
,
'l'
,
'i'
,
't'
,
'y'
,
0
};
static
const
WCHAR
attrWidth
[]
=
...
...
@@ -96,6 +98,7 @@ static const LPCWSTR style_strings[] = {
attrPaddingLeft
,
attrTextDecoration
,
attrTop
,
attrVerticalAlign
,
attrVisibility
,
attrWidth
,
};
...
...
@@ -728,15 +731,35 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationBlink(IHTMLStyle *iface, VARIA
static
HRESULT
WINAPI
HTMLStyle_put_verticalAlign
(
IHTMLStyle
*
iface
,
VARIANT
v
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
FIXME
(
"(%p)->(v%d)
\n
"
,
This
,
V_VT
(
&
v
));
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
v
));
switch
(
V_VT
(
&
v
))
{
case
VT_BSTR
:
return
set_style_attr
(
This
,
STYLEID_VERTICAL_ALIGN
,
V_BSTR
(
&
v
),
0
);
default:
FIXME
(
"not implemented vt %d
\n
"
,
V_VT
(
&
v
));
return
E_NOTIMPL
;
}
return
S_OK
;
}
static
HRESULT
WINAPI
HTMLStyle_get_verticalAlign
(
IHTMLStyle
*
iface
,
VARIANT
*
p
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
BSTR
ret
;
HRESULT
hres
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
hres
=
get_style_attr
(
This
,
STYLEID_VERTICAL_ALIGN
,
&
ret
);
if
(
FAILED
(
hres
))
return
hres
;
V_VT
(
p
)
=
VT_BSTR
;
V_BSTR
(
p
)
=
ret
;
return
S_OK
;
}
static
HRESULT
WINAPI
HTMLStyle_put_textTransform
(
IHTMLStyle
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlstyle.h
View file @
91cb239f
...
...
@@ -50,6 +50,7 @@ typedef enum {
STYLEID_PADDING_LEFT
,
STYLEID_TEXT_DECORATION
,
STYLEID_TOP
,
STYLEID_VERTICAL_ALIGN
,
STYLEID_VISIBILITY
,
STYLEID_WIDTH
}
styleid_t
;
...
...
dlls/mshtml/tests/dom.c
View file @
91cb239f
...
...
@@ -2154,6 +2154,27 @@ static void test_default_style(IHTMLStyle *style)
ok
(
hres
==
S_OK
,
"get_cursor failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"default"
),
"get_cursor returned %s
\n
"
,
dbgstr_w
(
str
));
SysFreeString
(
str
);
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
IHTMLStyle_get_verticalAlign
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_vertivalAlign failed: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_BSTR
,
"V_VT(v)=%d
\n
"
,
V_VT
(
&
v
));
ok
(
!
V_BSTR
(
&
v
),
"V_BSTR(v) != NULL
\n
"
);
VariantClear
(
&
v
);
V_VT
(
&
v
)
=
VT_BSTR
;
V_BSTR
(
&
v
)
=
a2bstr
(
"middle"
);
hres
=
IHTMLStyle_put_verticalAlign
(
style
,
v
);
ok
(
hres
==
S_OK
,
"put_vertivalAlign failed: %08x
\n
"
,
hres
);
VariantClear
(
&
v
);
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
IHTMLStyle_get_verticalAlign
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_verticalAlign failed: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_BSTR
,
"V_VT(v)=%d
\n
"
,
V_VT
(
&
v
));
ok
(
!
strcmp_wa
(
V_BSTR
(
&
v
),
"middle"
),
"V_BSTR(v) = %s
\n
"
,
dbgstr_w
(
V_BSTR
(
&
v
)));
VariantClear
(
&
v
);
}
static
void
test_default_selection
(
IHTMLDocument2
*
doc
)
...
...
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