ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Try XRandR 1.0 if 1.2 fails.

This commit is contained in:
Henri Verbeet 2012-08-20 08:12:06 +02:00 committed by Alexandre Julliard
parent 1bd91a4fd2
commit 28a9b39372
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/winex11.drv/xrandr.c
View File

@ -344,24 +344,25 @@ static LONG xrandr12_set_current_mode( int mode )
return DISP_CHANGE_SUCCESSFUL; return DISP_CHANGE_SUCCESSFUL;
} }
static void xrandr12_init_modes(void) static int xrandr12_init_modes(void)
{ {
XRRScreenResources *resources; XRRScreenResources *resources;
XRROutputInfo *output_info; XRROutputInfo *output_info;
XRRCrtcInfo *crtc_info; XRRCrtcInfo *crtc_info;
int ret = -1;
int i, j; int i, j;
if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) if (!(resources = xrandr_get_screen_resources( gdi_display, root_window )))
{ {
ERR("Failed to get screen resources.\n"); ERR("Failed to get screen resources.\n");
return; return ret;
} }
if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] )))
{ {
pXRRFreeScreenResources( resources ); pXRRFreeScreenResources( resources );
ERR("Failed to get CRTC info.\n"); ERR("Failed to get CRTC info.\n");
return; return ret;
} }
TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode, TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode,
@ -372,7 +373,7 @@ static void xrandr12_init_modes(void)
pXRRFreeCrtcInfo( crtc_info ); pXRRFreeCrtcInfo( crtc_info );
pXRRFreeScreenResources( resources ); pXRRFreeScreenResources( resources );
ERR("Failed to get output info.\n"); ERR("Failed to get output info.\n");
return; return ret;
} }
TRACE("OUTPUT 0: name %s.\n", debugstr_a(output_info->name)); TRACE("OUTPUT 0: name %s.\n", debugstr_a(output_info->name));
@ -415,11 +416,13 @@ static void xrandr12_init_modes(void)
} }
X11DRV_Settings_AddDepthModes(); X11DRV_Settings_AddDepthModes();
ret = 0;
done: done:
pXRRFreeOutputInfo( output_info ); pXRRFreeOutputInfo( output_info );
pXRRFreeCrtcInfo( crtc_info ); pXRRFreeCrtcInfo( crtc_info );
pXRRFreeScreenResources( resources ); pXRRFreeScreenResources( resources );
return ret;
} }
#endif /* HAVE_XRRGETSCREENRESOURCES */ #endif /* HAVE_XRRGETSCREENRESOURCES */
@ -452,9 +455,7 @@ void X11DRV_XRandR_Init(void)
xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResources", NULL, 0 ); xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResources", NULL, 0 );
} }
if (xrandr_get_screen_resources) if (!xrandr_get_screen_resources || xrandr12_init_modes() < 0)
xrandr12_init_modes();
else
#endif #endif
xrandr10_init_modes(); xrandr10_init_modes();
} }