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
87083c9d
Commit
87083c9d
authored
Dec 18, 2006
by
Markus Amsler
Committed by
Alexandre Julliard
Dec 18, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: Handle volume container in d3d8.
parent
05318581
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
21 deletions
+7
-21
d3d8_private.h
dlls/d3d8/d3d8_private.h
+3
-0
volume.c
dlls/d3d8/volume.c
+4
-21
No files found.
dlls/d3d8/d3d8_private.h
View file @
87083c9d
...
...
@@ -200,6 +200,9 @@ struct IDirect3DVolume8Impl
/* IDirect3DVolume8 fields */
IWineD3DVolume
*
wineD3DVolume
;
/* The volume container */
IUnknown
*
container
;
/* If set forward refcounting to this object */
IUnknown
*
forwardReference
;
};
...
...
dlls/d3d8/volume.c
View file @
87083c9d
...
...
@@ -111,35 +111,17 @@ static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 ifa
static
HRESULT
WINAPI
IDirect3DVolume8Impl_GetContainer
(
LPDIRECT3DVOLUME8
iface
,
REFIID
riid
,
void
**
ppContainer
)
{
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
IWineD3DBase
*
wineD3DContainer
=
NULL
;
IUnknown
*
wineD3DContainerParent
=
NULL
;
HRESULT
res
;
TRACE
(
"(This %p, riid %s, ppContainer %p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppContainer
);
if
(
!
This
->
container
)
return
E_NOINTERFACE
;
if
(
!
ppContainer
)
{
ERR
(
"Called without a valid ppContainer.
\n
"
);
}
/* Get the WineD3D container. */
res
=
IWineD3DVolume_GetContainer
(
This
->
wineD3DVolume
,
&
IID_IWineD3DBase
,
(
void
**
)
&
wineD3DContainer
);
if
(
res
!=
D3D_OK
)
return
res
;
if
(
!
wineD3DContainer
)
{
ERR
(
"IWineD3DSurface_GetContainer should never return NULL
\n
"
);
}
/* Get the parent */
IWineD3DBase_GetParent
(
wineD3DContainer
,
&
wineD3DContainerParent
);
IUnknown_Release
(
wineD3DContainer
);
if
(
!
wineD3DContainerParent
)
{
ERR
(
"IWineD3DBase_GetParent should never return NULL
\n
"
);
}
/* Now, query the interface of the parent for the riid */
res
=
IUnknown_QueryInterface
(
wineD3DContainerParent
,
riid
,
ppContainer
);
IUnknown_Release
(
wineD3DContainerParent
);
res
=
IUnknown_QueryInterface
(
This
->
container
,
riid
,
ppContainer
);
TRACE
(
"Returning ppContainer %p, *ppContainer %p
\n
"
,
ppContainer
,
*
ppContainer
);
...
...
@@ -223,6 +205,7 @@ HRESULT WINAPI D3D8CB_CreateVolume(IUnknown *pDevice, IUnknown *pSuperior, UINT
*
ppVolume
=
NULL
;
}
else
{
*
ppVolume
=
(
IWineD3DVolume
*
)
object
->
wineD3DVolume
;
object
->
container
=
pSuperior
;
object
->
forwardReference
=
pSuperior
;
}
TRACE
(
"(%p) Created volume %p
\n
"
,
This
,
*
ppVolume
);
...
...
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