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
0702f061
Commit
0702f061
authored
May 28, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
May 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Add IHTMLTableCell::height property implementation.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0dfc101e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
5 deletions
+45
-5
htmltable.c
dlls/mshtml/htmltable.c
+21
-4
dom.c
dlls/mshtml/tests/dom.c
+24
-1
No files found.
dlls/mshtml/htmltable.c
View file @
0702f061
...
...
@@ -346,15 +346,32 @@ static HRESULT WINAPI HTMLTableCell_get_width(IHTMLTableCell *iface, VARIANT *p)
static
HRESULT
WINAPI
HTMLTableCell_put_height
(
IHTMLTableCell
*
iface
,
VARIANT
v
)
{
HTMLTableCell
*
This
=
impl_from_IHTMLTableCell
(
iface
);
FIXME
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
v
));
return
E_NOTIMPL
;
nsAString
nsstr
;
nsresult
nsres
;
HRESULT
hres
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
v
));
hres
=
variant_to_nsstr
(
&
v
,
FALSE
,
&
nsstr
);
if
(
FAILED
(
hres
))
return
hres
;
nsres
=
nsIDOMHTMLTableCellElement_SetHeight
(
This
->
nscell
,
&
nsstr
);
nsAString_Finish
(
&
nsstr
);
return
map_nsresult
(
nsres
);
}
static
HRESULT
WINAPI
HTMLTableCell_get_height
(
IHTMLTableCell
*
iface
,
VARIANT
*
p
)
{
HTMLTableCell
*
This
=
impl_from_IHTMLTableCell
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
nsAString
nsstr
;
nsresult
nsres
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
nsAString_Init
(
&
nsstr
,
NULL
);
nsres
=
nsIDOMHTMLTableCellElement_GetHeight
(
This
->
nscell
,
&
nsstr
);
return
return_nsstr_variant
(
nsres
,
&
nsstr
,
NSSTR_IMPLICIT_PX
,
p
);
}
static
HRESULT
WINAPI
HTMLTableCell_get_cellIndex
(
IHTMLTableCell
*
iface
,
LONG
*
p
)
...
...
dlls/mshtml/tests/dom.c
View file @
0702f061
...
...
@@ -7564,7 +7564,7 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div)
HRESULT
hres
;
LONG
lval
;
BSTR
str
;
VARIANT
vbg
,
vDefaultbg
;
VARIANT
vbg
,
vDefaultbg
,
v
;
test_elem_set_innerhtml
((
IUnknown
*
)
div
,
L"<table id=
\"
tbl
\"
><tbody>"
...
...
@@ -7626,6 +7626,29 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div)
ok
(
!
lstrcmpW
(
V_BSTR
(
&
vbg
),
L"#ff0000"
),
"Unexpected bgcolor %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
vbg
)));
VariantClear
(
&
vbg
);
V_VT
(
&
v
)
=
VT_I4
;
V_I4
(
&
v
)
=
100
;
hres
=
IHTMLTableCell_put_height
(
cell
,
v
);
ok
(
hres
==
S_OK
,
"put_height failed: %08x
\n
"
,
hres
);
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
IHTMLTableCell_get_height
(
cell
,
&
v
);
ok
(
hres
==
S_OK
,
"get_height failed: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_BSTR
&&
!
lstrcmpW
(
V_BSTR
(
&
v
),
L"100"
),
"height = %s
\n
"
,
wine_dbgstr_variant
(
&
v
));
VariantClear
(
&
v
);
V_VT
(
&
v
)
=
VT_BSTR
;
V_BSTR
(
&
v
)
=
SysAllocString
(
L"110px"
);
hres
=
IHTMLTableCell_put_height
(
cell
,
v
);
ok
(
hres
==
S_OK
,
"put_height failed: %08x
\n
"
,
hres
);
SysFreeString
(
V_BSTR
(
&
v
));
V_VT
(
&
v
)
=
VT_EMPTY
;
hres
=
IHTMLTableCell_get_height
(
cell
,
&
v
);
ok
(
hres
==
S_OK
,
"get_height failed: %08x
\n
"
,
hres
);
ok
(
V_VT
(
&
v
)
==
VT_BSTR
&&
!
lstrcmpW
(
V_BSTR
(
&
v
),
L"110"
),
"height = %s
\n
"
,
wine_dbgstr_variant
(
&
v
));
VariantClear
(
&
v
);
/* Restore Original */
hres
=
IHTMLTableCell_put_bgColor
(
cell
,
vDefaultbg
);
ok
(
hres
==
S_OK
,
"put_bgColor 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