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
39bc0bcf
Commit
39bc0bcf
authored
Jul 23, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 23, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLFrameBase::frameBorder implementation.
parent
7e35abdd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
4 deletions
+51
-4
htmlframebase.c
dlls/mshtml/htmlframebase.c
+38
-4
dom.c
dlls/mshtml/tests/dom.c
+13
-0
No files found.
dlls/mshtml/htmlframebase.c
View file @
39bc0bcf
...
@@ -190,15 +190,49 @@ static HRESULT WINAPI HTMLFrameBase_get_border(IHTMLFrameBase *iface, VARIANT *p
...
@@ -190,15 +190,49 @@ static HRESULT WINAPI HTMLFrameBase_get_border(IHTMLFrameBase *iface, VARIANT *p
static
HRESULT
WINAPI
HTMLFrameBase_put_frameBorder
(
IHTMLFrameBase
*
iface
,
BSTR
v
)
static
HRESULT
WINAPI
HTMLFrameBase_put_frameBorder
(
IHTMLFrameBase
*
iface
,
BSTR
v
)
{
{
HTMLFrameBase
*
This
=
impl_from_IHTMLFrameBase
(
iface
);
HTMLFrameBase
*
This
=
impl_from_IHTMLFrameBase
(
iface
);
FIXME
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
v
));
nsAString
nsstr
;
return
E_NOTIMPL
;
nsresult
nsres
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
v
));
if
(
!
This
->
nsframe
&&
!
This
->
nsiframe
)
{
ERR
(
"No attached ns frame object
\n
"
);
return
E_UNEXPECTED
;
}
nsAString_InitDepend
(
&
nsstr
,
v
);
if
(
This
->
nsframe
)
nsres
=
nsIDOMHTMLFrameElement_SetFrameBorder
(
This
->
nsframe
,
&
nsstr
);
else
nsres
=
nsIDOMHTMLIFrameElement_SetFrameBorder
(
This
->
nsiframe
,
&
nsstr
);
nsAString_Finish
(
&
nsstr
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"SetFrameBorder failed: %08x
\n
"
,
nsres
);
return
E_FAIL
;
}
return
S_OK
;
}
}
static
HRESULT
WINAPI
HTMLFrameBase_get_frameBorder
(
IHTMLFrameBase
*
iface
,
BSTR
*
p
)
static
HRESULT
WINAPI
HTMLFrameBase_get_frameBorder
(
IHTMLFrameBase
*
iface
,
BSTR
*
p
)
{
{
HTMLFrameBase
*
This
=
impl_from_IHTMLFrameBase
(
iface
);
HTMLFrameBase
*
This
=
impl_from_IHTMLFrameBase
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
nsAString
nsstr
;
return
E_NOTIMPL
;
nsresult
nsres
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
if
(
!
This
->
nsframe
&&
!
This
->
nsiframe
)
{
ERR
(
"No attached ns frame object
\n
"
);
return
E_UNEXPECTED
;
}
nsAString_Init
(
&
nsstr
,
NULL
);
if
(
This
->
nsframe
)
nsres
=
nsIDOMHTMLFrameElement_GetFrameBorder
(
This
->
nsframe
,
&
nsstr
);
else
nsres
=
nsIDOMHTMLIFrameElement_GetFrameBorder
(
This
->
nsiframe
,
&
nsstr
);
return
return_nsstr
(
nsres
,
&
nsstr
,
p
);
}
}
static
HRESULT
WINAPI
HTMLFrameBase_put_frameSpacing
(
IHTMLFrameBase
*
iface
,
VARIANT
v
)
static
HRESULT
WINAPI
HTMLFrameBase_put_frameSpacing
(
IHTMLFrameBase
*
iface
,
VARIANT
v
)
...
...
dlls/mshtml/tests/dom.c
View file @
39bc0bcf
...
@@ -4239,6 +4239,19 @@ static void test_framebase(IUnknown *unk)
...
@@ -4239,6 +4239,19 @@ static void test_framebase(IUnknown *unk)
ok
(
!
strcmp_wa
(
str
,
"no"
),
"get_scrolling should have given 'no', gave: %s
\n
"
,
wine_dbgstr_w
(
str
));
ok
(
!
strcmp_wa
(
str
,
"no"
),
"get_scrolling should have given 'no', gave: %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
SysFreeString
(
str
);
hres
=
IHTMLFrameBase_get_frameBorder
(
fbase
,
&
str
);
ok
(
hres
==
S_OK
,
"get_frameBorder failed: %08x
\n
"
,
hres
);
ok
(
!
str
,
"frameBorder = %s
\n
"
,
wine_dbgstr_w
(
str
));
str
=
a2bstr
(
"1"
);
hres
=
IHTMLFrameBase_put_frameBorder
(
fbase
,
str
);
ok
(
hres
==
S_OK
,
"put_frameBorder failed: %08x
\n
"
,
hres
);
SysFreeString
(
str
);
hres
=
IHTMLFrameBase_get_frameBorder
(
fbase
,
&
str
);
ok
(
hres
==
S_OK
,
"get_frameBorder failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"1"
),
"frameBorder = %s, expected
\"
1
\"\n
"
,
wine_dbgstr_w
(
str
));
IHTMLFrameBase_Release
(
fbase
);
IHTMLFrameBase_Release
(
fbase
);
}
}
...
...
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