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
9157c6d6
Commit
9157c6d6
authored
Jun 30, 2008
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 01, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Return NULL in window object's GetNameSpaceParent.
parent
45eba140
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
htmlwindow.c
dlls/mshtml/htmlwindow.c
+2
-1
script.c
dlls/mshtml/tests/script.c
+7
-0
No files found.
dlls/mshtml/htmlwindow.c
View file @
9157c6d6
...
@@ -1127,7 +1127,8 @@ static HRESULT WINAPI WindowDispEx_GetNameSpaceParent(IDispatchEx *iface, IUnkno
...
@@ -1127,7 +1127,8 @@ static HRESULT WINAPI WindowDispEx_GetNameSpaceParent(IDispatchEx *iface, IUnkno
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
ppunk
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
ppunk
);
return
IDispatchEx_GetNameSpaceParent
(
DISPATCHEX
(
&
This
->
dispex
),
ppunk
);
*
ppunk
=
NULL
;
return
S_OK
;
}
}
#undef DISPEX_THIS
#undef DISPEX_THIS
...
...
dlls/mshtml/tests/script.c
View file @
9157c6d6
...
@@ -439,6 +439,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac
...
@@ -439,6 +439,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac
DWORD
dwFlags
,
VARIANT
*
pvarResult
,
EXCEPINFO
*
pexcepinfo
)
DWORD
dwFlags
,
VARIANT
*
pvarResult
,
EXCEPINFO
*
pexcepinfo
)
{
{
IDispatchEx
*
document
;
IDispatchEx
*
document
;
IUnknown
*
unk
;
VARIANT
var
;
VARIANT
var
;
DISPPARAMS
dp
;
DISPPARAMS
dp
;
EXCEPINFO
ei
;
EXCEPINFO
ei
;
...
@@ -510,6 +511,12 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac
...
@@ -510,6 +511,12 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac
ok
(
V_I4
(
&
var
)
==
100
,
"V_I4(&var) == NULL
\n
"
);
ok
(
V_I4
(
&
var
)
==
100
,
"V_I4(&var) == NULL
\n
"
);
IDispatchEx_Release
(
document
);
IDispatchEx_Release
(
document
);
unk
=
(
void
*
)
0xdeadbeef
;
hres
=
IDispatchEx_GetNameSpaceParent
(
window_dispex
,
&
unk
);
ok
(
hres
==
S_OK
,
"GetNameSpaceParent failed: %08x
\n
"
,
hres
);
ok
(
!
unk
,
"unk=%p, expected NULL
\n
"
,
unk
);
return
S_OK
;
return
S_OK
;
}
}
...
...
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