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
4f50e751
Commit
4f50e751
authored
Oct 28, 2012
by
Józef Kucia
Committed by
Alexandre Julliard
Oct 29, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: A simple copy isn't enough when a color key is provided.
parent
08a5dbbb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
surface.c
dlls/d3dx9_36/surface.c
+2
-1
volume.c
dlls/d3dx9_36/volume.c
+4
-1
No files found.
dlls/d3dx9_36/surface.c
View file @
4f50e751
...
@@ -1668,7 +1668,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
...
@@ -1668,7 +1668,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
if
(
src_format
==
surfdesc
.
Format
if
(
src_format
==
surfdesc
.
Format
&&
dst_size
.
width
==
src_size
.
width
&&
dst_size
.
width
==
src_size
.
width
&&
dst_size
.
height
==
src_size
.
height
)
/* Simple copy. */
&&
dst_size
.
height
==
src_size
.
height
&&
color_key
==
0
)
/* Simple copy. */
{
{
if
(
src_rect
->
left
&
(
srcformatdesc
->
block_width
-
1
)
if
(
src_rect
->
left
&
(
srcformatdesc
->
block_width
-
1
)
||
src_rect
->
top
&
(
srcformatdesc
->
block_height
-
1
)
||
src_rect
->
top
&
(
srcformatdesc
->
block_height
-
1
)
...
...
dlls/d3dx9_36/volume.c
View file @
4f50e751
...
@@ -148,7 +148,10 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume,
...
@@ -148,7 +148,10 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume,
return
E_NOTIMPL
;
return
E_NOTIMPL
;
if
(
desc
.
Format
==
src_format
if
(
desc
.
Format
==
src_format
&&
dst_size
.
width
==
src_size
.
width
&&
dst_size
.
height
==
src_size
.
height
&&
dst_size
.
depth
==
src_size
.
depth
)
&&
dst_size
.
width
==
src_size
.
width
&&
dst_size
.
height
==
src_size
.
height
&&
dst_size
.
depth
==
src_size
.
depth
&&
color_key
==
0
)
{
{
const
BYTE
*
src_addr
;
const
BYTE
*
src_addr
;
...
...
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