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
Alexey Alyaev
wine
Commits
4a0a2ee0
Commit
4a0a2ee0
authored
22 years ago
by
Christian Costa
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Avoid deadlock in VGA_DoSetMode.
parent
470a3f93
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/winedos/vga.c
+13
-13
13 additions, 13 deletions
dlls/winedos/vga.c
with
13 additions
and
13 deletions
dlls/winedos/vga.c
+
13
−
13
View file @
4a0a2ee0
...
...
@@ -232,6 +232,18 @@ typedef struct {
int
ret
;
}
ModeSet
;
static
void
WINAPI
VGA_DoExit
(
ULONG_PTR
arg
)
{
VGA_DeinstallTimer
();
IDirectDrawSurface_SetPalette
(
lpddsurf
,
NULL
);
IDirectDrawSurface_Release
(
lpddsurf
);
lpddsurf
=
NULL
;
IDirectDrawPalette_Release
(
lpddpal
);
lpddpal
=
NULL
;
IDirectDraw_Release
(
lpddraw
);
lpddraw
=
NULL
;
}
static
void
WINAPI
VGA_DoSetMode
(
ULONG_PTR
arg
)
{
LRESULT
res
;
...
...
@@ -239,7 +251,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg)
ModeSet
*
par
=
(
ModeSet
*
)
arg
;
par
->
ret
=
1
;
if
(
lpddraw
)
VGA_Exit
();
if
(
lpddraw
)
VGA_
Do
Exit
(
NULL
);
if
(
!
lpddraw
)
{
if
(
!
pDirectDrawCreate
)
{
...
...
@@ -334,18 +346,6 @@ int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth)
return
0
;
}
static
void
WINAPI
VGA_DoExit
(
ULONG_PTR
arg
)
{
VGA_DeinstallTimer
();
IDirectDrawSurface_SetPalette
(
lpddsurf
,
NULL
);
IDirectDrawSurface_Release
(
lpddsurf
);
lpddsurf
=
NULL
;
IDirectDrawPalette_Release
(
lpddpal
);
lpddpal
=
NULL
;
IDirectDraw_Release
(
lpddraw
);
lpddraw
=
NULL
;
}
void
VGA_Exit
(
void
)
{
if
(
lpddraw
)
MZ_RunInThread
(
VGA_DoExit
,
0
);
...
...
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