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
f024e237
Commit
f024e237
authored
Nov 16, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 16, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: Fix some return values.
parent
06581b45
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
device.c
dlls/d3d8/device.c
+12
-7
No files found.
dlls/d3d8/device.c
View file @
f024e237
...
...
@@ -464,9 +464,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8
TRACE
(
"iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.
\n
"
,
iface
,
XHotSpot
,
YHotSpot
,
pCursorBitmap
);
if
(
!
pCursorBitmap
)
{
WARN
(
"No cursor bitmap, returning WINED3DERR_INVALIDCALL
\n
"
);
return
WINED3DERR_INVALIDCALL
;
if
(
!
pCursorBitmap
)
{
WARN
(
"No cursor bitmap, returning D3DERR_INVALIDCALL.
\n
"
);
return
D3DERR_INVALIDCALL
;
}
wined3d_mutex_lock
();
...
...
@@ -903,11 +904,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID
destFormat
=
winedesc
.
format
;
/* Check that the source and destination formats match */
if
(
srcFormat
!=
destFormat
&&
WINED3DFMT_UNKNOWN
!=
destFormat
)
{
WARN
(
"(%p) source %p format must match the dest %p format, returning WINED3DERR_INVALIDCALL
\n
"
,
iface
,
pSourceSurface
,
pDestinationSurface
);
if
(
srcFormat
!=
destFormat
&&
WINED3DFMT_UNKNOWN
!=
destFormat
)
{
WARN
(
"Source %p format must match the dest %p format, returning D3DERR_INVALIDCALL.
\n
"
,
pSourceSurface
,
pDestinationSurface
);
wined3d_mutex_unlock
();
return
WINED3DERR_INVALIDCALL
;
}
else
if
(
WINED3DFMT_UNKNOWN
==
destFormat
)
{
return
D3DERR_INVALIDCALL
;
}
else
if
(
WINED3DFMT_UNKNOWN
==
destFormat
)
{
TRACE
(
"(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format
\n
"
,
iface
);
IWineD3DSurface_SetFormat
(
Dest
->
wineD3DSurface
,
srcFormat
);
}
...
...
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