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
0fe854b7
Commit
0fe854b7
authored
23 years ago
by
Francois Gouget
Committed by
Alexandre Julliard
23 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added an option to disable XVidMode support.
parent
38909c59
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/x11drv/x11drv_main.c
+4
-1
4 additions, 1 deletion
dlls/x11drv/x11drv_main.c
dlls/x11drv/xvidmode.c
+7
-3
7 additions, 3 deletions
dlls/x11drv/xvidmode.c
documentation/samples/config
+2
-0
2 additions, 0 deletions
documentation/samples/config
with
13 additions
and
4 deletions
dlls/x11drv/x11drv_main.c
+
4
−
1
View file @
0fe854b7
...
...
@@ -55,7 +55,7 @@ unsigned int screen_width;
unsigned
int
screen_height
;
unsigned
int
screen_depth
;
Window
root_window
;
int
dxgrab
,
usedga
;
int
dxgrab
,
usedga
,
usexvidmode
;
unsigned
int
X11DRV_server_startticks
;
...
...
@@ -219,6 +219,9 @@ static void setup_options(void)
if
(
!
get_config_key
(
hkey
,
appkey
,
"UseDGA"
,
buffer
,
sizeof
(
buffer
)
))
usedga
=
IS_OPTION_TRUE
(
buffer
[
0
]
);
if
(
!
get_config_key
(
hkey
,
appkey
,
"UseXVidMode"
,
buffer
,
sizeof
(
buffer
)
))
usexvidmode
=
IS_OPTION_TRUE
(
buffer
[
0
]
);
screen_depth
=
0
;
if
(
!
get_config_key
(
hkey
,
appkey
,
"ScreenDepth"
,
buffer
,
sizeof
(
buffer
)
))
screen_depth
=
atoi
(
buffer
);
...
...
This diff is collapsed.
Click to expand it.
dlls/x11drv/xvidmode.c
+
7
−
3
View file @
0fe854b7
...
...
@@ -24,6 +24,8 @@ DEFAULT_DEBUG_CHANNEL(x11drv);
#ifdef HAVE_LIBXXF86VM
extern
int
usexvidmode
;
static
int
xf86vm_event
,
xf86vm_error
,
xf86vm_major
,
xf86vm_minor
;
LPDDHALMODEINFO
xf86vm_modes
;
...
...
@@ -62,13 +64,15 @@ void X11DRV_XF86VM_Init(void)
if
(
xf86vm_major
)
return
;
/* already initialized? */
/* if in desktop mode, don't use XVidMode */
if
(
root_window
!=
DefaultRootWindow
(
gdi_display
))
return
;
if
(
!
usexvidmode
)
return
;
/* see if XVidMode is available */
if
(
!
TSXF86VidModeQueryExtension
(
gdi_display
,
&
xf86vm_event
,
&
xf86vm_error
))
return
;
if
(
!
TSXF86VidModeQueryVersion
(
gdi_display
,
&
xf86vm_major
,
&
xf86vm_minor
))
return
;
/* if in desktop mode, don't use XVidMode */
if
(
root_window
!=
DefaultRootWindow
(
gdi_display
))
return
;
/* retrieve modes */
if
(
!
TSXF86VidModeGetAllModeLines
(
gdi_display
,
DefaultScreen
(
gdi_display
),
&
nmodes
,
&
modes
))
...
...
This diff is collapsed.
Click to expand it.
documentation/samples/config
+
2
−
0
View file @
0fe854b7
...
...
@@ -124,6 +124,8 @@ WINE REGISTRY Version 2
"UseDGA" = "Y"
; Use XShm extension if present
"UseXShm" = "Y"
; Use XVidMode extension if present
"UseXVidMode" = "Y"
; Enable DirectX mouse grab
"DXGrab" = "N"
; Create the desktop window with a double-buffered visual
...
...
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