Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
516ed8e7
Commit
516ed8e7
authored
10 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mshtml: Added IHTMLFrameBase::get_src implementation.
parent
49c72775
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/mshtml/htmlframebase.c
+16
-2
16 additions, 2 deletions
dlls/mshtml/htmlframebase.c
dlls/mshtml/tests/dom.c
+23
-0
23 additions, 0 deletions
dlls/mshtml/tests/dom.c
with
39 additions
and
2 deletions
dlls/mshtml/htmlframebase.c
+
16
−
2
View file @
516ed8e7
...
...
@@ -157,8 +157,22 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v)
static
HRESULT
WINAPI
HTMLFrameBase_get_src
(
IHTMLFrameBase
*
iface
,
BSTR
*
p
)
{
HTMLFrameBase
*
This
=
impl_from_IHTMLFrameBase
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
nsAString
nsstr
;
nsresult
nsres
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
if
(
!
This
->
nsframe
&&
!
This
->
nsiframe
)
{
ERR
(
"No attached frame object
\n
"
);
return
E_UNEXPECTED
;
}
nsAString_Init
(
&
nsstr
,
NULL
);
if
(
This
->
nsframe
)
nsres
=
nsIDOMHTMLFrameElement_GetSrc
(
This
->
nsframe
,
&
nsstr
);
else
nsres
=
nsIDOMHTMLIFrameElement_GetSrc
(
This
->
nsiframe
,
&
nsstr
);
return
return_nsstr
(
nsres
,
&
nsstr
,
p
);
}
static
HRESULT
WINAPI
HTMLFrameBase_put_name
(
IHTMLFrameBase
*
iface
,
BSTR
v
)
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/tests/dom.c
+
23
−
0
View file @
516ed8e7
...
...
@@ -5283,6 +5283,27 @@ static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const ch
IHTMLFrameBase_Release
(
fbase
);
}
#define test_framebase_src(a,b) _test_framebase_src(__LINE__,a,b)
static
void
_test_framebase_src
(
unsigned
line
,
IHTMLElement
*
elem
,
const
char
*
src
)
{
BSTR
str
=
(
void
*
)
0xdeadbeef
;
IHTMLFrameBase
*
fbase
;
HRESULT
hres
;
hres
=
IHTMLElement_QueryInterface
(
elem
,
&
IID_IHTMLFrameBase
,
(
void
**
)
&
fbase
);
ok
(
hres
==
S_OK
,
"Could not get IHTMLFrameBase interface: 0x%08x
\n
"
,
hres
);
hres
=
IHTMLFrameBase_get_src
(
fbase
,
&
str
);
ok_
(
__FILE__
,
line
)(
hres
==
S_OK
,
"IHTMLFrameBase_get_src failed: 0x%08x
\n
"
,
hres
);
if
(
src
)
ok_
(
__FILE__
,
line
)(
!
strcmp_wa
(
str
,
src
),
"src = %s, expected %s
\n
"
,
wine_dbgstr_w
(
str
),
src
);
else
ok_
(
__FILE__
,
line
)(
!
str
,
"src = %s, expected NULL
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
IHTMLFrameBase_Release
(
fbase
);
}
#define test_framebase_marginheight(a,b) _test_framebase_marginheight(__LINE__,a,b)
static
void
_test_framebase_marginheight
(
unsigned
line
,
IHTMLFrameBase
*
framebase
,
const
char
*
exval
)
{
...
...
@@ -6890,6 +6911,7 @@ static void test_iframe_elem(IHTMLElement *elem)
set_iframe_width
(
elem
,
"150px"
);
set_iframe_width
(
elem
,
"70%"
);
test_iframe_width
(
elem
,
"70%"
);
test_framebase_src
(
elem
,
"about:blank"
);
str
=
a2bstr
(
"text/html"
);
V_VT
(
&
errv
)
=
VT_ERROR
;
...
...
@@ -8636,6 +8658,7 @@ static void test_frameset(IHTMLDocument2 *doc)
test_framebase_put_name
(
elem
,
"frame name"
);
test_framebase_put_name
(
elem
,
NULL
);
test_framebase_put_name
(
elem
,
"nm1"
);
test_framebase_src
(
elem
,
"about:blank"
);
IHTMLElement_Release
(
elem
);
/* get_name with no name attr */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment