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
9e183990
Commit
9e183990
authored
Jun 30, 2012
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jul 02, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3drm: Make IDirect3DRMx_CreateFrame() more forgiving about the parent frame.
parent
65f686c8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
10 deletions
+11
-10
frame.c
dlls/d3drm/frame.c
+11
-10
No files found.
dlls/d3drm/frame.c
View file @
9e183990
...
...
@@ -2671,6 +2671,7 @@ static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3D
HRESULT
Direct3DRMFrame_create
(
REFIID
riid
,
IUnknown
*
parent
,
IUnknown
**
ret_iface
)
{
IDirect3DRMFrameImpl
*
object
;
HRESULT
hr
;
TRACE
(
"(%s, %p, %p)
\n
"
,
wine_dbgstr_guid
(
riid
),
parent
,
ret_iface
);
...
...
@@ -2687,18 +2688,18 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa
memcpy
(
&
object
->
transform
[
0
][
0
],
&
identity
[
0
][
0
],
sizeof
(
D3DRMMATRIX4D
));
if
(
IsEqualGUID
(
riid
,
&
IID_IDirect3DRMFrame3
)
)
if
(
parent
)
{
if
(
parent
)
IDirect3DRMFrame3_AddChild
((
IDirect3DRMFrame3
*
)
parent
,
&
object
->
IDirect3DRMFrame3_iface
);
*
ret_iface
=
(
IUnknown
*
)
&
object
->
IDirect3DRMFrame3_iface
;
}
else
{
if
(
parent
)
IDirect3DRMFrame2_AddChild
((
IDirect3DRMFrame2
*
)
parent
,
(
IDirect3DRMFrame
*
)
&
object
->
IDirect3DRMFrame2_iface
);
*
ret_iface
=
(
IUnknown
*
)
&
object
->
IDirect3DRMFrame2_iface
;
IDirect3DRMFrame3
*
p
;
hr
=
IDirect3DRMFrame_QueryInterface
(
parent
,
&
IID_IDirect3DRMFrame3
,
(
void
**
)
&
p
);
if
(
hr
!=
S_OK
)
return
hr
;
IDirect3DRMFrame_Release
(
parent
);
IDirect3DRMFrame3_AddChild
(
p
,
&
object
->
IDirect3DRMFrame3_iface
);
}
hr
=
IDirect3DRMFrame3_QueryInterface
(
&
object
->
IDirect3DRMFrame3_iface
,
riid
,
(
void
**
)
ret_iface
);
IDirect3DRMFrame3_Release
(
&
object
->
IDirect3DRMFrame3_iface
);
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