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
9cf9d201
Commit
9cf9d201
authored
Aug 31, 2009
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 01, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLWindow2::toString implementation.
parent
f6b84641
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
htmlwindow.c
dlls/mshtml/htmlwindow.c
+10
-2
dom.c
dlls/mshtml/tests/dom.c
+10
-0
No files found.
dlls/mshtml/htmlwindow.c
View file @
9cf9d201
...
...
@@ -745,8 +745,16 @@ static HRESULT WINAPI HTMLWindow2_execScript(IHTMLWindow2 *iface, BSTR scode, BS
static
HRESULT
WINAPI
HTMLWindow2_toString
(
IHTMLWindow2
*
iface
,
BSTR
*
String
)
{
HTMLWindow
*
This
=
HTMLWINDOW2_THIS
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
String
);
return
E_NOTIMPL
;
static
const
WCHAR
objectW
[]
=
{
'['
,
'o'
,
'b'
,
'j'
,
'e'
,
'c'
,
't'
,
']'
,
0
};
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
String
);
if
(
!
String
)
return
E_INVALIDARG
;
*
String
=
SysAllocString
(
objectW
);
return
*
String
?
S_OK
:
E_OUTOFMEMORY
;
}
static
HRESULT
WINAPI
HTMLWindow2_scrollBy
(
IHTMLWindow2
*
iface
,
LONG
x
,
LONG
y
)
...
...
dlls/mshtml/tests/dom.c
View file @
9cf9d201
...
...
@@ -3959,6 +3959,7 @@ static void test_window(IHTMLDocument2 *doc)
IHTMLWindow2
*
window
,
*
window2
,
*
self
;
IHTMLDocument2
*
doc2
=
NULL
;
IDispatch
*
disp
;
BSTR
str
;
HRESULT
hres
;
hres
=
IHTMLDocument2_get_parentWindow
(
doc
,
&
window
);
...
...
@@ -3991,6 +3992,15 @@ static void test_window(IHTMLDocument2 *doc)
ok
(
disp
==
(
void
*
)
window
,
"disp != window
\n
"
);
IDispatch_Release
(
disp
);
hres
=
IHTMLWindow2_toString
(
window
,
NULL
);
ok
(
hres
==
E_INVALIDARG
,
"toString failed: %08x
\n
"
,
hres
);
str
=
NULL
;
hres
=
IHTMLWindow2_toString
(
window
,
&
str
);
ok
(
hres
==
S_OK
,
"toString failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"[object]"
),
"toString returned %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
IHTMLWindow2_Release
(
window
);
}
...
...
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