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
04c97d08
Commit
04c97d08
authored
Oct 23, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 23, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLStyle::clear property implementation.
parent
f950f41b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
4 deletions
+27
-4
htmlstyle.c
dlls/mshtml/htmlstyle.c
+11
-4
htmlstyle.h
dlls/mshtml/htmlstyle.h
+1
-0
style.c
dlls/mshtml/tests/style.c
+15
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
04c97d08
...
...
@@ -91,6 +91,8 @@ static const WCHAR attrBorderWidth[] =
{
'b'
,
'o'
,
'r'
,
'd'
,
'e'
,
'r'
,
'-'
,
'w'
,
'i'
,
'd'
,
't'
,
'h'
,
0
};
static
const
WCHAR
attrBottom
[]
=
{
'b'
,
'o'
,
't'
,
't'
,
'o'
,
'm'
,
0
};
static
const
WCHAR
attrClear
[]
=
{
'c'
,
'l'
,
'e'
,
'a'
,
'r'
,
0
};
static
const
WCHAR
attrClip
[]
=
{
'c'
,
'l'
,
'i'
,
'p'
,
0
};
static
const
WCHAR
attrColor
[]
=
...
...
@@ -212,6 +214,7 @@ static const style_tbl_entry_t style_tbl[] = {
{
attrBorderTopWidth
,
DISPID_IHTMLSTYLE_BORDERTOPWIDTH
},
{
attrBorderWidth
,
DISPID_IHTMLSTYLE_BORDERWIDTH
},
{
attrBottom
,
DISPID_IHTMLSTYLE2_BOTTOM
},
{
attrClear
,
DISPID_IHTMLSTYLE_CLEAR
},
{
attrClip
,
DISPID_IHTMLSTYLE_CLIP
},
{
attrColor
,
DISPID_IHTMLSTYLE_COLOR
},
{
attrCursor
,
DISPID_IHTMLSTYLE_CURSOR
},
...
...
@@ -2063,15 +2066,19 @@ static HRESULT WINAPI HTMLStyle_get_styleFloat(IHTMLStyle *iface, BSTR *p)
static
HRESULT
WINAPI
HTMLStyle_put_clear
(
IHTMLStyle
*
iface
,
BSTR
v
)
{
HTMLStyle
*
This
=
impl_from_IHTMLStyle
(
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_CLEAR
,
v
,
0
);
}
static
HRESULT
WINAPI
HTMLStyle_get_clear
(
IHTMLStyle
*
iface
,
BSTR
*
p
)
{
HTMLStyle
*
This
=
impl_from_IHTMLStyle
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
get_style_attr
(
This
,
STYLEID_CLEAR
,
p
);
}
static
HRESULT
WINAPI
HTMLStyle_put_display
(
IHTMLStyle
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlstyle.h
View file @
04c97d08
...
...
@@ -61,6 +61,7 @@ typedef enum {
STYLEID_BORDER_TOP_WIDTH
,
STYLEID_BORDER_WIDTH
,
STYLEID_BOTTOM
,
STYLEID_CLEAR
,
STYLEID_CLIP
,
STYLEID_COLOR
,
STYLEID_CURSOR
,
...
...
dlls/mshtml/tests/style.c
View file @
04c97d08
...
...
@@ -1910,6 +1910,21 @@ static void test_body_style(IHTMLStyle *style)
ok
(
!
strcmp_wa
(
str
,
"rect(0px 1px 500px 505px)"
),
"clip = %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
/* clear */
hres
=
IHTMLStyle_get_clear
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_clear failed: %08x
\n
"
,
hres
);
ok
(
!
str
,
"clear = %s
\n
"
,
wine_dbgstr_w
(
str
));
str
=
a2bstr
(
"both"
);
hres
=
IHTMLStyle_put_clear
(
style
,
str
);
ok
(
hres
==
S_OK
,
"put_clear failed: %08x
\n
"
,
hres
);
SysFreeString
(
str
);
hres
=
IHTMLStyle_get_clear
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_clear failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"both"
),
"clear = %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
/* pageBreakAfter */
hres
=
IHTMLStyle_get_pageBreakAfter
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_pageBreakAfter 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