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
9b3742be
Commit
9b3742be
authored
Sep 18, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Nov 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: Build without -DWINE_NO_LONG_TYPES.
parent
52c35814
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
81 additions
and
83 deletions
+81
-83
Makefile.in
dlls/d3d9/Makefile.in
+0
-1
buffer.c
dlls/d3d9/buffer.c
+12
-12
d3d9_main.c
dlls/d3d9/d3d9_main.c
+6
-6
device.c
dlls/d3d9/device.c
+0
-0
directx.c
dlls/d3d9/directx.c
+12
-12
query.c
dlls/d3d9/query.c
+5
-6
shader.c
dlls/d3d9/shader.c
+6
-6
stateblock.c
dlls/d3d9/stateblock.c
+3
-3
surface.c
dlls/d3d9/surface.c
+6
-6
swapchain.c
dlls/d3d9/swapchain.c
+5
-5
texture.c
dlls/d3d9/texture.c
+18
-18
vertexdeclaration.c
dlls/d3d9/vertexdeclaration.c
+6
-6
volume.c
dlls/d3d9/volume.c
+2
-2
No files found.
dlls/d3d9/Makefile.in
View file @
9b3742be
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
d3d9.dll
MODULE
=
d3d9.dll
IMPORTLIB
=
d3d9
IMPORTLIB
=
d3d9
IMPORTS
=
dxguid uuid wined3d
IMPORTS
=
dxguid uuid wined3d
...
...
dlls/d3d9/buffer.c
View file @
9b3742be
...
@@ -51,7 +51,7 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface)
...
@@ -51,7 +51,7 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface)
struct
d3d9_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer9
(
iface
);
struct
d3d9_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer9
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
buffer
->
resource
.
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
buffer
->
resource
.
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -70,7 +70,7 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface)
...
@@ -70,7 +70,7 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface)
struct
d3d9_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer9
(
iface
);
struct
d3d9_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer9
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
buffer
->
resource
.
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
buffer
->
resource
.
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -107,7 +107,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_SetPrivateData(IDirect3DVertexBuffer9 *i
...
@@ -107,7 +107,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_SetPrivateData(IDirect3DVertexBuffer9 *i
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d9_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer9
(
iface
);
struct
d3d9_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer9
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
buffer
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
buffer
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -137,7 +137,7 @@ static DWORD WINAPI d3d9_vertexbuffer_SetPriority(IDirect3DVertexBuffer9 *iface,
...
@@ -137,7 +137,7 @@ static DWORD WINAPI d3d9_vertexbuffer_SetPriority(IDirect3DVertexBuffer9 *iface,
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
previous
;
DWORD
previous
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_buffer_get_resource
(
buffer
->
wined3d_buffer
);
resource
=
wined3d_buffer_get_resource
(
buffer
->
wined3d_buffer
);
...
@@ -190,7 +190,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT
...
@@ -190,7 +190,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT
struct
wined3d_box
wined3d_box
;
struct
wined3d_box
wined3d_box
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#
l
x.
\n
"
,
iface
,
offset
,
size
,
data
,
flags
);
iface
,
offset
,
size
,
data
,
flags
);
wined3d_box_set
(
&
wined3d_box
,
offset
,
0
,
offset
+
size
,
1
,
0
,
1
);
wined3d_box_set
(
&
wined3d_box
,
offset
,
0
,
offset
+
size
,
1
,
0
,
1
);
...
@@ -331,7 +331,7 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *
...
@@ -331,7 +331,7 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d buffer, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d buffer, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
@@ -379,7 +379,7 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface)
...
@@ -379,7 +379,7 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface)
struct
d3d9_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer9
(
iface
);
struct
d3d9_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer9
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
buffer
->
resource
.
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
buffer
->
resource
.
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -395,7 +395,7 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface)
...
@@ -395,7 +395,7 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface)
struct
d3d9_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer9
(
iface
);
struct
d3d9_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer9
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
buffer
->
resource
.
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
buffer
->
resource
.
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -428,7 +428,7 @@ static HRESULT WINAPI d3d9_indexbuffer_SetPrivateData(IDirect3DIndexBuffer9 *ifa
...
@@ -428,7 +428,7 @@ static HRESULT WINAPI d3d9_indexbuffer_SetPrivateData(IDirect3DIndexBuffer9 *ifa
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d9_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer9
(
iface
);
struct
d3d9_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer9
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
buffer
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
buffer
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -458,7 +458,7 @@ static DWORD WINAPI d3d9_indexbuffer_SetPriority(IDirect3DIndexBuffer9 *iface, D
...
@@ -458,7 +458,7 @@ static DWORD WINAPI d3d9_indexbuffer_SetPriority(IDirect3DIndexBuffer9 *iface, D
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
previous
;
DWORD
previous
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_buffer_get_resource
(
buffer
->
wined3d_buffer
);
resource
=
wined3d_buffer_get_resource
(
buffer
->
wined3d_buffer
);
...
@@ -511,7 +511,7 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface,
...
@@ -511,7 +511,7 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface,
struct
wined3d_box
wined3d_box
;
struct
wined3d_box
wined3d_box
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#
l
x.
\n
"
,
iface
,
offset
,
size
,
data
,
flags
);
iface
,
offset
,
size
,
data
,
flags
);
wined3d_box_set
(
&
wined3d_box
,
offset
,
0
,
offset
+
size
,
1
,
0
,
1
);
wined3d_box_set
(
&
wined3d_box
,
offset
,
0
,
offset
+
size
,
1
,
0
,
1
);
...
@@ -635,7 +635,7 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de
...
@@ -635,7 +635,7 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d buffer, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d buffer, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d9/d3d9_main.c
View file @
9b3742be
...
@@ -113,7 +113,7 @@ struct IDirect3DShaderValidator9Vtbl
...
@@ -113,7 +113,7 @@ struct IDirect3DShaderValidator9Vtbl
HRESULT
(
WINAPI
*
Begin
)(
IDirect3DShaderValidator9
*
iface
,
HRESULT
(
WINAPI
*
Begin
)(
IDirect3DShaderValidator9
*
iface
,
shader_validator_cb
callback
,
void
*
context
,
DWORD_PTR
arg3
);
shader_validator_cb
callback
,
void
*
context
,
DWORD_PTR
arg3
);
HRESULT
(
WINAPI
*
Instruction
)(
IDirect3DShaderValidator9
*
iface
,
HRESULT
(
WINAPI
*
Instruction
)(
IDirect3DShaderValidator9
*
iface
,
const
char
*
file
,
int
line
,
const
DWORD
*
tokens
,
DWORD
token_count
);
const
char
*
file
,
int
line
,
const
DWORD
*
tokens
,
unsigned
int
token_count
);
HRESULT
(
WINAPI
*
End
)(
IDirect3DShaderValidator9
*
iface
);
HRESULT
(
WINAPI
*
End
)(
IDirect3DShaderValidator9
*
iface
);
};
};
...
@@ -161,7 +161,7 @@ static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface,
...
@@ -161,7 +161,7 @@ static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface,
* length.
* length.
* - "token_count" is in DWORDs. */
* - "token_count" is in DWORDs. */
static
HRESULT
WINAPI
shader_validator_Instruction
(
IDirect3DShaderValidator9
*
iface
,
static
HRESULT
WINAPI
shader_validator_Instruction
(
IDirect3DShaderValidator9
*
iface
,
const
char
*
file
,
int
line
,
const
DWORD
*
tokens
,
DWORD
token_count
)
const
char
*
file
,
int
line
,
const
DWORD
*
tokens
,
unsigned
int
token_count
)
{
{
WARN
(
"iface %p, file %s, line %u, tokens %p, token_count %u, stub!
\n
"
,
WARN
(
"iface %p, file %s, line %u, tokens %p, token_count %u, stub!
\n
"
,
iface
,
debugstr_a
(
file
),
line
,
tokens
,
token_count
);
iface
,
debugstr_a
(
file
),
line
,
tokens
,
token_count
);
...
@@ -200,7 +200,7 @@ IDirect3DShaderValidator9 * WINAPI Direct3DShaderValidatorCreate9(void)
...
@@ -200,7 +200,7 @@ IDirect3DShaderValidator9 * WINAPI Direct3DShaderValidatorCreate9(void)
*/
*/
int
WINAPI
D3DPERF_BeginEvent
(
D3DCOLOR
color
,
const
WCHAR
*
name
)
int
WINAPI
D3DPERF_BeginEvent
(
D3DCOLOR
color
,
const
WCHAR
*
name
)
{
{
TRACE
(
"color 0x%08x, name %s.
\n
"
,
color
,
debugstr_w
(
name
));
TRACE
(
"color 0x%08
l
x, name %s.
\n
"
,
color
,
debugstr_w
(
name
));
return
D3DPERF_event_level
++
;
return
D3DPERF_event_level
++
;
}
}
...
@@ -229,7 +229,7 @@ DWORD WINAPI D3DPERF_GetStatus(void) {
...
@@ -229,7 +229,7 @@ DWORD WINAPI D3DPERF_GetStatus(void) {
*/
*/
void
WINAPI
D3DPERF_SetOptions
(
DWORD
options
)
void
WINAPI
D3DPERF_SetOptions
(
DWORD
options
)
{
{
FIXME
(
"(%#x) : stub
\n
"
,
options
);
FIXME
(
"options %#lx, stub!
\n
"
,
options
);
}
}
/***********************************************************************
/***********************************************************************
...
@@ -246,7 +246,7 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(void) {
...
@@ -246,7 +246,7 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(void) {
*/
*/
void
WINAPI
D3DPERF_SetMarker
(
D3DCOLOR
color
,
const
WCHAR
*
name
)
void
WINAPI
D3DPERF_SetMarker
(
D3DCOLOR
color
,
const
WCHAR
*
name
)
{
{
FIXME
(
"color 0x%08x, name %s stub!
\n
"
,
color
,
debugstr_w
(
name
));
FIXME
(
"color 0x%08
l
x, name %s stub!
\n
"
,
color
,
debugstr_w
(
name
));
}
}
/***********************************************************************
/***********************************************************************
...
@@ -254,7 +254,7 @@ void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name)
...
@@ -254,7 +254,7 @@ void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name)
*/
*/
void
WINAPI
D3DPERF_SetRegion
(
D3DCOLOR
color
,
const
WCHAR
*
name
)
void
WINAPI
D3DPERF_SetRegion
(
D3DCOLOR
color
,
const
WCHAR
*
name
)
{
{
FIXME
(
"color 0x%08x, name %s stub!
\n
"
,
color
,
debugstr_w
(
name
));
FIXME
(
"color 0x%08
l
x, name %s stub!
\n
"
,
color
,
debugstr_w
(
name
));
}
}
void
d3d9_resource_cleanup
(
struct
d3d9_resource
*
resource
)
void
d3d9_resource_cleanup
(
struct
d3d9_resource
*
resource
)
...
...
dlls/d3d9/device.c
View file @
9b3742be
This diff is collapsed.
Click to expand it.
dlls/d3d9/directx.c
View file @
9b3742be
...
@@ -67,7 +67,7 @@ static ULONG WINAPI d3d9_AddRef(IDirect3D9Ex *iface)
...
@@ -67,7 +67,7 @@ static ULONG WINAPI d3d9_AddRef(IDirect3D9Ex *iface)
struct
d3d9
*
d3d9
=
impl_from_IDirect3D9Ex
(
iface
);
struct
d3d9
*
d3d9
=
impl_from_IDirect3D9Ex
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
d3d9
->
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
d3d9
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
return
refcount
;
return
refcount
;
}
}
...
@@ -77,7 +77,7 @@ static ULONG WINAPI d3d9_Release(IDirect3D9Ex *iface)
...
@@ -77,7 +77,7 @@ static ULONG WINAPI d3d9_Release(IDirect3D9Ex *iface)
struct
d3d9
*
d3d9
=
impl_from_IDirect3D9Ex
(
iface
);
struct
d3d9
*
d3d9
=
impl_from_IDirect3D9Ex
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
d3d9
->
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
d3d9
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -123,7 +123,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte
...
@@ -123,7 +123,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte
unsigned
int
output_idx
;
unsigned
int
output_idx
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, adapter %u, flags %#x, identifier %p.
\n
"
,
TRACE
(
"iface %p, adapter %u, flags %#
l
x, identifier %p.
\n
"
,
iface
,
adapter
,
flags
,
identifier
);
iface
,
adapter
,
flags
,
identifier
);
output_idx
=
adapter
;
output_idx
=
adapter
;
...
@@ -134,7 +134,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte
...
@@ -134,7 +134,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte
if
(
FAILED
(
hr
=
wined3d_output_get_desc
(
d3d9
->
wined3d_outputs
[
output_idx
],
&
output_desc
)))
if
(
FAILED
(
hr
=
wined3d_output_get_desc
(
d3d9
->
wined3d_outputs
[
output_idx
],
&
output_desc
)))
{
{
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Failed to get output description, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to get output description, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
WideCharToMultiByte
(
CP_ACP
,
0
,
output_desc
.
device_name
,
-
1
,
identifier
->
DeviceName
,
WideCharToMultiByte
(
CP_ACP
,
0
,
output_desc
.
device_name
,
-
1
,
identifier
->
DeviceName
,
...
@@ -283,7 +283,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter,
...
@@ -283,7 +283,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter,
unsigned
int
output_idx
;
unsigned
int
output_idx
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.
\n
"
,
TRACE
(
"iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#
l
x, resource_type %#x, format %#x.
\n
"
,
iface
,
adapter
,
device_type
,
adapter_format
,
usage
,
resource_type
,
format
);
iface
,
adapter
,
device_type
,
adapter_format
,
usage
,
resource_type
,
format
);
output_idx
=
adapter
;
output_idx
=
adapter
;
...
@@ -329,7 +329,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter,
...
@@ -329,7 +329,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter,
wined3d_adapter
=
wined3d_output_get_adapter
(
d3d9
->
wined3d_outputs
[
output_idx
]);
wined3d_adapter
=
wined3d_output_get_adapter
(
d3d9
->
wined3d_outputs
[
output_idx
]);
if
(
format
==
D3DFMT_RESZ
&&
resource_type
==
D3DRTYPE_SURFACE
&&
usage
==
D3DUSAGE_RENDERTARGET
)
if
(
format
==
D3DFMT_RESZ
&&
resource_type
==
D3DRTYPE_SURFACE
&&
usage
==
D3DUSAGE_RENDERTARGET
)
{
{
DWORD
levels
;
unsigned
int
levels
;
hr
=
wined3d_check_device_multisample_type
(
wined3d_adapter
,
wined3d_device_type_from_d3d
(
device_type
),
hr
=
wined3d_check_device_multisample_type
(
wined3d_adapter
,
wined3d_device_type_from_d3d
(
device_type
),
WINED3DFMT_D24_UNORM_S8_UINT
,
FALSE
,
WINED3D_MULTISAMPLE_NON_MASKABLE
,
&
levels
);
WINED3DFMT_D24_UNORM_S8_UINT
,
FALSE
,
WINED3D_MULTISAMPLE_NON_MASKABLE
,
&
levels
);
...
@@ -367,7 +367,7 @@ static HRESULT WINAPI d3d9_CheckDeviceMultiSampleType(IDirect3D9Ex *iface, UINT
...
@@ -367,7 +367,7 @@ static HRESULT WINAPI d3d9_CheckDeviceMultiSampleType(IDirect3D9Ex *iface, UINT
wined3d_adapter
=
wined3d_output_get_adapter
(
d3d9
->
wined3d_outputs
[
output_idx
]);
wined3d_adapter
=
wined3d_output_get_adapter
(
d3d9
->
wined3d_outputs
[
output_idx
]);
hr
=
wined3d_check_device_multisample_type
(
wined3d_adapter
,
hr
=
wined3d_check_device_multisample_type
(
wined3d_adapter
,
wined3d_device_type_from_d3d
(
device_type
),
wined3dformat_from_d3dformat
(
format
),
wined3d_device_type_from_d3d
(
device_type
),
wined3dformat_from_d3dformat
(
format
),
windowed
,
wined3d_multisample_type_from_d3d
(
multisample_type
),
levels
);
windowed
,
wined3d_multisample_type_from_d3d
(
multisample_type
),
(
unsigned
int
*
)
levels
);
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
hr
==
WINED3DERR_NOTAVAILABLE
&&
levels
)
if
(
hr
==
WINED3DERR_NOTAVAILABLE
&&
levels
)
*
levels
=
1
;
*
levels
=
1
;
...
@@ -471,7 +471,7 @@ static HMONITOR WINAPI d3d9_GetAdapterMonitor(IDirect3D9Ex *iface, UINT adapter)
...
@@ -471,7 +471,7 @@ static HMONITOR WINAPI d3d9_GetAdapterMonitor(IDirect3D9Ex *iface, UINT adapter)
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to get output desc, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to get output desc, hr %#
l
x.
\n
"
,
hr
);
return
NULL
;
return
NULL
;
}
}
...
@@ -486,7 +486,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U
...
@@ -486,7 +486,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U
struct
d3d9_device
*
object
;
struct
d3d9_device
*
object
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, device %p.
\n
"
,
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#
l
x, parameters %p, device %p.
\n
"
,
iface
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
device
);
iface
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
device
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
...
@@ -495,7 +495,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U
...
@@ -495,7 +495,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U
hr
=
device_init
(
object
,
d3d9
,
d3d9
->
wined3d
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
NULL
);
hr
=
device_init
(
object
,
d3d9
,
d3d9
->
wined3d
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
NULL
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to initialize device, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize device, hr %#
l
x.
\n
"
,
hr
);
heap_free
(
object
);
heap_free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -607,7 +607,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDeviceEx(IDirect3D9Ex *iface,
...
@@ -607,7 +607,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDeviceEx(IDirect3D9Ex *iface,
struct
d3d9_device
*
object
;
struct
d3d9_device
*
object
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, mode %p, device %p.
\n
"
,
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#
l
x, parameters %p, mode %p, device %p.
\n
"
,
iface
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
mode
,
device
);
iface
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
mode
,
device
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
...
@@ -616,7 +616,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDeviceEx(IDirect3D9Ex *iface,
...
@@ -616,7 +616,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDeviceEx(IDirect3D9Ex *iface,
hr
=
device_init
(
object
,
d3d9
,
d3d9
->
wined3d
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
mode
);
hr
=
device_init
(
object
,
d3d9
,
d3d9
->
wined3d
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
mode
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to initialize device, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize device, hr %#
l
x.
\n
"
,
hr
);
heap_free
(
object
);
heap_free
(
object
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d9/query.c
View file @
9b3742be
...
@@ -62,7 +62,7 @@ static ULONG WINAPI d3d9_query_AddRef(IDirect3DQuery9 *iface)
...
@@ -62,7 +62,7 @@ static ULONG WINAPI d3d9_query_AddRef(IDirect3DQuery9 *iface)
struct
d3d9_query
*
query
=
impl_from_IDirect3DQuery9
(
iface
);
struct
d3d9_query
*
query
=
impl_from_IDirect3DQuery9
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
query
->
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
query
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
return
refcount
;
return
refcount
;
}
}
...
@@ -72,7 +72,7 @@ static ULONG WINAPI d3d9_query_Release(IDirect3DQuery9 *iface)
...
@@ -72,7 +72,7 @@ static ULONG WINAPI d3d9_query_Release(IDirect3DQuery9 *iface)
struct
d3d9_query
*
query
=
impl_from_IDirect3DQuery9
(
iface
);
struct
d3d9_query
*
query
=
impl_from_IDirect3DQuery9
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
query
->
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
query
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -123,7 +123,7 @@ static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface)
...
@@ -123,7 +123,7 @@ static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface)
static
HRESULT
WINAPI
d3d9_query_Issue
(
IDirect3DQuery9
*
iface
,
DWORD
flags
)
static
HRESULT
WINAPI
d3d9_query_Issue
(
IDirect3DQuery9
*
iface
,
DWORD
flags
)
{
{
struct
d3d9_query
*
query
=
impl_from_IDirect3DQuery9
(
iface
);
struct
d3d9_query
*
query
=
impl_from_IDirect3DQuery9
(
iface
);
TRACE
(
"iface %p, flags %#x.
\n
"
,
iface
,
flags
);
TRACE
(
"iface %p, flags %#
l
x.
\n
"
,
iface
,
flags
);
return
wined3d_query_issue
(
query
->
wined3d_query
,
flags
);
return
wined3d_query_issue
(
query
->
wined3d_query
,
flags
);
}
}
...
@@ -133,8 +133,7 @@ static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWO
...
@@ -133,8 +133,7 @@ static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWO
enum
wined3d_query_type
type
;
enum
wined3d_query_type
type
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, data %p, size %u, flags %#x.
\n
"
,
TRACE
(
"iface %p, data %p, size %lu, flags %#lx.
\n
"
,
iface
,
data
,
size
,
flags
);
iface
,
data
,
size
,
flags
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
type
=
wined3d_query_get_type
(
query
->
wined3d_query
);
type
=
wined3d_query_get_type
(
query
->
wined3d_query
);
...
@@ -202,7 +201,7 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER
...
@@ -202,7 +201,7 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER
query
,
&
d3d9_null_wined3d_parent_ops
,
&
query
->
wined3d_query
)))
query
,
&
d3d9_null_wined3d_parent_ops
,
&
query
->
wined3d_query
)))
{
{
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Failed to create wined3d query, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d query, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d9/shader.c
View file @
9b3742be
...
@@ -49,7 +49,7 @@ static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface)
...
@@ -49,7 +49,7 @@ static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface)
struct
d3d9_vertexshader
*
shader
=
impl_from_IDirect3DVertexShader9
(
iface
);
struct
d3d9_vertexshader
*
shader
=
impl_from_IDirect3DVertexShader9
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
shader
->
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
shader
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -65,7 +65,7 @@ static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface)
...
@@ -65,7 +65,7 @@ static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface)
struct
d3d9_vertexshader
*
shader
=
impl_from_IDirect3DVertexShader9
(
iface
);
struct
d3d9_vertexshader
*
shader
=
impl_from_IDirect3DVertexShader9
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
shader
->
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
shader
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -144,7 +144,7 @@ HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device *
...
@@ -144,7 +144,7 @@ HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device *
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d vertex shader, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d vertex shader, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
@@ -192,7 +192,7 @@ static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface)
...
@@ -192,7 +192,7 @@ static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface)
struct
d3d9_pixelshader
*
shader
=
impl_from_IDirect3DPixelShader9
(
iface
);
struct
d3d9_pixelshader
*
shader
=
impl_from_IDirect3DPixelShader9
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
shader
->
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
shader
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -208,7 +208,7 @@ static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface)
...
@@ -208,7 +208,7 @@ static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface)
struct
d3d9_pixelshader
*
shader
=
impl_from_IDirect3DPixelShader9
(
iface
);
struct
d3d9_pixelshader
*
shader
=
impl_from_IDirect3DPixelShader9
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
shader
->
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
shader
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -287,7 +287,7 @@ HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *de
...
@@ -287,7 +287,7 @@ HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *de
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to created wined3d pixel shader, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to created wined3d pixel shader, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d9/stateblock.c
View file @
9b3742be
...
@@ -52,7 +52,7 @@ static ULONG WINAPI d3d9_stateblock_AddRef(IDirect3DStateBlock9 *iface)
...
@@ -52,7 +52,7 @@ static ULONG WINAPI d3d9_stateblock_AddRef(IDirect3DStateBlock9 *iface)
struct
d3d9_stateblock
*
stateblock
=
impl_from_IDirect3DStateBlock9
(
iface
);
struct
d3d9_stateblock
*
stateblock
=
impl_from_IDirect3DStateBlock9
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
stateblock
->
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
stateblock
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
return
refcount
;
return
refcount
;
}
}
...
@@ -62,7 +62,7 @@ static ULONG WINAPI d3d9_stateblock_Release(IDirect3DStateBlock9 *iface)
...
@@ -62,7 +62,7 @@ static ULONG WINAPI d3d9_stateblock_Release(IDirect3DStateBlock9 *iface)
struct
d3d9_stateblock
*
stateblock
=
impl_from_IDirect3DStateBlock9
(
iface
);
struct
d3d9_stateblock
*
stateblock
=
impl_from_IDirect3DStateBlock9
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
stateblock
->
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
stateblock
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -192,7 +192,7 @@ HRESULT stateblock_init(struct d3d9_stateblock *stateblock, struct d3d9_device *
...
@@ -192,7 +192,7 @@ HRESULT stateblock_init(struct d3d9_stateblock *stateblock, struct d3d9_device *
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d stateblock, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d stateblock, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
}
}
...
...
dlls/d3d9/surface.c
View file @
9b3742be
...
@@ -61,7 +61,7 @@ static ULONG WINAPI d3d9_surface_AddRef(IDirect3DSurface9 *iface)
...
@@ -61,7 +61,7 @@ static ULONG WINAPI d3d9_surface_AddRef(IDirect3DSurface9 *iface)
}
}
refcount
=
InterlockedIncrement
(
&
surface
->
resource
.
refcount
);
refcount
=
InterlockedIncrement
(
&
surface
->
resource
.
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -95,7 +95,7 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface)
...
@@ -95,7 +95,7 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface)
}
}
refcount
=
InterlockedDecrement
(
&
surface
->
resource
.
refcount
);
refcount
=
InterlockedDecrement
(
&
surface
->
resource
.
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -134,7 +134,7 @@ static HRESULT WINAPI d3d9_surface_SetPrivateData(IDirect3DSurface9 *iface, REFG
...
@@ -134,7 +134,7 @@ static HRESULT WINAPI d3d9_surface_SetPrivateData(IDirect3DSurface9 *iface, REFG
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d9_surface
*
surface
=
impl_from_IDirect3DSurface9
(
iface
);
struct
d3d9_surface
*
surface
=
impl_from_IDirect3DSurface9
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
surface
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
surface
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -160,7 +160,7 @@ static HRESULT WINAPI d3d9_surface_FreePrivateData(IDirect3DSurface9 *iface, REF
...
@@ -160,7 +160,7 @@ static HRESULT WINAPI d3d9_surface_FreePrivateData(IDirect3DSurface9 *iface, REF
static
DWORD
WINAPI
d3d9_surface_SetPriority
(
IDirect3DSurface9
*
iface
,
DWORD
priority
)
static
DWORD
WINAPI
d3d9_surface_SetPriority
(
IDirect3DSurface9
*
iface
,
DWORD
priority
)
{
{
TRACE
(
"iface %p, priority %u. Ignored on surfaces.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u. Ignored on surfaces.
\n
"
,
iface
,
priority
);
return
0
;
return
0
;
}
}
...
@@ -236,7 +236,7 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface,
...
@@ -236,7 +236,7 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface,
struct
wined3d_map_desc
map_desc
;
struct
wined3d_map_desc
map_desc
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, locked_rect %p, rect %s, flags %#x.
\n
"
,
TRACE
(
"iface %p, locked_rect %p, rect %s, flags %#
l
x.
\n
"
,
iface
,
locked_rect
,
wine_dbgstr_rect
(
rect
),
flags
);
iface
,
locked_rect
,
wine_dbgstr_rect
(
rect
),
flags
);
if
(
rect
)
if
(
rect
)
...
@@ -414,7 +414,7 @@ struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct
...
@@ -414,7 +414,7 @@ struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct
if
(
FAILED
(
hr
=
wined3d_rendertarget_view_create_from_sub_resource
(
surface
->
wined3d_texture
,
if
(
FAILED
(
hr
=
wined3d_rendertarget_view_create_from_sub_resource
(
surface
->
wined3d_texture
,
surface
->
sub_resource_idx
,
surface
,
&
d3d9_view_wined3d_parent_ops
,
&
surface
->
wined3d_rtv
)))
surface
->
sub_resource_idx
,
surface
,
&
d3d9_view_wined3d_parent_ops
,
&
surface
->
wined3d_rtv
)))
{
{
ERR
(
"Failed to create rendertarget view, hr %#x.
\n
"
,
hr
);
ERR
(
"Failed to create rendertarget view, hr %#
l
x.
\n
"
,
hr
);
d3d9_surface_Release
(
&
surface
->
IDirect3DSurface9_iface
);
d3d9_surface_Release
(
&
surface
->
IDirect3DSurface9_iface
);
return
NULL
;
return
NULL
;
}
}
...
...
dlls/d3d9/swapchain.c
View file @
9b3742be
...
@@ -92,7 +92,7 @@ static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9Ex *iface)
...
@@ -92,7 +92,7 @@ static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9Ex *iface)
struct
d3d9_swapchain
*
swapchain
=
impl_from_IDirect3DSwapChain9Ex
(
iface
);
struct
d3d9_swapchain
*
swapchain
=
impl_from_IDirect3DSwapChain9Ex
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
swapchain
->
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
swapchain
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -117,7 +117,7 @@ static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9Ex *iface)
...
@@ -117,7 +117,7 @@ static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9Ex *iface)
}
}
refcount
=
InterlockedDecrement
(
&
swapchain
->
refcount
);
refcount
=
InterlockedDecrement
(
&
swapchain
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -140,7 +140,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai
...
@@ -140,7 +140,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai
struct
d3d9_swapchain
*
swapchain
=
impl_from_IDirect3DSwapChain9Ex
(
iface
);
struct
d3d9_swapchain
*
swapchain
=
impl_from_IDirect3DSwapChain9Ex
(
iface
);
struct
d3d9_device
*
device
=
impl_from_IDirect3DDevice9Ex
(
swapchain
->
parent_device
);
struct
d3d9_device
*
device
=
impl_from_IDirect3DDevice9Ex
(
swapchain
->
parent_device
);
TRACE
(
"iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#
l
x.
\n
"
,
iface
,
wine_dbgstr_rect
(
src_rect
),
wine_dbgstr_rect
(
dst_rect
),
iface
,
wine_dbgstr_rect
(
src_rect
),
wine_dbgstr_rect
(
dst_rect
),
dst_window_override
,
dirty_region
,
flags
);
dst_window_override
,
dirty_region
,
flags
);
...
@@ -380,7 +380,7 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi
...
@@ -380,7 +380,7 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi
if
(
FAILED
(
hr
=
wined3d_swapchain_create
(
device
->
wined3d_device
,
desc
,
&
swapchain
->
state_parent
,
if
(
FAILED
(
hr
=
wined3d_swapchain_create
(
device
->
wined3d_device
,
desc
,
&
swapchain
->
state_parent
,
swapchain
,
&
d3d9_swapchain_wined3d_parent_ops
,
&
swapchain
->
wined3d_swapchain
)))
swapchain
,
&
d3d9_swapchain_wined3d_parent_ops
,
&
swapchain
->
wined3d_swapchain
)))
{
{
WARN
(
"Failed to create wined3d swapchain, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d swapchain, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
@@ -401,7 +401,7 @@ HRESULT d3d9_swapchain_create(struct d3d9_device *device, struct wined3d_swapcha
...
@@ -401,7 +401,7 @@ HRESULT d3d9_swapchain_create(struct d3d9_device *device, struct wined3d_swapcha
if
(
FAILED
(
hr
=
swapchain_init
(
object
,
device
,
desc
,
swap_interval
)))
if
(
FAILED
(
hr
=
swapchain_init
(
object
,
device
,
desc
,
swap_interval
)))
{
{
WARN
(
"Failed to initialize swapchain, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize swapchain, hr %#
l
x.
\n
"
,
hr
);
heap_free
(
object
);
heap_free
(
object
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d9/texture.c
View file @
9b3742be
...
@@ -26,7 +26,7 @@ static ULONG d3d9_texture_incref(struct d3d9_texture *texture)
...
@@ -26,7 +26,7 @@ static ULONG d3d9_texture_incref(struct d3d9_texture *texture)
{
{
ULONG
ref
=
InterlockedIncrement
(
&
texture
->
resource
.
refcount
);
ULONG
ref
=
InterlockedIncrement
(
&
texture
->
resource
.
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
texture
,
ref
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
texture
,
ref
);
if
(
ref
==
1
)
if
(
ref
==
1
)
{
{
...
@@ -49,7 +49,7 @@ static ULONG d3d9_texture_decref(struct d3d9_texture *texture)
...
@@ -49,7 +49,7 @@ static ULONG d3d9_texture_decref(struct d3d9_texture *texture)
{
{
ULONG
ref
=
InterlockedDecrement
(
&
texture
->
resource
.
refcount
);
ULONG
ref
=
InterlockedDecrement
(
&
texture
->
resource
.
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
texture
,
ref
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
texture
,
ref
);
if
(
!
ref
)
if
(
!
ref
)
{
{
...
@@ -125,7 +125,7 @@ static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource
...
@@ -125,7 +125,7 @@ static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource
wined3d_texture_get_resource
(
d3d9_texture_get_draw_texture
(
texture
)),
texture
,
wined3d_texture_get_resource
(
d3d9_texture_get_draw_texture
(
texture
)),
texture
,
&
d3d9_srv_wined3d_parent_ops
,
&
texture
->
wined3d_srv
)))
&
d3d9_srv_wined3d_parent_ops
,
&
texture
->
wined3d_srv
)))
{
{
ERR
(
"Failed to create shader resource view, hr %#x.
\n
"
,
hr
);
ERR
(
"Failed to create shader resource view, hr %#
l
x.
\n
"
,
hr
);
return
NULL
;
return
NULL
;
}
}
...
@@ -201,7 +201,7 @@ static HRESULT WINAPI d3d9_texture_2d_SetPrivateData(IDirect3DTexture9 *iface,
...
@@ -201,7 +201,7 @@ static HRESULT WINAPI d3d9_texture_2d_SetPrivateData(IDirect3DTexture9 *iface,
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DTexture9
(
iface
);
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DTexture9
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -231,7 +231,7 @@ static DWORD WINAPI d3d9_texture_2d_SetPriority(IDirect3DTexture9 *iface, DWORD
...
@@ -231,7 +231,7 @@ static DWORD WINAPI d3d9_texture_2d_SetPriority(IDirect3DTexture9 *iface, DWORD
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_texture_get_resource
(
d3d9_texture_get_draw_texture
(
texture
));
resource
=
wined3d_texture_get_resource
(
d3d9_texture_get_draw_texture
(
texture
));
...
@@ -278,7 +278,7 @@ static DWORD WINAPI d3d9_texture_2d_SetLOD(IDirect3DTexture9 *iface, DWORD lod)
...
@@ -278,7 +278,7 @@ static DWORD WINAPI d3d9_texture_2d_SetLOD(IDirect3DTexture9 *iface, DWORD lod)
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DTexture9
(
iface
);
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DTexture9
(
iface
);
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, lod %u.
\n
"
,
iface
,
lod
);
TRACE
(
"iface %p, lod %
l
u.
\n
"
,
iface
,
lod
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
ret
=
wined3d_texture_set_lod
(
d3d9_texture_get_draw_texture
(
texture
),
lod
);
ret
=
wined3d_texture_set_lod
(
d3d9_texture_get_draw_texture
(
texture
),
lod
);
...
@@ -427,7 +427,7 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface,
...
@@ -427,7 +427,7 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface,
struct
d3d9_surface
*
surface_impl
;
struct
d3d9_surface
*
surface_impl
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, level %u, locked_rect %p, rect %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, level %u, locked_rect %p, rect %p, flags %#
l
x.
\n
"
,
iface
,
level
,
locked_rect
,
rect
,
flags
);
iface
,
level
,
locked_rect
,
rect
,
flags
);
if
(
texture
->
usage
&
D3DUSAGE_AUTOGENMIPMAP
&&
level
)
if
(
texture
->
usage
&
D3DUSAGE_AUTOGENMIPMAP
&&
level
)
...
@@ -575,7 +575,7 @@ static HRESULT WINAPI d3d9_texture_cube_SetPrivateData(IDirect3DCubeTexture9 *if
...
@@ -575,7 +575,7 @@ static HRESULT WINAPI d3d9_texture_cube_SetPrivateData(IDirect3DCubeTexture9 *if
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DCubeTexture9
(
iface
);
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DCubeTexture9
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -605,7 +605,7 @@ static DWORD WINAPI d3d9_texture_cube_SetPriority(IDirect3DCubeTexture9 *iface,
...
@@ -605,7 +605,7 @@ static DWORD WINAPI d3d9_texture_cube_SetPriority(IDirect3DCubeTexture9 *iface,
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_texture_get_resource
(
d3d9_texture_get_draw_texture
(
texture
));
resource
=
wined3d_texture_get_resource
(
d3d9_texture_get_draw_texture
(
texture
));
...
@@ -652,7 +652,7 @@ static DWORD WINAPI d3d9_texture_cube_SetLOD(IDirect3DCubeTexture9 *iface, DWORD
...
@@ -652,7 +652,7 @@ static DWORD WINAPI d3d9_texture_cube_SetLOD(IDirect3DCubeTexture9 *iface, DWORD
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DCubeTexture9
(
iface
);
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DCubeTexture9
(
iface
);
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, lod %u.
\n
"
,
iface
,
lod
);
TRACE
(
"iface %p, lod %
l
u.
\n
"
,
iface
,
lod
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
ret
=
wined3d_texture_set_lod
(
d3d9_texture_get_draw_texture
(
texture
),
lod
);
ret
=
wined3d_texture_set_lod
(
d3d9_texture_get_draw_texture
(
texture
),
lod
);
...
@@ -822,7 +822,7 @@ static HRESULT WINAPI d3d9_texture_cube_LockRect(IDirect3DCubeTexture9 *iface,
...
@@ -822,7 +822,7 @@ static HRESULT WINAPI d3d9_texture_cube_LockRect(IDirect3DCubeTexture9 *iface,
UINT
sub_resource_idx
;
UINT
sub_resource_idx
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#
l
x.
\n
"
,
iface
,
face
,
level
,
locked_rect
,
rect
,
flags
);
iface
,
face
,
level
,
locked_rect
,
rect
,
flags
);
if
(
texture
->
usage
&
D3DUSAGE_AUTOGENMIPMAP
&&
level
)
if
(
texture
->
usage
&
D3DUSAGE_AUTOGENMIPMAP
&&
level
)
...
@@ -975,7 +975,7 @@ static HRESULT WINAPI d3d9_texture_3d_SetPrivateData(IDirect3DVolumeTexture9 *if
...
@@ -975,7 +975,7 @@ static HRESULT WINAPI d3d9_texture_3d_SetPrivateData(IDirect3DVolumeTexture9 *if
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DVolumeTexture9
(
iface
);
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DVolumeTexture9
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -1005,7 +1005,7 @@ static DWORD WINAPI d3d9_texture_3d_SetPriority(IDirect3DVolumeTexture9 *iface,
...
@@ -1005,7 +1005,7 @@ static DWORD WINAPI d3d9_texture_3d_SetPriority(IDirect3DVolumeTexture9 *iface,
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_texture_get_resource
(
d3d9_texture_get_draw_texture
(
texture
));
resource
=
wined3d_texture_get_resource
(
d3d9_texture_get_draw_texture
(
texture
));
...
@@ -1052,7 +1052,7 @@ static DWORD WINAPI d3d9_texture_3d_SetLOD(IDirect3DVolumeTexture9 *iface, DWORD
...
@@ -1052,7 +1052,7 @@ static DWORD WINAPI d3d9_texture_3d_SetLOD(IDirect3DVolumeTexture9 *iface, DWORD
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DVolumeTexture9
(
iface
);
struct
d3d9_texture
*
texture
=
impl_from_IDirect3DVolumeTexture9
(
iface
);
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, lod %u.
\n
"
,
iface
,
lod
);
TRACE
(
"iface %p, lod %
l
u.
\n
"
,
iface
,
lod
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
ret
=
wined3d_texture_set_lod
(
d3d9_texture_get_draw_texture
(
texture
),
lod
);
ret
=
wined3d_texture_set_lod
(
d3d9_texture_get_draw_texture
(
texture
),
lod
);
...
@@ -1162,7 +1162,7 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface,
...
@@ -1162,7 +1162,7 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface,
struct
d3d9_volume
*
volume_impl
;
struct
d3d9_volume
*
volume_impl
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, level %u, locked_box %p, box %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, level %u, locked_box %p, box %p, flags %#
l
x.
\n
"
,
iface
,
level
,
locked_box
,
box
,
flags
);
iface
,
level
,
locked_box
,
box
,
flags
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
...
@@ -1356,7 +1356,7 @@ static HRESULT d3d9_texture_init(struct d3d9_texture *texture, struct d3d9_devic
...
@@ -1356,7 +1356,7 @@ static HRESULT d3d9_texture_init(struct d3d9_texture *texture, struct d3d9_devic
NULL
,
texture
,
&
d3d9_null_wined3d_parent_ops
,
&
texture
->
wined3d_texture
)))
NULL
,
texture
,
&
d3d9_null_wined3d_parent_ops
,
&
texture
->
wined3d_texture
)))
{
{
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Failed to create sysmem texture, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create sysmem texture, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
@@ -1368,7 +1368,7 @@ static HRESULT d3d9_texture_init(struct d3d9_texture *texture, struct d3d9_devic
...
@@ -1368,7 +1368,7 @@ static HRESULT d3d9_texture_init(struct d3d9_texture *texture, struct d3d9_devic
{
{
wined3d_texture_decref
(
texture
->
wined3d_texture
);
wined3d_texture_decref
(
texture
->
wined3d_texture
);
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Failed to create draw texture, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create draw texture, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
}
}
...
@@ -1378,7 +1378,7 @@ static HRESULT d3d9_texture_init(struct d3d9_texture *texture, struct d3d9_devic
...
@@ -1378,7 +1378,7 @@ static HRESULT d3d9_texture_init(struct d3d9_texture *texture, struct d3d9_devic
NULL
,
texture
,
&
d3d9_texture_wined3d_parent_ops
,
&
texture
->
wined3d_texture
)))
NULL
,
texture
,
&
d3d9_texture_wined3d_parent_ops
,
&
texture
->
wined3d_texture
)))
{
{
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Failed to create wined3d texture, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d texture, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
}
}
...
...
dlls/d3d9/vertexdeclaration.c
View file @
9b3742be
...
@@ -119,7 +119,7 @@ HRESULT vdecl_convert_fvf(
...
@@ -119,7 +119,7 @@ HRESULT vdecl_convert_fvf(
case
3
:
elements
[
idx
].
Type
=
D3DDECLTYPE_FLOAT3
;
break
;
case
3
:
elements
[
idx
].
Type
=
D3DDECLTYPE_FLOAT3
;
break
;
case
4
:
elements
[
idx
].
Type
=
D3DDECLTYPE_FLOAT4
;
break
;
case
4
:
elements
[
idx
].
Type
=
D3DDECLTYPE_FLOAT4
;
break
;
default:
default:
ERR
(
"Unexpected amount of blend values: %u
\n
"
,
num_blends
);
ERR
(
"Unexpected amount of blend values: %
l
u
\n
"
,
num_blends
);
}
}
}
}
elements
[
idx
].
Usage
=
D3DDECLUSAGE_BLENDWEIGHT
;
elements
[
idx
].
Usage
=
D3DDECLUSAGE_BLENDWEIGHT
;
...
@@ -220,7 +220,7 @@ static ULONG WINAPI d3d9_vertex_declaration_AddRef(IDirect3DVertexDeclaration9 *
...
@@ -220,7 +220,7 @@ static ULONG WINAPI d3d9_vertex_declaration_AddRef(IDirect3DVertexDeclaration9 *
struct
d3d9_vertex_declaration
*
declaration
=
impl_from_IDirect3DVertexDeclaration9
(
iface
);
struct
d3d9_vertex_declaration
*
declaration
=
impl_from_IDirect3DVertexDeclaration9
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
declaration
->
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
declaration
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -236,7 +236,7 @@ static ULONG WINAPI d3d9_vertex_declaration_Release(IDirect3DVertexDeclaration9
...
@@ -236,7 +236,7 @@ static ULONG WINAPI d3d9_vertex_declaration_Release(IDirect3DVertexDeclaration9
struct
d3d9_vertex_declaration
*
declaration
=
impl_from_IDirect3DVertexDeclaration9
(
iface
);
struct
d3d9_vertex_declaration
*
declaration
=
impl_from_IDirect3DVertexDeclaration9
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
declaration
->
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
declaration
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -376,7 +376,7 @@ static HRESULT vertexdeclaration_init(struct d3d9_vertex_declaration *declaratio
...
@@ -376,7 +376,7 @@ static HRESULT vertexdeclaration_init(struct d3d9_vertex_declaration *declaratio
&
declaration
->
stream_map
);
&
declaration
->
stream_map
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d vertex declaration elements, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d vertex declaration elements, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
@@ -401,7 +401,7 @@ static HRESULT vertexdeclaration_init(struct d3d9_vertex_declaration *declaratio
...
@@ -401,7 +401,7 @@ static HRESULT vertexdeclaration_init(struct d3d9_vertex_declaration *declaratio
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
heap_free
(
declaration
->
elements
);
heap_free
(
declaration
->
elements
);
WARN
(
"Failed to create wined3d vertex declaration, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d vertex declaration, hr %#
l
x.
\n
"
,
hr
);
if
(
hr
==
E_INVALIDARG
)
if
(
hr
==
E_INVALIDARG
)
hr
=
E_FAIL
;
hr
=
E_FAIL
;
return
hr
;
return
hr
;
...
@@ -425,7 +425,7 @@ HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device,
...
@@ -425,7 +425,7 @@ HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device,
hr
=
vertexdeclaration_init
(
object
,
device
,
elements
);
hr
=
vertexdeclaration_init
(
object
,
device
,
elements
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to initialize vertex declaration, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize vertex declaration, hr %#
l
x.
\n
"
,
hr
);
heap_free
(
object
);
heap_free
(
object
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d9/volume.c
View file @
9b3742be
...
@@ -79,7 +79,7 @@ static HRESULT WINAPI d3d9_volume_SetPrivateData(IDirect3DVolume9 *iface, REFGUI
...
@@ -79,7 +79,7 @@ static HRESULT WINAPI d3d9_volume_SetPrivateData(IDirect3DVolume9 *iface, REFGUI
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d9_volume
*
volume
=
impl_from_IDirect3DVolume9
(
iface
);
struct
d3d9_volume
*
volume
=
impl_from_IDirect3DVolume9
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
volume
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d9_resource_set_private_data
(
&
volume
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -141,7 +141,7 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface,
...
@@ -141,7 +141,7 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface,
struct
wined3d_map_desc
map_desc
;
struct
wined3d_map_desc
map_desc
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, locked_box %p, box %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, locked_box %p, box %p, flags %#
l
x.
\n
"
,
iface
,
locked_box
,
box
,
flags
);
iface
,
locked_box
,
box
,
flags
);
if
(
FAILED
(
hr
=
wined3d_resource_map
(
wined3d_texture_get_resource
(
volume
->
wined3d_texture
),
if
(
FAILED
(
hr
=
wined3d_resource_map
(
wined3d_texture_get_resource
(
volume
->
wined3d_texture
),
...
...
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