Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
4ca9fccf
Commit
4ca9fccf
authored
18 years ago
by
Markus Amsler
Committed by
Alexandre Julliard
18 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wined3d: Remove IWineD3DVolume_GetContainerParent.
parent
9b397ec2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/wined3d/volume.c
+0
-24
0 additions, 24 deletions
dlls/wined3d/volume.c
include/wine/wined3d_interface.h
+0
-2
0 additions, 2 deletions
include/wine/wined3d_interface.h
with
0 additions
and
26 deletions
dlls/wined3d/volume.c
+
0
−
24
View file @
4ca9fccf
...
...
@@ -104,29 +104,6 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa
/* *******************************************
IWineD3DVolume parts follow
******************************************* */
static
HRESULT
WINAPI
IWineD3DVolumeImpl_GetContainerParent
(
IWineD3DVolume
*
iface
,
IUnknown
**
ppContainerParent
)
{
IWineD3DVolumeImpl
*
This
=
(
IWineD3DVolumeImpl
*
)
iface
;
TRACE
(
"(%p) : ppContainerParent %p
\n
"
,
This
,
ppContainerParent
);
if
(
!
ppContainerParent
)
{
ERR
(
"(%p) : Called without a valid ppContainerParent
\n
"
,
This
);
}
if
(
This
->
container
)
{
IWineD3DBase_GetParent
(
This
->
container
,
ppContainerParent
);
if
(
!
ppContainerParent
)
{
/* WineD3D objects should always have a parent */
ERR
(
"(%p) : GetParent returned NULL
\n
"
,
This
);
}
IUnknown_Release
(
*
ppContainerParent
);
/* GetParent adds a reference; we want just the pointer */
}
else
{
*
ppContainerParent
=
NULL
;
}
return
WINED3D_OK
;
}
static
HRESULT
WINAPI
IWineD3DVolumeImpl_GetContainer
(
IWineD3DVolume
*
iface
,
REFIID
riid
,
void
**
ppContainer
)
{
IWineD3DVolumeImpl
*
This
=
(
IWineD3DVolumeImpl
*
)
iface
;
...
...
@@ -332,7 +309,6 @@ const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl =
IWineD3DVolumeImpl_PreLoad
,
IWineD3DVolumeImpl_GetType
,
/* IWineD3DVolume */
IWineD3DVolumeImpl_GetContainerParent
,
IWineD3DVolumeImpl_GetContainer
,
IWineD3DVolumeImpl_GetDesc
,
IWineD3DVolumeImpl_LockBox
,
...
...
This diff is collapsed.
Click to expand it.
include/wine/wined3d_interface.h
+
0
−
2
View file @
4ca9fccf
...
...
@@ -1210,7 +1210,6 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD3DResource)
STDMETHOD_
(
void
,
PreLoad
)(
THIS
)
PURE
;
STDMETHOD_
(
WINED3DRESOURCETYPE
,
GetType
)(
THIS
)
PURE
;
/*** IWineD3DVolume methods ***/
STDMETHOD
(
GetContainerParent
)(
THIS_
IUnknown
**
ppContainerParent
)
PURE
;
STDMETHOD
(
GetContainer
)(
THIS_
REFIID
riid
,
void
**
ppContainer
)
PURE
;
STDMETHOD
(
GetDesc
)(
THIS_
WINED3DVOLUME_DESC
*
pDesc
)
PURE
;
STDMETHOD
(
LockBox
)(
THIS_
WINED3DLOCKED_BOX
*
pLockedVolume
,
CONST
WINED3DBOX
*
pBox
,
DWORD
Flags
)
PURE
;
...
...
@@ -1239,7 +1238,6 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD3DResource)
#define IWineD3DVolume_PreLoad(p) (p)->lpVtbl->PreLoad(p)
#define IWineD3DVolume_GetType(p) (p)->lpVtbl->GetType(p)
/*** IWineD3DVolume methods ***/
#define IWineD3DVolume_GetContainerParent(p,a) (p)->lpVtbl->GetContainerParent(p,a)
#define IWineD3DVolume_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b)
#define IWineD3DVolume_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a)
#define IWineD3DVolume_LockBox(p,a,b,c) (p)->lpVtbl->LockBox(p,a,b,c)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment