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
7e301611
Commit
7e301611
authored
Jun 26, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use variant_to_nsstr in IHTMLIFrameElement2::put_width.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
190762cb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
htmlframe.c
dlls/mshtml/htmlframe.c
+4
-5
dom.c
dlls/mshtml/tests/dom.c
+6
-0
No files found.
dlls/mshtml/htmlframe.c
View file @
7e301611
...
...
@@ -1278,15 +1278,14 @@ static HRESULT WINAPI HTMLIFrameElement2_put_width(IHTMLIFrameElement2 *iface, V
HTMLIFrame
*
This
=
impl_from_IHTMLIFrameElement2
(
iface
);
nsAString
nsstr
;
nsresult
nsres
;
HRESULT
hres
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
v
));
if
(
V_VT
(
&
v
)
!=
VT_BSTR
)
{
FIXME
(
"Unsupported %s
\n
"
,
debugstr_variant
(
&
v
));
return
E_NOTIMPL
;
}
hres
=
variant_to_nsstr
(
&
v
,
FALSE
,
&
nsstr
);
if
(
FAILED
(
hres
))
return
hres
;
nsAString_InitDepend
(
&
nsstr
,
V_BSTR
(
&
v
));
nsres
=
nsIDOMHTMLIFrameElement_SetWidth
(
This
->
framebase
.
nsiframe
,
&
nsstr
);
nsAString_Finish
(
&
nsstr
);
if
(
NS_FAILED
(
nsres
))
{
...
...
dlls/mshtml/tests/dom.c
View file @
7e301611
...
...
@@ -8264,6 +8264,12 @@ static void test_iframe_elem(IHTMLElement *elem)
test_iframe_width
(
elem
,
L"70%"
);
test_framebase_src
(
elem
,
L"about:blank"
);
V_VT
(
&
v
)
=
VT_I4
;
V_I4
(
&
v
)
=
110
;
hres
=
IHTMLIFrameElement2_put_width
(
iframe2
,
v
);
ok
(
hres
==
S_OK
,
"put_height failed: %08x
\n
"
,
hres
);
test_iframe_width
(
elem
,
L"110"
);
str
=
SysAllocString
(
L"text/html"
);
V_VT
(
&
errv
)
=
VT_ERROR
;
disp
=
NULL
;
...
...
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