Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yoann Laissus
wine
Commits
e88edac6
Commit
e88edac6
authored
23 years ago
by
Lionel Ulmer
Committed by
Alexandre Julliard
23 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix crash in the X11 HAL when setting a NULL palette to a surface.
parent
519d4864
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/ddraw/dsurface/hal.c
+1
-1
1 addition, 1 deletion
dlls/ddraw/dsurface/hal.c
dlls/x11drv/x11ddraw.c
+5
-3
5 additions, 3 deletions
dlls/x11drv/x11ddraw.c
with
6 additions
and
4 deletions
dlls/ddraw/dsurface/hal.c
+
1
−
1
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
;
...
...
This diff is collapsed.
Click to expand it.
dlls/x11drv/x11ddraw.c
+
5
−
3
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment