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
9651079f
Commit
9651079f
authored
Dec 12, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 12, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Don't set the palette on attached backbuffers in ddraw_surface7_SetPalette().
Tests show this is just wrong. This patch fixes a regression introduced by commit
74e3f516
.
parent
1f0bb534
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
29 deletions
+0
-29
surface.c
dlls/ddraw/surface.c
+0
-29
No files found.
dlls/ddraw/surface.c
View file @
9651079f
...
...
@@ -4695,7 +4695,6 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir
struct
ddraw_surface
*
surface
=
impl_from_IDirectDrawSurface7
(
iface
);
struct
ddraw_palette
*
palette_impl
=
unsafe_impl_from_IDirectDrawPalette
(
palette
);
struct
ddraw_palette
*
prev
;
HRESULT
hr
;
TRACE
(
"iface %p, palette %p.
\n
"
,
iface
,
palette
);
...
...
@@ -4721,34 +4720,6 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir
wined3d_surface_set_palette
(
surface
->
ddraw
->
wined3d_frontbuffer
,
palette_impl
?
palette_impl
->
wineD3DPalette
:
NULL
);
/* If this is a front buffer, also update the back buffers
* TODO: How do things work for palettized cube textures? */
if
(
surface
->
surface_desc
.
ddsCaps
.
dwCaps
&
DDSCAPS_FRONTBUFFER
)
{
/* For primary surfaces the tree is just a list, so the simpler scheme fits too */
DDSCAPS2
caps2
=
{
DDSCAPS_FLIP
,
0
,
0
,
0
};
struct
ddraw_surface
*
current
=
surface
;
for
(;;)
{
IDirectDrawSurface7
*
attach
;
if
(
FAILED
(
hr
=
ddraw_surface7_GetAttachedSurface
(
&
current
->
IDirectDrawSurface7_iface
,
&
caps2
,
&
attach
)))
break
;
current
=
impl_from_IDirectDrawSurface7
(
attach
);
if
(
current
==
surface
)
{
ddraw_surface7_Release
(
attach
);
break
;
}
TRACE
(
"Setting palette on %p.
\n
"
,
attach
);
ddraw_surface7_SetPalette
(
attach
,
palette
);
ddraw_surface7_Release
(
attach
);
}
}
wined3d_mutex_unlock
();
return
DD_OK
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment