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
e2a9d203
Commit
e2a9d203
authored
Apr 07, 2017
by
Jacek Caban
Committed by
Alexandre Julliard
Apr 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLTableCell::colSpan property implementation.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b1c7b891
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
4 deletions
+42
-4
htmltablecell.c
dlls/mshtml/htmltablecell.c
+25
-4
dom.c
dlls/mshtml/tests/dom.c
+17
-0
No files found.
dlls/mshtml/htmltablecell.c
View file @
e2a9d203
...
...
@@ -135,15 +135,36 @@ static HRESULT WINAPI HTMLTableCell_get_rowSpan(IHTMLTableCell *iface, LONG *p)
static
HRESULT
WINAPI
HTMLTableCell_put_colSpan
(
IHTMLTableCell
*
iface
,
LONG
v
)
{
HTMLTableCell
*
This
=
impl_from_IHTMLTableCell
(
iface
);
FIXME
(
"(%p)->(%d)
\n
"
,
This
,
v
);
return
E_NOTIMPL
;
nsresult
nsres
;
TRACE
(
"(%p)->(%d)
\n
"
,
This
,
v
);
if
(
v
<=
0
)
return
E_INVALIDARG
;
nsres
=
nsIDOMHTMLTableCellElement_SetColSpan
(
This
->
nscell
,
v
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"SetColSpan failed: %08x
\n
"
,
nsres
);
return
E_FAIL
;
}
return
S_OK
;
}
static
HRESULT
WINAPI
HTMLTableCell_get_colSpan
(
IHTMLTableCell
*
iface
,
LONG
*
p
)
{
HTMLTableCell
*
This
=
impl_from_IHTMLTableCell
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
nsresult
nsres
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
nsres
=
nsIDOMHTMLTableCellElement_GetColSpan
(
This
->
nscell
,
p
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"GetColSpan failed: %08x
\n
"
,
nsres
);
return
E_FAIL
;
}
return
S_OK
;
}
static
HRESULT
WINAPI
HTMLTableCell_put_align
(
IHTMLTableCell
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/tests/dom.c
View file @
e2a9d203
...
...
@@ -7325,6 +7325,23 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div)
ok
(
hres
==
S_OK
,
"get_rowSpan failed: %08x
\n
"
,
hres
);
ok
(
lval
==
2
,
"rowSpan = %d
\n
"
,
lval
);
hres
=
IHTMLTableCell_get_colSpan
(
cell
,
&
lval
);
ok
(
hres
==
S_OK
,
"get_rowSpan failed: %08x
\n
"
,
hres
);
ok
(
lval
==
1
,
"rowSpan = %d
\n
"
,
lval
);
hres
=
IHTMLTableCell_put_colSpan
(
cell
,
-
1
);
ok
(
hres
==
E_INVALIDARG
,
"put_rowSpan failed: %08x
\n
"
,
hres
);
hres
=
IHTMLTableCell_put_colSpan
(
cell
,
0
);
ok
(
hres
==
E_INVALIDARG
,
"put_rowSpan failed: %08x
\n
"
,
hres
);
hres
=
IHTMLTableCell_put_colSpan
(
cell
,
2
);
ok
(
hres
==
S_OK
,
"put_rowSpan failed: %08x
\n
"
,
hres
);
hres
=
IHTMLTableCell_get_colSpan
(
cell
,
&
lval
);
ok
(
hres
==
S_OK
,
"get_rowSpan failed: %08x
\n
"
,
hres
);
ok
(
lval
==
2
,
"rowSpan = %d
\n
"
,
lval
);
IHTMLTableCell_Release
(
cell
);
}
...
...
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