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
991104b9
Commit
991104b9
authored
Nov 29, 2010
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 29, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLStyle::padding property implementation.
parent
f82668f2
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
+11
-4
htmlstyle.h
dlls/mshtml/htmlstyle.h
+1
-0
dom.c
dlls/mshtml/tests/dom.c
+16
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
991104b9
...
...
@@ -129,6 +129,8 @@ static const WCHAR attrMinHeight[] =
{
'm'
,
'i'
,
'n'
,
'-'
,
'h'
,
'e'
,
'i'
,
'g'
,
'h'
,
't'
,
0
};
static
const
WCHAR
attrOverflow
[]
=
{
'o'
,
'v'
,
'e'
,
'r'
,
'f'
,
'l'
,
'o'
,
'w'
,
0
};
static
const
WCHAR
attrPadding
[]
=
{
'p'
,
'a'
,
'd'
,
'd'
,
'i'
,
'n'
,
'g'
,
0
};
static
const
WCHAR
attrPaddingBottom
[]
=
{
'p'
,
'a'
,
'd'
,
'd'
,
'i'
,
'n'
,
'g'
,
'-'
,
'b'
,
'o'
,
't'
,
't'
,
'o'
,
'm'
,
0
};
static
const
WCHAR
attrPaddingLeft
[]
=
...
...
@@ -213,6 +215,7 @@ static const struct{
{
attrMarginTop
,
DISPID_IHTMLSTYLE_MARGINTOP
},
{
attrMinHeight
,
DISPID_IHTMLSTYLE4_MINHEIGHT
},
{
attrOverflow
,
DISPID_IHTMLSTYLE_OVERFLOW
},
{
attrPadding
,
DISPID_IHTMLSTYLE_PADDING
},
{
attrPaddingBottom
,
DISPID_IHTMLSTYLE_PADDINGBOTTOM
},
{
attrPaddingLeft
,
DISPID_IHTMLSTYLE_PADDINGLEFT
},
{
attrPaddingRight
,
DISPID_IHTMLSTYLE_PADDINGRIGHT
},
...
...
@@ -1416,15 +1419,19 @@ static HRESULT WINAPI HTMLStyle_get_paddingLeft(IHTMLStyle *iface, VARIANT *p)
static
HRESULT
WINAPI
HTMLStyle_put_padding
(
IHTMLStyle
*
iface
,
BSTR
v
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
FIXME
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
v
));
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
v
));
return
set_style_attr
(
This
,
STYLEID_PADDING
,
v
,
0
);
}
static
HRESULT
WINAPI
HTMLStyle_get_padding
(
IHTMLStyle
*
iface
,
BSTR
*
p
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
get_style_attr
(
This
,
STYLEID_PADDING
,
p
);
}
static
HRESULT
WINAPI
HTMLStyle_put_border
(
IHTMLStyle
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlstyle.h
View file @
991104b9
...
...
@@ -82,6 +82,7 @@ typedef enum {
STYLEID_MARGIN_TOP
,
STYLEID_MIN_HEIGHT
,
STYLEID_OVERFLOW
,
STYLEID_PADDING
,
STYLEID_PADDING_BOTTOM
,
STYLEID_PADDING_LEFT
,
STYLEID_PADDING_RIGHT
,
...
...
dlls/mshtml/tests/dom.c
View file @
991104b9
...
...
@@ -4976,6 +4976,22 @@ static void test_default_style(IHTMLStyle *style)
ok
(
!
V_BSTR
(
&
v
),
"str=%s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
VariantClear
(
&
v
);
/* padding */
hres
=
IHTMLStyle_get_padding
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_padding failed: %08x
\n
"
,
hres
);
ok
(
!
str
,
"padding = %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
str
=
a2bstr
(
"1"
);
hres
=
IHTMLStyle_put_padding
(
style
,
str
);
ok
(
hres
==
S_OK
,
"put_padding failed: %08x
\n
"
,
hres
);
SysFreeString
(
str
);
hres
=
IHTMLStyle_get_padding
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_padding failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"1px"
),
"padding = %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
/* PaddingLeft */
hres
=
IHTMLStyle_get_paddingLeft
(
style
,
&
vDefault
);
ok
(
hres
==
S_OK
,
"get_paddingLeft: %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