Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-10-02 05:06:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct fix for Bugzilla #602.

Browse Source 
--HG--
branch : SDL-1.2
This commit is contained in:
Ryan C. Gordon
2008-09-15 20:47:55 +00:00
parent 2bf4df013b
commit 390ea0d774
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/Xext/Xxf86vm/XF86VMode.c
View File

@@ -214,12 +214,6 @@ SDL_NAME(XF86VidModeGetGamma)(Display *dpy, int screen, SDL_NAME(XF86VidModeGamm
return True;
}
/* this is to prevent an unaligned memory write on CPUs that need that. */
static void zap_ptr(char *ptr, size_t size)
{
memset(ptr, '\0', size);
}
Bool
SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, modeline)
Display* dpy;
@@ -290,7 +284,7 @@ SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, modeline)
}
_XRead(dpy, (char*)modeline->private, modeline->privsize * sizeof(INT32));
} else {
zap_ptr((char *)&modeline->private, sizeof(modeline->private));
modeline->private = NULL;
}
UnlockDisplay(dpy);
SyncHandle();

21
src/video/x11/SDL_x11modes.c
View File

@@ -52,8 +52,25 @@ static int cmpmodelist(const void *va, const void *vb)
#if SDL_VIDEO_DRIVER_X11_VIDMODE
Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidModeModeInfo) *info)
{
SDL_NAME(XF86VidModeModeLine) *l = (SDL_NAME(XF86VidModeModeLine)*)((char*)info + sizeof info->dotclock);
return SDL_NAME(XF86VidModeGetModeLine)(dpy, scr, (int*)&info->dotclock, l);
Bool retval;
int dotclock;
SDL_NAME(XF86VidModeModeLine) l;
SDL_memset(&l, 0, sizeof(l));
retval = SDL_NAME(XF86VidModeGetModeLine)(dpy, scr, &dotclock, &l);
info->dotclock = dotclock;
info->hdisplay = l.hdisplay;
info->hsyncstart = l.hsyncstart;
info->hsyncend = l.hsyncend;
info->htotal = l.htotal;
info->hskew = l.hskew;
info->vdisplay = l.vdisplay;
info->vsyncstart = l.vsyncstart;
info->vsyncend = l.vsyncend;
info->vtotal = l.vtotal;
info->flags = l.flags;
info->privsize = l.privsize;
info->private = l.private;
return retval;
}
#endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */