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
28a9b393
Commit
28a9b393
authored
Aug 20, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Try XRandR 1.0 if 1.2 fails.
parent
1bd91a4f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
xrandr.c
dlls/winex11.drv/xrandr.c
+8
-7
No files found.
dlls/winex11.drv/xrandr.c
View file @
28a9b393
...
@@ -344,24 +344,25 @@ static LONG xrandr12_set_current_mode( int mode )
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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
();
}
}
...
...
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