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
d5912c53
Commit
d5912c53
authored
Oct 17, 2011
by
Ričardas Barkauskas
Committed by
Alexandre Julliard
Oct 17, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: COM cleanup for IDirect3DDevice interface.
parent
a0c9ab78
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
ddraw_private.h
dlls/ddraw/ddraw_private.h
+2
-2
device.c
dlls/ddraw/device.c
+4
-4
surface.c
dlls/ddraw/surface.c
+1
-1
No files found.
dlls/ddraw/ddraw_private.h
View file @
d5912c53
...
...
@@ -280,7 +280,7 @@ struct IDirect3DDeviceImpl
const
IDirect3DDevice7Vtbl
*
lpVtbl
;
const
IDirect3DDevice3Vtbl
*
IDirect3DDevice3_vtbl
;
const
IDirect3DDevice2Vtbl
*
IDirect3DDevice2_vtbl
;
const
IDirect3DDeviceVtbl
*
IDirect3DDevice_vtbl
;
IDirect3DDevice
IDirect3DDevice_iface
;
LONG
ref
;
/* Other object connections */
...
...
@@ -327,7 +327,7 @@ WINED3DZBUFFERTYPE IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *T
static
inline
IDirect3DDeviceImpl
*
impl_from_IDirect3DDevice
(
IDirect3DDevice
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
IDirect3DDeviceImpl
,
IDirect3DDevice_
vtbl
);
return
CONTAINING_RECORD
(
iface
,
IDirect3DDeviceImpl
,
IDirect3DDevice_
iface
);
}
static
inline
IDirect3DDeviceImpl
*
device_from_device2
(
IDirect3DDevice2
*
iface
)
...
...
dlls/ddraw/device.c
View file @
d5912c53
...
...
@@ -163,7 +163,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface,
/* Direct3DDevice */
else
if
(
IsEqualGUID
(
&
IID_IDirect3DDevice
,
refiid
)
)
{
*
obj
=
&
This
->
IDirect3DDevice_
vtbl
;
*
obj
=
&
This
->
IDirect3DDevice_
iface
;
TRACE
(
"(%p) Returning IDirect3DDevice interface at %p
\n
"
,
This
,
*
obj
);
}
else
if
(
IsEqualGUID
(
&
IID_IDirect3DDevice2
,
refiid
)
)
{
...
...
@@ -329,7 +329,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface)
{
/* No FIXME here because this might happen because of sloppy applications. */
WARN
(
"Leftover matrix handle %#x (%p), deleting.
\n
"
,
i
+
1
,
entry
->
object
);
IDirect3DDevice_DeleteMatrix
(
(
IDirect3DDevice
*
)
&
This
->
IDirect3DDevice_vtbl
,
i
+
1
);
IDirect3DDevice_DeleteMatrix
(
&
This
->
IDirect3DDevice_iface
,
i
+
1
);
break
;
}
...
...
@@ -6741,7 +6741,7 @@ IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface)
{
if
(
!
iface
)
return
NULL
;
assert
(
iface
->
lpVtbl
==
&
d3d_device1_vtbl
);
return
CONTAINING_RECORD
(
iface
,
IDirect3DDeviceImpl
,
IDirect3DDevice_
vtbl
);
return
CONTAINING_RECORD
(
iface
,
IDirect3DDeviceImpl
,
IDirect3DDevice_
iface
);
}
/*****************************************************************************
...
...
@@ -6788,7 +6788,7 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi
device
->
IDirect3DDevice3_vtbl
=
&
d3d_device3_vtbl
;
device
->
IDirect3DDevice2_vtbl
=
&
d3d_device2_vtbl
;
device
->
IDirect3DDevice_
v
tbl
=
&
d3d_device1_vtbl
;
device
->
IDirect3DDevice_
iface
.
lpV
tbl
=
&
d3d_device1_vtbl
;
device
->
ref
=
1
;
device
->
ddraw
=
ddraw
;
device
->
target
=
target
;
...
...
dlls/ddraw/surface.c
View file @
d5912c53
...
...
@@ -134,7 +134,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
if
(
d3d
)
{
*
obj
=
(
IDirect3DDevice
*
)
&
((
IDirect3DDeviceImpl
*
)
d3d
)
->
IDirect3DDevice_vtbl
;
*
obj
=
&
((
IDirect3DDeviceImpl
*
)
d3d
)
->
IDirect3DDevice_iface
;
TRACE
(
"(%p) Returning IDirect3DDevice interface at %p
\n
"
,
This
,
*
obj
);
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