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
e88edac6
Commit
e88edac6
authored
Feb 26, 2002
by
Lionel Ulmer
Committed by
Alexandre Julliard
Feb 26, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix crash in the X11 HAL when setting a NULL palette to a surface.
parent
519d4864
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
hal.c
dlls/ddraw/dsurface/hal.c
+1
-1
x11ddraw.c
dlls/x11drv/x11ddraw.c
+5
-3
No files found.
dlls/ddraw/dsurface/hal.c
View file @
e88edac6
...
...
@@ -223,7 +223,7 @@ void HAL_DirectDrawSurface_set_palette(IDirectDrawSurfaceImpl* This,
DIB_DirectDrawSurface_set_palette
(
This
,
pal
);
data
.
lpDD
=
dd_gbl
;
data
.
lpDDSurface
=
&
This
->
local
;
data
.
lpDDPalette
=
&
pal
->
global
;
data
.
lpDDPalette
=
(
pal
!=
NULL
?
&
pal
->
global
:
NULL
)
;
data
.
ddRVal
=
0
;
data
.
Attach
=
TRUE
;
/* what's this? */
data
.
SetPalette
=
dd_gbl
->
lpDDCBtmp
->
HALDDSurface
.
SetPalette
;
...
...
dlls/x11drv/x11ddraw.c
View file @
e88edac6
...
...
@@ -159,12 +159,14 @@ static DWORD PASCAL X11DRV_DDHAL_DestroySurface(LPDDHAL_DESTROYSURFACEDATA data)
static
DWORD
PASCAL
X11DRV_DDHAL_SetPalette
(
LPDDHAL_SETPALETTEDATA
data
)
{
Colormap
pal
=
data
->
lpDDPalette
->
u1
.
dwReserved1
;
if
(
pal
)
{
if
(
data
->
lpDDPalette
&&
data
->
lpDDPalette
->
u1
.
dwReserved1
)
{
if
(
data
->
lpDDSurface
==
X11DRV_DD_Primary
)
{
FIXME
(
"stub
\n
"
);
/* we should probably find the ddraw window (maybe data->lpDD->lpExclusiveOwner->hWnd),
* and attach the palette to it */
* and attach the palette to it
*
* Colormap pal = data->lpDDPalette->u1.dwReserved1;
*/
}
}
data
->
ddRVal
=
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