enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Ecore_X: Fix more memcpy madness causing problems in randr. This fixes 

crtc_possible_outputs_get and crtc_outputs_get.



SVN revision: 76454
This commit is contained in:
Christopher Michael 2012-09-11 11:41:26 +00:00
parent 90f9d623fe
commit 4b1e2578b0
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c
View File

@ -681,19 +681,19 @@ ecore_x_randr_crtc_outputs_get(Ecore_X_Window root,
Ecore_X_Randr_Output *ret = NULL;
XRRCrtcInfo *crtc_info = NULL;
if (_ecore_x_randr_crtc_validate(root,
crtc) &&
if (_ecore_x_randr_crtc_validate(root, crtc) &&
(res =
_ecore_x_randr_get_screen_resources (_ecore_x_disp,
root)) &&
_ecore_x_randr_get_screen_resources (_ecore_x_disp, root)) &&
(crtc_info = XRRGetCrtcInfo(_ecore_x_disp, res, crtc)))
{
if ((ret = malloc(sizeof(Ecore_X_Randr_Output) * crtc_info->noutput)))
{
memcpy(ret, crtc_info->outputs,
(sizeof(Ecore_X_Randr_Output) * crtc_info->noutput));
if (num)
*num = crtc_info->noutput;
int i = 0;
if (num) *num = crtc_info->noutput;
for (i = 0; i < crtc_info->noutput; i++)
ret[i] = crtc_info->outputs[i];
}
if (crtc_info)
@ -725,8 +725,7 @@ ecore_x_randr_crtc_possible_outputs_get(Ecore_X_Window root,
Ecore_X_Randr_Output *ret = NULL;
XRRCrtcInfo *crtc_info = NULL;
if (_ecore_x_randr_crtc_validate(root,
crtc) &&
if (_ecore_x_randr_crtc_validate(root, crtc) &&
(res = _ecore_x_randr_get_screen_resources (_ecore_x_disp, root)))
{
if ((crtc_info = XRRGetCrtcInfo(_ecore_x_disp, res, crtc)))
@ -734,10 +733,12 @@ ecore_x_randr_crtc_possible_outputs_get(Ecore_X_Window root,
if ((ret =
malloc(sizeof(Ecore_X_Randr_Output) * crtc_info->npossible)))
{
memcpy(ret, crtc_info->possible,
(sizeof(Ecore_X_Randr_Output) * crtc_info->npossible));
if (num)
*num = res->ncrtc;
int i = 0;
if (num) *num = crtc_info->npossible;
for (i = 0; i < crtc_info->npossible; i++)
ret[i] = crtc_info->possible[i];
}
XRRFreeCrtcInfo(crtc_info);