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
f8bd01a3
Commit
f8bd01a3
authored
Oct 19, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Oct 19, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: Add traces.
parent
adf5bb5f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
294 additions
and
143 deletions
+294
-143
cubetexture.c
dlls/d3d8/cubetexture.c
+38
-18
device.c
dlls/d3d8/device.c
+0
-0
directx.c
dlls/d3d8/directx.c
+39
-16
indexbuffer.c
dlls/d3d8/indexbuffer.c
+30
-15
pixelshader.c
dlls/d3d8/pixelshader.c
+4
-2
stateblock.c
dlls/d3d8/stateblock.c
+7
-5
surface.c
dlls/d3d8/surface.c
+27
-13
swapchain.c
dlls/d3d8/swapchain.c
+9
-4
texture.c
dlls/d3d8/texture.c
+38
-19
vertexbuffer.c
dlls/d3d8/vertexbuffer.c
+30
-15
vertexdeclaration.c
dlls/d3d8/vertexdeclaration.c
+5
-5
vertexshader.c
dlls/d3d8/vertexshader.c
+4
-2
volume.c
dlls/d3d8/volume.c
+26
-11
volumetexture.c
dlls/d3d8/volumetexture.c
+37
-18
No files found.
dlls/d3d8/cubetexture.c
View file @
f8bd01a3
...
...
@@ -26,6 +26,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
/* IDirect3DCubeTexture8 IUnknown parts follow: */
static
HRESULT
WINAPI
IDirect3DCubeTexture8Impl_QueryInterface
(
LPDIRECT3DCUBETEXTURE8
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DResource8
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DBaseTexture8
)
...
...
@@ -44,7 +47,7 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_AddRef(LPDIRECT3DCUBETEXTURE8 ifac
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
{
...
...
@@ -61,7 +64,7 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 ifa
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
IDirect3DDevice8
*
parentDevice
=
This
->
parentDevice
;
...
...
@@ -83,7 +86,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(LPDIRECT3DCUBETEXTURE8
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
IWineD3DDevice
*
wined3d_device
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
ppDevice
);
wined3d_mutex_lock
();
hr
=
IWineD3DCubeTexture_GetDevice
(
This
->
wineD3DCubeTexture
,
&
wined3d_device
);
...
...
@@ -100,7 +104,9 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(LPDIRECT3DCUBETEXTURE8
static
HRESULT
WINAPI
IDirect3DCubeTexture8Impl_SetPrivateData
(
LPDIRECT3DCUBETEXTURE8
iface
,
REFGUID
refguid
,
CONST
void
*
pData
,
DWORD
SizeOfData
,
DWORD
Flags
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %u, flags %#x.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
SizeOfData
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DCubeTexture_SetPrivateData
(
This
->
wineD3DCubeTexture
,
refguid
,
pData
,
SizeOfData
,
Flags
);
...
...
@@ -112,7 +118,9 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_SetPrivateData(LPDIRECT3DCUBETEX
static
HRESULT
WINAPI
IDirect3DCubeTexture8Impl_GetPrivateData
(
LPDIRECT3DCUBETEXTURE8
iface
,
REFGUID
refguid
,
void
*
pData
,
DWORD
*
pSizeOfData
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %p.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
pSizeOfData
);
wined3d_mutex_lock
();
hr
=
IWineD3DCubeTexture_GetPrivateData
(
This
->
wineD3DCubeTexture
,
refguid
,
pData
,
pSizeOfData
);
...
...
@@ -124,7 +132,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetPrivateData(LPDIRECT3DCUBETEX
static
HRESULT
WINAPI
IDirect3DCubeTexture8Impl_FreePrivateData
(
LPDIRECT3DCUBETEXTURE8
iface
,
REFGUID
refguid
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s.
\n
"
,
iface
,
debugstr_guid
(
refguid
));
wined3d_mutex_lock
();
hr
=
IWineD3DCubeTexture_FreePrivateData
(
This
->
wineD3DCubeTexture
,
refguid
);
...
...
@@ -136,7 +145,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_FreePrivateData(LPDIRECT3DCUBETE
static
DWORD
WINAPI
IDirect3DCubeTexture8Impl_SetPriority
(
LPDIRECT3DCUBETEXTURE8
iface
,
DWORD
PriorityNew
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
PriorityNew
);
wined3d_mutex_lock
();
ret
=
IWineD3DCubeTexture_SetPriority
(
This
->
wineD3DCubeTexture
,
PriorityNew
);
...
...
@@ -148,7 +158,8 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_SetPriority(LPDIRECT3DCUBETEXTURE8
static
DWORD
WINAPI
IDirect3DCubeTexture8Impl_GetPriority
(
LPDIRECT3DCUBETEXTURE8
iface
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
ret
=
IWineD3DCubeTexture_GetPriority
(
This
->
wineD3DCubeTexture
);
...
...
@@ -159,7 +170,8 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_GetPriority(LPDIRECT3DCUBETEXTURE8
static
void
WINAPI
IDirect3DCubeTexture8Impl_PreLoad
(
LPDIRECT3DCUBETEXTURE8
iface
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
IWineD3DCubeTexture_PreLoad
(
This
->
wineD3DCubeTexture
);
...
...
@@ -169,7 +181,8 @@ static void WINAPI IDirect3DCubeTexture8Impl_PreLoad(LPDIRECT3DCUBETEXTURE8 ifac
static
D3DRESOURCETYPE
WINAPI
IDirect3DCubeTexture8Impl_GetType
(
LPDIRECT3DCUBETEXTURE8
iface
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
D3DRESOURCETYPE
type
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
type
=
IWineD3DCubeTexture_GetType
(
This
->
wineD3DCubeTexture
);
...
...
@@ -182,7 +195,8 @@ static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(LPDIRECT3DCUBETE
static
DWORD
WINAPI
IDirect3DCubeTexture8Impl_SetLOD
(
LPDIRECT3DCUBETEXTURE8
iface
,
DWORD
LODNew
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
DWORD
lod
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, lod %u.
\n
"
,
iface
,
LODNew
);
wined3d_mutex_lock
();
lod
=
IWineD3DCubeTexture_SetLOD
(
This
->
wineD3DCubeTexture
,
LODNew
);
...
...
@@ -194,7 +208,8 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_SetLOD(LPDIRECT3DCUBETEXTURE8 ifac
static
DWORD
WINAPI
IDirect3DCubeTexture8Impl_GetLOD
(
LPDIRECT3DCUBETEXTURE8
iface
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
DWORD
lod
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
lod
=
IWineD3DCubeTexture_GetLOD
((
LPDIRECT3DBASETEXTURE8
)
This
);
...
...
@@ -206,7 +221,8 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_GetLOD(LPDIRECT3DCUBETEXTURE8 ifac
static
DWORD
WINAPI
IDirect3DCubeTexture8Impl_GetLevelCount
(
LPDIRECT3DCUBETEXTURE8
iface
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
DWORD
cnt
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
cnt
=
IWineD3DCubeTexture_GetLevelCount
(
This
->
wineD3DCubeTexture
);
...
...
@@ -221,7 +237,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(LPDIRECT3DCUBETEXTU
HRESULT
hr
;
WINED3DSURFACE_DESC
wined3ddesc
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p, level %u, desc %p.
\n
"
,
iface
,
Level
,
pDesc
);
wined3d_mutex_lock
();
hr
=
IWineD3DCubeTexture_GetLevelDesc
(
This
->
wineD3DCubeTexture
,
Level
,
&
wined3ddesc
);
...
...
@@ -247,7 +263,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(LPDIRECT3DCUBE
HRESULT
hrc
=
D3D_OK
;
IWineD3DSurface
*
mySurface
=
NULL
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p, face %#x, level %u, surface %p.
\n
"
,
iface
,
FaceType
,
Level
,
ppCubeMapSurface
);
wined3d_mutex_lock
();
hrc
=
IWineD3DCubeTexture_GetCubeMapSurface
(
This
->
wineD3DCubeTexture
,
(
WINED3DCUBEMAP_FACES
)
FaceType
,
Level
,
&
mySurface
);
...
...
@@ -263,7 +279,9 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(LPDIRECT3DCUBE
static
HRESULT
WINAPI
IDirect3DCubeTexture8Impl_LockRect
(
LPDIRECT3DCUBETEXTURE8
iface
,
D3DCUBEMAP_FACES
FaceType
,
UINT
Level
,
D3DLOCKED_RECT
*
pLockedRect
,
CONST
RECT
*
pRect
,
DWORD
Flags
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#x.
\n
"
,
iface
,
FaceType
,
Level
,
pLockedRect
,
pRect
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DCubeTexture_LockRect
(
This
->
wineD3DCubeTexture
,
(
WINED3DCUBEMAP_FACES
)
FaceType
,
Level
,
(
WINED3DLOCKED_RECT
*
)
pLockedRect
,
pRect
,
Flags
);
...
...
@@ -275,7 +293,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(LPDIRECT3DCUBETEXTURE8
static
HRESULT
WINAPI
IDirect3DCubeTexture8Impl_UnlockRect
(
LPDIRECT3DCUBETEXTURE8
iface
,
D3DCUBEMAP_FACES
FaceType
,
UINT
Level
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, face %#x, level %u.
\n
"
,
iface
,
FaceType
,
Level
);
wined3d_mutex_lock
();
hr
=
IWineD3DCubeTexture_UnlockRect
(
This
->
wineD3DCubeTexture
,
(
WINED3DCUBEMAP_FACES
)
FaceType
,
Level
);
...
...
@@ -287,7 +306,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(LPDIRECT3DCUBETEXTURE
static
HRESULT
WINAPI
IDirect3DCubeTexture8Impl_AddDirtyRect
(
LPDIRECT3DCUBETEXTURE8
iface
,
D3DCUBEMAP_FACES
FaceType
,
CONST
RECT
*
pDirtyRect
)
{
IDirect3DCubeTexture8Impl
*
This
=
(
IDirect3DCubeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, face %#x, dirty_rect %p.
\n
"
,
iface
,
FaceType
,
pDirtyRect
);
wined3d_mutex_lock
();
hr
=
IWineD3DCubeTexture_AddDirtyRect
(
This
->
wineD3DCubeTexture
,
(
WINED3DCUBEMAP_FACES
)
FaceType
,
pDirtyRect
);
...
...
dlls/d3d8/device.c
View file @
f8bd01a3
This diff is collapsed.
Click to expand it.
dlls/d3d8/directx.c
View file @
f8bd01a3
...
...
@@ -42,6 +42,8 @@ static HRESULT WINAPI IDirect3D8Impl_QueryInterface(LPDIRECT3D8 iface, REFIID ri
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3D8
))
{
IUnknown_AddRef
(
iface
);
...
...
@@ -58,7 +60,7 @@ static ULONG WINAPI IDirect3D8Impl_AddRef(LPDIRECT3D8 iface) {
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -67,7 +69,7 @@ static ULONG WINAPI IDirect3D8Impl_Release(LPDIRECT3D8 iface) {
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
TRACE
(
"Releasing wined3d %p
\n
"
,
This
->
WineD3D
);
...
...
@@ -86,7 +88,8 @@ static ULONG WINAPI IDirect3D8Impl_Release(LPDIRECT3D8 iface) {
static
HRESULT
WINAPI
IDirect3D8Impl_RegisterSoftwareDevice
(
LPDIRECT3D8
iface
,
void
*
pInitializeFunction
)
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
pInitializeFunction
);
TRACE
(
"iface %p, init_function %p.
\n
"
,
iface
,
pInitializeFunction
);
wined3d_mutex_lock
();
hr
=
IWineD3D_RegisterSoftwareDevice
(
This
->
WineD3D
,
pInitializeFunction
);
...
...
@@ -98,7 +101,8 @@ static HRESULT WINAPI IDirect3D8Impl_RegisterSoftwareDevice (LPDIRECT3D8 iface,
static
UINT
WINAPI
IDirect3D8Impl_GetAdapterCount
(
LPDIRECT3D8
iface
)
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p)
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
hr
=
IWineD3D_GetAdapterCount
(
This
->
WineD3D
);
...
...
@@ -114,7 +118,8 @@ static HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier(LPDIRECT3D8 iface,
WINED3DADAPTER_IDENTIFIER
adapter_id
;
HRESULT
hr
;
TRACE
(
"(%p)->(%d,%08x, %p
\n
"
,
This
,
Adapter
,
Flags
,
pIdentifier
);
TRACE
(
"iface %p, adapter %u, flags %#x, identifier %p.
\n
"
,
iface
,
Adapter
,
Flags
,
pIdentifier
);
adapter_id
.
driver
=
pIdentifier
->
Driver
;
adapter_id
.
driver_size
=
sizeof
(
pIdentifier
->
Driver
);
...
...
@@ -141,7 +146,8 @@ static HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier(LPDIRECT3D8 iface,
static
UINT
WINAPI
IDirect3D8Impl_GetAdapterModeCount
(
LPDIRECT3D8
iface
,
UINT
Adapter
)
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p)->(%d)
\n
"
,
This
,
Adapter
);
TRACE
(
"iface %p, adapter %u.
\n
"
,
iface
,
Adapter
);
wined3d_mutex_lock
();
hr
=
IWineD3D_GetAdapterModeCount
(
This
->
WineD3D
,
Adapter
,
0
/* format */
);
...
...
@@ -153,7 +159,9 @@ static UINT WINAPI IDirect3D8Impl_GetAdapterModeCount (LPDIRECT3D8 iface,UINT Ad
static
HRESULT
WINAPI
IDirect3D8Impl_EnumAdapterModes
(
LPDIRECT3D8
iface
,
UINT
Adapter
,
UINT
Mode
,
D3DDISPLAYMODE
*
pMode
)
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p)->(%d, %d, %p)
\n
"
,
This
,
Adapter
,
Mode
,
pMode
);
TRACE
(
"iface %p, adapter %u, mode_idx %u, mode %p.
\n
"
,
iface
,
Adapter
,
Mode
,
pMode
);
wined3d_mutex_lock
();
hr
=
IWineD3D_EnumAdapterModes
(
This
->
WineD3D
,
Adapter
,
WINED3DFMT_UNKNOWN
,
Mode
,
(
WINED3DDISPLAYMODE
*
)
pMode
);
...
...
@@ -167,7 +175,9 @@ static HRESULT WINAPI IDirect3D8Impl_EnumAdapterModes (LPDIRECT3D8 iface, UINT A
static
HRESULT
WINAPI
IDirect3D8Impl_GetAdapterDisplayMode
(
LPDIRECT3D8
iface
,
UINT
Adapter
,
D3DDISPLAYMODE
*
pMode
)
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p)->(%d,%p)
\n
"
,
This
,
Adapter
,
pMode
);
TRACE
(
"iface %p, adapter %u, mode %p.
\n
"
,
iface
,
Adapter
,
pMode
);
wined3d_mutex_lock
();
hr
=
IWineD3D_GetAdapterDisplayMode
(
This
->
WineD3D
,
Adapter
,
(
WINED3DDISPLAYMODE
*
)
pMode
);
...
...
@@ -183,7 +193,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceType (LPDIRECT3D8 i
D3DFORMAT
BackBufferFormat
,
BOOL
Windowed
)
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p)->(%d, %d, %d, %d, %s)
\n
"
,
This
,
Adapter
,
CheckType
,
DisplayFormat
,
BackBufferFormat
,
Windowed
?
"true"
:
"false"
);
TRACE
(
"iface %p, adapter %u, device_type %#x, display_format %#x, backbuffer_format %#x, windowed %#x.
\n
"
,
iface
,
Adapter
,
CheckType
,
DisplayFormat
,
BackBufferFormat
,
Windowed
);
wined3d_mutex_lock
();
hr
=
IWineD3D_CheckDeviceType
(
This
->
WineD3D
,
Adapter
,
CheckType
,
wined3dformat_from_d3dformat
(
DisplayFormat
),
...
...
@@ -199,7 +211,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceFormat (LPDIRECT3D8 i
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HRESULT
hr
;
WINED3DRESOURCETYPE
WineD3DRType
;
TRACE
(
"(%p)->(%d, %d, %d, %08x, %d, %d)
\n
"
,
This
,
Adapter
,
DeviceType
,
AdapterFormat
,
Usage
,
RType
,
CheckFormat
);
TRACE
(
"iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.
\n
"
,
iface
,
Adapter
,
DeviceType
,
AdapterFormat
,
Usage
,
RType
,
CheckFormat
);
if
(
CheckFormat
==
D3DFMT_R8G8B8
)
{
...
...
@@ -233,7 +247,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceMultiSampleType(IDirect3D8 *ifac
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p)-<(%d, %d, %d, %s, %d)
\n
"
,
This
,
Adapter
,
DeviceType
,
SurfaceFormat
,
Windowed
?
"true"
:
"false"
,
MultiSampleType
);
TRACE
(
"iface %p, adapter %u, device_type %#x, format %#x, windowed %#x, multisample_type %#x.
\n
"
,
iface
,
Adapter
,
DeviceType
,
SurfaceFormat
,
Windowed
,
MultiSampleType
);
wined3d_mutex_lock
();
hr
=
IWineD3D_CheckDeviceMultiSampleType
(
This
->
WineD3D
,
Adapter
,
DeviceType
,
...
...
@@ -248,7 +264,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDepthStencilMatch(IDirect3D8 *iface, U
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p)-<(%d, %d, %d, %d, %d)
\n
"
,
This
,
Adapter
,
DeviceType
,
AdapterFormat
,
RenderTargetFormat
,
DepthStencilFormat
);
TRACE
(
"iface %p, adapter %u, device_type %#x, adapter_format %#x, rt_format %#x, ds_format %#x.
\n
"
,
iface
,
Adapter
,
DeviceType
,
AdapterFormat
,
RenderTargetFormat
,
DepthStencilFormat
);
wined3d_mutex_lock
();
hr
=
IWineD3D_CheckDepthStencilMatch
(
This
->
WineD3D
,
Adapter
,
DeviceType
,
...
...
@@ -278,7 +296,7 @@ static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Ada
HRESULT
hrc
=
D3D_OK
;
WINED3DCAPS
*
pWineCaps
;
TRACE
(
"
(%p) Relay %d %u %p
\n
"
,
This
,
Adapter
,
DeviceType
,
pCaps
);
TRACE
(
"
iface %p, adapter %u, device_type %#x, caps %p.
\n
"
,
iface
,
Adapter
,
DeviceType
,
pCaps
);
if
(
NULL
==
pCaps
){
return
D3DERR_INVALIDCALL
;
...
...
@@ -303,7 +321,8 @@ static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Ada
static
HMONITOR
WINAPI
IDirect3D8Impl_GetAdapterMonitor
(
LPDIRECT3D8
iface
,
UINT
Adapter
)
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
HMONITOR
ret
;
TRACE
(
"(%p)->(%d)
\n
"
,
This
,
Adapter
);
TRACE
(
"iface %p, adapter %u.
\n
"
,
iface
,
Adapter
);
wined3d_mutex_lock
();
ret
=
IWineD3D_GetAdapterMonitor
(
This
->
WineD3D
,
Adapter
);
...
...
@@ -314,7 +333,8 @@ static HMONITOR WINAPI IDirect3D8Impl_GetAdapterMonitor(LPDIRECT3D8 iface, UINT
ULONG
WINAPI
D3D8CB_DestroySwapChain
(
IWineD3DSwapChain
*
pSwapChain
)
{
IUnknown
*
swapChainParent
;
TRACE
(
"(%p) call back
\n
"
,
pSwapChain
);
TRACE
(
"swapchain %p.
\n
"
,
pSwapChain
);
IWineD3DSwapChain_GetParent
(
pSwapChain
,
&
swapChainParent
);
IUnknown_Release
(
swapChainParent
);
...
...
@@ -329,7 +349,10 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte
IDirect3DDevice8Impl
*
object
=
NULL
;
WINED3DPRESENT_PARAMETERS
localParameters
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, device %p.
\n
"
,
iface
,
Adapter
,
DeviceType
,
hFocusWindow
,
BehaviourFlags
,
pPresentationParameters
,
ppReturnedDeviceInterface
);
/* Check the validity range of the adapter parameter */
if
(
Adapter
>=
IDirect3D8Impl_GetAdapterCount
(
iface
))
{
...
...
dlls/d3d8/indexbuffer.c
View file @
f8bd01a3
...
...
@@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static
HRESULT
WINAPI
IDirect3DIndexBuffer8Impl_QueryInterface
(
LPDIRECT3DINDEXBUFFER8
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DResource8
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DIndexBuffer8
))
{
...
...
@@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_AddRef(LPDIRECT3DINDEXBUFFER8 ifac
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
{
...
...
@@ -61,7 +63,7 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
IDirect3DDevice8
*
parentDevice
=
This
->
parentDevice
;
...
...
@@ -81,7 +83,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(LPDIRECT3DINDEXBUFFER8
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
IWineD3DDevice
*
wined3d_device
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
ppDevice
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_GetDevice
(
This
->
wineD3DIndexBuffer
,
&
wined3d_device
);
...
...
@@ -98,7 +101,9 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(LPDIRECT3DINDEXBUFFER8
static
HRESULT
WINAPI
IDirect3DIndexBuffer8Impl_SetPrivateData
(
LPDIRECT3DINDEXBUFFER8
iface
,
REFGUID
refguid
,
CONST
void
*
pData
,
DWORD
SizeOfData
,
DWORD
Flags
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %u, flags %#x.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
SizeOfData
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_SetPrivateData
(
This
->
wineD3DIndexBuffer
,
refguid
,
pData
,
SizeOfData
,
Flags
);
...
...
@@ -110,7 +115,9 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_SetPrivateData(LPDIRECT3DINDEXBU
static
HRESULT
WINAPI
IDirect3DIndexBuffer8Impl_GetPrivateData
(
LPDIRECT3DINDEXBUFFER8
iface
,
REFGUID
refguid
,
void
*
pData
,
DWORD
*
pSizeOfData
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %p.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
pSizeOfData
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_GetPrivateData
(
This
->
wineD3DIndexBuffer
,
refguid
,
pData
,
pSizeOfData
);
...
...
@@ -122,7 +129,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetPrivateData(LPDIRECT3DINDEXBU
static
HRESULT
WINAPI
IDirect3DIndexBuffer8Impl_FreePrivateData
(
LPDIRECT3DINDEXBUFFER8
iface
,
REFGUID
refguid
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s.
\n
"
,
iface
,
debugstr_guid
(
refguid
));
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_FreePrivateData
(
This
->
wineD3DIndexBuffer
,
refguid
);
...
...
@@ -134,7 +142,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_FreePrivateData(LPDIRECT3DINDEXB
static
DWORD
WINAPI
IDirect3DIndexBuffer8Impl_SetPriority
(
LPDIRECT3DINDEXBUFFER8
iface
,
DWORD
PriorityNew
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
PriorityNew
);
wined3d_mutex_lock
();
ret
=
IWineD3DBuffer_SetPriority
(
This
->
wineD3DIndexBuffer
,
PriorityNew
);
...
...
@@ -146,7 +155,8 @@ static DWORD WINAPI IDirect3DIndexBuffer8Impl_SetPriority(LPDIRECT3DINDEXBUFFER8
static
DWORD
WINAPI
IDirect3DIndexBuffer8Impl_GetPriority
(
LPDIRECT3DINDEXBUFFER8
iface
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
ret
=
IWineD3DBuffer_GetPriority
(
This
->
wineD3DIndexBuffer
);
...
...
@@ -157,16 +167,17 @@ static DWORD WINAPI IDirect3DIndexBuffer8Impl_GetPriority(LPDIRECT3DINDEXBUFFER8
static
void
WINAPI
IDirect3DIndexBuffer8Impl_PreLoad
(
LPDIRECT3DINDEXBUFFER8
iface
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
IWineD3DBuffer_PreLoad
(
This
->
wineD3DIndexBuffer
);
wined3d_mutex_unlock
();
}
static
D3DRESOURCETYPE
WINAPI
IDirect3DIndexBuffer8Impl_GetType
(
LPDIRECT3DINDEXBUFFER8
iface
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
TRACE
(
"
(%p)
\n
"
,
This
);
static
D3DRESOURCETYPE
WINAPI
IDirect3DIndexBuffer8Impl_GetType
(
IDirect3DIndexBuffer8
*
iface
)
{
TRACE
(
"
iface %p.
\n
"
,
iface
);
return
D3DRTYPE_INDEXBUFFER
;
}
...
...
@@ -175,7 +186,9 @@ static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer8Impl_GetType(LPDIRECT3DINDEXB
static
HRESULT
WINAPI
IDirect3DIndexBuffer8Impl_Lock
(
LPDIRECT3DINDEXBUFFER8
iface
,
UINT
OffsetToLock
,
UINT
SizeToLock
,
BYTE
**
ppbData
,
DWORD
Flags
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#x.
\n
"
,
iface
,
OffsetToLock
,
SizeToLock
,
ppbData
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_Map
(
This
->
wineD3DIndexBuffer
,
OffsetToLock
,
SizeToLock
,
ppbData
,
Flags
);
...
...
@@ -187,7 +200,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Lock(LPDIRECT3DINDEXBUFFER8 ifac
static
HRESULT
WINAPI
IDirect3DIndexBuffer8Impl_Unlock
(
LPDIRECT3DINDEXBUFFER8
iface
)
{
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_Unmap
(
This
->
wineD3DIndexBuffer
);
...
...
@@ -200,7 +214,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 i
IDirect3DIndexBuffer8Impl
*
This
=
(
IDirect3DIndexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
WINED3DBUFFER_DESC
desc
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, desc %p.
\n
"
,
iface
,
pDesc
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_GetDesc
(
This
->
wineD3DIndexBuffer
,
&
desc
);
...
...
dlls/d3d8/pixelshader.c
View file @
f8bd01a3
...
...
@@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static
HRESULT
WINAPI
IDirect3DPixelShader8Impl_QueryInterface
(
IDirect3DPixelShader8
*
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DPixelShader8Impl
*
This
=
(
IDirect3DPixelShader8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DPixelShader8
))
{
IUnknown_AddRef
(
iface
);
...
...
@@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DPixelShader8Impl_AddRef(IDirect3DPixelShader8 *ifac
IDirect3DPixelShader8Impl
*
This
=
(
IDirect3DPixelShader8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
{
...
...
@@ -60,7 +62,7 @@ static ULONG WINAPI IDirect3DPixelShader8Impl_Release(IDirect3DPixelShader8 * if
IDirect3DPixelShader8Impl
*
This
=
(
IDirect3DPixelShader8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
wined3d_mutex_lock
();
...
...
dlls/d3d8/stateblock.c
View file @
f8bd01a3
...
...
@@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static
HRESULT
WINAPI
IDirect3DStateBlock8Impl_QueryInterface
(
IDirect3DStateBlock8
*
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DStateBlock8Impl
*
This
=
(
IDirect3DStateBlock8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DStateBlock8
))
{
IUnknown_AddRef
(
iface
);
...
...
@@ -46,7 +48,7 @@ static ULONG WINAPI IDirect3DStateBlock8Impl_AddRef(IDirect3DStateBlock8 *iface)
IDirect3DStateBlock8Impl
*
This
=
(
IDirect3DStateBlock8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -55,7 +57,7 @@ static ULONG WINAPI IDirect3DStateBlock8Impl_Release(IDirect3DStateBlock8 *iface
IDirect3DStateBlock8Impl
*
This
=
(
IDirect3DStateBlock8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
wined3d_mutex_lock
();
...
...
@@ -73,7 +75,7 @@ static HRESULT WINAPI IDirect3DStateBlock8Impl_GetDevice(IDirect3DStateBlock8 *i
IWineD3DDevice
*
wined3d_device
;
HRESULT
hr
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p, device %p.
\n
"
,
iface
,
ppDevice
);
wined3d_mutex_lock
();
hr
=
IWineD3DStateBlock_GetDevice
(
This
->
wineD3DStateBlock
,
&
wined3d_device
);
...
...
@@ -91,7 +93,7 @@ static HRESULT WINAPI IDirect3DStateBlock8Impl_Capture(IDirect3DStateBlock8 *ifa
IDirect3DStateBlock8Impl
*
This
=
(
IDirect3DStateBlock8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
hr
=
IWineD3DStateBlock_Capture
(
This
->
wineD3DStateBlock
);
...
...
@@ -104,7 +106,7 @@ static HRESULT WINAPI IDirect3DStateBlock8Impl_Apply(IDirect3DStateBlock8 *iface
IDirect3DStateBlock8Impl
*
This
=
(
IDirect3DStateBlock8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
hr
=
IWineD3DStateBlock_Apply
(
This
->
wineD3DStateBlock
);
...
...
dlls/d3d8/surface.c
View file @
f8bd01a3
...
...
@@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static
HRESULT
WINAPI
IDirect3DSurface8Impl_QueryInterface
(
LPDIRECT3DSURFACE8
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DResource8
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DSurface8
))
{
...
...
@@ -43,7 +45,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(LPDIRECT3DSURFACE8 if
static
ULONG
WINAPI
IDirect3DSurface8Impl_AddRef
(
LPDIRECT3DSURFACE8
iface
)
{
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
TRACE
(
"
(%p)
\n
"
,
This
);
TRACE
(
"
iface %p.
\n
"
,
iface
);
if
(
This
->
forwardReference
)
{
/* Forward refcounting */
...
...
@@ -52,6 +54,9 @@ static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) {
}
else
{
/* No container, handle our own refcounting */
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
{
if
(
This
->
parentDevice
)
IUnknown_AddRef
(
This
->
parentDevice
);
...
...
@@ -59,7 +64,7 @@ static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) {
IUnknown_AddRef
(
This
->
wineD3DSurface
);
wined3d_mutex_unlock
();
}
TRACE
(
"(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
return
ref
;
}
}
...
...
@@ -67,7 +72,7 @@ static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) {
static
ULONG
WINAPI
IDirect3DSurface8Impl_Release
(
LPDIRECT3DSURFACE8
iface
)
{
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
TRACE
(
"
(%p)
\n
"
,
This
);
TRACE
(
"
iface %p.
\n
"
,
iface
);
if
(
This
->
forwardReference
)
{
/* Forward refcounting */
...
...
@@ -76,7 +81,8 @@ static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) {
}
else
{
/* No container, handle our own refcounting */
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
IDirect3DDevice8
*
parentDevice
=
This
->
parentDevice
;
...
...
@@ -98,7 +104,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(LPDIRECT3DSURFACE8 iface,
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
IWineD3DDevice
*
wined3d_device
;
HRESULT
hr
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
ppDevice
);
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
ppDevice
);
wined3d_mutex_lock
();
hr
=
IWineD3DSurface_GetDevice
(
This
->
wineD3DSurface
,
&
wined3d_device
);
...
...
@@ -115,7 +122,9 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(LPDIRECT3DSURFACE8 iface,
static
HRESULT
WINAPI
IDirect3DSurface8Impl_SetPrivateData
(
LPDIRECT3DSURFACE8
iface
,
REFGUID
refguid
,
CONST
void
*
pData
,
DWORD
SizeOfData
,
DWORD
Flags
)
{
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %u, flags %#x.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
SizeOfData
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DSurface_SetPrivateData
(
This
->
wineD3DSurface
,
refguid
,
pData
,
SizeOfData
,
Flags
);
...
...
@@ -127,7 +136,9 @@ static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(LPDIRECT3DSURFACE8 if
static
HRESULT
WINAPI
IDirect3DSurface8Impl_GetPrivateData
(
LPDIRECT3DSURFACE8
iface
,
REFGUID
refguid
,
void
*
pData
,
DWORD
*
pSizeOfData
)
{
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %p.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
pSizeOfData
);
wined3d_mutex_lock
();
hr
=
IWineD3DSurface_GetPrivateData
(
This
->
wineD3DSurface
,
refguid
,
pData
,
pSizeOfData
);
...
...
@@ -139,7 +150,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetPrivateData(LPDIRECT3DSURFACE8 if
static
HRESULT
WINAPI
IDirect3DSurface8Impl_FreePrivateData
(
LPDIRECT3DSURFACE8
iface
,
REFGUID
refguid
)
{
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s.
\n
"
,
iface
,
debugstr_guid
(
refguid
));
wined3d_mutex_lock
();
hr
=
IWineD3DSurface_FreePrivateData
(
This
->
wineD3DSurface
,
refguid
);
...
...
@@ -153,7 +165,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 ifac
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
HRESULT
res
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p, riid %s, container %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppContainer
);
if
(
!
This
->
container
)
return
E_NOINTERFACE
;
...
...
@@ -167,7 +179,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
WINED3DSURFACE_DESC
wined3ddesc
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, desc %p.
\n
"
,
iface
,
pDesc
);
wined3d_mutex_lock
();
hr
=
IWineD3DSurface_GetDesc
(
This
->
wineD3DSurface
,
&
wined3ddesc
);
...
...
@@ -191,8 +204,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3
static
HRESULT
WINAPI
IDirect3DSurface8Impl_LockRect
(
LPDIRECT3DSURFACE8
iface
,
D3DLOCKED_RECT
*
pLockedRect
,
CONST
RECT
*
pRect
,
DWORD
Flags
)
{
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"
(%p) calling IWineD3DSurface_LockRect %p %p %p %d
\n
"
,
This
,
This
->
wineD3DSur
face
,
pLockedRect
,
pRect
,
Flags
);
TRACE
(
"
iface %p, locked_rect %p, rect %p, flags %#x.
\n
"
,
i
face
,
pLockedRect
,
pRect
,
Flags
);
wined3d_mutex_lock
();
if
(
pRect
)
{
...
...
@@ -221,7 +234,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D
static
HRESULT
WINAPI
IDirect3DSurface8Impl_UnlockRect
(
LPDIRECT3DSURFACE8
iface
)
{
IDirect3DSurface8Impl
*
This
=
(
IDirect3DSurface8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
hr
=
IWineD3DSurface_UnlockRect
(
This
->
wineD3DSurface
);
...
...
dlls/d3d8/swapchain.c
View file @
f8bd01a3
...
...
@@ -28,6 +28,8 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN
{
IDirect3DSwapChain8Impl
*
This
=
(
IDirect3DSwapChain8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DSwapChain8
))
{
IUnknown_AddRef
(
iface
);
...
...
@@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(LPDIRECT3DSWAPCHAIN8 iface) {
IDirect3DSwapChain8Impl
*
This
=
(
IDirect3DSwapChain8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -53,7 +55,7 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface)
IDirect3DSwapChain8Impl
*
This
=
(
IDirect3DSwapChain8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
wined3d_mutex_lock
();
...
...
@@ -70,7 +72,9 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface)
static
HRESULT
WINAPI
IDirect3DSwapChain8Impl_Present
(
LPDIRECT3DSWAPCHAIN8
iface
,
CONST
RECT
*
pSourceRect
,
CONST
RECT
*
pDestRect
,
HWND
hDestWindowOverride
,
CONST
RGNDATA
*
pDirtyRegion
)
{
IDirect3DSwapChain8Impl
*
This
=
(
IDirect3DSwapChain8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.
\n
"
,
iface
,
pSourceRect
,
pDestRect
,
hDestWindowOverride
,
pDirtyRegion
);
wined3d_mutex_lock
();
hr
=
IWineD3DSwapChain_Present
(
This
->
wineD3DSwapChain
,
pSourceRect
,
pDestRect
,
hDestWindowOverride
,
pDirtyRegion
,
0
);
...
...
@@ -84,7 +88,8 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN8
HRESULT
hrc
=
D3D_OK
;
IWineD3DSurface
*
mySurface
=
NULL
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.
\n
"
,
iface
,
iBackBuffer
,
Type
,
ppBackBuffer
);
wined3d_mutex_lock
();
hrc
=
IWineD3DSwapChain_GetBackBuffer
(
This
->
wineD3DSwapChain
,
iBackBuffer
,
(
WINED3DBACKBUFFER_TYPE
)
Type
,
&
mySurface
);
...
...
dlls/d3d8/texture.c
View file @
f8bd01a3
...
...
@@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static
HRESULT
WINAPI
IDirect3DTexture8Impl_QueryInterface
(
LPDIRECT3DTEXTURE8
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DResource8
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DBaseTexture8
)
...
...
@@ -45,7 +47,7 @@ static ULONG WINAPI IDirect3DTexture8Impl_AddRef(LPDIRECT3DTEXTURE8 iface) {
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
{
...
...
@@ -62,7 +64,7 @@ static ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) {
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
IDirect3DDevice8
*
parentDevice
=
This
->
parentDevice
;
...
...
@@ -82,7 +84,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface,
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
IWineD3DDevice
*
wined3d_device
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
ppDevice
);
wined3d_mutex_lock
();
hr
=
IWineD3DTexture_GetDevice
(
This
->
wineD3DTexture
,
&
wined3d_device
);
...
...
@@ -99,7 +102,9 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface,
static
HRESULT
WINAPI
IDirect3DTexture8Impl_SetPrivateData
(
LPDIRECT3DTEXTURE8
iface
,
REFGUID
refguid
,
CONST
void
*
pData
,
DWORD
SizeOfData
,
DWORD
Flags
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %u, flags %#x.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
SizeOfData
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DTexture_SetPrivateData
(
This
->
wineD3DTexture
,
refguid
,
pData
,
SizeOfData
,
Flags
);
...
...
@@ -111,7 +116,9 @@ static HRESULT WINAPI IDirect3DTexture8Impl_SetPrivateData(LPDIRECT3DTEXTURE8 if
static
HRESULT
WINAPI
IDirect3DTexture8Impl_GetPrivateData
(
LPDIRECT3DTEXTURE8
iface
,
REFGUID
refguid
,
void
*
pData
,
DWORD
*
pSizeOfData
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %p.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
pSizeOfData
);
wined3d_mutex_lock
();
hr
=
IWineD3DTexture_GetPrivateData
(
This
->
wineD3DTexture
,
refguid
,
pData
,
pSizeOfData
);
...
...
@@ -123,7 +130,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetPrivateData(LPDIRECT3DTEXTURE8 if
static
HRESULT
WINAPI
IDirect3DTexture8Impl_FreePrivateData
(
LPDIRECT3DTEXTURE8
iface
,
REFGUID
refguid
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s.
\n
"
,
iface
,
debugstr_guid
(
refguid
));
wined3d_mutex_lock
();
hr
=
IWineD3DTexture_FreePrivateData
(
This
->
wineD3DTexture
,
refguid
);
...
...
@@ -135,7 +143,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_FreePrivateData(LPDIRECT3DTEXTURE8 i
static
DWORD
WINAPI
IDirect3DTexture8Impl_SetPriority
(
LPDIRECT3DTEXTURE8
iface
,
DWORD
PriorityNew
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
PriorityNew
);
wined3d_mutex_lock
();
ret
=
IWineD3DTexture_SetPriority
(
This
->
wineD3DTexture
,
PriorityNew
);
...
...
@@ -147,7 +156,8 @@ static DWORD WINAPI IDirect3DTexture8Impl_SetPriority(LPDIRECT3DTEXTURE8 iface,
static
DWORD
WINAPI
IDirect3DTexture8Impl_GetPriority
(
LPDIRECT3DTEXTURE8
iface
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
ret
=
IWineD3DTexture_GetPriority
(
This
->
wineD3DTexture
);
...
...
@@ -158,7 +168,8 @@ static DWORD WINAPI IDirect3DTexture8Impl_GetPriority(LPDIRECT3DTEXTURE8 iface)
static
void
WINAPI
IDirect3DTexture8Impl_PreLoad
(
LPDIRECT3DTEXTURE8
iface
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
IWineD3DTexture_PreLoad
(
This
->
wineD3DTexture
);
...
...
@@ -168,7 +179,8 @@ static void WINAPI IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) {
static
D3DRESOURCETYPE
WINAPI
IDirect3DTexture8Impl_GetType
(
LPDIRECT3DTEXTURE8
iface
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
D3DRESOURCETYPE
type
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
type
=
IWineD3DTexture_GetType
(
This
->
wineD3DTexture
);
...
...
@@ -181,7 +193,8 @@ static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(LPDIRECT3DTEXTURE8 i
static
DWORD
WINAPI
IDirect3DTexture8Impl_SetLOD
(
LPDIRECT3DTEXTURE8
iface
,
DWORD
LODNew
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, lod %u.
\n
"
,
iface
,
LODNew
);
wined3d_mutex_lock
();
ret
=
IWineD3DTexture_SetLOD
(
This
->
wineD3DTexture
,
LODNew
);
...
...
@@ -193,7 +206,8 @@ static DWORD WINAPI IDirect3DTexture8Impl_SetLOD(LPDIRECT3DTEXTURE8 iface, DWORD
static
DWORD
WINAPI
IDirect3DTexture8Impl_GetLOD
(
LPDIRECT3DTEXTURE8
iface
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
ret
=
IWineD3DTexture_GetLOD
(
This
->
wineD3DTexture
);
...
...
@@ -205,7 +219,8 @@ static DWORD WINAPI IDirect3DTexture8Impl_GetLOD(LPDIRECT3DTEXTURE8 iface) {
static
DWORD
WINAPI
IDirect3DTexture8Impl_GetLevelCount
(
LPDIRECT3DTEXTURE8
iface
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
ret
=
IWineD3DTexture_GetLevelCount
(
This
->
wineD3DTexture
);
...
...
@@ -217,10 +232,10 @@ static DWORD WINAPI IDirect3DTexture8Impl_GetLevelCount(LPDIRECT3DTEXTURE8 iface
/* IDirect3DTexture8 Interface follow: */
static
HRESULT
WINAPI
IDirect3DTexture8Impl_GetLevelDesc
(
LPDIRECT3DTEXTURE8
iface
,
UINT
Level
,
D3DSURFACE_DESC
*
pDesc
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
WINED3DSURFACE_DESC
wined3ddesc
;
HRESULT
hr
;
WINED3DSURFACE_DESC
wined3ddesc
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, level %u, desc %p.
\n
"
,
iface
,
Level
,
pDesc
);
wined3d_mutex_lock
();
hr
=
IWineD3DTexture_GetLevelDesc
(
This
->
wineD3DTexture
,
Level
,
&
wined3ddesc
);
...
...
@@ -246,7 +261,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 i
HRESULT
hrc
=
D3D_OK
;
IWineD3DSurface
*
mySurface
=
NULL
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p, level %u, surface %p.
\n
"
,
iface
,
Level
,
ppSurfaceLevel
);
wined3d_mutex_lock
();
hrc
=
IWineD3DTexture_GetSurfaceLevel
(
This
->
wineD3DTexture
,
Level
,
&
mySurface
);
...
...
@@ -262,7 +277,9 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 i
static
HRESULT
WINAPI
IDirect3DTexture8Impl_LockRect
(
LPDIRECT3DTEXTURE8
iface
,
UINT
Level
,
D3DLOCKED_RECT
*
pLockedRect
,
CONST
RECT
*
pRect
,
DWORD
Flags
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, level %u, locked_rect %p, rect %p, flags %#x.
\n
"
,
iface
,
Level
,
pLockedRect
,
pRect
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DTexture_LockRect
(
This
->
wineD3DTexture
,
Level
,
(
WINED3DLOCKED_RECT
*
)
pLockedRect
,
pRect
,
Flags
);
...
...
@@ -274,7 +291,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(LPDIRECT3DTEXTURE8 iface, U
static
HRESULT
WINAPI
IDirect3DTexture8Impl_UnlockRect
(
LPDIRECT3DTEXTURE8
iface
,
UINT
Level
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, level %u.
\n
"
,
iface
,
Level
);
wined3d_mutex_lock
();
hr
=
IWineD3DTexture_UnlockRect
(
This
->
wineD3DTexture
,
Level
);
...
...
@@ -286,7 +304,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(LPDIRECT3DTEXTURE8 iface,
static
HRESULT
WINAPI
IDirect3DTexture8Impl_AddDirtyRect
(
LPDIRECT3DTEXTURE8
iface
,
CONST
RECT
*
pDirtyRect
)
{
IDirect3DTexture8Impl
*
This
=
(
IDirect3DTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, dirty_rect %p.
\n
"
,
iface
,
pDirtyRect
);
wined3d_mutex_lock
();
hr
=
IWineD3DTexture_AddDirtyRect
(
This
->
wineD3DTexture
,
pDirtyRect
);
...
...
dlls/d3d8/vertexbuffer.c
View file @
f8bd01a3
...
...
@@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static
HRESULT
WINAPI
IDirect3DVertexBuffer8Impl_QueryInterface
(
LPDIRECT3DVERTEXBUFFER8
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DResource8
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DVertexBuffer8
))
{
...
...
@@ -45,7 +47,7 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_AddRef(LPDIRECT3DVERTEXBUFFER8 if
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
{
...
...
@@ -62,7 +64,7 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
IDirect3DDevice8
*
parentDevice
=
This
->
parentDevice
;
...
...
@@ -83,7 +85,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(LPDIRECT3DVERTEXBUFFE
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
IWineD3DDevice
*
wined3d_device
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
ppDevice
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_GetDevice
(
This
->
wineD3DVertexBuffer
,
&
wined3d_device
);
...
...
@@ -100,7 +103,9 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(LPDIRECT3DVERTEXBUFFE
static
HRESULT
WINAPI
IDirect3DVertexBuffer8Impl_SetPrivateData
(
LPDIRECT3DVERTEXBUFFER8
iface
,
REFGUID
refguid
,
CONST
void
*
pData
,
DWORD
SizeOfData
,
DWORD
Flags
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %u, flags %#x.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
SizeOfData
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_SetPrivateData
(
This
->
wineD3DVertexBuffer
,
refguid
,
pData
,
SizeOfData
,
Flags
);
...
...
@@ -112,7 +117,9 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_SetPrivateData(LPDIRECT3DVERTEX
static
HRESULT
WINAPI
IDirect3DVertexBuffer8Impl_GetPrivateData
(
LPDIRECT3DVERTEXBUFFER8
iface
,
REFGUID
refguid
,
void
*
pData
,
DWORD
*
pSizeOfData
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %p.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
pSizeOfData
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_GetPrivateData
(
This
->
wineD3DVertexBuffer
,
refguid
,
pData
,
pSizeOfData
);
...
...
@@ -124,7 +131,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetPrivateData(LPDIRECT3DVERTEX
static
HRESULT
WINAPI
IDirect3DVertexBuffer8Impl_FreePrivateData
(
LPDIRECT3DVERTEXBUFFER8
iface
,
REFGUID
refguid
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s.
\n
"
,
iface
,
debugstr_guid
(
refguid
));
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_FreePrivateData
(
This
->
wineD3DVertexBuffer
,
refguid
);
...
...
@@ -136,7 +144,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_FreePrivateData(LPDIRECT3DVERTE
static
DWORD
WINAPI
IDirect3DVertexBuffer8Impl_SetPriority
(
LPDIRECT3DVERTEXBUFFER8
iface
,
DWORD
PriorityNew
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
PriorityNew
);
wined3d_mutex_lock
();
ret
=
IWineD3DBuffer_SetPriority
(
This
->
wineD3DVertexBuffer
,
PriorityNew
);
...
...
@@ -148,7 +157,8 @@ static DWORD WINAPI IDirect3DVertexBuffer8Impl_SetPriority(LPDIRECT3DVERTEXBUFFE
static
DWORD
WINAPI
IDirect3DVertexBuffer8Impl_GetPriority
(
LPDIRECT3DVERTEXBUFFER8
iface
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
ret
=
IWineD3DBuffer_GetPriority
(
This
->
wineD3DVertexBuffer
);
...
...
@@ -159,16 +169,17 @@ static DWORD WINAPI IDirect3DVertexBuffer8Impl_GetPriority(LPDIRECT3DVERTEXBUFFE
static
void
WINAPI
IDirect3DVertexBuffer8Impl_PreLoad
(
LPDIRECT3DVERTEXBUFFER8
iface
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
IWineD3DBuffer_PreLoad
(
This
->
wineD3DVertexBuffer
);
wined3d_mutex_unlock
();
}
static
D3DRESOURCETYPE
WINAPI
IDirect3DVertexBuffer8Impl_GetType
(
LPDIRECT3DVERTEXBUFFER8
iface
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
TRACE
(
"
(%p)
\n
"
,
This
);
static
D3DRESOURCETYPE
WINAPI
IDirect3DVertexBuffer8Impl_GetType
(
IDirect3DVertexBuffer8
*
iface
)
{
TRACE
(
"
iface %p.
\n
"
,
iface
);
return
D3DRTYPE_VERTEXBUFFER
;
}
...
...
@@ -177,7 +188,9 @@ static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer8Impl_GetType(LPDIRECT3DVERTE
static
HRESULT
WINAPI
IDirect3DVertexBuffer8Impl_Lock
(
LPDIRECT3DVERTEXBUFFER8
iface
,
UINT
OffsetToLock
,
UINT
SizeToLock
,
BYTE
**
ppbData
,
DWORD
Flags
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#x.
\n
"
,
iface
,
OffsetToLock
,
SizeToLock
,
ppbData
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_Map
(
This
->
wineD3DVertexBuffer
,
OffsetToLock
,
SizeToLock
,
ppbData
,
Flags
);
...
...
@@ -189,7 +202,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_Lock(LPDIRECT3DVERTEXBUFFER8 if
static
HRESULT
WINAPI
IDirect3DVertexBuffer8Impl_Unlock
(
LPDIRECT3DVERTEXBUFFER8
iface
)
{
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_Unmap
(
This
->
wineD3DVertexBuffer
);
...
...
@@ -202,7 +216,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER8
IDirect3DVertexBuffer8Impl
*
This
=
(
IDirect3DVertexBuffer8Impl
*
)
iface
;
HRESULT
hr
;
WINED3DBUFFER_DESC
desc
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, desc %p.
\n
"
,
iface
,
pDesc
);
wined3d_mutex_lock
();
hr
=
IWineD3DBuffer_GetDesc
(
This
->
wineD3DVertexBuffer
,
&
desc
);
...
...
dlls/d3d8/vertexdeclaration.c
View file @
f8bd01a3
...
...
@@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
/* IUnknown */
static
HRESULT
WINAPI
IDirect3DVertexDeclaration8Impl_QueryInterface
(
IDirect3DVertexDeclaration8
*
iface
,
REFIID
riid
,
void
**
obj_ptr
)
{
TRACE
(
"
(%p)->(%s, %p)
\n
"
,
iface
,
debugstr_guid
(
riid
),
obj_ptr
);
TRACE
(
"
iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
obj_ptr
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DVertexDeclaration8
))
...
...
@@ -46,9 +46,9 @@ static HRESULT WINAPI IDirect3DVertexDeclaration8Impl_QueryInterface(IDirect3DVe
static
ULONG
WINAPI
IDirect3DVertexDeclaration8Impl_AddRef
(
IDirect3DVertexDeclaration8
*
iface
)
{
IDirect3DVertexDeclaration8Impl
*
This
=
(
IDirect3DVertexDeclaration8Impl
*
)
iface
;
ULONG
ref_count
=
InterlockedIncrement
(
&
This
->
ref_count
);
TRACE
(
"(%p) : AddRef increasing to %d
\n
"
,
This
,
ref_count
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
ref_count
);
if
(
ref_count
==
1
)
{
...
...
@@ -63,9 +63,9 @@ static ULONG WINAPI IDirect3DVertexDeclaration8Impl_AddRef(IDirect3DVertexDeclar
static
ULONG
WINAPI
IDirect3DVertexDeclaration8Impl_Release
(
IDirect3DVertexDeclaration8
*
iface
)
{
IDirect3DVertexDeclaration8Impl
*
This
=
(
IDirect3DVertexDeclaration8Impl
*
)
iface
;
ULONG
ref_count
=
InterlockedDecrement
(
&
This
->
ref_count
);
TRACE
(
"(%p) : Releasing to %d
\n
"
,
This
,
ref_count
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
ref_count
);
if
(
!
ref_count
)
{
wined3d_mutex_lock
();
...
...
dlls/d3d8/vertexshader.c
View file @
f8bd01a3
...
...
@@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static
HRESULT
WINAPI
IDirect3DVertexShader8Impl_QueryInterface
(
IDirect3DVertexShader8
*
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DVertexShader8Impl
*
This
=
(
IDirect3DVertexShader8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DVertexShader8
))
{
IUnknown_AddRef
(
iface
);
...
...
@@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DVertexShader8Impl_AddRef(IDirect3DVertexShader8 *if
IDirect3DVertexShader8Impl
*
This
=
(
IDirect3DVertexShader8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
&&
This
->
wineD3DVertexShader
)
{
...
...
@@ -67,7 +69,7 @@ static ULONG WINAPI IDirect3DVertexShader8Impl_Release(IDirect3DVertexShader8 *i
IDirect3DVertexShader8Impl
*
This
=
(
IDirect3DVertexShader8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
if
(
This
->
wineD3DVertexShader
)
...
...
dlls/d3d8/volume.c
View file @
f8bd01a3
...
...
@@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static
HRESULT
WINAPI
IDirect3DVolume8Impl_QueryInterface
(
LPDIRECT3DVOLUME8
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DVolume8
))
{
IUnknown_AddRef
(
iface
);
...
...
@@ -42,7 +44,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 ifac
static
ULONG
WINAPI
IDirect3DVolume8Impl_AddRef
(
LPDIRECT3DVOLUME8
iface
)
{
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
TRACE
(
"
(%p)
\n
"
,
This
);
TRACE
(
"
iface %p.
\n
"
,
iface
);
if
(
This
->
forwardReference
)
{
/* Forward to the containerParent */
...
...
@@ -51,7 +53,8 @@ static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) {
}
else
{
/* No container, handle our own refcounting */
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
{
...
...
@@ -67,7 +70,7 @@ static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) {
static
ULONG
WINAPI
IDirect3DVolume8Impl_Release
(
LPDIRECT3DVOLUME8
iface
)
{
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
TRACE
(
"
(%p)
\n
"
,
This
);
TRACE
(
"
iface %p.
\n
"
,
iface
);
if
(
This
->
forwardReference
)
{
/* Forward to the containerParent */
...
...
@@ -77,7 +80,8 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) {
else
{
/* No container, handle our own refcounting */
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
wined3d_mutex_lock
();
...
...
@@ -94,6 +98,8 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, ID
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
IWineD3DDevice
*
myDevice
=
NULL
;
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
ppDevice
);
wined3d_mutex_lock
();
IWineD3DVolume_GetDevice
(
This
->
wineD3DVolume
,
&
myDevice
);
IWineD3DDevice_GetParent
(
myDevice
,
(
IUnknown
**
)
ppDevice
);
...
...
@@ -106,7 +112,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, ID
static
HRESULT
WINAPI
IDirect3DVolume8Impl_SetPrivateData
(
LPDIRECT3DVOLUME8
iface
,
REFGUID
refguid
,
CONST
void
*
pData
,
DWORD
SizeOfData
,
DWORD
Flags
)
{
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %u, flags %#x.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
SizeOfData
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolume_SetPrivateData
(
This
->
wineD3DVolume
,
refguid
,
pData
,
SizeOfData
,
Flags
);
...
...
@@ -118,7 +126,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 ifac
static
HRESULT
WINAPI
IDirect3DVolume8Impl_GetPrivateData
(
LPDIRECT3DVOLUME8
iface
,
REFGUID
refguid
,
void
*
pData
,
DWORD
*
pSizeOfData
)
{
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %p.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
pSizeOfData
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolume_GetPrivateData
(
This
->
wineD3DVolume
,
refguid
,
pData
,
pSizeOfData
);
...
...
@@ -130,7 +140,8 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 ifac
static
HRESULT
WINAPI
IDirect3DVolume8Impl_FreePrivateData
(
LPDIRECT3DVOLUME8
iface
,
REFGUID
refguid
)
{
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s.
\n
"
,
iface
,
debugstr_guid
(
refguid
));
wined3d_mutex_lock
();
hr
=
IWineD3DVolume_FreePrivateData
(
This
->
wineD3DVolume
,
refguid
);
...
...
@@ -143,7 +154,8 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface,
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
HRESULT
res
;
TRACE
(
"(This %p, riid %s, ppContainer %p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppContainer
);
TRACE
(
"iface %p, riid %s, container %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppContainer
);
if
(
!
This
->
container
)
return
E_NOINTERFACE
;
...
...
@@ -163,7 +175,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV
HRESULT
hr
;
WINED3DVOLUME_DESC
wined3ddesc
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p, desc %p.
\n
"
,
iface
,
pDesc
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolume_GetDesc
(
This
->
wineD3DVolume
,
&
wined3ddesc
);
...
...
@@ -187,7 +199,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV
static
HRESULT
WINAPI
IDirect3DVolume8Impl_LockBox
(
LPDIRECT3DVOLUME8
iface
,
D3DLOCKED_BOX
*
pLockedVolume
,
CONST
D3DBOX
*
pBox
,
DWORD
Flags
)
{
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) relay %p %p %p %d
\n
"
,
This
,
This
->
wineD3DVolume
,
pLockedVolume
,
pBox
,
Flags
);
TRACE
(
"iface %p, locked_box %p, box %p, flags %#x.
\n
"
,
iface
,
pLockedVolume
,
pBox
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolume_LockBox
(
This
->
wineD3DVolume
,
(
WINED3DLOCKED_BOX
*
)
pLockedVolume
,
(
CONST
WINED3DBOX
*
)
pBox
,
Flags
);
...
...
@@ -199,7 +213,8 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DL
static
HRESULT
WINAPI
IDirect3DVolume8Impl_UnlockBox
(
LPDIRECT3DVOLUME8
iface
)
{
IDirect3DVolume8Impl
*
This
=
(
IDirect3DVolume8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) relay %p
\n
"
,
This
,
This
->
wineD3DVolume
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolume_UnlockBox
(
This
->
wineD3DVolume
);
...
...
dlls/d3d8/volumetexture.c
View file @
f8bd01a3
...
...
@@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static
HRESULT
WINAPI
IDirect3DVolumeTexture8Impl_QueryInterface
(
LPDIRECT3DVOLUMETEXTURE8
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DResource8
)
||
IsEqualGUID
(
riid
,
&
IID_IDirect3DBaseTexture8
)
...
...
@@ -45,7 +47,7 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_AddRef(LPDIRECT3DVOLUMETEXTURE8
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : AddRef from %d
\n
"
,
This
,
ref
-
1
);
TRACE
(
"
%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
{
...
...
@@ -62,7 +64,7 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"
(%p) : ReleaseRef to %d
\n
"
,
This
,
ref
);
TRACE
(
"
%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
IDirect3DDevice8
*
parentDevice
=
This
->
parentDevice
;
...
...
@@ -82,7 +84,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEXT
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
IWineD3DDevice
*
wined3d_device
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
ppDevice
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolumeTexture_GetDevice
(
This
->
wineD3DVolumeTexture
,
&
wined3d_device
);
...
...
@@ -99,7 +102,9 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEXT
static
HRESULT
WINAPI
IDirect3DVolumeTexture8Impl_SetPrivateData
(
LPDIRECT3DVOLUMETEXTURE8
iface
,
REFGUID
refguid
,
CONST
void
*
pData
,
DWORD
SizeOfData
,
DWORD
Flags
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %u, flags %#x.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
SizeOfData
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolumeTexture_SetPrivateData
(
This
->
wineD3DVolumeTexture
,
refguid
,
pData
,
SizeOfData
,
Flags
);
...
...
@@ -111,7 +116,9 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_SetPrivateData(LPDIRECT3DVOLUM
static
HRESULT
WINAPI
IDirect3DVolumeTexture8Impl_GetPrivateData
(
LPDIRECT3DVOLUMETEXTURE8
iface
,
REFGUID
refguid
,
void
*
pData
,
DWORD
*
pSizeOfData
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s, data %p, data_size %p.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
pSizeOfData
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolumeTexture_GetPrivateData
(
This
->
wineD3DVolumeTexture
,
refguid
,
pData
,
pSizeOfData
);
...
...
@@ -123,7 +130,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetPrivateData(LPDIRECT3DVOLUM
static
HRESULT
WINAPI
IDirect3DVolumeTexture8Impl_FreePrivateData
(
LPDIRECT3DVOLUMETEXTURE8
iface
,
REFGUID
refguid
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, guid %s.
\n
"
,
iface
,
debugstr_guid
(
refguid
));
wined3d_mutex_lock
();
hr
=
IWineD3DVolumeTexture_FreePrivateData
(
This
->
wineD3DVolumeTexture
,
refguid
);
...
...
@@ -135,7 +143,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_FreePrivateData(LPDIRECT3DVOLU
static
DWORD
WINAPI
IDirect3DVolumeTexture8Impl_SetPriority
(
LPDIRECT3DVOLUMETEXTURE8
iface
,
DWORD
PriorityNew
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
PriorityNew
);
wined3d_mutex_lock
();
ret
=
IWineD3DVolumeTexture_SetPriority
(
This
->
wineD3DVolumeTexture
,
PriorityNew
);
...
...
@@ -147,7 +156,8 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetPriority(LPDIRECT3DVOLUMETEXT
static
DWORD
WINAPI
IDirect3DVolumeTexture8Impl_GetPriority
(
LPDIRECT3DVOLUMETEXTURE8
iface
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
ret
=
IWineD3DVolumeTexture_GetPriority
(
This
->
wineD3DVolumeTexture
);
...
...
@@ -158,7 +168,8 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetPriority(LPDIRECT3DVOLUMETEXT
static
void
WINAPI
IDirect3DVolumeTexture8Impl_PreLoad
(
LPDIRECT3DVOLUMETEXTURE8
iface
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
IWineD3DVolumeTexture_PreLoad
(
This
->
wineD3DVolumeTexture
);
...
...
@@ -168,7 +179,8 @@ static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE8
static
D3DRESOURCETYPE
WINAPI
IDirect3DVolumeTexture8Impl_GetType
(
LPDIRECT3DVOLUMETEXTURE8
iface
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
D3DRESOURCETYPE
type
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
type
=
IWineD3DVolumeTexture_GetType
(
This
->
wineD3DVolumeTexture
);
...
...
@@ -181,7 +193,8 @@ static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(LPDIRECT3DVOLU
static
DWORD
WINAPI
IDirect3DVolumeTexture8Impl_SetLOD
(
LPDIRECT3DVOLUMETEXTURE8
iface
,
DWORD
LODNew
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, lod %u.
\n
"
,
iface
,
LODNew
);
wined3d_mutex_lock
();
ret
=
IWineD3DVolumeTexture_SetLOD
(
This
->
wineD3DVolumeTexture
,
LODNew
);
...
...
@@ -193,7 +206,8 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetLOD(LPDIRECT3DVOLUMETEXTURE8
static
DWORD
WINAPI
IDirect3DVolumeTexture8Impl_GetLOD
(
LPDIRECT3DVOLUMETEXTURE8
iface
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
ret
=
IWineD3DVolumeTexture_GetLOD
(
This
->
wineD3DVolumeTexture
);
...
...
@@ -205,7 +219,8 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLOD(LPDIRECT3DVOLUMETEXTURE8
static
DWORD
WINAPI
IDirect3DVolumeTexture8Impl_GetLevelCount
(
LPDIRECT3DVOLUMETEXTURE8
iface
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
DWORD
ret
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
ret
=
IWineD3DVolumeTexture_GetLevelCount
(
This
->
wineD3DVolumeTexture
);
...
...
@@ -220,7 +235,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(LPDIRECT3DVOLUMET
WINED3DVOLUME_DESC
wined3ddesc
;
HRESULT
hr
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p, level %u, desc %p.
\n
"
,
iface
,
Level
,
pDesc
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolumeTexture_GetLevelDesc
(
This
->
wineD3DVolumeTexture
,
Level
,
&
wined3ddesc
);
...
...
@@ -246,7 +261,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(LPDIRECT3DVOLUM
HRESULT
hrc
=
D3D_OK
;
IWineD3DVolume
*
myVolume
=
NULL
;
TRACE
(
"
(%p) Relay
\n
"
,
This
);
TRACE
(
"
iface %p, level %u, volume %p.
\n
"
,
iface
,
Level
,
ppVolumeLevel
);
wined3d_mutex_lock
();
hrc
=
IWineD3DVolumeTexture_GetVolumeLevel
(
This
->
wineD3DVolumeTexture
,
Level
,
&
myVolume
);
...
...
@@ -262,7 +277,9 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(LPDIRECT3DVOLUM
static
HRESULT
WINAPI
IDirect3DVolumeTexture8Impl_LockBox
(
LPDIRECT3DVOLUMETEXTURE8
iface
,
UINT
Level
,
D3DLOCKED_BOX
*
pLockedVolume
,
CONST
D3DBOX
*
pBox
,
DWORD
Flags
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay %p %p %p %d
\n
"
,
This
,
This
->
wineD3DVolumeTexture
,
pLockedVolume
,
pBox
,
Flags
);
TRACE
(
"iface %p, level %u, locked_box %p, box %p, flags %#x.
\n
"
,
iface
,
Level
,
pLockedVolume
,
pBox
,
Flags
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolumeTexture_LockBox
(
This
->
wineD3DVolumeTexture
,
Level
,
(
WINED3DLOCKED_BOX
*
)
pLockedVolume
,
(
CONST
WINED3DBOX
*
)
pBox
,
Flags
);
...
...
@@ -274,7 +291,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTUR
static
HRESULT
WINAPI
IDirect3DVolumeTexture8Impl_UnlockBox
(
LPDIRECT3DVOLUMETEXTURE8
iface
,
UINT
Level
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay %p %d
\n
"
,
This
,
This
->
wineD3DVolumeTexture
,
Level
);
TRACE
(
"iface %p, level %u.
\n
"
,
iface
,
Level
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolumeTexture_UnlockBox
(
This
->
wineD3DVolumeTexture
,
Level
);
...
...
@@ -286,7 +304,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXT
static
HRESULT
WINAPI
IDirect3DVolumeTexture8Impl_AddDirtyBox
(
LPDIRECT3DVOLUMETEXTURE8
iface
,
CONST
D3DBOX
*
pDirtyBox
)
{
IDirect3DVolumeTexture8Impl
*
This
=
(
IDirect3DVolumeTexture8Impl
*
)
iface
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
TRACE
(
"iface %p, dirty_box %p.
\n
"
,
iface
,
pDirtyBox
);
wined3d_mutex_lock
();
hr
=
IWineD3DVolumeTexture_AddDirtyBox
(
This
->
wineD3DVolumeTexture
,
(
CONST
WINED3DBOX
*
)
pDirtyBox
);
...
...
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