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
bf463eae
Commit
bf463eae
authored
Aug 10, 2014
by
Zhenbo Li
Committed by
Alexandre Julliard
Aug 11, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLStyle::listStylePosition property implementation.
parent
ed9b0f75
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
4 deletions
+21
-4
htmlstyle.c
dlls/mshtml/htmlstyle.c
+11
-4
htmlstyle.h
dlls/mshtml/htmlstyle.h
+1
-0
style.c
dlls/mshtml/tests/style.c
+9
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
bf463eae
...
@@ -128,6 +128,8 @@ static const WCHAR attrLineHeight[] =
...
@@ -128,6 +128,8 @@ static const WCHAR attrLineHeight[] =
{
'l'
,
'i'
,
'n'
,
'e'
,
'-'
,
'h'
,
'e'
,
'i'
,
'g'
,
'h'
,
't'
,
0
};
{
'l'
,
'i'
,
'n'
,
'e'
,
'-'
,
'h'
,
'e'
,
'i'
,
'g'
,
'h'
,
't'
,
0
};
static
const
WCHAR
attrListStyleType
[]
=
static
const
WCHAR
attrListStyleType
[]
=
{
'l'
,
'i'
,
's'
,
't'
,
'-'
,
's'
,
't'
,
'y'
,
'l'
,
'e'
,
'-'
,
't'
,
'y'
,
'p'
,
'e'
,
0
};
{
'l'
,
'i'
,
's'
,
't'
,
'-'
,
's'
,
't'
,
'y'
,
'l'
,
'e'
,
'-'
,
't'
,
'y'
,
'p'
,
'e'
,
0
};
static
const
WCHAR
attrListStylePosition
[]
=
{
'l'
,
'i'
,
's'
,
't'
,
'-'
,
's'
,
't'
,
'y'
,
'l'
,
'e'
,
'-'
,
'p'
,
'o'
,
's'
,
'i'
,
't'
,
'i'
,
'o'
,
'n'
,
0
};
static
const
WCHAR
attrMargin
[]
=
static
const
WCHAR
attrMargin
[]
=
{
'm'
,
'a'
,
'r'
,
'g'
,
'i'
,
'n'
,
0
};
{
'm'
,
'a'
,
'r'
,
'g'
,
'i'
,
'n'
,
0
};
static
const
WCHAR
attrMarginBottom
[]
=
static
const
WCHAR
attrMarginBottom
[]
=
...
@@ -245,6 +247,7 @@ static const style_tbl_entry_t style_tbl[] = {
...
@@ -245,6 +247,7 @@ static const style_tbl_entry_t style_tbl[] = {
{
attrLeft
,
DISPID_IHTMLSTYLE_LEFT
},
{
attrLeft
,
DISPID_IHTMLSTYLE_LEFT
},
{
attrLetterSpacing
,
DISPID_IHTMLSTYLE_LETTERSPACING
},
{
attrLetterSpacing
,
DISPID_IHTMLSTYLE_LETTERSPACING
},
{
attrLineHeight
,
DISPID_IHTMLSTYLE_LINEHEIGHT
},
{
attrLineHeight
,
DISPID_IHTMLSTYLE_LINEHEIGHT
},
{
attrListStylePosition
,
DISPID_IHTMLSTYLE_LISTSTYLEPOSITION
},
{
attrListStyleType
,
DISPID_IHTMLSTYLE_LISTSTYLETYPE
},
{
attrListStyleType
,
DISPID_IHTMLSTYLE_LISTSTYLETYPE
},
{
attrMargin
,
DISPID_IHTMLSTYLE_MARGIN
},
{
attrMargin
,
DISPID_IHTMLSTYLE_MARGIN
},
{
attrMarginBottom
,
DISPID_IHTMLSTYLE_MARGINBOTTOM
},
{
attrMarginBottom
,
DISPID_IHTMLSTYLE_MARGINBOTTOM
},
...
@@ -2196,15 +2199,19 @@ static HRESULT WINAPI HTMLStyle_get_listStyleType(IHTMLStyle *iface, BSTR *p)
...
@@ -2196,15 +2199,19 @@ static HRESULT WINAPI HTMLStyle_get_listStyleType(IHTMLStyle *iface, BSTR *p)
static
HRESULT
WINAPI
HTMLStyle_put_listStylePosition
(
IHTMLStyle
*
iface
,
BSTR
v
)
static
HRESULT
WINAPI
HTMLStyle_put_listStylePosition
(
IHTMLStyle
*
iface
,
BSTR
v
)
{
{
HTMLStyle
*
This
=
impl_from_IHTMLStyle
(
iface
);
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_LISTSTYLEPOSITION
,
v
,
0
);
}
}
static
HRESULT
WINAPI
HTMLStyle_get_listStylePosition
(
IHTMLStyle
*
iface
,
BSTR
*
p
)
static
HRESULT
WINAPI
HTMLStyle_get_listStylePosition
(
IHTMLStyle
*
iface
,
BSTR
*
p
)
{
{
HTMLStyle
*
This
=
impl_from_IHTMLStyle
(
iface
);
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_LISTSTYLEPOSITION
,
p
);
}
}
static
HRESULT
WINAPI
HTMLStyle_put_listStyleImage
(
IHTMLStyle
*
iface
,
BSTR
v
)
static
HRESULT
WINAPI
HTMLStyle_put_listStyleImage
(
IHTMLStyle
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlstyle.h
View file @
bf463eae
...
@@ -78,6 +78,7 @@ typedef enum {
...
@@ -78,6 +78,7 @@ typedef enum {
STYLEID_LEFT
,
STYLEID_LEFT
,
STYLEID_LETTER_SPACING
,
STYLEID_LETTER_SPACING
,
STYLEID_LINE_HEIGHT
,
STYLEID_LINE_HEIGHT
,
STYLEID_LISTSTYLEPOSITION
,
STYLEID_LISTSTYLETYPE
,
STYLEID_LISTSTYLETYPE
,
STYLEID_MARGIN
,
STYLEID_MARGIN
,
STYLEID_MARGIN_BOTTOM
,
STYLEID_MARGIN_BOTTOM
,
...
...
dlls/mshtml/tests/style.c
View file @
bf463eae
...
@@ -2161,6 +2161,15 @@ static void test_body_style(IHTMLStyle *style)
...
@@ -2161,6 +2161,15 @@ static void test_body_style(IHTMLStyle *style)
hres
=
IHTMLStyle_get_listStyleType
(
style
,
&
str
);
hres
=
IHTMLStyle_get_listStyleType
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_listStyleType failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"get_listStyleType failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"square"
),
"listStyleType = %s
\n
"
,
wine_dbgstr_w
(
str
));
ok
(
!
strcmp_wa
(
str
,
"square"
),
"listStyleType = %s
\n
"
,
wine_dbgstr_w
(
str
));
str
=
a2bstr
(
"inside"
);
hres
=
IHTMLStyle_put_listStylePosition
(
style
,
str
);
ok
(
hres
==
S_OK
,
"put_listStylePosition failed: %08x
\n
"
,
hres
);
SysFreeString
(
str
);
hres
=
IHTMLStyle_get_listStylePosition
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_listStylePosition failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"inside"
),
"listStyleType = %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
SysFreeString
(
str
);
hres
=
IHTMLStyle_QueryInterface
(
style
,
&
IID_IHTMLStyle2
,
(
void
**
)
&
style2
);
hres
=
IHTMLStyle_QueryInterface
(
style
,
&
IID_IHTMLStyle2
,
(
void
**
)
&
style2
);
...
...
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