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
90014d15
Commit
90014d15
authored
Aug 18, 2014
by
Zhenbo Li
Committed by
Alexandre Julliard
Aug 19, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLStyle2::tableLayout property implementation.
parent
2b9cade4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
4 deletions
+24
-4
htmlstyle.c
dlls/mshtml/htmlstyle.c
+3
-0
htmlstyle.h
dlls/mshtml/htmlstyle.h
+1
-0
htmlstyle2.c
dlls/mshtml/htmlstyle2.c
+8
-4
style.c
dlls/mshtml/tests/style.c
+12
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
90014d15
...
@@ -168,6 +168,8 @@ static const WCHAR attrPosition[] =
...
@@ -168,6 +168,8 @@ static const WCHAR attrPosition[] =
{
'p'
,
'o'
,
's'
,
'i'
,
't'
,
'i'
,
'o'
,
'n'
,
0
};
{
'p'
,
'o'
,
's'
,
'i'
,
't'
,
'i'
,
'o'
,
'n'
,
0
};
static
const
WCHAR
attrRight
[]
=
static
const
WCHAR
attrRight
[]
=
{
'r'
,
'i'
,
'g'
,
'h'
,
't'
,
0
};
{
'r'
,
'i'
,
'g'
,
'h'
,
't'
,
0
};
static
const
WCHAR
attrTableLayout
[]
=
{
't'
,
'a'
,
'b'
,
'l'
,
'e'
,
'-'
,
'l'
,
'a'
,
'y'
,
'o'
,
'u'
,
't'
,
0
};
static
const
WCHAR
attrTextAlign
[]
=
static
const
WCHAR
attrTextAlign
[]
=
{
't'
,
'e'
,
'x'
,
't'
,
'-'
,
'a'
,
'l'
,
'i'
,
'g'
,
'n'
,
0
};
{
't'
,
'e'
,
'x'
,
't'
,
'-'
,
'a'
,
'l'
,
'i'
,
'g'
,
'n'
,
0
};
static
const
WCHAR
attrTextDecoration
[]
=
static
const
WCHAR
attrTextDecoration
[]
=
...
@@ -268,6 +270,7 @@ static const style_tbl_entry_t style_tbl[] = {
...
@@ -268,6 +270,7 @@ static const style_tbl_entry_t style_tbl[] = {
{
attrPageBreakBefore
,
DISPID_IHTMLSTYLE_PAGEBREAKBEFORE
},
{
attrPageBreakBefore
,
DISPID_IHTMLSTYLE_PAGEBREAKBEFORE
},
{
attrPosition
,
DISPID_IHTMLSTYLE2_POSITION
},
{
attrPosition
,
DISPID_IHTMLSTYLE2_POSITION
},
{
attrRight
,
DISPID_IHTMLSTYLE2_RIGHT
},
{
attrRight
,
DISPID_IHTMLSTYLE2_RIGHT
},
{
attrTableLayout
,
DISPID_IHTMLSTYLE2_TABLELAYOUT
},
{
attrTextAlign
,
DISPID_IHTMLSTYLE_TEXTALIGN
},
{
attrTextAlign
,
DISPID_IHTMLSTYLE_TEXTALIGN
},
{
attrTextDecoration
,
DISPID_IHTMLSTYLE_TEXTDECORATION
},
{
attrTextDecoration
,
DISPID_IHTMLSTYLE_TEXTDECORATION
},
{
attrTextIndent
,
DISPID_IHTMLSTYLE_TEXTINDENT
},
{
attrTextIndent
,
DISPID_IHTMLSTYLE_TEXTINDENT
},
...
...
dlls/mshtml/htmlstyle.h
View file @
90014d15
...
@@ -99,6 +99,7 @@ typedef enum {
...
@@ -99,6 +99,7 @@ typedef enum {
STYLEID_PAGE_BREAK_BEFORE
,
STYLEID_PAGE_BREAK_BEFORE
,
STYLEID_POSITION
,
STYLEID_POSITION
,
STYLEID_RIGHT
,
STYLEID_RIGHT
,
STYLEID_TABLE_LAYOUT
,
STYLEID_TEXT_ALIGN
,
STYLEID_TEXT_ALIGN
,
STYLEID_TEXT_DECORATION
,
STYLEID_TEXT_DECORATION
,
STYLEID_TEXT_INDENT
,
STYLEID_TEXT_INDENT
,
...
...
dlls/mshtml/htmlstyle2.c
View file @
90014d15
...
@@ -92,15 +92,19 @@ static HRESULT WINAPI HTMLStyle2_Invoke(IHTMLStyle2 *iface, DISPID dispIdMember,
...
@@ -92,15 +92,19 @@ static HRESULT WINAPI HTMLStyle2_Invoke(IHTMLStyle2 *iface, DISPID dispIdMember,
static
HRESULT
WINAPI
HTMLStyle2_put_tableLayout
(
IHTMLStyle2
*
iface
,
BSTR
v
)
static
HRESULT
WINAPI
HTMLStyle2_put_tableLayout
(
IHTMLStyle2
*
iface
,
BSTR
v
)
{
{
HTMLStyle
*
This
=
impl_from_IHTMLStyle2
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle2
(
iface
);
FIXME
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
v
));
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
v
));
return
set_nsstyle_attr
(
This
->
nsstyle
,
STYLEID_TABLE_LAYOUT
,
v
,
0
);
}
}
static
HRESULT
WINAPI
HTMLStyle2_get_tableLayout
(
IHTMLStyle2
*
iface
,
BSTR
*
p
)
static
HRESULT
WINAPI
HTMLStyle2_get_tableLayout
(
IHTMLStyle2
*
iface
,
BSTR
*
p
)
{
{
HTMLStyle
*
This
=
impl_from_IHTMLStyle2
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle2
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
get_nsstyle_attr
(
This
->
nsstyle
,
STYLEID_TABLE_LAYOUT
,
p
,
0
);
}
}
static
HRESULT
WINAPI
HTMLStyle2_put_borderCollapse
(
IHTMLStyle2
*
iface
,
BSTR
v
)
static
HRESULT
WINAPI
HTMLStyle2_put_borderCollapse
(
IHTMLStyle2
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/tests/style.c
View file @
90014d15
...
@@ -421,6 +421,18 @@ static void test_style2(IHTMLStyle2 *style2)
...
@@ -421,6 +421,18 @@ static void test_style2(IHTMLStyle2 *style2)
hres
=
IHTMLStyle2_get_overflowY
(
style2
,
&
str
);
hres
=
IHTMLStyle2_get_overflowY
(
style2
,
&
str
);
ok
(
hres
==
S_OK
,
"get_overflowY failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"get_overflowY failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"hidden"
),
"overflowX = %s
\n
"
,
wine_dbgstr_w
(
str
));
ok
(
!
strcmp_wa
(
str
,
"hidden"
),
"overflowX = %s
\n
"
,
wine_dbgstr_w
(
str
));
/* tableLayout */
str
=
a2bstr
(
"fixed"
);
hres
=
IHTMLStyle2_put_tableLayout
(
style2
,
str
);
ok
(
hres
==
S_OK
,
"put_tableLayout failed: %08x
\n
"
,
hres
);
SysFreeString
(
str
);
str
=
(
void
*
)
0xdeadbeef
;
hres
=
IHTMLStyle2_get_tableLayout
(
style2
,
&
str
);
ok
(
hres
==
S_OK
,
"get_tableLayout failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"fixed"
),
"tableLayout = %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
}
}
static
void
test_style3
(
IHTMLStyle3
*
style3
)
static
void
test_style3
(
IHTMLStyle3
*
style3
)
...
...
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